17826:【小程序端-电站监控】报警信息>电站报警列表，未处理报警列表没有一条数据

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/TdHygfJpInverterWarnServiceImpl.java

@@ -69,7 +69,7 @@ public class TdHygfJpInverterWarnServiceImpl
 //		}
         List<TdHygfJpInverterWarnDto> list = new ArrayList<>();
         if (tdHygfJpInverterWarnDto.getStationIds().isEmpty()) {
-			list = this.baseMapper.list(tdHygfJpInverterWarnDto);
+
         } else {
 
             list = this.baseMapper.list(tdHygfJpInverterWarnDto);
@@ -90,16 +90,23 @@ public class TdHygfJpInverterWarnServiceImpl
             }
         }
         List<Long> waringIds = list.stream().map(tdHygfJpInverterWarnDto1 -> tdHygfJpInverterWarnDto1.getCreatedTime()).collect(Collectors.toList());
-		if(waringIds.size()==0){
-			waringIds =Arrays.asList(0L);
+        if (waringIds.size() == 0) {
+            waringIds = Arrays.asList(0L);
         }
-		List<HYGFMaintenanceTickets> hygfMaintenanceTicketsList = hygfMaintenanceTicketsMapper.selectList(new QueryWrapper<HYGFMaintenanceTickets>().in("warning_id",waringIds));
-		Set<String> status  = hygfMaintenanceTicketsList.stream().filter(hygfmaintenanceTickets -> tdHygfJpInverterWarnDto.getCreatedTime().equals(hygfmaintenanceTickets.getWarningId())).map(HYGFMaintenanceTickets::getHandlerStatus).collect(Collectors.toSet());
-		if(status.contains("未处理")){
-			tdHygfJpInverterWarnDto.setTicketStatus("处理中");
+        List<HYGFMaintenanceTickets> hygfMaintenanceTicketsList = hygfMaintenanceTicketsMapper.selectList(new QueryWrapper<HYGFMaintenanceTickets>().in("warning_id", waringIds));
+        if (hygfMaintenanceTicketsList.size() > 0) {
+           list.forEach(i -> {
+               List<HYGFMaintenanceTickets> ticketsList = hygfMaintenanceTicketsList.stream().filter(hygfmaintenanceTickets -> i.getCreatedTime().equals(hygfmaintenanceTickets.getWarningId())).collect(Collectors.toList());
+               if (ObjectUtil.isNotEmpty(ticketsList)) {
+                   Set<String> status = ticketsList.stream().map(HYGFMaintenanceTickets::getHandlerStatus).collect(Collectors.toSet());
+                   if (status.contains("未处理")) {
+                       i.setTicketStatus("处理中");
                    }
-		if(status.contains("已处理")&&status.size()==1){
-			tdHygfJpInverterWarnDto.setTicketStatus("已处理");
+                   if (status.contains("已处理") && status.size() == 1) {
+                       i.setTicketStatus("已处理");
+                   }
+               }
+           });
         }
         PageInfo<TdHygfJpInverterWarnDto> page = new PageInfo(list);
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<TdHygfJpInverterWarnDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<TdHygfJpInverterWarnDto>();
@@ -125,8 +132,8 @@ public class TdHygfJpInverterWarnServiceImpl
                 .eq(JpStation::getThirdStationId, tdHygfJpInverterWarnDto.getThirdStationId()));
         List<HYGFMaintenanceTickets> hygfMaintenanceTickets = hygfMaintenanceTicketsMapper.
                 selectList(new QueryWrapper<HYGFMaintenanceTickets>()
-						.eq("warning_id",String.valueOf(tdHygfJpInverterWarnDto.getCreatedTime()))
-						.eq("inverter_sn",String.valueOf(tdHygfJpInverterWarnDto.getSnCode())));
+                        .eq("warning_id", String.valueOf(tdHygfJpInverterWarnDto.getCreatedTime()))
+                        .eq("inverter_sn", String.valueOf(tdHygfJpInverterWarnDto.getSnCode())));
         if (jpStation != null) {
             tdHygfJpInverterWarnDto.setStationName(jpStation.getName());
             tdHygfJpInverterWarnDto.setStationContact(jpStation.getStationContact());
@@ -145,12 +152,12 @@ public class TdHygfJpInverterWarnServiceImpl
                 tdHygfJpInverterWarnDto.setStartTimeFormat(TimeUtil.dateFormat(tdHygfJpInverterWarnDto.getStartTime()));
             }
         }
-		if(hygfMaintenanceTickets.size()>0){
+        if (hygfMaintenanceTickets.size() > 0) {
             Set<String> status = hygfMaintenanceTickets.stream().filter(hygfmaintenanceTickets -> tdHygfJpInverterWarnDto.getCreatedTime().equals(hygfmaintenanceTickets.getWarningId())).map(HYGFMaintenanceTickets::getHandlerStatus).collect(Collectors.toSet());
-			if(status.contains("未处理")){
+            if (status.contains("未处理")) {
                 tdHygfJpInverterWarnDto.setTicketStatus("处理中");
             }
-			if(status.contains("已处理")&&status.size()==1){
+            if (status.contains("已处理") && status.size() == 1) {
                 tdHygfJpInverterWarnDto.setTicketStatus("已处理");
             }
             tdHygfJpInverterWarnDto.setListTickets(hygfMaintenanceTickets);
@@ -158,19 +165,20 @@ public class TdHygfJpInverterWarnServiceImpl
         return tdHygfJpInverterWarnDto;
     }
 
-	public List<TdHygfJpInverterWarnDto> selectWarnList(String state, String level, String minvalue, String maxValue, String snCode, List<String>  stationId, String startTime, String endTime, String content, Integer current, Integer size,String handlerStatus){
-	     List<TdHygfJpInverterWarnDto> list = this.getBaseMapper().selectWarnList(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,(current-1)*size,size,handlerStatus);
+    public List<TdHygfJpInverterWarnDto> selectWarnList(String state, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content, Integer current, Integer size, String handlerStatus) {
+        List<TdHygfJpInverterWarnDto> list = this.getBaseMapper().selectWarnList(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content, (current - 1) * size, size, handlerStatus);
         list.forEach(i -> {
             JpStation jpStation = jpStationServiceImpl.getOne(new LambdaQueryWrapper<JpStation>()
                     .eq(JpStation::getThirdStationId, i.getThirdStationId()));
-			 if(ObjectUtil.isNotNull(jpStation)){
+            if (ObjectUtil.isNotNull(jpStation)) {
                 i.setAddress(jpStation.getAddress());
                 i.setArea(jpStation.getArea());
             }
         });
         return list;
     }
-	public int selectWarnListTotal(String state, String level, String minvalue, String maxValue, String snCode, List<String>  stationId, String startTime, String endTime, String content,String handlerStatus){
-		return this.getBaseMapper().selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,handlerStatus);
+
+    public int selectWarnListTotal(String state, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content, String handlerStatus) {
+        return this.getBaseMapper().selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content, handlerStatus);
     }
 }
\ No newline at end of file