From 33308e16bbb153d9aac76fd703ec0f38ea7e344a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 09 十月 2024 15:47:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 52 +++++++++++++++++++++++++++++-----------------------
1 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
index 33610c6..3d98ea2 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
@@ -36,7 +36,7 @@
private EngineeringService engineeringService;
@Autowired
private OptimizeProjectService optimizeProjectService;
- @ApiOperation("鏄剧ず姝ｅ湪鍑虹墖鐨勫伐绋嬩俊鎭�")
+ @ApiOperation("鏄剧ず閫夋嫨鐨勫伐绋嬩俊鎭�")
@GetMapping("/prioritylist") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
@ResponseBody
public Result<List<UpPattenUsage>> prioritylist() {
@@ -45,32 +45,38 @@
return Result.build(200, "", glass);
}
- @ApiOperation("鐐瑰嚮閫夋嫨宸ョ▼淇濆瓨鍚庤繘琛岃皟鐢�,浼犲叆宸ョ▼鍙�")
- @PostMapping("/saveUpPattenUsage") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
+ @ApiOperation("閫夋嫨宸ョ▼鍙峰悗鏄剧ず涓婄墖椤哄簭棰勮")
+ @PostMapping("/selectUpPattenUsage") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
@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, "宸蹭繚瀛樼殑宸ョ▼", null);
+ public Result<List<UpPattenUsage>> selectUpPattenUsage(@RequestBody Engineering engineering) {
+ List<UpPattenUsage> upPattenUsages=null;
+ UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
+ if(upPattenUsage == null){
+ upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
}else {
- List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
- log.info("灏嗘煡璇㈠嚭鐨刄pPattenUsage鏁版嵁淇濆瓨鍒版暟鎹簱琛ㄩ噷");
- upPattenUsageService.saveUpPattenUsage(upPattenUsages);
- log.info("浠嶱P琛ㄦ煡璇lassinfo鐨勬暟鎹苟淇濆瓨鍒拌〃閲�");
- List<GlassInfo> glassinfo=glassInfoService.selectGlassInfo(engineering.getEngineerId());
- glassInfoService.saveGlassInfo(glassinfo);
- log.info("浠嶱P琛ㄦ煡璇ngineering鐨勬暟鎹苟淇濆瓨鍒拌〃閲�");
- List<Engineering> listEngineering= engineeringService.selectEngineering(engineering.getEngineerId());
- engineeringService.saveEngineering(listEngineering);
- log.info("鏇存敼pp琛ㄧ姸鎬佷负宸查鍙�");
- optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
-// List<UpPattenUsage> data=upPattenUsageService.prioritylist();
-// log.info("鏄剧ず淇濆瓨鍚庣殑涓婄墖椤哄簭琛�");
- return Result.build(200, "", engineering);
+ upPattenUsages= upPattenUsageService.selectUpPattenUsage(upPattenUsage);
+ }
+
+ if (!upPattenUsages.isEmpty()) {
+ return Result.build(200, "鎴愬姛", upPattenUsages);
+ }else {
+ return Result.build(100, "澶辫触", upPattenUsages);
+ }
+
+ }
+
+ @ApiOperation("鍒囨崲鍘熺墖涓婄墖鐘舵��")
+ @PostMapping("/updateGlassState") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
+ @ResponseBody
+ public Result<Boolean> updateGlassState(@RequestBody UpPattenUsage upPattenUsage) {
+ Boolean whether = upPattenUsageService.updateGlassState(upPattenUsage);
+ if (whether){
+ return Result.build(200, "鎴愬姛", whether);
+ }else {
+ return Result.build(100, "澶辫触", whether);
}
}
+
}
--
Gitblit v1.8.0