diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsSuperviseController.java b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsSuperviseController.java index b86b49a67..dd380e9be 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsSuperviseController.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsSuperviseController.java @@ -54,7 +54,7 @@ public class ThsSuperviseController extends BaseController { - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + /* @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("预警/告警事务生成手动") @ApiImplicitParam(name = "superviseParam", value = "创建技术监督参数", required = true) @PostMapping("/initSuperviseHand") @@ -63,7 +63,7 @@ public class ThsSuperviseController extends BaseController { SuperviceRunLogVo result = thsSuperviseService.initSuperviseHand(superviseParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } - +*/ @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("预警/告警事务生成自动") diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/ThsSuperviseService.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/ThsSuperviseService.java index c95447740..9ac0883e5 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/ThsSuperviseService.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/ThsSuperviseService.java @@ -116,7 +116,7 @@ public interface ThsSuperviseService extends IService { SuperviceRunLogVo initSupervise(@RequestBody @Validated SuperviseParam superviseParam); - SuperviceRunLogVo initSuperviseHand(@RequestBody @Validated SuperviseParam superviseParam); + //SuperviceRunLogVo initSuperviseHand(@RequestBody @Validated SuperviseParam superviseParam); Page queryPage(ThsSuperviseParam thsSuperviseParam); diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java index fefd17285..93d75bdf5 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java @@ -26,6 +26,7 @@ import com.njcn.harmonic.pojo.vo.ThsStrategyVo; import com.njcn.oss.constant.OssPath; import com.njcn.oss.utils.FileStorageUtil; import com.njcn.prepare.harmonic.pojo.dto.SuperviseDto; +import com.njcn.process.api.FlowableDefineFeignClient; import com.njcn.process.pojo.param.SuperviseParam; import com.njcn.process.pojo.po.ThsOverRunLog; import com.njcn.process.pojo.po.ThsSupervise; @@ -95,9 +96,6 @@ import static com.njcn.process.enums.SteadyIndicatorEnum.Negative_Voltage; public class ThsSuperviseServiceImpl extends ServiceImpl implements ThsSuperviseService { - - - private final ThsWarnStrategyMapper thsWarnStrategyMapper; private final ThsWarnStrategyAssMapper thsWarnStrategyAssMapper; @@ -125,6 +123,8 @@ public class ThsSuperviseServiceImpl extends ServiceImpl mapParam = new HashMap<>(); String proInId = ""; - if(thsSupervise.getType() == 0){ + if (thsSupervise.getType() == 0) { proInId = "flow_yzep99kb:1:a100b48b-da75-11ed-8335-b07b253cdad9"; - }else { + } else { proInId = "flow_yzep99kb:2:6358e099-dcba-11ed-8026-b07b253cdad9"; } - iFlowDefinitionService.startProcessInstanceById(proInId,thsSupervise.getSupIndex(),mapParam); + iFlowDefinitionService.startProcessInstanceById(proInId, thsSupervise.getSupIndex(), mapParam); for (ThsOverRunLog thsOverRunLog : superviceRunLogVo.getOverRunLog()) { @@ -188,7 +188,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl superviseVoPage = new Page<>(pageNum, pageSize); - Page page = thsSuperviseMapper.querySupervisePage(superviseVoPage,superviseDto); + Page page = thsSuperviseMapper.querySupervisePage(superviseVoPage, superviseDto); List pageRecords = page.getRecords(); if (CollectionUtil.isNotEmpty(pageRecords)) { for (SuperviseVo superviseVo : pageRecords) { @@ -231,11 +231,11 @@ public class ThsSuperviseServiceImpl extends ServiceImpl().eq(ThsSupervise::getSupIndex, id)); //删除同时删除工作流程 - FlowableAss flowableAss = flowableAssMapper.selectById(id); - if(Objects.nonNull(flowableAss)) { - iFlowDefinitionService.deleteInstance(flowableAss.getExecIndex(), ""); - flowableAssMapper.deleteById(id); - } + FlowableAss flowableAss = flowableAssMapper.selectById(id); + if (Objects.nonNull(flowableAss)) { + iFlowDefinitionService.deleteInstance(flowableAss.getExecIndex(), ""); + flowableAssMapper.deleteById(id); + } }); } @@ -248,25 +248,25 @@ public class ThsSuperviseServiceImpl extends ServiceImpl 1) { List thsOverRunLogs = thsOverRunLogService.list(new LambdaQueryWrapper().eq(ThsOverRunLog::getSupIndex, supIndex)); this.batchUploadFile(thsSupervise, thsOverRunLogs, files, ticketType); - this.updateProcess(thsSupervise, ticketType,thsSuperObj.getType()); + this.updateProcess(thsSupervise, ticketType, thsSuperObj.getType()); } //判断当监督单下面的监测点报告都被上传则认为流程完成 List thsOverRunLogs = thsOverRunLogService.list(new LambdaQueryWrapper().eq(ThsOverRunLog::getSupIndex, supIndex)); - List fileNames = thsOverRunLogs.stream().filter(item-> StrUtil.isNotBlank(item.getFeedback())).map(ThsOverRunLog::getFileName).distinct().collect(Collectors.toList()); - if(fileNames.size() == thsOverRunLogs.size()){ + List fileNames = thsOverRunLogs.stream().filter(item -> StrUtil.isNotBlank(item.getFeedback())).map(ThsOverRunLog::getFileName).distinct().collect(Collectors.toList()); + if (fileNames.size() == thsOverRunLogs.size()) { FlowableAss flowableAss = flowableAssMapper.selectById(supIndex); Task task = iFlowTaskService.getTask(flowableAss.getExecIndex()); @@ -285,7 +285,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl().eq(ThsOverRunLog::getSupIndex, supIndex)); thsSuperviseMapper.update(thsSupervise, new LambdaQueryWrapper().eq(ThsSupervise::getSupIndex, supIndex)); + FlowableAss flowableAss = flowableAssMapper.selectById(supIndex); Task task = iFlowTaskService.getTask(flowableAss.getExecIndex()); @@ -565,9 +567,9 @@ public class ThsSuperviseServiceImpl extends ServiceImpl commMonitorInfoDTOList = commTerminalGeneralClient.tagOrIdGetMonitorList(monitorGetParam).getData(); - Map monitorInfoDTOMap = commMonitorInfoDTOList.stream().collect(Collectors.toMap(CommMonitorInfoDTO::getId,Function.identity())); + Map monitorInfoDTOMap = commMonitorInfoDTOList.stream().collect(Collectors.toMap(CommMonitorInfoDTO::getId, Function.identity())); - List temIds= commMonitorInfoDTOList.stream().map(CommMonitorInfoDTO::getId).distinct().collect(Collectors.toList()); + List temIds = commMonitorInfoDTOList.stream().map(CommMonitorInfoDTO::getId).distinct().collect(Collectors.toList()); List rStatLimitRateDPOList = rStatLimitRateDClient.monitorIdsGetLimitInfo(RStatLimitQueryParam.builder().ids(temIds).date(yesterday).build()).getData(); //TODO 数据中心和pms这边稳态指标没用一个需要考虑兼容问题 - dictTargetList = dictTargetList.stream().filter(item->targetIds.contains(item.getId())).collect(Collectors.toList()); + dictTargetList = dictTargetList.stream().filter(item -> targetIds.contains(item.getId())).collect(Collectors.toList()); //判断指标是否在策略中 - if(CollectionUtil.isNotEmpty(rStatLimitRateDPOList)){ - for(RStatLimitRateDPO rStatLimitRateDPO :rStatLimitRateDPOList ){ + if (CollectionUtil.isNotEmpty(rStatLimitRateDPOList)) { + for (RStatLimitRateDPO rStatLimitRateDPO : rStatLimitRateDPOList) { List descriptionList = new ArrayList<>(); Integer[] count = {0}; - Map limitBoolMap = verifyLimit(rStatLimitRateDPO,dictTargetList,descriptionList,count); + Map limitBoolMap = verifyLimit(rStatLimitRateDPO, dictTargetList, descriptionList, count); - if(oneStrategyVo.getOperation().equals(OperationEnum.AND.getCode()) ){ + if (oneStrategyVo.getOperation().equals(OperationEnum.AND.getCode())) { //与 boolean res = limitBoolMap.containsValue(false); - if(res){ + if (res) { continue; } - }else { + } else { //或 boolean res = limitBoolMap.containsValue(true); - if(!res){ + if (!res) { continue; } } //到这一步说明符合策略保留该条数据，开始组装实体 - if(Objects.isNull(thsSupervise)){ + if (Objects.isNull(thsSupervise)) { thsSupervise = new ThsSupervise(); - buildSuperviseData(yesterday,dept,superviseParam,oneStrategyVo,superviseParam.getInitType(),thsSupervise); + buildSuperviseData(yesterday, dept, superviseParam, oneStrategyVo, superviseParam.getInitType(), thsSupervise); thsSuperviseListPO.add(thsSupervise); } - buildOverRunLog(thsSupervise,monitorInfoDTOMap.get(rStatLimitRateDPO.getLineId()),descriptionList,thsOverRunLogList,count); + buildOverRunLog(thsSupervise, monitorInfoDTOMap.get(rStatLimitRateDPO.getLineId()), descriptionList, thsOverRunLogList, count); } allThsLogPO.addAll(thsOverRunLogList); @@ -658,19 +660,30 @@ public class ThsSuperviseServiceImpl extends ServiceImpl mapParam = new HashMap<>(); + String proInId = ""; + if (ths.getType() == 0) { + proInId = "flow_yzep99kb:1:a100b48b-da75-11ed-8335-b07b253cdad9"; + } else { + proInId = "flow_yzep99kb:2:6358e099-dcba-11ed-8026-b07b253cdad9"; + } + flowDefinitionService.startProcessInstanceById(proInId, thsSupervise.getSupIndex(), mapParam); + } this.saveBatch(thsSuperviseListPO); thsOverRunLogService.saveBatch(allThsLogPO); return null; } - }else { + } else { superviceRunLogVo.setOverRunLog(allThsLogPO); return superviceRunLogVo; } - } @@ -680,7 +693,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl thsOverRunLogList = new ArrayList<>(); @@ -695,93 +708,92 @@ public class ThsSuperviseServiceImpl extends ServiceImpl thsStrategyList = this.thsWarnStrategyMapper.selectStrategyList(superviseParam); //按部门进行分组 if (CollectionUtil.isNotEmpty(thsStrategyList)) { - ThsSupervise thsSupervise = null; - List oneLevel = thsStrategyList.stream().filter(r -> !GradeEnum.THREE_LEVEL.getCode().equals(r.getGrade())).collect(Collectors.toList());//一级或二级策略集合 - if (CollectionUtil.isNotEmpty(oneLevel)) { - //遍历当前部门下面的所有策略 - for (ThsStrategyVo oneStrategyVo : oneLevel) { + ThsSupervise thsSupervise = null; + List oneLevel = thsStrategyList.stream().filter(r -> !GradeEnum.THREE_LEVEL.getCode().equals(r.getGrade())).collect(Collectors.toList());//一级或二级策略集合 + if (CollectionUtil.isNotEmpty(oneLevel)) { + //遍历当前部门下面的所有策略 + for (ThsStrategyVo oneStrategyVo : oneLevel) { - Dept dept = deptFeignClient.getDeptById(oneStrategyVo.getDeptId()).getData(); + Dept dept = deptFeignClient.getDeptById(oneStrategyVo.getDeptId()).getData(); + List oneInterferenceSourceAsses = this.queryWarnStrategyAss(oneStrategyVo.getId(), TypeEnum.SOURCE_TYPE);//干扰源列表 + List oneSteadyIndicatorAsses = this.queryWarnStrategyAss(oneStrategyVo.getId(), TypeEnum.INTERFERENCE_TYPE);//指标类型列表 + List oneMonitorAsses = this.queryWarnStrategyAss(oneStrategyVo.getId(), TypeEnum.MONITOR_TYPE);//监测点列表 - List oneInterferenceSourceAsses = this.queryWarnStrategyAss(oneStrategyVo.getId(), TypeEnum.SOURCE_TYPE);//干扰源列表 - List oneSteadyIndicatorAsses = this.queryWarnStrategyAss(oneStrategyVo.getId(), TypeEnum.INTERFERENCE_TYPE);//指标类型列表 - List oneMonitorAsses = this.queryWarnStrategyAss(oneStrategyVo.getId(), TypeEnum.MONITOR_TYPE);//监测点列表 + List tagIds = oneInterferenceSourceAsses.stream().map(ThsWarnStrategyAss::getAssId).distinct().collect(Collectors.toList()); + List targetIds = oneSteadyIndicatorAsses.stream().map(ThsWarnStrategyAss::getAssId).distinct().collect(Collectors.toList()); + List monitorIds = oneMonitorAsses.stream().map(ThsWarnStrategyAss::getAssId).collect(Collectors.toList()); - List tagIds = oneInterferenceSourceAsses.stream().map(ThsWarnStrategyAss::getAssId).distinct().collect(Collectors.toList()); - List targetIds = oneSteadyIndicatorAsses.stream().map(ThsWarnStrategyAss::getAssId).distinct().collect(Collectors.toList()); - List monitorIds = oneMonitorAsses.stream().map(ThsWarnStrategyAss::getAssId).collect(Collectors.toList()); + MonitorGetParam monitorGetParam = new MonitorGetParam(); + monitorGetParam.setTagList(tagIds); + monitorGetParam.setMonitorIds(monitorIds); - MonitorGetParam monitorGetParam = new MonitorGetParam(); - monitorGetParam.setTagList(tagIds); - monitorGetParam.setMonitorIds(monitorIds); + List deptAllIds = deptFeignClient.getDepSonIdtByDeptId(oneStrategyVo.getDeptId()).getData(); + monitorGetParam.setDeptIds(deptAllIds); + //TODO 需要校验 + List commMonitorInfoDTOList = commTerminalGeneralClient.tagOrIdGetMonitorList(monitorGetParam).getData(); + Map monitorInfoDTOMap = commMonitorInfoDTOList.stream().collect(Collectors.toMap(CommMonitorInfoDTO::getId, Function.identity())); - List deptAllIds = deptFeignClient.getDepSonIdtByDeptId(oneStrategyVo.getDeptId()).getData(); - monitorGetParam.setDeptIds(deptAllIds); - //TODO 需要校验 - List commMonitorInfoDTOList = commTerminalGeneralClient.tagOrIdGetMonitorList(monitorGetParam).getData(); - Map monitorInfoDTOMap = commMonitorInfoDTOList.stream().collect(Collectors.toMap(CommMonitorInfoDTO::getId,Function.identity())); + List temIds = commMonitorInfoDTOList.stream().map(CommMonitorInfoDTO::getId).distinct().collect(Collectors.toList()); - List temIds= commMonitorInfoDTOList.stream().map(CommMonitorInfoDTO::getId).distinct().collect(Collectors.toList()); + List rStatLimitRateDPOList = rStatLimitRateDClient.monitorIdsGetLimitInfo(RStatLimitQueryParam.builder().ids(temIds).date(yesterday).build()).getData(); - List rStatLimitRateDPOList = rStatLimitRateDClient.monitorIdsGetLimitInfo(RStatLimitQueryParam.builder().ids(temIds).date(yesterday).build()).getData(); + //TODO 数据中心和pms这边稳态指标没用一个需要考虑兼容问题 + dictTargetList = dictTargetList.stream().filter(item -> targetIds.contains(item.getId())).collect(Collectors.toList()); - //TODO 数据中心和pms这边稳态指标没用一个需要考虑兼容问题 - dictTargetList = dictTargetList.stream().filter(item->targetIds.contains(item.getId())).collect(Collectors.toList()); + //判断指标是否在策略中 + if (CollectionUtil.isNotEmpty(rStatLimitRateDPOList)) { + for (RStatLimitRateDPO rStatLimitRateDPO : rStatLimitRateDPOList) { - //判断指标是否在策略中 - if(CollectionUtil.isNotEmpty(rStatLimitRateDPOList)){ - for(RStatLimitRateDPO rStatLimitRateDPO :rStatLimitRateDPOList ){ + List descriptionList = new ArrayList<>(); + Integer[] count = {0}; + Map limitBoolMap = verifyLimit(rStatLimitRateDPO, dictTargetList, descriptionList, count); - List descriptionList = new ArrayList<>(); - Integer[] count = {0}; - Map limitBoolMap = verifyLimit(rStatLimitRateDPO,dictTargetList,descriptionList,count); - - if(oneStrategyVo.getOperation().equals(OperationEnum.AND.getCode()) ){ - //与 - boolean res = limitBoolMap.containsValue(false); - if(res){ - continue; - } - }else { - //或 - boolean res = limitBoolMap.containsValue(true); - if(!res){ - continue; - } + if (oneStrategyVo.getOperation().equals(OperationEnum.AND.getCode())) { + //与 + boolean res = limitBoolMap.containsValue(false); + if (res) { + continue; } - - //到这一步说明符合策略保留该条数据，开始组装实体 - if(Objects.isNull(thsSupervise)){ - thsSupervise = new ThsSupervise(); - buildSuperviseData(yesterday,dept,superviseParam,oneStrategyVo,superviseParam.getInitType(),thsSupervise); + } else { + //或 + boolean res = limitBoolMap.containsValue(true); + if (!res) { + continue; } - buildOverRunLog(thsSupervise,monitorInfoDTOMap.get(rStatLimitRateDPO.getLineId()),descriptionList,thsOverRunLogList,count); - } + //到这一步说明符合策略保留该条数据，开始组装实体 + if (Objects.isNull(thsSupervise)) { + thsSupervise = new ThsSupervise(); + buildSuperviseData(yesterday, dept, superviseParam, oneStrategyVo, superviseParam.getInitType(), thsSupervise); + } + buildOverRunLog(thsSupervise, monitorInfoDTOMap.get(rStatLimitRateDPO.getLineId()), descriptionList, thsOverRunLogList, count); } + } + } + } } superviceRunLogVo.setOverRunLog(thsOverRunLogList); return superviceRunLogVo; - } + }*/ @Override public Page queryPage(ThsSuperviseParam thsSuperviseParam) { - return this.page(new Page<>(thsSuperviseParam.getPageNum(),thsSuperviseParam.getPageSize()),new LambdaQueryWrapper() - .between(ThsSupervise::getCreateTime,DateUtil.beginOfDay(DateUtil.parse(thsSuperviseParam.getStartTime())),DateUtil.endOfDay(DateUtil.parse(thsSuperviseParam.getEndTime()))) - .eq(ThsSupervise::getDeptId,thsSuperviseParam.getDeptId())); + return this.page(new Page<>(thsSuperviseParam.getPageNum(), thsSuperviseParam.getPageSize()), new LambdaQueryWrapper() + .between(ThsSupervise::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(thsSuperviseParam.getStartTime())), DateUtil.endOfDay(DateUtil.parse(thsSuperviseParam.getEndTime()))) + .eq(ThsSupervise::getDeptId, thsSuperviseParam.getDeptId())); } - public void buildSuperviseData(String yesterday,Dept dept ,SuperviseParam superviseParam,ThsStrategyVo steady,Integer initType, ThsSupervise thsSupervise) { + public void buildSuperviseData(String yesterday, Dept dept, SuperviseParam superviseParam, ThsStrategyVo steady, Integer initType, ThsSupervise thsSupervise) { if (thsSupervise != null && StringUtils.isBlank(thsSupervise.getSupIndex())) { - thsSupervise.setName(yesterday+dept.getName()+AlarmTypeEnum.getAlarmTypeEnumByCode(superviseParam.getType()).getMessage()); + thsSupervise.setName(yesterday + dept.getName() + AlarmTypeEnum.getAlarmTypeEnumByCode(superviseParam.getType()).getMessage()); thsSupervise.setSupIndex(IdUtil.simpleUUID()); thsSupervise.setDeptId(steady.getDeptId()); thsSupervise.setCreateTime(new Date()); @@ -792,7 +804,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl descriptionList,List thsOverRunLogs,Integer[] count) { + public void buildOverRunLog(ThsSupervise thsSupervise, CommMonitorInfoDTO monitor, List descriptionList, List thsOverRunLogs, Integer[] count) { ThsOverRunLog thsOverRunLog = new ThsOverRunLog(); thsOverRunLog.setId(IdUtil.simpleUUID()); thsOverRunLog.setSupIndex(thsSupervise.getSupIndex()); @@ -815,8 +827,6 @@ public class ThsSuperviseServiceImpl extends ServiceImpl verifyLimit(RStatLimitRateDPO rStatLimitRateDPO,List dictTargetList,List descriptionList,Integer[] count) { + private Map verifyLimit(RStatLimitRateDPO rStatLimitRateDPO, List dictTargetList, List descriptionList, Integer[] count) { Map limitBoolMap = new HashMap<>(); - for(DictData dic : dictTargetList){ + for (DictData dic : dictTargetList) { SteadyIndicatorEnum steadyIndicatorEnum = SteadyIndicatorEnum.getSteadyIndicatorEnumByCode(dic.getCode()); switch (steadyIndicatorEnum) { case Negative_Voltage://负序电压不平衡度 if (rStatLimitRateDPO.getUbalanceOvertime() > 0) { limitBoolMap.put(Negative_Voltage.getCode(), true); descriptionList.add(Negative_Voltage.getMessage().concat(rStatLimitRateDPO.getUbalanceOvertime() + "次")); - count[0] = count[0]+rStatLimitRateDPO.getUbalanceOvertime(); + count[0] = count[0] + rStatLimitRateDPO.getUbalanceOvertime(); } else { limitBoolMap.put(Negative_Voltage.getCode(), false); } @@ -910,7 +920,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl 0) { limitBoolMap.put(SteadyIndicatorEnum.Interhar_Voltage.getCode(), true); descriptionList.add(SteadyIndicatorEnum.Interhar_Voltage.getMessage().concat(interharVoltageOvertime + "次")); - count[0] = count[0]+interharVoltageOvertime; + count[0] = count[0] + interharVoltageOvertime; } else { limitBoolMap.put(SteadyIndicatorEnum.Interhar_Voltage.getCode(), false); } @@ -919,7 +929,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl 0) { limitBoolMap.put(SteadyIndicatorEnum.Neg_Current.getCode(), true); descriptionList.add(SteadyIndicatorEnum.Neg_Current.getMessage().concat(rStatLimitRateDPO.getINegOvertime() + "次")); - count[0] = count[0]+rStatLimitRateDPO.getINegOvertime(); + count[0] = count[0] + rStatLimitRateDPO.getINegOvertime(); } else { limitBoolMap.put(SteadyIndicatorEnum.Neg_Current.getCode(), false); } @@ -928,7 +938,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl 0) { limitBoolMap.put(SteadyIndicatorEnum.Fre_Deviation.getCode(), true); descriptionList.add(SteadyIndicatorEnum.Fre_Deviation.getMessage().concat(rStatLimitRateDPO.getFreqDevOvertime() + "次")); - count[0] = count[0]+rStatLimitRateDPO.getFreqDevOvertime(); + count[0] = count[0] + rStatLimitRateDPO.getFreqDevOvertime(); } else { limitBoolMap.put(SteadyIndicatorEnum.Fre_Deviation.getCode(), false); } @@ -937,7 +947,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl 0) { limitBoolMap.put(SteadyIndicatorEnum.Voltage_Dev.getCode(), true); descriptionList.add(SteadyIndicatorEnum.Voltage_Dev.getMessage().concat(rStatLimitRateDPO.getVoltageDevOvertime() + "次")); - count[0] = count[0]+rStatLimitRateDPO.getVoltageDevOvertime(); + count[0] = count[0] + rStatLimitRateDPO.getVoltageDevOvertime(); } else { limitBoolMap.put(SteadyIndicatorEnum.Voltage_Dev.getCode(), false); } @@ -947,7 +957,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl 0) { limitBoolMap.put(SteadyIndicatorEnum.Har_Current.getCode(), true); descriptionList.add(SteadyIndicatorEnum.Har_Current.getMessage().concat(harCurrentOvertime + "次")); - count[0] = count[0]+harCurrentOvertime; + count[0] = count[0] + harCurrentOvertime; } else { @@ -958,7 +968,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl 0) { limitBoolMap.put(SteadyIndicatorEnum.Voltage_Fluc.getCode(), true); descriptionList.add(SteadyIndicatorEnum.Voltage_Fluc.getMessage().concat(rStatLimitRateDPO.getFlickerOvertime() + "次")); - count[0] = count[0]+rStatLimitRateDPO.getFlickerOvertime(); + count[0] = count[0] + rStatLimitRateDPO.getFlickerOvertime(); } else { limitBoolMap.put(SteadyIndicatorEnum.Voltage_Fluc.getCode(), false); } @@ -968,7 +978,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl 0) { limitBoolMap.put(SteadyIndicatorEnum.Har_Voltage.getCode(), true); descriptionList.add(SteadyIndicatorEnum.Har_Voltage.getMessage().concat(harVoltageOvertime + "次")); - count[0] = count[0]+harVoltageOvertime; + count[0] = count[0] + harVoltageOvertime; } else { limitBoolMap.put(SteadyIndicatorEnum.Har_Voltage.getCode(), false); } @@ -977,7 +987,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl 0) { limitBoolMap.put(SteadyIndicatorEnum.Thd_V.getCode(), true); descriptionList.add(SteadyIndicatorEnum.Thd_V.getMessage().concat(rStatLimitRateDPO.getUaberranceOvertime() + "次")); - count[0] = count[0]+rStatLimitRateDPO.getUaberranceOvertime(); + count[0] = count[0] + rStatLimitRateDPO.getUaberranceOvertime(); } else { limitBoolMap.put(SteadyIndicatorEnum.Thd_V.getCode(), false); }