From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 440 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 402 insertions(+), 38 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index f23de00..67232f0 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -1,70 +1,434 @@
package com.mes.edgstoragecage.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.yulichang.query.MPJQueryWrapper;
-import com.github.yulichang.wrapper.MPJAbstractLambdaWrapper;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.query.MPJLambdaQueryWrapper;
+import com.github.yulichang.toolkit.JoinWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.mes.common.config.Const;
+import com.mes.damage.entity.Damage;
+import com.mes.damage.mapper.DamageMapper;
+import com.mes.damage.service.DamageService;
+import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
+import com.mes.edgglasstask.entity.request.IdentWornRequest;
+import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
+import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
-import com.mes.taskcache.mapper.HangzhouMesMapper;
+import com.mes.engineering.entity.Engineering;
+import com.mes.engineering.mapper.EngineeringMapper;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.mapper.GlassInfoMapper;
+import com.mes.pp.entity.OptimizeDetail;
+import com.mes.pp.entity.OptimizeLayout;
+import com.mes.pp.mapper.OptimizeDetailMapper;
+import com.mes.taskcache.entity.TaskCache;
+import com.mes.taskcache.service.TaskCacheService;
+import com.mes.uppattenusage.entity.UpPattenUsage;
+import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author zhoush
* @since 2024-04-07
*/
@Service
-public class EdgStorageCageDetailsServiceImpl extends ServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
- //鑾峰彇鍏ㄩ儴鏁版嵁
+@Slf4j
+public class EdgStorageCageDetailsServiceImpl extends MPJBaseServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
+
@Autowired
- private HangzhouMesMapper hangzhouMesMapper;
+ UpPattenUsageMapper upPattenUsageMapper;
+
@Autowired
- private EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
- //璇嗗埆 鐮存崯/鎷胯蛋
- public boolean identWorn(String glassid,int ControlsId){
- List<EdgStorageCageDetails> edgStorageCageDetails=edgStorageCageDetailsMapper.selectList(new QueryWrapper<EdgStorageCageDetails>().eq("glassid",glassid));
- if(edgStorageCageDetails.size()==1){
- edgStorageCageDetailsMapper.update(edgStorageCageDetails.get(0),new QueryWrapper<EdgStorageCageDetails>().eq("glassid",glassid));
- return true;
+ EngineeringMapper engineeringMapper;
+
+ @Autowired
+ OptimizeDetailMapper optimizeDetailMapper;
+
+ @Autowired
+ EdgStorageCageMapper edgStorageCageMapper;
+ @Autowired
+ GlassInfoMapper glassInfoMapper;
+
+ @Autowired
+ TaskCacheService taskCacheService;
+
+ @Autowired
+ DamageMapper damageMapper;
+
+ @Autowired
+ DamageService damageService;
+
+ @Autowired
+ EdgGlassTaskInfoService edgGlassTaskInfoService;
+//
+// @Override
+// public boolean identWorn(Map<String, Object> arguments) {
+// String glassId=arguments.get("glassId").toString();
+// int state=arguments.get("state").toString().isEmpty()?0:Integer.parseInt(arguments.get("state").toString());
+// int line=arguments.get("line").toString().isEmpty()?0:Integer.parseInt(arguments.get("line").toString());
+// String workingProcedure=arguments.get("workingProcedure").toString();
+// if(state==0||line==0||workingProcedure==null||glassId==null||glassId.isEmpty()){
+// log.info("鍓嶇浼犻�掓暟鎹笉鍏�:{}",arguments);
+// return false;
+// }
+// List<GlassInfo> GlassInfos = glassInfoMapper.selectList(new MPJLambdaQueryWrapper<GlassInfo>()
+// .selectAll(GlassInfo.class)
+// .eq(GlassInfo::getGlassId, glassId));
+// if (GlassInfos.size() == 1) {
+// Damage damage =new Damage();
+// damage.setGlassId(glassId);
+// damage.setLine(line);
+// damage.setWorkingProcedure(workingProcedure);
+// damage.setRemark("");
+// damage.setStatus(state);//8鐮存崯锛�9鎷胯蛋
+// damageService.insertDamage(damage);
+// }else{
+// return false;
+// }
+// List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
+// .selectAll(EdgStorageCageDetails.class)
+// .eq(EdgStorageCageDetails::getGlassId, glassId));
+// if (edgStorageCageDetails.size() == 1) {
+// EdgStorageCageDetails item = edgStorageCageDetails.get(0);
+// item.setState(state);
+// baseMapper.update(item, new MPJLambdaWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId, glassId));
+// }
+// return true;
+// }
+ /**
+ * 鑾峰彇 鍒囧壊褰撳墠鐗堝浘
+ *
+ * @return
+ */
+ @Override
+ public List<Map<String, Object>> selectCutTerritory() {
+ //鏌ヨEdgStorageCageDetails鏈�鍚庝竴寮犵幓鐠冩墍灞炵増鍥�
+ List<UpPattenUsage> upPattenUsage=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
+ .selectAll(UpPattenUsage.class)
+ .distinct()
+ .innerJoin(Engineering.class, on -> on
+ .eq(Engineering::getEngineerId, UpPattenUsage::getEngineeringId))
+ .innerJoin(GlassInfo.class, on -> on
+ .eq(GlassInfo::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(GlassInfo::getPatternSequence,UpPattenUsage::getLayoutSequence))
+ .leftJoin(EdgStorageCageDetails.class, on -> on
+ .eq(EdgStorageCageDetails::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(EdgStorageCageDetails::getGlassId,GlassInfo::getGlassId))
+ .leftJoin(Damage.class, on -> on
+ .eq(Damage::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(Damage::getGlassId,GlassInfo::getGlassId))
+ .eq(Engineering::getState,1)
+ .and(wrapper->wrapper.isNotNull(EdgStorageCageDetails::getId).or().isNotNull(Damage::getId))
+ .orderByDesc(UpPattenUsage::getLayoutSequence)
+ .orderByDesc(GlassInfo::getId)
+ );
+ if (!upPattenUsage.isEmpty()) {
+ //褰撳墠鐗�
+ UpPattenUsage upPattenUsage1 = upPattenUsage.get(0);
+ //鏌ョ湅褰撳墠鐗堟槸鍚﹀瓨鍦ㄦ湭杩涚瀛愭垨鐮存崯鐨勭幓鐠�
+ List<UpPattenUsage> upPattenUsage2=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
+ .selectAll(UpPattenUsage.class)
+ .distinct()
+ .innerJoin(GlassInfo.class, on -> on
+ .eq(GlassInfo::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(GlassInfo::getPatternSequence,UpPattenUsage::getLayoutSequence))
+ .leftJoin(EdgStorageCageDetails.class, on -> on
+ .eq(EdgStorageCageDetails::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(EdgStorageCageDetails::getGlassId,GlassInfo::getGlassId))
+ .leftJoin(Damage.class, on -> on
+ .eq(Damage::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(Damage::getGlassId,GlassInfo::getGlassId))
+ .eq(UpPattenUsage::getEngineeringId,upPattenUsage.get(0).getEngineeringId())
+ .eq(UpPattenUsage::getLayoutSequence,upPattenUsage.get(0).getLayoutSequence())
+ .and(wrapper->wrapper.isNull(EdgStorageCageDetails::getId).or().isNull(Damage::getId))
+ .orderByDesc(UpPattenUsage::getLayoutSequence)
+ .orderByDesc(GlassInfo::getId)
+ );
+ //鏄剧ず涓嬩竴鐗� 鍚﹀垯鏄剧ず褰撳墠鐗堝浘
+ if(upPattenUsage2.isEmpty()){
+ //鍓╀綑鐗堝浘
+ List<UpPattenUsage> upPattenUsage3=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
+ .selectAll(UpPattenUsage.class)
+ .distinct()
+ .innerJoin(Engineering.class, on -> on
+ .eq(Engineering::getEngineerId, UpPattenUsage::getEngineeringId))
+ .eq(Engineering::getState,1)
+ .gt(UpPattenUsage::getLayoutSequence,upPattenUsage1.getLayoutSequence())
+ .orderByAsc(UpPattenUsage::getLayoutSequence)
+ );
+ if(!upPattenUsage3.isEmpty()){
+ //鍒囨崲鎴愪笅涓�鐗堝浘
+ upPattenUsage1=upPattenUsage3.get(0);
+ }
+ }
+
+ List<Map<String, Object>> cutTerritorys=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
+ .selectAll(OptimizeDetail.class)
+ .selectAs(OptimizeLayout::getWidth, "olWidth")
+ .selectAs(OptimizeLayout::getHeight, "olHeight")
+ .leftJoin(OptimizeLayout.class, on -> on
+ .eq(OptimizeLayout::getProjectNo, OptimizeDetail::getProjectNo)
+ .eq(OptimizeLayout::getStockId, OptimizeDetail::getStockId))
+ .eq(OptimizeDetail::getProjectNo, upPattenUsage1.getEngineeringId())
+ .eq(OptimizeDetail::getStockId, upPattenUsage1.getLayoutSequence())
+ );
+ Map<String, EdgStorageCageDetails> edgMaps=baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
+ .selectAll(EdgStorageCageDetails.class)
+ .eq(EdgStorageCageDetails::getEngineerId,upPattenUsage1.getEngineeringId())
+ ).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails->EdgStorageCageDetails));
+
+ Map<String, Damage> damageMaps=damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
+ .selectAll(Damage.class)
+ .eq(Damage::getEngineerId,upPattenUsage1.getEngineeringId())
+ .and(wrapper->wrapper.eq(Damage::getType,8)
+ .or()
+ .eq(Damage::getType,9))
+ ).stream().collect(Collectors.toMap(Damage::getGlassId,Damage->Damage,(V1,V2)->V2));
+
+ List<Map<String, Object>> resultCutTerritory=new ArrayList<>();
+ for (Map<String, Object> cutTerritory : cutTerritorys) {
+// log.info("鍐呭锛歿}-------{}",cutTerritory,edgStorageCageDetails);
+ if(cutTerritory.get("glass_id")==null||"".equals(cutTerritory.get("glass_id"))){
+ log.info("浼樺寲鏁版嵁涓璯lassId瀛樺湪绌哄��-----鍐呭锛歿}",cutTerritorys);
+ return new ArrayList<>();
+ }else if(damageMaps.get(cutTerritory.get("glass_id"))!=null){
+ //log.info("鐜荤拑宸茬牬鎹�/鎷胯蛋-----鍐呭锛歿}",damageMaps.get(item.get("glass_id")));
+ cutTerritory.put("glass_state",damageMaps.get(cutTerritory.get("glass_id")).getType());
+ }else if(edgMaps.get(cutTerritory.get("glass_id"))!=null){
+ cutTerritory.put("glass_state",edgMaps.get(cutTerritory.get("glass_id")).getState());
+ }else{
+ cutTerritory.put("glass_state",0);
+ }
+ resultCutTerritory.add(cutTerritory);
+ }
+ return resultCutTerritory;
}
- return false;
+ return null;
}
- //鑾峰彇 鍒囧壊褰撳墠鐗堝浘
+
+ /**
+ * 鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
+ *
+ * @param current
+ * @return
+ */
@Override
- public List<Map> selectCutTerritory(){
- List<Map> list= edgStorageCageDetailsMapper.selectJoinList(
- Map.class,new MPJQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class)
- .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
- .leftJoin("glass_info gi on t.layout_sequence=gi.pattern_sequence and t.engineering_id=gi.engineer_id")
- .leftJoin("edg_storage_cage_details escd on gi.id=escd.glass_id")
- .eq("state",1)
- .orderByAsc("t.layout_sequence")
+ public List<List<Map<String, Object>>> selectCurrentCutTerritory(String current) {
+
+ List<Engineering> engineering=engineeringMapper.selectJoinList(Engineering.class, new MPJLambdaWrapper<Engineering>()
+ .selectAll(Engineering.class)
+ .eq(Engineering::getEngineerId,current)
);
- return list;
+ if(engineering.size()==0){
+ log.info("褰撳墠宸ョ▼鍙锋湭棰嗗彇杩�:{}",current);
+ return new ArrayList<>();
+ }
+ //缁撴灉
+ List<Map<String, Object>> resultCutTerritory=new ArrayList<>();
+ //姝ゅ伐绋嬬殑鎵�鏈変紭鍖栨暟鎹�
+ List<Map<String, Object>> cutTerritory=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
+ .selectAll(OptimizeDetail.class)
+ .selectAs(OptimizeLayout::getWidth, "olWidth")
+ .selectAs(OptimizeLayout::getHeight, "olHeight")
+ .leftJoin(OptimizeLayout.class, on -> on
+ .eq(OptimizeLayout::getProjectNo, OptimizeDetail::getProjectNo)
+ .eq(OptimizeLayout::getStockId, OptimizeDetail::getStockId))
+ .eq(OptimizeDetail::getProjectNo, current)
+ );
+
+ Map<String, EdgStorageCageDetails> edgMaps=baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
+ .selectAll(EdgStorageCageDetails.class)
+ .eq(EdgStorageCageDetails::getEngineerId,current)
+ ).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails->EdgStorageCageDetails,(V1,V2)->V2));
+
+ Map<String, Damage> damageMaps=damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
+ .selectAll(Damage.class)
+ .eq(Damage::getEngineerId,current)
+ .and(wrapper->wrapper.eq(Damage::getType,8)
+ .or()
+ .eq(Damage::getType,9))
+ ).stream().collect(Collectors.toMap(Damage::getGlassId,Damage->Damage,(V1,V2)->V2));
+
+ for (Map<String, Object> item : cutTerritory) {
+// log.info("鍐呭锛歿}-------{}",cutTerritory,edgStorageCageDetails);
+ if(item.get("glass_id")==null||"".equals(item.get("glass_id"))){
+ log.info("浼樺寲鏁版嵁涓璯lassId瀛樺湪绌哄��-----鍐呭锛歿}",cutTerritory);
+ return new ArrayList<>();
+ }
+ if(damageMaps.get(item.get("glass_id"))!=null){
+ //log.info("鐜荤拑宸茬牬鎹�/鎷胯蛋-----鍐呭锛歿}",damageMaps.get(item.get("glass_id")));
+ item.put("glass_state",damageMaps.get(item.get("glass_id")).getType());
+ }else if(edgMaps.get(item.get("glass_id"))!=null){
+ item.put("glass_state",edgMaps.get(item.get("glass_id")).getState());
+ }else{
+ item.put("glass_state",0);
+ }
+ resultCutTerritory.add(item);
+ }
+ Map<String, List<Map<String, Object>>> groupBy=resultCutTerritory.stream().collect(Collectors.groupingBy(item->item.get("stock_id").toString()));
+// List<List<Map<String, Object>>> Result=groupBy.values().stream().collect(Collectors.toList());
+ int count=1;
+ List<List<Map<String, Object>>> result=new ArrayList<>();
+ for (String item : groupBy.keySet()) {
+ String key=count+"";
+ if(key!=null){
+ result.add(groupBy.get(key));
+ }
+ count++;
+ }
+ return result;
}
- //鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
+
+ /**
+ * 鏌ヨ绗煎唴鐗堝浘宸�艰寖鍥村唴鐨� 姝ゅ昂瀵哥幓鐠� 濡傛棤鍒欐寜鐓� 閽㈠寲鐗堝浘搴忓彿 浠ュ強鐜荤拑搴忓彿
+ *
+ * @param glassId
+ * @param threshold
+ * @return
+ */
@Override
- public List<Map> selectCurrentCutTerritory(String current){
- List<Map> list= edgStorageCageDetailsMapper.selectJoinList(
- Map.class,new MPJQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class)
- .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
- .leftJoin("glass_info gi on t.layout_sequence=gi.pattern_sequence and t.engineering_id=gi.engineer_id")
- .leftJoin("edg_storage_cage_details escd on gi.id=escd.glass_id")
- .eq("t.engineering_id",current)
- .orderByAsc("t.layout_sequence")
+ public EdgStorageCageDetails selectConformGlass(String glassId, int threshold) {
+ //1.鍘荤鍐呮煡璇㈡灏哄鐨勭幓鐠� 鐩墠鐗堝浘宸�煎唴鐨勭幓鐠� 鏄惁鏈夊悓灏哄鐨�
+ //1.1 鏈夊悓灏哄鐨� 鍒欑敓鎴愬悓灏哄鐨勪换鍔�
+ //1.2 鏃犲悓灏哄鐨� 鍒欑敓鎴愮増鍥鹃『搴忔渶灏忕殑鍑虹墖
+ EdgStorageCageDetails edgStorageCageDetails = baseMapper.selectOne(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
+ .selectAll(EdgStorageCageDetails.class)
+ .eq(EdgStorageCageDetails::getGlassId, glassId)
);
- return list;
- };
+ List<EdgStorageCageDetails> listEdgStorageCageDetails = baseMapper.selectList(new LambdaQueryWrapper<EdgStorageCageDetails>()
+ .lt(EdgStorageCageDetails::getState, 200)
+ .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
+ );
+ EdgStorageCageDetails minTemperingLayoutId = new EdgStorageCageDetails();
+ if (!listEdgStorageCageDetails.isEmpty()) {
+ minTemperingLayoutId = listEdgStorageCageDetails.get(0);
+ }
+ EdgStorageCageDetails result = new EdgStorageCageDetails();
+ if (edgStorageCageDetails != null && minTemperingLayoutId != null) {
+ result = edgStorageCageMapper.selectJoinOne(EdgStorageCageDetails.class, new MPJLambdaWrapper<EdgStorageCage>()
+ .selectAll(EdgStorageCageDetails.class)
+ .leftJoin(EdgStorageCageDetails.class, on -> on
+ .eq(EdgStorageCageDetails::getDeviceId, EdgStorageCage::getDeviceId)
+ .eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot))
+ .isNotNull(EdgStorageCageDetails::getSlot)
+ .eq(EdgStorageCageDetails::getWidth, edgStorageCageDetails.getWidth())
+ .eq(EdgStorageCageDetails::getHeight, edgStorageCageDetails.getHeight())
+ .ge(EdgStorageCageDetails::getTemperingLayoutId, minTemperingLayoutId.getTemperingLayoutId())
+ .le(EdgStorageCageDetails::getTemperingLayoutId, minTemperingLayoutId.getTemperingLayoutId() + threshold)
+ .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
+ );
+ }
+ if (result == null) {
+ result = edgStorageCageMapper.selectJoinOne(EdgStorageCageDetails.class, new MPJLambdaWrapper<EdgStorageCage>()
+ .selectAll(EdgStorageCageDetails.class)
+ .leftJoin(EdgStorageCageDetails.class, on -> on
+ .eq(EdgStorageCageDetails::getDeviceId, EdgStorageCage::getDeviceId)
+ .eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot))
+ .isNotNull(EdgStorageCageDetails::getSlot)
+ .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
+ );
+ }
+ return result;
+ }
+ /**
+ * 鏌ヨ绗煎唴鐗堝浘宸�艰寖鍥村唴鐨� 姝ゅ昂瀵哥幓鐠� 濡傛棤鍒欐寜鐓� 閽㈠寲鐗堝浘搴忓彿 浠ュ強鐜荤拑搴忓彿
+ *
+ * @param glassId
+ * @param threshold
+ * @return
+ */
+ @Override
+ public EdgStorageCageDetails selectOutGlass(String glassId, int threshold) {
+ EdgStorageCageDetails oldEdgStorageCageDetails = null;
+ if (StringUtils.isNotEmpty(glassId)) {
+ oldEdgStorageCageDetails = baseMapper.selectOne(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
+ .selectAll(EdgStorageCageDetails.class)
+ .eq(EdgStorageCageDetails::getGlassId, glassId));
+ }
+ log.info("鎸夌収鐜荤拑id锛歿}鑾峰彇鐜荤拑淇℃伅{}", glassId, oldEdgStorageCageDetails);
+
+ LambdaQueryWrapper<TaskCache> wrapper = new LambdaQueryWrapper<TaskCache>().select(TaskCache::getGlassId).eq(TaskCache::getTaskType, "2");
+ List<TaskCache> taskCacheList = taskCacheService.list(wrapper);
+ List<String> glassIds = taskCacheList.stream().map(TaskCache::getGlassId).collect(Collectors.toList());
+ log.info("鑾峰彇绗煎唴鎵�鏈夊凡鍑虹墖鐨勭幓鐠僫d淇℃伅:{}", glassIds);
+
+ //鑾峰彇绗煎唴鏈�灏忕増鍥緄d鍙婄増搴忎负鏈�灏忕殑鐜荤拑淇℃伅锛堢幓鐠僫d涓嶅湪浠诲姟琛ㄤ腑鐨勫嚭鐗囪褰曚腑锛�
+ EdgStorageCageDetails minTemperingLayoutId = baseMapper.selectOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
+ .eq(EdgStorageCageDetails::getState, 100)
+ .notIn(CollectionUtils.isNotEmpty(glassIds), EdgStorageCageDetails::getGlassId, glassIds)
+ .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
+ .last("limit 1"));
+ Assert.isTrue(minTemperingLayoutId != null, "绗煎唴鏃犵鍚堣姹傜殑鐜荤拑");
+ log.info("鑾峰彇绗煎唴鏈�灏忕増鍥緄d{}鍙婄増搴忎负{}鐨勭幓鐠冧俊鎭瘂}", minTemperingLayoutId.getTemperingLayoutId(),
+ minTemperingLayoutId.getTemperingFeedSequence(), minTemperingLayoutId);
+
+ EdgStorageCageDetails outEdgStorageCageDetails = null;
+
+// if (queryMaxMinDiff(threshold))
+ //todo:閫昏緫1锛氳幏鍙栦袱鏉＄嚎宸插嚭鏈�鍚庝竴鍧楃幓鐠冨湪绗煎唴鐩稿悓灏哄鎵�鍓╂暟閲忥紝浼樺厛璧版暟閲忓皯鐨勭嚎
+ //todo:闇�瑕佸湪鍗у紡鐞嗙墖绗艰鎯呰〃涓柊澧炵姸鎬侊紝鐢ㄦ潵琛ㄧず鐜荤拑杩涘嚭鐞嗙墖绗兼儏鍐�
+ if (oldEdgStorageCageDetails != null && minTemperingLayoutId != null) {
+ log.info("鎸夌収涓婁竴鐗囧凡鍑虹幓鐠冨搴}锛岄珮搴}锛屽強鐗堝浘id鍖洪棿{}鍒皗}鑾峰彇鍑虹墖浠诲姟鐜荤拑淇℃伅", oldEdgStorageCageDetails.getWidth()
+ , oldEdgStorageCageDetails.getHeight(), minTemperingLayoutId.getTemperingLayoutId(), minTemperingLayoutId.getTemperingLayoutId() + threshold);
+ outEdgStorageCageDetails = this.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
+ .notIn(CollectionUtils.isNotEmpty(glassIds), EdgStorageCageDetails::getGlassId, glassIds)
+ .eq(EdgStorageCageDetails::getWidth, oldEdgStorageCageDetails.getWidth())
+ .eq(EdgStorageCageDetails::getHeight, oldEdgStorageCageDetails.getHeight())
+ .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
+ .last("limit 1"));
+ log.info("鍑虹墖浠诲姟鐨勭幓鐠冧俊鎭細{}", outEdgStorageCageDetails);
+ }
+ if (outEdgStorageCageDetails == null) {
+ outEdgStorageCageDetails = minTemperingLayoutId;
+ }
+ return outEdgStorageCageDetails;
+ }
+
+ @Override
+ public String identControls(IdentWornRequest request) {
+ //灏嗚瘑鍒牬鎹熺殑鐜荤拑鐩存帴鍔犲叆鐮存崯琛�
+ Damage damage = new Damage();
+ BeanUtils.copyProperties(request, damage);
+ damage.setType(request.getState());
+ damage.setRemark("");
+ damage.setStatus(0);
+ damageService.insertDamage(damage);
+ return "success";
+ }
+
+ @Override
+ public String edgReportStatus(IdentWornRequest request) {
+ //灏嗙（杈归槦鍒楃牬鎹熺殑鐜荤拑鐩存帴鍔犲叆鐮存崯琛�
+ Damage damage = new Damage();
+ BeanUtils.copyProperties(request, damage);
+ damage.setType(request.getState());
+ damage.setRemark("");
+ damage.setStatus(0);
+ damageService.insertDamage(damage);
+ //淇敼纾ㄨ竟闃熷垪鏁版嵁鐘舵��
+ edgGlassTaskInfoService.update(new LambdaUpdateWrapper<EdgGlassTaskInfo>()
+ .set(EdgGlassTaskInfo::getStatus, request.getState()).eq(EdgGlassTaskInfo::getGlassId, request.getGlassId()));
+ return "success";
+ }
}
--
Gitblit v1.8.0