综合展示二供展示

sms_water/src/main/java/com/huaxu/controller/ComDisplayController.java

@@ -130,7 +130,10 @@ public class ComDisplayController {
     @RequestMapping(value="selectMapForWholeCompany" , method = RequestMethod.GET)
     @ApiOperation(value = "二供供水排行--总公司")
     public AjaxMessage<List<SecDataCollectDto>> selectMapForWholeCompany() {
-        List<SecDataCollectDto> result = comdisplayMapLocationService.selectMapForWholeCompanyByMonth();
+        MonitorDataCollectDto monitorDataCollectDto = new MonitorDataCollectDto();
+        monitorDataCollectDto.setSceneTypeName("泵站");
+        monitorDataCollectDto.setSceneIds(sceneService.findByParentIdsByCom(null));
+        List<SecDataCollectDto> result = onlineMonitorService.selectMapForWholeCompany(monitorDataCollectDto);
         for (SecDataCollectDto item : result) {
             item.setYieldWaterUsage(item.getYieldWaterUsage() != null ? (double) Math.round(item.getYieldWaterUsage() / (float) 100) / 100 : null);
         }
@@ -143,6 +146,7 @@ public class ComDisplayController {
         monitorDataCollectDto.setSceneTypeName("泵站");
         monitorDataCollectDto.setSceneIds(sceneService.findByParentIdsByCom(Long.valueOf(companyOrgId)));
         List<MonitorDataCollectDto> result = onlineMonitorService.selectMapSuspensionForMonth(monitorDataCollectDto);
+
         for (MonitorDataCollectDto item : result) {
             item.setYieldWaterUsage(item.getYieldWaterUsage() != null ? (double) Math.round(item.getYieldWaterUsage() / (float) 100) / 100 : null);
         }

sms_water/src/main/java/com/huaxu/service/impl/OnlineMonitorImpl.java

@@ -490,7 +490,7 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
         if(!StringUtils.isEmpty(monitorDataCollectDto.getSceneTypeName()))
         {
             monitorDataCollectDto.setType(1);
-            List<MonitorDataCollectDto> calculateRes=onlineMonitorMapper.selectSceneParam(monitorDataCollectDto);
+            List<MonitorDataCollectDto> calculateRes=onlineMonitorMapper.selectSceneParamForLastMonth(monitorDataCollectDto);
             GetCalMonitorData(result,calculateRes);
             Map<Long,SecDataCollectDto> map = new HashMap<>();
             // 按公司进行汇总