From efac00aebd0e447f7d3d6933d735e753e5e8fbac Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 11 十月 2022 09:12:52 +0800
Subject: [PATCH] 均一性

---
 src/main/java/com/whyc/service/FileParamService.java |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/whyc/service/FileParamService.java b/src/main/java/com/whyc/service/FileParamService.java
index 3e5fd10..f7c08ed 100644
--- a/src/main/java/com/whyc/service/FileParamService.java
+++ b/src/main/java/com/whyc/service/FileParamService.java
@@ -7,8 +7,11 @@
 import com.whyc.dto.*;
 import com.whyc.mapper.BattGroupDataMapper;
 import com.whyc.mapper.FileParamMapper;
+import com.whyc.pojo.BattgroupData;
+import com.whyc.pojo.BattgroupInfo;
 import com.whyc.pojo.FileInfo;
 import com.whyc.pojo.FileParam;
+import com.whyc.util.MathUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -127,6 +130,32 @@
     public Response getDataByCondition(Date testTime1, Date testTime2, int battVol,int pageCurr,int pageSize) {
         PageHelper.startPage(pageCurr,pageSize);
         List<FileParam> list=mapper.getDataByCondition(testTime1,testTime2,battVol);
+        if(list!=null&&list.size()>0){
+            for (FileParam fparam:list) {
+                List<BattgroupInfo> binfInfoList=fparam.getBattInfoList();
+                if(binfInfoList!=null&&binfInfoList.size()>0){
+                    for (BattgroupInfo binfo:binfInfoList) {
+                        List<BattgroupData> binfDataList=binfo.getBattDataList();
+                        List listBv=new ArrayList();
+                        List listBr=new ArrayList();
+                        List listBs=new ArrayList();
+                        List listCr=new ArrayList();
+                        if(binfDataList!=null&&binfDataList.size()>0) {
+                            for (BattgroupData bData : binfDataList) {
+                                listBv.add(bData.getBv());
+                                listBr.add(bData.getBr());
+                                listBs.add(bData.getBs());
+                                listCr.add(bData.getCr());
+                            }
+                            binfo.setSdBasebv(MathUtil.getStandardDeviation(listBv));
+                            binfo.setSdBasebr(MathUtil.getStandardDeviation(listBr));
+                            binfo.setSdBasebs(MathUtil.getStandardDeviation(listBs));
+                            binfo.setSdBasecr(MathUtil.getStandardDeviation(listCr));
+                        }
+                    }
+                }
+            }
+        }
         PageInfo pageInfo=new PageInfo(list);
         return new Response().setII(1,list.size()>0,pageInfo,"绛涢�夋暟鎹簱淇℃伅");
     }

--
Gitblit v1.9.1