From 98154abb1b191d8a353417709ea1afc9984e1864 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 21 二月 2025 11:21:56 +0800
Subject: [PATCH] 修改所有的请求方式
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java | 1
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java | 15 +-
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRiskAssessmentResultsController.java | 16 +-
cnas-manage/src/main/java/com/ruoyi/manage/controller/ClientSatisfactionController.java | 26 ++--
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java | 15 +-
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCheckController.java | 4
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java | 15 +-
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramController.java | 4
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingParticipantsController.java | 4
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsController.java | 11 -
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIssueRecycleController.java | 14 -
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalImplementController.java | 16 +-
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentCancelController.java | 17 +-
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java | 19 ++-
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalReportController.java | 4
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewReportController.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingController.java | 4
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordTotalController.java | 16 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java | 3
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordVerifyController.java | 9 -
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCheckController.java | 19 +-
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java | 19 +-
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordAuditController.java | 35 +----
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentListController.java | 11 -
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsTotalController.java | 14 +-
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java | 6
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java | 2
28 files changed, 144 insertions(+), 179 deletions(-)
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ClientSatisfactionController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ClientSatisfactionController.java
index f7872cb..0251cac 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ClientSatisfactionController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ClientSatisfactionController.java
@@ -36,11 +36,11 @@
/**
* 瀹㈡埛婊℃剰搴﹁皟鏌ュ垪琛�
- * @param
+ * @param
* @return
*/
@ApiOperation(value = "瀹㈡埛婊℃剰搴﹁皟鏌ュ垪琛�")
- @PostMapping("/pageClientSatisfaction")
+ @GetMapping("/pageClientSatisfaction")
public Result<IPage<ClientSatisfaction>> pageClientSatisfaction(Page page,ClientSatisfaction clientSatisfaction) throws Exception {
return Result.success(clientSatisfactionService.pageClientSatisfaction(page, clientSatisfaction));
}
@@ -69,7 +69,7 @@
* 瀹㈡埛婊℃剰搴﹁皟鏌ヤ慨鏀�
* @return
*/
-
+
@ApiOperation(value = "瀹㈡埛婊℃剰搴﹁皟鏌ユ柊澧�")
@GetMapping("/delClientSatisfaction")
public Result updateClientSatisfaction(Integer clientSatisfactionId){
@@ -82,7 +82,7 @@
* @param response
* @return
*/
-
+
@ApiOperation(value = "瀹㈡埛婊℃剰瀵煎嚭")
@GetMapping("/exportWordClientSatisfaction")
public Result exportWordClientSatisfaction(Integer clientSatisfactionId, HttpServletResponse response){
@@ -95,10 +95,10 @@
* @param clientSatisfaction 瑕佷慨鏀瑰鎴锋弧鎰忓害鐨勭姸鎬佸璞�
* @param userId 淇敼浜篿d
*/
-
+
@ApiOperation(value = "纭瀹㈡埛婊℃剰搴�")
- @GetMapping("/confirmClientSatisfaction")
- public void confirmClientSatisfaction(ClientSatisfaction clientSatisfaction, Integer userId){
+ @PostMapping("/confirmClientSatisfaction")
+ public void confirmClientSatisfaction(@RequestBody ClientSatisfaction clientSatisfaction, Integer userId){
clientSatisfactionService.confirmClientSatisfaction(clientSatisfaction, userId);
}
@@ -107,7 +107,7 @@
* @param file
* @return
*/
-
+
@ApiOperation(value = "鏂板鎴峰垎鏋愰檮浠�")
@PostMapping("/uploadAnalyseFile")
public Result<?> uploadAnalyseFile(MultipartFile file) {
@@ -119,12 +119,10 @@
* 鏌ヨ鎴峰垎鏋愰檮浠�
* @return
*/
-
+
@ApiOperation(value = "鏌ヨ鎴峰垎鏋愰檮浠�")
- @PostMapping("/pageAnalyseFile")
- public Result<IPage<ClientSatisfactionAnalyseFile>> pageAnalyseFile(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- ClientSatisfactionAnalyseFile analyseFile = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ClientSatisfactionAnalyseFile.class);
+ @GetMapping("/pageAnalyseFile")
+ public Result<IPage<ClientSatisfactionAnalyseFile>> pageAnalyseFile(Page page, ClientSatisfactionAnalyseFile analyseFile) {
return Result.success(clientSatisfactionService.pageAnalyseFile(page, analyseFile));
}
@@ -132,7 +130,7 @@
* 鍒犻櫎鎴峰垎鏋愰檮浠�
* @return
*/
-
+
@ApiOperation(value = "鍒犻櫎鎴峰垎鏋愰檮浠�")
@GetMapping("/delAnalyseFile")
public Result delAnalyseFile(Integer analyseFileId){
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCheckController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCheckController.java
index c1ee078..7bcb8ba 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCheckController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCheckController.java
@@ -42,7 +42,7 @@
*/
@ApiOperation(value = "鍐呭妫�鏌ュ垎椤垫煡璇�")
- @PostMapping("/pageInternalCheck")
+ @GetMapping("/pageInternalCheck")
public Result<IPage<InternalCheckDto>> pageInternalCheck(Page page,InternalCheck internalCheck) throws Exception {
return Result.success(internalCheckService.pageInternalCheck(page, internalCheck));
}
@@ -75,7 +75,7 @@
*/
@ApiOperation(value = "鍐呭妫�鏌ュ垹闄�")
- @GetMapping("/delInternalCheck")
+ @DeleteMapping("/delInternalCheck")
public Result delInternalCheck(Integer checkId){
return Result.success(internalCheckService.delInternalCheck(checkId));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java
index 4040a8f..05cd164 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java
@@ -66,10 +66,8 @@
*/
@ApiOperation(value = "鏌ヨ鍐呭绠＄悊绾犳鎺柦鍒楄〃")
- @PostMapping("/pageInternalCorrect")
- public Result<IPage<InternalCorrect>> pageInternalCorrect(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- InternalCorrect detailsCorrect = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InternalCorrect.class);
+ @GetMapping("/pageInternalCorrect")
+ public Result<IPage<InternalCorrect>> pageInternalCorrect(Page page, InternalCorrect detailsCorrect) {
return Result.success(internalCorrectService.pageInternalCorrect(page, detailsCorrect));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalImplementController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalImplementController.java
index 33adf2e..5e1b8d8 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalImplementController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalImplementController.java
@@ -38,12 +38,12 @@
/**
* 鍐呭瀹炴柦璁″垝鍒嗛〉鏌ヨ
- * @param
+ * @param
* @return
*/
-
+
@ApiOperation(value = "鍐呭瀹炴柦璁″垝鍒嗛〉鏌ヨ")
- @PostMapping("/pageInternalImplement")
+ @GetMapping("/pageInternalImplement")
public Result<IPage<InternalImplementDto>> pageInternalImplement(Page page,InternalImplement internalImplement) throws Exception {
return Result.success(internalImplementService.pageInternalImplement(page, internalImplement));
}
@@ -52,7 +52,7 @@
* 鍐呭瀹炴柦璁″垝鏂板
* @return
*/
-
+
@ApiOperation(value = "鍐呭瀹炴柦璁″垝鏂板")
@PostMapping("/addInternalImplement")
public Result addInternalImplement(@RequestBody InternalImplementDto internalImplement){
@@ -63,7 +63,7 @@
* 鍐呭瀹炴柦璁″垝淇敼
* @return
*/
-
+
@ApiOperation(value = "鍐呭瀹炴柦璁″垝淇敼")
@PostMapping("/updateInternalImplement")
public Result updateInternalImplement(@RequestBody InternalImplementDto internalImplement){
@@ -74,7 +74,7 @@
* 鍐呭瀹炴柦璁″垝鍒犻櫎
* @return
*/
-
+
@ApiOperation(value = "鍐呭瀹炴柦璁″垝鍒犻櫎")
@GetMapping("/delInternalImplement")
public Result delInternalImplement(Integer implementId){
@@ -85,7 +85,7 @@
* 鍐呭瀹炴柦璁″垝鏌ョ湅璇︽儏
* @return
*/
-
+
@ApiOperation(value = "鍐呭瀹炴柦璁″垝鏌ョ湅璇︽儏")
@GetMapping("/getInternalImplementOne")
public Result<InternalImplementDto> getInternalImplementOne(Integer implementId){
@@ -107,7 +107,7 @@
* 瀵煎嚭鍐呭瀹炴柦璁″垝
* @return
*/
-
+
@ApiOperation(value = "瀵煎嚭鍐呭瀹炴柦璁″垝")
@GetMapping("/exportInternalImplement")
public void exportInternalImplement(Integer implementId, HttpServletResponse response){
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java
index 57805f0..f43c27e 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java
@@ -41,7 +41,7 @@
*/
@ApiOperation(value = "鍐呭浼氳鍒嗛〉鏌ヨ")
- @PostMapping("/pageInternalMeeting")
+ @GetMapping("/pageInternalMeeting")
public Result<IPage<InternalMeetingDto>> pageInternalMeeting(Page page,InternalMeeting internalMeeting) throws Exception {
return Result.success(internalMeetingService.pageInternalMeeting(page, internalMeeting));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java
index 4e10221..fd9c35d 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java
@@ -43,7 +43,7 @@
*/
@ApiOperation(value = "鍐呭骞村害璁″垝鍒嗛〉鏌ヨ")
- @PostMapping("/pageInternalPlan")
+ @GetMapping("/pageInternalPlan")
public Result<IPage<InternalPlanDto>> pageInternalPlan(Page page,InternalPlan internalPlan) throws Exception {
return Result.success(internalPlanService.pageInternalPlan(page, internalPlan));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalReportController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalReportController.java
index 3b0c6ce..8f3d5c2 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalReportController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalReportController.java
@@ -41,7 +41,7 @@
*/
@ApiOperation(value = "鍐呭鎶ュ憡鍒嗛〉鏌ヨ")
- @PostMapping("/pageInternalReport")
+ @GetMapping("/pageInternalReport")
public Result<IPage<InternalReport>> pageInternalReport(Page page,InternalReport internalReport) throws Exception {
return Result.success(internalReportService.pageInternalReport(page, internalReport));
}
@@ -74,7 +74,7 @@
*/
@ApiOperation(value = "鍐呭鎶ュ憡鍒犻櫎")
- @GetMapping("/delInternalReport")
+ @DeleteMapping("/delInternalReport")
public Result delInternalReport(Integer reportId){
return Result.success(internalReportService.removeById(reportId));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java
index 55a714e..64e7189 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java
@@ -21,6 +21,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.time.LocalDateTime;
+import java.util.Map;
/**
* <p>
@@ -48,8 +49,10 @@
}
@ApiOperation(value = "鎵瑰噯")
- @GetMapping("/approvalOfControlPlanChecklist")
- public Result<?> approvalOfControlPlanChecklist(Integer approve, Integer status){
+ @PostMapping("/approvalOfControlPlanChecklist")
+ public Result<?> approvalOfControlPlanChecklist(@RequestBody Map<String, Integer> param){
+ Integer approve = param.get("approve");
+ Integer status= param.get("status");
manageControlPlanListService.update(Wrappers.<ManageControlPlanList>lambdaUpdate()
.set(ManageControlPlanList::getApprove, approve)
.set(ManageControlPlanList::getApproveStatus, status)
@@ -58,8 +61,10 @@
}
@ApiOperation(value = "瀹℃壒")
- @GetMapping("/riskAnalysisApprovalOfControlPlanChecklist")
- public Result<?> riskAnalysisApprovalOfControlPlanChecklist(Integer approval, Integer status){
+ @PostMapping("/riskAnalysisApprovalOfControlPlanChecklist")
+ public Result<?> riskAnalysisApprovalOfControlPlanChecklist(@RequestBody Map<String, Integer> param){
+ Integer approval = param.get("approval");
+ Integer status= param.get("status");
manageControlPlanListService.update(Wrappers.<ManageControlPlanList>lambdaUpdate()
.set(ManageControlPlanList::getApproval, approval)
.set(ManageControlPlanList::getApprovalStatus, status)
@@ -87,7 +92,7 @@
@ApiOperation(value = "鏂板")
@PostMapping("/analysisOfMajorRiskFactorsAdded")
- public void analysisOfMajorRiskFactorsAdded(@RequestBody ManageControlPlanList manageControlPlanList) throws IOException {
+ public void analysisOfMajorRiskFactorsAdded(@RequestBody ManageControlPlanList manageControlPlanList) {
Integer userId = SecurityUtils.getUserId().intValue();
manageControlPlanList.setEditor(userId);
manageControlPlanList.setEditorDate(LocalDateTime.now());
@@ -95,8 +100,8 @@
}
@ApiOperation(value = "鍒犻櫎")
- @GetMapping("/deleteSignificantRiskFactorAnalysis")
- public void deleteSignificantRiskFactorAnalysis(Integer id) throws IOException {
+ @DeleteMapping("/deleteSignificantRiskFactorAnalysis")
+ public void deleteSignificantRiskFactorAnalysis(Integer id) {
manageControlPlanListService.removeById(id);
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java
index ff3116f..c441584 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java
@@ -12,10 +12,7 @@
import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -38,41 +35,41 @@
private ManageDocumentAlterService manageDocumentAlterService;
@ApiOperation(value = "鍒嗛〉鏌ヨ鏂囦欢鍙樻洿")
- @PostMapping("/pageManageDocumentAlter")
+ @GetMapping("/pageManageDocumentAlter")
public Result pageManageDocumentAlter(Page page,ManageDocumentAlter manageDocumentAlter) throws Exception {
return Result.success(manageDocumentAlterService.pageManageDocumentAlter(page, manageDocumentAlter));
}
@ApiOperation(value = "鍒犻櫎鏂囦欢鍙樻洿")
- @PostMapping("/delManageDocumentAlter")
+ @DeleteMapping("/delManageDocumentAlter")
public Result delManageDocumentAlter(Integer id){
return Result.success(manageDocumentAlterService.delManageDocumentAlter(id));
}
@ApiOperation(value = "鏌ョ湅鏂囦欢鍙樻洿")
- @PostMapping("/getManageDocumentAlter")
+ @GetMapping("/getManageDocumentAlter")
public Result getManageDocumentAlter(Integer id){
return Result.success(manageDocumentAlterService.getManageDocumentAlter(id));
}
@ApiOperation(value = "鏂板鏂囦欢鍙樻洿")
@PostMapping("/addManageDocumentAlter")
- public Result addManageDocumentAlter(ManageDocumentAlter manageDocumentAlter){
+ public Result addManageDocumentAlter(@RequestBody ManageDocumentAlter manageDocumentAlter){
return Result.success(manageDocumentAlterService.addManageDocumentAlter(manageDocumentAlter));
}
@ApiOperation(value = "缂栬緫鏂囦欢鍙樻洿")
@PostMapping("/doManageDocumentAlter")
- public Result doManageDocumentAlter(ManageDocumentAlter manageDocumentAlter){
+ public Result doManageDocumentAlter(@RequestBody ManageDocumentAlter manageDocumentAlter){
return Result.success(manageDocumentAlterService.doManageDocumentAlter(manageDocumentAlter));
}
@ApiOperation(value = "瀹℃牳鏂囦欢鍙樻洿")
@PostMapping("/checkManageDocumentAlter")
- public Result checkManageDocumentAlter(ManageDocumentAlter manageDocumentAlter){
+ public Result checkManageDocumentAlter(@RequestBody ManageDocumentAlter manageDocumentAlter){
return Result.success(manageDocumentAlterService.checkManageDocumentAlter(manageDocumentAlter));
}
@@ -84,7 +81,7 @@
}
@ApiOperation(value = "瀵煎嚭鏂囦欢鍙樻洿")
- @PostMapping("/exportManageDocumentAlter")
+ @GetMapping("/exportManageDocumentAlter")
public void exportManageDocumentAlter(ManageDocumentAlter manageDocumentAlter,HttpServletResponse response) throws Exception {
manageDocumentAlterService.exportManageDocumentAlter(manageDocumentAlter,response);
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentCancelController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentCancelController.java
index d4714f6..9710966 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentCancelController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentCancelController.java
@@ -12,10 +12,7 @@
import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -38,7 +35,7 @@
private ManageDocumentCancelService manageDocumentCancelService;
@ApiOperation(value = "鍒嗛〉鏌ヨ鏂囦欢浣滃簾")
- @PostMapping("/pageManageDocumentCancel")
+ @GetMapping("/pageManageDocumentCancel")
public Result pageManageDocumentCancel(Page page,ManageDocumentCancel manageDocumentCancel) throws Exception {
return Result.success(manageDocumentCancelService.pageManageDocumentCancel(page, manageDocumentCancel));
}
@@ -52,19 +49,21 @@
@ApiOperation(value = "瀹℃牳鏂囦欢浣滃簾")
@PostMapping("/checkManageDocumentCancel")
- public Result checkManageDocumentCancel(Integer id, String state) {
+ public Result checkManageDocumentCancel(@RequestBody Map<String, Object> param) {
+ Integer id = (Integer) param.get("id");
+ String state = (String) param.get("state");
return Result.success(manageDocumentCancelService.checkManageDocumentCancel(id, state));
}
@ApiOperation(value = "鍒犻櫎鏂囦欢浣滃簾")
- @PostMapping("/delManageDocumentCancel")
+ @DeleteMapping("/delManageDocumentCancel")
public Result delManageDocumentCancel(Integer id) {
return Result.success(manageDocumentCancelService.delManageDocumentCancel(id));
}
@ApiOperation(value = "鏌ョ湅鏂囦欢浣滃簾")
- @PostMapping("/getManageDocumentCancel")
+ @GetMapping("/getManageDocumentCancel")
public Result getManageDocumentCancel(Integer id) {
return Result.success(manageDocumentCancelService.getManageDocumentCancel(id));
}
@@ -77,7 +76,7 @@
}
@ApiOperation(value = "瀵煎嚭鏂囦欢浣滃簾")
- @PostMapping("/exportManageDocumentCancel")
+ @GetMapping("/exportManageDocumentCancel")
public void exportManageDocumentCancel(ManageDocumentCancel manageDocumentCancel,HttpServletResponse response) throws Exception {
manageDocumentCancelService.exportManageDocumentCancel(manageDocumentCancel,response);
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java
index 3ffa6d7..59fb849 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java
@@ -12,10 +12,7 @@
import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -38,7 +35,7 @@
private ManageDocumentControlledService manageDocumentControlledService;
@ApiOperation(value = "鍒嗛〉鏌ヨ鏂囦欢鍙楁帶")
- @PostMapping("/pageManageDocumentControlled")
+ @GetMapping("/pageManageDocumentControlled")
public Result pageManageDocumentControlled(Page page,ManageDocumentControlled manageDocumentControlled) throws Exception {
return Result.success(manageDocumentControlledService.pageManageDocumentControlled(page, manageDocumentControlled));
}
@@ -51,7 +48,7 @@
@ApiOperation(value = "鏌ョ湅鏂囦欢鍙楁帶")
- @PostMapping("/getManageDocumentControlled")
+ @GetMapping("/getManageDocumentControlled")
public Result getManageDocumentControlled(Long id){
return Result.success(manageDocumentControlledService.getManageDocumentControlled(id));
}
@@ -64,7 +61,7 @@
}
@ApiOperation(value = "鍒犻櫎鏂囦欢鍙楁帶")
- @PostMapping("/delManageDocumentControlled")
+ @DeleteMapping("/delManageDocumentControlled")
public Result delManageDocumentControlled(Long id){
return Result.success(manageDocumentControlledService.delManageDocumentControlled(id));
}
@@ -72,13 +69,13 @@
@ApiOperation(value = "瀹℃牳鏂囦欢鍙楁帶")
@PostMapping("/checkManageDocumentControlled")
- public Result checkManageDocumentControlled(ManageDocumentControlled manageDocumentControlled){
+ public Result checkManageDocumentControlled(@RequestBody ManageDocumentControlled manageDocumentControlled){
return Result.success(manageDocumentControlledService.checkManageDocumentControlled(manageDocumentControlled));
}
@ApiOperation(value = "瀹℃牳鏌ョ湅闄勪欢")
- @PostMapping("/checkManageDocumentControlledPdf")
+ @GetMapping("/checkManageDocumentControlledPdf")
public void checkManageDocumentControlledPdf(Long id, HttpServletResponse response)throws Exception {
manageDocumentControlledService.checkManageDocumentControlledPdf(id,response);
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java
index aecac08..2bc1403 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java
@@ -13,10 +13,7 @@
import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -39,26 +36,26 @@
private ManageDocumentIssueRecycleService manageDocumentIssueRecycleService;
@ApiOperation(value = "鍒嗛〉鏌ヨ鏂囦欢鍙戞斁鍥炴敹")
- @PostMapping("/pageManageDocumentIssueRecycle")
+ @GetMapping("/pageManageDocumentIssueRecycle")
public Result pageManageDocumentIssueRecycle(Page page,ManageDocumentIssueRecycleDto manageDocumentIssueRecycleDto) throws Exception {
return Result.success(manageDocumentIssueRecycleService.pageManageDocumentIssueRecycle(page, manageDocumentIssueRecycleDto));
}
@ApiOperation(value = "鏂板鏂囦欢鍙戞斁鍥炴敹")
@PostMapping("/addManageDocumentIssueRecycle")
- public Result addManageDocumentIssueRecycle(ManageDocumentIssueRecycle manageDocumentIssueRecycle){
+ public Result addManageDocumentIssueRecycle(@RequestBody ManageDocumentIssueRecycle manageDocumentIssueRecycle){
return Result.success(manageDocumentIssueRecycleService.addManageDocumentIssueRecycle(manageDocumentIssueRecycle));
}
@ApiOperation(value = "鍒犻櫎鏂囦欢鍙戞斁鍥炴敹")
- @PostMapping("/delManageDocumentIssueRecycle")
+ @DeleteMapping("/delManageDocumentIssueRecycle")
public Result delManageDocumentIssueRecycle(Long id){
return Result.success(manageDocumentIssueRecycleService.delManageDocumentIssueRecycle(id));
}
@ApiOperation(value = "鏌ョ湅鏂囦欢鍙戞斁鍥炴敹")
- @PostMapping("/getManageDocumentIssueRecycle")
+ @GetMapping("/getManageDocumentIssueRecycle")
public Result getManageDocumentIssueRecycle(Long id){
return Result.success(manageDocumentIssueRecycleService.getManageDocumentIssueRecycle(id));
}
@@ -66,7 +63,7 @@
@ApiOperation(value = "缂栬緫鏂囦欢鍙戞斁鍥炴敹")
@PostMapping("/doManageDocumentIssueRecycle")
- public Result doManageDocumentIssueRecycle(ManageDocumentIssueRecycle manageDocumentIssueRecycle){
+ public Result doManageDocumentIssueRecycle(@RequestBody ManageDocumentIssueRecycle manageDocumentIssueRecycle){
return Result.success(manageDocumentIssueRecycleService.doManageDocumentIssueRecycle(manageDocumentIssueRecycle));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentListController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentListController.java
index 0052446..91851f3 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentListController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentListController.java
@@ -13,10 +13,7 @@
import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -41,7 +38,7 @@
private ManageDocumentListService manageDocumentListService;
@ApiOperation(value = "鍒嗛〉鏌ヨ鏂囦欢娓呭崟")
- @PostMapping("/pageManageDocumentList")
+ @GetMapping("/pageManageDocumentList")
public Result pageManageDocumentList(Page page,ManageDocumentList manageDocumentList) throws Exception {
return Result.success(manageDocumentListService.pageManageDocumentList(page, manageDocumentList));
}
@@ -52,8 +49,8 @@
return Result.success(manageDocumentListService.updateById(manageDocumentList));
}
- @ApiOperation(value = "缂栬緫鏂囦欢娓呭崟")
- @PostMapping("/delManageDocumentList")
+ @ApiOperation(value = "鍒犻櫎鏂囦欢娓呭崟")
+ @DeleteMapping("/delManageDocumentList")
public Result delManageDocumentList(Integer id) {
return Result.success(manageDocumentListService.removeById(id));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingController.java
index 0725a34..345b93c 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingController.java
@@ -45,7 +45,7 @@
}
@ApiOperation(value = "缂栬緫浼氳璁板綍")
- @PutMapping("/modifyMeeting")
+ @PostMapping("/modifyMeeting")
public Result modifyMeeting(@RequestBody ManageMeetingDto manageMeetingDto){
return Result.success(manageMeetingService.modifyMeeting(manageMeetingDto));
}
@@ -58,7 +58,7 @@
@ApiOperation(value = "涓嬭浇浼氳璁板綍")
- @PostMapping("/exportMeeting")
+ @GetMapping("/exportMeeting")
public void exportMeeting(Integer id, HttpServletResponse response){
manageMeetingService.exportMeeting(id,response);
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingParticipantsController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingParticipantsController.java
index eb08a35..4bbb329 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingParticipantsController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingParticipantsController.java
@@ -38,14 +38,14 @@
@ApiOperation(value = "鏂板浼氳璁板綍鍙備細浜哄憳")
@PostMapping("/add")
- public Result addParticipants(List<ManageMeetingParticipants> list){
+ public Result addParticipants(@RequestBody List<ManageMeetingParticipants> list){
manageMeetingParticipantsService.saveBatch(list);
return Result.success();
}
@ApiOperation(value = "鍒犻櫎浼氳璁板綍鍙備細浜哄憳")
@DeleteMapping("/delete")
- public Result deleteParticipants(List<Integer> ids){
+ public Result deleteParticipants(@RequestBody List<Integer> ids){
manageMeetingParticipantsService.removeByIds(ids);
return Result.success();
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordAuditController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordAuditController.java
index afc086a..ced4578 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordAuditController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordAuditController.java
@@ -12,10 +12,7 @@
import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -38,54 +35,40 @@
private ManageRecordAuditService manageRecordAuditService;
@ApiOperation(value = "鍒嗛〉鏌ヨ鏂囦欢淇鐢宠瀹℃壒璁板綍")
- @PostMapping("/pageManageRecordAudit")
+ @GetMapping("/pageManageRecordAudit")
public Result pageManageRecordAudit(Page page,ManageRecordAudit manageRecordAudit) throws Exception {
return Result.success(manageRecordAuditService.pageManageRecordAudit(page, manageRecordAudit));
}
@ApiOperation(value = "鏂板鏂囦欢淇鐢宠瀹℃壒璁板綍")
@PostMapping("/addManageRecordAudit")
- public Result addManageRecordAudit( ManageRecordAudit manageRecordAudit){
+ public Result addManageRecordAudit(@RequestBody ManageRecordAudit manageRecordAudit){
return Result.success(manageRecordAuditService.addManageRecordAudit(manageRecordAudit));
}
@ApiOperation(value = "缂栬緫鏂囦欢淇鐢宠瀹℃壒璁板綍")
@PostMapping("/doManageRecordAudit")
- public Result doManageRecordAudit(ManageRecordAudit manageRecordAudit){
+ public Result doManageRecordAudit(@RequestBody ManageRecordAudit manageRecordAudit){
return Result.success(manageRecordAuditService.doManageRecordAudit(manageRecordAudit));
}
@ApiOperation(value = "鍒犻櫎鏂囦欢淇鐢宠瀹℃壒璁板綍")
- @PostMapping("/delManageRecordAudit")
+ @DeleteMapping("/delManageRecordAudit")
public Result delManageRecordAudit(Integer id){
return Result.success(manageRecordAuditService.removeById(id));
}
@ApiOperation(value = "鎵瑰噯鏂囦欢淇鐢宠瀹℃壒璁板綍")
@PostMapping("/ratifyManageRecordAudit")
- public Result ratifyManageRecordAudit(Integer id){
+ public Result ratifyManageRecordAudit(@RequestBody Map<String, Integer> param){
+ Integer id = param.get("id");
return Result.success(manageRecordAuditService.ratifyManageRecordAudit(id));
}
- @ApiOperation(value = "鐢宠閮ㄩ棬涓荤鎰忚鏂囦欢淇鐢宠瀹℃壒璁板綍")
- @PostMapping("/manageRecordAudit1")
- public void manageRecordAudit1(){
- }
-
- @ApiOperation(value = "鍘熷埗瀹氶儴闂ㄦ剰瑙佹枃浠朵慨璁㈢敵璇峰鎵硅褰�")
- @PostMapping("/manageRecordAudit2")
- public void manageRecordAudit2(){
- }
-
- @ApiOperation(value = "鍘熷鏍搁儴闂ㄦ剰瑙佹枃浠朵慨璁㈢敵璇峰鎵硅褰�")
- @PostMapping("/manageRecordAudit3")
- public void manageRecordAudit3(){
- }
-
@ApiOperation(value = "瀵煎嚭鏂囦欢淇鐢宠瀹℃壒璁板綍")
- @PostMapping("/exportOutManageRecordAudit")
- public Result exportOutManageRecordAudit(ManageRecordAudit manageRecordAudit, HttpServletResponse response) throws Exception {
+ @GetMapping("/exportOutManageRecordAudit")
+ public Result exportOutManageRecordAudit(ManageRecordAudit manageRecordAudit, HttpServletResponse response) {
return Result.success(manageRecordAuditService.exportOutManageRecordAudit(manageRecordAudit,response));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java
index d970e87..cf573fa 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java
@@ -12,10 +12,7 @@
import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -40,7 +37,7 @@
private ManageRecordCancelService manageRecordCancelService;
@ApiOperation(value = "鍒嗛〉鏌ヨ浣滃簾鏂囦欢閿�姣佽褰�")
- @PostMapping("/pageManageRecordCancel")
+ @GetMapping("/pageManageRecordCancel")
public Result pageManageRecordCancel(Page page,ManageRecordCancel manageRecordCancel) throws Exception {
return Result.success(manageRecordCancelService.pageManageRecordCancel(page, manageRecordCancel));
}
@@ -60,19 +57,21 @@
}
@ApiOperation(value = "鍒犻櫎浣滃簾鏂囦欢閿�姣佽褰�")
- @PostMapping("/delManageRecordCancel")
+ @DeleteMapping("/delManageRecordCancel")
public Result delManageRecordCancel(Integer id){
return Result.success(manageRecordCancelService.removeById(id));
}
@ApiOperation(value = "鎵瑰噯浣滃簾鏂囦欢閿�姣佽褰�")
@PostMapping("/ratifyManageRecordCancel")
- public Result ratifyManageRecordCancel(Integer id,String ratifyState){
+ public Result ratifyManageRecordCancel(@RequestBody Map<String, Object> param){
+ Integer id = (Integer) param.get("id");
+ String ratifyState = (String) param.get("ratifyState");
return Result.success(manageRecordCancelService.ratifyManageRecordCancel(id,ratifyState));
}
@ApiOperation(value = "瀵煎嚭浣滃簾鏂囦欢閿�姣佽褰�")
- @PostMapping("/exportOutManageRecordCancel")
+ @GetMapping("/exportOutManageRecordCancel")
public Result exportOutManageRecordCancel(ManageRecordCancel manageRecordCancel, HttpServletResponse response) throws Exception {
return Result.success(manageRecordCancelService.exportOutManageRecordCancel(manageRecordCancel,response));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCheckController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCheckController.java
index 716369f..ff1c1ac 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCheckController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCheckController.java
@@ -12,10 +12,7 @@
import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -39,7 +36,7 @@
private ManageRecordCheckService manageRecordCheckService;
@ApiOperation(value = "鍒嗛〉鏌ヨ鏂囦欢瀹℃壒璁板綍")
- @PostMapping("/pageManageRecordCheck")
+ @GetMapping("/pageManageRecordCheck")
public Result pageManageRecordCheck(Page page,ManageRecordCheck manageRecordCheck) throws Exception {
return Result.success(manageRecordCheckService.pageManageRecordCheck(page, manageRecordCheck));
}
@@ -58,25 +55,29 @@
}
@ApiOperation(value = "鍒犻櫎鏂囦欢瀹℃壒璁板綍")
- @PostMapping("/delManageRecordCheck")
+ @DeleteMapping("/delManageRecordCheck")
public Result delManageRecordCheck(Integer id) {
return Result.success(manageRecordCheckService.removeById(id));
}
@ApiOperation(value = "瀹℃牳鏂囦欢瀹℃壒璁板綍")
@PostMapping("/checkManageRecordCheck")
- public Result checkManageRecordCheck(Integer id,String checkState) {
+ public Result checkManageRecordCheck(@RequestBody Map<String, Object> param) {
+ Integer id = (Integer) param.get("id");
+ String checkState = (String) param.get("checkState");
return Result.success(manageRecordCheckService.checkManageRecordCheck(id,checkState));
}
@ApiOperation(value = "鎵瑰噯鏂囦欢瀹℃壒璁板綍")
@PostMapping("/ratifyManageRecordCheck")
- public Result ratifyManageRecordCheck(Integer id,String ratifyState) {
+ public Result ratifyManageRecordCheck(@RequestBody Map<String, Object> param) {
+ Integer id = (Integer) param.get("id");
+ String ratifyState = (String) param.get("ratifyState");
return Result.success(manageRecordCheckService.ratifyManageRecordCheck(id,ratifyState));
}
@ApiOperation(value = "瀵煎嚭鏂囦欢瀹℃壒璁板綍")
- @PostMapping("/exportOutManageRecordCheck")
+ @GetMapping("/exportOutManageRecordCheck")
public Result exportOutManageRecordCheck(ManageRecordCheck manageRecordCheck, HttpServletResponse response) throws Exception {
return Result.success(manageRecordCheckService.exportOutManageRecordCheck(manageRecordCheck,response));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsController.java
index faf687e..5c66147 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsController.java
@@ -12,10 +12,7 @@
import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -39,7 +36,7 @@
private ManageRecordIntervalsService manageRecordIntervalsService;
@ApiOperation(value = "鍒嗛〉鏌ヨ鏂囦欢瀹氭湡瀹℃煡璁板綍")
- @PostMapping("/pageManageRecordIntervals")
+ @GetMapping("/pageManageRecordIntervals")
public Result pageManageRecordIntervals(Page page,ManageRecordIntervals manageRecordIntervals) throws Exception {
return Result.success(manageRecordIntervalsService.pageManageRecordIntervals(page, manageRecordIntervals));
}
@@ -58,13 +55,13 @@
}
@ApiOperation(value = "鍒犻櫎鏂囦欢瀹氭湡瀹℃煡璁板綍")
- @PostMapping("/delManageRecordIntervals")
+ @DeleteMapping("/delManageRecordIntervals")
public Result delManageRecordIntervals(Integer id) {
return Result.success(manageRecordIntervalsService.delManageRecordIntervals(id));
}
@ApiOperation(value = "瀵煎嚭鏂囦欢瀹氭湡瀹℃煡璁板綍")
- @PostMapping("/exportOutManageRecordIntervals")
+ @GetMapping("/exportOutManageRecordIntervals")
public Result exportOutManageRecordIntervals(ManageRecordIntervals manageRecordIntervals, HttpServletResponse response) throws Exception {
return Result.success(manageRecordIntervalsService.exportOutManageRecordIntervals(manageRecordIntervals,response));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsTotalController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsTotalController.java
index 34f4786..bb5addd 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsTotalController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsTotalController.java
@@ -11,10 +11,7 @@
import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Map;
@@ -36,20 +33,23 @@
private ManageRecordIntervalsTotalService manageRecordIntervalsTotalService;
@ApiOperation(value = "鏌ヨ鏂囦欢瀹氭湡瀹℃煡璁板綍鍘嗗彶鍒楄〃")
- @PostMapping("/pageManageRecordIntervalsTotal")
+ @GetMapping("/pageManageRecordIntervalsTotal")
public Result pageManageRecordIntervalsTotal(Page page,ManageRecordIntervalsTotal manageRecordIntervalsTotal) throws Exception {
return Result.success(manageRecordIntervalsTotalService.pageManageRecordIntervalsTotal(page, manageRecordIntervalsTotal));
}
@ApiOperation(value = "鎻愪氦鏂囦欢瀹氭湡瀹℃煡璁板綍鍘嗗彶鍒楄〃")
@PostMapping("/submitManageRecordIntervalsTotal")
- public Result submitManageRecordIntervalsTotal(Integer id) {
+ public Result submitManageRecordIntervalsTotal(@RequestBody Map<String, Integer> param) {
+ Integer id = param.get("id");
return Result.success(manageRecordIntervalsTotalService.submitManageRecordIntervalsTotal(id));
}
@ApiOperation(value = "鎵瑰噯鏂囦欢瀹氭湡瀹℃煡璁板綍鍘嗗彶鍒楄〃")
@PostMapping("/ratifyManageRecordIntervalsTotal")
- public Result ratifyManageRecordIntervalsTotal(Integer id, String ratifyState) {
+ public Result ratifyManageRecordIntervalsTotal(@RequestBody Map<String, Object> param) {
+ Integer id = (Integer) param.get("id");
+ String ratifyState = (String) param.get("ratifyState");
return Result.success(manageRecordIntervalsTotalService.ratifyManageRecordIntervalsTotal(id, ratifyState));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIssueRecycleController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIssueRecycleController.java
index d66f439..3278dc1 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIssueRecycleController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIssueRecycleController.java
@@ -12,10 +12,7 @@
import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -39,13 +36,13 @@
private ManageRecordIssueRecycleService manageRecordIssueRecycleService;
@ApiOperation(value = "鍒嗛〉鏌ヨ鎵�鏈夋枃浠剁殑鍙戞斁涓庡洖鏀惰褰�")
- @PostMapping("/pageManageRecordIssueRecycle")
+ @GetMapping("/pageManageRecordIssueRecycle")
public Result pageManageRecordIssueRecycle(Page page,ManageRecordIssueRecycle manageRecordIssueRecycle) throws Exception {
return Result.success(manageRecordIssueRecycleService.pageManageRecordIssueRecycle(page, manageRecordIssueRecycle));
}
@ApiOperation(value = "鍒犻櫎鎵�鏈夋枃浠剁殑鍙戞斁涓庡洖鏀惰褰�")
- @PostMapping("/delManageRecordIssueRecycle")
+ @DeleteMapping("/delManageRecordIssueRecycle")
public Result delManageRecordIssueRecycle(Integer id){
return Result.success(manageRecordIssueRecycleService.removeById(id));
}
@@ -64,9 +61,8 @@
}
@ApiOperation(value = "瀵煎嚭鎵�鏈夋枃浠剁殑鍙戞斁涓庡洖鏀惰褰�")
- @PostMapping("/exportOutManageRecordIssueRecycle")
- public Result exportOutManageRecordIssueRecycle(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
- ManageRecordIssueRecycle manageRecordIssueRecycle = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordIssueRecycle.class);
+ @GetMapping("/exportOutManageRecordIssueRecycle")
+ public Result exportOutManageRecordIssueRecycle(ManageRecordIssueRecycle manageRecordIssueRecycle, HttpServletResponse response) {
return Result.success(manageRecordIssueRecycleService.exportOutManageRecordIssueRecycle(manageRecordIssueRecycle,response));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordTotalController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordTotalController.java
index b9c6820..727efea 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordTotalController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordTotalController.java
@@ -11,10 +11,7 @@
import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Map;
@@ -36,20 +33,23 @@
private ManageRecordTotalService manageRecordTotalService;
@ApiOperation(value = "鏌ヨ澶栨潵鏂囦欢纭璁板綍鍘嗗彶鍒楄〃")
- @PostMapping("/pageManageRecordTotal")
- public Result pageManageRecordTotal(Page page,ManageRecordTotal manageRecordTotal) throws Exception {
+ @GetMapping("/pageManageRecordTotal")
+ public Result pageManageRecordTotal(Page page, ManageRecordTotal manageRecordTotal) throws Exception {
return Result.success(manageRecordTotalService.pageManageRecordTotal(page, manageRecordTotal));
}
@ApiOperation(value = "鎻愪氦澶栨潵鏂囦欢纭璁板綍鍘嗗彶鍒楄〃")
@PostMapping("/submitManageRecordTotal")
- public Result submitManageRecordTotal(Integer id) {
+ public Result submitManageRecordTotal(@RequestBody Map<String, Integer> param) {
+ Integer id = param.get("id");
return Result.success(manageRecordTotalService.submitManageRecordTotal(id));
}
@ApiOperation(value = "鎵瑰噯澶栨潵鏂囦欢纭璁板綍鍘嗗彶鍒楄〃")
@PostMapping("/ratifyManageRecordTotal")
- public Result ratifyManageRecordTotal(Integer id, String ratifyState) {
+ public Result ratifyManageRecordTotal(@RequestBody Map<String, Object> param) {
+ Integer id = (Integer) param.get("id");
+ String ratifyState = (String) param.get("ratifyState");
return Result.success(manageRecordTotalService.ratifyManageRecordTotal(id, ratifyState));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordVerifyController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordVerifyController.java
index a46509c..b9a9f99 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordVerifyController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordVerifyController.java
@@ -12,10 +12,7 @@
import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -39,7 +36,7 @@
@ApiOperation(value = "鏌ヨ澶栨潵鏂囦欢纭璁板綍璇︽儏")
- @PostMapping("/pageManageRecordVerify")
+ @GetMapping("/pageManageRecordVerify")
public Result pageManageRecordVerify(Page page,ManageRecordVerify manageRecordVerify) throws Exception {
return Result.success(manageRecordVerifyService.pageManageRecordVerify(page, manageRecordVerify));
}
@@ -51,7 +48,7 @@
}
@ApiOperation(value = "鍒犻櫎澶栨潵鏂囦欢纭璁板綍")
- @PostMapping("/delManageRecordVerify")
+ @DeleteMapping("/delManageRecordVerify")
public Result delManageRecordVerify(Integer id) {
return Result.success(manageRecordVerifyService.delManageRecordVerify(id));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramController.java
index 56212f2..0623941 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramController.java
@@ -32,7 +32,7 @@
@ApiOperation(value = "鏌ヨ璇勫璁″垝")
@GetMapping("/getPageReviewProgram")
- public Result<IPage<ManageReviewProgram>> getPageReviewProgram(Page page, String startTime,String endTime, String judgingLocation) throws Exception {
+ public Result<IPage<ManageReviewProgram>> getPageReviewProgram(Page page, String startTime,String endTime, String judgingLocation) {
IPage<ManageReviewProgram> ipage = manageReviewProgramService.page(page,startTime,endTime,judgingLocation);
return Result.success(ipage);
}
@@ -58,7 +58,7 @@
@ApiOperation(value = "涓嬭浇璇勫璁″垝")
- @PostMapping("/exportReviewProgram")
+ @GetMapping("/exportReviewProgram")
public void exportReviewProgram(Integer id, HttpServletResponse response){
manageReviewProgramService.exportReviewProgram(id,response);
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewReportController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewReportController.java
index 7dbb09f..a7f58df 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewReportController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewReportController.java
@@ -56,7 +56,7 @@
}
@ApiOperation(value = "涓嬭浇绠＄悊璇勫鎶ュ憡")
- @PostMapping("/exportReviewReport")
+ @GetMapping("/exportReviewReport")
public void exportReviewReport(Integer id , HttpServletResponse response){
manageReviewReportService.exportReviewReport(id,response);
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRiskAssessmentResultsController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRiskAssessmentResultsController.java
index e71c7ec..52c2f47 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRiskAssessmentResultsController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRiskAssessmentResultsController.java
@@ -26,6 +26,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.time.LocalDateTime;
+import java.util.Map;
/**
* <p>
@@ -40,9 +41,6 @@
@RequestMapping("/manageRiskAssessmentResults")
public class ManageRiskAssessmentResultsController {
- @Autowired
-
-
@Resource
private ManageRiskAssessmentResultsService manageRiskAssessmentResultsService;
@@ -54,8 +52,10 @@
}
@ApiOperation(value = "鎵瑰噯")
- @GetMapping("/hazardIdentificationAndRiskApproval")
- public Result<?> hazardIdentificationAndRiskApproval(Integer approve, Integer status) {
+ @PostMapping("/hazardIdentificationAndRiskApproval")
+ public Result<?> hazardIdentificationAndRiskApproval(@RequestBody Map<String, Integer> param) {
+ Integer approve = param.get("approve");
+ Integer status = param.get("status");
manageRiskAssessmentResultsService.update(Wrappers.<ManageRiskAssessmentResults>lambdaUpdate()
.set(ManageRiskAssessmentResults::getApprove, approve)
.set(ManageRiskAssessmentResults::getApproveStatus, status)
@@ -64,8 +64,10 @@
}
@ApiOperation(value = "瀹℃壒")
- @GetMapping("/dangerousRiskApproval")
- public Result<?> dangerousRiskApproval(Integer approval, Integer status) {
+ @PostMapping("/dangerousRiskApproval")
+ public Result<?> dangerousRiskApproval(@RequestBody Map<String, Integer> param) {
+ Integer approval = param.get("approval");
+ Integer status = param.get("status");
manageRiskAssessmentResultsService.update(Wrappers.<ManageRiskAssessmentResults>lambdaUpdate()
.set(ManageRiskAssessmentResults::getApproval, approval)
.set(ManageRiskAssessmentResults::getApprovalStatus, status)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
index fa6d4c6..3102a89 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
@@ -51,7 +51,8 @@
@GetMapping(value = "/{menuId}")
public AjaxResult getInfo(@PathVariable Long menuId)
{
- return success(menuService.selectMenuById(menuId));
+ SysMenu sysMenu = menuService.selectMenuById(menuId);
+ return success(sysMenu);
}
/**
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
index 47354aa..39a2cc0 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
@@ -282,6 +282,7 @@
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
+ .append("isRersonalButton", geIsRersonalButton())
.toString();
}
}
--
Gitblit v1.9.3