Commit 66b7366a authored by 廖旭伟's avatar 廖旭伟

数据汇聚接口只查询当前月份汇聚结果

parent 90eada26
package com.mortals.xhx.module.converge.service.impl; package com.mortals.xhx.module.converge.service.impl;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.util.DateUtils;
import com.mortals.xhx.common.pdu.RespData; import com.mortals.xhx.common.pdu.RespData;
import com.mortals.xhx.common.pdu.device.DevicePdu; import com.mortals.xhx.common.pdu.device.DevicePdu;
import com.mortals.xhx.common.pdu.site.SitePdu; import com.mortals.xhx.common.pdu.site.SitePdu;
...@@ -65,16 +66,12 @@ public class ConvergeSiteServiceImpl extends AbstractCRUDServiceImpl<ConvergeSit ...@@ -65,16 +66,12 @@ public class ConvergeSiteServiceImpl extends AbstractCRUDServiceImpl<ConvergeSit
ConvergeAppsQuery appsQuery = new ConvergeAppsQuery(); ConvergeAppsQuery appsQuery = new ConvergeAppsQuery();
appsQuery.setSiteId(deviceEntity.getSiteId()); appsQuery.setSiteId(deviceEntity.getSiteId());
appsQuery.setEquipmentId(deviceEntity.getId()); appsQuery.setEquipmentId(deviceEntity.getId());
Map<String,String> orderCols = new HashMap<>(); appsQuery.setStatYearMonth(DateUtils.getCurrDateTime("yyyy-MM"));
orderCols.put("statYearMonth","desc");
appsQuery.setOrderCols(orderCols);
List<ConvergeAppsEntity> apps = convergeAppsService.find(appsQuery); List<ConvergeAppsEntity> apps = convergeAppsService.find(appsQuery);
if(CollectionUtils.isEmpty(apps)){ if(CollectionUtils.isEmpty(apps)){
continue; continue;
} }
List<ConvergeAppsEntity> appsNew = new ArrayList<>(); for(ConvergeAppsEntity item:apps){
appsNew.add(apps.get(0));
for(ConvergeAppsEntity item:appsNew){
ConvergeAppsInterfaceEntity query = new ConvergeAppsInterfaceEntity(); ConvergeAppsInterfaceEntity query = new ConvergeAppsInterfaceEntity();
query.setEcode(deviceEntity.getLogo()); query.setEcode(deviceEntity.getLogo());
query.setApplicationId(item.getAppEname()); query.setApplicationId(item.getAppEname());
...@@ -84,7 +81,7 @@ public class ConvergeSiteServiceImpl extends AbstractCRUDServiceImpl<ConvergeSit ...@@ -84,7 +81,7 @@ public class ConvergeSiteServiceImpl extends AbstractCRUDServiceImpl<ConvergeSit
} }
item.setInterfaceEntityList(interfaceEntityList); item.setInterfaceEntityList(interfaceEntityList);
} }
equipmentVO.setAppStats(convertAppVO(appsNew)); equipmentVO.setAppStats(convertAppVO(apps));
equipments.add(equipmentVO); equipments.add(equipmentVO);
} }
branchVO.setEquipments(equipments); branchVO.setEquipments(equipments);
......
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