From 2cf1b1baa5f74154e8b0f98521eff72cbe9c685b Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 07 八月 2024 16:25:52 +0800
Subject: [PATCH] 更改破损状态的显示和方法

---
 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java |   56 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java
index 16574db..0157fee 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java
@@ -1,5 +1,8 @@
 package com.mes.storagetask.controller;
 
+import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
+import com.mes.storagetask.entity.request.StorageTaskRequest;
+import com.mes.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import io.swagger.annotations.ApiOperation;
@@ -14,6 +17,8 @@
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  *  
@@ -38,9 +43,9 @@
     @ApiOperation(value = "鍒楄〃鏌ヨ",notes = "鍒楄〃鏌ヨ",produces = "application/json")
     @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
     @PostMapping("/findList")
-    public ResponseEntity<List<StorageTask>> findList(@RequestBody StorageTask params) {
+    public Result findList(@RequestBody StorageTask params) {
         List<StorageTask> result = storageTaskService.findList(params);
-        return ResponseEntity.ok(result);
+        return Result.success(result);
     }
 
     /**
@@ -52,9 +57,9 @@
     @ApiOperation(value = "鏌ヨ", notes = "鏌ヨ璇︽儏")
     @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
     @GetMapping("/{id}")
-    public ResponseEntity<StorageTask> findById(@PathVariable("id") Long id) {
-        StorageTask storageTask = storageTaskService.findById(id);
-        return ResponseEntity.ok(storageTask);
+    public Result findById(@PathVariable("id") Long id) {
+        StorageTask storageTask = storageTaskService.getBaseMapper().selectById(id);
+        return Result.success(storageTask);
     }
 
     /**
@@ -66,9 +71,9 @@
     @ApiOperation(value = "鏂板", notes = "鏂板鏁版嵁")
     @ApiResponses({@ApiResponse(code = 200, message = "鎿嶄綔鎴愬姛")})
     @PostMapping
-    public ResponseEntity<Boolean> insert( @RequestBody StorageTask storageTask) {
-        boolean result = storageTaskService.insert(storageTask);
-        return ResponseEntity.ok(result);
+    public Result insert( @RequestBody StorageTask storageTask) {
+        boolean result = storageTaskService.save(storageTask);
+        return Result.success(result);
     }
 
     /**
@@ -80,9 +85,9 @@
     @ApiOperation(value = "淇敼", notes = "淇敼鏁版嵁")
     @ApiResponses({@ApiResponse(code = 200, message = "鎿嶄綔鎴愬姛")})
     @PutMapping
-    public ResponseEntity<Boolean> update( @RequestBody StorageTask storageTask) {
-        boolean result = storageTaskService.update(storageTask);
-        return ResponseEntity.ok(result);
+    public Result update( @RequestBody StorageTask storageTask) {
+        boolean result = storageTaskService.updateById(storageTask);
+        return Result.success(result);
     }
 
     /**
@@ -93,9 +98,32 @@
      */
     @ApiOperation(value = "鍒犻櫎", notes = "鍒犻櫎鏁版嵁")
     @DeleteMapping("/{id}")
-    public ResponseEntity<Integer> delete(@PathVariable("id") Long id) {
-        int result = storageTaskService.delete(id);
-        return ResponseEntity.ok(result);
+    public Result delete(@PathVariable("id") Long id) {
+        int result = storageTaskService.getBaseMapper().deleteById(id);
+        return Result.success(result);
     }
 
+
+    @ApiOperation(value = "浠诲姟鏌ヨ",notes = "浠诲姟鏌ヨ",produces = "application/json")
+    @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
+    @GetMapping("/findTasks")
+    public Result findLatestTasks() {
+        List<StorageTaskRequest> result = storageTaskService.Tasks();
+        return Result.success(result);
+    }
+
+
+
+    @ApiOperation(value = "浠诲姟鎿嶄綔", notes = "浠诲姟鎿嶄綔")
+    @PostMapping("/taskUpdate")
+    public Result taskUpdate(@RequestBody Map<String, Object> storageTaskMap) {
+
+        StorageTask task = new StorageTask();
+        task.setType((String) storageTaskMap.get("Type")); // 鍋囪Type鏄瓨鍌ㄥ湪Map涓殑涓�涓敭
+        task.setId((int) storageTaskMap.get("id"));
+        storageTaskService.taskUpdate(task);
+        return Result.success();
+    }
+
+
 }
\ No newline at end of file

--
Gitblit v1.8.0