From 2d2fd991826837d7189cc488aee6f309a6f5e216 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 09 三月 2026 22:48:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/PlannerServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/PlannerServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PlannerServiceImpl.java
index 115fefc..a73721a 100644
--- a/src/main/java/com/zy/asrs/service/impl/PlannerServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PlannerServiceImpl.java
@@ -2,7 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
@@ -54,7 +54,7 @@
public JSONObject calculateAndSaveSchedule() {
ArrayList<HashMap<String, Object>> crnDataList = new ArrayList<>();
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("status", 1));
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<BasCrnp>().eq("status", 1));
Map<Integer, StationObjModel> stationIndex = new HashMap<>();
Map<Integer, String> stationCrnCodeIndex = new HashMap<>();
@@ -123,7 +123,7 @@
CrnProtocol p = crnThread.getStatus();
Integer tNo = p.getTaskNo();
if (tNo != null && tNo > 0) {
- WrkMast task = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", tNo));
+ WrkMast task = wrkMastService.getOne(new QueryWrapper<WrkMast>().eq("wrk_no", tNo));
if (task != null) {
// Calculate current X, Y
double curX = (p.getBay() == null ? 0 : p.getBay()) * bayWidth;
@@ -237,7 +237,7 @@
}
ArrayList<HashMap<String, Object>> taskDataList = new ArrayList<>();
- List<WrkMast> outTasks = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.NEW_OUTBOUND.sts));
+ List<WrkMast> outTasks = wrkMastService.list(new QueryWrapper<WrkMast>().eq("wrk_sts", WrkStsType.NEW_OUTBOUND.sts));
for (WrkMast wrkMast : outTasks) {
HashMap<String, Object> t = new HashMap<>();
t.put("taskId", wrkMast.getWrkNo());
@@ -298,7 +298,7 @@
taskDataList.add(t);
}
- List<WrkMast> moveTasks = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.NEW_LOC_MOVE.sts));
+ List<WrkMast> moveTasks = wrkMastService.list(new QueryWrapper<WrkMast>().eq("wrk_sts", WrkStsType.NEW_LOC_MOVE.sts));
for (WrkMast wrkMast : moveTasks) {
HashMap<String, Object> t = new HashMap<>();
t.put("taskId", wrkMast.getWrkNo());
@@ -352,7 +352,7 @@
taskDataList.add(t);
}
- List<WrkMast> inTasks = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.INBOUND_DEVICE_RUN.sts));
+ List<WrkMast> inTasks = wrkMastService.list(new QueryWrapper<WrkMast>().eq("wrk_sts", WrkStsType.INBOUND_DEVICE_RUN.sts));
for (WrkMast wrkMast : inTasks) {
HashMap<String, Object> t = new HashMap<>();
t.put("taskId", wrkMast.getWrkNo());
@@ -432,8 +432,8 @@
result = null;
}
} else {
- Config uriCfg = configService.selectOne(new EntityWrapper<Config>().eq("code", "plannerSolverUri"));
- Config pathCfg = configService.selectOne(new EntityWrapper<Config>().eq("code", "plannerSolverPath"));
+ Config uriCfg = configService.getOne(new QueryWrapper<Config>().eq("code", "plannerSolverUri"));
+ Config pathCfg = configService.getOne(new QueryWrapper<Config>().eq("code", "plannerSolverPath"));
if (uriCfg == null || pathCfg == null || uriCfg.getValue() == null || pathCfg.getValue() == null) {
// 濡傛灉鏄湇鍔¤皟鐢紝杩欓噷鏃犳硶鐩存帴杩斿洖R.error锛岃繑鍥瀗ull鎴栬�卐mpty json
return null;
@@ -508,7 +508,7 @@
private Double getDoubleConfig(String code, Double def) {
try {
- Config c = configService.selectOne(new EntityWrapper<Config>().eq("code", code));
+ Config c = configService.getOne(new QueryWrapper<Config>().eq("code", code));
if (c != null && c.getValue() != null && c.getValue().trim().length() > 0) {
return Double.parseDouble(c.getValue().trim());
}
@@ -518,7 +518,7 @@
private Integer getIntConfig(String code, Integer def) {
try {
- Config c = configService.selectOne(new EntityWrapper<Config>().eq("code", code));
+ Config c = configService.getOne(new QueryWrapper<Config>().eq("code", code));
if (c != null && c.getValue() != null && c.getValue().trim().length() > 0) {
String v = c.getValue().trim();
if (v.endsWith("%")) v = v.substring(0, v.length() - 1);
@@ -530,7 +530,7 @@
private Boolean getBoolConfig(String code, Boolean def) {
try {
- Config c = configService.selectOne(new EntityWrapper<Config>().eq("code", code));
+ Config c = configService.getOne(new QueryWrapper<Config>().eq("code", code));
if (c != null && c.getValue() != null) {
String v = c.getValue().trim().toUpperCase();
if ("Y".equals(v) || "TRUE".equals(v)) return true;
--
Gitblit v1.9.1