From a465f67fdd32f818f35938eded708b166b1cc1f7 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 20 二月 2025 10:25:37 +0800
Subject: [PATCH] 搬迁cnas的8体系管理要求模块完成
---
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java | 30 -
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRiskAssessmentResultsController.java | 37 +
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordAuditServiceImpl.java | 17
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java | 9
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsServiceImpl.java | 15
cnas-manage/pom.xml | 12
cnas-manage/src/main/java/com/ruoyi/manage/controller/ClientSatisfactionController.java | 26 -
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCancelService.java | 3
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordTotalService.java | 3
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java | 32 -
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCheckController.java | 28 -
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIssueRecycleServiceImpl.java | 17
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCancelController.java | 30 -
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramController.java | 10
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsTotalServiceImpl.java | 21
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingParticipantsController.java | 8
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsController.java | 29 -
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIssueRecycleController.java | 26 -
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCheckServiceImpl.java | 21
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalImplementController.java | 29 -
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsService.java | 3
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordVerifyService.java | 3
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentCancelController.java | 32 -
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCheckService.java | 3
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java | 48 +-
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java | 26
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalReportController.java | 30 -
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewReportController.java | 10
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordVerifyServiceImpl.java | 10
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageMeetingController.java | 10
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordTotalController.java | 20
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramFileController.java | 9
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsTotalService.java | 3
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordVerifyController.java | 26
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewReportServiceImpl.java | 7
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIssueRecycleService.java | 3
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCheckController.java | 31 -
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java | 34 +-
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordAuditController.java | 32 -
cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordAuditService.java | 3
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordTotalServiceImpl.java | 21
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentListController.java | 22
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewProgramServiceImpl.java | 11
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsTotalController.java | 20
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCancelServiceImpl.java | 24
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java | 22
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java | 30 -
47 files changed, 413 insertions(+), 483 deletions(-)
diff --git a/cnas-manage/pom.xml b/cnas-manage/pom.xml
index 7ac0697..0d7b8d0 100644
--- a/cnas-manage/pom.xml
+++ b/cnas-manage/pom.xml
@@ -13,18 +13,6 @@
<dependencies>
- <!-- 鏍稿績妯″潡-->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-framework</artifactId>
- </dependency>
-
- <!-- 绯荤粺妯″潡-->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-system</artifactId>
- </dependency>
-
<!--涓氬姟妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
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 c548731..f7872cb 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
@@ -3,13 +3,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.ValueAuth;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.mapper.ClientSatisfactionAnalyseFileMapper;
import com.ruoyi.manage.pojo.ClientSatisfaction;
import com.ruoyi.manage.pojo.ClientSatisfactionAnalyseFile;
import com.ruoyi.manage.service.ClientSatisfactionService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -37,15 +36,12 @@
/**
* 瀹㈡埛婊℃剰搴﹁皟鏌ュ垪琛�
- * @param data
+ * @param
* @return
*/
- @ValueAuth
@ApiOperation(value = "瀹㈡埛婊℃剰搴﹁皟鏌ュ垪琛�")
@PostMapping("/pageClientSatisfaction")
- public Result<IPage<ClientSatisfaction>> pageClientSatisfaction(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- ClientSatisfaction clientSatisfaction = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ClientSatisfaction.class);
+ public Result<IPage<ClientSatisfaction>> pageClientSatisfaction(Page page,ClientSatisfaction clientSatisfaction) throws Exception {
return Result.success(clientSatisfactionService.pageClientSatisfaction(page, clientSatisfaction));
}
@@ -53,7 +49,6 @@
* 瀹㈡埛婊℃剰搴﹁皟鏌ユ柊澧�
* @return
*/
- @ValueAuth
@ApiOperation(value = "瀹㈡埛婊℃剰搴﹁皟鏌ユ柊澧�")
@PostMapping("/addClientSatisfaction")
public Result addClientSatisfaction(@RequestBody ClientSatisfaction clientSatisfaction){
@@ -64,7 +59,6 @@
* 瀹㈡埛婊℃剰搴﹁皟鏌ヤ慨鏀�
* @return
*/
- @ValueAuth
@ApiOperation(value = "瀹㈡埛婊℃剰搴﹁皟鏌ユ柊澧�")
@PostMapping("/updateClientSatisfaction")
public Result updateClientSatisfaction(@RequestBody ClientSatisfaction clientSatisfaction){
@@ -75,7 +69,7 @@
* 瀹㈡埛婊℃剰搴﹁皟鏌ヤ慨鏀�
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "瀹㈡埛婊℃剰搴﹁皟鏌ユ柊澧�")
@GetMapping("/delClientSatisfaction")
public Result updateClientSatisfaction(Integer clientSatisfactionId){
@@ -88,7 +82,7 @@
* @param response
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "瀹㈡埛婊℃剰瀵煎嚭")
@GetMapping("/exportWordClientSatisfaction")
public Result exportWordClientSatisfaction(Integer clientSatisfactionId, HttpServletResponse response){
@@ -101,7 +95,7 @@
* @param clientSatisfaction 瑕佷慨鏀瑰鎴锋弧鎰忓害鐨勭姸鎬佸璞�
* @param userId 淇敼浜篿d
*/
- @ValueAuth
+
@ApiOperation(value = "纭瀹㈡埛婊℃剰搴�")
@GetMapping("/confirmClientSatisfaction")
public void confirmClientSatisfaction(ClientSatisfaction clientSatisfaction, Integer userId){
@@ -113,7 +107,7 @@
* @param file
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鏂板鎴峰垎鏋愰檮浠�")
@PostMapping("/uploadAnalyseFile")
public Result<?> uploadAnalyseFile(MultipartFile file) {
@@ -125,7 +119,7 @@
* 鏌ヨ鎴峰垎鏋愰檮浠�
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鏌ヨ鎴峰垎鏋愰檮浠�")
@PostMapping("/pageAnalyseFile")
public Result<IPage<ClientSatisfactionAnalyseFile>> pageAnalyseFile(@RequestBody Map<String, Object> data) throws Exception {
@@ -138,7 +132,7 @@
* 鍒犻櫎鎴峰垎鏋愰檮浠�
* @return
*/
- @ValueAuth
+
@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 9554a5e..c1ee078 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
@@ -4,13 +4,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.ValueAuth;
-import com.ruoyi.manage.annotation.ValueClassify;
+import com.deepoove.poi.data.style.*;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.dto.InternalCheckDto;
import com.ruoyi.manage.pojo.InternalCheck;
import com.ruoyi.manage.service.InternalCheckService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -36,15 +37,13 @@
/**
* 鍐呭妫�鏌ュ垎椤垫煡璇�
- * @param data
+ * @param
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭妫�鏌ュ垎椤垫煡璇�")
@PostMapping("/pageInternalCheck")
- public Result<IPage<InternalCheckDto>> pageInternalCheck(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- InternalCheck internalCheck = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InternalCheck.class);
+ public Result<IPage<InternalCheckDto>> pageInternalCheck(Page page,InternalCheck internalCheck) throws Exception {
return Result.success(internalCheckService.pageInternalCheck(page, internalCheck));
}
@@ -52,7 +51,7 @@
* 鍐呭妫�鏌ユ柊澧�
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭妫�鏌ユ柊澧�")
@PostMapping("/addInternalCheck")
public Result addInternalCheck(@RequestBody InternalCheckDto internalCheck){
@@ -63,7 +62,7 @@
* 鍐呭妫�鏌ヤ慨鏀�
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭妫�鏌ヤ慨鏀�")
@PostMapping("/updateInternalCheck")
public Result updateInternalCheck(@RequestBody InternalCheckDto internalCheck){
@@ -74,7 +73,7 @@
* 鍐呭妫�鏌ュ垹闄�
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭妫�鏌ュ垹闄�")
@GetMapping("/delInternalCheck")
public Result delInternalCheck(Integer checkId){
@@ -85,7 +84,7 @@
* 鍐呭妫�鏌ユ煡鐪嬭鎯�
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭妫�鏌ユ煡鐪嬭鎯�")
@GetMapping("/getInternalCheckOne")
public Result<InternalCheckDto> getInternalCheckOne(Integer checkId){
@@ -97,7 +96,6 @@
* 鍐呭妫�鏌ユ壒鍑�
* @return
*/
- @ValueClassify("鍐呭妫�鏌�")
@ApiOperation(value = "鍐呭妫�鏌ユ壒鍑�")
@PostMapping("/ratifyInternalCheck")
public Result ratifyInternalCheck(@RequestBody InternalCheckDto internalCheck){
@@ -108,7 +106,7 @@
* 瀵煎嚭鍐呭妫�鏌�
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "瀵煎嚭鍐呭妫�鏌�")
@GetMapping("/exportInternalCheck")
public void exportInternalCheck(Integer checkId, HttpServletResponse response){
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 0e445d3..4040a8f 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
@@ -2,13 +2,15 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.ValueAuth;
+import com.deepoove.poi.data.style.*;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.mapper.InternalCorrectFileMapper;
import com.ruoyi.manage.pojo.InternalCorrect;
import com.ruoyi.manage.pojo.InternalCorrectFile;
import com.ruoyi.manage.service.InternalCorrectService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -40,7 +42,7 @@
* 鏂板鍐呭绠＄悊绾犳澶勭悊淇℃伅
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鏂板鍐呭绠＄悊绾犳澶勭悊")
@PostMapping("/addInternalCorrect")
public Result addInternalCorrect(@RequestBody InternalCorrect internalCorrect){
@@ -51,7 +53,7 @@
* 鏌ヨ鍐呭绠＄悊绾犳澶勭悊
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鏌ヨ鍐呭绠＄悊绾犳澶勭悊")
@GetMapping("/getInternalCorrect")
public Result<InternalCorrect> getInternalCorrect(Integer correctId){
@@ -62,7 +64,7 @@
* 鏌ヨ鍐呭绠＄悊绾犳鎺柦鍒楄〃
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鏌ヨ鍐呭绠＄悊绾犳鎺柦鍒楄〃")
@PostMapping("/pageInternalCorrect")
public Result<IPage<InternalCorrect>> pageInternalCorrect(@RequestBody Map<String, Object> data) throws Exception {
@@ -77,7 +79,7 @@
* @param file
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鏂板鍐呭绠＄悊绾犳鎺柦闄勪欢")
@PostMapping("/uploadInternalCorrectFile")
public Result<?> uploadInternalCorrectFile(Integer correctId, MultipartFile file) {
@@ -89,7 +91,7 @@
* 鏌ヨ鍐呭绠＄悊绾犳鎺柦闄勪欢
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鏌ヨ鍐呭绠＄悊绾犳鎺柦闄勪欢")
@GetMapping("/getInternalCorrectFileList")
public Result<List<InternalCorrectFile>> getInternalCorrectFileList(Integer correctId){
@@ -100,7 +102,7 @@
* 鍒犻櫎鍐呭绠＄悊绾犳鎺柦闄勪欢
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍒犻櫎鍐呭绠＄悊绾犳鎺柦闄勪欢")
@GetMapping("/delInternalCorrectFile")
public Result delInternalCorrectFile(Integer correctFileId){
@@ -111,7 +113,7 @@
* 瀵煎嚭绾犳鎺柦
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "瀵煎嚭绾犳鎺柦")
@GetMapping("/exportInternalCorrect")
public void exportInternalCorrect(Integer correctId, HttpServletResponse response){
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 2145b0c..33adf2e 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
@@ -4,13 +4,15 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.ValueAuth;
-import com.ruoyi.manage.annotation.ValueClassify;
+import com.deepoove.poi.data.style.*;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
+
import com.ruoyi.manage.dto.InternalImplementDto;
import com.ruoyi.manage.pojo.InternalImplement;
import com.ruoyi.manage.service.InternalImplementService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -36,15 +38,13 @@
/**
* 鍐呭瀹炴柦璁″垝鍒嗛〉鏌ヨ
- * @param data
+ * @param
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭瀹炴柦璁″垝鍒嗛〉鏌ヨ")
@PostMapping("/pageInternalImplement")
- public Result<IPage<InternalImplementDto>> pageInternalImplement(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- InternalImplement internalImplement = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InternalImplement.class);
+ public Result<IPage<InternalImplementDto>> pageInternalImplement(Page page,InternalImplement internalImplement) throws Exception {
return Result.success(internalImplementService.pageInternalImplement(page, internalImplement));
}
@@ -52,7 +52,7 @@
* 鍐呭瀹炴柦璁″垝鏂板
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭瀹炴柦璁″垝鏂板")
@PostMapping("/addInternalImplement")
public Result addInternalImplement(@RequestBody InternalImplementDto internalImplement){
@@ -63,7 +63,7 @@
* 鍐呭瀹炴柦璁″垝淇敼
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭瀹炴柦璁″垝淇敼")
@PostMapping("/updateInternalImplement")
public Result updateInternalImplement(@RequestBody InternalImplementDto internalImplement){
@@ -74,7 +74,7 @@
* 鍐呭瀹炴柦璁″垝鍒犻櫎
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭瀹炴柦璁″垝鍒犻櫎")
@GetMapping("/delInternalImplement")
public Result delInternalImplement(Integer implementId){
@@ -85,7 +85,7 @@
* 鍐呭瀹炴柦璁″垝鏌ョ湅璇︽儏
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭瀹炴柦璁″垝鏌ョ湅璇︽儏")
@GetMapping("/getInternalImplementOne")
public Result<InternalImplementDto> getInternalImplementOne(Integer implementId){
@@ -97,7 +97,6 @@
* 鍐呭瀹炴柦璁″垝鎵瑰噯
* @return
*/
- @ValueClassify("鍐呭瀹炴柦璁″垝")
@ApiOperation(value = "鍐呭瀹炴柦璁″垝鎵瑰噯")
@PostMapping("/ratifyInternalImplement")
public Result ratifyInternalImplement(@RequestBody InternalImplementDto internalImplement){
@@ -108,7 +107,7 @@
* 瀵煎嚭鍐呭瀹炴柦璁″垝
* @return
*/
- @ValueAuth
+
@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 f8ecb39..57805f0 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
@@ -2,12 +2,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.ValueAuth;
+import com.deepoove.poi.data.style.*;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.dto.InternalMeetingDto;
import com.ruoyi.manage.pojo.InternalMeeting;
import com.ruoyi.manage.service.InternalMeetingService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -34,15 +36,13 @@
/**
* 鍐呭浼氳鍒嗛〉鏌ヨ
- * @param data
+ * @param
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭浼氳鍒嗛〉鏌ヨ")
@PostMapping("/pageInternalMeeting")
- public Result<IPage<InternalMeetingDto>> pageInternalMeeting(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- InternalMeeting internalMeeting = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InternalMeeting.class);
+ public Result<IPage<InternalMeetingDto>> pageInternalMeeting(Page page,InternalMeeting internalMeeting) throws Exception {
return Result.success(internalMeetingService.pageInternalMeeting(page, internalMeeting));
}
@@ -50,7 +50,7 @@
* 鍐呭浼氳鏂板
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭浼氳鏂板")
@PostMapping("/addInternalMeeting")
public Result addInternalMeeting(@RequestBody InternalMeetingDto internalMeeting){
@@ -61,7 +61,7 @@
* 鍐呭浼氳淇敼
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭浼氳淇敼")
@PostMapping("/updateInternalMeeting")
public Result updateInternalMeeting(@RequestBody InternalMeetingDto internalMeeting){
@@ -72,7 +72,7 @@
* 鍐呭浼氳鍒犻櫎
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭浼氳鍒犻櫎")
@GetMapping("/delInternalMeeting")
public Result delInternalMeeting(Integer meetingId){
@@ -83,7 +83,7 @@
* 鍐呭浼氳鏌ョ湅璇︽儏
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭浼氳鏌ョ湅璇︽儏")
@GetMapping("/getInternalMeetingOne")
public Result<InternalMeetingDto> getInternalMeetingOne(Integer meetingId){
@@ -94,7 +94,7 @@
* 瀵煎嚭鍐呭浼氳
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "瀵煎嚭鍐呭浼氳")
@GetMapping("/exportInternalMeeting")
public void exportInternalMeeting(Integer meetingId, HttpServletResponse response){
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 9153cfa..4e10221 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
@@ -2,13 +2,15 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.ValueAuth;
-import com.ruoyi.manage.annotation.ValueClassify;
+import com.deepoove.poi.data.style.*;
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.dto.InternalPlanDto;
import com.ruoyi.manage.pojo.InternalPlan;
import com.ruoyi.manage.service.InternalPlanService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -36,15 +38,13 @@
/**
* 鍐呭骞村害璁″垝鍒嗛〉鏌ヨ
- * @param data
+ * @param
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭骞村害璁″垝鍒嗛〉鏌ヨ")
@PostMapping("/pageInternalPlan")
- public Result<IPage<InternalPlanDto>> pageInternalPlan(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- InternalPlan internalPlan = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InternalPlan.class);
+ public Result<IPage<InternalPlanDto>> pageInternalPlan(Page page,InternalPlan internalPlan) throws Exception {
return Result.success(internalPlanService.pageInternalPlan(page, internalPlan));
}
@@ -52,7 +52,7 @@
* 鍐呭骞村害璁″垝鏂板
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭骞村害璁″垝鏂板")
@PostMapping("/addInternalPlan")
public Result addInternalPlan(@RequestBody InternalPlanDto internalPlan){
@@ -63,7 +63,7 @@
* 鍐呭骞村害璁″垝淇敼
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭骞村害璁″垝淇敼")
@PostMapping("/updateInternalPlan")
public Result updateInternalPlan(@RequestBody InternalPlanDto internalPlan){
@@ -74,7 +74,7 @@
* 鍐呭骞村害璁″垝鍒犻櫎
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭骞村害璁″垝鍒犻櫎")
@GetMapping("/delInternalPlan")
public Result delInternalPlan(Integer planId){
@@ -85,7 +85,7 @@
* 鍐呭骞村害璁″垝鏌ョ湅璇︽儏
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭骞村害璁″垝鏌ョ湅璇︽儏")
@GetMapping("/getInternalPlanOne")
public Result<InternalPlanDto> getInternalPlanOne(Integer planId){
@@ -97,7 +97,6 @@
* 鍐呭骞村害璁″垝瀹℃牳
* @return
*/
- @ValueClassify("鍐呭骞村害璁″垝")
@ApiOperation(value = "鍐呭骞村害璁″垝瀹℃牳")
@PostMapping("/examineInternalPlan")
public Result examineInternalPlan(@RequestBody InternalPlanDto internalPlanDto){
@@ -108,7 +107,6 @@
* 鍐呭骞村害璁″垝鎵瑰噯
* @return
*/
- @ValueClassify("鍐呭骞村害璁″垝")
@ApiOperation(value = "鍐呭瀹炴柦璁″垝鎵瑰噯")
@PostMapping("/ratifyInternalPlan")
public Result ratifyInternalPlan(@RequestBody InternalPlanDto internalPlanDto){
@@ -119,7 +117,7 @@
* 瀵煎嚭鍐呭骞村害璁″垝
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "瀵煎嚭鍐呭骞村害璁″垝")
@GetMapping("/exportInternalPlan")
public void exportInternalPlan(Integer planId, HttpServletResponse response){
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 08eb6f4..3b0c6ce 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
@@ -3,12 +3,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.ValueAuth;
-import com.ruoyi.manage.annotation.ValueClassify;
+import com.deepoove.poi.data.style.*;
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.pojo.InternalReport;
import com.ruoyi.manage.service.InternalReportService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -34,15 +36,13 @@
/**
* 鍐呭鎶ュ憡鍒嗛〉鏌ヨ
- * @param data
+ * @param
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭鎶ュ憡鍒嗛〉鏌ヨ")
@PostMapping("/pageInternalReport")
- public Result<IPage<InternalReport>> pageInternalReport(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- InternalReport internalReport = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InternalReport.class);
+ public Result<IPage<InternalReport>> pageInternalReport(Page page,InternalReport internalReport) throws Exception {
return Result.success(internalReportService.pageInternalReport(page, internalReport));
}
@@ -50,7 +50,7 @@
* 鍐呭鎶ュ憡鏂板
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭鎶ュ憡鏂板")
@PostMapping("/addInternalReport")
public Result addInternalReport(@RequestBody InternalReport internalReport){
@@ -61,7 +61,7 @@
* 鍐呭鎶ュ憡淇敼
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭鎶ュ憡淇敼")
@PostMapping("/updateInternalReport")
public Result updateInternalReport(@RequestBody InternalReport internalReport){
@@ -72,7 +72,7 @@
* 鍐呭鎶ュ憡鍒犻櫎
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭鎶ュ憡鍒犻櫎")
@GetMapping("/delInternalReport")
public Result delInternalReport(Integer reportId){
@@ -83,7 +83,7 @@
* 鍐呭鎶ュ憡鏌ョ湅璇︽儏
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭鎶ュ憡鏌ョ湅璇︽儏")
@GetMapping("/getInternalReportOne")
public Result<InternalReport> getInternalReportOne(Integer reportId){
@@ -94,7 +94,6 @@
* 鍐呭妫�鏌ュ鏍�
* @return
*/
- @ValueClassify("鍐呭鎶ュ憡")
@ApiOperation(value = "鍐呭妫�鏌ュ鏍�")
@PostMapping("/examineInternalReport")
public Result examineInternalReport(@RequestBody InternalReport internalReport){
@@ -105,7 +104,6 @@
* 鍐呭鎶ュ憡璐ㄩ噺璐熻矗浜哄～鍐�
* @return
*/
- @ValueClassify("鍐呭鎶ュ憡")
@ApiOperation(value = "鍐呭鎶ュ憡璐ㄩ噺璐熻矗浜哄～鍐�")
@PostMapping("/qualityInternalReport")
public Result qualityInternalReport(@RequestBody InternalReport internalReport){
@@ -116,7 +114,7 @@
* 瀵煎嚭鍐呭鎶ュ憡
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "瀵煎嚭鍐呭鎶ュ憡")
@GetMapping("/exportInternalReport")
public void exportInternalReport(Integer reportId, HttpServletResponse response){
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 016a70b..55a714e 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
@@ -1,25 +1,22 @@
package com.ruoyi.manage.controller;
import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.alibaba.excel.read.listener.PageReadListener;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.ValueAuth;
-import com.ruoyi.manage.annotation.ValueClassify;
-
-
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.manage.pojo.ManageControlPlanList;
import com.ruoyi.manage.service.ManageControlPlanListService;
-import com.ruoyi.manage.utils.MyUtil;
import com.ruoyi.manage.vo.ManageControlPlanListVo;
-import com.ruoyi.manage.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -42,18 +39,14 @@
@Resource
private ManageControlPlanListService manageControlPlanListService;
- @Autowired
-
- @ValueClassify(value = "閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗�")
+
@ApiOperation(value = "鍒嗛〉鏌ヨ")
@GetMapping("/getPageList")
- public Result<IPage<ManageControlPlanListVo>> getPageList(Page page){
- IPage<ManageControlPlanListVo> ipage = manageControlPlanListService.getPageList(page);
- return Result.success(ipage);
+ public Result<IPage<ManageControlPlanListVo>> getPageList(Page page) {
+ return Result.success(manageControlPlanListService.getPageList(page));
}
- @ValueClassify(value = "閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗�")
@ApiOperation(value = "鎵瑰噯")
@GetMapping("/approvalOfControlPlanChecklist")
public Result<?> approvalOfControlPlanChecklist(Integer approve, Integer status){
@@ -64,7 +57,6 @@
return Result.success();
}
- @ValueClassify(value = "閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗�")
@ApiOperation(value = "瀹℃壒")
@GetMapping("/riskAnalysisApprovalOfControlPlanChecklist")
public Result<?> riskAnalysisApprovalOfControlPlanChecklist(Integer approval, Integer status){
@@ -75,11 +67,9 @@
return Result.success();
}
- @ValueClassify(value = "閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗�")
- @ApiOperation(value = "瀵煎叆")
@PostMapping("/importControlPlanList")
public void importControlPlanList(MultipartFile file) throws IOException {
- boolean excelFile = MyUtil.isExcelFile(file);
+ boolean excelFile = isExcelFile(file);
if (!excelFile) {
throw new ErrorException("璇峰鍏xcel鏂囦欢锛�");
}
@@ -95,7 +85,6 @@
})).sheet().doRead();
}
- @ValueClassify(value = "閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗�")
@ApiOperation(value = "鏂板")
@PostMapping("/analysisOfMajorRiskFactorsAdded")
public void analysisOfMajorRiskFactorsAdded(@RequestBody ManageControlPlanList manageControlPlanList) throws IOException {
@@ -105,7 +94,6 @@
manageControlPlanListService.saveOrUpdate(manageControlPlanList);
}
- @ValueClassify(value = "閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗�")
@ApiOperation(value = "鍒犻櫎")
@GetMapping("/deleteSignificantRiskFactorAnalysis")
public void deleteSignificantRiskFactorAnalysis(Integer id) throws IOException {
@@ -116,10 +104,26 @@
*
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗�")
@GetMapping("/exportSignificantRiskFactors")
public void exportSignificantRiskFactors(HttpServletResponse response){
manageControlPlanListService.exportPersonTraining(response);
}
+
+ public static boolean isExcelFile(MultipartFile file) {
+ if (file.isEmpty()) {
+ return false;
+ }
+ String originalFilename = file.getOriginalFilename();
+ if (originalFilename == null) {
+ return false;
+ }
+ String[] parts = originalFilename.split("\\.");
+ if (parts.length == 0) {
+ return false;
+ }
+ String fileExtension = parts[parts.length - 1].toLowerCase();
+ return fileExtension.equals("xls") || fileExtension.equals("xlsx");
+ }
}
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 48c2e8e..ff3116f 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
@@ -1,13 +1,16 @@
package com.ruoyi.manage.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.CustomClazzName;
-import com.ruoyi.manage.annotation.ValueAuth;
-import com.ruoyi.manage.annotation.ValueClassify;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
+
+import com.deepoove.poi.data.style.*;
+
import com.ruoyi.manage.pojo.ManageDocumentAlter;
import com.ruoyi.manage.service.ManageDocumentAlterService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+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;
@@ -26,70 +29,63 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2024-11-11 11:04:01
*/
+@Api(tags = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@RestController
@RequestMapping("/manageDocumentAlter")
-@CustomClazzName(name = "浣撶郴绠＄悊瑕佹眰", index = 10)
public class ManageDocumentAlterController {
@Resource
private ManageDocumentAlterService manageDocumentAlterService;
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "鍒嗛〉鏌ヨ鏂囦欢鍙樻洿")
@PostMapping("/pageManageDocumentAlter")
- public Result pageManageDocumentAlter(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- ManageDocumentAlter manageDocumentAlter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageDocumentAlter.class);
+ public Result pageManageDocumentAlter(Page page,ManageDocumentAlter manageDocumentAlter) throws Exception {
return Result.success(manageDocumentAlterService.pageManageDocumentAlter(page, manageDocumentAlter));
}
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "鍒犻櫎鏂囦欢鍙樻洿")
@PostMapping("/delManageDocumentAlter")
public Result delManageDocumentAlter(Integer id){
return Result.success(manageDocumentAlterService.delManageDocumentAlter(id));
}
- @ValueAuth
+
@ApiOperation(value = "鏌ョ湅鏂囦欢鍙樻洿")
@PostMapping("/getManageDocumentAlter")
public Result getManageDocumentAlter(Integer id){
return Result.success(manageDocumentAlterService.getManageDocumentAlter(id));
}
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "鏂板鏂囦欢鍙樻洿")
@PostMapping("/addManageDocumentAlter")
public Result addManageDocumentAlter(ManageDocumentAlter manageDocumentAlter){
return Result.success(manageDocumentAlterService.addManageDocumentAlter(manageDocumentAlter));
}
- @ValueAuth
+
@ApiOperation(value = "缂栬緫鏂囦欢鍙樻洿")
@PostMapping("/doManageDocumentAlter")
public Result doManageDocumentAlter(ManageDocumentAlter manageDocumentAlter){
return Result.success(manageDocumentAlterService.doManageDocumentAlter(manageDocumentAlter));
}
- @ValueAuth
+
@ApiOperation(value = "瀹℃牳鏂囦欢鍙樻洿")
@PostMapping("/checkManageDocumentAlter")
public Result checkManageDocumentAlter(ManageDocumentAlter manageDocumentAlter){
return Result.success(manageDocumentAlterService.checkManageDocumentAlter(manageDocumentAlter));
}
- @ValueAuth
+
@ApiOperation(value = "瀹℃牳鏌ョ湅闄勪欢")
@PostMapping("/checkManageDocumentAlterPdf")
public void checkManageDocumentAlterPdf(Long id, HttpServletResponse response)throws Exception {
manageDocumentAlterService.checkManageDocumentAlterPdf(id,response);
}
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "瀵煎嚭鏂囦欢鍙樻洿")
@PostMapping("/exportManageDocumentAlter")
- public void exportManageDocumentAlter(@RequestBody Map<String, Object> data,HttpServletResponse response) throws Exception {
- ManageDocumentAlter manageDocumentAlter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageDocumentAlter.class);
+ 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 d441282..d4714f6 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
@@ -1,13 +1,16 @@
package com.ruoyi.manage.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.CustomClazzName;
-import com.ruoyi.manage.annotation.ValueAuth;
-import com.ruoyi.manage.annotation.ValueClassify;
+
+import com.deepoove.poi.data.style.*;
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.pojo.ManageDocumentCancel;
import com.ruoyi.manage.service.ManageDocumentCancelService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+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;
@@ -26,63 +29,56 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2024-11-09 02:37:35
*/
+@Api(tags = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@RestController
@RequestMapping("/manageDocumentCancel")
-@CustomClazzName(name = "浣撶郴绠＄悊瑕佹眰", index = 10)
public class ManageDocumentCancelController {
@Resource
private ManageDocumentCancelService manageDocumentCancelService;
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "鍒嗛〉鏌ヨ鏂囦欢浣滃簾")
@PostMapping("/pageManageDocumentCancel")
- public Result pageManageDocumentCancel(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- ManageDocumentCancel manageDocumentCancel = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageDocumentCancel.class);
+ public Result pageManageDocumentCancel(Page page,ManageDocumentCancel manageDocumentCancel) throws Exception {
return Result.success(manageDocumentCancelService.pageManageDocumentCancel(page, manageDocumentCancel));
}
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "鏂板鏂囦欢浣滃簾")
@PostMapping("/addManageDocumentCancel")
public Result addManageDocumentCancel(@RequestBody ManageDocumentCancel manageDocumentCancel) {
return Result.success(manageDocumentCancelService.addManageDocumentCancel(manageDocumentCancel));
}
- @ValueAuth
+
@ApiOperation(value = "瀹℃牳鏂囦欢浣滃簾")
@PostMapping("/checkManageDocumentCancel")
public Result checkManageDocumentCancel(Integer id, String state) {
return Result.success(manageDocumentCancelService.checkManageDocumentCancel(id, state));
}
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "鍒犻櫎鏂囦欢浣滃簾")
@PostMapping("/delManageDocumentCancel")
public Result delManageDocumentCancel(Integer id) {
return Result.success(manageDocumentCancelService.delManageDocumentCancel(id));
}
- @ValueAuth
+
@ApiOperation(value = "鏌ョ湅鏂囦欢浣滃簾")
@PostMapping("/getManageDocumentCancel")
public Result getManageDocumentCancel(Integer id) {
return Result.success(manageDocumentCancelService.getManageDocumentCancel(id));
}
- @ValueAuth
+
@ApiOperation(value = "缂栬緫鏂囦欢浣滃簾")
@PostMapping("/doManageDocumentCancel")
public Result doManageDocumentCancel(@RequestBody ManageDocumentCancel manageDocumentCancel) {
return Result.success(manageDocumentCancelService.doManageDocumentCancel(manageDocumentCancel));
}
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "瀵煎嚭鏂囦欢浣滃簾")
@PostMapping("/exportManageDocumentCancel")
- public void exportManageDocumentCancel(@RequestBody Map<String, Object> data,HttpServletResponse response) throws Exception {
- ManageDocumentCancel manageDocumentCancel = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageDocumentCancel.class);
+ 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 2b1733f..3ffa6d7 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
@@ -1,13 +1,16 @@
package com.ruoyi.manage.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.CustomClazzName;
-import com.ruoyi.manage.annotation.ValueAuth;
-import com.ruoyi.manage.annotation.ValueClassify;
+
+import com.deepoove.poi.data.style.*;
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.pojo.ManageDocumentControlled;
import com.ruoyi.manage.service.ManageDocumentControlledService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+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;
@@ -26,59 +29,54 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2024-11-08 02:54:44
*/
+@Api(tags = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@RestController
@RequestMapping("/manageDocumentControlled")
-@CustomClazzName(name = "浣撶郴绠＄悊瑕佹眰",index = 10)
public class ManageDocumentControlledController {
@Resource
private ManageDocumentControlledService manageDocumentControlledService;
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "鍒嗛〉鏌ヨ鏂囦欢鍙楁帶")
@PostMapping("/pageManageDocumentControlled")
- public Result pageManageDocumentControlled(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- ManageDocumentControlled manageDocumentControlled = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageDocumentControlled.class);
+ public Result pageManageDocumentControlled(Page page,ManageDocumentControlled manageDocumentControlled) throws Exception {
return Result.success(manageDocumentControlledService.pageManageDocumentControlled(page, manageDocumentControlled));
}
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "鏂板鏂囦欢鍙楁帶")
@PostMapping("/addManageDocumentControlled")
public Result addManageDocumentControlled(ManageDocumentControlled manageDocumentControlled){
return Result.success(manageDocumentControlledService.addManageDocumentControlled(manageDocumentControlled));
}
- @ValueAuth
+
@ApiOperation(value = "鏌ョ湅鏂囦欢鍙楁帶")
@PostMapping("/getManageDocumentControlled")
public Result getManageDocumentControlled(Long id){
return Result.success(manageDocumentControlledService.getManageDocumentControlled(id));
}
- @ValueAuth
+
@ApiOperation(value = "缂栬緫鏂囦欢鍙楁帶")
@PostMapping("/doManageDocumentControlled")
public Result doManageDocumentControlled(ManageDocumentControlled manageDocumentControlled){
return Result.success(manageDocumentControlledService.doManageDocumentControlled(manageDocumentControlled));
}
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "鍒犻櫎鏂囦欢鍙楁帶")
@PostMapping("/delManageDocumentControlled")
public Result delManageDocumentControlled(Long id){
return Result.success(manageDocumentControlledService.delManageDocumentControlled(id));
}
- @ValueAuth
+
@ApiOperation(value = "瀹℃牳鏂囦欢鍙楁帶")
@PostMapping("/checkManageDocumentControlled")
public Result checkManageDocumentControlled(ManageDocumentControlled manageDocumentControlled){
return Result.success(manageDocumentControlledService.checkManageDocumentControlled(manageDocumentControlled));
}
- @ValueAuth
+
@ApiOperation(value = "瀹℃牳鏌ョ湅闄勪欢")
@PostMapping("/checkManageDocumentControlledPdf")
public void checkManageDocumentControlledPdf(Long id, HttpServletResponse response)throws Exception {
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 fd583de..aecac08 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
@@ -1,14 +1,17 @@
package com.ruoyi.manage.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.CustomClazzName;
-import com.ruoyi.manage.annotation.ValueAuth;
-import com.ruoyi.manage.annotation.ValueClassify;
+
+import com.deepoove.poi.data.style.*;
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.dto.ManageDocumentIssueRecycleDto;
import com.ruoyi.manage.pojo.ManageDocumentIssueRecycle;
import com.ruoyi.manage.service.ManageDocumentIssueRecycleService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+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;
@@ -27,63 +30,56 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2024-11-09 09:18:24
*/
+@Api(tags = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@RestController
@RequestMapping("/manageDocumentIssueRecycle")
-@CustomClazzName(name = "浣撶郴绠＄悊瑕佹眰",index = 10)
public class ManageDocumentIssueRecycleController {
@Resource
private ManageDocumentIssueRecycleService manageDocumentIssueRecycleService;
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "鍒嗛〉鏌ヨ鏂囦欢鍙戞斁鍥炴敹")
@PostMapping("/pageManageDocumentIssueRecycle")
- public Result pageManageDocumentIssueRecycle(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- ManageDocumentIssueRecycleDto manageDocumentIssueRecycleDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageDocumentIssueRecycleDto.class);
+ public Result pageManageDocumentIssueRecycle(Page page,ManageDocumentIssueRecycleDto manageDocumentIssueRecycleDto) throws Exception {
return Result.success(manageDocumentIssueRecycleService.pageManageDocumentIssueRecycle(page, manageDocumentIssueRecycleDto));
}
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "鏂板鏂囦欢鍙戞斁鍥炴敹")
@PostMapping("/addManageDocumentIssueRecycle")
public Result addManageDocumentIssueRecycle(ManageDocumentIssueRecycle manageDocumentIssueRecycle){
return Result.success(manageDocumentIssueRecycleService.addManageDocumentIssueRecycle(manageDocumentIssueRecycle));
}
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "鍒犻櫎鏂囦欢鍙戞斁鍥炴敹")
@PostMapping("/delManageDocumentIssueRecycle")
public Result delManageDocumentIssueRecycle(Long id){
return Result.success(manageDocumentIssueRecycleService.delManageDocumentIssueRecycle(id));
}
- @ValueAuth
+
@ApiOperation(value = "鏌ョ湅鏂囦欢鍙戞斁鍥炴敹")
@PostMapping("/getManageDocumentIssueRecycle")
public Result getManageDocumentIssueRecycle(Long id){
return Result.success(manageDocumentIssueRecycleService.getManageDocumentIssueRecycle(id));
}
- @ValueAuth
+
@ApiOperation(value = "缂栬緫鏂囦欢鍙戞斁鍥炴敹")
@PostMapping("/doManageDocumentIssueRecycle")
public Result doManageDocumentIssueRecycle(ManageDocumentIssueRecycle manageDocumentIssueRecycle){
return Result.success(manageDocumentIssueRecycleService.doManageDocumentIssueRecycle(manageDocumentIssueRecycle));
}
- @ValueAuth
+
@ApiOperation(value = "瀹℃牳鏂囦欢鍙戞斁鍥炴敹")
@PostMapping("/checkManageDocumentIssueRecycle")
public Result checkManageDocumentIssueRecycle(Integer id,String documentState){
return Result.success(manageDocumentIssueRecycleService.checkManageDocumentIssueRecycle(id,documentState));
}
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "瀵煎嚭鏂囦欢鍙戞斁鍥炴敹")
@PostMapping("/exportManageDocumentIssueRecycle")
- public void exportManageDocumentIssueRecycle(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
- ManageDocumentIssueRecycleDto manageDocumentIssueRecycleDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageDocumentIssueRecycleDto.class);
+ public void exportManageDocumentIssueRecycle(ManageDocumentIssueRecycleDto manageDocumentIssueRecycleDto, HttpServletResponse response) throws Exception {
manageDocumentIssueRecycleService.exportManageDocumentIssueRecycle(manageDocumentIssueRecycleDto,response);
}
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 4cba7e9..0052446 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
@@ -2,13 +2,16 @@
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.CustomClazzName;
-import com.ruoyi.manage.annotation.ValueClassify;
+
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.excel.ManageDocumentListListener;
import com.ruoyi.manage.pojo.ManageDocumentList;
import com.ruoyi.manage.service.ManageDocumentListService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+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;
@@ -29,45 +32,38 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2024-11-08 11:08:11
*/
+@Api(tags = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@RestController
@RequestMapping("/manageDocumentList")
-@CustomClazzName(name = "浣撶郴绠＄悊瑕佹眰",index = 10)
public class ManageDocumentListController {
@Resource
private ManageDocumentListService manageDocumentListService;
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "鍒嗛〉鏌ヨ鏂囦欢娓呭崟")
@PostMapping("/pageManageDocumentList")
- public Result pageManageDocumentList(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- ManageDocumentList manageDocumentList = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageDocumentList.class);
+ public Result pageManageDocumentList(Page page,ManageDocumentList manageDocumentList) throws Exception {
return Result.success(manageDocumentListService.pageManageDocumentList(page, manageDocumentList));
}
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "缂栬緫鏂囦欢娓呭崟")
@PostMapping("/doManageDocumentList")
public Result doManageDocumentList(@RequestBody ManageDocumentList manageDocumentList) {
return Result.success(manageDocumentListService.updateById(manageDocumentList));
}
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "缂栬緫鏂囦欢娓呭崟")
@PostMapping("/delManageDocumentList")
public Result delManageDocumentList(Integer id) {
return Result.success(manageDocumentListService.removeById(id));
}
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "涓婁紶闄勪欢-鏂囦欢娓呭崟")
@PostMapping("/uploadFileManageDocumentList")
public Result uploadFileManageDocumentList(Integer id, MultipartFile file) {
return Result.success(manageDocumentListService.uploadFile(id,file));
}
- @ValueClassify(value = "绠＄悊浣撶郴鏂囦欢鐨勬帶鍒�")
@ApiOperation(value = "瀵煎叆鏂囦欢娓呭崟鍒楄〃")
@PostMapping("/exportManageDocumentList")
public Result exportManageDocumentList(MultipartFile file) {
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 23ee130..0725a34 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
@@ -2,10 +2,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.ValueClassify;
+
+import com.ruoyi.common.core.domain.Result;
import com.ruoyi.manage.dto.ManageMeetingDto;
import com.ruoyi.manage.service.ManageMeetingService;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -29,7 +30,6 @@
@Resource
private ManageMeetingService manageMeetingService;
- @ValueClassify(value = "绠＄悊璇勫浼氳璁板綍")
@ApiOperation(value = "绠＄悊璇勫浼氳璁板綍鏌ヨ")
@GetMapping("/getPageMeeting")
public Result<IPage<ManageMeetingDto>> getPageMeeting(Page page, String startTime, String endTime, String place) throws Exception {
@@ -37,7 +37,6 @@
return Result.success(ipage);
}
- @ValueClassify(value = "绠＄悊璇勫浼氳璁板綍")
@ApiOperation(value = "鏂板浼氳璁板綍")
@PostMapping("/addMeeting")
public Result addMeeting(@RequestBody ManageMeetingDto dto){
@@ -45,14 +44,12 @@
return Result.success();
}
- @ValueClassify(value = "绠＄悊璇勫浼氳璁板綍")
@ApiOperation(value = "缂栬緫浼氳璁板綍")
@PutMapping("/modifyMeeting")
public Result modifyMeeting(@RequestBody ManageMeetingDto manageMeetingDto){
return Result.success(manageMeetingService.modifyMeeting(manageMeetingDto));
}
- @ValueClassify(value = "绠＄悊璇勫浼氳璁板綍")
@ApiOperation(value = "鍒犻櫎浼氳璁板綍")
@DeleteMapping("/deleteMeeting")
public Result deleteMeeting(Integer id){
@@ -60,7 +57,6 @@
}
- @ValueClassify(value = "绠＄悊璇勫浼氳璁板綍")
@ApiOperation(value = "涓嬭浇浼氳璁板綍")
@PostMapping("/exportMeeting")
public void exportMeeting(Integer id, HttpServletResponse 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 36e638e..eb08a35 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
@@ -1,10 +1,11 @@
package com.ruoyi.manage.controller;
-import com.ruoyi.manage.annotation.ValueClassify;
+
+import com.ruoyi.common.core.domain.Result;
import com.ruoyi.manage.pojo.ManageMeetingParticipants;
import com.ruoyi.manage.service.ManageMeetingParticipantsService;
import com.ruoyi.manage.vo.MeetingParticipantsDetailsVo;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -29,14 +30,12 @@
private ManageMeetingParticipantsService manageMeetingParticipantsService;
- @ValueClassify(value = "绠＄悊璇勫浼氳璁板綍鍙備細浜哄憳")
@ApiOperation(value = "鏌ヨ浼氳璁板綍鍙備細浜哄憳")
@GetMapping("/getParticipants")
public Result<MeetingParticipantsDetailsVo> getParticipants(Integer id){
return Result.success(manageMeetingParticipantsService.getParticipants(id));
}
- @ValueClassify(value = "绠＄悊璇勫浼氳璁板綍鍙備細浜哄憳")
@ApiOperation(value = "鏂板浼氳璁板綍鍙備細浜哄憳")
@PostMapping("/add")
public Result addParticipants(List<ManageMeetingParticipants> list){
@@ -44,7 +43,6 @@
return Result.success();
}
- @ValueClassify(value = "绠＄悊璇勫浼氳璁板綍鍙備細浜哄憳")
@ApiOperation(value = "鍒犻櫎浼氳璁板綍鍙備細浜哄憳")
@DeleteMapping("/delete")
public Result deleteParticipants(List<Integer> ids){
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 e814459..afc086a 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
@@ -1,13 +1,16 @@
package com.ruoyi.manage.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.CustomClazzName;
-import com.ruoyi.manage.annotation.ValueAuth;
-import com.ruoyi.manage.annotation.ValueClassify;
+
+import com.deepoove.poi.data.style.*;
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.pojo.ManageRecordAudit;
import com.ruoyi.manage.service.ManageRecordAuditService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+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;
@@ -26,74 +29,63 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2024-11-14 10:29:18
*/
+@Api(tags = "璁板綍鐨勬帶鍒�")
@RestController
@RequestMapping("/manageRecordAudit")
-@CustomClazzName(name = "浣撶郴绠＄悊瑕佹眰", index = 10)
public class ManageRecordAuditController {
@Resource
private ManageRecordAuditService manageRecordAuditService;
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鍒嗛〉鏌ヨ鏂囦欢淇鐢宠瀹℃壒璁板綍")
@PostMapping("/pageManageRecordAudit")
- public Result pageManageRecordAudit(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- ManageRecordAudit manageRecordAudit = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordAudit.class);
+ public Result pageManageRecordAudit(Page page,ManageRecordAudit manageRecordAudit) throws Exception {
return Result.success(manageRecordAuditService.pageManageRecordAudit(page, manageRecordAudit));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鏂板鏂囦欢淇鐢宠瀹℃壒璁板綍")
@PostMapping("/addManageRecordAudit")
public Result addManageRecordAudit( ManageRecordAudit manageRecordAudit){
return Result.success(manageRecordAuditService.addManageRecordAudit(manageRecordAudit));
}
- @ValueAuth
+
@ApiOperation(value = "缂栬緫鏂囦欢淇鐢宠瀹℃壒璁板綍")
@PostMapping("/doManageRecordAudit")
public Result doManageRecordAudit(ManageRecordAudit manageRecordAudit){
return Result.success(manageRecordAuditService.doManageRecordAudit(manageRecordAudit));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鍒犻櫎鏂囦欢淇鐢宠瀹℃壒璁板綍")
@PostMapping("/delManageRecordAudit")
public Result delManageRecordAudit(Integer id){
return Result.success(manageRecordAuditService.removeById(id));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鎵瑰噯鏂囦欢淇鐢宠瀹℃壒璁板綍")
@PostMapping("/ratifyManageRecordAudit")
public Result ratifyManageRecordAudit(Integer id){
return Result.success(manageRecordAuditService.ratifyManageRecordAudit(id));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鐢宠閮ㄩ棬涓荤鎰忚鏂囦欢淇鐢宠瀹℃壒璁板綍")
@PostMapping("/manageRecordAudit1")
public void manageRecordAudit1(){
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鍘熷埗瀹氶儴闂ㄦ剰瑙佹枃浠朵慨璁㈢敵璇峰鎵硅褰�")
@PostMapping("/manageRecordAudit2")
public void manageRecordAudit2(){
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鍘熷鏍搁儴闂ㄦ剰瑙佹枃浠朵慨璁㈢敵璇峰鎵硅褰�")
@PostMapping("/manageRecordAudit3")
public void manageRecordAudit3(){
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "瀵煎嚭鏂囦欢淇鐢宠瀹℃壒璁板綍")
@PostMapping("/exportOutManageRecordAudit")
- public Result exportOutManageRecordAudit(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
- ManageRecordAudit manageRecordAudit = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordAudit.class);
+ public Result exportOutManageRecordAudit(ManageRecordAudit manageRecordAudit, HttpServletResponse response) throws Exception {
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 41b164a..d970e87 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
@@ -1,13 +1,16 @@
package com.ruoyi.manage.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.CustomClazzName;
-import com.ruoyi.manage.annotation.ValueAuth;
-import com.ruoyi.manage.annotation.ValueClassify;
+
+import com.deepoove.poi.data.style.*;
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.pojo.ManageRecordCancel;
import com.ruoyi.manage.service.ManageRecordCancelService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+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;
@@ -28,24 +31,20 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2024-11-13 01:27:22
*/
+@Api(tags = "璁板綍鐨勬帶鍒�")
@RestController
@RequestMapping("/manageRecordCancel")
-@CustomClazzName(name = "浣撶郴绠＄悊瑕佹眰", index = 10)
public class ManageRecordCancelController {
@Resource
private ManageRecordCancelService manageRecordCancelService;
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鍒嗛〉鏌ヨ浣滃簾鏂囦欢閿�姣佽褰�")
@PostMapping("/pageManageRecordCancel")
- public Result pageManageRecordCancel(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- ManageRecordCancel manageRecordCancel = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordCancel.class);
+ public Result pageManageRecordCancel(Page page,ManageRecordCancel manageRecordCancel) throws Exception {
return Result.success(manageRecordCancelService.pageManageRecordCancel(page, manageRecordCancel));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鏂板浣滃簾鏂囦欢閿�姣佽褰�")
@PostMapping("/addManageRecordCancel")
public Result addManageRecordCancel(@RequestBody ManageRecordCancel manageRecordCancel){
@@ -53,36 +52,31 @@
return Result.success(manageRecordCancelService.save(manageRecordCancel));
}
- @ValueAuth
+
@ApiOperation(value = "缂栬緫浣滃簾鏂囦欢閿�姣佽褰�")
@PostMapping("/doManageRecordCancel")
public Result doManageRecordCancel(@RequestBody ManageRecordCancel manageRecordCancel){
return Result.success(manageRecordCancelService.updateById(manageRecordCancel));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鍒犻櫎浣滃簾鏂囦欢閿�姣佽褰�")
@PostMapping("/delManageRecordCancel")
public Result delManageRecordCancel(Integer id){
return Result.success(manageRecordCancelService.removeById(id));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鎵瑰噯浣滃簾鏂囦欢閿�姣佽褰�")
@PostMapping("/ratifyManageRecordCancel")
public Result ratifyManageRecordCancel(Integer id,String ratifyState){
return Result.success(manageRecordCancelService.ratifyManageRecordCancel(id,ratifyState));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "瀵煎嚭浣滃簾鏂囦欢閿�姣佽褰�")
@PostMapping("/exportOutManageRecordCancel")
- public Result exportOutManageRecordCancel(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
- ManageRecordCancel manageRecordCancel = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordCancel.class);
+ public Result exportOutManageRecordCancel(ManageRecordCancel manageRecordCancel, HttpServletResponse response) throws Exception {
return Result.success(manageRecordCancelService.exportOutManageRecordCancel(manageRecordCancel,response));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "瀵煎叆浣滃簾鏂囦欢閿�姣佽褰�")
@PostMapping("/exportInManageRecordCancel")
public Result exportInManageRecordCancel(MultipartFile file){
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 ebd7253..716369f 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
@@ -1,13 +1,16 @@
package com.ruoyi.manage.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.CustomClazzName;
-import com.ruoyi.manage.annotation.ValueAuth;
-import com.ruoyi.manage.annotation.ValueClassify;
+
+import com.deepoove.poi.data.style.*;
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.pojo.ManageRecordCheck;
import com.ruoyi.manage.service.ManageRecordCheckService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+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;
@@ -27,67 +30,57 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2024-11-12 02:31:36
*/
+@Api(tags = "璁板綍鐨勬帶鍒�")
@RestController
@RequestMapping("/manageRecordCheck")
-@CustomClazzName(name = "浣撶郴绠＄悊瑕佹眰", index = 10)
public class ManageRecordCheckController {
@Resource
private ManageRecordCheckService manageRecordCheckService;
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鍒嗛〉鏌ヨ鏂囦欢瀹℃壒璁板綍")
@PostMapping("/pageManageRecordCheck")
- public Result pageManageRecordCheck(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- ManageRecordCheck manageRecordCheck = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordCheck.class);
+ public Result pageManageRecordCheck(Page page,ManageRecordCheck manageRecordCheck) throws Exception {
return Result.success(manageRecordCheckService.pageManageRecordCheck(page, manageRecordCheck));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鏂板鏂囦欢瀹℃壒璁板綍")
@PostMapping("/addManageRecordCheck")
public Result addManageRecordCheck(@RequestBody ManageRecordCheck manageRecordCheck) {
return Result.success(manageRecordCheckService.save(manageRecordCheck));
}
- @ValueAuth
+
@ApiOperation(value = "缂栬緫鏂囦欢瀹℃壒璁板綍")
@PostMapping("/doManageRecordCheck")
public Result doManageRecordCheck(@RequestBody ManageRecordCheck manageRecordCheck) {
return Result.success(manageRecordCheckService.updateById(manageRecordCheck));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鍒犻櫎鏂囦欢瀹℃壒璁板綍")
@PostMapping("/delManageRecordCheck")
public Result delManageRecordCheck(Integer id) {
return Result.success(manageRecordCheckService.removeById(id));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "瀹℃牳鏂囦欢瀹℃壒璁板綍")
@PostMapping("/checkManageRecordCheck")
public Result checkManageRecordCheck(Integer id,String checkState) {
return Result.success(manageRecordCheckService.checkManageRecordCheck(id,checkState));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鎵瑰噯鏂囦欢瀹℃壒璁板綍")
@PostMapping("/ratifyManageRecordCheck")
public Result ratifyManageRecordCheck(Integer id,String ratifyState) {
return Result.success(manageRecordCheckService.ratifyManageRecordCheck(id,ratifyState));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "瀵煎嚭鏂囦欢瀹℃壒璁板綍")
@PostMapping("/exportOutManageRecordCheck")
- public Result exportOutManageRecordCheck(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
- ManageRecordCheck manageRecordCheck = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordCheck.class);
+ public Result exportOutManageRecordCheck(ManageRecordCheck manageRecordCheck, HttpServletResponse response) throws Exception {
return Result.success(manageRecordCheckService.exportOutManageRecordCheck(manageRecordCheck,response));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "瀵煎叆鏂囦欢瀹℃壒璁板綍")
@PostMapping("/exportInManageRecordCheck")
public Result exportInManageRecordCheck(MultipartFile file){
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 f398a4a..faf687e 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
@@ -1,13 +1,16 @@
package com.ruoyi.manage.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.CustomClazzName;
-import com.ruoyi.manage.annotation.ValueAuth;
-import com.ruoyi.manage.annotation.ValueClassify;
+
+import com.deepoove.poi.data.style.*;
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.pojo.ManageRecordIntervals;
import com.ruoyi.manage.service.ManageRecordIntervalsService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+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;
@@ -27,53 +30,45 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2024-11-13 10:54:31
*/
+@Api(tags = "璁板綍鐨勬帶鍒�")
@RestController
@RequestMapping("/manageRecordIntervals")
-@CustomClazzName(name = "浣撶郴绠＄悊瑕佹眰", index = 10)
public class ManageRecordIntervalsController {
@Resource
private ManageRecordIntervalsService manageRecordIntervalsService;
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鍒嗛〉鏌ヨ鏂囦欢瀹氭湡瀹℃煡璁板綍")
@PostMapping("/pageManageRecordIntervals")
- public Result pageManageRecordIntervals(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- ManageRecordIntervals manageRecordIntervals = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordIntervals.class);
+ public Result pageManageRecordIntervals(Page page,ManageRecordIntervals manageRecordIntervals) throws Exception {
return Result.success(manageRecordIntervalsService.pageManageRecordIntervals(page, manageRecordIntervals));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鏂板鏂囦欢瀹氭湡瀹℃煡璁板綍")
@PostMapping("/addManageRecordIntervals")
public Result addManageRecordIntervals(@RequestBody ManageRecordIntervals manageRecordIntervals) {
return Result.success(manageRecordIntervalsService.addManageRecordIntervals(manageRecordIntervals));
}
- @ValueAuth
+
@ApiOperation(value = "缂栬緫鏂囦欢瀹氭湡瀹℃煡璁板綍")
@PostMapping("/doManageRecordIntervals")
public Result doManageRecordIntervals(@RequestBody ManageRecordIntervals manageRecordIntervals) {
return Result.success(manageRecordIntervalsService.updateById(manageRecordIntervals));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鍒犻櫎鏂囦欢瀹氭湡瀹℃煡璁板綍")
@PostMapping("/delManageRecordIntervals")
public Result delManageRecordIntervals(Integer id) {
return Result.success(manageRecordIntervalsService.delManageRecordIntervals(id));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "瀵煎嚭鏂囦欢瀹氭湡瀹℃煡璁板綍")
@PostMapping("/exportOutManageRecordIntervals")
- public Result exportOutManageRecordIntervals(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
- ManageRecordIntervals manageRecordIntervals = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordIntervals.class);
+ public Result exportOutManageRecordIntervals(ManageRecordIntervals manageRecordIntervals, HttpServletResponse response) throws Exception {
return Result.success(manageRecordIntervalsService.exportOutManageRecordIntervals(manageRecordIntervals,response));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "瀵煎叆鏂囦欢瀹氭湡瀹℃煡璁板綍")
@PostMapping("/exportInManageRecordIntervals")
public Result exportInManageRecordIntervals(MultipartFile file){
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 e75a765..34f4786 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
@@ -1,12 +1,15 @@
package com.ruoyi.manage.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.CustomClazzName;
-import com.ruoyi.manage.annotation.ValueClassify;
+
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.pojo.ManageRecordIntervalsTotal;
import com.ruoyi.manage.service.ManageRecordIntervalsTotalService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+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;
@@ -24,31 +27,26 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2024-11-15 01:12:11
*/
+@Api(tags = "璁板綍鐨勬帶鍒�")
@RestController
@RequestMapping("/manageRecordIntervalsTotal")
-@CustomClazzName(name = "浣撶郴绠＄悊瑕佹眰", index = 10)
public class ManageRecordIntervalsTotalController {
@Resource
private ManageRecordIntervalsTotalService manageRecordIntervalsTotalService;
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鏌ヨ鏂囦欢瀹氭湡瀹℃煡璁板綍鍘嗗彶鍒楄〃")
@PostMapping("/pageManageRecordIntervalsTotal")
- public Result pageManageRecordIntervalsTotal(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- ManageRecordIntervalsTotal manageRecordIntervalsTotal = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordIntervalsTotal.class);
+ public Result pageManageRecordIntervalsTotal(Page page,ManageRecordIntervalsTotal manageRecordIntervalsTotal) throws Exception {
return Result.success(manageRecordIntervalsTotalService.pageManageRecordIntervalsTotal(page, manageRecordIntervalsTotal));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鎻愪氦鏂囦欢瀹氭湡瀹℃煡璁板綍鍘嗗彶鍒楄〃")
@PostMapping("/submitManageRecordIntervalsTotal")
public Result submitManageRecordIntervalsTotal(Integer id) {
return Result.success(manageRecordIntervalsTotalService.submitManageRecordIntervalsTotal(id));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鎵瑰噯鏂囦欢瀹氭湡瀹℃煡璁板綍鍘嗗彶鍒楄〃")
@PostMapping("/ratifyManageRecordIntervalsTotal")
public Result ratifyManageRecordIntervalsTotal(Integer id, String 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 37ce175..d66f439 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
@@ -1,13 +1,16 @@
package com.ruoyi.manage.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.CustomClazzName;
-import com.ruoyi.manage.annotation.ValueAuth;
-import com.ruoyi.manage.annotation.ValueClassify;
+
+import com.deepoove.poi.data.style.*;
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.pojo.ManageRecordIssueRecycle;
import com.ruoyi.manage.service.ManageRecordIssueRecycleService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+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;
@@ -27,45 +30,39 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2024-11-13 09:11:05
*/
+@Api(tags = "璁板綍鐨勬帶鍒�")
@RestController
@RequestMapping("/manageRecordIssueRecycle")
-@CustomClazzName(name = "浣撶郴绠＄悊瑕佹眰", index = 10)
public class ManageRecordIssueRecycleController {
@Resource
private ManageRecordIssueRecycleService manageRecordIssueRecycleService;
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鍒嗛〉鏌ヨ鎵�鏈夋枃浠剁殑鍙戞斁涓庡洖鏀惰褰�")
@PostMapping("/pageManageRecordIssueRecycle")
- public Result pageManageRecordIssueRecycle(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- ManageRecordIssueRecycle manageRecordIssueRecycle = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordIssueRecycle.class);
+ public Result pageManageRecordIssueRecycle(Page page,ManageRecordIssueRecycle manageRecordIssueRecycle) throws Exception {
return Result.success(manageRecordIssueRecycleService.pageManageRecordIssueRecycle(page, manageRecordIssueRecycle));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鍒犻櫎鎵�鏈夋枃浠剁殑鍙戞斁涓庡洖鏀惰褰�")
@PostMapping("/delManageRecordIssueRecycle")
public Result delManageRecordIssueRecycle(Integer id){
return Result.success(manageRecordIssueRecycleService.removeById(id));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鏂板鎵�鏈夋枃浠剁殑鍙戞斁涓庡洖鏀惰褰�")
@PostMapping("/addManageRecordIssueRecycle")
public Result addManageRecordIssueRecycle(@RequestBody ManageRecordIssueRecycle manageRecordIssueRecycle){
return Result.success(manageRecordIssueRecycleService.addManageRecordIssueRecycle(manageRecordIssueRecycle));
}
- @ValueAuth
+
@ApiOperation(value = "缂栬緫鎵�鏈夋枃浠剁殑鍙戞斁涓庡洖鏀惰褰�")
@PostMapping("/doManageRecordIssueRecycle")
public Result doManageRecordIssueRecycle(@RequestBody ManageRecordIssueRecycle manageRecordIssueRecycle){
return Result.success(manageRecordIssueRecycleService.doManageRecordIssueRecycle(manageRecordIssueRecycle));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "瀵煎嚭鎵�鏈夋枃浠剁殑鍙戞斁涓庡洖鏀惰褰�")
@PostMapping("/exportOutManageRecordIssueRecycle")
public Result exportOutManageRecordIssueRecycle(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
@@ -73,7 +70,6 @@
return Result.success(manageRecordIssueRecycleService.exportOutManageRecordIssueRecycle(manageRecordIssueRecycle,response));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "瀵煎叆鎵�鏈夋枃浠剁殑鍙戞斁涓庡洖鏀惰褰�")
@PostMapping("/exportInManageRecordIssueRecycle")
public Result exportInManageRecordIssueRecycle(MultipartFile file){
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 25a950e..b9c6820 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
@@ -1,12 +1,15 @@
package com.ruoyi.manage.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.CustomClazzName;
-import com.ruoyi.manage.annotation.ValueClassify;
+
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.pojo.ManageRecordTotal;
import com.ruoyi.manage.service.ManageRecordTotalService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+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;
@@ -24,31 +27,26 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2024-11-12 10:30:08
*/
+@Api(tags = "璁板綍鐨勬帶鍒�")
@RestController
@RequestMapping("/manageRecordTotal")
-@CustomClazzName(name = "浣撶郴绠＄悊瑕佹眰", index = 10)
public class ManageRecordTotalController {
@Resource
private ManageRecordTotalService manageRecordTotalService;
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鏌ヨ澶栨潵鏂囦欢纭璁板綍鍘嗗彶鍒楄〃")
@PostMapping("/pageManageRecordTotal")
- public Result pageManageRecordTotal(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- ManageRecordTotal manageRecordTotal = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordTotal.class);
+ public Result pageManageRecordTotal(Page page,ManageRecordTotal manageRecordTotal) throws Exception {
return Result.success(manageRecordTotalService.pageManageRecordTotal(page, manageRecordTotal));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鎻愪氦澶栨潵鏂囦欢纭璁板綍鍘嗗彶鍒楄〃")
@PostMapping("/submitManageRecordTotal")
public Result submitManageRecordTotal(Integer id) {
return Result.success(manageRecordTotalService.submitManageRecordTotal(id));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鎵瑰噯澶栨潵鏂囦欢纭璁板綍鍘嗗彶鍒楄〃")
@PostMapping("/ratifyManageRecordTotal")
public Result ratifyManageRecordTotal(Integer id, String 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 cb004cf..a46509c 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
@@ -1,13 +1,16 @@
package com.ruoyi.manage.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.CustomClazzName;
-import com.ruoyi.manage.annotation.ValueAuth;
-import com.ruoyi.manage.annotation.ValueClassify;
+
+import com.deepoove.poi.data.style.*;
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.pojo.ManageRecordVerify;
import com.ruoyi.manage.service.ManageRecordVerifyService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+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;
@@ -26,45 +29,40 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2024-11-12 10:29:44
*/
+@Api(tags = "璁板綍鐨勬帶鍒�")
@RestController
@RequestMapping("/manageRecordVerify")
-@CustomClazzName(name = "浣撶郴绠＄悊瑕佹眰", index = 10)
public class ManageRecordVerifyController {
@Resource
private ManageRecordVerifyService manageRecordVerifyService;
- @ValueAuth
+
@ApiOperation(value = "鏌ヨ澶栨潵鏂囦欢纭璁板綍璇︽儏")
@PostMapping("/pageManageRecordVerify")
- public Result pageManageRecordVerify(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- ManageRecordVerify manageRecordVerify = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordVerify.class);
+ public Result pageManageRecordVerify(Page page,ManageRecordVerify manageRecordVerify) throws Exception {
return Result.success(manageRecordVerifyService.pageManageRecordVerify(page, manageRecordVerify));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鏂板澶栨潵鏂囦欢纭璁板綍")
@PostMapping("/addManageRecordVerify")
public Result addManageRecordVerify(@RequestBody ManageRecordVerify manageRecordVerify) {
return Result.success(manageRecordVerifyService.addManageRecordVerify(manageRecordVerify));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鍒犻櫎澶栨潵鏂囦欢纭璁板綍")
@PostMapping("/delManageRecordVerify")
public Result delManageRecordVerify(Integer id) {
return Result.success(manageRecordVerifyService.delManageRecordVerify(id));
}
- @ValueAuth
+
@ApiOperation(value = "淇敼澶栨潵鏂囦欢纭璁板綍")
@PostMapping("/doManageRecordVerify")
public Result doManageRecordVerify(@RequestBody ManageRecordVerify manageRecordVerify) {
return Result.success(manageRecordVerifyService.updateById(manageRecordVerify));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "瀵煎叆澶栨潵鏂囦欢纭璁板綍")
@PostMapping("/exportManageRecordVerify")
public Result exportManageRecordVerify(MultipartFile file) {
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 31584dc..56212f2 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
@@ -2,10 +2,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.ValueClassify;
+
+import com.ruoyi.common.core.domain.Result;
import com.ruoyi.manage.pojo.ManageReviewProgram;
import com.ruoyi.manage.service.ManageReviewProgramService;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -29,7 +30,6 @@
private ManageReviewProgramService manageReviewProgramService;
- @ValueClassify(value = "绠＄悊璇勫璁″垝")
@ApiOperation(value = "鏌ヨ璇勫璁″垝")
@GetMapping("/getPageReviewProgram")
public Result<IPage<ManageReviewProgram>> getPageReviewProgram(Page page, String startTime,String endTime, String judgingLocation) throws Exception {
@@ -38,21 +38,18 @@
}
- @ValueClassify(value = "绠＄悊璇勫璁″垝")
@ApiOperation(value = "鏂板璇勫璁″垝")
@PostMapping("/addReviewProgram")
public Result addReviewProgram(@RequestBody ManageReviewProgram manageReviewProgram){
return Result.success(manageReviewProgramService.addReviewProgram(manageReviewProgram));
}
- @ValueClassify(value = "绠＄悊璇勫璁″垝")
@ApiOperation(value = "缂栬緫璇勫璁″垝")
@PutMapping("/modifyReviewProgram")
public Result modifyReviewProgram(@RequestBody ManageReviewProgram manageReviewProgram){
return Result.success(manageReviewProgramService.updateById(manageReviewProgram));
}
- @ValueClassify(value = "绠＄悊璇勫璁″垝")
@ApiOperation(value = "鍒犻櫎璇勫璁″垝")
@DeleteMapping("/deleteReviewProgram")
public Result deleteReviewProgram( Integer id){
@@ -60,7 +57,6 @@
}
- @ValueClassify(value = "绠＄悊璇勫璁″垝")
@ApiOperation(value = "涓嬭浇璇勫璁″垝")
@PostMapping("/exportReviewProgram")
public void exportReviewProgram(Integer id, HttpServletResponse response){
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramFileController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramFileController.java
index 77d9105..3b9dfc0 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramFileController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageReviewProgramFileController.java
@@ -1,8 +1,10 @@
package com.ruoyi.manage.controller;
-import com.ruoyi.manage.annotation.ValueClassify;
+
+import com.ruoyi.common.core.domain.Result;
import com.ruoyi.manage.service.ManageReviewProgramFileService;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -20,6 +22,7 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2024-11-09 04:15:47
*/
+@Api(tags = "绠＄悊璇勫璁″垝鏂囦欢")
@RestController
@RequestMapping("/manageReviewProgramFile")
public class ManageReviewProgramFileController {
@@ -27,7 +30,6 @@
@Resource
private ManageReviewProgramFileService manageReviewProgramFileService;
- @ValueClassify(value = "绠＄悊璇勫璁″垝鏂囦欢")
@ApiOperation(value = "鏌ヨ璇勫璁″垝鏂囦欢")
@GetMapping("/selectReviewProgramFile")
public Result selectReviewProgramFile(Integer id){
@@ -35,7 +37,6 @@
}
- @ValueClassify(value = "绠＄悊璇勫璁″垝鏂囦欢")
@ApiOperation(value = "鏂板璇勫璁″垝鏂囦欢")
@PostMapping("/addReviewProgramFile")
public Result addReviewProgramFile(MultipartFile file,Integer id){
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 47340bb..7dbb09f 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
@@ -2,10 +2,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.ValueClassify;
+
+import com.ruoyi.common.core.domain.Result;
import com.ruoyi.manage.pojo.ManageReviewReport;
import com.ruoyi.manage.service.ManageReviewReportService;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -29,7 +30,6 @@
@Resource
private ManageReviewReportService manageReviewReportService;
- @ValueClassify(value = "绠＄悊璇勫鎶ュ憡")
@ApiOperation(value = "鏌ヨ绠＄悊璇勫鎶ュ憡")
@GetMapping("/getPageReviewReport")
public Result<IPage<ManageReviewReport>> getPageReviewReport(Page page, String startTime, String endTime, String place) {
@@ -37,28 +37,24 @@
return Result.success(ipage);
}
- @ValueClassify(value = "绠＄悊璇勫鎶ュ憡")
@ApiOperation(value = "鏂板绠＄悊璇勫鎶ュ憡")
@PostMapping("/addReviewReport")
public Result addReviewReport(@RequestBody ManageReviewReport manageReviewReport){
return Result.success(manageReviewReportService.save(manageReviewReport));
}
- @ValueClassify(value = "绠＄悊璇勫鎶ュ憡")
@ApiOperation(value = "缂栬緫绠＄悊璇勫鎶ュ憡")
@PutMapping("/modifyReviewReport")
public Result modifyReviewReport(@RequestBody ManageReviewReport manageReviewReport){
return Result.success(manageReviewReportService.updateById(manageReviewReport));
}
- @ValueClassify(value = "绠＄悊璇勫鎶ュ憡")
@ApiOperation(value = "鍒犻櫎绠＄悊璇勫鎶ュ憡")
@DeleteMapping("/deleteReviewReport")
public Result deleteReviewReport(Integer id){
return Result.success(manageReviewReportService.removeById(id));
}
- @ValueClassify(value = "绠＄悊璇勫鎶ュ憡")
@ApiOperation(value = "涓嬭浇绠＄悊璇勫鎶ュ憡")
@PostMapping("/exportReviewReport")
public void exportReviewReport(Integer id , HttpServletResponse 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 e0ca2bd..e71c7ec 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
@@ -6,15 +6,16 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.ValueAuth;
-import com.ruoyi.manage.annotation.ValueClassify;
+import com.deepoove.poi.data.style.*;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.manage.pojo.ManageRiskAssessmentResults;
import com.ruoyi.manage.service.ManageRiskAssessmentResultsService;
-import com.ruoyi.manage.utils.MyUtil;
import com.ruoyi.manage.vo.ManageRiskAssessmentResultsVo;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,12 +41,11 @@
public class ManageRiskAssessmentResultsController {
@Autowired
-
+
@Resource
private ManageRiskAssessmentResultsService manageRiskAssessmentResultsService;
- @ValueClassify(value = "鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙�")
@ApiOperation(value = "鍒嗛〉鏌ヨ")
@GetMapping("/getPageResults")
public Result<IPage<ManageRiskAssessmentResultsVo>> getPageResults(Page page) {
@@ -53,7 +53,6 @@
return Result.success(ipage);
}
- @ValueClassify(value = "鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙�")
@ApiOperation(value = "鎵瑰噯")
@GetMapping("/hazardIdentificationAndRiskApproval")
public Result<?> hazardIdentificationAndRiskApproval(Integer approve, Integer status) {
@@ -64,7 +63,6 @@
return Result.success();
}
- @ValueClassify(value = "鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙�")
@ApiOperation(value = "瀹℃壒")
@GetMapping("/dangerousRiskApproval")
public Result<?> dangerousRiskApproval(Integer approval, Integer status) {
@@ -75,11 +73,10 @@
return Result.success();
}
- @ValueClassify(value = "鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙�")
@ApiOperation(value = "瀵煎叆")
@PostMapping("/riskAssessmentImport")
public void riskAssessmentImport(MultipartFile file) throws IOException {
- boolean excelFile = MyUtil.isExcelFile(file);
+ boolean excelFile = isExcelFile(file);
if (!excelFile) {
throw new ErrorException("璇峰鍏xcel鏂囦欢锛�");
}
@@ -95,7 +92,6 @@
})).extraRead(CellExtraTypeEnum.MERGE).sheet().doRead();
}
- @ValueClassify(value = "鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙�")
@ApiOperation(value = "鏂板")
@PostMapping("/addNewRiskFactors")
public void addNewRiskFactors(@RequestBody ManageRiskAssessmentResults manageRiskAssessmentResults) {
@@ -105,17 +101,32 @@
manageRiskAssessmentResultsService.saveOrUpdate(manageRiskAssessmentResults);
}
- @ValueClassify(value = "鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙�")
@ApiOperation(value = "鍒犻櫎")
@GetMapping("/removeRiskFactors")
public void removeRiskFactors(Integer id) {
manageRiskAssessmentResultsService.removeById(id);
}
- @ValueAuth
+
@ApiOperation(value = "瀵煎嚭鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙�")
@GetMapping("/exportHazardFactorIdentification")
public void exportPersonTraining(HttpServletResponse response){
manageRiskAssessmentResultsService.exportPersonTraining(response);
}
+
+ public static boolean isExcelFile(MultipartFile file) {
+ if (file.isEmpty()) {
+ return false;
+ }
+ String originalFilename = file.getOriginalFilename();
+ if (originalFilename == null) {
+ return false;
+ }
+ String[] parts = originalFilename.split("\\.");
+ if (parts.length == 0) {
+ return false;
+ }
+ String fileExtension = parts[parts.length - 1].toLowerCase();
+ return fileExtension.equals("xls") || fileExtension.equals("xlsx");
+ }
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordAuditService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordAuditService.java
index c50d66a..1154b05 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordAuditService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordAuditService.java
@@ -1,5 +1,6 @@
package com.ruoyi.manage.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.manage.pojo.ManageRecordAudit;
@@ -17,7 +18,7 @@
*/
public interface ManageRecordAuditService extends IService<ManageRecordAudit> {
- Map<String,Object> pageManageRecordAudit(Page page, ManageRecordAudit manageRecordAudit);
+ IPage<ManageRecordAudit> pageManageRecordAudit(Page page, ManageRecordAudit manageRecordAudit);
int addManageRecordAudit(ManageRecordAudit manageRecordAudit);
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCancelService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCancelService.java
index 9d851af..3d5b4ff 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCancelService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCancelService.java
@@ -1,5 +1,6 @@
package com.ruoyi.manage.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.manage.pojo.ManageRecordCancel;
@@ -18,7 +19,7 @@
*/
public interface ManageRecordCancelService extends IService<ManageRecordCancel> {
- Map<String,Object> pageManageRecordCancel(Page page, ManageRecordCancel manageRecordCancel);
+ IPage<ManageRecordCancel> pageManageRecordCancel(Page page, ManageRecordCancel manageRecordCancel);
int ratifyManageRecordCancel(Integer id, String ratifyState);
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCheckService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCheckService.java
index e30b610..78a0bc1 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCheckService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordCheckService.java
@@ -1,5 +1,6 @@
package com.ruoyi.manage.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.manage.pojo.ManageRecordCheck;
@@ -18,7 +19,7 @@
*/
public interface ManageRecordCheckService extends IService<ManageRecordCheck> {
- Map<String,Object> pageManageRecordCheck(Page page, ManageRecordCheck manageRecordCheck);
+ IPage<ManageRecordCheck> pageManageRecordCheck(Page page, ManageRecordCheck manageRecordCheck);
int checkManageRecordCheck(Integer id, String checkState);
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsService.java
index caaa404..a09519a 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsService.java
@@ -1,5 +1,6 @@
package com.ruoyi.manage.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.manage.pojo.ManageRecordIntervals;
@@ -18,7 +19,7 @@
*/
public interface ManageRecordIntervalsService extends IService<ManageRecordIntervals> {
- Map<String,Object> pageManageRecordIntervals(Page page, ManageRecordIntervals manageRecordIntervals);
+ IPage<ManageRecordIntervals> pageManageRecordIntervals(Page page, ManageRecordIntervals manageRecordIntervals);
String exportOutManageRecordIntervals(ManageRecordIntervals manageRecordIntervals, HttpServletResponse response);
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsTotalService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsTotalService.java
index 8662bb6..bfa40ee 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsTotalService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIntervalsTotalService.java
@@ -1,5 +1,6 @@
package com.ruoyi.manage.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.manage.pojo.ManageRecordIntervalsTotal;
@@ -16,7 +17,7 @@
*/
public interface ManageRecordIntervalsTotalService extends IService<ManageRecordIntervalsTotal> {
- Map<String,Object> pageManageRecordIntervalsTotal(Page page, ManageRecordIntervalsTotal manageRecordIntervalsTotal);
+ IPage<ManageRecordIntervalsTotal> pageManageRecordIntervalsTotal(Page page, ManageRecordIntervalsTotal manageRecordIntervalsTotal);
int submitManageRecordIntervalsTotal(Integer id);
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIssueRecycleService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIssueRecycleService.java
index 47f9886..66cd965 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIssueRecycleService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordIssueRecycleService.java
@@ -1,5 +1,6 @@
package com.ruoyi.manage.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.manage.pojo.ManageRecordIssueRecycle;
@@ -18,7 +19,7 @@
*/
public interface ManageRecordIssueRecycleService extends IService<ManageRecordIssueRecycle> {
- Map<String,Object> pageManageRecordIssueRecycle(Page page, ManageRecordIssueRecycle manageRecordIssueRecycle);
+ IPage<ManageRecordIssueRecycle> pageManageRecordIssueRecycle(Page page, ManageRecordIssueRecycle manageRecordIssueRecycle);
String exportOutManageRecordIssueRecycle(ManageRecordIssueRecycle manageRecordIssueRecycle, HttpServletResponse response);
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordTotalService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordTotalService.java
index 35c5fef..c757186 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordTotalService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordTotalService.java
@@ -1,5 +1,6 @@
package com.ruoyi.manage.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.manage.pojo.ManageRecordTotal;
@@ -16,7 +17,7 @@
*/
public interface ManageRecordTotalService extends IService<ManageRecordTotal> {
- Map<String,Object> pageManageRecordTotal(Page page, ManageRecordTotal manageRecordTotal);
+ IPage<ManageRecordTotal> pageManageRecordTotal(Page page, ManageRecordTotal manageRecordTotal);
int submitManageRecordTotal(Integer id);
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordVerifyService.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordVerifyService.java
index dd6e386..eb195f1 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordVerifyService.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/ManageRecordVerifyService.java
@@ -1,5 +1,6 @@
package com.ruoyi.manage.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.manage.pojo.ManageRecordVerify;
@@ -17,7 +18,7 @@
*/
public interface ManageRecordVerifyService extends IService<ManageRecordVerify> {
- Map<String,Object> pageManageRecordVerify(Page page, ManageRecordVerify manageRecordVerify);
+ IPage<ManageRecordVerify> pageManageRecordVerify(Page page, ManageRecordVerify manageRecordVerify);
int addManageRecordVerify(ManageRecordVerify manageRecordVerify);
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordAuditServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordAuditServiceImpl.java
index 151ee3b..52cf02d 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordAuditServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordAuditServiceImpl.java
@@ -10,7 +10,11 @@
import com.deepoove.poi.config.ConfigureBuilder;
-
+import com.deepoove.poi.data.*;
+import com.deepoove.poi.data.style.*;
+import com.ruoyi.common.utils.QueryWrappers;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.manage.mapper.ManageRecordAuditMapper;
import com.ruoyi.manage.pojo.ManageRecordAudit;
@@ -19,9 +23,6 @@
import com.ruoyi.system.mapper.UserMapper;
import org.apache.commons.io.IOUtils;
import org.apache.poi.openxml4j.util.ZipSecureFile;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.TableStyle;
import org.apache.poi.xwpf.usermodel.*;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.STMerge;
import org.springframework.beans.factory.annotation.Value;
@@ -61,16 +62,14 @@
@Override
- public Map<String, Object> pageManageRecordAudit(Page page, ManageRecordAudit manageRecordAudit) {
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(ManageRecordAudit.class));
+ public IPage<ManageRecordAudit> pageManageRecordAudit(Page page, ManageRecordAudit manageRecordAudit) {
+
IPage<ManageRecordAudit> manageRecordAuditIPage = manageRecordAuditMapper.pageManageRecordAudit(page, QueryWrappers.queryWrappers(manageRecordAudit));
for (ManageRecordAudit record : manageRecordAuditIPage.getRecords()) {
String limsName = userMapper.selectUserDepartmentLimsName(record.getCreateUser());
record.setCreateUserDepart(limsName);
}
- map.put("body", manageRecordAuditIPage);
- return map;
+ return manageRecordAuditIPage;
}
@Override
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCancelServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCancelServiceImpl.java
index 107435c..bd8155c 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCancelServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCancelServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.manage.service.impl;
import cn.hutool.core.lang.UUID;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,19 +9,19 @@
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.config.ConfigureBuilder;
-
-
-
+import com.deepoove.poi.data.*;
+import com.deepoove.poi.data.style.*;
+import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.common.utils.QueryWrappers;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.manage.mapper.ManageRecordCancelMapper;
-
import com.ruoyi.manage.pojo.ManageRecordCancel;
import com.ruoyi.manage.service.ManageRecordCancelService;
+import com.ruoyi.system.mapper.UserMapper;
import org.apache.commons.io.IOUtils;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.TableStyle;
import org.apache.poi.xwpf.usermodel.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -54,7 +55,7 @@
@Resource
private ManageRecordCancelMapper manageRecordCancelMapper;
-
+
@Value("${wordUrl}")
private String wordUrl;
@@ -63,11 +64,8 @@
private UserMapper userMapper;
@Override
- public Map<String, Object> pageManageRecordCancel(Page page, ManageRecordCancel manageRecordCancel) {
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(ManageRecordCancel.class));
- map.put("body", manageRecordCancelMapper.pageManageRecordCancel(page, QueryWrappers.queryWrappers(manageRecordCancel)));
- return map;
+ public IPage<ManageRecordCancel> pageManageRecordCancel(Page page, ManageRecordCancel manageRecordCancel) {
+ return manageRecordCancelMapper.pageManageRecordCancel(page, QueryWrappers.queryWrappers(manageRecordCancel));
}
@Override
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCheckServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCheckServiceImpl.java
index f439b59..9ffe421 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCheckServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCheckServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.manage.service.impl;
import cn.hutool.core.lang.UUID;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,17 +11,20 @@
import com.deepoove.poi.config.ConfigureBuilder;
-
+import com.deepoove.poi.data.*;
+import com.deepoove.poi.data.style.*;
+import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.common.utils.QueryWrappers;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.manage.mapper.ManageRecordCheckMapper;
import com.ruoyi.manage.pojo.ManageRecordCheck;
import com.ruoyi.manage.service.ManageRecordCheckService;
+import com.ruoyi.system.mapper.UserMapper;
import org.apache.commons.io.IOUtils;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.TableStyle;
import org.apache.poi.xwpf.usermodel.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -60,14 +64,11 @@
@Resource
private UserMapper userMapper;
-
+
@Override
- public Map<String, Object> pageManageRecordCheck(Page page, ManageRecordCheck manageRecordCheck) {
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(ManageRecordCheck.class));
- map.put("body", manageRecordCheckMapper.pageManageRecordCheck(page, QueryWrappers.queryWrappers(manageRecordCheck)));
- return map;
+ public IPage<ManageRecordCheck> pageManageRecordCheck(Page page, ManageRecordCheck manageRecordCheck) {
+ return manageRecordCheckMapper.pageManageRecordCheck(page, QueryWrappers.queryWrappers(manageRecordCheck));
}
@Override
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsServiceImpl.java
index 670d90c..4326aec 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.manage.service.impl;
import cn.hutool.core.lang.UUID;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,6 +11,10 @@
import com.deepoove.poi.config.ConfigureBuilder;
+import com.deepoove.poi.data.*;
+import com.deepoove.poi.data.style.*;
+import com.ruoyi.common.utils.QueryWrappers;
+import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.manage.mapper.ManageRecordIntervalsMapper;
import com.ruoyi.manage.mapper.ManageRecordIntervalsTotalMapper;
import com.ruoyi.manage.pojo.ManageRecordIntervals;
@@ -18,9 +23,6 @@
import org.apache.commons.io.IOUtils;
import org.apache.poi.openxml4j.util.ZipSecureFile;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.TableStyle;
import org.apache.poi.xwpf.usermodel.*;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.STMerge;
import org.springframework.beans.factory.annotation.Value;
@@ -59,11 +61,8 @@
private String wordUrl;
@Override
- public Map<String, Object> pageManageRecordIntervals(Page page, ManageRecordIntervals manageRecordIntervals) {
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(ManageRecordIntervals.class));
- map.put("body", manageRecordIntervalsMapper.pageManageRecordIntervals(page, QueryWrappers.queryWrappers(manageRecordIntervals)));
- return map;
+ public IPage<ManageRecordIntervals> pageManageRecordIntervals(Page page, ManageRecordIntervals manageRecordIntervals) {
+ return manageRecordIntervalsMapper.pageManageRecordIntervals(page, QueryWrappers.queryWrappers(manageRecordIntervals));
}
@Override
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsTotalServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsTotalServiceImpl.java
index b925b00..62f6b35 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsTotalServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsTotalServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.manage.service.impl;
import cn.hutool.core.lang.UUID;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,7 +11,12 @@
import com.deepoove.poi.config.ConfigureBuilder;
-
+import com.deepoove.poi.data.*;
+import com.deepoove.poi.data.style.*;
+import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.common.utils.QueryWrappers;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.manage.mapper.ManageRecordIntervalsMapper;
import com.ruoyi.manage.mapper.ManageRecordIntervalsTotalMapper;
@@ -18,11 +24,9 @@
import com.ruoyi.manage.pojo.ManageRecordIntervalsTotal;
import com.ruoyi.manage.service.ManageRecordIntervalsTotalService;
+import com.ruoyi.system.mapper.UserMapper;
import org.apache.commons.io.IOUtils;
import org.apache.poi.openxml4j.util.ZipSecureFile;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.TableStyle;
import org.apache.poi.xwpf.usermodel.*;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.STMerge;
import org.springframework.beans.factory.annotation.Value;
@@ -52,7 +56,7 @@
@Value("${wordUrl}")
private String wordUrl;
-
+
@Resource
private UserMapper userMapper;
@@ -67,11 +71,8 @@
private ManageRecordIntervalsMapper manageRecordIntervalsMapper;
@Override
- public Map<String, Object> pageManageRecordIntervalsTotal(Page page, ManageRecordIntervalsTotal manageRecordIntervalsTotal) {
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(ManageRecordIntervalsTotal.class));
- map.put("body", manageRecordIntervalsTotalMapper.pageManageRecordIntervalsTotal(page, QueryWrappers.queryWrappers(manageRecordIntervalsTotal)));
- return map;
+ public IPage<ManageRecordIntervalsTotal> pageManageRecordIntervalsTotal(Page page, ManageRecordIntervalsTotal manageRecordIntervalsTotal) {
+ return manageRecordIntervalsTotalMapper.pageManageRecordIntervalsTotal(page, QueryWrappers.queryWrappers(manageRecordIntervalsTotal));
}
@Override
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIssueRecycleServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIssueRecycleServiceImpl.java
index 3838b37..4fb7805 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIssueRecycleServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIssueRecycleServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.manage.service.impl;
import cn.hutool.core.lang.UUID;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,17 +11,20 @@
import com.deepoove.poi.config.ConfigureBuilder;
+import com.deepoove.poi.data.*;
+import com.deepoove.poi.data.style.*;
+import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.common.utils.QueryWrappers;
+import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.manage.mapper.ManageRecordIssueRecycleMapper;
import com.ruoyi.manage.pojo.ManageRecordIssueRecycle;
import com.ruoyi.manage.service.ManageRecordIssueRecycleService;
+import com.ruoyi.system.mapper.UserMapper;
import org.apache.commons.io.IOUtils;
import org.apache.poi.openxml4j.util.ZipSecureFile;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.TableStyle;
import org.apache.poi.xwpf.usermodel.*;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.STMerge;
import org.springframework.beans.factory.annotation.Value;
@@ -59,11 +63,8 @@
private UserMapper userMapper;
@Override
- public Map<String, Object> pageManageRecordIssueRecycle(Page page, ManageRecordIssueRecycle manageRecordIssueRecycle) {
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(ManageRecordIssueRecycle.class));
- map.put("body", manageRecordIssueRecycleMapper.pageManageRecordIssueRecycle(page, QueryWrappers.queryWrappers(manageRecordIssueRecycle)));
- return map;
+ public IPage<ManageRecordIssueRecycle> pageManageRecordIssueRecycle(Page page, ManageRecordIssueRecycle manageRecordIssueRecycle) {
+ return manageRecordIssueRecycleMapper.pageManageRecordIssueRecycle(page, QueryWrappers.queryWrappers(manageRecordIssueRecycle));
}
@Override
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordTotalServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordTotalServiceImpl.java
index 4ed9edc..1d8260e 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordTotalServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordTotalServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.manage.service.impl;
import cn.hutool.core.lang.UUID;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,7 +11,12 @@
import com.deepoove.poi.config.ConfigureBuilder;
-
+import com.deepoove.poi.data.*;
+import com.deepoove.poi.data.style.*;
+import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.common.utils.QueryWrappers;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.manage.mapper.ManageRecordTotalMapper;
import com.ruoyi.manage.mapper.ManageRecordVerifyMapper;
@@ -19,10 +25,8 @@
import com.ruoyi.manage.service.ManageRecordTotalService;
+import com.ruoyi.system.mapper.UserMapper;
import org.apache.commons.io.IOUtils;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.TableStyle;
import org.apache.poi.xwpf.usermodel.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -57,7 +61,7 @@
@Value("${wordUrl}")
private String wordUrl;
-
+
@Resource
private UserMapper userMapper;
@@ -69,11 +73,8 @@
private ManageRecordVerifyMapper manageRecordVerifyMapper;
@Override
- public Map<String, Object> pageManageRecordTotal(Page page, ManageRecordTotal manageRecordTotal) {
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(ManageRecordTotal.class));
- map.put("body", manageRecordTotalMapper.pageProcessTotaldeal(page, QueryWrappers.queryWrappers(manageRecordTotal)));
- return map;
+ public IPage<ManageRecordTotal> pageManageRecordTotal(Page page, ManageRecordTotal manageRecordTotal) {
+ return manageRecordTotalMapper.pageProcessTotaldeal(page, QueryWrappers.queryWrappers(manageRecordTotal));
}
@Override
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordVerifyServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordVerifyServiceImpl.java
index 3fac647..de56b41 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordVerifyServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordVerifyServiceImpl.java
@@ -1,11 +1,14 @@
package com.ruoyi.manage.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.QueryWrappers;
+import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.manage.mapper.ManageRecordTotalMapper;
import com.ruoyi.manage.mapper.ManageRecordVerifyMapper;
import com.ruoyi.manage.pojo.ManageRecordTotal;
@@ -48,9 +51,7 @@
private ManageRecordTotalMapper manageRecordTotalMapper;
@Override
- public Map<String, Object> pageManageRecordVerify(Page page, ManageRecordVerify manageRecordVerify) {
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(ManageRecordVerify.class));
+ public IPage<ManageRecordVerify> pageManageRecordVerify(Page page, ManageRecordVerify manageRecordVerify) {
if (ObjectUtils.isEmpty(manageRecordVerify.getManageRecordTotalId())) {
//鑾峰彇褰撳墠骞翠唤
LocalDate currentDate = LocalDate.now();
@@ -62,8 +63,7 @@
ManageRecordTotal manageRecordTotal = manageRecordTotalMapper.selectOne(Wrappers.<ManageRecordTotal>lambdaQuery().eq(ManageRecordTotal::getYear, currentMonth));
manageRecordVerify.setManageRecordTotalId(manageRecordTotal.getId());
}
- map.put("body", manageRecordVerifyMapper.pageManageRecordVerify(page, QueryWrappers.queryWrappers(manageRecordVerify)));
- return map;
+ return manageRecordVerifyMapper.pageManageRecordVerify(page, QueryWrappers.queryWrappers(manageRecordVerify));
}
@Override
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewProgramServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewProgramServiceImpl.java
index eb047d2..1fb3bf9 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewProgramServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewProgramServiceImpl.java
@@ -9,16 +9,15 @@
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.config.ConfigureBuilder;
import com.deepoove.poi.data.FilePictureRenderData;
-
-
+import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.manage.mapper.ManageReviewProgramMapper;
-
import com.ruoyi.manage.pojo.ManageReviewProgram;
-
import com.ruoyi.manage.service.ManageReviewProgramService;
+import com.ruoyi.system.mapper.UserMapper;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
@@ -49,7 +48,7 @@
@Value("${file.path}")
private String imgUrl;
-
+
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewReportServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewReportServiceImpl.java
index 1b02790..e1ad1f1 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewReportServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageReviewReportServiceImpl.java
@@ -9,15 +9,14 @@
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.config.ConfigureBuilder;
import com.deepoove.poi.data.FilePictureRenderData;
-
+import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.manage.mapper.ManageReviewReportMapper;
-
import com.ruoyi.manage.pojo.ManageReviewReport;
-
import com.ruoyi.manage.service.ManageReviewReportService;
+import com.ruoyi.system.mapper.UserMapper;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java
index fa4ca88..091a66d 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java
@@ -8,18 +8,17 @@
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.data.Pictures;
-
+import com.ruoyi.common.utils.DateImageUtil;
+import com.ruoyi.framework.exception.ErrorException;
+import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.mapper.ManageRiskAssessmentResultsMapper;
-
import com.ruoyi.manage.pojo.ManageRiskAssessmentResults;
import com.ruoyi.manage.service.ManageRiskAssessmentResultsService;
-
-
import com.ruoyi.manage.vo.ManageRiskAssessmentResultsVo;
+import com.ruoyi.system.mapper.UserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.io.OutputStream;
--
Gitblit v1.9.3