代码提交

src/main/java/com/njcn/syncdata/controller/DataImportController.java

@@ -65,7 +65,7 @@ public class DataImportController {
     }
     @GetMapping("/insertData")
     public String getResourceData(){
-        Map map = service.insertData();
+        String s = service.insertData();
-        return "data";
+        return s;
     }
 }

src/main/java/com/njcn/syncdata/mapper/DictDataMapper.java

@@ -18,7 +18,7 @@ import java.util.List;
 public interface DictDataMapper extends BaseMapper<DictData> {
 
     List<DictData> selectList(@Param("code") String code);
-    DictData selectByCode(@Param("code") String code);
+    DictData selectByCode(@Param("dataCode") String dataCode,@Param("typeCode") String typeCode);
     List<Dept> selectUserList();
 
 }

src/main/java/com/njcn/syncdata/mapper/mapping/DictDataMapper.xml

@@ -17,9 +17,11 @@
     </select>
     <select id="selectByCode" resultType="com.njcn.syncdata.pojo.po.DictData">
         SELECT sys_dict_data.*
-        FROM sys_dict_data sys_dict_data
+        FROM sys_dict_data sys_dict_data,
-        WHERE
+             sys_dict_type sys_dict_type
-            sys_dict_data.code = #{code}
+        WHERE sys_dict_data.type_id = sys_dict_type.id
+          and sys_dict_data.code = #{dataCode}
+          and sys_dict_type.code = #{typeCode}
           and sys_dict_data.state = 1
     </select>
 </mapper>

src/main/java/com/njcn/syncdata/pojo/enums/DicDataEnum.java

