1.解决【区域统计】：数据不对应bug

2.在线监测点bug
2023-05-12 14:42:11 +08:00
parent bcf5791010
commit 40a88596dc
4 changed files with 199 additions and 170 deletions
--- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/VoltageToleranceCurveVO.java
+++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/VoltageToleranceCurveVO.java
@@ -1,7 +1,6 @@
 package com.njcn.event.pojo.vo;

-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
 import lombok.Data;
@@ -71,6 +70,7 @@ public class VoltageToleranceCurveVO implements Serializable {
        private String gdName;

        @ApiModelProperty(name = "time", value = "发生时刻")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS",timezone = "GMT+8")
        private LocalDateTime time;

        public static Comparator<VoltageToleranceCurveDataList> sortAscTime() {
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaAnalysisServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaAnalysisServiceImpl.java
@@ -3,10 +3,9 @@ package com.njcn.event.service.majornetwork.Impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.C;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.njcn.db.bo.BaseEntity;
 import com.njcn.device.pq.api.GeneralDeviceInfoClient;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
@@ -20,15 +19,12 @@ import com.njcn.event.pojo.vo.VoltageToleranceCurveVO.VoltageToleranceCurveDataL
 import com.njcn.event.service.majornetwork.AreaAnalysisService;
 import com.njcn.event.service.majornetwork.EventDetailService;
 import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.pojo.po.DictData;
 import lombok.RequiredArgsConstructor;
-import lombok.Value;
-import org.influxdb.querybuilder.clauses.Clause;
 import org.springframework.stereotype.Service;

-import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -75,12 +71,29 @@ public class AreaAnalysisServiceImpl implements AreaAnalysisService {

        //暂降类型特殊处理
        DictData dictData = dicReasonList.stream().filter(item->"短路故障".equals(item.getName())).findFirst().get();
+        //相间
+        List<String> dicIdsXi = dicTypeList.stream().filter(item->
+                ObjectUtil.equals(DicDataEnum.INTERPHASE_AB.getCode(),item.getCode())||
+                ObjectUtil.equals(DicDataEnum.INTERPHASE_BC.getCode(),item.getCode())||
+                ObjectUtil.equals(DicDataEnum.INTERPHASE_AC.getCode(),item.getCode())
+        ).map(DictData::getId).collect(Collectors.toList());
+        //接地
+        List<String> dicIdsOne = dicTypeList.stream().filter(item->
+                ObjectUtil.equals(DicDataEnum.PHASE_A.getCode(),item.getCode())||
+                ObjectUtil.equals(DicDataEnum.PHASE_B.getCode(),item.getCode())||
+                ObjectUtil.equals(DicDataEnum.PHASE_C.getCode(),item.getCode())
+        ).map(DictData::getId).collect(Collectors.toList());
+        //三相接地
+        List<String> dicIdsThree = dicTypeList.stream().filter(item->ObjectUtil.equals(DicDataEnum.GROUND_ABC.getCode(),item.getCode())).map(DictData::getId).collect(Collectors.toList());
+        //其他
+        List<String> dicIdsOther = dicTypeList.stream().filter(item->ObjectUtil.equals(DicDataEnum.TYPE_REST.getCode(),item.getCode())).map(DictData::getId).collect(Collectors.toList());
+        //两相接地
+        List<String> dicIdsDouble = dicTypeList.stream().filter(item->
+                ObjectUtil.equals(DicDataEnum.GROUND_AB.getCode(),item.getCode())||
+                ObjectUtil.equals(DicDataEnum.GROUND_BC.getCode(),item.getCode())||
+                ObjectUtil.equals(DicDataEnum.GROUND_AC.getCode(),item.getCode())
+        ).map(DictData::getId).collect(Collectors.toList());

-        List<String> dicIdsXi = dicTypeList.stream().filter(item->item.getName().contains("相间")).map(DictData::getId).collect(Collectors.toList());
-        List<String> dicIdsOne = dicTypeList.stream().filter(item->"A相".equals(item.getName())||"B相".equals(item.getName())||"C相".equals(item.getName())).map(DictData::getId).collect(Collectors.toList());
-        List<String> dicIdsThree = dicTypeList.stream().filter(item->item.getName().contains("三相接地")).map(DictData::getId).collect(Collectors.toList());
-        List<String> dicIdsOther = dicTypeList.stream().filter(item->item.getName().contains("其他")).map(DictData::getId).collect(Collectors.toList());
-        List<String> dicIdsDouble = dicTypeList.stream().filter(item->item.getName().contains("双相接地")).map(DictData::getId).collect(Collectors.toList());
        Map<String, List<String>> stringListMap = new HashMap<>();
        stringListMap.put("单相接地",dicIdsOne);
        stringListMap.put("两相接地",dicIdsDouble);
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java
@@ -4,22 +4,19 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.config.GeneralInfo;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.common.utils.PubUtils;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
 import com.njcn.device.pq.pojo.vo.LineDetailDataVO;
 import com.njcn.event.enums.EventResponseEnum;
 import com.njcn.event.pojo.constant.Param;
-import com.njcn.event.pojo.dto.wave.WaveDataDTO;
 import com.njcn.event.pojo.param.*;
 import com.njcn.event.pojo.po.EventDetail;
-import com.njcn.event.pojo.po.EventDetailNew;
 import com.njcn.event.pojo.po.RmpEventDetailPO;
 import com.njcn.event.pojo.vo.*;
 import com.njcn.event.service.majornetwork.EventAnalysisService;
@@ -35,7 +32,6 @@ import org.influxdb.dto.QueryResult;
 import org.influxdb.impl.InfluxDBResultMapper;
 import org.springframework.stereotype.Service;

-import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.math.BigDecimal;
 import java.text.ParseException;
@@ -1076,9 +1072,12 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
 //        QueryResult query = MonitorQuery(statisticsParam);
 //        InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper();
 //        info = influxDBResultMapper.toPOJO(query, EventDetail.class);
+        //获取暂降字典信息
+        DictData dataDto = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
        //数据暂降查询
        List<RmpEventDetailPO> info = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
                .eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
+                .eq(StringUtils.isNotBlank(dataDto.getId()),RmpEventDetailPO::getMeasurementPointId, dataDto.getId())
                .ge(StringUtils.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime, DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime())))
                .le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
        );
