From f9978d9309b3a75f078b32746bcb96d4afd55bcc Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 19 十月 2025 23:50:51 +0800
Subject: [PATCH] 1、 切割/钢化版图展示，仅将破损未报工的小片显示为破损
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java | 47 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java
index 4309548..5fbde43 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java
@@ -1,11 +1,14 @@
package com.mes.pp.controller;
+import com.baomidou.mybatisplus.extension.api.R;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.pp.service.OptimizeProjectService;
import com.mes.utils.Result;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import liquibase.pro.packaged.O;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -20,6 +23,7 @@
* @author zhoush
* @since 2024-04-16
*/
+@Api(tags = "宸ョ▼淇℃伅")
@RestController
@RequestMapping("/optimizeProject")
@Slf4j
@@ -30,22 +34,49 @@
@ApiOperation("鏄剧ず宸ョ▼閫夋嫨淇℃伅")
@PostMapping("/listByState") //鏄剧ず宸ョ▼閫夋嫨淇℃伅
+ @ResponseBody
public Result<List<OptimizeProject>> listByState(@RequestBody OptimizeRequest optimizeRequest) {
log.info("灏嗚姹傚弬鏁板皝瑁呭湪璇锋眰绫婚噷闈�");
List<OptimizeProject> glass = optimizeProjectService.listByState(optimizeRequest);
+
log.info("鏄剧ず宸ョ▼閫夋嫨淇℃伅:{}", glass);
return Result.build(200, "", glass);
}
- @ApiOperation("淇濆瓨宸ョ▼淇℃伅")
- @PostMapping("/saveProject") //鏄剧ず宸ョ▼閫夋嫨淇℃伅
- public Result<List<OptimizeProject>> saveProject(@RequestBody OptimizeRequest optimizeRequest) {
- log.info("鑾峰彇閫夋嫨濂界殑宸ョ▼id杩涜鏌ヨ鏁版嵁鍚庝繚瀛�");
- List<OptimizeProject> glass = optimizeProjectService.saveProject(optimizeRequest);
- log.info("鏄剧ず宸ョ▼閫夋嫨淇℃伅鍚庤繘琛屼繚瀛�:{}", glass);
- //void insetProject(glass);
- return Result.build(200, "", glass);
+ @ApiOperation("鏌ヨ宸ョ▼淇℃伅")
+ @PostMapping("/queryEngineer") //鏄剧ず宸ョ▼淇℃伅 pp琛�
+ @ResponseBody
+ public Result<List<OptimizeProject>> queryEngineer() {
+ List<OptimizeProject> resultList = optimizeProjectService.queryEngineer();
+ return Result.build(200, "", resultList);
}
+ @ApiOperation("鏌ヨ宸ョ▼鎺掍骇淇℃伅")
+ @PostMapping("/engineerScheduling") //鏄剧ず宸ョ▼鎺掍骇淇℃伅 engineerScheduling琛�
+ @ResponseBody
+ public Result<List<OptimizeProject>> engineerScheduling(@RequestBody OptimizeProject optimizeProject) {
+ List<OptimizeProject> engineerScheduling = optimizeProjectService.engineerScheduling(optimizeProject);
+ return Result.build(200, "", engineerScheduling);
+ }
+
+ @ApiOperation("鏇存柊宸ョ▼淇℃伅")
+ @PostMapping("/updateEngineerScheduling") //鏇存柊宸ョ▼鎺掍骇淇℃伅 engineerScheduling琛�
+ @ResponseBody
+ public Result<List<OptimizeProject>> updateEngineerScheduling(@RequestParam Integer type, @RequestBody List<OptimizeProject> engineerList) {
+ List<OptimizeProject> resultList = optimizeProjectService.updateEngineerScheduling(type, engineerList);
+ return Result.build(200, "鏇存柊鎴愬姛", resultList);
+ }
+
+// @ApiOperation("淇濆瓨宸ョ▼淇℃伅")
+// @PostMapping("/saveProject") //鏄剧ず宸ョ▼閫夋嫨淇℃伅
+// public Result<List<OptimizeProject>> saveProject(@RequestBody OptimizeRequest optimizeRequest) {
+// log.info("鑾峰彇閫夋嫨濂界殑宸ョ▼id杩涜鏌ヨ鏁版嵁鍚庝繚瀛�");
+// List<OptimizeProject> glass = optimizeProjectService.selectSaveProject(optimizeRequest);
+// log.info("鏄剧ず宸ョ▼閫夋嫨淇℃伅鍚庝繚瀛樺埌upPattenUsage琛�:{}", glass);
+// optimizeProjectService.insetupPattenUsage(glass);
+// //void insetProject(glass);
+// return Result.build(200, "", glass);
+// }
+
}
--
Gitblit v1.8.0