数据报表查询改为以站点为单位
This commit is contained in:
parent
8d6e88b506
commit
0e92650804
|
|
@ -60,6 +60,11 @@ public class SurvAlertRecordServiceImpl extends ServiceImpl<SurvAlertRecordMappe
|
||||||
@Override
|
@Override
|
||||||
public AlertSummaryVo getSummary(AlertSummaryDTO alertSummaryDTO) {
|
public AlertSummaryVo getSummary(AlertSummaryDTO alertSummaryDTO) {
|
||||||
AlertSummaryVo alertSummaryVo = new AlertSummaryVo();
|
AlertSummaryVo alertSummaryVo = new AlertSummaryVo();
|
||||||
|
Map<String,SurvItemInfo> itemInfo = new HashMap<>();
|
||||||
|
List<SurvItemInfo> itemList = new ArrayList<>();
|
||||||
|
List<String> timeList = new ArrayList<>();
|
||||||
|
Map<String,List<String>> dataMap = new HashMap<>();
|
||||||
|
|
||||||
if(StringUtils.isNotBlank(alertSummaryDTO.getStationCode())){
|
if(StringUtils.isNotBlank(alertSummaryDTO.getStationCode())){
|
||||||
//获取站点下的所有设备
|
//获取站点下的所有设备
|
||||||
List<String> deployTypes = new ArrayList<>();
|
List<String> deployTypes = new ArrayList<>();
|
||||||
|
|
@ -74,8 +79,17 @@ public class SurvAlertRecordServiceImpl extends ServiceImpl<SurvAlertRecordMappe
|
||||||
if(deviceList!=null && !deviceList.isEmpty()){
|
if(deviceList!=null && !deviceList.isEmpty()){
|
||||||
for (SurvDeviceDeploy deploy : deviceList) {
|
for (SurvDeviceDeploy deploy : deviceList) {
|
||||||
alertSummaryDTO.setDeployId(deploy.getId());
|
alertSummaryDTO.setDeployId(deploy.getId());
|
||||||
alertSummaryVo = getDeviceSummary(alertSummaryDTO);
|
AlertSummaryVo temp = getDeviceSummary(alertSummaryDTO);
|
||||||
|
itemInfo.putAll(temp.getItemInfo());
|
||||||
|
itemList.addAll(temp.getItemList());
|
||||||
|
dataMap.putAll(temp.getDataMap());
|
||||||
|
|
||||||
|
timeList = temp.getTimeList();
|
||||||
}
|
}
|
||||||
|
alertSummaryVo.setItemInfo(itemInfo);
|
||||||
|
alertSummaryVo.setItemList(itemList);
|
||||||
|
alertSummaryVo.setDataMap(dataMap);
|
||||||
|
alertSummaryVo.setTimeList(timeList);
|
||||||
}
|
}
|
||||||
|
|
||||||
}else{
|
}else{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue