| src/main/java/com/zy/asrs/controller/BasJarController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/BasJar.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/BasJarMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/deviceOperate/jarOperate.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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); } 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) { 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; } 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>
@@ -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 }}
