From ff9b89307d063f29000857a8b8823bfd4b3de4a5 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 23 十一月 2024 17:19:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/JarThread.java | 9 ++++++++-
src/main/resources/mapper/BasJarMapper.xml | 2 ++
src/main/java/com/zy/core/model/protocol/JarProtocol.java | 8 ++++++++
src/main/java/com/zy/asrs/entity/BasJar.java | 14 ++++++++++++++
4 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasJar.java b/src/main/java/com/zy/asrs/entity/BasJar.java
index bbdaa48..400025d 100644
--- a/src/main/java/com/zy/asrs/entity/BasJar.java
+++ b/src/main/java/com/zy/asrs/entity/BasJar.java
@@ -175,6 +175,20 @@
@TableField("holding_time")
private Date holdingTime;
+ /**
+ * 寮�闂ㄦ椂闂�
+ */
+ @ApiModelProperty(value= "寮�闂ㄦ椂闂�")
+ @TableField("open_time")
+ private Date openTime;
+
+ /**
+ * 鍏抽棬鏃堕棿
+ */
+ @ApiModelProperty(value= "鍏抽棬鏃堕棿")
+ @TableField("close_time")
+ private Date closeTime;
+
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 bebf57a..29b50cf 100644
--- a/src/main/java/com/zy/core/model/protocol/JarProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/JarProtocol.java
@@ -114,6 +114,8 @@
public Float jarTemperature;
public Float jarPressure;
public boolean holdingSign = false;
+ public boolean openDoorSign = false;
+ public boolean closeDoorSign = false;
public Short upStatus = 0;
@@ -161,6 +163,12 @@
if (holdingSign){
basJar.setHoldingTime(new Date());
}
+ if (openDoorSign){
+ basJar.setOpenTime(new Date());
+ }
+ if (closeDoorSign){
+ basJar.setCloseTime(new Date());
+ }
return basJar;
}
diff --git a/src/main/java/com/zy/core/thread/JarThread.java b/src/main/java/com/zy/core/thread/JarThread.java
index 6442301..24186b4 100644
--- a/src/main/java/com/zy/core/thread/JarThread.java
+++ b/src/main/java/com/zy/core/thread/JarThread.java
@@ -178,8 +178,15 @@
jarProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, 12) == 2);//鑷姩
- if (jarProtocol.statusType .equals(JarStatusType.SOS) || jarProtocol.statusType .equals(JarStatusType.SOS2)){
+// if (jarProtocol.statusType .equals(JarStatusType.SOS)){
+// jarProtocol.setHoldingSign(!jarProtocol.getStatus().equals(jarProtocol.getUpStatus()));
+// } else
+ if (jarProtocol.statusType .equals(JarStatusType.SOS2)){
jarProtocol.setHoldingSign(!jarProtocol.getStatus().equals(jarProtocol.getUpStatus()));
+ } else if (jarProtocol.statusType .equals(JarStatusType.WAITING3) || jarProtocol.statusType .equals(JarStatusType.WAITING4)){
+ jarProtocol.setOpenDoorSign(!jarProtocol.getStatus().equals(jarProtocol.getUpStatus()));
+ } else if (jarProtocol.statusType .equals(JarStatusType.WAITING5) || jarProtocol.statusType .equals(JarStatusType.OFF_LINE)){
+ jarProtocol.setCloseDoorSign(!jarProtocol.getStatus().equals(jarProtocol.getUpStatus()));
}
jarProtocol.setUpStatus(jarProtocol.getStatus());
diff --git a/src/main/resources/mapper/BasJarMapper.xml b/src/main/resources/mapper/BasJarMapper.xml
index f86f4bf..a105c37 100644
--- a/src/main/resources/mapper/BasJarMapper.xml
+++ b/src/main/resources/mapper/BasJarMapper.xml
@@ -27,6 +27,8 @@
<result column="jar_temperature" property="jarTemperature" />
<result column="jar_pressure" property="jarPressure" />
<result column="holding_time" property="holdingTime" />
+ <result column="open_time" property="openTime" />
+ <result column="close_time" property="closeTime" />
</resultMap>
--
Gitblit v1.9.1