From def1eb8623e1444164ae4bce9179d011a89b8c5e Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 03 十二月 2024 09:15:27 +0800
Subject: [PATCH] 现场对接批量更新
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java | 71 +++++++++++------------------------
1 files changed, 23 insertions(+), 48 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java
index b11911c..c7281d2 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java
@@ -3,6 +3,8 @@
import com.mes.md.entity.Machine;
import com.mes.md.entity.Tasking;
+import com.mes.md.mapper.MachineMapper;
+import com.mes.md.service.ProjectService;
import com.mes.md.service.TaskingService;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
@@ -24,51 +26,10 @@
public class TaskingController {
@Autowired
private TaskingService taskingService;
-
-// @ApiOperation("鍒囨崲妯″紡")
-// @PostMapping("/updateLoadState") //鍒囨崲妯″紡"
-// @ResponseBody
-// public Result<Boolean> updateStatus(@RequestBody Integer state) {
-// if(state == 1){
-// boolean result =taskingService.updateStatus(state);
-// return Result.build(1,"瀹氬埗妯″紡",result);
-// }else {
-// boolean result =taskingService.updateStatus(state);
-// return Result.build(0,"鏍囧噯妯″紡",result);
-// }
-// }
-// @ApiOperation("鐐瑰嚮鏆傚仠璁惧")
-// @PostMapping("/updateLoadStatus") //鐐瑰嚮鏆傚仠璁惧
-// @ResponseBody
-// public Result<Boolean> updateLoadStatus(@RequestBody Integer state) {
-// if(state == 1){
-// boolean result =taskingService.updateLoadState(state);
-// return Result.build(1,"鎴愬姛",result);
-// }else {
-// boolean result =taskingService.updateLoadState(state);
-// return Result.build(0,"鎴愬姛",result);
-// }
-// }
-// @ApiOperation("鐐瑰嚮鐮存崯")
-// @PostMapping("/updateDamage") //鏆傚仠涓婄墖浠诲姟
-// @ResponseBody
-// public Result<Tasking> updateDamage(@RequestBody Tasking tasking) {
-//
-// boolean result =taskingService.updateDamage(tasking);
-// return Result.build(1,"瀹氬埗妯″紡",null);
-//
-//
-// }
-// @ApiOperation("鏌ヨ褰撳墠妯″紡杩囧幓鐨勭幓鐠�")
-// @PostMapping("/selectTasking") //鏆傚仠涓婄墖浠诲姟
-// @ResponseBody
-// public Result<List<Tasking>> selectTasking() {
-//
-// List<Tasking> tasking =taskingService.selectTasking();
-// return Result.build(1,"瀹氬埗妯″紡",tasking);
-// }
-
-
+ @Autowired
+ private ProjectService projectService;
+ @Autowired
+ private MachineMapper machineMapper;
@ApiOperation("鏌ヨ褰撳墠璁惧锛屾湭瀹屽伐鐘舵�佺殑绾夸笂浠诲姟")
@PostMapping("/findMachineTask")
@@ -116,10 +77,18 @@
}
@ApiOperation("淇敼褰撳墠璁惧 銆愪笂绾裤��")
+ @PostMapping("/glassTopLineList")
+ @ResponseBody
+ public Result glassTopLineList(@RequestBody List<Tasking> taskingList) {
+ int count =taskingService.glassTopLine(taskingList);
+ return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
+ }
+
+ @ApiOperation("淇敼褰撳墠璁惧 銆愪笂绾裤��")
@PostMapping("/glassTopLine")
@ResponseBody
- public Result glassTopLine(@RequestBody List<Tasking> taskingList) {
- int count =taskingService.glassTopLine(taskingList);
+ public Result glassTopLine(@RequestBody Tasking tasking) {
+ int count =taskingService.glassTopLine(tasking);
return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
}
@@ -130,7 +99,13 @@
int count =taskingService.glassDownLine(tasking);
return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
}
-
+ @ApiOperation("鐜荤拑 銆愪笅绾裤��")
+ @PostMapping("/glassAgainTopLine")
+ @ResponseBody
+ public Result glassAgainTopLine(@RequestBody Tasking tasking) {
+ int count =taskingService.stopTasking(tasking);
+ return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
+ }
}
--
Gitblit v1.8.0