华为与科士达逆变器不展示问题修改

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/emqx/MaintenanceResultHandlerMessage.java

@@ -88,7 +88,7 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
                 jpStation = jpStationMapper.selectById(stationid);
             }
             TdHygfJpInverterWarn tdHygfJpInverterWarn = tdHygfJpInverterWarnMapper.getInverTerWarnByparams(warningId, sncode, stationid);
-            hygfMaintenanceTickets.setHandlerStatus("未处理");
+//            hygfMaintenanceTickets.setHandlerStatus("未处理");
             MaintenanceDto maintenance = maintenanceMapper.selectOneById(Long.valueOf(mantainancePersonId));
             hygfMaintenanceTickets.setStationId(stationid);
             hygfMaintenanceTickets.setWarningId(warningId);
@@ -146,10 +146,10 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
 
 
             hygfMaintenanceTicketsMapper.insert(hygfMaintenanceTickets);
-            if (ObjectUtil.isNotEmpty(tdHygfJpInverterWarn)) {
-                tdHygfJpInverterWarn.setHandlerStatus("处理中");
-                tdHygfJpInverterWarnMapper.insert(tdHygfJpInverterWarn);
-            }
+//            if (ObjectUtil.isNotEmpty(tdHygfJpInverterWarn)) {
+//                tdHygfJpInverterWarn.setHandlerStatus("处理中");
+//                tdHygfJpInverterWarnMapper.insert(tdHygfJpInverterWarn);
+//            }
             log.info("创建运维工单成功{}", JSON.toJSONString(hygfMaintenanceTickets));
         }
     }

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

@@ -189,13 +189,13 @@ public class HYGFMaintenanceTicketsServiceImpl extends BaseService<HYGFMaintenan
             hygfMaintenanceTicketsDto.setWarningDuration(day+"天"+hour+"小时"+minute+"分钟");
         }
         this.updateWithModel(hygfMaintenanceTicketsDto);
-        if(ObjectUtil.isNotEmpty(hygfMaintenanceTicketsDto.getWarningId())){
-            TdHygfJpInverterWarn tdHygfJpInverterWarn = tdHygfJpInverterWarnMapper.getInverTerWarnByparams(hygfMaintenanceTicketsDto.getWarningId(), hygfMaintenanceTicketsDto.getInverterSn(), hygfMaintenanceTicketsDto.getStationId());
-            if (ObjectUtil.isNotEmpty(tdHygfJpInverterWarn)) {
-                tdHygfJpInverterWarn.setHandlerStatus("已处理");
-            }
-            tdHygfJpInverterWarnMapper.insert(tdHygfJpInverterWarn);
-        }
+//        if(ObjectUtil.isNotEmpty(hygfMaintenanceTicketsDto.getWarningId())){
+//            TdHygfJpInverterWarn tdHygfJpInverterWarn = tdHygfJpInverterWarnMapper.getInverTerWarnByparams(hygfMaintenanceTicketsDto.getWarningId(), hygfMaintenanceTicketsDto.getInverterSn(), hygfMaintenanceTicketsDto.getStationId());
+//            if (ObjectUtil.isNotEmpty(tdHygfJpInverterWarn)) {
+//                tdHygfJpInverterWarn.setHandlerStatus("已处理");
+//            }
+//            tdHygfJpInverterWarnMapper.insert(tdHygfJpInverterWarn);
+//        }
         log.info("更新运维工单成功{}", JSON.toJSONString(hygfMaintenanceTicketsDto));
         return hygfMaintenanceTicketsDto;
     }

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

@@ -178,13 +178,14 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
 
 
     public List<JpStation>getJpStationList (JpStationDto reviewDto){
-        List<JpInverter> dataJpInverter=jpInverterMapper.selectList(new QueryWrapper<JpInverter>().isNotNull("third_station_id").groupBy("third_station_id"));
+        List<JpInverter> dataJpInverter=jpInverterMapper.selectList(new QueryWrapper<JpInverter>().isNotNull("third_station_id").isNotNull("sn_code").notLike("sn_code",""));
         Map<String,List<String>> inverterMap=dataJpInverter.stream().collect(Collectors.groupingBy(JpInverter::getThirdStationId,Collectors.mapping(JpInverter::getSnCode,Collectors.toList())));
         List<JpStation> list= jpStationMapper.getJpStationList(reviewDto);
         list.forEach(jpStation -> {
             List<String> sncodes =inverterMap.get(jpStation.getThirdStationId()).stream().distinct().collect(Collectors.toList());
             jpStation.setSnCodes(sncodes);
         });
+        list =list.stream().filter(jpStation -> jpStation.getSnCodes().size()>0).collect(Collectors.toList());
         return list;
     }
     @Override