From 9e97ded305585c0bdc22aef3468dd031567c38a3 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 09 五月 2024 14:04:00 +0800
Subject: [PATCH] 卧式理片笼线程改造优化
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 11 ++-
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java | 4 -
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 93 +++++++++++++++++++++---------
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 4
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java | 12 ++-
5 files changed, 82 insertions(+), 42 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
index 343b4ca..bc344ce 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
@@ -12,7 +12,7 @@
public static final Long DEFULT_ROLE = 1L;
//A09鍑虹墖鐩爣浣嶇疆
- public static final String A09_OUT_TARGET_POSITION = "2001";
+ public static final Integer A09_OUT_TARGET_POSITION = 2001;
//A09鍑虹墖鐩爣浣嶇疆
- public static final String A10_OUT_TARGET_POSITION = "2002";
+ public static final Integer A10_OUT_TARGET_POSITION = 2002;
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
index 6f1479f..577e794 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
@@ -1,11 +1,7 @@
package com.mes.edgstoragecage.service;
-import com.baomidou.mybatisplus.extension.service.IService;
import com.github.yulichang.base.MPJBaseService;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
-import com.mes.pp.entity.OptimizeDetail;
-import com.mes.taskcache.entity.TaskCache;
import java.util.List;
import java.util.Map;
@@ -48,4 +44,12 @@
* @return
*/
EdgStorageCageDetails selectConformGlass(String glassId, int poor);
+
+ /**
+ * 鑾峰彇鍑虹墖淇℃伅鏁版嵁
+ * @param glassId
+ * @param poor
+ * @return
+ */
+ EdgStorageCageDetails selectOutGlass(String glassId, int poor);
}
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 322ea68..3196f32 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
@@ -24,7 +24,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -41,13 +40,13 @@
@Slf4j
public class EdgStorageCageDetailsServiceImpl extends MPJBaseServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
- @Resource
+ @Autowired
UpPattenUsageMapper upPattenUsageMapper;
@Autowired
OptimizeDetailMapper optimizeDetailMapper;
- @Resource
+ @Autowired
EdgStorageCageMapper edgStorageCageMapper;
@Autowired
@@ -144,29 +143,79 @@
/**
* 鏌ヨ绗煎唴鐗堝浘宸�艰寖鍥村唴鐨� 姝ゅ昂瀵哥幓鐠� 濡傛棤鍒欐寜鐓� 閽㈠寲鐗堝浘搴忓彿 浠ュ強鐜荤拑搴忓彿
+ * @param glassId
+ * @param poor
+ * @return
+ */
+ @Override
+ public EdgStorageCageDetails selectConformGlass(String glassId, int poor){
+ //1.鍘荤鍐呮煡璇㈡灏哄鐨勭幓鐠� 鐩墠鐗堝浘宸�煎唴鐨勭幓鐠� 鏄惁鏈夊悓灏哄鐨�
+ //1.1 鏈夊悓灏哄鐨� 鍒欑敓鎴愬悓灏哄鐨勪换鍔�
+ //1.2 鏃犲悓灏哄鐨� 鍒欑敓鎴愮増鍥鹃『搴忔渶灏忕殑鍑虹墖
+ EdgStorageCageDetails edgStorageCageDetails= baseMapper.selectOne(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
+ .selectAll(EdgStorageCageDetails.class)
+ .eq(EdgStorageCageDetails::getGlassId,glassId)
+ );
+ 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()+poor)
+ .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 poor
* @return
*/
@Override
- public EdgStorageCageDetails selectConformGlass(String glassId, int poor) {
- //1.鍘荤鍐呮煡璇㈡灏哄鐨勭幓鐠� 鐩墠鐗堝浘宸�煎唴鐨勭幓鐠� 鏄惁鏈夊悓灏哄鐨�
- //1.1 鏈夊悓灏哄鐨� 鍒欑敓鎴愬悓灏哄鐨勪换鍔�
- //1.2 鏃犲悓灏哄鐨� 鍒欑敓鎴愮増鍥鹃『搴忔渶灏忕殑鍑虹墖
- log.info("鎸夌収鐜荤拑id锛歿}鑾峰彇鐜荤拑淇℃伅", glassId);
+ public EdgStorageCageDetails selectOutGlass(String glassId, int poor) {
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)
@@ -177,36 +226,24 @@
minTemperingLayoutId.getTemperingFeedSequence(), minTemperingLayoutId);
EdgStorageCageDetails outEdgStorageCageDetails = null;
+
+ //todo:鑾峰彇绗煎瓙鍐呮渶澶х増鍥緄d鍜屾渶灏忕増鍥緄d鎻掑�硷紝鍒ゆ柇鏄惁澶т簬闃堝�硷紝澶т簬闃堝�肩洿鎺ュ嚭鏈�灏忕増鍥剧幓鐠�
+ //todo:閫昏緫1锛氳幏鍙栦袱鏉＄嚎宸插嚭鏈�鍚庝竴鍧楃幓鐠冨湪绗煎唴鐩稿悓灏哄鎵�鍓╂暟閲忥紝浼樺厛璧版暟閲忓皯鐨勭嚎
+ //todo:閫昏緫2锛氫紭鍏堣蛋绌洪棽鐨勭嚎
+ //todo:闇�瑕佸湪鍗у紡鐞嗙墖绗艰鎯呰〃涓柊澧炵姸鎬侊紝鐢ㄦ潵琛ㄧず鐜荤拑杩涘嚭鐞嗙墖绗兼儏鍐�
if (oldEdgStorageCageDetails != null && minTemperingLayoutId != null) {
log.info("鎸夌収涓婁竴鐗囧凡鍑虹幓鐠冨搴}锛岄珮搴}锛屽強鐗堝浘id鍖洪棿{}鍒皗}鑾峰彇鍑虹墖浠诲姟鐜荤拑淇℃伅", oldEdgStorageCageDetails.getWidth()
, oldEdgStorageCageDetails.getHeight(), minTemperingLayoutId.getTemperingLayoutId(), minTemperingLayoutId.getTemperingLayoutId() + poor);
- outEdgStorageCageDetails = 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)
+ outEdgStorageCageDetails = this.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
+ .notIn(CollectionUtils.isNotEmpty(glassIds), EdgStorageCageDetails::getGlassId, glassIds)
.eq(EdgStorageCageDetails::getWidth, oldEdgStorageCageDetails.getWidth())
.eq(EdgStorageCageDetails::getHeight, oldEdgStorageCageDetails.getHeight())
- .ge(EdgStorageCageDetails::getTemperingLayoutId, minTemperingLayoutId.getTemperingLayoutId())
- .le(EdgStorageCageDetails::getTemperingLayoutId, minTemperingLayoutId.getTemperingLayoutId() + poor)
.orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
- .last("limit 1")
- );
+ .last("limit 1"));
log.info("鍑虹墖浠诲姟鐨勭幓鐠冧俊鎭細{}", outEdgStorageCageDetails);
}
-
if (outEdgStorageCageDetails == null) {
outEdgStorageCageDetails = minTemperingLayoutId;
-// outEdgStorageCageDetails = 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)
-// .last("limit 1")
-// );
}
return outEdgStorageCageDetails;
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
index df47433..d559304 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -131,20 +131,21 @@
int endcell = 0;
List<TaskCache> oldTaskCacheList;
- log.info("2銆佸垽鏂嚭鐗囩嚎璺紝鑾峰彇鏈�鍚庤鏉＄嚎宸插嚭鐗囩殑浠诲姟淇℃伅(澶囨敞锛�0寰呮墽琛岋紝1宸叉墽琛�)锛岄兘绌洪棽浼樺厛鍑篈09绾�");
if (line == 2) {
- endcell = 2002;
+ endcell = Const.A10_OUT_TARGET_POSITION;
oldTaskCacheList = taskCacheService.selectLastOutCacheInfos(Const.A10_OUT_TARGET_POSITION);
} else {
- endcell = 2001;
+ endcell = Const.A09_OUT_TARGET_POSITION;
oldTaskCacheList = taskCacheService.selectLastOutCacheInfos(Const.A09_OUT_TARGET_POSITION);
}
+ log.info("2銆佸垽鏂嚭鐗囩嚎璺瘂}锛岃幏鍙栨渶鍚庤鏉＄嚎宸插嚭鐗囩殑浠诲姟淇℃伅{}(澶囨敞锛�0寰呮墽琛岋紝1宸叉墽琛�).閮界┖闂蹭紭鍏堝嚭A09绾�", endcell, oldTaskCacheList);
+
String glassId = "";
if (CollectionUtil.isNotEmpty(oldTaskCacheList)) {
glassId = oldTaskCacheList.get(0).getGlassId();
}
- log.info("3銆佹寜鐓у巻鍙插凡鍑虹幓鐠僫d{}鍜岄槇鍊納}锛屾嬁鍑虹悊鐗囩鍐呯殑鍑虹墖淇℃伅", glassId, threshold);
- EdgStorageCageDetails glassInfo = edgStorageCageDetailsService.selectConformGlass(glassId, threshold);
+ EdgStorageCageDetails glassInfo = edgStorageCageDetailsService.selectOutGlass(glassId, threshold);
+ log.info("3銆佹寜鐓у巻鍙插凡鍑虹幓鐠僫d{}鍜岄槇鍊納}锛屾嬁鍑虹悊鐗囩鍐呯殑鍑虹墖淇℃伅{}", glassId, threshold, glassInfo);
if (glassInfo != null) {
log.info("4銆佹坊鍔犲嚭鐗囦换鍔★紝鐜荤拑id锛歿}锛屼换鍔＄被鍨嬶細{}锛岃捣濮嬩綅缃細{}锛岀粨鏉熶綅缃細{}", glassInfo.getGlassId(),
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java
index f90c418..c5a6f02 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java
@@ -1,8 +1,6 @@
package com.mes.taskcache.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
-import com.mes.glassinfo.entity.GlassInfo;
import com.mes.taskcache.entity.TaskCache;
import java.util.List;
@@ -60,7 +58,7 @@
* @param line
* @return
*/
- List<TaskCache> selectLastOutCacheInfos(String line);
+ List<TaskCache> selectLastOutCacheInfos(int line);
/**
* 鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
--
Gitblit v1.8.0