宁夏分公司代码修改

alarm-service/src/main/java/com/gyee/alarm/AlarmMain.java

@@ -19,17 +19,17 @@ public class AlarmMain {
         SpringApplication.run(AlarmMain.class, args);
 
 //        AlarmBtService alarmBtService= SpringUtils.getBean("alarmBtService");
-//        AlarmWtService alarmWtService= SpringUtils.getBean("alarmWtService");
+        AlarmWtService alarmWtService= SpringUtils.getBean("alarmWtService");
         AlarmCtService alarmCtService= SpringUtils.getBean("alarmCtService");
 //
-        alarmCtService.createSuperTable();
-        alarmCtService.initalCtAlarm();
+//        alarmCtService.createSuperTable();
+//        alarmCtService.initalCtAlarm();
 //
 //
 //
 //
-//        alarmWtService.createSuperTable();
-//        alarmWtService.initalWtAlarm();
+        alarmWtService.createSuperTable();
+        alarmWtService.initalWtAlarm();
 //
 ////        alarmBtService.createSuperTable();
 ////        alarmBtService.initalBtAlarm();

alarm-service/src/main/java/com/gyee/alarm/service/AlarmWtService.java

@@ -251,7 +251,8 @@ public class AlarmWtService {
                                     alarmVoList.add(vo);
                                 }
 
-                            }else if (pointMap.containsKey(alarm.getUniformCode()) && StringUtils.empty(alarm.getDeviceId())) {
+                            }
+                            else if (pointMap.containsKey(alarm.getUniformCode()) && StringUtils.empty(alarm.getDeviceId())) {
                                 ProBasicEquipmentPoint equipmentPoint = pointMap.get(alarm.getUniformCode());
 
                                 if (StringUtils.notEmp(initialcode) &&

alarm-web/src/main/java/com/gyee/alarm/controller/AlarmHistoryController.java

@@ -62,6 +62,7 @@ public class AlarmHistoryController {
             @ApiImplicitParam(name = "modelId", value = "型号", required = false, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "deviceType", value = "报警类型 booststation:升压站报警,windturbine:设备报警", required = false, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "components", value = "部件编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "subcomponents", value = "子部件编号", required = false, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "alarmId", value = "报警编号", required = false, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "isclose", value = "是否完成 不传全查,true 完成的，false 没完成的", required = false, dataType = "Boolean", paramType = "query"),
             @ApiImplicitParam(name = "pageNum", value = "页号", required = true, dataType = "string", paramType = "query"),
@@ -76,6 +77,7 @@ public class AlarmHistoryController {
             @RequestParam(value = "modelId", required = false) String modelId,
             @RequestParam(value = "deviceType", required = false) String deviceType,
             @RequestParam(value = "components", required = false) String components,
+            @RequestParam(value = "subcomponents", required = false) String subcomponents,
             @RequestParam(value = "alarmId", required = false) String alarmId,
             @RequestParam(value = "isclose", required = false) Boolean isclose,
             @RequestParam(value = "pageNum", required = true) Integer pageNum,
@@ -87,7 +89,7 @@ public class AlarmHistoryController {
         Date beginDate = df.parse(begin);
         Date endDate = df.parse(end);
         pageNum=pageNum-1;
-        Map<String,Object> map = alarmHistoryService.findAlarmlist(modelId,beginDate.getTime(), endDate.getTime(), alarmType, stationid,deviceid, description,deviceType,components,alarmId,isclose, pageNum, pageSize);
+        Map<String,Object> map = alarmHistoryService.findAlarmlist(modelId,beginDate.getTime(), endDate.getTime(), alarmType, stationid,deviceid, description,deviceType,components,alarmId,isclose, pageNum, pageSize,subcomponents);
         return AjaxResult.successData(AjaxStatus.success.code, map);
 
     }
@@ -328,9 +330,9 @@ public class AlarmHistoryController {
             @ApiImplicitParam(name = "end", value = "结束时间", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "stationid", value = "场站编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "modelId", value = "型号编号", required = false, dataType = "string", paramType = "query"),
-            @ApiImplicitParam(name = "components", value = "部件集合", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "components", value = "部件集合", required = false, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "deviceType", value = "报警类型 booststation:升压站报警,windturbine:设备报警,inverter:光伏", required = true, dataType = "string", paramType = "query"),
-            @ApiImplicitParam(name = "alarmIds", value = "报警编号集合", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "alarmIds", value = "报警编号集合", required = false, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "timeType", value = "秒、分、时（s,m,h）", required = false, dataType = "string", paramType = "query")
     })
     public List<ProBasicFeatureStat> findCtFeatureStatByComponents(
@@ -339,9 +341,9 @@ public class AlarmHistoryController {
             @RequestParam(value = "end", required = true) String end,
             @RequestParam(value = "stationid", required = true) String stId,
             @RequestParam(value = "modelId", required = false) String modelId,
-            @RequestParam(value = "components", required = true) String components,
+            @RequestParam(value = "components", required = false) String components,
             @RequestParam(value = "deviceType", required = true) String deviceType,
-            @RequestParam(value = "alarmIds", required = true) String alarmIds,
+            @RequestParam(value = "alarmIds", required = false) String alarmIds,
             @RequestParam(value = "timeType", required = false) String timeType
     ) throws ParseException {
 

alarm-web/src/main/java/com/gyee/alarm/controller/AlarmHistoryNXFController.java

@@ -60,6 +60,7 @@ public class AlarmHistoryNXFController {
             @ApiImplicitParam(name = "modelId", value = "型号", required = false, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "deviceType", value = "报警类型 booststation:升压站报警,windturbine:设备报警", required = false, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "components", value = "部件编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "subcomponents", value = "子部件编号", required = false, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "alarmId", value = "报警编号", required = false, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "isclose", value = "是否完成 不传全查,true 完成的，false 没完成的", required = false, dataType = "Boolean", paramType = "query"),
             @ApiImplicitParam(name = "pageNum", value = "页号", required = true, dataType = "string", paramType = "query"),
@@ -74,6 +75,7 @@ public class AlarmHistoryNXFController {
             @RequestParam(value = "modelId", required = false) String modelId,
             @RequestParam(value = "deviceType", required = false) String deviceType,
             @RequestParam(value = "components", required = false) String components,
+            @RequestParam(value = "subcomponents", required = false) String subcomponents,
             @RequestParam(value = "alarmId", required = false) String alarmId,
             @RequestParam(value = "isclose", required = false) Boolean isclose,
             @RequestParam(value = "pageNum", required = true) Integer pageNum,
@@ -85,7 +87,7 @@ public class AlarmHistoryNXFController {
         Date beginDate = df.parse(begin);
         Date endDate = df.parse(end);
         pageNum=pageNum-1;
-        Map<String,Object> map = alarmHistoryService.findAlarmlist(modelId,beginDate.getTime(), endDate.getTime(), alarmType, stationid,deviceid, description,deviceType,components,alarmId,isclose, pageNum, pageSize);
+        Map<String,Object> map = alarmHistoryService.findAlarmlist(modelId,beginDate.getTime(), endDate.getTime(), alarmType, stationid,deviceid, description,deviceType,components,alarmId,isclose, pageNum, pageSize,subcomponents);
         return AjaxResult.successData(AjaxStatus.success.code, map);
 
     }

alarm-web/src/main/java/com/gyee/alarm/mapper/auto/ProEconShutdownEvent2Mapper.java

@@ -82,6 +82,7 @@ public interface ProEconShutdownEvent2Mapper extends BaseMapper<ProEconShutdownE
 
             "</where>",
             " GROUP BY stoptime ",
+            " ORDER BY stoptime ",
             "</script>"})
     List<ShutdownEventVo> queryShutdownEvent2ByDay(@Param("wpId") String wpId, @Param("modelId") String modelId,@Param("begin")Date begin, @Param("end") Date end);
 
@@ -104,6 +105,7 @@ public interface ProEconShutdownEvent2Mapper extends BaseMapper<ProEconShutdownE
 
             "</where>",
             " GROUP BY stoptime ",
+            " ORDER BY stoptime ",
             "</script>"})
     List<ShutdownEventVo> queryShutdownEvent2ByMonth(@Param("wpId") String wpId, @Param("modelId") String modelId,@Param("begin")Date begin, @Param("end") Date end);
 

alarm-web/src/main/java/com/gyee/alarm/service/AlarmHistoryService.java

@@ -255,7 +255,7 @@ public class AlarmHistoryService   {
      * @param pageSize 每页多少条
      * @return
      */
-    public Map<String,Object> findAlarmlist(String modelId, long begin,long end ,String alarmType,String stationid,String deviceid,String description,String deviceType,String components,String alarmId,Boolean isclose, int pageNum, int pageSize) {
+    public Map<String,Object> findAlarmlist(String modelId, long begin,long end ,String alarmType,String stationid,String deviceid,String description,String deviceType,String components,String alarmId,Boolean isclose, int pageNum, int pageSize,String subcomponents) {
 
         Map<String,Object> map=new HashMap<>();
 
@@ -335,6 +335,24 @@ public class AlarmHistoryService   {
                 components=String.valueOf(componentsList.substring(0,componentsList.length()-1));
             }
         }
+
+        if(StringUtils.empty(subcomponents)  )
+        {
+            subcomponents=null;
+        }else
+        {
+            StringBuilder componentsList=new StringBuilder();
+            String [] componentsStr=subcomponents.split(",");
+            for(String c:componentsStr)
+            {
+                componentsList.append("'").append(c).append("',");
+
+            }
+            if(componentsList.length()>0)
+            {
+                subcomponents=String.valueOf(componentsList.substring(0,componentsList.length()-1));
+            }
+        }
         if(StringUtils.empty(alarmId)  )
         {
             alarmId=null;
@@ -344,7 +362,7 @@ public class AlarmHistoryService   {
         {
             isclose=null;
         }
-        vos = alarmTsMapper.selectByWtLimit(begin,end,modelId,superTableName, alarmType, stationid, deviceid, description,deviceType,components, alarmId,isclose,pageNum*pageSize, pageSize);
+        vos = alarmTsMapper.selectByWtLimit(begin,end,modelId,superTableName, alarmType, stationid, deviceid, description,deviceType,components, alarmId,isclose,pageNum*pageSize, pageSize,subcomponents);
 
         for(AlarmVo vo:vos)
         {
@@ -460,15 +478,15 @@ public class AlarmHistoryService   {
             Date beginDate = DateUtils.truncate(endDate);
             if(type.equals(AlarmTypeValue.BT.getCode()))
             {
-                vos = alarmTsMapper.selectByWtLimit(beginDate.getTime(),endDate.getTime(),null,AlarmSuperTalbeType.BT.getCode(), AlarmTypeValue.BT.getCode(), null, null, null,null,null, null,null,1, home_pagep_size);
+                vos = alarmTsMapper.selectByWtLimit(beginDate.getTime(),endDate.getTime(),null,AlarmSuperTalbeType.BT.getCode(), AlarmTypeValue.BT.getCode(), null, null, null,null,null, null,null,1, home_pagep_size,null);
 
             }else if(type.equals(AlarmTypeValue.WT.getCode()))
             {
-                vos = alarmTsMapper.selectByWtLimit(beginDate.getTime(),endDate.getTime(),null,AlarmSuperTalbeType.WT.getCode(), AlarmTypeValue.WT.getCode(), null, null, null,null, null,null,null,1, home_pagep_size);
+                vos = alarmTsMapper.selectByWtLimit(beginDate.getTime(),endDate.getTime(),null,AlarmSuperTalbeType.WT.getCode(), AlarmTypeValue.WT.getCode(), null, null, null,null, null,null,null,1, home_pagep_size,null);
 
             }else if(type.equals(AlarmTypeValue.CT.getCode()))
             {
-                vos = alarmTsMapper.selectByWtLimit(beginDate.getTime(),endDate.getTime(),null,AlarmSuperTalbeType.CT.getCode(), AlarmTypeValue.CT.getCode(), null, null, null,null, null,null,null,1, home_pagep_size);
+                vos = alarmTsMapper.selectByWtLimit(beginDate.getTime(),endDate.getTime(),null,AlarmSuperTalbeType.CT.getCode(), AlarmTypeValue.CT.getCode(), null, null, null,null, null,null,null,1, home_pagep_size,null);
 
             }