diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java index 3042018..c26a000 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java @@ -84,8 +84,26 @@ public class NuIotTqApiRequestLogController extends JeecgController date.getTime()){ - par.setResolveStatus("抄表失败"); - //判断返回状态为空并且没有超过了5分钟则返回抄表中 + //9清零 3抄表 10电表拉闸 11电表合闸 49水表清零 42水表抄表 43水表开闸 53水表关闸 + if(StringUtils.equals("9",par.getType())){ + par.setResolveStatus("清零失败"); + }else if (StringUtils.equals("3",par.getType())){ + par.setResolveStatus("抄表失败"); + }else if(StringUtils.equals("10",par.getType())){ + par.setResolveStatus("拉闸失败"); + }else if (StringUtils.equals("11",par.getType())){ + par.setResolveStatus("合闸失败"); + }else if(StringUtils.equals("49",par.getType())){ + par.setResolveStatus("清零失败"); + }else if (StringUtils.equals("42",par.getType())){ + par.setResolveStatus("抄表失败"); + }else if (StringUtils.equals("43",par.getType())){ + par.setResolveStatus("开阀失败"); + }else if (StringUtils.equals("53",par.getType())){ + par.setResolveStatus("关阀失败"); + } + + //判断返回状态为空并且没有超过了5分钟则返回抄表中 }else if(StringUtils.isBlank(par.getResolveStatus())){ par.setResolveStatus(par.getRequestStatus()); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java index bcc9171..1ccb480 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java @@ -139,7 +139,7 @@ public class WaterMeterServiceImpl extends ServiceImpl waterControl(WaterMeter waterMeter){ @@ -147,9 +147,9 @@ public class WaterMeterServiceImpl extends ServiceImpl> req = new ArrayList<>(); @@ -181,9 +181,9 @@ public class WaterMeterServiceImpl extends ServiceImpl