Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
539efbbf18
|
@ -37,6 +37,34 @@ public class SummaryServiceImpl implements SummaryService {
|
|||
// onlineMap.put("2","false");
|
||||
// onlineMap.put("3","true");
|
||||
// onlineMap.put("4","true");
|
||||
if(onlineMap.isEmpty()){
|
||||
List<PieSummaryVO> result = new ArrayList<>();
|
||||
PieSummaryVO pieSummaryVO = new PieSummaryVO();
|
||||
pieSummaryVO.setChartName("total");
|
||||
pieSummaryVO.setTitle("设备总数");
|
||||
pieSummaryVO.setData(List.of());
|
||||
result.add(pieSummaryVO);
|
||||
|
||||
PieSummaryVO pieSummaryVO1 = new PieSummaryVO();
|
||||
pieSummaryVO1.setChartName(KNPCV1_MODBUS_TYPE);
|
||||
pieSummaryVO1.setTitle("KNPCV1");
|
||||
pieSummaryVO1.setData(List.of());
|
||||
result.add(pieSummaryVO1);
|
||||
|
||||
PieSummaryVO pieSummaryVO2 = new PieSummaryVO();
|
||||
pieSummaryVO2.setChartName(ETC_MODBUS_TYPE);
|
||||
pieSummaryVO2.setTitle("ETC");
|
||||
pieSummaryVO2.setData(List.of());
|
||||
result.add(pieSummaryVO2);
|
||||
|
||||
PieSummaryVO pieSummaryVO3 = new PieSummaryVO();
|
||||
pieSummaryVO3.setChartName(SCSS_MODBUS_TYPE);
|
||||
pieSummaryVO3.setTitle("四川双晟");
|
||||
pieSummaryVO3.setData(List.of());
|
||||
result.add(pieSummaryVO3);
|
||||
|
||||
return result;
|
||||
}
|
||||
List<Long> deviceIdList = onlineMap.keySet().stream().map(Long::parseLong).toList();
|
||||
|
||||
List<DeviceVO> deviceVOList = deviceService.getDeviceVOByIds(deviceIdList);
|
||||
|
|
Loading…
Reference in New Issue