From 7b8758054b52e369710e8625d893eec8293ab166 Mon Sep 17 00:00:00 2001
From: he wei <858544502@qq.com>
Date: 星期四, 01 十二月 2022 10:40:58 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/ResMeterManager
---
src/main/java/com/whyc/service/FileParamService.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/service/FileParamService.java b/src/main/java/com/whyc/service/FileParamService.java
index bb2ed06..ab175b9 100644
--- a/src/main/java/com/whyc/service/FileParamService.java
+++ b/src/main/java/com/whyc/service/FileParamService.java
@@ -152,14 +152,16 @@
List<Integer> list=mapper.getMonVolStd();
return new Response().setII(1,list.size()>0,list,"杩斿洖鎵�鏈夌殑鏍囩О鐢靛帇绫诲瀷");
}
- //鎸夌収绛涢�夋潯浠舵煡璇㈡暟鎹簱淇℃伅
- public Response getDataByCondition(Date testTime1, Date testTime2, String battVol,int pageCurr,int pageSize) {
+ //鎸夌収绛涢�夋潯浠舵煡璇㈡暟鎹簱淇℃伅(鍐呴樆璇勪环锛氬唴闃昏秺澶ц秺宸�)锛岀劧鍚庡啀鏍规嵁鍐呴樆鎵嬪姩鍒嗛〉
+ public Response getDataByCondition(Date testTime1, Date testTime2, String battVol,int pageCurr,int pageSize,int flag) {
PageHelper.startPage(pageCurr,pageSize);
List<FileParam> list=mapper.getDataByCondition(testTime1,testTime2,Float.valueOf(battVol));
+ List flagList=new ArrayList();//瀛樻斁璇勪环缁撴灉
QueryWrapper testParamWrapper=new QueryWrapper();
testParamWrapper.eq("enabled",1);
TestParam testParam=testParamMapper.selectOne(testParamWrapper);
float std=0f;
+ int resFlag=0;//鏁寸粍鍐呴樆鏍囪瘑锛�1宸紝2鑹紝3浼�
if(list!=null&&list.size()>0){
for (FileParam fparam:list) {
List<BattgroupInfo> binfInfoList=fparam.getBattInfoList();
@@ -167,7 +169,7 @@
if(binfInfoList!=null&&binfInfoList.size()>0){
for (BattgroupInfo binfo:binfInfoList) {
List<BattgroupData> binfDataList=binfo.getBattDataList();
- float minStd=9999999.0f;
+ float maxStd=0f;
List listBv=new ArrayList();
List listBr=new ArrayList();
List listBs=new ArrayList();
@@ -178,22 +180,30 @@
listBr.add(Float.valueOf(bData.getBr()));
listBs.add(Float.valueOf(bData.getBs()));
listCr.add(Float.valueOf(bData.getCr()));
- if( Float.parseFloat(bData.getBr())<=minStd){
- minStd= Float.parseFloat(bData.getBr());
+ if( Float.parseFloat(bData.getBr())>=maxStd){
+ maxStd= Float.parseFloat(bData.getBr());
}
}
binfo.setSdBasebv(MathUtil.getStandardDeviation(listBv));
binfo.setSdBasebr(MathUtil.getStandardDeviation(listBr));
binfo.setSdBasebs(MathUtil.getStandardDeviation(listBs));
binfo.setSdBasecr(MathUtil.getStandardDeviation(listCr));
- binfo.setBrJudge(MathUtil.getJudge(minStd,std,testParam));
+ resFlag=MathUtil.getflag(maxStd,std,testParam);
+ binfo.setBrJudge(MathUtil.getJudge(resFlag));
}
+ }
+ }
+ if(flag==0){//涓�0鏄叏閮�
+ flagList.add(fparam);
+ }else{
+ if(flag==resFlag){
+ flagList.add(fparam);
}
}
}
}
- PageInfo pageInfo=new PageInfo(list);
- return new Response().setII(1,list.size()>0,pageInfo,"绛涢�夋暟鎹簱淇℃伅");
+ PageInfo pageInfo=new PageInfo(flagList);
+ return new Response().setII(1,flagList.size()>0,pageInfo,"绛涢�夋暟鎹簱淇℃伅");
}
public FileParam getByFileId(String fileId) {
--
Gitblit v1.9.1