Commit a1cbade3 authored by caotao's avatar caotao

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

parent 126d2a58
...@@ -88,7 +88,7 @@ public class MaintenanceResultHandlerMessage extends EmqxListener { ...@@ -88,7 +88,7 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
jpStation = jpStationMapper.selectById(stationid); jpStation = jpStationMapper.selectById(stationid);
} }
TdHygfJpInverterWarn tdHygfJpInverterWarn = tdHygfJpInverterWarnMapper.getInverTerWarnByparams(warningId, sncode, stationid); TdHygfJpInverterWarn tdHygfJpInverterWarn = tdHygfJpInverterWarnMapper.getInverTerWarnByparams(warningId, sncode, stationid);
hygfMaintenanceTickets.setHandlerStatus("未处理"); // hygfMaintenanceTickets.setHandlerStatus("未处理");
MaintenanceDto maintenance = maintenanceMapper.selectOneById(Long.valueOf(mantainancePersonId)); MaintenanceDto maintenance = maintenanceMapper.selectOneById(Long.valueOf(mantainancePersonId));
hygfMaintenanceTickets.setStationId(stationid); hygfMaintenanceTickets.setStationId(stationid);
hygfMaintenanceTickets.setWarningId(warningId); hygfMaintenanceTickets.setWarningId(warningId);
...@@ -146,10 +146,10 @@ public class MaintenanceResultHandlerMessage extends EmqxListener { ...@@ -146,10 +146,10 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
hygfMaintenanceTicketsMapper.insert(hygfMaintenanceTickets); hygfMaintenanceTicketsMapper.insert(hygfMaintenanceTickets);
if (ObjectUtil.isNotEmpty(tdHygfJpInverterWarn)) { // if (ObjectUtil.isNotEmpty(tdHygfJpInverterWarn)) {
tdHygfJpInverterWarn.setHandlerStatus("处理中"); // tdHygfJpInverterWarn.setHandlerStatus("处理中");
tdHygfJpInverterWarnMapper.insert(tdHygfJpInverterWarn); // tdHygfJpInverterWarnMapper.insert(tdHygfJpInverterWarn);
} // }
log.info("创建运维工单成功{}", JSON.toJSONString(hygfMaintenanceTickets)); log.info("创建运维工单成功{}", JSON.toJSONString(hygfMaintenanceTickets));
} }
} }
......
...@@ -189,13 +189,13 @@ public class HYGFMaintenanceTicketsServiceImpl extends BaseService<HYGFMaintenan ...@@ -189,13 +189,13 @@ public class HYGFMaintenanceTicketsServiceImpl extends BaseService<HYGFMaintenan
hygfMaintenanceTicketsDto.setWarningDuration(day+"天"+hour+"小时"+minute+"分钟"); hygfMaintenanceTicketsDto.setWarningDuration(day+"天"+hour+"小时"+minute+"分钟");
} }
this.updateWithModel(hygfMaintenanceTicketsDto); this.updateWithModel(hygfMaintenanceTicketsDto);
if(ObjectUtil.isNotEmpty(hygfMaintenanceTicketsDto.getWarningId())){ // if(ObjectUtil.isNotEmpty(hygfMaintenanceTicketsDto.getWarningId())){
TdHygfJpInverterWarn tdHygfJpInverterWarn = tdHygfJpInverterWarnMapper.getInverTerWarnByparams(hygfMaintenanceTicketsDto.getWarningId(), hygfMaintenanceTicketsDto.getInverterSn(), hygfMaintenanceTicketsDto.getStationId()); // TdHygfJpInverterWarn tdHygfJpInverterWarn = tdHygfJpInverterWarnMapper.getInverTerWarnByparams(hygfMaintenanceTicketsDto.getWarningId(), hygfMaintenanceTicketsDto.getInverterSn(), hygfMaintenanceTicketsDto.getStationId());
if (ObjectUtil.isNotEmpty(tdHygfJpInverterWarn)) { // if (ObjectUtil.isNotEmpty(tdHygfJpInverterWarn)) {
tdHygfJpInverterWarn.setHandlerStatus("已处理"); // tdHygfJpInverterWarn.setHandlerStatus("已处理");
} // }
tdHygfJpInverterWarnMapper.insert(tdHygfJpInverterWarn); // tdHygfJpInverterWarnMapper.insert(tdHygfJpInverterWarn);
} // }
log.info("更新运维工单成功{}", JSON.toJSONString(hygfMaintenanceTicketsDto)); log.info("更新运维工单成功{}", JSON.toJSONString(hygfMaintenanceTicketsDto));
return hygfMaintenanceTicketsDto; return hygfMaintenanceTicketsDto;
} }
......
...@@ -178,13 +178,14 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS ...@@ -178,13 +178,14 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
public List<JpStation>getJpStationList (JpStationDto reviewDto){ 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()))); 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<JpStation> list= jpStationMapper.getJpStationList(reviewDto);
list.forEach(jpStation -> { list.forEach(jpStation -> {
List<String> sncodes =inverterMap.get(jpStation.getThirdStationId()).stream().distinct().collect(Collectors.toList()); List<String> sncodes =inverterMap.get(jpStation.getThirdStationId()).stream().distinct().collect(Collectors.toList());
jpStation.setSnCodes(sncodes); jpStation.setSnCodes(sncodes);
}); });
list =list.stream().filter(jpStation -> jpStation.getSnCodes().size()>0).collect(Collectors.toList());
return list; return list;
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment