From 40bf019f0b348378385ed0a819b5b06e1708d558 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期六, 09 八月 2025 00:19:37 +0800
Subject: [PATCH] 工作流代码
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
index 0d7d06e..001f12d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
@@ -7,11 +7,13 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.MaintenanceStandardStatusEnum;
@@ -47,8 +49,6 @@
private IEamMaintenanceStandardService eamMaintenanceStandardService;
@Autowired
private ISysBusinessCodeRuleService businessCodeRuleService;
- @Autowired
- private IEamEquipmentService eamEquipmentService;
/**
* 娴佺▼鍚姩,淇濆瓨瀵瑰簲鐨勬暟鎹�
@@ -59,6 +59,11 @@
@ApiOperation(value = "淇濆吇鏍囧噯-娴佺▼鍚姩淇濆瓨瀵瑰簲鐨勬暟鎹�", notes = "淇濆吇鏍囧噯-娴佺▼鍚姩淇濆瓨瀵瑰簲鐨勬暟鎹�")
@GetMapping(value = "/saveEamMaintenanceStandardProcess")
public Result<?> saveEamMaintenanceStandardProcess(String id) {
+ // 鏍￠獙棰嗗彇鏉冮檺
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (!BusinessCodeConst.PCR0002.equals(user.getPost())) {
+ return Result.error("濉姤澶辫触,娌℃湁濉姤鏉冮檺锛�,闇�缁翠慨宸ユ彁浜�");
+ }
return eamMaintenanceStandardService.saveEamMaintenanceStandardProcess(id);
}
@@ -286,7 +291,7 @@
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();
String fileName = file.getOriginalFilename();
- Result<?> importResult=eamMaintenanceStandardService.importPointInspectionExcel(file);
+ Result<?> importResult=eamMaintenanceStandardService.importPointInspectionExcel(file,null);
if (importResult.isSuccess()) {
successCount++;
} else {
@@ -322,7 +327,7 @@
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();
String fileName = file.getOriginalFilename();
- Result<?> importResult=eamMaintenanceStandardService.importMaintenanceStandard(file, "SECOND");
+ Result<?> importResult=eamMaintenanceStandardService.importMaintenanceStandard(file, "SECOND",null);
if (importResult.isSuccess()) {
successCount++;
} else {
@@ -357,7 +362,7 @@
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();
String fileName = file.getOriginalFilename();
- Result<?> importResult= eamMaintenanceStandardService.importMaintenanceStandard(file, "THIRD");
+ Result<?> importResult= eamMaintenanceStandardService.importMaintenanceStandard(file, "THIRD",null);
if (importResult.isSuccess()) {
successCount++;
} else {
@@ -375,6 +380,35 @@
}
}
+ /**
+ * 鍗囩増瀵煎叆
+ * @param id,file
+ * @return
+ */
+ @ApiOperation(value = "鍗囩増瀵煎叆", notes = "鍗囩増瀵煎叆")
+ @PostMapping(value = "/importUpgrade")
+ public Result<?> importUpgrade(String id,MultipartFile file) {
+ EamMaintenanceStandard eamMaintenanceStandard=eamMaintenanceStandardService.getById(id);
+ if (eamMaintenanceStandard==null) {
+ return Result.error("璇烽�夋嫨闇�瑕佸崌鐗堢殑淇濆吇鏍囧噯");
+ }else {
+ switch (eamMaintenanceStandard.getMaintenanceCategory()){
+ case "POINT_INSPECTION":
+ //鐐规鍗囩増瀵煎叆
+ return eamMaintenanceStandardService.importPointInspectionExcel(file,id);
+ case "SECOND_MAINTENANCE":
+ //浜屼繚鍗囩増瀵煎叆
+ return eamMaintenanceStandardService.importMaintenanceStandard(file, "SECOND",id);
+ case "THIRD_MAINTENANCE":
+ //涓変繚鍗囩増瀵煎叆
+ return eamMaintenanceStandardService.importMaintenanceStandard(file, "THIRD",id);
+ default:
+ break;
+ }
+ }
+ return Result.error("鍗囩増瀵煎叆澶辫触");
+ }
+
private Result<?> getResult(Map<String, String> results, int fileCount, int successCount, int failureCount) {
List<String> response = new ArrayList<>();
response.add("鎬绘枃浠舵暟锛�" + fileCount);
--
Gitblit v1.9.3