@@ -1087,8 +1086,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
        HttpResult<List<DictData>> type = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_TYPE.getName());
        List<DictData> reasonData = reason.getData();
        List<DictData> typeData = type.getData();
-        //获取暂降字典信息
-        DictData dataDto = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
+
        HashMap<String, Integer> reasonMap = new HashMap<>();
        HashMap<String, Integer> typeMap = new HashMap<>();

@@ -1150,6 +1148,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
     */
    @Override
    public ProbabilityVO getProbabilityDistribution(StatisticsParam statisticsParam) {
+
        ProbabilityVO result = new ProbabilityVO();
        List<EventDetail> info = new ArrayList<>();
 //        QueryResult query = MonitorQuery(statisticsParam);
@@ -1456,9 +1455,12 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
 //                }
 //            }
 //        }
+        //获取电压暂降信息
+        DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
        //查询监测点未处理暂态事件
        List<RmpEventDetailPO> eventDetails = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
                .eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
+                .eq(StrUtil.isNotBlank(data.getId()),RmpEventDetailPO::getEventType, data.getId())
                .ge(StringUtils.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime, DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime())))
                .le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
        );
@@ -1467,8 +1469,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
        Map<String, DictData> reasonMap = reasonData.stream().collect(Collectors.toMap(DictData::getId, Function.identity(), (kye1, key2) -> kye1));
        List<DictData> typeData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_TYPE.getCode()).getData();
        Map<String, DictData> typeMap = typeData.stream().collect(Collectors.toMap(DictData::getId, Function.identity(), (kye1, key2) -> kye1));