@@ -0,0 +1,455 @@
+package com.njcn.syncdata.pojo.enums;
+
+import lombok.Getter;
+
+/**
+ * 类的介绍：字典数据名称
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2021/8/5 21:56
+ */
+@Getter
+public enum DicDataEnum {
+
+    /**
+     * 数据中心稳态统计指标
+     */
+    PLPC_ENUM("频率偏差", "PLPC"),
+    DYPC_ENUM("电压偏差", "DYPC"),
+    SXDYBPHD_ENUM("负序电压不平衡度", "SXDYBPHD"),
+    XBDY_ENUM("谐波电压", "XBDY"),
+    CSSB_ENUM("长时闪变", "CSSB"),
+    XBDL_ENUM("谐波电流", "XBDL"),
+    FXDL_ENUM("负序电流", "FXDL"),
+    JXBDY_ENUM("间谐波电压", "JXBDY"),
+
+
+    /**
+     * 稳态统计指标
+     */
+    VOLTAGE_DEV("电压偏差", "Voltage_Dev"),
+    FLICKER("长时闪变", "Flicker"),
+    HARMONIC_VOLTAGE("谐波电压", "Harmonic_Voltage"),
+    HARMONIC_CURRENT("谐波电流", "Harmonic_Current"),
+    INTERHARMONIC_VOLTAGE("间谐波电压", "Interharmonic_Voltage"),
+    PHASE_VOLTAGE("负序电压不平衡度", "phase_Voltage"),
+    FREQUENCY_DEV("频率偏差", "Frequency_Dev"),
+    NEG_CURRENT("负序电流", "Neg_Current"),
+    TOTAL_INDICATOR("总稳态指标", "Total_Indicator"),
+
+    /**
+     * 污区图统计类型
+     */
+    I_ALL("谐波电流", "I_All"),
+    V_HARMONIC("谐波电压", "V_Harmonic"),
+
+
+    /**
+     * 监测点类别
+     */
+    ONE_LINE("I类监测点", "One_Line"),
+    TWO_LINE("II类监测点", "Two_Line"),
+    THREE_LINE("III类监测点", "Three_Line"),
+
+
+    /**
+     * 监测点类型
+     */
+    Power_Supply_Point("供电点","Power_Supply_Point"),
+    Pub_Connect_Point("公共连接点PCC","Pub_Connect_Point"),
+    Parallel_Point("并网点","Parallel_Point"),
+    Other("其他","Other"),
+
+
+    /**
+     * 电压互感器类型
+     */
+    Cap_V("电容式电压互感器","Cap_V"),
+    Pele_V("光电式电压互感器","Pele_V"),
+    A_V("A类测试电压互感器","A_V"),
+    Elec_V("电子式电压互感器","Elec_V"),
+    Other_S("其他","Other"),
+    Ele_V("电磁式电压互感器","Ele_V"),
+
+    /**
+     * 中性点接地方式
+     */
+    Ground_Res("经非线性电阻接地-消谐器","Ground_Res"),
+    Ground_Trans("经互感器接地-4PT","Ground_Trans"),
+    Ground_Dir("直接接地-3PT","Ground_Dir"),
+    A_Center("A类测试中性点接地方式","A_Center"),
+    Ground_Other("其他","Other"),
+
+
+
+
+    /**
+     * 终端类型
+     */
+    DEV_QUALITY("电能质量监测终端", "Dev_Quality"),
+    DEV_SMART("智能电表", "Dev_Smart"),
+    DEV_MIX("智能融合终端", "Dev_Mix"),
+
+    /***
+     * 告警类型
+     */
+    COMM_ERR("通讯异常", "Comm_Err"),
+
+    /**
+     * 暂态统计指标
+     */
+    TOTAL_INDICATORS("总暂态指标", "Total_Indicators"),
+    VOLTAGE_DIP("电压暂降", "Voltage_Dip"),
+    VOLTAGE_RISE("电压暂升", "Voltage_Rise"),
+    SHORT_INTERRUPTIONS("短时中断", "Short_Interruptions"),
+    DISTURBANCE("扰动", "Disturbance"),
+    OTHER("其他", "Other"),
+    RECORDING_WAVE("录波", "Recording_Wave"),
+
+    /**
+     * 数据类型
+     */
+    MAINNET_POINT("主网测点", "Mainnet_Point"),
+    DISTRIBUTION_POINT("配网测点", "Distribution_Point"),
+
+    /**
+     * 分布式光伏台区渗透率水平
+     */
+    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"),
+
+    /**
+     * 审核状态
+     */
+    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"),
+
+    /**
+     * 问题来源
+     */
+    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"),
+    /**
+     * 监测点状态
+     */
+    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"),
+
+    /**
+     * 监测点标签（废弃，统一使用监测点对象类型）
+     */
+    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"),
+
+
+    /**
+     * 电压等级
+     * 此电压用于计算,真实code请使用上面枚举
+     */
+
+    V100("100V", "0.1",0.1f),
+    V220("220V", "0.22",0.22f),
+    KV038("0.38kV", "0.38",0.38f),
+    V380("380V", "0.38",0.38f),
+    KV04("0.4kV", "0.4",0.4f),
+    KV06("0.6kV", "0.6",0.6f),
+    V400("400V", "0.4",0.4f),
+    KV1("1kV", "1",1.0f),
+    KV6("6kV", "6",6.0f),
+    KV10("10kV", "10",10.0f),
+    KV20("20kV", "20",20.0f),
+    KV30("30kV", "30",30.0f),
+    KV35("35kV", "35",35.0f),
+    KV50("50kV", "50",50.0f),
+    KV66("66kV", "66",66.0f),
+    KV72_5("72.5kV", "725",725.0f),
+    KV110("110kV", "110",110.0f),
+    KV120("120kV", "120",120.0f),
+    KV125("125kV", "125",125.0f),
+    KV200("200kV", "200",200.0f),
+    KV220("220kV", "220",220.0f),
+    KV320("320kV", "320",320.0f),
+    KV330("330kV", "330",330.0f),
+    KV400("400kV", "400",400.0f),
+    KV500("500kV", "500",500.0f),
+    KV600("600kV", "600",600.0f),
+    KV660("660kV", "660",660.0f),
+    KV750("750kV", "750",750.0f),
+    KV1000("1000kV", "1000",1000.0f),
+    KV1100("1100kV", "1100",1100.0f),
+
+    /**
+     * 计划采取实施
+     */
+    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"),
+
+
+
+
+    /**
+     * 监测对象
+     */
+    PHOTOVOLT("光伏台区", "Photovolt"),
+    FEEDER_TENKV("10kV馈线", "Feeder_TenkV"),
+    MAIN_CHANGE("主变", "Main_Change"),
+
+    /**
+     * 工单状态
+     */
+    PEND_DISPATCH("待派单", "Pend_Dispatch"),
+    DISPATCHED("已派单", "Dispatched"),
+    CLOSED("已关闭", "Closed"),
+
+    /**
+     * 问题类型
+     */
+    VOLTAGE_LIMIT("谐波电压越限", "Voltage_Limit"),
+    CURRENT_LIMIT("谐波电流越限", "Current_Limit"),
+
+    /**
+     * 审核状态
+     */
+    REVIEW("待审核", "Review"),
+    AUDITED("已审核", "Audited"),
+    APPROVED("审核通过", "Approved"),
+    NOT_APPROVED("审核通过", "Not_Approved"),
+
+    /**
+     * 审核处理
+     */
+    GENERATE("生成工单", "Generate"),
+    NO_REQUIRED("无需处理", "No_Required"),
+
+    /**
+     * 工单流程
+     */
+    GENERATED("生成工单", "Generated"),
+    DISPATCH("派单", "Dispatch"),
+    FEEDBACK("反馈", "Feedback"),
+    AUDITING("审核", "Auditing"),
+    RECTIFICATION("整改", "Rectification"),
+    ASSESS("评估", "Assess"),
+    PIGEONHOLE("归档", "Pigeonhole"),
+
+    /**
+     * 评估结果
+     */
+    PASS("评估合格", "Pass"),
+    NOT_PASS("评估不合格", "Not_Pass"),
+
+    /**
+     * 工单类型
+     */
+    RECT_ORDER("整改单", "Rect_Order"),
+
+    /**
+     * 一级业务类型
+     */
+    TRANS_BUSINESS("运检业务", "Trans_Business"),
+
+    /**
+     * 日志字典类型
+     */
+    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"),
+
+    /**
+     * 装置类型(治理)
+     */
+    GATEWAY_DEV("网关", "Gateway_Dev"),
+    CONNECT_DEV("直连设备", "Connect_Dev"),
+
+    /**
+     * 治理数据模型
+     */
+    EPD("电能数据","Epd"),
+    PQD("电能质量数据","Pqd"),
+    BMD("基础测量数据","Bmd"),
+    EVT("事件","Evt"),
+    ALM("告警","Alm"),
+    STS("状态","Sts"),
+    DI("开入","Di"),
+    DO("电能数据","Do"),
+    PARM("参数","Parm"),
+    SET("定值","Set"),
+    INSET("内部定值","InSet"),
+    CTRL("控制","Ctrl"),
+    /**
+     * 暂降原因
+     */
+    SHORT_TROUBLE("短路故障", "Short_Trouble"),
+
+    /**
+     * 暂降类型
+     */
+    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"),
+
+    /**
+     * 监测点位置
+     */
+    LOAD_SIDE("负载侧", "Load_Side"),
+    GRID_SIDE("电网侧", "Grid_Side"),
+    OUTPUT_SIDE("输出侧", "Output_Side"),
+
+    /**
+     * 警告级别
+     */
+
+    ALARM("告警", "Alarm"),
+    FAULT("故障", "Fault"),
+
+    /**
+     * 装置级别
+     */
+    MOST_IMPORMENT("极重要","Vital"),
+
+    /**
+     * 测量信号输入形式
+     */
+    NUMBER_SIGNAL("数字信号","Digital_Signal"),
+    SIMULATION_SIGNAL("模拟信号","Analog_Signal"),
+
+    /**
+     * 设备地区特征
+     */
+    DOWNTOWN("市中心区","downtown"),
+    CITY("市区","city"),
+    TOWN("城镇","town"),
+    COUNTY_SEAT("县城区","County_Seat"),
+    COUNTRYSIDE("农村","countryside"),
+    TOWNSHIP("乡镇","township"),
+    AGRO_AREA("农牧区","Agro_Area"),
+
+    /**
+     * 设备使用性质代码
+     */
+    DEDICATED("专用","dedicated"),
+    PUBLIC("公用","public");
+
+    private final String name;
+    private final String code;
+    private final Float value;
+
+    DicDataEnum(String name, String code,Float value) {
+        this.name = name;
+        this.code = code;
+        this.value = value;
+    }
+
+    DicDataEnum(String name, String code) {
+        this.name = name;
+        this.code = code;
+        this.value = null;
+    }
+
+}

