From 3c901b2289729b8d13689a52faaffb3cd1124594 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 27 三月 2025 13:25:08 +0800
Subject: [PATCH] 修改标准库查询bug
---
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java | 67 +++++++++++++++++++--------------
1 files changed, 38 insertions(+), 29 deletions(-)
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..64e7189 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java
@@ -1,29 +1,27 @@
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;
import java.time.LocalDateTime;
+import java.util.Map;
/**
* <p>
@@ -42,21 +40,19 @@
@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){
+ @PostMapping("/approvalOfControlPlanChecklist")
+ public Result<?> approvalOfControlPlanChecklist(@RequestBody Map<String, Integer> param){
+ Integer approve = param.get("approve");
+ Integer status= param.get("status");
manageControlPlanListService.update(Wrappers.<ManageControlPlanList>lambdaUpdate()
.set(ManageControlPlanList::getApprove, approve)
.set(ManageControlPlanList::getApproveStatus, status)
@@ -64,10 +60,11 @@
return Result.success();
}
- @ValueClassify(value = "閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗�")
@ApiOperation(value = "瀹℃壒")
- @GetMapping("/riskAnalysisApprovalOfControlPlanChecklist")
- public Result<?> riskAnalysisApprovalOfControlPlanChecklist(Integer approval, Integer status){
+ @PostMapping("/riskAnalysisApprovalOfControlPlanChecklist")
+ public Result<?> riskAnalysisApprovalOfControlPlanChecklist(@RequestBody Map<String, Integer> param){
+ Integer approval = param.get("approval");
+ Integer status= param.get("status");
manageControlPlanListService.update(Wrappers.<ManageControlPlanList>lambdaUpdate()
.set(ManageControlPlanList::getApproval, approval)
.set(ManageControlPlanList::getApprovalStatus, status)
@@ -75,11 +72,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,20 +90,18 @@
})).sheet().doRead();
}
- @ValueClassify(value = "閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗�")
@ApiOperation(value = "鏂板")
@PostMapping("/analysisOfMajorRiskFactorsAdded")
- public void analysisOfMajorRiskFactorsAdded(@RequestBody ManageControlPlanList manageControlPlanList) throws IOException {
+ public void analysisOfMajorRiskFactorsAdded(@RequestBody ManageControlPlanList manageControlPlanList) {
Integer userId = SecurityUtils.getUserId().intValue();
manageControlPlanList.setEditor(userId);
manageControlPlanList.setEditorDate(LocalDateTime.now());
manageControlPlanListService.saveOrUpdate(manageControlPlanList);
}
- @ValueClassify(value = "閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗�")
@ApiOperation(value = "鍒犻櫎")
- @GetMapping("/deleteSignificantRiskFactorAnalysis")
- public void deleteSignificantRiskFactorAnalysis(Integer id) throws IOException {
+ @DeleteMapping("/deleteSignificantRiskFactorAnalysis")
+ public void deleteSignificantRiskFactorAnalysis(Integer id) {
manageControlPlanListService.removeById(id);
}
@@ -116,10 +109,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");
+ }
}
--
Gitblit v1.9.3