From bfb8fee59115eb328c41709f178675f24c32afe5 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 11 九月 2024 09:17:30 +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 | 64 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 18 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 fa14e27..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,11 +1,8 @@
package com.mes.md.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.mes.md.entity.Account;
import com.mes.md.entity.Tasking;
-import com.mes.md.mapper.TaskingMapper;
+import com.mes.md.service.TaskingService;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,21 +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) {
- @Autowired
- TaskingMapper taskingMapper;
+ boolean result =taskingService.updateDamage(tasking);
+ return Result.build(1,"瀹氬埗妯″紡",null);
- @ApiOperation("璐︽埛缁戝畾瑙掕壊")
- @PostMapping("/bindAccountRole")
- @ResponseBody
- public Result Tasking (@RequestBody Tasking tasking) {
- List<Tasking> list=taskingMapper.selectList(new MPJLambdaWrapper<Tasking>().selectAll()
- .eq(Tasking::getState,"绾夸笂")
- .eq(Tasking::getCurrentCraft,"gongui"));
- return Result.build(200,"鎴愬姛",list);
- }
+
+ }
+ @ApiOperation("鏌ヨ褰撳墠妯″紡杩囧幓鐨勭幓鐠�")
+ @PostMapping("/selectTasking") //鏆傚仠涓婄墖浠诲姟
+ @ResponseBody
+ public Result<List<Tasking>> selectTasking() {
+
+ List<Tasking> tasking =taskingService.selectTasking();
+ return Result.build(1,"瀹氬埗妯″紡",tasking);
+ }
}
--
Gitblit v1.8.0