From 1ce72200c83bea66259c77bb0fce0cce1a4399ba Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 17 十二月 2024 10:29:50 +0800
Subject: [PATCH] 增加上片1,2号线的数据推送
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 45 insertions(+), 6 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 66aef59..1514655 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
@@ -36,14 +36,31 @@
private GlassInfoService glassInfoService;
@Autowired
private OptimizeProjectService optimizeProjectService;
+
@ApiOperation("寮�濮�/鏆傚仠浠诲姟/浼犻�掑伐绋嬪彿鍜岀姸鎬�,寮�濮嬫槸1 鏆傚仠鏄�0")
- @PostMapping("/pauseTask") //璋冪敤涓婄墖浠诲姟
+ @PostMapping("/pauseTask") //鏆傚仠涓婄墖浠诲姟
@ResponseBody
public Result <List<UpPattenUsage>> pauseTask(@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);
+ 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, "鎴愬姛", null);
+ }else {
+ return Result.build(100, "鎴愬姛", null);
+ }
}
@ApiOperation("寮�濮嬩笂鐗�")
@@ -53,7 +70,7 @@
log.info("engineeringId:{}", engineering);
UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
if (upPattenUsage != null) {
- boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
+ boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState());
List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
return Result.build(200, "宸蹭繚瀛樿繃", work);
@@ -69,14 +86,36 @@
engineeringService.saveEngineering(listEngineering);
log.info("鏇存敼pp琛ㄧ姸鎬佷负宸查鍙�");
//灏唀ngineering琛ㄧ姸鎬佷负姝ｅ湪涓婄墖
- boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
+ boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState());
List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
- return Result.build(200, "淇濆瓨鎴愬姛", work);
+ if (work) {
+ return Result.build(200, "淇濆瓨鎴愬姛"+engineering.getEngineerId(), true);
+ }else {
+ return Result.build(200, "淇濆瓨澶辫触"+engineering.getEngineerId(), false);
+ }
}
}
+ @ApiOperation("鍒犻櫎宸ョ▼涓婄墖")
+ @PostMapping("/deleteTask") //璋冪敤涓婄墖浠诲姟
+ @ResponseBody
+ public Result <List<GlassInfo>> deleteTask(@RequestBody Engineering engineering) {
+ //鍒犻櫎宸ョ▼琛ㄣ�佸皬鐗囪〃銆佷笂鐗囪〃锛屾洿鏀逛紭鍖栬〃鐘舵��
+// boolean work=engineeringService.deleteTask(engineering.getEngineerId());
+// glassInfoService.deleteTask(engineering.getEngineerId());
+// upPattenUsageService.deleteTask(engineering.getEngineerId());
+// optimizeProjectService.changeTask(engineering.getEngineerId(), 100);
+ //鏆傚仠宸ョ▼
+ engineeringService.pauseTask(engineering.getEngineerId(),0);
+ //鏌ヨ鏈笂鐗囩殑灏忕墖淇℃伅
+ List<GlassInfo>glasslist=glassInfoService.selectEdgGlassInfo(engineering.getEngineerId());
+ return Result.build(200, "鍒犻櫎鎴愬姛"+engineering.getEngineerId(), glasslist);
+
+
+ }
+
@ApiOperation("鏌ヨ鍙互涓婄墖鐨勫伐绋嬪彿")
@GetMapping("/selectTask") //璋冪敤涓婄墖浠诲姟
@ResponseBody
--
Gitblit v1.8.0