From 2f1116d016f50ea83f84748e468020d16bb87007 Mon Sep 17 00:00:00 2001 From: Lemon Date: Sat, 12 Aug 2023 16:56:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9E=AA=E5=8F=A3=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=20=E6=95=85=E9=9A=9C=E5=8E=9F=E5=9B=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/netty/handler/UploadRealTimeMonitorHandler.java | 2 +- .../pile/service/impl/PileConnectorInfoServiceImpl.java | 4 ++++ .../java/com/jsowell/pile/vo/web/PileConnectorInfoVO.java | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) 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; + /** * 车位号 */