From 25533b6d08d3aa1d137c0e3537f432c33a23e945 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 27 四月 2026 18:03:50 +0800
Subject: [PATCH] fix: source auto tune out stations from devp
---
src/main/java/com/zy/ai/service/impl/AutoTuneSnapshotServiceImpl.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/ai/service/impl/AutoTuneSnapshotServiceImpl.java b/src/main/java/com/zy/ai/service/impl/AutoTuneSnapshotServiceImpl.java
index 781710b..6838509 100644
--- a/src/main/java/com/zy/ai/service/impl/AutoTuneSnapshotServiceImpl.java
+++ b/src/main/java/com/zy/ai/service/impl/AutoTuneSnapshotServiceImpl.java
@@ -10,21 +10,22 @@
import com.zy.asrs.domain.vo.StationCycleCapacityVo;
import com.zy.asrs.domain.vo.StationCycleLoopVo;
import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.BasDualCrnp;
import com.zy.asrs.entity.BasStation;
import com.zy.asrs.entity.DeviceConfig;
-import com.zy.asrs.entity.StationFlowCapacity;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.BasDualCrnpService;
import com.zy.asrs.service.BasStationService;
import com.zy.asrs.service.DeviceConfigService;
import com.zy.asrs.service.StationCycleCapacityService;
-import com.zy.asrs.service.StationFlowCapacityService;
import com.zy.asrs.service.WrkMastService;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.enums.WrkStsType;
+import com.zy.core.model.StationObjModel;
import com.zy.core.model.protocol.StationProtocol;
import com.zy.core.thread.StationThread;
import com.zy.system.service.ConfigService;
@@ -47,7 +48,6 @@
private static final int DEFAULT_CRN_OUT_BATCH_RUNNING_LIMIT = 5;
private static final int DEFAULT_CONVEYOR_STATION_TASK_LIMIT = 30;
private static final int DEFAULT_AI_AUTO_TUNE_INTERVAL_MINUTES = 10;
- private static final String DIRECTION_OUT = "OUT";
@Autowired
private WrkMastService wrkMastService;
@@ -68,7 +68,7 @@
private BasStationService basStationService;
@Autowired
- private StationFlowCapacityService stationFlowCapacityService;
+ private BasDevpService basDevpService;
@Autowired
private BasCrnpService basCrnpService;
@@ -264,16 +264,22 @@
private Set<Integer> loadOutStationIds() {
LinkedHashSet<Integer> stationIds = new LinkedHashSet<>();
- if (stationFlowCapacityService == null) {
+ if (basDevpService == null) {
return stationIds;
}
- QueryWrapper<StationFlowCapacity> wrapper = new QueryWrapper<>();
- wrapper.eq("direction_code", DIRECTION_OUT);
- wrapper.orderByAsc("station_id");
- List<StationFlowCapacity> capacityList = safeList(stationFlowCapacityService.list(wrapper));
- for (StationFlowCapacity capacity : capacityList) {
- if (capacity != null && capacity.getStationId() != null) {
- stationIds.add(capacity.getStationId());
+ QueryWrapper<BasDevp> wrapper = new QueryWrapper<>();
+ wrapper.eq("status", 1);
+ wrapper.orderByAsc("devp_no");
+ List<BasDevp> basDevpList = safeList(basDevpService.list(wrapper));
+ for (BasDevp basDevp : basDevpList) {
+ if (basDevp == null) {
+ continue;
+ }
+ List<StationObjModel> outStationList = safeList(basDevp.getOutStationList$());
+ for (StationObjModel stationObjModel : outStationList) {
+ if (stationObjModel != null && stationObjModel.getStationId() != null) {
+ stationIds.add(stationObjModel.getStationId());
+ }
}
}
return stationIds;
--
Gitblit v1.9.1