From e973fbaf60de8891ddbd99c775932139c366af89 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 23 十一月 2024 17:20:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java | 4 ++++
src/main/resources/mapper/BasJarMapper.xml | 3 +++
src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/controller/BasJarController.java | 6 +++++-
src/main/java/com/zy/asrs/entity/BasJar.java | 22 ++++++++++++++++++++++
src/main/webapp/views/deviceOperate/jarOperate.html | 6 ++++++
6 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasJarController.java b/src/main/java/com/zy/asrs/controller/BasJarController.java
index 3af53de..7c6e556 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarController.java
@@ -145,10 +145,14 @@
vo.setJarTemperature(basJar.getJarTemperature());
vo.setJarTemperature$(basJar.getJarTemperature().toString()+"鈩�");
vo.setJarPressure(basJar.getJarPressure());
- vo.setJarPressure$(basJar.getJarPressure().toString()+"Pa");
+ vo.setJarPressure$(basJar.getJarPressure().toString()+"MPa");
vo.setJarCount(basJar.getJarCount());//鏈�澶у偍閲�
vo.setJarCount$(basJar.getJarCount().toString()+"鎵�");//鏈�澶у偍閲�
+ vo.setHoldingTime(basJar.getHoldingTime().toString());//淇濇俯鏃堕棿
+ vo.setOpenTime(basJar.getOpenTime().toString());//寮�闂ㄦ椂闂�
+ vo.setCloseTime(basJar.getCloseTime().toString());//鍏抽棬鏃堕棿
+
}
return R.ok().add(list);
}
diff --git a/src/main/java/com/zy/asrs/entity/BasJar.java b/src/main/java/com/zy/asrs/entity/BasJar.java
index 31ead83..42dfb95 100644
--- a/src/main/java/com/zy/asrs/entity/BasJar.java
+++ b/src/main/java/com/zy/asrs/entity/BasJar.java
@@ -8,6 +8,7 @@
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
+import java.util.Date;
@Data
@TableName("asr_bas_jar")
@@ -167,6 +168,27 @@
@TableField("jar_pressure")
private Float jarPressure;
+ /**
+ * 淇濇俯鏃堕棿
+ */
+ @ApiModelProperty(value= "淇濇俯鏃堕棿")
+ @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/asrs/entity/vo/JarStateTableVo.java b/src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java
index 9657a19..c04c140 100644
--- a/src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java
+++ b/src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java
@@ -42,5 +42,9 @@
private Integer jarCount = 0;
private String jarCount$ = "-";
+ private String holdingTime = "-";
+ private String openTime = "-";
+ private String closeTime = "-";
+
private List<JarMastTableVo> jarMastTableVoList;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
index 92f3aa3..45ec7ce 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -52,7 +52,7 @@
}
if (crnp.getCrnErr() != null) {
if (crnp.getCrnErr() != 0) {
- log.error("{}鍙峰爢鍨涙満寮傚父锛屽紓甯哥爜{}", crnNo, crnp.getCrnErr());
+ log.error("{}鍙峰爢鍨涙満寮傚父锛屽紓甯哥爜{}", crnNo, crnp.getCrnErr()+crnp.getCrnErr$());
return false;
}
}
diff --git a/src/main/resources/mapper/BasJarMapper.xml b/src/main/resources/mapper/BasJarMapper.xml
index 753f9a8..6aa5b38 100644
--- a/src/main/resources/mapper/BasJarMapper.xml
+++ b/src/main/resources/mapper/BasJarMapper.xml
@@ -26,6 +26,9 @@
<result column="burial" property="burial" />
<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>
diff --git a/src/main/webapp/views/deviceOperate/jarOperate.html b/src/main/webapp/views/deviceOperate/jarOperate.html
index 6d7d971..ef4bdcd 100644
--- a/src/main/webapp/views/deviceOperate/jarOperate.html
+++ b/src/main/webapp/views/deviceOperate/jarOperate.html
@@ -96,6 +96,12 @@
</el-descriptions-item>
<el-descriptions-item label="鏈�澶у偍閲�">{{ tableData[currentIndex].jarCount$ }}
</el-descriptions-item>
+ <el-descriptions-item label="淇濇俯鏃堕棿">{{ tableData[currentIndex].holdingTime }}
+ </el-descriptions-item>
+ <el-descriptions-item label="寮�闂ㄦ椂闂�">{{ tableData[currentIndex].openTime }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍏抽棬鏃堕棿">{{ tableData[currentIndex].closeTime }}
+ </el-descriptions-item>
<el-descriptions-item label="鏁呴殰浠ｇ爜">{{ tableData[currentIndex].jarErr }}
</el-descriptions-item>
</el-descriptions>
--
Gitblit v1.9.1