From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 268 ++++++++--------------------------------------------
1 files changed, 44 insertions(+), 224 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 e01c67f..87ce02b 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,5 +1,6 @@
package com.mes.edgstoragecage.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -16,20 +17,20 @@
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
+import com.mes.edgstoragecage.entity.vo.CutDrawingVO;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
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.*;
-import com.mes.pp.mapper.OptimizeDetailMapper;
+import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.pp.entity.OptimizeHeatDetail;
+import com.mes.pp.entity.OptimizeHeatLayout;
+import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.mapper.OptimizeHeatDetailMapper;
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;
@@ -56,13 +57,7 @@
public class EdgStorageCageDetailsServiceImpl extends MPJBaseServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
@Resource
- UpPattenUsageMapper upPattenUsageMapper;
-
- @Resource
EngineeringMapper engineeringMapper;
-
- @Resource
- OptimizeDetailMapper optimizeDetailMapper;
@Resource
OptimizeHeatDetailMapper optimizeHeatDetailMapper;
@@ -71,7 +66,7 @@
EdgStorageCageMapper edgStorageCageMapper;
@Resource
- GlassInfoMapper glassInfoMapper;
+ GlassInfoService glassInfoService;
@Autowired
TaskCacheService taskCacheService;
@@ -84,226 +79,51 @@
@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;
+ public List<CutDrawingVO> queryCurrentCutDrawing(int deviceId, int stationCell) {
+// 鑾峰彇鏈潯绾垮綋鍓嶆鍦ㄦ墽琛岀殑宸ョ▼
+ Engineering engineering = engineeringMapper.selectOne(new LambdaQueryWrapper<Engineering>()
+ .eq(Engineering::getState, 1).eq(Engineering::getStationCell, stationCell));
+ if (null == engineering) {
+ log.info("褰撳墠绾胯矾娌℃湁闇�瑕佹墽琛岀殑宸ョ▼");
+ return null;
}
- return null;
- }
-
- /**
- * 鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
- *
- * @param current
- * @return
- */
- @Override
- 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)
- );
- 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());
+ List<EdgStorageCageDetails> edgStorageCageDetailsList = this.list(new LambdaQueryWrapper<EdgStorageCageDetails>()
+ .eq(EdgStorageCageDetails::getDeviceId, deviceId)
+ .eq(EdgStorageCageDetails::getEngineerId, engineering.getEngineerId())
+ .orderByDesc(EdgStorageCageDetails::getId));
+ //鎸夌収褰撳墠宸ョ▼鍘荤悊鐗囩鎼滄渶鍚庝竴鍧楃幓鐠� 鑾峰彇宸ョ▼鍙� 鐗堝浘鍙� 娌℃湁鐩存帴鏄剧ず绗竴寮犵増鍥�
+ int patternSequence = 0;
+ if (CollectionUtil.isEmpty(edgStorageCageDetailsList)) {
+ patternSequence = 1;
+ } else {
+ EdgStorageCageDetails lastGlass = edgStorageCageDetailsList.get(0);
+ log.info("鑾峰彇鏈�鍚庝竴鍧楄繘绗肩殑鐜荤拑涓猴細{}", lastGlass);
+ List<CutDrawingVO> drawingVOList = baseMapper.queryCutDrawingByEngineerId(lastGlass.getEngineerId(), lastGlass.getPatternSequence(), 1);
+ if (CollectionUtil.isEmpty(drawingVOList)) {
+ //鏃犲墿浣� 鏄剧ず褰撳墠鐗堝浘鍔�1鐨勫叏閲忕増鍥�
+ patternSequence = lastGlass.getPatternSequence() + 1;
} else {
- item.put("glass_state", 0);
+ //褰撳墠鐗堝浘鏄惁鏈夊墿浣欙紝鏈夊墿浣欐樉绀哄綋鍓嶇増鍥�
+ patternSequence = lastGlass.getPatternSequence();
}
- 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;
+ return baseMapper.queryCutDrawingByEngineerId(engineering.getEngineerId(), patternSequence, 0);
}
+ @Override
+ public Map<String, Object> queryCutDrawingByEngineerId(String engineerId, int patternSequence) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("currentCutDrawing", baseMapper.queryCutDrawingByEngineerId(engineerId, patternSequence, 0));
+ List<GlassInfo> glassInfoList = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getEngineerId, engineerId));
+ long totalPatternSequence = glassInfoList.stream().map(GlassInfo::getPatternSequence).distinct().count();
+ map.put("totalPatternSequence", totalPatternSequence);
+ return map;
+
+ }
+
+
/**
* 鑾峰彇 宸ョ▼涓嬬殑閽㈠寲鐗堝浘
*
--
Gitblit v1.8.0