Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

zbj//1.修改流量套餐 可以修改默认类型套餐的名称及流量 代码调整

Browse Source
This commit is contained in:
zhangbaojian
2023-05-23 13:52:14 +08:00
parent 35a7cd34ab
commit b5a0e4c9e3
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/DeviceResponseEnum.java
View File

@@ -91,8 +91,8 @@ public enum DeviceResponseEnum {
QUERY_DEVICE_DATA_EMPTY("A0360","查询终端数据数据为空"), QUERY_DEVICE_DATA_EMPTY("A0360","查询终端数据数据为空"),
SAME_ALARM_STRATEGY("A0361","当前等级策略已存在"), SAME_ALARM_STRATEGY("A0361","当前等级策略已存在"),
LINE_GRADE_INDEX_ERR("A0362","异常等级索引"), LINE_GRADE_INDEX_ERR("A0362","异常等级索引"),
LINE_GRADE_LESS("A0363","监测点等级策略缺失") LINE_GRADE_LESS("A0363","监测点等级策略缺失"),
FLOW_UPDATE("A0364","默认类型必须存在一个")

17
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/FlowMealServiceImpl.java
View File

@@ -19,6 +19,7 @@ import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import java.util.Objects;
/** /**
* @version 1.0.0 * @version 1.0.0
@@ -53,7 +54,7 @@ public class FlowMealServiceImpl extends ServiceImpl<FlowMealMapper, FlowMeal> i
@Override @Override
public boolean updateRateOfFlowData(FlowMealParam.FlowMealUpdateParam flowMealUpdateParam) { public boolean updateRateOfFlowData(FlowMealParam.FlowMealUpdateParam flowMealUpdateParam) {
if (flowMealUpdateParam.getType() ==0 ) { if (flowMealUpdateParam.getType() == 0) {
checkCode(flowMealUpdateParam, true); checkCode(flowMealUpdateParam, true);
} }
FlowMeal flowMeal = new FlowMeal(); FlowMeal flowMeal = new FlowMeal();
@@ -96,10 +97,18 @@ public class FlowMealServiceImpl extends ServiceImpl<FlowMealMapper, FlowMeal> i
List<RateOfFlowVO> rateOfFlowFlag = rateOfFlowMapper.getRateOfFlowFlag(); List<RateOfFlowVO> rateOfFlowFlag = rateOfFlowMapper.getRateOfFlowFlag();
if (!CollectionUtils.isEmpty(rateOfFlowFlag)) { if (!CollectionUtils.isEmpty(rateOfFlowFlag)) {
if (flowMealParam.getFlag().equals(DataStateEnum.ENABLE.getCode())) { 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);
}
} }
} }
} }
} }