src/main/java/com/njcn/syncdata/pojo/enums/DicDataTypeEnum.java

@@ -0,0 +1,100 @@
+package com.njcn.syncdata.pojo.enums;
+
+import lombok.Getter;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2021/8/5 21:56
+ */
+@Getter
+public enum DicDataTypeEnum {
+    /**
+     * 字典类型名称
+     */
+    FRONT_TYPE("前置类型","Front_Type"),
+    DEV_TYPE("终端型号","Dev_Type"),
+    DEV_VARIETY("终端类型","Dev_Variety"),
+    DEV_FUN("终端功能","Dev_Fun"),
+    DEV_STATUS("终端状态","Dev_Status"),
+    DEV_LEVEL("终端等级","Dev_Level"),
+    DEV_CONNECT("接线方式","Dev_Connect"),
+    DEV_MANUFACTURER("制造厂商","Dev_Manufacturers"),
+    //电压等级用于pms区分交直流
+    DEV_VOLTAGE("电压等级","Dev_Voltage"),
+    //标准电压等级用于pq不区分交直流
+    DEV_VOLTAGE_STAND("标准电压等级","Dev_Voltage_Stand"),
+    EVENT_REASON("暂降原因","Event_Reason"),
+    EVENT_TYPE("暂降类型","Event_Type"),
+    BUSINESS_TYPE("行业类型","Business_Type"),
+    INTERFERENCE_SOURCE_TYPE("干扰源类型","Interference_Source"),
+    ALARM_TYPE("告警类型","alarm_Type"),
+    DEV_OPS("运维日志","Dev_Ops"),
+    INDICATOR_TYPE("指标类型","Indicator_Type"),
+    COMMUNICATE_TYPE("通讯类型","Communicate_Type"),
+    RATE_TYPE("费率类型","Rate_Type"),
+    ELE_LOAD_TYPE("用能负荷类型","Ele_Load_Type"),
+    ELE_STATISTICAL_TYPE("用能统计类型","Ele_Statistical_Type"),
+    REPORT_TYPE("自定义报表类型","Report_Type"),
+    LINE_MARK("监测点评分等级","Line_Grade"),
+    LINE_TYPE("监测点类型","Line_Type"),
+    STEADY_STATIS("稳态统计指标","Steady_Statis"),
+    EVENT_STATIS("暂态指标","Event_Statis"),
+    MONITORING_LABELS("监测点标签","Monitoring_Labels"),
+    POLLUTION_STATIS("污区图统计类型","Pollution_Statis"),
+    BENCHMARK_INDICATORS("基准水平评价指标","Benchmark_Indicator"),
+    LINE_SORT("监测点类别","Line_Sort"),
+    DATA_TYPE("数据类型","Data_Type"),
+    PERMEABILITY_TYPE("分布式光伏台区渗透率水平","Permeability_Type"),
+    ON_NETWORK_STATUS("报告状态","On-network_Status"),
+    AUDIT_STATUS("审核状态","Audit_Status"),
+    FILL_PROGRESS("填报进度","Fill_Progress"),
+    PROBLEM_SOURCES("问题来源","Problem_Sources"),
+    AREA_PQ_EVENT_TYPE("台区电能质量事件类型","area_pq_event_type"),
+    LINE_STATE("监测点状态","Line_State"),
+    DEVICE_STATUS("设备状态","Device_Status"),
+    INTERFERENCE_SOURCE("监测对象类别","Interference_Source"),
+    PLAN_TAKE("计划采取实施","Plan_Take"),
+    MONITOR_OBJ("监测对象","Monitor_Obj"),
+    CONNET_GROUP_WAY("牵引站变压器接线方式","Connet_Group_Way"),
+    WORK_ORDER_STATUS("工单状态","Work_Order_Status"),
+    PROBLEM_TYPE("问题类型","Problem_Type"),
+    CHECK_STATUS("审核状态","Check_Status"),
+    CHECK_RESULT("审核处理","Check_Result"),
+    WORK_ORDER_PROCESS("工单流程","Work_Order_Process"),
+    ASSESS_RESULT("评估结果","Assess_Result"),
+    WORK_ORDER_TYPE("工单类型","Work_Order_Type"),
+
+    PRIMARY_TYPE("一级业务类型","Primary_Type"),
+    DEV_CLASS("终端类型(治理)","Dev_Class"),
+    CS_STATISTICAL_TYPE("治理统计类型","Cs_Statistical_Type"),
+    LINE_POSITION("监测点位置","Line_Position"),
+    ALARM_LEVEL("警告级别","Alarm_Level"),
+
+
+    CS_DATA_TYPE("治理数据模型", "Cs_Data_Type"),
+
+
+    //pms
+    DEV_CATEGORY("装置类别","Device_Category"),
+    DEV_GRADE("装置级别","Dev_Level"),
+    INPUT_SIGNAL("测量信号输入形式","Signal_form"),
+    VOLTAGE_TRANSFORMER("电压互感器类型","Voltage_Transformer"),
+    Neutral_Point("中性点接地方式","Neutral_Point"),
+    DEVICE_REGIONLYPE("设备地区特征","Device_RegionLype"),
+    DEVICE_USERNATURE("设备使用性质代码","Device_UseNature");
+
+
+
+
+    private final String name;
+    private final String code;
+
+    DicDataTypeEnum(String name,String code){
+        this.name=name;
+        this.code=code;
+    }
+
+}

