From 4e4ec01a74b48ef4b9060868b8f9d82312cf4b77 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期一, 22 三月 2021 17:30:33 +0800
Subject: [PATCH] 更新 部分电池数据统计接口

---
 src/main/java/com/whyc/service/BatteryDataService.java |   75 ++++++++++++++++++++++++++++++++++---
 1 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/whyc/service/BatteryDataService.java b/src/main/java/com/whyc/service/BatteryDataService.java
index af8f182..89570ae 100644
--- a/src/main/java/com/whyc/service/BatteryDataService.java
+++ b/src/main/java/com/whyc/service/BatteryDataService.java
@@ -1,8 +1,11 @@
 package com.whyc.service;
 
+import com.whyc.dto.BatteryInfo;
 import com.whyc.dto.DataAnalysisFloatDTO;
 import com.whyc.dto.Response;
 import com.whyc.mapper.BatteryDataMapper;
+import com.whyc.mapper.BatteryResDataMapper;
+import com.whyc.mapper.BatteryTestDataMapper;
 import com.whyc.pojo.BatteryEndurance;
 import com.whyc.pojo.BatteryRTState;
 import com.whyc.util.MathUtil;
@@ -16,6 +19,12 @@
 
     @Resource
     private BatteryDataMapper mapper;
+
+    @Resource
+    private BatteryResDataMapper resMapper;
+
+    @Resource
+    private BatteryTestDataMapper testDataMapper;
 
     public Response getEndurance(Integer userId) {
         List<BatteryEndurance> enduranceList = mapper.endurance(userId);
@@ -98,19 +107,71 @@
         return maps;
     }
 
-    public Response getMonVolAndTemp(Integer userId) {
-        List<DataAnalysisFloatDTO> dataList= mapper.getMonVolAndTemp(userId);
-        return new Response<>().set(1,dataList);
+    public Response getMonVol(Integer userId) {
+        HashMap<String, Object> resMap = new HashMap<>();
+        List<BatteryInfo> batteryInfos =  testDataMapper.getStationAndBatteryGroupIds(userId);
+        for (BatteryInfo temp:batteryInfos) {
+            //鏍规嵁BattGroupIds鏌ヨ鍒板搴旂殑鏁板��
+            String[] batteryGroupIds = temp.getBatteryGroupIds().split(",");
+            Integer[] ids = new Integer[batteryGroupIds.length];
+            for (int i = 0; i < batteryGroupIds.length; i++) {
+                ids[i] = Integer.parseInt(batteryGroupIds[i]);
+            }
+            DataAnalysisFloatDTO dataStatistics = testDataMapper.getStatisticsByBattGroupIds(ids,"mon_vol");
+            resMap.put(temp.getStationName(),dataStatistics);
+        }
+        return new Response<>().set(1,resMap);
+    }
+
+    public Response getMonTemp(Integer userId) {
+        HashMap<String, Object> resMap = new HashMap<>();
+        List<BatteryInfo> batteryInfos =  testDataMapper.getStationAndBatteryGroupIds(userId);
+        for (BatteryInfo temp:batteryInfos) {
+            //鏍规嵁BattGroupIds鏌ヨ鍒板搴旂殑鏁板��
+            String[] batteryGroupIds = temp.getBatteryGroupIds().split(",");
+            Integer[] ids = new Integer[batteryGroupIds.length];
+            for (int i = 0; i < batteryGroupIds.length; i++) {
+                ids[i] = Integer.parseInt(batteryGroupIds[i]);
+            }
+            DataAnalysisFloatDTO dataStatistics = testDataMapper.getStatisticsByBattGroupIds(ids,"mon_tmp");
+            resMap.put(temp.getStationName(),dataStatistics);
+        }
+        return new Response<>().set(1,resMap);
     }
 
     public Response getMonRes(Integer userId) {
-        DataAnalysisFloatDTO data= mapper.getMonRes(userId);
-        return new Response<>().set(1,data);
+        HashMap<String, Object> resMap = new HashMap<>();
+        List<BatteryInfo> batteryInfos =  resMapper.getResStationAndBatteryGroupIds(userId);
+        for (BatteryInfo temp:batteryInfos) {
+            //鏍规嵁BattGroupIds鏌ヨ鍒板搴旂殑鏁板��
+            String[] batteryGroupIds = temp.getBatteryGroupIds().split(",");
+            Integer[] ids = new Integer[batteryGroupIds.length];
+            for (int i = 0; i < batteryGroupIds.length; i++) {
+                ids[i] = Integer.parseInt(batteryGroupIds[i]);
+            }
+            DataAnalysisFloatDTO dataStatistics = resMapper.getResStatisticsByBattGroupIds(ids);
+            resMap.put(temp.getStationName(),dataStatistics);
+        }
+        return new Response<>().set(1,resMap);
     }
 
     public Response getMonCap(Integer userId) {
-        DataAnalysisFloatDTO data= mapper.getMonCap(userId);
-        return new Response<>().set(1,data);
+        HashMap<String, Object> resMap = new HashMap<>();
+        List<BatteryInfo> batteryInfos =  testDataMapper.getStationAndBatteryGroupIds(userId);
+        for (BatteryInfo temp:batteryInfos) {
+            String[] batteryGroupIds = temp.getBatteryGroupIds().split(",");
+            Integer[] ids = new Integer[batteryGroupIds.length];
+            for (int i = 0; i < batteryGroupIds.length; i++) {
+                ids[i] = Integer.parseInt(batteryGroupIds[i]);
+            }
+            //鏌ヨ鏍囧噯
+            List<BatteryInfo> batteryStdList = testDataMapper.getVolAndCapStd(ids);
+            //鏌ヨ鏈�鍊�
+            List<BatteryInfo> batteryStatisticList = testDataMapper.getCapStatisticsByBattGroupIds(ids);
+
+        }
+        return new Response<>().set(1,resMap);
+
     }
 
 

--
Gitblit v1.9.1