From 09c9c55d62cdcc6db5e99ee238ae0e78d082ee1a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 21 十月 2024 13:34:25 +0800
Subject: [PATCH] 添加大理片多线程
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 152 +++++++++++++++++++++++++-------------------------
1 files changed, 77 insertions(+), 75 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 b7ce80b..887a74d 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
@@ -116,6 +116,7 @@
// }
// return true;
// }
+
/**
* 鑾峰彇 鍒囧壊褰撳墠鐗堝浘
*
@@ -124,22 +125,22 @@
@Override
public List<Map<String, Object>> selectCutTerritory() {
//鏌ヨEdgStorageCageDetails鏈�鍚庝竴寮犵幓鐠冩墍灞炵増鍥�
- List<UpPattenUsage> upPattenUsage=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
+ 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))
+ .eq(GlassInfo::getPatternSequence, UpPattenUsage::getLayoutSequence))
.leftJoin(EdgStorageCageDetails.class, on -> on
.eq(EdgStorageCageDetails::getEngineerId, UpPattenUsage::getEngineeringId)
- .eq(EdgStorageCageDetails::getGlassId,GlassInfo::getGlassId))
+ .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))
+ .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)
);
@@ -147,43 +148,43 @@
//褰撳墠鐗�
UpPattenUsage upPattenUsage1 = upPattenUsage.get(0);
//鏌ョ湅褰撳墠鐗堟槸鍚﹀瓨鍦ㄦ湭杩涚瀛愭垨鐮存崯鐨勭幓鐠�
- List<UpPattenUsage> upPattenUsage2=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
+ 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))
+ .eq(GlassInfo::getPatternSequence, UpPattenUsage::getLayoutSequence))
.leftJoin(EdgStorageCageDetails.class, on -> on
.eq(EdgStorageCageDetails::getEngineerId, UpPattenUsage::getEngineeringId)
- .eq(EdgStorageCageDetails::getGlassId,GlassInfo::getGlassId))
+ .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))
+ .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()){
+ if (upPattenUsage2.isEmpty()) {
//鍓╀綑鐗堝浘
- List<UpPattenUsage> upPattenUsage3=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
+ 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())
+ .eq(Engineering::getState, 1)
+ .gt(UpPattenUsage::getLayoutSequence, upPattenUsage1.getLayoutSequence())
.orderByAsc(UpPattenUsage::getLayoutSequence)
);
- if(!upPattenUsage3.isEmpty()){
+ if (!upPattenUsage3.isEmpty()) {
//鍒囨崲鎴愪笅涓�鐗堝浘
- upPattenUsage1=upPattenUsage3.get(0);
+ upPattenUsage1 = upPattenUsage3.get(0);
}
}
- List<Map<String, Object>> cutTerritorys=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
+ List<Map<String, Object>> cutTerritorys = optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
.selectAll(OptimizeDetail.class)
.selectAs(OptimizeLayout::getWidth, "olWidth")
.selectAs(OptimizeLayout::getHeight, "olHeight")
@@ -193,32 +194,32 @@
.eq(OptimizeDetail::getProjectNo, upPattenUsage1.getEngineeringId())
.eq(OptimizeDetail::getStockId, upPattenUsage1.getLayoutSequence())
);
- Map<String, EdgStorageCageDetails> edgMaps=baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
+ 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));
+ .eq(EdgStorageCageDetails::getEngineerId, upPattenUsage1.getEngineeringId())
+ ).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId, EdgStorageCageDetails -> EdgStorageCageDetails));
- Map<String, Damage> damageMaps=damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
+ Map<String, Damage> damageMaps = damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
.selectAll(Damage.class)
- .eq(Damage::getEngineerId,upPattenUsage1.getEngineeringId())
- .and(wrapper->wrapper.eq(Damage::getType,8)
+ .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));
+ .eq(Damage::getType, 9))
+ ).stream().collect(Collectors.toMap(Damage::getGlassId, Damage -> Damage, (V1, V2) -> V2));
- List<Map<String, Object>> resultCutTerritory=new ArrayList<>();
+ 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);
+ 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){
+ } 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);
+ 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);
}
@@ -236,18 +237,18 @@
@Override
public List<List<Map<String, Object>>> selectCurrentCutTerritory(String current) {
- List<Engineering> engineering=engineeringMapper.selectJoinList(Engineering.class, new MPJLambdaWrapper<Engineering>()
+ List<Engineering> engineering = engineeringMapper.selectJoinList(Engineering.class, new MPJLambdaWrapper<Engineering>()
.selectAll(Engineering.class)
- .eq(Engineering::getEngineerId,current)
+ .eq(Engineering::getEngineerId, current)
);
- if(engineering.size()==0){
- log.info("褰撳墠宸ョ▼鍙锋湭棰嗗彇杩�:{}",current);
+ if (engineering.size() == 0) {
+ log.info("褰撳墠宸ョ▼鍙锋湭棰嗗彇杩�:{}", current);
return new ArrayList<>();
}
//缁撴灉
- List<Map<String, Object>> resultCutTerritory=new ArrayList<>();
+ List<Map<String, Object>> resultCutTerritory = new ArrayList<>();
//姝ゅ伐绋嬬殑鎵�鏈変紭鍖栨暟鎹�
- List<Map<String, Object>> cutTerritory=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
+ List<Map<String, Object>> cutTerritory = optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
.selectAll(OptimizeDetail.class)
.selectAs(OptimizeLayout::getWidth, "olWidth")
.selectAs(OptimizeLayout::getHeight, "olHeight")
@@ -257,42 +258,42 @@
.eq(OptimizeDetail::getProjectNo, current)
);
- Map<String, EdgStorageCageDetails> edgMaps=baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
+ 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));
+ .eq(EdgStorageCageDetails::getEngineerId, current)
+ ).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId, EdgStorageCageDetails -> EdgStorageCageDetails, (V1, V2) -> V2));
- Map<String, Damage> damageMaps=damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
+ Map<String, Damage> damageMaps = damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
.selectAll(Damage.class)
- .eq(Damage::getEngineerId,current)
- .and(wrapper->wrapper.eq(Damage::getType,8)
+ .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));
+ .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);
+ 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){
+ 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);
+ 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()));
+ 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<>();
+ int count = 1;
+ List<List<Map<String, Object>>> result = new ArrayList<>();
for (String item : groupBy.keySet()) {
- String key=count+"";
- if(key!=null){
+ String key = count + "";
+ if (key != null) {
result.add(groupBy.get(key));
}
count++;
@@ -309,7 +310,7 @@
@Override
public List<List<Map<String, Object>>> selectTemperingTerritory(String current) {
//姝ゅ伐绋嬬殑鎵�鏈変紭鍖栨暟鎹�
- List<Map<String, Object>> resultCutTerritory=optimizeHeatDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeHeatDetail.class)
+ List<Map<String, Object>> resultCutTerritory = optimizeHeatDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeHeatDetail.class)
.selectAll(OptimizeHeatDetail.class)
.selectAs(OptimizeProject::getLoadWidth, "olWidth")
.selectAs(OptimizeProject::getLoadLength, "olHeight")
@@ -319,14 +320,15 @@
.leftJoin(OptimizeProject.class, on -> on
.eq(OptimizeProject::getProjectNo, OptimizeHeatLayout::getProjectNo))
.eq(OptimizeHeatDetail::getProjectNo, current)
+ .gt(OptimizeHeatDetail::getLayoutId, 0)
);
- Map<String, List<Map<String, Object>>> groupBy=resultCutTerritory.stream().collect(Collectors.groupingBy(item->item.get("layout_id").toString()));
+ Map<String, List<Map<String, Object>>> groupBy = resultCutTerritory.stream().collect(Collectors.groupingBy(item -> item.get("layout_id").toString()));
// List<List<Map<String, Object>>> Result=groupBy.values().stream().collect(Collectors.toList());
- List<List<Map<String, Object>>> result=new ArrayList<>();
- for (int i=1;i<=groupBy.keySet().size();i++) {
- String key=i+"";
- if(key!=null){
+ List<List<Map<String, Object>>> result = new ArrayList<>();
+ for (int i = 1; i <= groupBy.keySet().size(); i++) {
+ String key = i + "";
+ if (key != null) {
result.add(groupBy.get(key));
}
}
@@ -474,19 +476,19 @@
* @return
*/
@Override
- public boolean inToVerify(String glassId){
+ public boolean inToVerify(String glassId) {
List<EdgStorageCageDetails> listEdgStorageCageDetails = baseMapper.selectList(new LambdaQueryWrapper<EdgStorageCageDetails>()
.eq(EdgStorageCageDetails::getGlassId, glassId)
);
if (listEdgStorageCageDetails.isEmpty()) {
//璇存槑姝ょ幓鐠冩病鏈夎繘杩囩悊鐗�
return true;
- }else{
- List<Damage> damage=damageMapper.selectList(new LambdaQueryWrapper<Damage>()
+ } else {
+ List<Damage> damage = damageMapper.selectList(new LambdaQueryWrapper<Damage>()
.eq(Damage::getGlassId, glassId)
- .and(wrapper->wrapper.eq(Damage::getType, 8).or().eq(Damage::getType, 9))
+ .and(wrapper -> wrapper.eq(Damage::getType, 8).or().eq(Damage::getType, 9))
);
- if(!damage.isEmpty()){
+ if (!damage.isEmpty()) {
return true;
}
}
--
Gitblit v1.8.0