From 16999af4129f6e43bb11b00796f1c48207840128 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期四, 17 七月 2025 18:11:49 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/RgvThread.java | 4 ++++
src/main/resources/mapper/BasRgvMapper.xml | 2 ++
src/main/java/com/zy/asrs/entity/BasRgv.java | 14 ++++++++++++++
3 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasRgv.java b/src/main/java/com/zy/asrs/entity/BasRgv.java
index 1243c38..81b8262 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgv.java
+++ b/src/main/java/com/zy/asrs/entity/BasRgv.java
@@ -56,6 +56,20 @@
private Integer rgvSts;
/**
+ * 浣滀笟鎬�
+ */
+ @ApiModelProperty(value= "浣滀笟鎬�")
+ @TableField("rgv_sts1")
+ private Integer rgvSts1;
+
+ /**
+ * 浣滀笟鎬�
+ */
+ @ApiModelProperty(value= "浣滀笟鎬�")
+ @TableField("rgv_sts2")
+ private Integer rgvSts2;
+
+ /**
* 浠诲姟鍙�
*/
@ApiModelProperty(value= "浠诲姟鍙�")
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index f89bbbf..6421de8 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -263,6 +263,8 @@
BasRgv basRgv = new BasRgv();
basRgv.setRgvNo(slave.getId());
basRgv.setRgvSts((int)rgvProtocol.getMode());
+ basRgv.setRgvSts1((int)rgvProtocol.getStatus1());
+ basRgv.setRgvSts2((int)rgvProtocol.getStatus2());
basRgv.setLoaded2(rgvProtocol.getLoaded2().intValue());
if (!basRgvService.updateById(rgvProtocol.toSqlModel(basRgv))){
log.error("RGV plc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
@@ -354,6 +356,8 @@
BasRgv basRgv = new BasRgv();
basRgv.setRgvNo(slave.getId());
basRgv.setRgvSts((int)rgvProtocol.getMode());
+ basRgv.setRgvSts1((int)rgvProtocol.getStatus1());
+ basRgv.setRgvSts2((int)rgvProtocol.getStatus2());
basRgv.setLoaded2(rgvProtocol.getLoaded2().intValue());
basRgv.setNowStaNo(rgvProtocol.getRgvPosI());
if (!basRgvService.updateById(rgvProtocol.toSqlModel(basRgv))){
diff --git a/src/main/resources/mapper/BasRgvMapper.xml b/src/main/resources/mapper/BasRgvMapper.xml
index 56844e1..54b6c8e 100644
--- a/src/main/resources/mapper/BasRgvMapper.xml
+++ b/src/main/resources/mapper/BasRgvMapper.xml
@@ -8,6 +8,8 @@
<result column="in_enable" property="inEnable" />
<result column="out_enable" property="outEnable" />
<result column="rgv_sts" property="rgvSts" />
+ <result column="rgv_sts1" property="rgvSts1" />
+ <result column="rgv_sts2" property="rgvSts2" />
<result column="wrk_no1" property="wrkNo1" />
<result column="wrk_no2" property="wrkNo2" />
<result column="rgv_err" property="rgvErr" />
--
Gitblit v1.9.1