From 566afa95de99a2f7cc3b9c928a6c4448865f8af5 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 01 七月 2024 18:09:03 +0800
Subject: [PATCH] 根据现场变动情况修改接口，添加当前值班表
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 84 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 76 insertions(+), 8 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
index 6b2c34c..e62c4cb 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
@@ -2,14 +2,20 @@
import com.mes.engineering.entity.Engineering;
-import com.mes.engineering.service.impl.EngineeringServiceImpl;
+import com.mes.engineering.service.EngineeringService;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.pp.service.OptimizeProjectService;
+import com.mes.uppattenusage.entity.UpPattenUsage;
+import com.mes.uppattenusage.service.UpPattenUsageService;
import com.mes.utils.Result;
-import com.mes.workstation.service.UpWorkstationService;
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.engineering.service.EngineeringService;
+
+import java.util.List;
+
/**
* <p>
* 鍓嶇鎺у埗鍣�
@@ -24,14 +30,76 @@
public class EngineeringController {
@Autowired
private EngineeringService engineeringService;
-
+ @Autowired
+ private UpPattenUsageService upPattenUsageService;
+ @Autowired
+ private GlassInfoService glassInfoService;
+ @Autowired
+ private OptimizeProjectService optimizeProjectService;
@ApiOperation("寮�濮�/鏆傚仠浠诲姟/浼犻�掑伐绋嬪彿鍜岀姸鎬�,寮�濮嬫槸1 鏆傚仠鏄�0")
+ @PostMapping("/pauseTask") //鏆傚仠涓婄墖浠诲姟
+ @ResponseBody
+ public Result <List<UpPattenUsage>> pauseTask(@RequestBody Engineering engineering) {
+ boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
+ List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
+ if(work){
+ return Result.build(200,"鎴愬姛",glass);
+ }else {
+ return Result.build(100,"澶辫触",glass);
+ }
+ }
+
+ @ApiOperation("鏆傚仠")
+ @PostMapping("/pause") //鏆傚仠涓婄墖浠诲姟
+ @ResponseBody
+ public Result <List<UpPattenUsage>> pause(@RequestBody Engineering engineering) {
+ boolean work=engineeringService.pauseTask(engineering.getEngineerId(),engineering.getState());
+ List<UpPattenUsage> glass = upPattenUsageService.prioritylist();String message;
+ if(work){
+ return Result.build(200,"鎴愬姛",glass);
+ }else {
+ return Result.build(100,"鎴愬姛",glass);
+ }
+ }
+
+ @ApiOperation("寮�濮嬩笂鐗�")
@PostMapping("/changeTask") //璋冪敤涓婄墖浠诲姟
@ResponseBody
- public Result <Engineering> changeTask(String projectId , Integer state) {
- boolean work=engineeringService.changeTask(projectId,state);
- log.info("寮�濮嬩换鍔¤繑鍥�:{}", work);
- return Result.build(200, "",null);
+ public Result <Boolean> changeTask(@RequestBody Engineering engineering) {
+ log.info("engineeringId:{}", engineering);
+ UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
+ if (upPattenUsage != null) {
+ boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
+ List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
+ optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
+ return Result.build(200, "宸蹭繚瀛樿繃", work);
+ } 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琛ㄧ姸鎬佷负宸查鍙�");
+ //灏唀ngineering琛ㄧ姸鎬佷负姝ｅ湪涓婄墖
+ boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
+ List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
+ optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
+ return Result.build(200, "淇濆瓨鎴愬姛", work);
+ }
+
+ }
+
+ @ApiOperation("鏌ヨ鍙互涓婄墖鐨勫伐绋嬪彿")
+ @GetMapping("/selectTask") //璋冪敤涓婄墖浠诲姟
+ @ResponseBody
+ public Result <List<Engineering>> selectTask() {
+ List<Engineering> engineering=engineeringService.selectTask();
+ log.info("鍙鍙栦换鍔¤繑鍥�:{}", engineering);
+ return Result.build(200, "",engineering);
}
}
--
Gitblit v1.8.0