From 489b48ad9fad5ad17106b7e69d778c824df3df9d Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 11 九月 2024 09:14:49 +0800
Subject: [PATCH] 提交合并代码
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 5 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 329b2ef..9cad4da 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,9 +1,14 @@
package com.mes.md.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.mes.md.entity.Tasking;
+import com.mes.md.service.TaskingService;
+import com.mes.utils.Result;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
/**
* <p>
@@ -13,9 +18,52 @@
* @author wu
* @since 2024-08-28
*/
-@RestController
-@RequestMapping("/tasking")
-public class TaskingController {
+ @RestController
+ @RequestMapping("/jiumumes/tasking")
+ 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);
+ }
}
--
Gitblit v1.8.0