From 00c4dfc5ac687c93e0b7abafc33abb693b38edd6 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 05 八月 2024 09:14:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java | 89 +++++++++++++++++++++++++++++++++++---------
1 files changed, 70 insertions(+), 19 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
index 7ade4e5..0e330b0 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
@@ -2,19 +2,24 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.mes.common.config.Const;
+import com.mes.damage.entity.Damage;
+import com.mes.damage.service.DamageService;
+import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.taskcache.entity.TaskCache;
import com.mes.taskcache.mapper.TaskCacheMapper;
import com.mes.taskcache.service.TaskCacheService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* <p>
@@ -24,11 +29,19 @@
* @author zhoush
* @since 2024-04-07
*/
+@Slf4j
@Service
-public class TaskCacheServiceImpl extends ServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {
+public class TaskCacheServiceImpl extends MPJBaseServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {
@Autowired
EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
+
+ @Autowired
+ GlassInfoMapper glassInfoMapper;
+ @Autowired
+ private TaskCacheMapper taskCacheMapper;
+
+
/**
* 娣诲姞鐞嗙墖绗间换鍔�
* @param taskCache
@@ -49,29 +62,51 @@
public List<Map<String,Object>> selectEdgInfo(String line) {
List<TaskCache> taskCache=baseMapper.selectList(new MPJLambdaWrapper<TaskCache>()
.selectAll(TaskCache.class)
- .eq(TaskCache::getEndCell,line)
- .eq(TaskCache::getTaskStatus,1));
+ .eq(TaskCache::getEndCell, line)
+ .eq(TaskCache::getTaskStatus,1)
+ .orderByAsc(TaskCache::getCreateTime));
List<Map<String,Object>> result=new ArrayList<>();
+ int serialNumber=1;
for(TaskCache taskCache1:taskCache){
Map<String,Object> map=new HashMap<>();
- EdgStorageCageDetails edgStorageCageDetails=edgStorageCageDetailsMapper.selectOne(new MPJLambdaWrapper<EdgStorageCageDetails>()
- .selectAll(EdgStorageCageDetails.class)
- .eq(EdgStorageCageDetails::getGlassId,taskCache1.getGlassId()));
- if(edgStorageCageDetails!=null){
- map.put("Line",line);
- map.put("Width",edgStorageCageDetails.getWidth());
- map.put("Height",edgStorageCageDetails.getHeight());
- map.put("Thickness",edgStorageCageDetails.getThickness());
- map.put("GlassId",edgStorageCageDetails.getGlassId());
- map.put("FlowCardId",edgStorageCageDetails.getFlowCardId());
- map.put("TemperingLayoutId",edgStorageCageDetails.getTemperingLayoutId());
- map.put("TemperingFeedSequence",edgStorageCageDetails.getTemperingFeedSequence());
+// GlassInfo glassInfo=glassInfoMapper.selectOne(new MPJLambdaWrapper<GlassInfo>()
+// .selectAll(GlassInfo.class)
+// .eq(GlassInfo::getGlassId,taskCache1.getGlassId()));
+ List<GlassInfo> glassInfos=glassInfoMapper.selectJoinList(GlassInfo.class, new MPJLambdaWrapper<GlassInfo>()
+ .selectAll(GlassInfo.class)
+ .innerJoin(EdgStorageCageDetails.class, on -> on
+ .eq(EdgStorageCageDetails::getGlassId, GlassInfo::getGlassId)
+ .eq(EdgStorageCageDetails::getEngineerId, GlassInfo::getEngineerId))
+ .eq(GlassInfo::getGlassId,taskCache1.getGlassId())
+ .eq(EdgStorageCageDetails::getState,Const.GLASS_STATE_OUT)
+ );
+ if(glassInfos.size()==1){
+ GlassInfo glassInfo=glassInfos.get(0);
+ map.put("Line",line);//绾胯矾 2001 1绾匡紝 2002 2绾�
+ map.put("Width",glassInfo.getWidth());//瀹�
+ map.put("Height",glassInfo.getHeight());//楂�
+ map.put("Thickness",glassInfo.getThickness());//鍘�
+ map.put("GlassId",glassInfo.getGlassId());//鐜荤拑ID
+ map.put("FlowCardId",glassInfo.getFlowCardId());//娴佺▼鍗″彿
+ map.put("TemperingLayoutId",glassInfo.getTemperingLayoutId());// 鏆備笉鏄剧ず 閽㈠寲鐗堝浘ID
+ map.put("TemperingFeedSequence",glassInfo.getTemperingFeedSequence());// 鏆備笉鏄剧ず 閽㈠寲鐗堝浘ID鍐呯殑搴忓彿
+ map.put("FilmsId",glassInfo.getFilmsid());//鑶滅郴
+ map.put("SerialNumber",serialNumber);//鍑虹墖椤哄簭
result.add(map);
+ }else if(glassInfos.size()>1){
+ log.info("鏁版嵁涓嶇鍚堥�昏緫--纾ㄨ竟闃熷垪glassId閲嶅:",glassInfos);
+ return new ArrayList<>();
}
+ serialNumber++;
}
return result;
// return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("end_cell",line));
+ }
+
+ @Override
+ public TaskCache queryGlassByTaskCache(int line, List<Integer> taskTypes) {
+ return baseMapper.queryGlassByTaskCache(line, taskTypes);
}
/**
@@ -134,6 +169,22 @@
public TaskCache selectLastOutCacheInfo(int line){
return baseMapper.selectOne(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell,line).eq(TaskCache::getTaskStatus,1).orderByDesc(TaskCache::getCreateTime));
}
+ /**
+ * 鏌ヨ鍒ゆ柇纾ㄨ竟绾挎槸鍚︽湁鐜荤拑杩愯
+ * @param
+ * @return
+ */
+ @Override
+ public List<TaskCache> selectTaskCacheIsRun() {
+ List<TaskCache> taskCaches=null;
+ taskCaches=taskCacheMapper.selectJoinList(TaskCache.class, new MPJLambdaWrapper<TaskCache>()
+ .select("top 4 t.end_cell,ISNULL(b.glass_id, 0)as glass_id")
+ .leftJoin("big_storage_cage_feed_task as b on t.glass_id=b.glass_id ")
+ .groupBy("t.end_cell,b.glass_id,t.create_time")
+ .orderByDesc("t.create_time")
+ );
+ return taskCaches;
+ }
}
--
Gitblit v1.8.0