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/ai/mcp/service/impl/WcsDataFacadeImpl.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zy/ai/mcp/service/impl/WcsDataFacadeImpl.java b/src/main/java/com/zy/ai/mcp/service/impl/WcsDataFacadeImpl.java
index 4cf371b..5b65c21 100644
--- a/src/main/java/com/zy/ai/mcp/service/impl/WcsDataFacadeImpl.java
+++ b/src/main/java/com/zy/ai/mcp/service/impl/WcsDataFacadeImpl.java
@@ -2,7 +2,7 @@
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zy.ai.entity.DeviceConfigsData;
 import com.zy.ai.log.AiLogAppender;
 import com.zy.ai.mcp.service.WcsDataFacade;
@@ -49,14 +49,14 @@
     @Override
     public Object getCrnDeviceStatus(JSONObject args) {
         List<Integer> deviceNoList = optIntList(args, "crnNos");
-        EntityWrapper<BasCrnp> wrapper = new EntityWrapper<>();
+        QueryWrapper<BasCrnp> wrapper = new QueryWrapper<>();
         if (deviceNoList != null && deviceNoList.size() > 0) {
             wrapper.in("crn_no", deviceNoList);
         }
         JSONObject data = new JSONObject();
 
         List<Object> deviceList = new ArrayList<>();
-        List<BasCrnp> basCrnps = basCrnpService.selectList(wrapper);
+        List<BasCrnp> basCrnps = basCrnpService.list(wrapper);
         for (BasCrnp basCrnp : basCrnps) {
             CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
             if (crnThread == null) {
@@ -72,7 +72,7 @@
 
     @Override
     public Object getStationDeviceStatus(JSONObject args) {
-        List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+        List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
         JSONObject data = new JSONObject();
 
         List<Object> stationList = new ArrayList<>();
@@ -100,14 +100,14 @@
     @Override
     public Object getRgvDeviceStatus(JSONObject args) {
         List<Integer> deviceNoList = optIntList(args, "rgvNos");
-        EntityWrapper<BasRgv> wrapper = new EntityWrapper<>();
+        QueryWrapper<BasRgv> wrapper = new QueryWrapper<>();
         if (deviceNoList != null && deviceNoList.size() > 0) {
             wrapper.in("rgv_no", deviceNoList);
         }
         JSONObject data = new JSONObject();
 
         List<Object> deviceList = new ArrayList<>();
-        List<BasRgv> basRgvs = basRgvService.selectList(wrapper);
+        List<BasRgv> basRgvs = basRgvService.list(wrapper);
         for (BasRgv basRgv : basRgvs) {
             RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, basRgv.getRgvNo());
             if (rgvThread == null) {
@@ -128,7 +128,7 @@
         List<Integer> taskNos = optIntList(args, "taskNos");
         int limit = optInt(args, "limit", 200);
 
-        EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
+        QueryWrapper<WrkMast> wrapper = new QueryWrapper<>();
         if (taskNos != null && taskNos.size() > 0) {
             wrapper.in("wrk_no", taskNos);
         }
@@ -141,7 +141,7 @@
             wrapper.eq("rgv_no", rgvNo);
         }
 
-        List<WrkMast> tasks = wrkMastService.selectList(wrapper);
+        List<WrkMast> tasks = wrkMastService.list(wrapper);
         JSONObject data = new JSONObject();
         data.put("tasks", tasks);
         return data;
@@ -162,24 +162,24 @@
         List<DeviceConfigsData> deviceConfigsDataList = new ArrayList<>();
 
         List<Integer> crnNoList = optIntList(args, "crnNos");
-        EntityWrapper<BasCrnp> crnWrapper = new EntityWrapper<>();
+        QueryWrapper<BasCrnp> crnWrapper = new QueryWrapper<>();
         if (crnNoList != null && crnNoList.size() > 0) {
             crnWrapper.in("crn_no", crnNoList);
         }
 
         List<Integer> rgvNoList = optIntList(args, "rgvNos");
-        EntityWrapper<BasRgv> rgvWrapper = new EntityWrapper<>();
+        QueryWrapper<BasRgv> rgvWrapper = new QueryWrapper<>();
         if (rgvNoList != null && rgvNoList.size() > 0) {
             rgvWrapper.in("rgv_no", rgvNoList);
         }
 
         List<Integer> devpNoList = optIntList(args, "devpNos");
-        EntityWrapper<BasDevp> devpWrapper = new EntityWrapper<>();
+        QueryWrapper<BasDevp> devpWrapper = new QueryWrapper<>();
         if (devpNoList != null && devpNoList.size() > 0) {
             devpWrapper.in("devp_no", devpNoList);
         }
 
-        List<BasCrnp> basCrnps = basCrnpService.selectList(crnWrapper);
+        List<BasCrnp> basCrnps = basCrnpService.list(crnWrapper);
         for (BasCrnp basCrnp : basCrnps) {
             DeviceConfigsData deviceConfigsData = new DeviceConfigsData();
             deviceConfigsData.setDeviceNo(basCrnp.getCrnNo());
@@ -188,7 +188,7 @@
             deviceConfigsDataList.add(deviceConfigsData);
         }
 
-        List<BasRgv> basRgvs = basRgvService.selectList(rgvWrapper);
+        List<BasRgv> basRgvs = basRgvService.list(rgvWrapper);
         for (BasRgv basRgv : basRgvs) {
             DeviceConfigsData deviceConfigsData = new DeviceConfigsData();
             deviceConfigsData.setDeviceNo(basRgv.getRgvNo());
@@ -197,7 +197,7 @@
             deviceConfigsDataList.add(deviceConfigsData);
         }
 
-        List<BasDevp> basDevps = basDevpService.selectList(devpWrapper);
+        List<BasDevp> basDevps = basDevpService.list(devpWrapper);
         for (BasDevp basDevp : basDevps) {
             DeviceConfigsData deviceConfigsData = new DeviceConfigsData();
             deviceConfigsData.setDeviceNo(basDevp.getDevpNo());
@@ -213,7 +213,7 @@
     @Override
     public Object getSystemConfig(JSONObject args) {
         JSONObject data = new JSONObject();
-        List<Config> systemConfigList = configService.selectList(new EntityWrapper<Config>().notIn("dingdingReportUrl"));
+        List<Config> systemConfigList = configService.list(new QueryWrapper<Config>().ne("code", "dingdingReportUrl"));
         data.put("systemConfigs", systemConfigList);
         return data;
     }
@@ -321,4 +321,4 @@
         }
         return list;
     }
-}
\ No newline at end of file
+}

--
Gitblit v1.9.1