From 6abb85bba678dee5d8aee82dbcd18758690402db Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 23 十二月 2024 10:58:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java |   74 +++++++++++++++++++++++++++++++-----
 1 files changed, 63 insertions(+), 11 deletions(-)

diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
index 59e226d..1fa6eec 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
@@ -1,5 +1,6 @@
 package com.mes.uppattenusage.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -7,7 +8,6 @@
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.query.MPJQueryWrapper;
 import com.mes.engineering.entity.Engineering;
-import com.mes.engineering.mapper.EngineeringMapper;
 import com.mes.engineering.service.EngineeringService;
 import com.mes.pp.entity.OptimizeProject;
 import com.mes.pp.mapper.OptimizeProjectMapper;
@@ -20,6 +20,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -54,9 +55,26 @@
     }
 
     @Override
+    public List<UpPattenUsage> selectLoadTask(Integer cell) {
+        //鑾峰彇姝ｅ湪涓婄墖鐨勪换鍔d
+        Engineering engineering= engineeringService.selectInitiates(1,cell);
+        //log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷{}",engineering);
+        if(engineering!=null){
+            LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId());
+            return this.list(wrapper);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
     public List<UpPattenUsage> selectUpPattenUsage(UpPattenUsage upPattenUsage) {
         LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(UpPattenUsage::getEngineeringId,upPattenUsage.getEngineeringId());
+        wrapper.eq(UpPattenUsage::getEngineeringId, upPattenUsage.getEngineeringId());
+//                .eq(UpPattenUsage::getStationCell, upPattenUsage.getStationCell())
+//                .eq(UpPattenUsage::getFilmRemove, upPattenUsage.getFilmRemove());
+
         return this.list(wrapper);
     }
 
@@ -97,25 +115,50 @@
 
     @Override
     public void saveUpPattenUsage(List<UpPattenUsage> upPattenUsage) {
-        this.saveBatch(upPattenUsage);
-        //淇濆瓨鍘熺墖浣跨敤璇︽儏琛�
+        if (CollectionUtil.isEmpty(upPattenUsage)){
+            return;
+        }
+        String engineerId = upPattenUsage.get(0).getEngineeringId();
+        int count = this.count(new LambdaQueryWrapper<UpPattenUsage>().eq(UpPattenUsage::getEngineeringId, engineerId));
+        if (count <=0){
+            //淇濆瓨鍘熺墖浣跨敤璇︽儏琛�
+            this.saveBatch(upPattenUsage);
+        }
     }
 
     @Override
     public void updateUpPattenUsageState(UpPattenUsage upPattenUsage, Integer state) {
         upPattenUsage.setState(state);
-        boolean updateSuccess=this.updateById(upPattenUsage);
-        log.info("鏇存柊鐘舵�亄}",updateSuccess);
+        boolean updateSuccess = this.updateById(upPattenUsage);
+        log.info("鏇存柊鐘舵�亄}", updateSuccess);
         //鏇存柊鐘舵��
     }
 
     @Override
-    public UpPattenUsage selectedEngineering(String engineeringId) {
-        QueryWrapper<UpPattenUsage>wrapper = new QueryWrapper<>();
-        wrapper.eq("engineering_id",engineeringId)
+    public UpPattenUsage selectedTaskEngineering(String engineeringId) {
+        return null;
+    }
+
+    @Override
+    public UpPattenUsage selectedEngineering(String engineerId) {
+        QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
+        wrapper.eq("engineering_id", engineerId)
+//                .eq("station_cell", stationCell)
+//                .eq("film_remove", filmRemove)
                 .last("limit 1");
+        log.info("鏌ヨ棰勮鍙傛暟");
+        log.info("鏌ヨ棰勮鍙傛暟{}", this.getOne(wrapper));
         return this.getOne(wrapper);
     }
+
+    @Override
+    public void deleteTask(String engineerId) {
+        QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
+        wrapper.eq("engineering_id",engineerId);
+        this.remove(wrapper);
+    }
+
+
 
     @Override
     public UpPattenUsage selectOverTask() {
@@ -139,10 +182,19 @@
     @Override
     public Boolean updateGlassState(UpPattenUsage upPattenUsage) {
         UpdateWrapper<UpPattenUsage> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id",upPattenUsage.getId())
-                .set("state",upPattenUsage.getState());
+        updateWrapper.eq("id", upPattenUsage.getId())
+                .set("state", upPattenUsage.getState());
         return this.update(updateWrapper);
     }
 
+    @Override
+    public List<Engineering> setRawGlassTaskRequest(Engineering request) {
+        return null;
+    }
+
+    public Object Engineering(Engineering request) {
+        return null;
+    }
+
 
 }

--
Gitblit v1.8.0