src/main/java/com/njcn/syncdata/pojo/po/AdsAstXbjcptGetFctgDi.java

@@ -33,10 +33,7 @@ public class AdsAstXbjcptGetFctgDi {
      * 台区编号
      */
     private String tg_no;
-    /**
+
-     * 台区区域划分类别,01、市中心区，02、市区,03、 城镇,04、农村
-     */
-    private String area_type;
     /**
      * 公变专变标志台区是0.公变或者1.专变
      */

src/main/java/com/njcn/syncdata/pojo/po/PWOPTransformerPSR.java

@@ -34,6 +34,12 @@ public class PWOPTransformerPSR {
      * 运行状态
      */
     private String RUN_STATUS;
+
+    /**
+     * 台区区域划分类别,01、市中心区，02、市区,03、 城镇,04、农村
+     */
+    private String REGION_TYPE;
+
     /**
      * 电压等级
      */

src/main/java/com/njcn/syncdata/pojo/po/PowerDistributionarea.java

@@ -1,9 +1,10 @@
 package com.njcn.syncdata.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.db.bo.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -14,9 +15,8 @@ import lombok.EqualsAndHashCode;
  * @since 2022-10-14
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @TableName("pms_power_distributionarea")
-public class PowerDistributionarea extends BaseEntity {
+public class PowerDistributionarea  {
 
     private static final long serialVersionUID = 1L;
 
@@ -156,4 +156,27 @@ public class PowerDistributionarea extends BaseEntity {
      * 数据状态：0-手动录入；1-gw台账录入
      */
     private Integer inputStatus;
+
+    /**
+     * 创建用户
+     */
+    private String createBy;
+
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新用户
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
 }

src/main/java/com/njcn/syncdata/service/IDictDataService.java

@@ -3,7 +3,6 @@ package com.njcn.syncdata.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.syncdata.pojo.po.DictData;
 
-import java.util.List;
 
 /**
  * <p>

src/main/java/com/njcn/syncdata/service/IPowerDistributionareaService.java

@@ -37,5 +37,5 @@ public interface IPowerDistributionareaService extends IReplenishMybatisService<
      */
     Map getResourceData(String token,String psrType,Integer num, String fieldName,String fieldValue);
 
-    Map insertData();
+    String insertData();
 }

src/main/java/com/njcn/syncdata/service/impl/PowerDistributionareaServiceImpl.java

@@ -2,13 +2,17 @@ package com.njcn.syncdata.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ListUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.cloud.apigateway.sdk.utils.Client;
 import com.cloud.apigateway.sdk.utils.Request;
 import com.njcn.db.service.impl.ReplenishMybatisServiceImpl;
 import com.njcn.syncdata.mapper.DictDataMapper;
 import com.njcn.syncdata.mapper.PowerDistributionareaMapper;
+import com.njcn.syncdata.pojo.enums.DicDataEnum;
+import com.njcn.syncdata.pojo.enums.DicDataTypeEnum;
 import com.njcn.syncdata.pojo.po.*;
 import com.njcn.syncdata.service.IPowerDistributionareaService;
 import com.njcn.syncdata.utils.RestTemplateUtil;
@@ -151,7 +155,7 @@ public class PowerDistributionareaServiceImpl extends ReplenishMybatisServiceImp
     @Override
     public  Map getResourceData(String token, String psrType,Integer num, String fieldName, String fieldValue) {
         Map body=new HashMap();
-        String userUrl = "http://dwzyywzt.com/baseCenter/oauth2/accessToken";
+        String userUrl = "http://dwzyywzt.com/PSRCenter/queryServices/commonQuery";
 
         Map<String, String> mapHeader = new HashMap<>();
         mapHeader.put("Content-Type", "application/json; charset=utf-8");
@@ -185,24 +189,22 @@ public class PowerDistributionareaServiceImpl extends ReplenishMybatisServiceImp
     }
 
     @Override
-    public Map insertData() {
+    public String insertData() {
         //初始化集合
         List<PowerDistributionarea> info = new ArrayList<>();
 
         String token= LoginToken();
         //1.获取数据台账信息
-        /*
         String s1 = adsList();
         JSONObject jsonObject = JSON.parseObject(s1);
         JSONArray data = jsonObject.getJSONArray("result");
         List<AdsAstXbjcptGetFctgDi> aas = JSONArray.parseArray(String.valueOf(data), AdsAstXbjcptGetFctgDi.class);
-        */
 
-        String s = "[{\"tg_id\":\"824843\",\"trans_pms_id\":\"73a32eea908afa989256723aa9015673a323181105\",\"id\":\"1415129064\",\"tg_name\":\"【混全】10kV722协神线东安香村南1号160公用配变\",\"tg_no\":\"0010034073\",\"pub_priv_flag\":\"01\",\"org_no\":\"134011910\",\"org_name\":\"行唐县安香供电所\",\"org_type\":\"06\",\"p_org_no\":\"1340119\",\"run_status_code\":\"01\",\"tg_cap\":160.0,\"fc_num\":2,\"fc_sum_cap\":44.8},\n" +
+//        String s = "[{\"tg_id\":\"824843\",\"trans_pms_id\":\"73a32eea908afa989256723aa9015673a323181105\",\"id\":\"1415129064\",\"tg_name\":\"【混全】10kV722协神线东安香村南1号160公用配变\",\"tg_no\":\"0010034073\",\"pub_priv_flag\":\"01\",\"org_no\":\"134011910\",\"org_name\":\"行唐县安香供电所\",\"org_type\":\"06\",\"p_org_no\":\"1340119\",\"run_status_code\":\"01\",\"tg_cap\":160.0,\"fc_num\":2,\"fc_sum_cap\":44.8},\n" +
-                " {\"tg_id\":\"825000\",\"trans_pms_id\":\"bc82f8391f8afa9890505facdb0150bc820b995f08\",\"id\":\"1411391450\",\"tg_name\":\"【混全】10kV722协神线东安香社厂100公用配变\",\"tg_no\":\"0010034337\",\"pub_priv_flag\":\"01\",\"org_no\":\"134011910\",\"org_name\":\"行唐县安香供电所\",\"org_type\":\"06\",\"p_org_no\":\"1340119\",\"run_status_code\":\"01\",\"tg_cap\":100.0,\"fc_num\":2,\"fc_sum_cap\":52.0}," +
+//                " {\"tg_id\":\"825000\",\"trans_pms_id\":\"bc82f8391f8afa9890505facdb0150bc820b995f08\",\"id\":\"1411391450\",\"tg_name\":\"【混全】10kV722协神线东安香社厂100公用配变\",\"tg_no\":\"0010034337\",\"pub_priv_flag\":\"01\",\"org_no\":\"134011910\",\"org_name\":\"行唐县安香供电所\",\"org_type\":\"06\",\"p_org_no\":\"1340119\",\"run_status_code\":\"01\",\"tg_cap\":100.0,\"fc_num\":2,\"fc_sum_cap\":52.0}," +
-                "{\"tg_id\":\"825000\",\"trans_pms_id\":\"bc82f8391f8afa9890505facdb0150bc820b995f08\",\"id\":\"1411391450\",\"tg_name\":\"【混全】10kV722协神线东安香社厂100公用配变\",\"tg_no\":\"0010034337\",\"pub_priv_flag\":\"01\",\"org_no\":\"134011910\",\"org_name\":\"行唐县安香供电所\",\"org_type\":\"06\",\"p_org_no\":\"1340119\",\"run_status_code\":\"01\",\"tg_cap\":100.0,\"fc_num\":2,\"fc_sum_cap\":52.0}," +
+//                "{\"tg_id\":\"825000\",\"trans_pms_id\":\"bc82f8391f8afa9890505facdb0150bc820b995f08\",\"id\":\"1411391450\",\"tg_name\":\"【混全】10kV722协神线东安香社厂100公用配变\",\"tg_no\":\"0010034337\",\"pub_priv_flag\":\"01\",\"org_no\":\"134011910\",\"org_name\":\"行唐县安香供电所\",\"org_type\":\"06\",\"p_org_no\":\"1340119\",\"run_status_code\":\"01\",\"tg_cap\":100.0,\"fc_num\":2,\"fc_sum_cap\":52.0}," +
-                "{\"tg_id\":\"825001\",\"trans_pms_id\":\"c06e78c12c8afa98904fb5b289014fc06e636c1f90\",\"id\":\"1411391450\",\"tg_name\":\"【混全】10kV722协神线东安香社厂100公用配变\",\"tg_no\":\"0010034337\",\"pub_priv_flag\":\"01\",\"org_no\":\"134011910\",\"org_name\":\"行唐县安香供电所\",\"org_type\":\"06\",\"p_org_no\":\"1340119\",\"run_status_code\":\"01\",\"tg_cap\":100.0,\"fc_num\":2,\"fc_sum_cap\":52.0}]";
+//                "{\"tg_id\":\"825001\",\"trans_pms_id\":\"c06e78c12c8afa98904fb5b289014fc06e636c1f90\",\"id\":\"1411391450\",\"tg_name\":\"【混全】10kV722协神线东安香社厂100公用配变\",\"tg_no\":\"0010034337\",\"pub_priv_flag\":\"01\",\"org_no\":\"134011910\",\"org_name\":\"行唐县安香供电所\",\"org_type\":\"06\",\"p_org_no\":\"1340119\",\"run_status_code\":\"01\",\"tg_cap\":100.0,\"fc_num\":2,\"fc_sum_cap\":52.0}]";
-        List<AdsAstXbjcptGetFctgDi> aas = JSONArray.parseArray(s, AdsAstXbjcptGetFctgDi.class);
+//        List<AdsAstXbjcptGetFctgDi> aas = JSONArray.parseArray(s, AdsAstXbjcptGetFctgDi.class);
 
 
         //进行数据拆分查询
@@ -210,12 +212,17 @@ public class PowerDistributionareaServiceImpl extends ReplenishMybatisServiceImp
         List<AdsAstXbjcptGetFctgDi> dome = new ArrayList<>(aa);
 
         //2.1.1获取电压字典
-        List<DictData> devVoltage = dictDataMapper.selectList("Dev_Voltage");
+        List<DictData> devVoltage = dictDataMapper.selectList(DicDataTypeEnum.DEV_VOLTAGE.getCode());
         //2.1.2运行状态
-        List<DictData> state = dictDataMapper.selectList("Line_State");
+        DictData state = dictDataMapper.selectByCode(DicDataEnum.RUN.getCode(),DicDataTypeEnum.LINE_STATE.getCode());
-        //2.1.3获取分布式光伏字典
+        //2.1.3分布式光伏字典
-        DictData photovoltaics = dictDataMapper.selectByCode("Distributed_Photovoltaics");
+        DictData photovoltaics = dictDataMapper.selectByCode(DicDataEnum.DISTRIBUTED_PHOTOVOLTAICS.getCode(),DicDataTypeEnum.MONITORING_LABELS.getCode());
-        //2.1.4获取部门字典
+        //2.1.4地区特征
+        List<DictData> regional = dictDataMapper.selectList(DicDataTypeEnum.DEVICE_REGIONLYPE.getCode());
+        //2.1.5使用性质
+        List<DictData> userNature = dictDataMapper.selectList(DicDataTypeEnum.DEVICE_USERNATURE.getCode());
+
+        //2.1.6获取部门字典
         List<Dept> depts = dictDataMapper.selectUserList();
 
         //3.设置需要进行的分片数据
@@ -227,7 +234,7 @@ public class PowerDistributionareaServiceImpl extends ReplenishMybatisServiceImp
         for (Integer i = 0; i < forNum; i++) {
             List<AdsAstXbjcptGetFctgDi> temList = pageList.get(i);
             List<String> trans_pms_id = temList.stream().map(AdsAstXbjcptGetFctgDi::getTrans_pms_id).distinct().collect(Collectors.toList());
-            /*
+
             //1.需要查询的户外变id
             String transPmsIds = String.join(",", trans_pms_id);
             List<PWOPTransformerPSR> transformer = resourceMethod(1, token, num, transPmsIds, PWOPTransformerPSR.class);
@@ -248,10 +255,10 @@ public class PowerDistributionareaServiceImpl extends ReplenishMybatisServiceImp
             if(CollUtil.isEmpty(substation)){
                 continue;
             }
-            */
+
-            List<PWOPTransformerPSR> transformer =this.staticMethod(1,PWOPTransformerPSR.class);
+//            List<PWOPTransformerPSR> transformer =this.staticMethod(1,PWOPTransformerPSR.class);
-            List<PWFeederLinePSR> line =this.staticMethod(2,PWFeederLinePSR.class);
+//            List<PWFeederLinePSR> line =this.staticMethod(2,PWFeederLinePSR.class);
-            List<Substation> substation  =this.staticMethod(3,Substation.class);
+//            List<Substation> substation  =this.staticMethod(3,Substation.class);
 
             Map<String, PWOPTransformerPSR> transformerMap = transformer.stream().collect(Collectors.toMap(PWOPTransformerPSR::getACCOUNT_ID, Function.identity(), (key1, kye2) -> key1));
             Map<String, PWFeederLinePSR> lineMap = line.stream().collect(Collectors.toMap(PWFeederLinePSR::getID, Function.identity(), (key1, kye2) -> key1));
@@ -285,24 +292,23 @@ public class PowerDistributionareaServiceImpl extends ReplenishMybatisServiceImp
 
                             area.setPCapacity(fctgDi.getTg_cap().floatValue());
                             //todo 要做处理(未处理)
-                            area.setRegionalism(fctgDi.getArea_type());
+                            area.setRegionalism(getAlgoDescribe(pwopTransformerPSR.getREGION_TYPE(),regional));
                             area.setIfRuralPowerGrid(pwopTransformerPSR.getIS_RURAL_GRID());
                             //todo 要做处理(未处理)
-                            area.setNatureOfUse(pwopTransformerPSR.getUse_nature());
+                            area.setNatureOfUse(getAlgoDescribe(pwopTransformerPSR.getUse_nature(),userNature));
                             area.setPowerSupplyRadius(pwFeederLinePSR.getSUPPLY_RADIUS().floatValue());
                             area.setLineLength(pwFeederLinePSR.getLENGTH().floatValue());
                             //todo 要做处理(处理)
-                            area.setState(getAlgoDescribe(pwopTransformerPSR.getRUN_STATUS(),state));
+                            area.setState(state.getId());
                             area.setDistributedPhotovoltaicNum(fctgDi.getFc_num());
                             area.setPhotovoltaicCapacity(fctgDi.getFc_sum_cap().floatValue());
                             area.setIfBevAp(0);
                             area.setApLoadType(photovoltaics.getId());
                             area.setIsUpToGrid(1);
                             area.setStatus(1);
-                            area.setCreateBy(null);
                             area.setCreateTime(LocalDateTime.now());
-                            area.setUpdateBy(null);
                             area.setUpdateTime(LocalDateTime.now());
+                            area.setInputStatus(1);
                             info.add(area);
                         }
                     }
@@ -319,7 +325,7 @@ public class PowerDistributionareaServiceImpl extends ReplenishMybatisServiceImp
             this.remove(lambdaQueryWrapper);
             this.insertBatchBySlice(info,1000);
         }
-        return null;
+        return "数据导入成功";
     }
     public static <T>  List<T> staticMethod(Integer a,Class<T> t){
         List<T> aas=new ArrayList<>();