From 0add19748b6c8ac642048b45821833bc32a2444b Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 29 七月 2024 08:41:51 +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 | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 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 3b56659..7fff8e4 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
@@ -3,6 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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;
@@ -10,6 +14,7 @@
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;
@@ -26,6 +31,7 @@
* @author zhoush
* @since 2024-04-07
*/
+@Slf4j
@Service
public class TaskCacheServiceImpl extends ServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {
@@ -34,6 +40,8 @@
@Autowired
GlassInfoMapper glassInfoMapper;
+
+
/**
* 娣诲姞鐞嗙墖绗间换鍔�
* @param taskCache
@@ -61,10 +69,19 @@
int serialNumber=1;
for(TaskCache taskCache1:taskCache){
Map<String,Object> map=new HashMap<>();
- GlassInfo glassInfo=glassInfoMapper.selectOne(new MPJLambdaWrapper<GlassInfo>()
+// 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)
- .eq(GlassInfo::getGlassId,taskCache1.getGlassId()));
- if(glassInfo!=null){
+ .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_IN)
+ );
+ 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());//楂�
@@ -76,6 +93,9 @@
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++;
}
@@ -151,4 +171,5 @@
}
+
}
--
Gitblit v1.8.0