泵站数据

sms_water/src/main/java/com/huaxu/service/SecSupplyService.java

@@ -2,6 +2,7 @@ package com.huaxu.service;
 
 import com.huaxu.dto.*;
 import com.huaxu.entity.*;
+import com.huaxu.service.impl.MonitorDataReportServiceImpl;
 import com.huaxu.util.ByteArrayUtils;
 import com.huaxu.util.RedisUtil;
 import org.bouncycastle.crypto.engines.AESLightEngine;
@@ -23,6 +24,8 @@ public class SecSupplyService {
     @Autowired
     private DeviceParmService deviceParmService;
     @Autowired
+    private MonitorDataReportServiceImpl monitorDataReportServiceImpl;
+    @Autowired
     private RedisUtil redisUtil;
     @Autowired
     private  DayReportService dayReportService;
@@ -78,7 +81,16 @@ public class SecSupplyService {
             multipleData = new BigDecimal("10000");
         }
         AmountTotalDto amountTotalDto = new AmountTotalDto();
-        List<SceneEntity> sceneEntities = sceneService.selectByTypeName(sceneEntity);
+        BigDecimal  instantFlow = monitorDataReportServiceImpl.getAmountCount(null,null,sceneEntity.getSceneTypeName(),14,1);
+        BigDecimal  dayAmount = monitorDataReportServiceImpl.getAmountCount(null,null,sceneEntity.getSceneTypeName(),3,1);
+        BigDecimal  monthAmount = monitorDataReportServiceImpl.getAmountCount(null,null,sceneEntity.getSceneTypeName(),3,2);
+        BigDecimal  yearAmount = monitorDataReportServiceImpl.getAmountCount(null,null,sceneEntity.getSceneTypeName(),3,3);
+        amountTotalDto.setInstantFlow(instantFlow.setScale(3,BigDecimal.ROUND_HALF_UP).doubleValue());
+        amountTotalDto.setDayAmount(dayAmount.divide(multipleData,3,BigDecimal.ROUND_HALF_UP).doubleValue());
+        amountTotalDto.setMonthAmount(monthAmount.divide(multipleData,3,BigDecimal.ROUND_HALF_UP).doubleValue());
+        amountTotalDto.setYearAmount(yearAmount.divide(multipleData,3,BigDecimal.ROUND_HALF_UP).doubleValue());
+
+        /*List<SceneEntity> sceneEntities = sceneService.selectByTypeName(sceneEntity);
         if (sceneEntities.size() == 0)
             return null;
         Calendar begin = Calendar.getInstance();// 得到一个Calendar的实例
@@ -179,6 +191,7 @@ public class SecSupplyService {
             yearAmount = monthAmount;
         }
         amountTotalDto.setYearAmount(BigDecimal.valueOf(yearAmount).divide(multipleData,3,BigDecimal.ROUND_HALF_UP).doubleValue());
+       */
         return amountTotalDto;
     }