From b365a0879edc787655b908b0dbb65b5e966bb23b Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 07 五月 2024 09:03:08 +0800
Subject: [PATCH] 公共yml文件 ip  改回10.153.19.150

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java |   64 +++++++++++++++++++++-----------
 1 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
index 9087138..8feea50 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
@@ -5,17 +5,17 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mes.downglassinfo.entity.DownGlassInfo;
 import com.mes.downglassinfo.entity.DownGlassTask;
 import com.mes.downglassinfo.mapper.DownGlassTaskMapper;
 import com.mes.downglassinfo.service.DownGlassTaskService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
 /**
  * <p>
- *  鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
  * </p>
  *
  * @author zhoush
@@ -23,7 +23,6 @@
  */
 @Service
 public class DownGlassTaskServiceImpl extends ServiceImpl<DownGlassTaskMapper, DownGlassTask> implements DownGlassTaskService {
-
 
 
     @Override
@@ -34,18 +33,20 @@
     }
 
     @Override
-    public void updateTaskStateToZero(String flowCardId) {
+    public void updateTaskStateToZero(long id) {
         UpdateWrapper<DownGlassTask> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.set("task_stauts", 0).eq("flow_card_id", flowCardId);
-        baseMapper.update(null, updateWrapper);
+        updateWrapper.set("task_stauts", 0).eq("id", id);
+        baseMapper.update(new DownGlassTask(), updateWrapper);
     }
+
     @Override
-    public void deleteTask(String flowCardId) {
+    public void deleteTask(String id) {
         LambdaQueryWrapper<DownGlassTask> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(DownGlassTask::getFlowCardId, flowCardId);
+        queryWrapper.eq(DownGlassTask::getFlowCardId, id);
 
         baseMapper.delete(queryWrapper);
     }
+
     @Override
     public DownGlassTask selectLastOutCacheInfo(String endCell) {
         QueryWrapper<DownGlassTask> queryWrapper = new QueryWrapper<>();
@@ -56,23 +57,42 @@
 
         return baseMapper.selectOne(queryWrapper);
     }
-    @Override
-    public Integer insertCacheTask(int id, String start, String end, String type, double width, double height, String filmsId, double thickness, String flowCardId) {
-        DownGlassTask glassInfo = new DownGlassTask();
-        glassInfo.setId(id);
-        glassInfo.setStartCell(start);
-        glassInfo.setEndCell(end);
-        glassInfo.setTaskType(type);
-        glassInfo.setWidth(width);
-        glassInfo.setHeight(height);
-        glassInfo.setFilmsid(filmsId);
-        glassInfo.setThickness(thickness);
-        glassInfo.setFlowCardId(flowCardId);
-        glassInfo.setTaskStauts(0); // 榛樿浠诲姟鐘舵�佷负0
 
-        int rows = baseMapper.insert(glassInfo);
+    @Override
+    public Integer insertCacheTask(DownGlassTask downGlassTask) {
+        // 鏌ヨ鏁版嵁搴擄紝妫�鏌ヤ富閿�兼槸鍚﹀凡缁忓瓨鍦�
+        DownGlassTask existingTask = baseMapper.selectById(downGlassTask.getId());
+        if (existingTask != null) {
+            // 濡傛灉宸插瓨鍦ㄧ浉鍚屼富閿�肩殑浠诲姟锛屽垯涓嶈繘琛屾彃鍏ユ搷浣滐紝杩斿洖 null 鎴栬�呮姏鍑哄紓甯�
+            // 杩欓噷绠�鍗曡捣瑙侊紝鐩存帴杩斿洖 null
+            return null;
+        }
+
+        // 濡傛灉涓婚敭鍊间笉瀛樺湪锛屽垯杩涜鎻掑叆鎿嶄綔
+        DownGlassTask newDownGlassTask = new DownGlassTask();
+        BeanUtils.copyProperties(downGlassTask, newDownGlassTask);
+        newDownGlassTask.setTaskStauts(0); // 榛樿浠诲姟鐘舵�佷负0
+
+        int rows = baseMapper.insert(newDownGlassTask);
         return rows > 0 ? rows : null;
     }
 
 
+
+    @Override
+    public List<DownGlassTask> selectInputTaskCache() {
+        return baseMapper.selectList(new QueryWrapper<DownGlassTask>().eq("task_status", 0).eq("task_type", 1));
+    }
+
+    /**
+     * 鏌ヨ寰呭嚭鐗囦换鍔�
+     *
+     * @return
+     */
+    @Override
+    public List<DownGlassTask> selectOutTaskCache() {
+        return baseMapper.selectList(new QueryWrapper<DownGlassTask>().eq("task_status", 0).eq("task_type", 2));
+    }
+
+
 }

--
Gitblit v1.8.0