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

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpInverterWarnController.java

@@ -117,7 +117,7 @@ public class TdHygfJpInverterWarnController extends BaseController {
      * @param sequenceNbr 主键
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "time/{createdTime}")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个户用光伏监盘逆变器报警表", notes = "根据sequenceNbr查询单个户用光伏监盘逆变器报警表")
     public ResponseModel<TdHygfJpInverterWarnDto> selectCreatedTime(@PathVariable Long createdTime) {
@@ -136,12 +136,12 @@ public class TdHygfJpInverterWarnController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "户用光伏监盘逆变器报警表分页查询", notes = "户用光伏监盘逆变器报警表分页查询")
     public ResponseModel<Page<TdHygfJpInverterWarnDto>> queryForPage(@RequestParam(value = "current") int current,
                                                                      @RequestParam(value = "size") int size, TdHygfJpInverterWarnDto tdHygfJpInverterWarnDto) {
-        List<JpPersonStation> pPersonStation =null;
-        if(tdHygfJpInverterWarnDto.getName()!=null&&!"".equals(tdHygfJpInverterWarnDto.getName())){
-            LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
-            qug1.like(JpPersonStation::getStationName,tdHygfJpInverterWarnDto.getName());
-            pPersonStation=pPersonStationMapper.selectList(qug1);
-        }else{
+        List<JpPersonStation> pPersonStation = null;
+        if (tdHygfJpInverterWarnDto.getName() != null && !"".equals(tdHygfJpInverterWarnDto.getName())) {
+            LambdaQueryWrapper<JpPersonStation> qug1 = new LambdaQueryWrapper<>();
+            qug1.like(JpPersonStation::getStationName, tdHygfJpInverterWarnDto.getName());
+            pPersonStation = pPersonStationMapper.selectList(qug1);
+        } else {
             LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>();
             qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId());
             pPersonStation = pPersonStationMapper.selectList(qug);
@@ -177,48 +177,48 @@ public class TdHygfJpInverterWarnController extends BaseController {
 
     /**
      * 获取告警统计
-      * **/
+     **/
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "户用光伏监盘逆变器报警表列表全部数据查询", notes = "户用光伏监盘逆变器报警表列表全部数据查询")
     @GetMapping(value = "/selectcount")
-    public ResponseModel<  Map<String,Object>  > selectcount(JpStationDto reviewDto) {
-        LambdaQueryWrapper<JpStation> qugda=new LambdaQueryWrapper<>();
+    public ResponseModel<Map<String, Object>> selectcount(JpStationDto reviewDto) {
+        LambdaQueryWrapper<JpStation> qugda = new LambdaQueryWrapper<>();
 
         //获取当前人管理场站
-        if(reviewDto.getThirdStationId()==null){
+        if (reviewDto.getThirdStationId() == null) {
             //获取当前人管理场站
-            LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
-            qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
-            List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
+            LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>();
+            qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId());
+            List<JpPersonStation> pPersonStation = pPersonStationMapper.selectList(qug);
 
-            if(pPersonStation==null||pPersonStation.isEmpty()){
+            if (pPersonStation == null || pPersonStation.isEmpty()) {
                 return ResponseHelper.buildResponse(null);
             }
-            List ids=null;
-            if(pPersonStation!=null&&!pPersonStation.isEmpty()){
-                ids=new ArrayList();
+            List ids = null;
+            if (pPersonStation != null && !pPersonStation.isEmpty()) {
+                ids = new ArrayList();
                 for (JpPersonStation jpPersonStation : pPersonStation) {
                     ids.add(jpPersonStation.getStationId());
                 }
-                qugda.in(ids!=null,JpStation::getThirdStationId,ids);
+                qugda.in(ids != null, JpStation::getThirdStationId, ids);
             }
-        }else{
-            qugda.eq(JpStation::getThirdStationId,reviewDto.getThirdStationId());
+        } else {
+            qugda.eq(JpStation::getThirdStationId, reviewDto.getThirdStationId());
         }
-        qugda.like(reviewDto.getName()!=null,JpStation::getName,reviewDto.getName());
-        qugda.like(reviewDto.getArea()!=null,JpStation::getArea,reviewDto.getArea());
-        List<JpStation> pPersonStation=jpStationMapper.selectList(qugda);
-        List<Map<String,Object>>   datalist=    tdHygfJpInverterWarnMapper.getCountTdHygfJpInverterWarn(pPersonStation!=null&&!pPersonStation.isEmpty()?pPersonStation:null);
-        Map<String,Object>  collector =new HashMap<>();
-        collector.put("wcl",0);
-        collector.put("ycl",0);
+        qugda.like(reviewDto.getName() != null, JpStation::getName, reviewDto.getName());
+        qugda.like(reviewDto.getArea() != null, JpStation::getArea, reviewDto.getArea());
+        List<JpStation> pPersonStation = jpStationMapper.selectList(qugda);
+        List<Map<String, Object>> datalist = tdHygfJpInverterWarnMapper.getCountTdHygfJpInverterWarn(pPersonStation != null && !pPersonStation.isEmpty() ? pPersonStation : null);
+        Map<String, Object> collector = new HashMap<>();
+        collector.put("wcl", 0);
+        collector.put("ycl", 0);
 
-        if(datalist!=null&&!datalist.isEmpty()){
+        if (datalist != null && !datalist.isEmpty()) {
             for (Map<String, Object> map : datalist) {
-                if("未处理".equals(map.get("state").toString())){
-                    collector.put("wcl",Integer.valueOf(map.get("num").toString()));
-                }else if("已处理".equals(map.get("state").toString())||"已恢复".equals(map.get("state").toString())){
-                    collector.put("ycl",Integer.valueOf(map.get("num").toString()));
+                if ("未处理".equals(map.get("state").toString())) {
+                    collector.put("wcl", Integer.valueOf(map.get("num").toString()));
+                } else if ("已处理".equals(map.get("state").toString()) || "已恢复".equals(map.get("state").toString())) {
+                    collector.put("ycl", Integer.valueOf(map.get("num").toString()));
                 }
             }
         }
@@ -247,11 +247,11 @@ public class TdHygfJpInverterWarnController extends BaseController {
         result.setSize(size);
         JpStationDto reviewDto = new JpStationDto();
         Map<String, String> nameMaps = new HashMap<>();
-		if (null != stationName && stationName != ""){
+        if (null != stationName && stationName != "") {
             reviewDto.setName(stationName);
         }
         List<JpStation> jpStation = jpStationMapper.getJpStation(reviewDto);
-		if (CollectionUtil.isEmpty(jpStation)){
+        if (CollectionUtil.isEmpty(jpStation)) {
             result.setTotal(0);
             List<TdHygfJpInverterWarnDto> list = new ArrayList<>();
             result.setRecords(list);
@@ -260,51 +260,53 @@ public class TdHygfJpInverterWarnController extends BaseController {
         }
         nameMaps = jpStation.stream().collect(Collectors.toMap(JpStation::getThirdStationId, JpStation::getName));
 
-		if (null == stationId ){
+        if (null == stationId) {
             stationId = jpStation.stream().map(JpStation::getThirdStationId).collect(Collectors.toList());
         }
-		String startTime ="";
+        String startTime = "";
         String endTime = "";
-		if (null != time){
+        if (null != time) {
 
             try {
-				startTime = String.valueOf( DateUtils.dateParse(time[0].replace("[",""), null).getTime());
+                startTime = String.valueOf(DateUtils.dateParse(time[0].replace("[", ""), null).getTime());
                 Date date = DateUtils.dateParse(time[1].replace("]", ""), null);
-				endTime = String.valueOf(DateUtils.dateAddDays(date,1).getTime());
+                endTime = String.valueOf(DateUtils.dateAddDays(date, 1).getTime());
             } catch (ParseException e) {
                 e.printStackTrace();
             }
         }
-		if (StringUtils.isNotEmpty(snCode)){
-			snCode = '%'+snCode+'%';
+        if (StringUtils.isNotEmpty(snCode)) {
+            snCode = '%' + snCode + '%';
         }
-		if (StringUtils.isNotEmpty(content)){
-			content = '%'+content+'%';
+        if (StringUtils.isNotEmpty(content)) {
+            content = '%' + content + '%';
         }
-		List<TdHygfJpInverterWarnDto> maps = tdHygfJpInverterWarnServiceImpl.selectWarnList(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,current,size,handlerStatus);
+        List<TdHygfJpInverterWarnDto> maps = tdHygfJpInverterWarnServiceImpl.selectWarnList(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content, current, size, handlerStatus);
         for (TdHygfJpInverterWarnDto map : maps) {
-			if (nameMaps.containsKey(map.getThirdStationId())){
+            if (nameMaps.containsKey(map.getThirdStationId())) {
                 map.setStationName(nameMaps.get(map.getThirdStationId()));
             }
-          String te=  map.getTimeLong()!=null?TimeUtil.longFormat(map.getTimeLong()):"";
+            String te = map.getTimeLong() != null ? TimeUtil.longFormat(map.getTimeLong()) : "";
             map.setTimeLongFormat(te);
         }
 
-		result.setTotal(tdHygfJpInverterWarnServiceImpl.selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,handlerStatus));
+        result.setTotal(tdHygfJpInverterWarnServiceImpl.selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content, handlerStatus));
         List<Long> waringIds = maps.stream().map(tdHygfJpInverterWarnDto -> tdHygfJpInverterWarnDto.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));
+        List<HYGFMaintenanceTickets> hygfMaintenanceTicketsList = hygfMaintenanceTicketsMapper.selectList(new QueryWrapper<HYGFMaintenanceTickets>().in("warning_id", waringIds));
+        if (hygfMaintenanceTicketsList.size() > 0) {
             maps.forEach(tdHygfJpInverterWarnDto -> {
                 Set<String> status = hygfMaintenanceTicketsList.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("已处理");
                 }
             });
+        }
         result.setRecords(maps);
         return ResponseHelper.buildResponse(result);
     }

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