diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java index 819c38a89..9d2b357cb 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java @@ -2,7 +2,6 @@ package com.njcn.harmonic.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.extra.template.engine.wit.WitTemplate; import com.njcn.common.utils.PubUtils; import com.njcn.device.biz.commApi.CommTerminalGeneralClient; import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO; @@ -27,6 +26,7 @@ import com.njcn.harmonic.pojo.vo.hebeinorth.EvaluationLevelVo; import com.njcn.harmonic.pojo.vo.hebeinorth.EvaluationVo; import com.njcn.harmonic.service.hebeinorth.IGridService; import com.njcn.harmonic.util.ComAssesUtil; +import com.njcn.system.enums.DicDataEnum; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -289,15 +289,15 @@ public class GridServiceImpl implements IGridService { } //获取数据 EvaluationLevelVo vo1 = new EvaluationLevelVo(); - vo1.setTargetName("频率偏差"); + vo1.setTargetName(DicDataEnum.FREQUENCY_DEV.getName()); EvaluationLevelVo vo2 = new EvaluationLevelVo(); - vo2.setTargetName("电压偏差"); + vo2.setTargetName(DicDataEnum.VOLTAGE_DEV.getName()); EvaluationLevelVo vo3 = new EvaluationLevelVo(); - vo3.setTargetName("电压总谐波畸变率"); + vo3.setTargetName(DicDataEnum.THD_V.getName()); EvaluationLevelVo vo4 = new EvaluationLevelVo(); - vo4.setTargetName("三相电压不平衡度"); + vo4.setTargetName(DicDataEnum.phase_Voltage.getName()); EvaluationLevelVo vo5 = new EvaluationLevelVo(); - vo5.setTargetName("闪变"); + vo5.setTargetName(DicDataEnum.FLICKER.getName()); if (CollUtil.isNotEmpty(line)) { List list1 = getList1(line,param.getStartTime(),param.getEndTime()); List list2 = getList2(line,param.getStartTime(),param.getEndTime()); @@ -369,7 +369,7 @@ public class GridServiceImpl implements IGridService { String lastDayOfMonth = month.atEndOfMonth().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); EvaluationLevelVo.EvaluationRatio vo = new EvaluationLevelVo.EvaluationRatio(); vo.setTime(month.toString()); - vo.setTargetList(Arrays.asList("频率偏差","电压偏差","电压总谐波畸变率","三相电压不平衡度","闪变")); + vo.setTargetList(Arrays.asList(DicDataEnum.FREQUENCY_DEV.getName(),DicDataEnum.VOLTAGE_DEV.getName(),DicDataEnum.THD_V.getName(),DicDataEnum.phase_Voltage.getName(),DicDataEnum.FLICKER.getName())); //获取监测点越限集合 List overLimitList = rStatLimitRateDMapper.getAssessTargetRate(line,firstDayOfMonth,lastDayOfMonth); if (CollUtil.isNotEmpty(overLimitList)) { @@ -422,17 +422,16 @@ public class GridServiceImpl implements IGridService { detail.setOnlineNum(list1.size()); //筛选当前部门下监测点的超标数据 List list2 = overLimitList.stream().filter(it->list1.contains(it.getLineId())).collect(Collectors.toList()); - EvaluationLevelVo.TargetDetail detail1 = new EvaluationLevelVo.TargetDetail(); - detail1.setTargetName("电压偏差"); + detail1.setTargetName(DicDataEnum.FREQUENCY_DEV.getName()); EvaluationLevelVo.TargetDetail detail2 = new EvaluationLevelVo.TargetDetail(); - detail2.setTargetName("频率偏差"); + detail2.setTargetName(DicDataEnum.VOLTAGE_DEV.getName()); EvaluationLevelVo.TargetDetail detail3 = new EvaluationLevelVo.TargetDetail(); - detail3.setTargetName("电压总谐波畸变率"); + detail3.setTargetName(DicDataEnum.THD_V.getName()); EvaluationLevelVo.TargetDetail detail4 = new EvaluationLevelVo.TargetDetail(); - detail4.setTargetName("闪变"); + detail4.setTargetName(DicDataEnum.FLICKER.getName()); EvaluationLevelVo.TargetDetail detail5 = new EvaluationLevelVo.TargetDetail(); - detail5.setTargetName("三相电压不平衡度"); + detail5.setTargetName(DicDataEnum.phase_Voltage.getName()); if (CollUtil.isNotEmpty(list2)) { //筛选出五项指标(电压偏差、频率偏差、电压总谐波畸变率、电压闪变、三相电压不平衡度)超标监测点