diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/DeviceResponseEnum.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/DeviceResponseEnum.java index c6f7588a4..3e56870bc 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/DeviceResponseEnum.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/DeviceResponseEnum.java @@ -91,8 +91,8 @@ public enum DeviceResponseEnum { QUERY_DEVICE_DATA_EMPTY("A0360","查询终端数据数据为空"), SAME_ALARM_STRATEGY("A0361","当前等级策略已存在"), LINE_GRADE_INDEX_ERR("A0362","异常等级索引"), - LINE_GRADE_LESS("A0363","监测点等级策略缺失") - + LINE_GRADE_LESS("A0363","监测点等级策略缺失"), + FLOW_UPDATE("A0364","默认类型必须存在一个") diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/FlowMealServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/FlowMealServiceImpl.java index bcce56f9e..680d36444 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/FlowMealServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/FlowMealServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.util.CollectionUtils; import java.time.LocalDateTime; import java.util.List; +import java.util.Objects; /** * @version 1.0.0 @@ -53,7 +54,7 @@ public class FlowMealServiceImpl extends ServiceImpl i @Override public boolean updateRateOfFlowData(FlowMealParam.FlowMealUpdateParam flowMealUpdateParam) { - if (flowMealUpdateParam.getType() ==0 ) { + if (flowMealUpdateParam.getType() == 0) { checkCode(flowMealUpdateParam, true); } FlowMeal flowMeal = new FlowMeal(); @@ -96,10 +97,18 @@ public class FlowMealServiceImpl extends ServiceImpl i List rateOfFlowFlag = rateOfFlowMapper.getRateOfFlowFlag(); if (!CollectionUtils.isEmpty(rateOfFlowFlag)) { if (flowMealParam.getFlag().equals(DataStateEnum.ENABLE.getCode())) { - throw new BusinessException(DeviceResponseEnum.FLOW_FLAG); + if (Objects.equals(((FlowMealParam.FlowMealUpdateParam) flowMealParam).getId(), rateOfFlowFlag.get(0).getId())) { + if (Objects.equals(flowMealParam.getName(), rateOfFlowFlag.get(0).getName()) && Objects.equals(flowMealParam.getFlow(), rateOfFlowFlag.get(0).getFlow())) { + throw new BusinessException(DeviceResponseEnum.FLOW_FLAG); + } + } else if (!Objects.equals(((FlowMealParam.FlowMealUpdateParam) flowMealParam).getId(), rateOfFlowFlag.get(0).getId())) { + throw new BusinessException(DeviceResponseEnum.FLOW_FLAG); + } + } else { + if (Objects.equals(((FlowMealParam.FlowMealUpdateParam) flowMealParam).getId(), rateOfFlowFlag.get(0).getId())) { + throw new BusinessException(DeviceResponseEnum.FLOW_UPDATE); + } } } } - - }