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 | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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 62ab37d..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,6 +36,7 @@
private GlassInfoService glassInfoService;
@Autowired
private OptimizeProjectService optimizeProjectService;
+
@ApiOperation("寮�濮�/鏆傚仠浠诲姟/浼犻�掑伐绋嬪彿鍜岀姸鎬�,寮�濮嬫槸1 鏆傚仠鏄�0")
@PostMapping("/pauseTask") //鏆傚仠涓婄墖浠诲姟
@ResponseBody
@@ -100,17 +101,18 @@
@ApiOperation("鍒犻櫎宸ョ▼涓婄墖")
@PostMapping("/deleteTask") //璋冪敤涓婄墖浠诲姟
@ResponseBody
- public Result <Boolean> deleteTask(@RequestBody Engineering engineering) {
+ 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);
- if (work) {
- return Result.build(200, "鍒犻櫎鎴愬姛"+engineering.getEngineerId(), true);
- }else {
- return Result.build(200, "鍒犻櫎澶辫触"+engineering.getEngineerId(), false);
- }
+// 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);
+
}
--
Gitblit v1.8.0