From 1817a79605b464735014a00e762e715788229a4b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 01 四月 2026 11:41:14 +0800
Subject: [PATCH] #入库获取Row优化
---
src/main/java/com/zy/asrs/utils/Utils.java | 258 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 161 insertions(+), 97 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index db3a663..db6e307 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -3,16 +3,15 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
+import com.zy.asrs.domain.vo.WrkTaskCountVo;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.BasDualCrnp;
import com.zy.asrs.entity.BasStationDevice;
-import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDualCrnpService;
import com.zy.asrs.service.BasStationDeviceService;
@@ -36,6 +35,8 @@
public class Utils {
private static final String LOC_NO_FLAG = "-";
+ private static final long STATION_REACHABLE_CACHE_SECONDS = 7 * 24 * 60 * 60L;
+ private static final long PRECOMPUTE_IN_TASK_ROW_CACHE_SECONDS = 60L;
private static final DecimalFormat fmt = new DecimalFormat("##0.00");
private static Integer defaultDeviceLogCollectTime = 200;
private static Long lastUpdateDeviceLogCollectTime = -1L;
@@ -69,7 +70,7 @@
String[] split = locNo.split(LOC_NO_FLAG);
return Integer.parseInt(split[0]);
}
- throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ throw new RuntimeException(locNo + "搴撲綅瑙ｆ瀽寮傚父");
}
/**
@@ -80,7 +81,7 @@
String[] split = locNo.split(LOC_NO_FLAG);
return Integer.parseInt(split[1]);
}
- throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ throw new RuntimeException(locNo + "搴撲綅瑙ｆ瀽寮傚父");
}
/**
@@ -91,7 +92,7 @@
String[] split = locNo.split(LOC_NO_FLAG);
return Integer.parseInt(split[2]);
}
- throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ throw new RuntimeException(locNo + "搴撲綅瑙ｆ瀽寮傚父");
}
public static String getLocNo(Number row, Number bay, Number lev) {
@@ -150,6 +151,24 @@
return getInTaskEnableRow(stationId, new ArrayList<>(), new ArrayList<>(), true);
}
+ public static void precomputeInTaskEnableRow(Integer stationId) {
+ if (stationId == null) {
+ return;
+ }
+ List<Integer> rowList = getInTaskEnableRow(stationId);
+ cacheInTaskEnableRow(stationId, rowList);
+ }
+
+ public static List<Integer> getInTaskEnableRowWithCache(Integer stationId) {
+ List<Integer> cachedRowList = getCachedInTaskEnableRow(stationId);
+ if (cachedRowList != null) {
+ return cachedRowList;
+ }
+ List<Integer> rowList = getInTaskEnableRow(stationId);
+ cacheInTaskEnableRow(stationId, rowList);
+ return rowList;
+ }
+
//鑾峰彇鍏ュ簱浠诲姟鍙敤鎺�
public static List<Integer> getInTaskEnableRow(Integer stationId, List<Integer> excludeCrnList, List<Integer> excludeDualCrnList, boolean maxInTaskControl) {
//鑾峰彇鍫嗗灈鏈哄叆搴撲换鍔″彲鐢ㄦ帓
@@ -172,7 +191,7 @@
BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
BasStationDeviceService basStationDeviceService = SpringUtils.getBean(BasStationDeviceService.class);
- List<BasStationDevice> stationDevices = basStationDeviceService.selectList(new EntityWrapper<BasStationDevice>().eq("station_id", stationId));
+ List<BasStationDevice> stationDevices = basStationDeviceService.list(new QueryWrapper<BasStationDevice>().eq("station_id", stationId));
boolean hasConfig = !stationDevices.isEmpty();
List<Integer> allowedCrnNos = new ArrayList<>();
if (hasConfig) {
@@ -189,34 +208,29 @@
currentCircleTaskCrnNo = Integer.parseInt(String.valueOf(object));
}
- Wrapper<BasCrnp> wrapper = new EntityWrapper<BasCrnp>()
+ Map<Integer, WrkTaskCountVo> crnTaskCountMap = toTaskCountMap(wrkMastService.selectCrnTaskCountList());
+ QueryWrapper<BasCrnp> wrapper = new QueryWrapper<BasCrnp>()
.eq("in_enable", "Y")
.eq("status", 1);
+ List<BasCrnp> basCrnps = basCrnpService.list(wrapper);
if (currentCircleTaskCrnNo != null) {
- currentCircleTaskCrnNo = currentCircleTaskCrnNo + 1;
- BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
- .eq("crn_no", currentCircleTaskCrnNo)
- .eq("in_enable", "Y")
- .eq("status", 1)
- );
- List<WrkMast> currentCrnTask = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .eq("crn_no", currentCircleTaskCrnNo)
- );
- if (currentCrnTask.size() <= 1) {
- if (basCrnp != null) {
- List<List<Integer>> rowList = basCrnp.getControlRows$();
- for (List<Integer> rows : rowList) {
- list.addAll(rows);
+ Integer nextCrnNo = currentCircleTaskCrnNo + 1;
+ WrkTaskCountVo countVo = crnTaskCountMap.get(nextCrnNo);
+ if (getTotalCount(countVo) <= 1) {
+ BasCrnp firstBasCrnp = null;
+ for (BasCrnp basCrnp : basCrnps) {
+ if (Objects.equals(nextCrnNo, basCrnp.getCrnNo())) {
+ firstBasCrnp = basCrnp;
+ break;
}
- wrapper.ne("crn_no", currentCircleTaskCrnNo);
+ }
+ if (firstBasCrnp != null) {
+ appendRowList(list, firstBasCrnp.getControlRows$());
+ basCrnps.remove(firstBasCrnp);
}
}
}
-
- HashMap<Integer, Integer> map = new HashMap<>();
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<>());
- List<BasCrnp> basCrnps = basCrnpService.selectList(wrapper);
List<BasCrnp> baseList = new ArrayList<>();
List<BasCrnp> extraList = new ArrayList<>();
@@ -229,11 +243,6 @@
}
baseList.addAll(extraList);
- for (WrkMast wrkMast : wrkMasts) {
- Integer crnNo = wrkMast.getCrnNo();
- map.put(crnNo, map.getOrDefault(crnNo, 0) + 1);
- }
-
List<BasCrnp> enabledCrnps = new ArrayList<>();
for (BasCrnp basCrnp : baseList) {
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
@@ -241,17 +250,15 @@
continue;
}
CrnProtocol crnProtocol = crnThread.getStatus();
- if (crnProtocol.getMode() != CrnModeType.AUTO.id) {
+ if (!crnProtocol.getMode().equals(CrnModeType.AUTO.id)) {
continue;
}
- List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .eq("crn_no", basCrnp.getCrnNo())
- .eq("io_type", WrkIoType.IN.id)
- );
+ WrkTaskCountVo countVo = crnTaskCountMap.get(basCrnp.getCrnNo());
+ int inTaskCount = getInCount(countVo);
// 妫�鏌ユ槸鍚﹁秴杩囨渶澶у叆搴撲换鍔℃暟
- if (maxInTaskControl && inWrkMasts.size() >= basCrnp.getMaxInTask()) {
- News.info("鍫嗗灈鏈�:{} 宸茶揪鏈�澶у叆搴撲换鍔℃暟锛屽綋鍓嶄换鍔℃暟:{}", basCrnp.getCrnNo(), inWrkMasts.size());
+ if (maxInTaskControl && inTaskCount >= basCrnp.getMaxInTask()) {
+ News.info("鍫嗗灈鏈�:{} 宸茶揪鏈�澶у叆搴撲换鍔℃暟锛屽綋鍓嶄换鍔℃暟:{}", basCrnp.getCrnNo(), inTaskCount);
continue;
}
@@ -259,14 +266,9 @@
List<StationObjModel> inStationList = basCrnp.getInStationList$();
boolean enableGo = false;
for (StationObjModel stationObjModel : inStationList) {
- try {
- List<NavigateNode> navigateNodes = navigateUtils.calcByStationId(stationId, stationObjModel.getStationId());
- if(navigateNodes != null && !navigateNodes.isEmpty()) {
- enableGo = true;
- break;
- }
- } catch (Exception e) {
-
+ if (isReachableWithCache(redisUtil, navigateUtils, stationId, stationObjModel.getStationId())) {
+ enableGo = true;
+ break;
}
}
@@ -275,18 +277,15 @@
}
}
- enabledCrnps.sort(Comparator.comparingInt(o -> map.getOrDefault(o.getCrnNo(), 0)));
+ enabledCrnps.sort(Comparator.comparingInt(o -> getTotalCount(crnTaskCountMap.get(o.getCrnNo()))));
List<Integer> recommendList = new ArrayList<>();
List<Integer> baseRowList = new ArrayList<>();
for (BasCrnp basCrnp : enabledCrnps) {
- List<List<Integer>> rowList = basCrnp.getControlRows$();
- for (List<Integer> rows : rowList) {
- if(allowedCrnNos.contains(basCrnp.getCrnNo())) {
- recommendList.addAll(rows);
- }else {
- baseRowList.addAll(rows);
- }
+ if(allowedCrnNos.contains(basCrnp.getCrnNo())) {
+ appendRowList(recommendList, basCrnp.getControlRows$());
+ }else {
+ appendRowList(baseRowList, basCrnp.getControlRows$());
}
}
@@ -302,13 +301,13 @@
public static List<Integer> getDualCrnInTaskEnableRow(Integer stationId, List<Integer> excludeCrnList, boolean maxInTaskControl) {
List<Integer> list = new ArrayList<>();
try {
- RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
- NavigateUtils navigateUtils = SpringUtils.getBean(NavigateUtils.class);
WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
BasDualCrnpService basDualCrnpService = SpringUtils.getBean(BasDualCrnpService.class);
BasStationDeviceService basStationDeviceService = SpringUtils.getBean(BasStationDeviceService.class);
+ RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+ NavigateUtils navigateUtils = SpringUtils.getBean(NavigateUtils.class);
- List<BasStationDevice> stationDevices = basStationDeviceService.selectList(new EntityWrapper<BasStationDevice>().eq("station_id", stationId));
+ List<BasStationDevice> stationDevices = basStationDeviceService.list(new QueryWrapper<BasStationDevice>().eq("station_id", stationId));
boolean hasConfig = !stationDevices.isEmpty();
List<Integer> allowedCrnNos = new ArrayList<>();
if (hasConfig) {
@@ -319,13 +318,12 @@
}
}
- Wrapper<BasDualCrnp> wrapper = new EntityWrapper<BasDualCrnp>()
+ QueryWrapper<BasDualCrnp> wrapper = new QueryWrapper<BasDualCrnp>()
.eq("in_enable", "Y")
.eq("status", 1);
- HashMap<Integer, Integer> map = new HashMap<>();
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<>());
- List<BasDualCrnp> basDualCrnps = basDualCrnpService.selectList(wrapper);
+ Map<Integer, WrkTaskCountVo> dualCrnTaskCountMap = toTaskCountMap(wrkMastService.selectDualCrnTaskCountList());
+ List<BasDualCrnp> basDualCrnps = basDualCrnpService.list(wrapper);
List<BasDualCrnp> baseList = new ArrayList<>();
List<BasDualCrnp> extraList = new ArrayList<>();
@@ -338,11 +336,6 @@
}
baseList.addAll(extraList);
- for (WrkMast wrkMast : wrkMasts) {
- Integer dualCrnNo = wrkMast.getDualCrnNo();
- map.put(dualCrnNo, map.getOrDefault(dualCrnNo, 0) + 1);
- }
-
List<BasDualCrnp> enabledCrnps = new ArrayList<>();
for (BasDualCrnp basDualCrnp : baseList) {
DualCrnThread dualCrnThread = (DualCrnThread) SlaveConnection.get(SlaveType.DualCrn, basDualCrnp.getCrnNo());
@@ -354,13 +347,11 @@
continue;
}
- List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .eq("dual_crn_no", basDualCrnp.getCrnNo())
- .eq("io_type", WrkIoType.IN.id)
- );
+ WrkTaskCountVo countVo = dualCrnTaskCountMap.get(basDualCrnp.getCrnNo());
+ int inTaskCount = getInCount(countVo);
// 妫�鏌ユ槸鍚﹁秴杩囨渶澶у叆搴撲换鍔℃暟
- if (maxInTaskControl && inWrkMasts.size() >= basDualCrnp.getMaxInTask()) {
- News.info("鍙屽伐浣嶅爢鍨涙満:{} 宸茶揪鏈�澶у叆搴撲换鍔℃暟锛屽綋鍓嶄换鍔℃暟:{}", basDualCrnp.getCrnNo(), inWrkMasts.size());
+ if (maxInTaskControl && inTaskCount >= basDualCrnp.getMaxInTask()) {
+ News.info("鍙屽伐浣嶅爢鍨涙満:{} 宸茶揪鏈�澶у叆搴撲换鍔℃暟锛屽綋鍓嶄换鍔℃暟:{}", basDualCrnp.getCrnNo(), inTaskCount);
continue;
}
@@ -368,14 +359,9 @@
List<StationObjModel> inStationList = basDualCrnp.getInStationList$();
boolean enableGo = false;
for (StationObjModel stationObjModel : inStationList) {
- try {
- List<NavigateNode> navigateNodes = navigateUtils.calcByStationId(stationId, stationObjModel.getStationId());
- if(navigateNodes != null && !navigateNodes.isEmpty()) {
- enableGo = true;
- break;
- }
- } catch (Exception e) {
-
+ if (isReachableWithCache(redisUtil, navigateUtils, stationId, stationObjModel.getStationId())) {
+ enableGo = true;
+ break;
}
}
@@ -384,18 +370,15 @@
}
}
- enabledCrnps.sort(Comparator.comparingInt(o -> map.getOrDefault(o.getCrnNo(), 0)));
+ enabledCrnps.sort(Comparator.comparingInt(o -> getTotalCount(dualCrnTaskCountMap.get(o.getCrnNo()))));
List<Integer> recommendList = new ArrayList<>();
List<Integer> baseRowList = new ArrayList<>();
for (BasDualCrnp basDualCrnp : enabledCrnps) {
- List<List<Integer>> rowList = basDualCrnp.getControlRows$();
- for (List<Integer> rows : rowList) {
- if(allowedCrnNos.contains(basDualCrnp.getCrnNo())) {
- recommendList.addAll(rows);
- }else {
- baseRowList.addAll(rows);
- }
+ if(allowedCrnNos.contains(basDualCrnp.getCrnNo())) {
+ appendRowList(recommendList, basDualCrnp.getControlRows$());
+ }else {
+ appendRowList(baseRowList, basDualCrnp.getControlRows$());
}
}
@@ -405,6 +388,87 @@
e.printStackTrace();
}
return list;
+ }
+
+ private static List<Integer> getCachedInTaskEnableRow(Integer stationId) {
+ if (stationId == null) {
+ return null;
+ }
+ RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+ Object object = redisUtil.get(RedisKeyType.PRECOMPUTE_IN_TASK_ROW_CACHE.key + stationId);
+ if (object == null) {
+ return null;
+ }
+ try {
+ return JSONArray.parseArray(String.valueOf(object), Integer.class);
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ private static void cacheInTaskEnableRow(Integer stationId, List<Integer> rowList) {
+ if (stationId == null || rowList == null || rowList.isEmpty()) {
+ return;
+ }
+ RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+ redisUtil.set(RedisKeyType.PRECOMPUTE_IN_TASK_ROW_CACHE.key + stationId,
+ JSON.toJSONString(rowList), PRECOMPUTE_IN_TASK_ROW_CACHE_SECONDS);
+ }
+
+ private static boolean isReachableWithCache(RedisUtil redisUtil,
+ NavigateUtils navigateUtils,
+ Integer sourceStationId,
+ Integer targetStationId) {
+ if (sourceStationId == null || targetStationId == null) {
+ return false;
+ }
+
+ String cacheKey = RedisKeyType.STATION_REACHABLE_CACHE.key + sourceStationId + "_" + targetStationId;
+ if (redisUtil.get(cacheKey) != null) {
+ return true;
+ }
+
+ try {
+ List<NavigateNode> navigateNodes = navigateUtils.calcReachablePathByStationId(sourceStationId, targetStationId);
+ if (navigateNodes != null && !navigateNodes.isEmpty()) {
+ redisUtil.set(cacheKey, "1", STATION_REACHABLE_CACHE_SECONDS);
+ return true;
+ }
+ } catch (Exception ignored) {
+ }
+ return false;
+ }
+
+ private static Map<Integer, WrkTaskCountVo> toTaskCountMap(List<WrkTaskCountVo> countVoList) {
+ Map<Integer, WrkTaskCountVo> countMap = new HashMap<>();
+ if (countVoList == null) {
+ return countMap;
+ }
+ for (WrkTaskCountVo countVo : countVoList) {
+ if (countVo != null && countVo.getDeviceNo() != null) {
+ countMap.put(countVo.getDeviceNo(), countVo);
+ }
+ }
+ return countMap;
+ }
+
+ private static int getTotalCount(WrkTaskCountVo countVo) {
+ return countVo == null || countVo.getTotalCount() == null ? 0 : countVo.getTotalCount();
+ }
+
+ private static int getInCount(WrkTaskCountVo countVo) {
+ return countVo == null || countVo.getInCount() == null ? 0 : countVo.getInCount();
+ }
+
+ private static void appendRowList(List<Integer> targetRowList, List<List<Integer>> sourceRowList) {
+ if (targetRowList == null || sourceRowList == null) {
+ return;
+ }
+ for (List<Integer> rows : sourceRowList) {
+ if (rows != null && !rows.isEmpty()) {
+ targetRowList.addAll(rows);
+ }
+ }
}
public static Map<String, Object> convertObjectToMap(Object obj) {
@@ -435,7 +499,7 @@
return rowList;
}
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>());
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<BasCrnp>());
for (BasCrnp basCrnp : basCrnps) {
String deepRowsStr = basCrnp.getDeepRows();
if(!Cools.isEmpty(deepRowsStr)){
@@ -444,7 +508,7 @@
}
}
- List<BasDualCrnp> basDualCrnps = basDualCrnpService.selectList(new EntityWrapper<BasDualCrnp>());
+ List<BasDualCrnp> basDualCrnps = basDualCrnpService.list(new QueryWrapper<BasDualCrnp>());
for (BasDualCrnp basDualCrnp : basDualCrnps) {
String deepRowsStr = basDualCrnp.getDeepRows();
if(!Cools.isEmpty(deepRowsStr)){
@@ -484,7 +548,7 @@
}
List<Integer> controlRowList = null;
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<>());
for (BasCrnp basCrnp : basCrnps) {
List<List<Integer>> rowList = basCrnp.getControlRows$();
for (List<Integer> rows : rowList) {
@@ -526,7 +590,7 @@
}
List<Integer> controlRowList = null;
- List<BasDualCrnp> basDualCrnps = basDualCrnpService.selectList(new EntityWrapper<>());
+ List<BasDualCrnp> basDualCrnps = basDualCrnpService.list(new QueryWrapper<>());
for (BasDualCrnp basDualCrnp : basDualCrnps) {
List<List<Integer>> rowList = basDualCrnp.getControlRows$();
for (List<Integer> rows : rowList) {
@@ -577,7 +641,7 @@
List<Integer> controlRowList = null;
List<Integer> deepRowList = null;
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<>());
for (BasCrnp basCrnp : basCrnps) {
List<List<Integer>> rowList = basCrnp.getControlRows$();
for (List<Integer> rows : rowList) {
@@ -616,7 +680,7 @@
List<Integer> controlRowList = null;
List<Integer> deepRowList = null;
- List<BasDualCrnp> basDualCrnps = basDualCrnpService.selectList(new EntityWrapper<>());
+ List<BasDualCrnp> basDualCrnps = basDualCrnpService.list(new QueryWrapper<>());
for (BasDualCrnp basDualCrnp : basDualCrnps) {
List<List<Integer>> rowList = basDualCrnp.getControlRows$();
for (List<Integer> rows : rowList) {
@@ -658,7 +722,7 @@
return null;
}
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<>());
for (BasCrnp basCrnp : basCrnps) {
List<List<Integer>> controlRows = basCrnp.getControlRows$();
for (List<Integer> list : controlRows) {
@@ -668,7 +732,7 @@
}
}
- List<BasDualCrnp> basDualCrnps = basDualCrnpService.selectList(new EntityWrapper<>());
+ List<BasDualCrnp> basDualCrnps = basDualCrnpService.list(new QueryWrapper<>());
for (BasDualCrnp basDualCrnp : basDualCrnps) {
List<List<Integer>> controlRows = basDualCrnp.getControlRows$();
for (List<Integer> list : controlRows) {
--
Gitblit v1.9.1