From 7b89e2cf25b6d5a43ecc86bb64a6a245ae862c6e Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 17 五月 2024 11:12:25 +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 | 126 ++++++++++++++++++++++++-----------------
1 files changed, 73 insertions(+), 53 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 48e78f1..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
@@ -1,56 +1,76 @@
package com.mes.uppattenusage.controller;
+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.*;
-//
-//import com.mes.uppattenusage.service.GlassInfoService;
-//import com.mes.uppattenusage.entity.OptimizeUpPattenUsage;
-//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;
-//
-//import java.util.List;
-//
-///**
-// * <p>
-// * 鍓嶇鎺у埗鍣�
-// * </p>
-// *
-// * @author zhoush
-// * @since 2024-04-18
-// */
-//@RestController
-//@RequestMapping("/up-patten-usage")
-//@Slf4j
-//public class UpPattenUsageController {
-//
-// @Autowired
-// private UpPattenUsageService upPattenUsageService;
-// @Autowired
-// private GlassInfoService glassInfoService;
-// @ApiOperation("鏄剧ず姝ｅ湪鍑虹墖鐨勫伐绋嬩俊鎭�")
-// @GetMapping("/prioritylist") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
-// public Result<List<UpPattenUsage>> prioritylist() {
-// List<UpPattenUsage> glass = upPattenUsageService.prioritylist(1);
-// log.info("鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅:{}", glass);
-// return Result.build(200, "", glass);
-// }
-//
-// @ApiOperation("鐐瑰嚮閫夋嫨宸ョ▼淇濆瓨鍚庤繘琛岃皟鐢�,浼犲叆宸ョ▼鍙�")
-// @GetMapping("/saveUpPattenUsage") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
-// public Result<Integer> saveUpPattenUsage(String engineeringId) {
-// List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineeringId);
-// log.info("灏嗘煡璇㈠嚭鐨刄pPattenUsage鏁版嵁淇濆瓨鍒版暟鎹簱琛ㄩ噷");
-// upPattenUsageService.saveUpPattenUsage(upPattenUsages);
-// log.info("浠嶱P琛ㄦ煡璇lassinfo鐨勬暟鎹苟淇濆瓨鍒拌〃閲�");
-// List<GlassInfo> glassinfo=glassInfoService.selectGlassInfo(engineeringId);
-// return Result.build(200, "", 200);
-// }
-//}
+import java.util.List;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-18
+ */
+@RestController
+@RequestMapping("/up-patten-usage")
+@Slf4j
+public class UpPattenUsageController {
+
+ @Autowired
+ private UpPattenUsageService upPattenUsageService;
+ @Autowired
+ private GlassInfoService glassInfoService;
+ @Autowired
+ private EngineeringService engineeringService;
+ @Autowired
+ private OptimizeProjectService optimizeProjectService;
+ @ApiOperation("鏄剧ず姝ｅ湪鍑虹墖鐨勫伐绋嬩俊鎭�")
+ @GetMapping("/prioritylist") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
+ @ResponseBody
+ public Result<List<UpPattenUsage>> prioritylist() {
+ List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
+ log.info("鏄剧ず姝ｅ湪鍑虹墖鐨勫伐绋嬩俊鎭�:{}", glass);
+ return Result.build(200, "", glass);
+ }
+
+ @ApiOperation("鐐瑰嚮閫夋嫨宸ョ▼淇濆瓨鍚庤繘琛岃皟鐢�,浼犲叆宸ョ▼鍙�")
+ @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, "宸蹭繚瀛樼殑宸ョ▼", null);
+ }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);
+ }
+
+ }
+}
--
Gitblit v1.8.0