diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java index a997dc1db..ea85d9d70 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java @@ -234,7 +234,7 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler { faultReason = YKCPileFaultReasonEnum.getValueByCode(faultCode); // log.info("故障码:{}, 故障原因:{}", faultCode, faultReason); } - realTimeMonitorData.setHardwareFault(hardwareFaultTemp); + realTimeMonitorData.setHardwareFault(faultReason); if (!StringUtils.equals(connectorStatus, "02")) { log.info("0x13上传实时监测数据==交易流水号:{}, 桩编号:{}, 枪号:{}, 状态:{}, 枪是否归位:{}, 是否插枪:{}, 输出电压:{}, 输出电流:{}, 枪线温度:{}, " + diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java index 379c20d33..f37426b93 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java @@ -474,6 +474,10 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService { BigDecimal instantPowerTemp = outputVoltage.multiply(outputCurrent); BigDecimal instantPower = instantPowerTemp.divide(new BigDecimal(1000), 2, BigDecimal.ROUND_HALF_UP); pileConnectorInfoVO.setInstantPower(instantPower); + // 如果故障,添加故障原因 + if (!StringUtils.equals("无", realTimeMonitorData.getHardwareFault())) { + pileConnectorInfoVO.setFaultReason(realTimeMonitorData.getHardwareFault()); + } log.info("枪口实时数据:{}", JSONObject.toJSONString(pileConnectorInfoVO)); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileConnectorInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileConnectorInfoVO.java index 52a527d73..fe7c1ef44 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileConnectorInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileConnectorInfoVO.java @@ -44,6 +44,11 @@ public class PileConnectorInfoVO { */ private Integer status; + /** + * 故障原因 + */ + private String faultReason; + /** * 车位号 */