From 636bd027a92d4bf669410ee550a5ca6324f72c88 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 27 十月 2025 17:30:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 14 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 222759c..731b748 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
@@ -2,16 +2,15 @@
import com.mes.pp.entity.OptimizeProject;
+import com.mes.pp.entity.dto.ProgressDTO;
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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -23,10 +22,10 @@
* @author zhoush
* @since 2024-04-16
*/
+@Api(tags = "宸ョ▼淇℃伅")
@RestController
@RequestMapping("/optimizeProject")
@Slf4j
-
public class OptimizeProjectController {
@Autowired
//鑾峰彇寰呴�夋嫨鐨勫伐绋嬪彿
@@ -34,23 +33,56 @@
@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.selectSaveProject(optimizeRequest);
- log.info("鏄剧ず宸ョ▼閫夋嫨淇℃伅鍚庝繚瀛樺埌upPattenUsage琛�:{}", glass);
- optimizeProjectService.insetupPattenUsage(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("/selectProgress") //鏇存柊宸ョ▼鎺掍骇淇℃伅 engineerScheduling琛�
+ @ResponseBody
+ public Result<List<ProgressDTO>> selectProgress(@RequestBody OptimizeRequest optimizeRequest) {
+ List<ProgressDTO> resultList = optimizeProjectService.selectProgress(optimizeRequest.getProjectNo());
+ 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