From 8dc28c815eb0acdb5af82c2667eec45efd0507c5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 18 三月 2025 09:34:46 +0800
Subject: [PATCH] 车间绑定调整
---
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRiskAssessmentResultsController.java | 53 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 33 insertions(+), 20 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..0e01a26 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;
@@ -25,6 +26,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.time.LocalDateTime;
+import java.util.Map;
/**
* <p>
@@ -39,13 +41,9 @@
@RequestMapping("/manageRiskAssessmentResults")
public class ManageRiskAssessmentResultsController {
- @Autowired
-
-
@Resource
private ManageRiskAssessmentResultsService manageRiskAssessmentResultsService;
- @ValueClassify(value = "鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙�")
@ApiOperation(value = "鍒嗛〉鏌ヨ")
@GetMapping("/getPageResults")
public Result<IPage<ManageRiskAssessmentResultsVo>> getPageResults(Page page) {
@@ -53,10 +51,11 @@
return Result.success(ipage);
}
- @ValueClassify(value = "鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙�")
@ApiOperation(value = "鎵瑰噯")
- @GetMapping("/hazardIdentificationAndRiskApproval")
- public Result<?> hazardIdentificationAndRiskApproval(Integer approve, Integer status) {
+ @PostMapping("/hazardIdentificationAndRiskApproval")
+ public Result<?> hazardIdentificationAndRiskApproval(@RequestBody Map<String, Integer> param) {
+ Integer approve = param.get("approve");
+ Integer status = param.get("status");
manageRiskAssessmentResultsService.update(Wrappers.<ManageRiskAssessmentResults>lambdaUpdate()
.set(ManageRiskAssessmentResults::getApprove, approve)
.set(ManageRiskAssessmentResults::getApproveStatus, status)
@@ -64,10 +63,11 @@
return Result.success();
}
- @ValueClassify(value = "鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙�")
@ApiOperation(value = "瀹℃壒")
- @GetMapping("/dangerousRiskApproval")
- public Result<?> dangerousRiskApproval(Integer approval, Integer status) {
+ @PostMapping("/dangerousRiskApproval")
+ public Result<?> dangerousRiskApproval(@RequestBody Map<String, Integer> param) {
+ Integer approval = param.get("approval");
+ Integer status = param.get("status");
manageRiskAssessmentResultsService.update(Wrappers.<ManageRiskAssessmentResults>lambdaUpdate()
.set(ManageRiskAssessmentResults::getApproval, approval)
.set(ManageRiskAssessmentResults::getApprovalStatus, status)
@@ -75,11 +75,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 +94,6 @@
})).extraRead(CellExtraTypeEnum.MERGE).sheet().doRead();
}
- @ValueClassify(value = "鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙�")
@ApiOperation(value = "鏂板")
@PostMapping("/addNewRiskFactors")
public void addNewRiskFactors(@RequestBody ManageRiskAssessmentResults manageRiskAssessmentResults) {
@@ -105,17 +103,32 @@
manageRiskAssessmentResultsService.saveOrUpdate(manageRiskAssessmentResults);
}
- @ValueClassify(value = "鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙�")
@ApiOperation(value = "鍒犻櫎")
- @GetMapping("/removeRiskFactors")
+ @DeleteMapping("/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