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/service/impl/BigStorageCageFeedTaskServiceImpl.java |   72 ++++++++++++++++++++++++++++++-----
 1 files changed, 61 insertions(+), 11 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageFeedTaskServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageFeedTaskServiceImpl.java
index 5a4b62b..0b91a9c 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageFeedTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageFeedTaskServiceImpl.java
@@ -1,21 +1,21 @@
 package com.mes.bigstoragetask.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.bigstorage.entity.BigStorageDTO;
 import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
-import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
 import com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper;
 import com.mes.bigstoragetask.service.BigStorageCageFeedTaskService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import net.bytebuddy.matcher.FilterableList;
+import com.mes.utils.Result;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
  * <p>
- *  鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
  * </p>
  *
  * @author zhoush
@@ -24,21 +24,71 @@
 @Service
 public class BigStorageCageFeedTaskServiceImpl extends ServiceImpl<BigStorageCageFeedTaskMapper, BigStorageCageFeedTask> implements BigStorageCageFeedTaskService {
 
+    @Value("${mes.glassGap}")
+    private Integer glassGap;
+
     @Override
-    public void addFeedTask(BigStorageCageDetails slotInfo, Integer plcFeedReqLine, int taskType){
-        BigStorageCageFeedTask bigStorageCageFeedTask=new BigStorageCageFeedTask();
+    public void addFeedTask(BigStorageCageDetails slotInfo, Integer plcFeedReqLine, int taskType) {
+        BigStorageCageFeedTask bigStorageCageFeedTask = new BigStorageCageFeedTask();
         bigStorageCageFeedTask.setId(slotInfo.getId());
         bigStorageCageFeedTask.setTaskState(0);
         bigStorageCageFeedTask.setLine(plcFeedReqLine);
-        bigStorageCageFeedTask.setTragetSlot(slotInfo.getSlot());
         bigStorageCageFeedTask.setTaskType(taskType);
         baseMapper.insert(bigStorageCageFeedTask);
     }
 
     @Override
-    public List<BigStorageCageFeedTask> querybigStorageCageFeedTask(int taskState){
-        LambdaQueryWrapper<BigStorageCageFeedTask> getFeedTaskWrapper=new LambdaQueryWrapper<>();
-        getFeedTaskWrapper.eq(BigStorageCageFeedTask::getTaskState,taskState);
+    public List<BigStorageCageFeedTask> querybigStorageCageFeedTask(int taskState) {
+        LambdaQueryWrapper<BigStorageCageFeedTask> getFeedTaskWrapper = new LambdaQueryWrapper<>();
+        getFeedTaskWrapper.eq(BigStorageCageFeedTask::getTaskState, taskState);
         return baseMapper.selectList(getFeedTaskWrapper);
     }
+
+    @Override
+    public BigStorageDTO querySitToUpRemainWidth(Integer line) {
+        return baseMapper.querySitToUpRemainWidth(line, glassGap);
+    }
+
+    @Override
+    public List<Integer> querySitToUpGlass() {
+        return baseMapper.querySitToUpGlass();
+    }
+
+    @Override
+    public List<BigStorageCageFeedTask> selectBigStorageCageFeedTask(BigStorageCageFeedTask bigStorageCageFeedTask, String startTime, String endTime) {
+        if (endTime != null && !endTime.isEmpty()) {
+            endTime = endTime + " 23:59:59";
+        }
+        LambdaQueryWrapper<BigStorageCageFeedTask> wrapper = new LambdaQueryWrapper<>();
+        if (bigStorageCageFeedTask.getTargetSlot() != null) {
+            wrapper.eq(BigStorageCageFeedTask::getTargetSlot, bigStorageCageFeedTask.getTargetSlot());
+        }
+        if (bigStorageCageFeedTask.getWidth() != null) {
+            wrapper.eq(BigStorageCageFeedTask::getWidth, bigStorageCageFeedTask.getWidth());
+        }
+        if (bigStorageCageFeedTask.getHeight() != null) {
+            wrapper.eq(BigStorageCageFeedTask::getHeight, bigStorageCageFeedTask.getHeight());
+        }
+        if (bigStorageCageFeedTask.getLine() != 0) {
+            wrapper.eq(BigStorageCageFeedTask::getLine, bigStorageCageFeedTask.getLine());
+        }
+        if (bigStorageCageFeedTask.getTaskState() != -1) {
+            wrapper.eq(BigStorageCageFeedTask::getTaskState, bigStorageCageFeedTask.getTaskState());
+        }
+        if (bigStorageCageFeedTask.getTaskType() != 0) {
+            wrapper.eq(BigStorageCageFeedTask::getTaskType, bigStorageCageFeedTask.getTaskType());
+        }
+        if (startTime != null && !startTime.isEmpty()) {
+            wrapper.ge(BigStorageCageFeedTask::getCreateTime, startTime);
+        }
+        if (endTime != null && !endTime.isEmpty()) {
+            wrapper.le(BigStorageCageFeedTask::getCreateTime, endTime);
+        }
+        wrapper.orderByDesc(BigStorageCageFeedTask::getId);
+        wrapper.and(item -> item.eq(BigStorageCageFeedTask::getDeleted, 0)
+                .or()
+                .eq(BigStorageCageFeedTask::getDeleted, 1));
+        wrapper.between(BigStorageCageFeedTask::getCreateTime, startTime, endTime);
+        return baseMapper.selectList(wrapper);
+    }
 }

--
Gitblit v1.8.0