-        //获取电压暂降信息
-        DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
+
        EventDetail eventDetailNew;
        for (RmpEventDetailPO eventDetail : eventDetails) {
            eventDetailNew = BeanUtil.copyProperties(eventDetail, EventDetail.class);
@@ -1516,7 +1517,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
                    VoltageToleranceCurveVO.VoltageToleranceCurveDataList voltageToleranceCurve = new VoltageToleranceCurveVO.VoltageToleranceCurveDataList();
                    voltageToleranceCurve.setLineId(dto.getLineId());
                    voltageToleranceCurve.setPersistTime(dto.getDuration());
-                    voltageToleranceCurve.setEventValue(dto.getFeatureAmplitude());
+                    voltageToleranceCurve.setEventValue(dto.getFeatureAmplitude()*100);
                    voltageToleranceCurve.setTime(dto.getStartTime());
                    voltageToleranceCurve.setGdName(info.getGdName());
                    voltageToleranceCurve.setSubName(info.getSubName());
--- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java
@@ -70,261 +70,276 @@ public enum DicDataEnum {
    /**
     * 分布式光伏台区渗透率水平
     */
-    RATE_0_25("0-25","Rate_0_25"),
-    RATE_25_50("25-50","Rate_25_50"),
-    RATE_50_75("50-75","Rate_50_75"),
-    RATE_75_100("75-100","Rate_75_100"),
-    RATE_100("100","Rate_100"),
+    RATE_0_25("0-25", "Rate_0_25"),
+    RATE_25_50("25-50", "Rate_25_50"),
+    RATE_50_75("50-75", "Rate_50_75"),
+    RATE_75_100("75-100", "Rate_75_100"),
+    RATE_100("100", "Rate_100"),

    /**
     * 入网报告状态
     */
-    NEWLY("新建","Newly"),
-    AUDIT("待审核","Audit"),
-    FAILED("未通过","Failed"),
-    FINISH("已生效","Finish"),
+    NEWLY("新建", "Newly"),
+    AUDIT("待审核", "Audit"),
+    FAILED("未通过", "Failed"),
+    FINISH("已生效", "Finish"),

    /**
     * 审核状态
     */
-    INIT("新建","Init"),
-    FAIL("未通过","Fail"),
-    AUDITT("待审核","Auditt"),
-    SUCCESS("已通过","Success"),
+    INIT("新建", "Init"),
+    FAIL("未通过", "Fail"),
+    AUDITT("待审核", "Auditt"),
+    SUCCESS("已通过", "Success"),

    /**
     * 填报进度
     */
-    NOT_REPORTED("未填报","Not_Reported"),
-    INSIGHTS("成效分析","Insights"),
-    PLAN_MEASURES("计划整改措施","Plan_Measures"),
-    ACTUAL_MEASURES("实际采取措施","Actual_Measures"),
-    CAUSE_ANALYSIS("原因分析","Cause_Analysis"),
-    ARCHIVED("已归档","Archived"),
+    NOT_REPORTED("未填报", "Not_Reported"),
+    INSIGHTS("成效分析", "Insights"),
+    PLAN_MEASURES("计划整改措施", "Plan_Measures"),
+    ACTUAL_MEASURES("实际采取措施", "Actual_Measures"),
+    CAUSE_ANALYSIS("原因分析", "Cause_Analysis"),
+    ARCHIVED("已归档", "Archived"),

    /**
     * 问题来源
     */
-    ONLINE("在线监测告警","Online"),
-    DEV_EXCEPTION("设备异常","Dev_Exception"),
-    GENERAL("普测超标","General"),
-    USER_COMPLAINTS("用户投诉","User_Complaints"),
+    ONLINE("在线监测告警", "Online"),
+    DEV_EXCEPTION("设备异常", "Dev_Exception"),
+    GENERAL("普测超标", "General"),
+    USER_COMPLAINTS("用户投诉", "User_Complaints"),

    /**
     * 台区电能质量事件类型
     */
-    EVENT_TYPE_P("低功率因数0.7-0.8","Event_Type_p"),
-    EVENT_TYPE_U("潮流倒送","Event_Type_u"),
-    EVENT_TYPE_T("电压越上限15%以上","Event_Type_t"),
-    EVENT_TYPE_W("电压越限","Event_Type_w"),
-    EVENT_TYPE_O("低功率因数0.7以下","Event_Type_o"),
-    EVENT_TYPE_E("电压越上限","Event_Type_e"),
-    EVENT_TYPE_Y("电压越下限","Event_Type_y"),
-    EVENT_TYPE_L("低功率因数0.8-0.9","Event_Type_l"),
-    EVENT_TYPE_Q("电压总谐波畸变率超标","Event_Type_q"),
-    EVENT_TYPE_R("电压越上限7%-15%","Event_Type_r"),
-    EVENT_TYPE_I("低功率因数","Event_Type_i"),
-    PENET_LIMIT("渗透率超上限","Penet_Limit"),
-    EVENT_TYPE_A("潮流倒送导致设备重载","Event_Type_a"),
-    EVENT_TYPE_S("潮流倒送导致设备过载","Event_Type_s"),
-    EVENT_TYPE_D("电压越上限严重度","Event_Type_d"),
-    EVENT_TYPE_F("电压越下限严重度","Event_Type_f"),
-    EVENT_TYPE_G("渗透率","Event_Type_g"),
-    EVENT_TYPE_Z("超标3%-10%","Event_Type_z"),
-    EVENT_TYPE_X("超标10%以下","Event_Type_x"),
-    EVENT_TYPE_C("重过载","Event_Type_c"),
+    EVENT_TYPE_P("低功率因数0.7-0.8", "Event_Type_p"),
+    EVENT_TYPE_U("潮流倒送", "Event_Type_u"),
+    EVENT_TYPE_T("电压越上限15%以上", "Event_Type_t"),
+    EVENT_TYPE_W("电压越限", "Event_Type_w"),
+    EVENT_TYPE_O("低功率因数0.7以下", "Event_Type_o"),
+    EVENT_TYPE_E("电压越上限", "Event_Type_e"),
+    EVENT_TYPE_Y("电压越下限", "Event_Type_y"),
+    EVENT_TYPE_L("低功率因数0.8-0.9", "Event_Type_l"),
+    EVENT_TYPE_Q("电压总谐波畸变率超标", "Event_Type_q"),
+    EVENT_TYPE_R("电压越上限7%-15%", "Event_Type_r"),
+    EVENT_TYPE_I("低功率因数", "Event_Type_i"),
+    PENET_LIMIT("渗透率超上限", "Penet_Limit"),
+    EVENT_TYPE_A("潮流倒送导致设备重载", "Event_Type_a"),
+    EVENT_TYPE_S("潮流倒送导致设备过载", "Event_Type_s"),
+    EVENT_TYPE_D("电压越上限严重度", "Event_Type_d"),
+    EVENT_TYPE_F("电压越下限严重度", "Event_Type_f"),
+    EVENT_TYPE_G("渗透率", "Event_Type_g"),
+    EVENT_TYPE_Z("超标3%-10%", "Event_Type_z"),
+    EVENT_TYPE_X("超标10%以下", "Event_Type_x"),
+    EVENT_TYPE_C("重过载", "Event_Type_c"),
    /**
     * 监测点状态
     */
-    RUN("运行","Run"),
-    OVERHAUL("检修","Overhaul"),
-    DEBUGGING("调试","Debugging"),
-    DECOMMISSIONING("停运","Decommissioning"),
-    RETIREMENT("退役","Retirement"),
+    RUN("运行", "Run"),
+    OVERHAUL("检修", "Overhaul"),
+    DEBUGGING("调试", "Debugging"),
+    DECOMMISSIONING("停运", "Decommissioning"),
+    RETIREMENT("退役", "Retirement"),

    /**
     * 终端状态
     */
-    FREE_MOORY("剩余内存","Free_Mmory"),
-    FREE_STORE("剩余存储空间","Free_Store"),
-    NOT_OPERATION("未投运","Not_Operation"),
-    RUNNING("在运","Running"),
-    RETIRE("退役","Retire"),
-    ON_SITE("现场留用","On_Site"),
-    STOCK_STANDBY("库存备用","Stock_Standby"),
-    TO_BE_SCRAPPED("待报废","To_Be_Scrapped"),
-    SCRAP("报废","Scrap"),
+    FREE_MOORY("剩余内存", "Free_Mmory"),
+    FREE_STORE("剩余存储空间", "Free_Store"),
+    NOT_OPERATION("未投运", "Not_Operation"),
+    RUNNING("在运", "Running"),
+    RETIRE("退役", "Retire"),
+    ON_SITE("现场留用", "On_Site"),
+    STOCK_STANDBY("库存备用", "Stock_Standby"),
+    TO_BE_SCRAPPED("待报废", "To_Be_Scrapped"),
+    SCRAP("报废", "Scrap"),

    /**
     * 监测点标签
     */
-    ONSHORE_WIND("陆上风电","Onshore_Wind"),
-    POWER_STATION("光伏电站","Power_Station"),
-    ELECTRIFIED_RAILWAYS("电气化铁路","Electrified_Railways"),
-    SMELT_LOAD("冶炼负荷","Smelt_Load"),
-    DISTRIBUTED_PHOTOVOLTAICS("分布式光伏","Distributed_Photovoltaics"),
+    ONSHORE_WIND("陆上风电", "Onshore_Wind"),
+    POWER_STATION("光伏电站", "Power_Station"),
+    ELECTRIFIED_RAILWAYS("电气化铁路", "Electrified_Railways"),
+    SMELT_LOAD("冶炼负荷", "Smelt_Load"),
+    DISTRIBUTED_PHOTOVOLTAICS("分布式光伏", "Distributed_Photovoltaics"),

    /**
     * 电压等级
     */
-    AC_380V("交流380V（含400V）","AC_380V（400V）"),
-    DY_380V("交流0.38kV","0.38kV"),
-    DY_10KV("交流10kV","10kV"),
-    DY_35KV("交流35kV","35kV"),
-    DY_110KV("交流110kV","110kV"),
-
+    AC_380V("交流380V（含400V）", "AC_380V（400V）"),
+    DY_380V("交流0.38kV", "0.38kV"),
+    DY_10KV("交流10kV", "10kV"),
+    DY_35KV("交流35kV", "35kV"),
+    DY_110KV("交流110kV", "110kV"),


    /**
     * 电压等级
     * 此电压用于计算,真实code请使用上面枚举
+     *
     * @author cdf
     * @date 2023/3/24
     */

-    KV01("0.1kV","0.1"),
-    V022("0.22kV","0.22"),
-    KV038("0.38kV","0.38"),
-    V380("380V","0.38"),
-    KV04("0.4kV","0.4"),
-    KV06("0.6kV","0.6"),
-    V400("400V","0.4"),
-    KV6("6kV","6"),
-    KV10("10kV","10"),
-    KV20("20kV","20"),
-    KV30("30kV","30"),
-    KV35("35kV","35"),
-    KV50("50kV","50"),
-    KV66("66kV","66"),
-    KV72_5("72.5kV","725"),
-    KV110("110kV","110"),
-    KV120("120kV","120"),
-    KV125("125kV","125"),
-    KV200("200kV","200"),
-    KV220("220kV","220"),
-    KV320("320kV","320"),
-    KV330("330kV","330"),
-    KV400("400kV","400"),
-    KV500("500kV","500"),
-    KV600("600kV","600"),
-    KV660("660kV","660"),
-    KV750("750kV","750"),
-    KV1000("1000kV","1000"),
-    KV1100("1100kV","1100"),
+    KV01("0.1kV", "0.1"),
+    V022("0.22kV", "0.22"),
+    KV038("0.38kV", "0.38"),
+    V380("380V", "0.38"),
+    KV04("0.4kV", "0.4"),
+    KV06("0.6kV", "0.6"),
+    V400("400V", "0.4"),
+    KV6("6kV", "6"),
+    KV10("10kV", "10"),
+    KV20("20kV", "20"),
+    KV30("30kV", "30"),
+    KV35("35kV", "35"),
+    KV50("50kV", "50"),
+    KV66("66kV", "66"),
+    KV72_5("72.5kV", "725"),
+    KV110("110kV", "110"),
+    KV120("120kV", "120"),
+    KV125("125kV", "125"),
+    KV200("200kV", "200"),
+    KV220("220kV", "220"),
+    KV320("320kV", "320"),
+    KV330("330kV", "330"),
+    KV400("400kV", "400"),
+    KV500("500kV", "500"),
+    KV600("600kV", "600"),
+    KV660("660kV", "660"),
+    KV750("750kV", "750"),
+    KV1000("1000kV", "1000"),
+    KV1100("1100kV", "1100"),

    /**
     * 计划采取实施
     */
-    GOVERNANCE_FACTS("事实治理工程","Governance_Facts"),
-    GRID_OPERATES("电网运行方式调整","Grid_Operates"),
-    PARAMETER_OPT("治理装置运行参数优化","Parameter_Opt"),
-    RECTIFY_ORDERS("提出整改工单","Rectify_Orders"),
+    GOVERNANCE_FACTS("事实治理工程", "Governance_Facts"),
+    GRID_OPERATES("电网运行方式调整", "Grid_Operates"),
+    PARAMETER_OPT("治理装置运行参数优化", "Parameter_Opt"),
+    RECTIFY_ORDERS("提出整改工单", "Rectify_Orders"),

    /**
     * 牵引站变压器接线方式
     */
-    SINGLE_TRANS("单相牵引变压器","Single_Trans"),
-    THREE_TRANS("三相YN d11联结牵引变压器","Three_Trans"),
-    THREE_PHASE_TRANS("三相YN d11 d1组成的牵引变压器","Three_Phase_Trans"),
-    SCOTT_TRANS("SCOTT牵引变压器","SCOTT_Trans"),
-    YN_V_TRANS("YN v联结平衡牵引变压器","YN_V_Trans"),
-    YN_A_TRANS("YN A联结平衡牵引变压器","YN_A_Trans"),
+    SINGLE_TRANS("单相牵引变压器", "Single_Trans"),
+    THREE_TRANS("三相YN d11联结牵引变压器", "Three_Trans"),
+    THREE_PHASE_TRANS("三相YN d11 d1组成的牵引变压器", "Three_Phase_Trans"),
+    SCOTT_TRANS("SCOTT牵引变压器", "SCOTT_Trans"),
+    YN_V_TRANS("YN v联结平衡牵引变压器", "YN_V_Trans"),
+    YN_A_TRANS("YN A联结平衡牵引变压器", "YN_A_Trans"),

    /**
     * 监测点类别
     */
-    LINE_ONE("Ⅰ类监测点","One_Line"),
-    LINE_TWO("Ⅱ类监测点","Two_Line"),
-    LINE_THREE("Ⅲ类监测点","Three_Line"),
+    LINE_ONE("Ⅰ类监测点", "One_Line"),
+    LINE_TWO("Ⅱ类监测点", "Two_Line"),
+    LINE_THREE("Ⅲ类监测点", "Three_Line"),

    /**
     * 稳态统计指标
     */
-    VOLTAGE_DEV("电压偏差","Voltage_Dev"),
-    FLICKER("闪变","Flicker"),
-    HARMONIC_VOLTAGE("谐波电压","Harmonic_Voltage"),
+    VOLTAGE_DEV("电压偏差", "Voltage_Dev"),
+    FLICKER("闪变", "Flicker"),
+    HARMONIC_VOLTAGE("谐波电压", "Harmonic_Voltage"),

    /**
     * 监测对象
     */
-    PHOTOVOLT("光伏台区","Photovolt"),
-    FEEDER_TENKV("10kV馈线","Feeder_TenkV"),
-    MAIN_CHANGE("主变","Main_Change"),
+    PHOTOVOLT("光伏台区", "Photovolt"),
+    FEEDER_TENKV("10kV馈线", "Feeder_TenkV"),
+    MAIN_CHANGE("主变", "Main_Change"),

    /**
     * 工单状态
     */
-    PEND_DISPATCH("待派单","Pend_Dispatch"),
-    DISPATCHED("已派单","Dispatched"),
-    CLOSED("已关闭","Closed"),
+    PEND_DISPATCH("待派单", "Pend_Dispatch"),
+    DISPATCHED("已派单", "Dispatched"),
+    CLOSED("已关闭", "Closed"),

    /**
     * 问题类型
     */
-    VOLTAGE_LIMIT("谐波电压越限","Voltage_Limit"),
-    CURRENT_LIMIT("谐波电流越限","Current_Limit"),
+    VOLTAGE_LIMIT("谐波电压越限", "Voltage_Limit"),
+    CURRENT_LIMIT("谐波电流越限", "Current_Limit"),

    /**
     * 审核状态
     */
-    REVIEW("待审核","Review"),
-    AUDITED("已审核","Audited"),
-    APPROVED("审核通过","Approved"),
-    NOT_APPROVED("审核通过","Not_Approved"),
+    REVIEW("待审核", "Review"),
+    AUDITED("已审核", "Audited"),
+    APPROVED("审核通过", "Approved"),
+    NOT_APPROVED("审核通过", "Not_Approved"),

    /**
     * 审核处理
     */
-    GENERATE("生成工单","Generate"),
-    NO_REQUIRED("无需处理","No_Required"),
+    GENERATE("生成工单", "Generate"),
+    NO_REQUIRED("无需处理", "No_Required"),

    /**
     * 工单流程
     */
-    GENERATED("生成工单","Generated"),
-    DISPATCH("派单","Dispatch"),
-    FEEDBACK("反馈","Feedback"),
-    AUDITING("审核","Auditing"),
-    RECTIFICATION("整改","Rectification"),
-    ASSESS("评估","Assess"),
-    PIGEONHOLE("归档","Pigeonhole"),
+    GENERATED("生成工单", "Generated"),
+    DISPATCH("派单", "Dispatch"),
+    FEEDBACK("反馈", "Feedback"),
+    AUDITING("审核", "Auditing"),
+    RECTIFICATION("整改", "Rectification"),
+    ASSESS("评估", "Assess"),
+    PIGEONHOLE("归档", "Pigeonhole"),

    /**
     * 评估结果
     */
-    PASS("评估合格","Pass"),
-    NOT_PASS("评估不合格","Not_Pass"),
+    PASS("评估合格", "Pass"),
+    NOT_PASS("评估不合格", "Not_Pass"),

    /**
     * 工单类型
     */
-    RECT_ORDER("整改单","Rect_Order"),
+    RECT_ORDER("整改单", "Rect_Order"),

    /**
     * 一级业务类型
     */
-    TRANS_BUSINESS("运检业务","Trans_Business"),
+    TRANS_BUSINESS("运检业务", "Trans_Business"),

    /**
     * 日志字典类型
     */
-    LINE_PARAMETER("监测点参数修改","Line_Parameter"),
-    DEV_PARAMETER("设备状态修改","Dev_Parameter"),
-    WEB_ADD("web新增用户","Web_Add"),
-    DATA_PLAN("流量套餐修改","Data_Plan"),
+    LINE_PARAMETER("监测点参数修改", "Line_Parameter"),
+    DEV_PARAMETER("设备状态修改", "Dev_Parameter"),
+    WEB_ADD("web新增用户", "Web_Add"),
+    DATA_PLAN("流量套餐修改", "Data_Plan"),

    /**
     * 接线方式
     */
-    STAR("星型接线","Trans_Business"),
-    STAR_TRIANGLE("星三角","Star_Triangle"),
-    OPEN_DELTA("开口三角","Open_Delta"),
+    STAR("星型接线", "Trans_Business"),
+    STAR_TRIANGLE("星三角", "Star_Triangle"),
+    OPEN_DELTA("开口三角", "Open_Delta"),

    /**
     * 装置类型(治理)
     */
-    GATEWAY_DEV("网关","Gateway_Dev"),
-    CONNECT_DEV("直连设备","Connect_Dev"),
+    GATEWAY_DEV("网关", "Gateway_Dev"),
+    CONNECT_DEV("直连设备", "Connect_Dev"),
+
+    /**
+     * 暂降类型
+     */
+    PHASE_A("A相接地", "Phase_A"),
+    PHASE_B("B相接地", "Phase_B"),
+    PHASE_C("C相接地", "Phase_C"),
+    INTERPHASE_AB("AB相间", "Interphase_AB"),
+    INTERPHASE_BC("BC相间", "Interphase_BC"),
+    INTERPHASE_AC("AC相间", "Interphase_AC"),
+    GROUND_AB("AB两相接地", "Ground_AB"),
+    GROUND_BC("BC两相接地", "Ground_BC"),
+    GROUND_AC("AC两相接地", "Ground_AC"),
+    GROUND_ABC("三相接地", "Ground_ABC"),
+    TYPE_REST("其他", "Type_Rest"),
    ;

    private final String name;