From 1ee71b1f8d0cb29c765a58c2a32750f27fc0bcfa Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 22 五月 2024 10:41:31 +0800
Subject: [PATCH] 代码迁移：将上片模块部分代码移到上片模块
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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..08268b3 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,17 @@
import com.mes.engineering.entity.Engineering;
-import com.mes.engineering.service.impl.EngineeringServiceImpl;
+import com.mes.engineering.service.EngineeringService;
+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 +27,26 @@
public class EngineeringController {
@Autowired
private EngineeringService engineeringService;
+ @Autowired
+ private UpPattenUsageService upPattenUsageService;
@ApiOperation("寮�濮�/鏆傚仠浠诲姟/浼犻�掑伐绋嬪彿鍜岀姸鎬�,寮�濮嬫槸1 鏆傚仠鏄�0")
@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 <List<UpPattenUsage>> changeTask(@RequestBody Engineering engineering) {
+ boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
+ List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
+ log.info("StartorStop:{},{}", work,engineering);
+ return Result.build(200, engineering.getEngineerId(),glass);
+ }
+
+ @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