From 339e2cecf06ce7d41314f8058414f64612c78221 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 20 五月 2024 14:37:36 +0800
Subject: [PATCH] 增加开始/暂停任务,架子数据修改时返回当前数据
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/controller/EngineeringController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/controller/EngineeringController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/controller/EngineeringController.java
index 97571fa..7400f9f 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/controller/EngineeringController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/controller/EngineeringController.java
@@ -2,6 +2,8 @@
import com.mes.engineering.entity.Engineering;
+import com.mes.uppattenusage.entity.UpPattenUsage;
+import com.mes.uppattenusage.service.UpPattenUsageService;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -25,14 +27,17 @@
public class EngineeringController {
@Autowired
private EngineeringService engineeringService;
+ @Autowired
+ private UpPattenUsageService upPattenUsageService;
@ApiOperation("寮�濮�/鏆傚仠浠诲姟/浼犻�掑伐绋嬪彿鍜岀姸鎬�,寮�濮嬫槸1 鏆傚仠鏄�0")
@PostMapping("/changeTask") //璋冪敤涓婄墖浠诲姟
@ResponseBody
- public Result <Boolean> changeTask(@RequestBody Engineering engineering) {
+ 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(),work);
+ return Result.build(200, engineering.getEngineerId(),glass);
}
@ApiOperation("鏌ヨ鍙互涓婄墖鐨勫伐绋嬪彿")
--
Gitblit v1.8.0