From 66d9a37adfa32014d479ae1e67575d2392084676 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 12 九月 2025 09:05:51 +0800
Subject: [PATCH] 1、大屏动画修改

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java
index dbdc794..4f40aba 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java
@@ -1,20 +1,25 @@
-package com.mes.userinfo.controller;
+package com.mes.bigstoragetask.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
 import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
 import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
+import com.mes.temperingglass.entity.TemperingGlassInfo;
+import com.mes.temperingglass.service.TemperingGlassInfoService;
+import com.mes.utils.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.tomcat.util.bcel.Const;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
 /**
  * <p>
- *  鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
  * </p>
  *
  * @author zhoush
@@ -22,16 +27,47 @@
  */
 @Api(description = "鍑虹墖浠诲姟淇℃伅")
 @RestController
-@RequestMapping("/big-storage-cage-out-task")
+@Slf4j
+@RequestMapping("/bigStorageCageOutTask")
 public class BigStorageCageOutTaskController {
 
     @Autowired
     private BigStorageCageOutTaskService bigStorageCageOutTaskService;
-    @ApiOperation("杩涚墖浠诲姟淇℃伅")
-    @GetMapping("/querybigStorageCageTask")
-    public List<BigStorageCageOutTask> querybigStorageCageOutTask(int taskState) {
-        return bigStorageCageOutTaskService.querybigStorageCageOutTask(taskState);
+    @Autowired
+    private TemperingGlassInfoService temperingGlassInfoService;
+
+    @ApiOperation("鍑虹墖浠诲姟淇敼")
+    @PostMapping("/updatebigStorageCageOutTask")
+    public Result deleteBigStorageCageDetails(@RequestBody BigStorageCageOutTask bigStorageCageOutTask) {
+        if (bigStorageCageOutTask.getTaskState() > 3) {
+            temperingGlassInfoService.remove(
+                    new LambdaUpdateWrapper<TemperingGlassInfo>()
+                            .in(TemperingGlassInfo::getGlassId, bigStorageCageOutTask.getGlassId())
+            );
+        } else {
+            temperingGlassInfoService.update(
+                    new LambdaUpdateWrapper<TemperingGlassInfo>()
+                            .in(TemperingGlassInfo::getGlassId, bigStorageCageOutTask.getGlassId())
+                            .set(TemperingGlassInfo::getState, 0)
+            );
+        }
+        bigStorageCageOutTaskService.updateById(bigStorageCageOutTask);
+        log.info("鎵嬪姩淇敼鍑虹墖浠诲姟" + bigStorageCageOutTask);
+        return Result.build(200, "淇敼鎴愬姛", 1);
     }
 
+    @ApiOperation("鍑虹墖浠诲姟鎶ヨ〃")
+    @PostMapping("/selectBigStorageCageOutTask")
+    public Result selectBigStorageCageOutTask(@RequestBody BigStorageCageOutTask bigStorageCageOutTask,
+                                              @RequestParam(required = false) String startTime,
+                                              @RequestParam(required = false) String endTime) {
+        return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageOutTaskService.selectBigStorageCageOutTask(bigStorageCageOutTask, startTime, endTime));
+    }
+
+    @ApiOperation("閽㈠寲鍑虹墖")
+    @PostMapping("/temperingOut")
+    public Result selectBigStorageCageOutTask(@RequestBody BigStorageCageOutTask bigStorageCageOutTask) {
+        return Result.build(200, bigStorageCageOutTaskService.temperingOut(bigStorageCageOutTask), 1);
+    }
 }
 

--
Gitblit v1.8.0