From 73fa5efb84f35bfa1c31aa2e11d5723f21bbb2e2 Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期五, 14 一月 2022 16:14:57 +0800
Subject: [PATCH] 接口更新
---
src/main/java/com/whyc/service/BatttestdataInfService.java | 94 +++++++++++++++++++++++-----------------------
1 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index 6636a57..228e680 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -143,53 +143,53 @@
return list1;
}
- public Response searchBattLifeNow(int pageNum,int pageSize,Battinf binf){
- PageHelper.startPage(pageNum,pageSize);
- List<BattState> list = mapper.searchBattLifeNow(binf);
- PageInfo<BattState> pageInfo = new PageInfo<>(list);
- return new Response().set(1,pageInfo,"鏌ヨ鎴愬姛");
- }
-
- public Response searchBattLife(int pageNum,int pageSize,Battinf binf){
- PageHelper.startPage(pageNum,pageSize);
- List<ReportBattTestDTO> list = mapper.searchBattLife(binf);
- float param = 0;//瀹归噺鏈夋晥鍙傛暟
- double STDAH = 0;//鏍囧瓨瀹归噺
- BattParamLow capLow=new BattParamLow();
- capLow.setLowType(BattCapFactory.CapType_type);;
- capLow.setLowNametype(BattCapFactory.CapType_name);
- capLow.setLowMethod(BattCapFactory.CapType_method);
- List<BattParamLow> listC = battParamLowMapper.serchByLow(capLow);
- if (listC!=null && listC.size()>0){
- param = listC.get(listC.size()-1).getLowValue();
- }
- int flag=0;//璇ユ鏀剧數鏄惁鏈夋晥鍒ゆ柇
- List<ReportBattTestDTO> listE=new ArrayList();//瀛樻斁鏀剧數鏈夋晥鐨勬祴璇�
- if (list!=null &&list.size()>0){
- for(int i=0;i<list.size();i++){
- STDAH=list.get(i).getBinf().getMonCapStd();
- float testCap=list.get(i).getTdata().getTestCap();//姝ゆ鏀剧數閲忕粺璁�
- //System.out.println(list.get(i).getTdata().getBattGroupId()+" "+list.get(i).getTdata().getTest_record_count()+" "+testCap+" "+param+" "+STDAH);
- flag=BattCapFactory.Judge(testCap, param, STDAH);
- if(flag==1){
- if(listE.size()>0){
- int tdata_battgroupid=list.get(i).getTdata().getBattGroupId();
- int e_battgroupid=listE.get(listE.size()-1).getTdata().getBattGroupId();
- if(tdata_battgroupid!=e_battgroupid){
- listE.add(list.get(i));
- }else{
- continue;
- }
- }else{
- listE.add(list.get(i));
- }
- flag=0;
- }
- }
- }
- PageInfo<ReportBattTestDTO> pageInfo = new PageInfo<>(list);
- return new Response().set(1,pageInfo,"鏌ヨ鎴愬姛");
- }
+ //public Response searchBattLifeNow(int pageNum,int pageSize,Battinf binf){
+ // PageHelper.startPage(pageNum,pageSize);
+ // List<BattState> list = mapper.searchBattLifeNow(binf);
+ // PageInfo<BattState> pageInfo = new PageInfo<>(list);
+ // return new Response().set(1,pageInfo,"鏌ヨ鎴愬姛");
+ //}
+ //
+ //public Response searchBattLife(int pageNum,int pageSize,Battinf binf){
+ // PageHelper.startPage(pageNum,pageSize);
+ // List<ReportBattTestDTO> list = mapper.searchBattLife(binf);
+ // float param = 0;//瀹归噺鏈夋晥鍙傛暟
+ // double STDAH = 0;//鏍囧瓨瀹归噺
+ // BattParamLow capLow=new BattParamLow();
+ // capLow.setLowType(BattCapFactory.CapType_type);;
+ // capLow.setLowNametype(BattCapFactory.CapType_name);
+ // capLow.setLowMethod(BattCapFactory.CapType_method);
+ // List<BattParamLow> listC = battParamLowMapper.serchByLow(capLow);
+ // if (listC!=null && listC.size()>0){
+ // param = listC.get(listC.size()-1).getLowValue();
+ // }
+ // int flag=0;//璇ユ鏀剧數鏄惁鏈夋晥鍒ゆ柇
+ // List<ReportBattTestDTO> listE=new ArrayList();//瀛樻斁鏀剧數鏈夋晥鐨勬祴璇�
+ // if (list!=null &&list.size()>0){
+ // for(int i=0;i<list.size();i++){
+ // STDAH=list.get(i).getBinf().getMonCapStd();
+ // float testCap=list.get(i).getTdata().getTestCap();//姝ゆ鏀剧數閲忕粺璁�
+ // //System.out.println(list.get(i).getTdata().getBattGroupId()+" "+list.get(i).getTdata().getTest_record_count()+" "+testCap+" "+param+" "+STDAH);
+ // flag=BattCapFactory.Judge(testCap, param, STDAH);
+ // if(flag==1){
+ // if(listE.size()>0){
+ // int tdata_battgroupid=list.get(i).getTdata().getBattGroupId();
+ // int e_battgroupid=listE.get(listE.size()-1).getTdata().getBattGroupId();
+ // if(tdata_battgroupid!=e_battgroupid){
+ // listE.add(list.get(i));
+ // }else{
+ // continue;
+ // }
+ // }else{
+ // listE.add(list.get(i));
+ // }
+ // flag=0;
+ // }
+ // }
+ // }
+ // PageInfo<ReportBattTestDTO> pageInfo = new PageInfo<>(list);
+ // return new Response().set(1,pageInfo,"鏌ヨ鎴愬姛");
+ //}
}
--
Gitblit v1.9.1