From a8e32b8a10bb462bb01f37e3b03d9d9fc3ffdee5 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 10 五月 2024 16:28:59 +0800
Subject: [PATCH] 增加上片模块线程，增加保存工程时的已保存判断
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
index a28c809..a8a3edf 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
@@ -1,15 +1,17 @@
package com.mes.uppattenusage.controller;
-
-
-import com.mes.uppattenusage.entity.OptimizeUpPattenUsage;
+import com.mes.engineering.entity.Engineering;
+import com.mes.engineering.service.EngineeringService;
+import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.pp.entity.OptimizeProject;
+import com.mes.pp.service.OptimizeProjectService;
import com.mes.uppattenusage.entity.UpPattenUsage;
+import com.mes.glassinfo.entity.GlassInfo;
import com.mes.uppattenusage.service.UpPattenUsageService;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -30,6 +32,12 @@
@Autowired
private UpPattenUsageService upPattenUsageService;
+ @Autowired
+ private GlassInfoService glassInfoService;
+ @Autowired
+ private EngineeringService engineeringService;
+ @Autowired
+ private OptimizeProjectService optimizeProjectService;
@ApiOperation("鏄剧ず姝ｅ湪鍑虹墖鐨勫伐绋嬩俊鎭�")
@GetMapping("/prioritylist") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
public Result<List<UpPattenUsage>> prioritylist() {
@@ -41,10 +49,26 @@
@ApiOperation("鐐瑰嚮閫夋嫨宸ョ▼淇濆瓨鍚庤繘琛岃皟鐢�,浼犲叆宸ョ▼鍙�")
@GetMapping("/saveUpPattenUsage") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
public Result<Integer> saveUpPattenUsage(String engineeringId) {
- List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineeringId);
- log.info("灏嗘煡璇㈠嚭鐨刄pPattenUsage鏁版嵁淇濆瓨鍒版暟鎹簱琛ㄩ噷:{}", 200);
- upPattenUsageService.saveUpPattenUsage(upPattenUsages);
- return Result.build(200, "", 200);
+ log.info("浼犲叆宸ョ▼鍙峰垽鏂槸鍚﹀凡淇濆瓨:{}", engineeringId);
+ UpPattenUsage upPattenUsage= upPattenUsageService.selectedEngineering(engineeringId);
+ if (upPattenUsage!=null){
+ log.info("宸蹭繚瀛樿繃");
+ return Result.build(200, "宸蹭繚瀛樿繃", 200);
+ }else {
+ List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineeringId);
+ log.info("灏嗘煡璇㈠嚭鐨刄pPattenUsage鏁版嵁淇濆瓨鍒版暟鎹簱琛ㄩ噷");
+ upPattenUsageService.saveUpPattenUsage(upPattenUsages);
+ log.info("浠嶱P琛ㄦ煡璇lassinfo鐨勬暟鎹苟淇濆瓨鍒拌〃閲�");
+ List<GlassInfo> glassinfo=glassInfoService.selectGlassInfo(engineeringId);
+ glassInfoService.saveGlassInfo(glassinfo);
+ log.info("浠嶱P琛ㄦ煡璇ngineering鐨勬暟鎹苟淇濆瓨鍒拌〃閲�");
+ List<Engineering> engineerings= engineeringService.selectEngineering(engineeringId);
+ engineeringService.saveEngineering(engineerings);
+ log.info("鏇存敼pp琛ㄧ姸鎬佷负宸查鍙�");
+ optimizeProjectService.changeTask(engineeringId, 200);
+ return Result.build(200, "", 200);
+ }
+
}
}
--
Gitblit v1.8.0