From c136e33dd6aab00015d3e40fee00349eff2bf137 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期六, 14 九月 2024 09:20:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/JiuMuMES
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java | 146 ++++++++++++++++++++++++++++--------------------
1 files changed, 86 insertions(+), 60 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 4ded016..b11911c 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
@@ -1,6 +1,7 @@
package com.mes.md.controller;
+import com.mes.md.entity.Machine;
import com.mes.md.entity.Tasking;
import com.mes.md.service.TaskingService;
import com.mes.utils.Result;
@@ -15,8 +16,8 @@
* 宸ヤ綔浠诲姟鎿嶄綔璁板綍鏄庣粏 鍓嶇鎺у埗鍣�
* </p>
*
- * @author wu
- * @since 2024-08-28
+ * @author yanzhixin
+ * @since 2024-09-13
*/
@RestController
@RequestMapping("/tasking")
@@ -24,84 +25,109 @@
@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("/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);
+// }
- }
- @ApiOperation("鏌ヨ褰撳墠妯″紡杩囧幓鐨勭幓鐠�")
- @PostMapping("/selectTasking") //鏆傚仠涓婄墖浠诲姟
- @ResponseBody
- public Result<List<Tasking>> selectTasking() {
- List<Tasking> tasking =taskingService.selectTasking();
- return Result.build(1,"瀹氬埗妯″紡",tasking);
- }
-
- @ApiOperation("鏌ヨ褰撳墠宸ヨ壓锛屾煇宸ヤ綔鐘舵�佺殑绾夸笂浠诲姟")
- @PostMapping("/findCraftTasking")
+ @ApiOperation("鏌ヨ褰撳墠璁惧锛屾湭瀹屽伐鐘舵�佺殑绾夸笂浠诲姟")
+ @PostMapping("/findMachineTask")
@ResponseBody
- public Result findCraftTasking(@RequestBody Tasking tasking) {
- List<Tasking> list =taskingService.findCraftTasking(tasking);
+ public Result findMachineTask(@RequestBody Machine machine) {
+ List<Tasking> list =taskingService.findMachineTask(machine);
return Result.build(200,"鎴愬姛",list);
}
- @ApiOperation("淇敼浠诲姟鐘舵�� 銆愮牬鎹�/澶辫触/瀹屽伐銆�")
- @PostMapping("/updateCraftTasking")
+ @ApiOperation("鏌ヨ褰撳墠璁惧锛屾煇鐘舵�佺殑绾夸笂浠诲姟銆愮瓑寰�/姝ｅ湪宸ヤ綔/瀹屽伐銆�")
+ @PostMapping("/findMachineWorkStateTask")
@ResponseBody
- public Result updateCraftTasking(@RequestBody Tasking tasking) {
- int count =taskingService.updateCraftTasking(tasking);
+ public Result findMachineWorkStateTask(@RequestBody Machine machine,String workState) {
+ List<Tasking> list =taskingService.findMachineWorkStateTask(machine,workState);
+ return Result.build(200,"鎴愬姛",list);
+ }
+
+ @ApiOperation("淇敼鐜荤拑鐘舵�� 銆愮牬鎹熴��")
+ @PostMapping("/damagedTask")
+ @ResponseBody
+ public Result damagedTask(@RequestBody Tasking tasking) {
+ int count =taskingService.damagedTask(tasking);
return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
}
- @ApiOperation("淇敼褰撳墠璁惧 銆愬紑宸�/鏆傚仠銆�")
- @PostMapping("/updateMachineState")
+ @ApiOperation("淇敼浠诲姟鐘舵�� 銆愭鍦ㄥ伐浣溿��")
+ @PostMapping("/startMachineTask")
@ResponseBody
- public Result updateMachineState(@RequestBody Tasking tasking) {
- int count =taskingService.updateCraftTasking(tasking);
+ public Result startMachineTask(@RequestBody Machine machine) {
+ Tasking tasking =taskingService.startMachineTask(machine);
+ return Result.build(200,"淇敼鎴愬姛锛�",tasking);
+ }
+ @ApiOperation("淇敼浠诲姟鐘舵�� 銆愬け璐ャ��")
+ @PostMapping("/loseMachineTask")
+ @ResponseBody
+ public Result loseMachineTask(@RequestBody Machine machine) {
+ int count =taskingService.loseMachineTask(machine);
return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
}
+ @ApiOperation("淇敼浠诲姟鐘舵�� 銆愬畬宸ャ��")
+ @PostMapping("/finishMachineTask")
+ @ResponseBody
+ public Result finishMachineTask(@RequestBody Machine machine) {
+ int count =taskingService.finishMachineTask(machine);
+ return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
+ }
+
@ApiOperation("淇敼褰撳墠璁惧 銆愪笂绾裤��")
- @PostMapping("/updateTopLine")
+ @PostMapping("/glassTopLine")
@ResponseBody
- public Result updateTopLine(@RequestBody Tasking tasking) {
- int count =taskingService.updateCraftTasking(tasking);
+ public Result glassTopLine(@RequestBody List<Tasking> taskingList) {
+ int count =taskingService.glassTopLine(taskingList);
return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
}
@ApiOperation("淇敼褰撳墠璁惧 銆愪笅绾裤��")
- @PostMapping("/updateDownLine")
+ @PostMapping("/glassDownLine")
@ResponseBody
- public Result updateDownLine(@RequestBody Tasking tasking) {
- int count =taskingService.updateCraftTasking(tasking);
+ public Result glassDownLine(@RequestBody Tasking tasking) {
+ int count =taskingService.glassDownLine(tasking);
return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
}
--
Gitblit v1.8.0