From 4eed2d245b3af6f3e69da1f6e4c68956292391ed Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期日, 24 十一月 2024 16:19:30 +0800
Subject: [PATCH] #cs1

---
 src/main/resources/mapper/BasJarMapper.xml                |    4 ++++
 src/main/java/com/zy/core/model/protocol/JarProtocol.java |    4 ++++
 src/main/java/com/zy/asrs/entity/BasJar.java              |   28 ++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/BasJar.java b/src/main/java/com/zy/asrs/entity/BasJar.java
index 400025d..2ad24b0 100644
--- a/src/main/java/com/zy/asrs/entity/BasJar.java
+++ b/src/main/java/com/zy/asrs/entity/BasJar.java
@@ -189,6 +189,34 @@
     @TableField("close_time")
     private Date closeTime;
 
+    /**
+     * 宸﹂棬寮�闂�
+     */
+    @ApiModelProperty(value= "宸﹂棬寮�闂�")
+    @TableField("left_door_open")
+    private Integer leftDoorOpen;
+
+    /**
+     * 宸﹂棬鍏抽棬
+     */
+    @ApiModelProperty(value= "宸﹂棬鍏抽棬")
+    @TableField("left_door_close")
+    private Integer leftDoorClose;
+
+    /**
+     * 鍙抽棬寮�闂�
+     */
+    @ApiModelProperty(value= "鍙抽棬寮�闂�")
+    @TableField("right_door_open")
+    private Integer rightDoorOpen;
+
+    /**
+     * 鍙抽棬鍏抽棬
+     */
+    @ApiModelProperty(value= "鍙抽棬鍏抽棬")
+    @TableField("right_door_close")
+    private Integer rightDoorClose;
+
     public BasJar() {}
 
     public BasJar(Integer jarNo,Integer region,Integer jarCode,Integer staNo,Integer jarStatus,Integer jarCount,Integer jarErr,String leftDoor,String rightDoor,String leftInEnable,String leftOutEnable,String autoing,Integer jarMode,String rightInEnable,String rightOutEnable) {
diff --git a/src/main/java/com/zy/core/model/protocol/JarProtocol.java b/src/main/java/com/zy/core/model/protocol/JarProtocol.java
index 93bc569..cfa29a4 100644
--- a/src/main/java/com/zy/core/model/protocol/JarProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/JarProtocol.java
@@ -160,6 +160,10 @@
         basJar.setAutoing(autoing?"Y":"N");
         basJar.setJarTemperature(jarTemperature);
         basJar.setJarPressure(jarPressure);
+        basJar.setLeftDoorOpen(leftDoorOpen);
+        basJar.setLeftDoorClose(leftDoorClose);
+        basJar.setRightDoorOpen(rightDoorOpen);
+        basJar.setRightDoorClose(rightDoorClose);
         if (holdingSign){
             basJar.setHoldingTime(new Date());
             holdingSign = false;
diff --git a/src/main/resources/mapper/BasJarMapper.xml b/src/main/resources/mapper/BasJarMapper.xml
index a105c37..24f1ddc 100644
--- a/src/main/resources/mapper/BasJarMapper.xml
+++ b/src/main/resources/mapper/BasJarMapper.xml
@@ -29,6 +29,10 @@
         <result column="holding_time" property="holdingTime" />
         <result column="open_time" property="openTime" />
         <result column="close_time" property="closeTime" />
+        <result column="left_door_open" property="leftDoorOpen" />
+        <result column="left_door_close" property="leftDoorClose" />
+        <result column="right_door_open" property="rightDoorOpen" />
+        <result column="right_door_close" property="rightDoorClose" />
 
     </resultMap>
 

--
Gitblit v1.9.1