From a4f07b2a0ddb6c210e05afbbb491feeb466203e7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 09 三月 2026 19:15:50 +0800
Subject: [PATCH] #V3重大更新，升级JDK17，升级SpirngBoot3.5.1
---
src/main/java/com/zy/asrs/utils/Utils.java | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index f3430d1..7fb3df8 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -3,8 +3,8 @@
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.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.SpringUtils;
@@ -172,7 +172,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,18 +189,18 @@
currentCircleTaskCrnNo = Integer.parseInt(String.valueOf(object));
}
- Wrapper<BasCrnp> wrapper = new EntityWrapper<BasCrnp>()
+ QueryWrapper<BasCrnp> wrapper = new QueryWrapper<BasCrnp>()
.eq("in_enable", "Y")
.eq("status", 1);
if (currentCircleTaskCrnNo != null) {
currentCircleTaskCrnNo = currentCircleTaskCrnNo + 1;
- BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
+ BasCrnp basCrnp = basCrnpService.getOne(new QueryWrapper<BasCrnp>()
.eq("crn_no", currentCircleTaskCrnNo)
.eq("in_enable", "Y")
.eq("status", 1)
);
- List<WrkMast> currentCrnTask = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> currentCrnTask = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("crn_no", currentCircleTaskCrnNo)
);
if (currentCrnTask.size() <= 1) {
@@ -215,8 +215,8 @@
}
HashMap<Integer, Integer> map = new HashMap<>();
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<>());
- List<BasCrnp> basCrnps = basCrnpService.selectList(wrapper);
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<>());
+ List<BasCrnp> basCrnps = basCrnpService.list(wrapper);
List<BasCrnp> baseList = new ArrayList<>();
List<BasCrnp> extraList = new ArrayList<>();
@@ -245,7 +245,7 @@
continue;
}
- List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> inWrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("crn_no", basCrnp.getCrnNo())
.eq("io_type", WrkIoType.IN.id)
);
@@ -308,7 +308,7 @@
BasDualCrnpService basDualCrnpService = SpringUtils.getBean(BasDualCrnpService.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) {
@@ -319,13 +319,13 @@
}
}
- 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);
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<>());
+ List<BasDualCrnp> basDualCrnps = basDualCrnpService.list(wrapper);
List<BasDualCrnp> baseList = new ArrayList<>();
List<BasDualCrnp> extraList = new ArrayList<>();
@@ -354,7 +354,7 @@
continue;
}
- List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> inWrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("dual_crn_no", basDualCrnp.getCrnNo())
.eq("io_type", WrkIoType.IN.id)
);
@@ -435,7 +435,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 +444,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 +484,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 +526,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 +577,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 +616,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 +658,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 +668,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