From 889ff0512bc68be0f5d231a524bf97c9488ec37f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 16 五月 2024 16:13:20 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 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 04c3279..6f81e0a 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
@@ -11,9 +11,7 @@
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.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -40,33 +38,37 @@
private OptimizeProjectService optimizeProjectService;
@ApiOperation("鏄剧ず姝ｅ湪鍑虹墖鐨勫伐绋嬩俊鎭�")
@GetMapping("/prioritylist") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
+ @ResponseBody
public Result<List<UpPattenUsage>> prioritylist() {
- List<UpPattenUsage> glass = upPattenUsageService.prioritylist(1);
- log.info("鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅:{}", glass);
+ List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
+ log.info("鏄剧ず姝ｅ湪鍑虹墖鐨勫伐绋嬩俊鎭�:{}", glass);
return Result.build(200, "", glass);
}
@ApiOperation("鐐瑰嚮閫夋嫨宸ョ▼淇濆瓨鍚庤繘琛岃皟鐢�,浼犲叆宸ョ▼鍙�")
- @GetMapping("/saveUpPattenUsage") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
- public Result<Integer> saveUpPattenUsage(String engineeringId) {
- log.info("浼犲叆宸ョ▼鍙峰垽鏂槸鍚﹀凡淇濆瓨:{}", engineeringId);
- UpPattenUsage upPattenUsage= upPattenUsageService.selectedEngineering(engineeringId);
+ @PostMapping("/saveUpPattenUsage") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
+ @ResponseBody
+ public Result<Engineering> saveUpPattenUsage(@RequestBody Engineering engineering) {
+ log.info("engineeringId:{}", engineering);
+ UpPattenUsage upPattenUsage= upPattenUsageService.selectedEngineering(engineering.getEngineerId());
if (upPattenUsage!=null){
log.info("宸蹭繚瀛樿繃");
- return Result.build(200, "宸蹭繚瀛樼殑宸ョ▼", 200);
+ return Result.build(200, "宸蹭繚瀛樼殑宸ョ▼", null);
}else {
- List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineeringId);
+ List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
log.info("灏嗘煡璇㈠嚭鐨刄pPattenUsage鏁版嵁淇濆瓨鍒版暟鎹簱琛ㄩ噷");
upPattenUsageService.saveUpPattenUsage(upPattenUsages);
log.info("浠嶱P琛ㄦ煡璇lassinfo鐨勬暟鎹苟淇濆瓨鍒拌〃閲�");
- List<GlassInfo> glassinfo=glassInfoService.selectGlassInfo(engineeringId);
+ List<GlassInfo> glassinfo=glassInfoService.selectGlassInfo(engineering.getEngineerId());
glassInfoService.saveGlassInfo(glassinfo);
log.info("浠嶱P琛ㄦ煡璇ngineering鐨勬暟鎹苟淇濆瓨鍒拌〃閲�");
- List<Engineering> engineering= engineeringService.selectEngineering(engineeringId);
- engineeringService.saveEngineering(engineering);
+ List<Engineering> listengineering= engineeringService.selectEngineering(engineering.getEngineerId());
+ engineeringService.saveEngineering(listengineering);
log.info("鏇存敼pp琛ㄧ姸鎬佷负宸查鍙�");
- optimizeProjectService.changeTask(engineeringId, 200);
- return Result.build(200, "", 200);
+ optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
+// List<UpPattenUsage> data=upPattenUsageService.prioritylist();
+// log.info("鏄剧ず淇濆瓨鍚庣殑涓婄墖椤哄簭琛�");
+ return Result.build(200, "", engineering);
}
}
--
Gitblit v1.8.0