From 16c2b2af2ac3c9c4bc2496a171d041a48514906e Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期四, 23 四月 2026 09:18:20 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/core/thread/RgvThread.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 5e213cf..a300ca6 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -5,7 +5,7 @@
 import HslCommunication.Profinet.Siemens.SiemensPLCS;
 import HslCommunication.Profinet.Siemens.SiemensS7Net;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.core.common.DateUtils;
 import com.core.common.SpringUtils;
 import com.zy.asrs.entity.BasCircularShuttle;
@@ -156,7 +156,7 @@
                     try {
                         // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
                         BasCircularShuttleService basCircularShuttleService = SpringUtils.getBean(BasCircularShuttleService.class);
-                        BasCircularShuttle basCircularShuttle = basCircularShuttleService.selectOne(new EntityWrapper<BasCircularShuttle>().eq("rgv_no",  slave.getId()));
+                        BasCircularShuttle basCircularShuttle = basCircularShuttleService.getOne(new QueryWrapper<BasCircularShuttle>().eq("rgv_no",  slave.getId()));
                         if (basCircularShuttle.getStatus() != 0){
                             continue;
                         }
@@ -340,7 +340,7 @@
                         if (!alarmChangeSign && !alarmList.isEmpty()){
                             BasRgvErrLogService basRgvErrLogService = SpringUtils.getBean(BasRgvErrLogService.class);
                             BasRgvErrLog basRgvErrLog = new BasRgvErrLog(rgvProtocol.getAlarmList(), rgvProtocol.getTaskNo1(), rgvProtocol.getRgvNo());
-                            basRgvErrLogService.insert(basRgvErrLog);
+                            basRgvErrLogService.save(basRgvErrLog);
                         }
                     } catch (Exception e){
                         log.error("RGV寮傚父淇℃伅淇濆瓨澶辫触锛侊紒");
@@ -371,7 +371,7 @@
             BasRgvOptService basRgvOptService = SpringUtils.getBean(BasRgvOptService.class);
             BasRgvOpt basRgvOpt = new BasRgvOpt(rgvProtocol.getTaskNo1().intValue(), rgvProtocol.getRgvNo(), rgvProtocol.getRgvPosInt(), command);
             log.info(rgvProtocol.getRgvNo()+"鍙峰皬杞﹀啓鍏ュ懡浠ゅ畾浣嶅�硷細"+rgvProtocol.getRgvPosInt());
-            basRgvOptService.insert(basRgvOpt);
+            basRgvOptService.save(basRgvOpt);
         }catch (Exception e){
             log.error("RGV鍐欏叆鍛戒护淇濆瓨澶辫触锛侊紒");
         }
@@ -380,7 +380,7 @@
         try{
             BasRgvOptService basRgvOptService = SpringUtils.getBean(BasRgvOptService.class);
             BasRgvOpt basRgvOpt = new BasRgvOpt(rgvProtocol.getTaskNo1().intValue(), rgvProtocol.getRgvNo(), rgvProtocol.getRgvPosI(), command);
-            basRgvOptService.insert(basRgvOpt);
+            basRgvOptService.save(basRgvOpt);
         }catch (Exception e){
             log.error("RGV鍐欏叆鍛戒护淇濆瓨澶辫触锛侊紒");
         }
@@ -432,7 +432,7 @@
                     new Date(),
                     null
             );
-            bean.insert(basRgvOpt);
+            bean.save(basRgvOpt);
         } catch (Exception ignore) {}
 
         if (result != null && result.IsSuccess) {
@@ -494,7 +494,7 @@
                     new Date(),
                     null
             );
-            bean.insert(basRgvOpt);
+            bean.save(basRgvOpt);
         } catch (Exception ignore) {}
 
         if (result != null && result.IsSuccess) {
@@ -579,7 +579,7 @@
                     new Date(),
                     null
             );
-            bean.insert(basRgvOpt);
+            bean.save(basRgvOpt);
         } catch (Exception ignore) {}
 
         if (result != null && result.IsSuccess) {

--
Gitblit v1.9.1