From 7d691c873261fc73ea412f20f42eb12560d6ca7b Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 05 十二月 2024 13:39:04 +0800
Subject: [PATCH] 中空接口及样式调整
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 3421f33..07ec598 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
@@ -42,18 +42,24 @@
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.changeTask(engineering.getEngineerId(),engineering.getState());
- List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
- log.info("StartorStop:{},{}", work,engineering);
- return Result.build(200, engineering.getEngineerId(),glass);
+ 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("寮�濮嬩笂鐗�")
@@ -63,7 +69,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);
@@ -79,10 +85,14 @@
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);
+ }
}
}
--
Gitblit v1.8.0