From a7f0ee46f5a1b0ec8cf7bd3d0701bde6c09de24f Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期日, 24 十一月 2024 16:33:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java | 52 +++++++++++++++++
src/main/resources/mapper/BasJarMapper.xml | 4 +
src/main/java/com/zy/asrs/controller/BasJarController.java | 38 ++++++++++++
src/main/java/com/zy/asrs/entity/BasJar.java | 28 +++++++++
src/main/webapp/views/deviceOperate/jarOperate.html | 28 ++++++++-
5 files changed, 146 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasJarController.java b/src/main/java/com/zy/asrs/controller/BasJarController.java
index 9e8d044..65e1136 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarController.java
@@ -165,16 +165,54 @@
vo.setRegion(basJar.getRegion());
vo.setJarCode(basJar.getJarCode());
vo.setJarErr(basJar.getJarErr$());
+
vo.setJarTemperature(basJar.getJarTemperature());
vo.setJarTemperature$(basJar.getJarTemperature().toString()+"鈩�");
vo.setJarPressure(basJar.getJarPressure());
vo.setJarPressure$(basJar.getJarPressure().toString()+"MPa");
vo.setJarCount(basJar.getJarCount());//鏈�澶у偍閲�
vo.setJarCount$(basJar.getJarCount().toString()+"鎵�");//鏈�澶у偍閲�
+
vo.setHoldingTime(DateUtils.convert(basJar.getHoldingTime()));//淇濇俯鏃堕棿
vo.setOpenTime(DateUtils.convert(basJar.getOpenTime()));//寮�闂ㄦ椂闂�
vo.setCloseTime(DateUtils.convert(basJar.getCloseTime()));//鍏抽棬鏃堕棿
+ vo.setLeftDoorOpen(basJar.getLeftDoorOpen());
+ vo.setLeftDoorClose(basJar.getLeftDoorClose());
+ vo.setRightDoorOpen(basJar.getRightDoorOpen());
+ vo.setRightDoorClose(basJar.getRightDoorClose());
+
+ /**
+ * 宸﹂棬(checkBox)
+ */
+ vo.setLeftDoor(basJar.getLeftDoor().equals("N")? "鍏抽棴":"鎵撳紑");
+
+ /**
+ * 鍙抽棬(checkBox)
+ */
+ vo.setRightDoor(basJar.getRightDoor().equals("N")? "鍏抽棴":"鎵撳紑");
+
+ /**
+ * 宸﹂棬鍙紑(checkBox)
+ */
+ vo.setLeftInEnable(basJar.getLeftInEnable());
+
+ /**
+ * 宸﹂棬鍙叧(checkBox)
+ */
+ vo.setLeftOutEnable(basJar.getLeftOutEnable());
+
+
+ /**
+ * 鍙抽棬鍙紑(checkBox)
+ */
+ vo.setRightInEnable(basJar.getRightInEnable());
+
+ /**
+ * 鍙抽棬鍙叧(checkBox)
+ */
+ vo.setRightOutEnable(basJar.getRightOutEnable());
+
}
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 42dfb95..b248fdb 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/asrs/entity/vo/JarStateTableVo.java b/src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java
index c04c140..ddfbc44 100644
--- a/src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java
+++ b/src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java
@@ -46,5 +46,57 @@
private String openTime = "-";
private String closeTime = "-";
+ /**
+ * 宸﹂棬寮�闂�
+ */
+ private Integer leftDoorOpen = 999;
+
+ /**
+ * 宸﹂棬鍏抽棬
+ */
+ private Integer leftDoorClose = 999;
+
+ /**
+ * 鍙抽棬寮�闂�
+ */
+ private Integer rightDoorOpen = 999;
+
+ /**
+ * 鍙抽棬鍏抽棬
+ */
+ private Integer rightDoorClose = 999;
+
+
+ /**
+ * 宸﹂棬(checkBox)
+ */
+ private String leftDoor = "-";
+
+ /**
+ * 鍙抽棬(checkBox)
+ */
+ private String rightDoor = "-";
+
+ /**
+ * 宸﹂棬鍙紑(checkBox)
+ */
+ private String leftInEnable = "-";
+
+ /**
+ * 宸﹂棬鍙叧(checkBox)
+ */
+ private String leftOutEnable = "-";
+
+
+ /**
+ * 鍙抽棬鍙紑(checkBox)
+ */
+ private String rightInEnable = "-";
+
+ /**
+ * 鍙抽棬鍙叧(checkBox)
+ */
+ private String rightOutEnable = "-";
+
private List<JarMastTableVo> jarMastTableVoList;
}
diff --git a/src/main/resources/mapper/BasJarMapper.xml b/src/main/resources/mapper/BasJarMapper.xml
index 6aa5b38..a858652 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>
diff --git a/src/main/webapp/views/deviceOperate/jarOperate.html b/src/main/webapp/views/deviceOperate/jarOperate.html
index 5e6ab82..9507a03 100644
--- a/src/main/webapp/views/deviceOperate/jarOperate.html
+++ b/src/main/webapp/views/deviceOperate/jarOperate.html
@@ -183,18 +183,38 @@
<el-descriptions-item label="璁惧鐘舵��">
<el-tag>{{ tableData[currentIndex].jarStatus }}</el-tag>
</el-descriptions-item>
+ <el-descriptions-item label="宸﹂棬">{{ tableData[currentIndex].leftDoor }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍙抽棬">{{ tableData[currentIndex].rightDoor }}
+ </el-descriptions-item>
+ <el-descriptions-item label="宸﹂棬鍙紑">{{ tableData[currentIndex].leftInEnable }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍙抽棬鍙紑">{{ tableData[currentIndex].leftOutEnable }}
+ </el-descriptions-item>
+ <el-descriptions-item label="宸﹂棬鍙叧">{{ tableData[currentIndex].rightInEnable }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍙抽棬鍙叧">{{ tableData[currentIndex].rightOutEnable }}
+ </el-descriptions-item>
<el-descriptions-item label="鍖哄煙">{{ tableData[currentIndex].region }}
</el-descriptions-item>
<el-descriptions-item label="浠ｅ彿">{{ tableData[currentIndex].jarCode }}
</el-descriptions-item>
- <el-descriptions-item label="娓╁害">{{ tableData[currentIndex].jarTemperature$ }}
- </el-descriptions-item>
- <el-descriptions-item label="鍘嬪姏">{{ tableData[currentIndex].jarPressure$ }}
- </el-descriptions-item>
+<!-- <el-descriptions-item label="娓╁害">{{ tableData[currentIndex].jarTemperature$ }}-->
+<!-- </el-descriptions-item>-->
+<!-- <el-descriptions-item label="鍘嬪姏">{{ tableData[currentIndex].jarPressure$ }}-->
+<!-- </el-descriptions-item>-->
<el-descriptions-item label="鏈�澶у偍閲�">{{ tableData[currentIndex].jarCount$ }}
</el-descriptions-item>
<el-descriptions-item label="鏁呴殰浠ｇ爜">{{ tableData[currentIndex].jarErr }}
</el-descriptions-item>
+ <el-descriptions-item label="宸﹂棬寮�闂ㄧ姸鎬�">{{ tableData[currentIndex].leftDoorOpen }}
+ </el-descriptions-item>
+ <el-descriptions-item label="宸﹂棬鍏抽棬鐘舵��">{{ tableData[currentIndex].leftDoorClose }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍙抽棬寮�闂ㄧ姸鎬�">{{ tableData[currentIndex].rightDoorOpen }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍙抽棬鍏抽棬鐘舵��">{{ tableData[currentIndex].rightDoorClose }}
+ </el-descriptions-item>
<el-descriptions-item label="鏈�杩戜竴娆′繚娓╂椂闂�">{{ tableData[currentIndex].holdingTime }}
</el-descriptions-item>
<el-descriptions-item label="鏈�杩戜竴娆″紑闂ㄦ椂闂�">{{ tableData[currentIndex].openTime }}
--
Gitblit v1.9.1