新能源专项分析功能开发

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/LineDTO.java

@@ -37,4 +37,7 @@ public class LineDTO {
 
     @ApiModelProperty(name = "用户非网侧")
     private String objId;
+
+    @ApiModelProperty(name = "对象类型大类")
+    private String bigObjType;
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/constant/Param.java

@@ -71,38 +71,4 @@ public interface Param {
     Integer WEEK = 4;
     Integer DAY = 5;
 
-    //以下四个固定ID用于某些业务判断
-//    //字典(sys_dict_data):电压暂升的ID
-//    String UPPEREVENT = "c5ce588cb76fba90c4519ab250c962d0";
-//    //字典(sys_dict_data):电压暂降的ID
-//    String LOWEREVENT = "c37861896dafab0883321e1d508caa51";
-//    //字典(sys_dict_data):光伏电站的ID
-//    String PHOTOVOLTAICPOWER = "45615057cb88650ffc4779b0629bac7e";
-//    //字典(sys_dict_data):风电场的ID
-//    String WINDFARM = "f9145acb79cbf136b9ee89fd38d72583";
-
-    /**
-     * 以下的四个Map为有功功率页面查看指标详情的四个指标分组下的具体指标(指标对应的可能不对 到时候直接改map里的key即可)
-     * put(name:表ele_epd_pqd中的名称,value:页面展示的指标名称)
-     */
-    Map<String,String> DATABSEMAP = new HashMap(){{
-        put("线电压偏差","电压偏差");
-        put("电压负序不平衡度","三相电压不平衡度");
-        put("相电压电压变动幅度","电压波动");
-        put("相电压长时闪变","长时闪变");
-        put("电流负序不平衡度","电流不平衡度");
-    }};
-
-    Map<String,String> UHARMMAP = new HashMap(){{
-        put("相电压谐波含有率序列","谐波电压");
-    }};
-
-    Map<String,String> IHARMMAP = new HashMap(){{
-        put("谐波电流有效值","谐波电流");
-    }};
-
-    Map<String,String> INTERHARMONICMAP = new HashMap(){{
-        put("间谐波电压有效值序列","间谐波电压含有率");
-    }};
-
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml

@@ -1435,7 +1435,8 @@
             pqd.Run_Flag as runFlag,
             detail.PT_Type AS ptType,
             detail.PT_Phase_Type AS ptPhaseType,
-            detail.Obj_Id AS objId
+            detail.Obj_Id AS objId,
+            detail.Big_Obj_Type AS bigObjType
         FROM
             pq_line line,
             pq_line_detail detail,