综合展示数据除以10000

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

@@ -5,6 +5,7 @@ import com.huaxu.dto.generalView.WaterSupplyChart;
 import com.huaxu.entity.MonitorDataEntity;
 import com.huaxu.entity.MonitorDataValueEntity;
 import com.huaxu.entity.SceneEntity;
+import com.huaxu.entity.ThingSettingEntity;
 import com.huaxu.model.AjaxMessage;
 import com.huaxu.model.ResultStatus;
 import com.huaxu.service.*;
@@ -121,6 +122,10 @@ public class ComDisplayController {
         } else {
             sceneUsageDto.setYieldPowerUsage(0d);
         }
+        //对数据进行单位转换 按万进行统计
+        sceneUsageDto.setYieldPowerUsage(sceneUsageDto.getYieldPowerUsage()!=null? (double) Math.round(sceneUsageDto.getYieldPowerUsage()/(float)100)/100:0);
+        sceneUsageDto.setYieldWaterUsage(sceneUsageDto.getYieldWaterUsage()!=null? (double) Math.round(sceneUsageDto.getYieldWaterUsage()/(float)100)/100:0);
+        sceneUsageDto.setPowerUsage(sceneUsageDto.getPowerUsage()!=null? (double) Math.round(sceneUsageDto.getPowerUsage()/(float)100)/100:0);
         return new AjaxMessage<>(ResultStatus.OK, sceneUsageDto);
     }
     @RequestMapping(value="selectMapForCompany" , method = RequestMethod.GET)
@@ -173,8 +178,8 @@ public class ComDisplayController {
             //查询子公司的取水量、制水量 产销差(制水量-售水量)/制水量  X 100%
             ComdisplayInfoDto comdisplayInfoDto = comdisplayMapLocationService.selectMapDataForCompany(Long.valueOf(receFee.get(0).getCompanyOrgId()));
             if (comdisplayInfoDto != null) {
-                receFee.get(0).setIntakeWaterUsage(comdisplayInfoDto.getIntakeWaterUsage());
-                receFee.get(0).setYieldWaterUsage(comdisplayInfoDto.getYieldWaterUsage());
+                receFee.get(0).setIntakeWaterUsage(comdisplayInfoDto.getIntakeWaterUsage() != null ? (double) Math.round(comdisplayInfoDto.getIntakeWaterUsage() / (float) 100) / 100 : 0);
+                receFee.get(0).setYieldWaterUsage(comdisplayInfoDto.getYieldWaterUsage() != null ? (double) Math.round(comdisplayInfoDto.getYieldWaterUsage() / (float) 100) / 100 : 0);
                 if (comdisplayInfoDto.getYieldWaterUsage() != null && comdisplayInfoDto.getYieldWaterUsage() > 0d) {
                     receFee.get(0).setWaterFeeRecoveryRate(Double.valueOf(Math.round(((comdisplayInfoDto.getYieldWaterUsage() - waterUsage) / comdisplayInfoDto.getYieldWaterUsage()) * 100)));
                 }

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

@@ -469,7 +469,7 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
                     SecDataCollectDto secDataCollectDto = new SecDataCollectDto();
                     secDataCollectDto.setYieldWaterUsage(item.getYieldWaterUsage());
                     secDataCollectDto.setCount(1);
-                    //secDataCollectDto.setComName(orgInfoUtil.getOrgName(item.getCompanyOrgId().intValue()));
+                    secDataCollectDto.setComName(orgInfoUtil.getOrgName(item.getCompanyOrgId().intValue()));
                     map.put(item.getCompanyOrgId(), secDataCollectDto);
                 } else {
                     Double yieldWaterUsage = map.get(item.getCompanyOrgId()).getYieldWaterUsage() != null ? map.get(item.getCompanyOrgId()).getYieldWaterUsage() : 0d;