水源水厂的取水、制水、耗电/10000

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

@@ -191,12 +191,12 @@ public class ComDisplayController {
     @RequestMapping(value="selectPipeNetLayer" , method = RequestMethod.GET)
     @ApiOperation(value = "查询管网地图图层及设备")
     public AjaxMessage<List<PipeNetLayerDto>> selectPipeNetLayer(
-            @ApiParam(value = "公司机构id", required = true)@RequestParam Integer companyOrgId,
+            @ApiParam(value = "公司机构id", required = false)@RequestParam(required = false) Integer companyOrgId,
             @ApiParam(value = "一级场景类型名称", required = false) @RequestParam(required = false) String sceneTypeName){
         OnlineDataDto onlineDataDto=new OnlineDataDto();
         onlineDataDto.setSceneTypeName(sceneTypeName);
         onlineDataDto.setFlag(1);
-        onlineDataDto.setSceneIds(sceneService.findByParentIdsByCom(Long.valueOf(companyOrgId)));
+        onlineDataDto.setSceneIds(companyOrgId==null?sceneService.findByParentIdsLike(null):sceneService.findByParentIdsByCom(Long.valueOf(companyOrgId)));
         List<PipeNetLayerDto> result=onlineMonitorService.selectPipeNetLayer(onlineDataDto);
         return new AjaxMessage<>(ResultStatus.OK, result);
     }
@@ -216,12 +216,12 @@ public class ComDisplayController {
     @RequestMapping(value="selectMapSuspension" , method = RequestMethod.GET)
     @ApiOperation(value = "查询地图悬浮数据")
     public AjaxMessage<List<MonitorDataCollectDto>> selectMapSuspension(
-            @ApiParam(value = "公司机构id", required = true)@RequestParam Integer companyOrgId,
+            @ApiParam(value = "公司机构id", required = false)@RequestParam(required = false) Integer companyOrgId,
             @ApiParam(value = "一级场景类型名称", required = false) @RequestParam(required = false) String sceneTypeName){
         MonitorDataCollectDto monitorDataCollectDto=new MonitorDataCollectDto();
         monitorDataCollectDto.setSceneTypeName(sceneTypeName);
         monitorDataCollectDto.setFlag(1);
-        monitorDataCollectDto.setSceneIds(sceneService.findByParentIdsByCom(Long.valueOf(companyOrgId)));
+        monitorDataCollectDto.setSceneIds(companyOrgId==null?sceneService.findByParentIdsLike(null):sceneService.findByParentIdsByCom(Long.valueOf(companyOrgId)));
         List<MonitorDataCollectDto> result=onlineMonitorService.selectMapSuspension(monitorDataCollectDto);
         return new AjaxMessage<>(ResultStatus.OK, result);
     }

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

@@ -657,6 +657,19 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
                 }
             }
         }
+        for(MonitorDataCollectDto mon : result){
+            if(mon.getSceneTypeName().equals("水源")||mon.getSceneTypeName().equals("水厂")){
+                if(mon.getYieldWaterUsage()!=null) {
+                    mon.setYieldWaterUsage(mon.getYieldWaterUsage() / 10000);
+                }
+                if(mon.getIntakeWaterUsage()!=null) {
+                    mon.setIntakeWaterUsage(mon.getIntakeWaterUsage() / 10000);
+                }
+                if(mon.getPowerUsage()!=null) {
+                    mon.setPowerUsage(mon.getPowerUsage() / 10000);
+                }
+            }
+        }
     }
     /**
      * 获取在线数据及计算数据
@@ -758,6 +771,19 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
                 }
             }
         }
+        for(OnlineDataDto mon : result){
+            if(mon.getSceneTypeName().equals("水源")||mon.getSceneTypeName().equals("水厂")){
+                if(mon.getYieldWaterUsage()!=null) {
+                    mon.setYieldWaterUsage(mon.getYieldWaterUsage() / 10000);
+                }
+                if(mon.getIntakeWaterUsage()!=null) {
+                    mon.setIntakeWaterUsage(mon.getIntakeWaterUsage() / 10000);
+                }
+                if(mon.getPowerUsage()!=null) {
+                    mon.setPowerUsage(mon.getPowerUsage() / 10000);
+                }
+            }
+        }
     }
     /**
      * 获取计算数据总值
@@ -800,6 +826,17 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
                 }
             }
         }
+        if(result.getSceneTypeName().equals("水源")||result.getSceneTypeName().equals("水厂")){
+            if(result.getYieldWaterUsage()!=null) {
+                result.setYieldWaterUsage(result.getYieldWaterUsage() / 10000);
+            }
+            if(result.getIntakeWaterUsage()!=null) {
+                result.setIntakeWaterUsage(result.getIntakeWaterUsage() / 10000);
+            }
+            if(result.getPowerUsage()!=null) {
+                result.setPowerUsage(result.getPowerUsage() / 10000);
+            }
+        }
         return result;
     }
 }