From f68d3c71819feb59e7a227a5d992b059b900916c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 28 三月 2025 08:28:26 +0800
Subject: [PATCH] 修改报表，界面添加查询流程卡个数，调整推送数据到前端的间隔
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 66 ++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 21 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 07ec598..63e9e33 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
@@ -18,7 +18,7 @@
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author wu
@@ -36,36 +36,38 @@
private GlassInfoService glassInfoService;
@Autowired
private OptimizeProjectService optimizeProjectService;
+
@ApiOperation("寮�濮�/鏆傚仠浠诲姟/浼犻�掑伐绋嬪彿鍜岀姸鎬�,寮�濮嬫槸1 鏆傚仠鏄�0")
@PostMapping("/pauseTask") //鏆傚仠涓婄墖浠诲姟
@ResponseBody
- public Result <List<UpPattenUsage>> pauseTask(@RequestBody Engineering engineering) {
- boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
+ public Result<List<UpPattenUsage>> pauseTask(@RequestBody Engineering engineering) {
+ boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState());
List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
- if(work){
- return Result.build(200,"鎴愬姛",glass);
- }else {
- return Result.build(100,"澶辫触",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);
+ 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, "鎴愬姛", glass);
+ } else {
+ return Result.build(100, "鎴愬姛", glass);
}
}
@ApiOperation("寮�濮嬩笂鐗�")
@PostMapping("/changeTask") //璋冪敤涓婄墖浠诲姟
@ResponseBody
- public Result <Boolean> changeTask(@RequestBody Engineering engineering) {
+ public Result<Boolean> changeTask(@RequestBody Engineering engineering) {
log.info("engineeringId:{}", engineering);
UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
if (upPattenUsage != null) {
@@ -89,10 +91,32 @@
List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
if (work) {
- return Result.build(200, "淇濆瓨鎴愬姛"+engineering.getEngineerId(), true);
- }else {
- return Result.build(200, "淇濆瓨澶辫触"+engineering.getEngineerId(), false);
+ return Result.build(200, "淇濆瓨鎴愬姛" + engineering.getEngineerId(), true);
+ } else {
+ return Result.build(200, "淇濆瓨鎴愬姛" + engineering.getEngineerId(), false);
}
+ }
+
+ }
+
+ @ApiOperation("鍒犻櫎宸ョ▼涓婄墖")
+ @PostMapping("/deleteTask") //璋冪敤涓婄墖浠诲姟
+ @ResponseBody
+ public Result<Boolean> deleteTask(@RequestBody Engineering engineering) {
+ //鍒犻櫎宸ョ▼琛ㄣ�佸皬鐗囪〃銆佷笂鐗囪〃锛屾洿鏀逛紭鍖栬〃鐘舵��
+ boolean work = false;
+ Engineering engineeringState = engineeringService.selectEngineeringState(engineering.getEngineerId());
+ if (engineeringState == null) {
+ 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);
}
}
@@ -100,10 +124,10 @@
@ApiOperation("鏌ヨ鍙互涓婄墖鐨勫伐绋嬪彿")
@GetMapping("/selectTask") //璋冪敤涓婄墖浠诲姟
@ResponseBody
- public Result <List<Engineering>> selectTask() {
- List<Engineering> engineering=engineeringService.selectTask();
+ public Result<List<Engineering>> selectTask() {
+ List<Engineering> engineering = engineeringService.selectTask();
log.info("鍙鍙栦换鍔¤繑鍥�:{}", engineering);
- return Result.build(200, "",engineering);
+ return Result.build(200, "", engineering);
}
}
--
Gitblit v1.8.0