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/core/ServerBootstrap.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 62c22f5..68cc1a2 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,6 +1,6 @@
package com.zy.core;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.exception.CoolException;
import com.zy.asrs.entity.DeviceConfig;
import com.zy.asrs.service.DeviceConfigService;
@@ -8,11 +8,7 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
-import com.zy.core.thread.impl.ZySiemensCrnThread;
-import com.zy.core.thread.impl.ZySiemensDualCrnThread;
-import com.zy.core.thread.impl.ZyStationThread;
-import com.zy.core.thread.impl.ZyStationV3Thread;
-import com.zy.core.thread.impl.ZyRgvThread;
+import com.zy.core.thread.impl.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -49,37 +45,37 @@
private void initMq(){
// 鍒濆鍖栧爢鍨涙満mq
- List<DeviceConfig> crnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> crnList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Crn)));
for (DeviceConfig crn : crnList) {
MessageQueue.init(SlaveType.Crn, crn.getDeviceNo());
}
// 鍒濆鍖栧弻宸ヤ綅鍫嗗灈鏈簃q
- List<DeviceConfig> dualCrnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> dualCrnList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.DualCrn)));
for (DeviceConfig crn : dualCrnList) {
MessageQueue.init(SlaveType.DualCrn, crn.getDeviceNo());
}
// 鍒濆鍖朢gv灏忚溅mq
- List<DeviceConfig> rgvList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> rgvList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Rgv)));
for (DeviceConfig rgv : rgvList) {
MessageQueue.init(SlaveType.Rgv, rgv.getDeviceNo());
}
// 鍒濆鍖栬緭閫佺嚎mq
- List<DeviceConfig> devpList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> devpList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Devp)));
for (DeviceConfig devp : devpList) {
MessageQueue.init(SlaveType.Devp, devp.getDeviceNo());
}
// 鍒濆鍖栨潯鐮佹壂鎻忎华mq
- List<DeviceConfig> barcodeList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> barcodeList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Barcode)));
for (DeviceConfig barcode : barcodeList) {
MessageQueue.init(SlaveType.Barcode, barcode.getDeviceNo());
}
// 鍒濆鍖朙ed鐏痬q
- List<DeviceConfig> ledList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> ledList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Led)));
for (DeviceConfig led : ledList) {
MessageQueue.init(SlaveType.Led, led.getDeviceNo());
@@ -87,7 +83,7 @@
}
private void initThread(){
- List<DeviceConfig> crnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> crnList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Crn)));
if(!crnList.isEmpty()) {
News.info("鍒濆鍖栧爢鍨涙満........................................................");
@@ -95,6 +91,8 @@
ThreadHandler thread = null;
if (deviceConfig.getThreadImpl().equals("ZySiemensCrnThread")) {
thread = new ZySiemensCrnThread(deviceConfig, redisUtil);
+ } else if (deviceConfig.getThreadImpl().equals("ZySiemensCrnV2Thread")) {
+ thread = new ZySiemensCrnV2Thread(deviceConfig, redisUtil);
} else {
throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
}
@@ -107,7 +105,7 @@
}
}
- List<DeviceConfig> dualCrnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> dualCrnList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.DualCrn)));
if(!dualCrnList.isEmpty()) {
News.info("鍒濆鍖栧弻宸ヤ綅鍫嗗灈鏈�........................................................");
@@ -127,7 +125,7 @@
}
}
- List<DeviceConfig> devpList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> devpList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Devp)));
if(!devpList.isEmpty()) {
News.info("鍒濆鍖栬緭閫佺珯........................................................");
@@ -137,6 +135,8 @@
thread = new ZyStationThread(deviceConfig, redisUtil);
} else if (deviceConfig.getThreadImpl().equals("ZyStationV3Thread")) {
thread = new ZyStationV3Thread(deviceConfig, redisUtil);
+ } else if (deviceConfig.getThreadImpl().equals("ZyStationV4Thread")) {
+ thread = new ZyStationV4Thread(deviceConfig, redisUtil);
} else {
throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
}
@@ -149,7 +149,7 @@
}
}
- List<DeviceConfig> rgvList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ List<DeviceConfig> rgvList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Rgv)));
if(!rgvList.isEmpty()) {
News.info("鍒濆鍖朢GV........................................................");
--
Gitblit v1.9.1