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/ManageRiskAssessmentResultsController.java | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
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");
+ }
}
--
Gitblit v1.9.3