From ee0934f03c4af4967d1bfaf5dfbfcd28d5203d93 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期一, 28 八月 2023 16:41:47 +0800
Subject: [PATCH] 5种充放电类型统计过滤
---
src/main/java/com/whyc/service/BattTestDataInf2Service.java | 60 ++++++++----------------------------------------------------
1 files changed, 8 insertions(+), 52 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattTestDataInf2Service.java b/src/main/java/com/whyc/service/BattTestDataInf2Service.java
index 21f4cd8..4dca15b 100644
--- a/src/main/java/com/whyc/service/BattTestDataInf2Service.java
+++ b/src/main/java/com/whyc/service/BattTestDataInf2Service.java
@@ -55,6 +55,13 @@
/*鏂扮増鎺ュ彛涓嶅寘鍚唴闃绘暟鎹�
* */
public PageInfo<BatttestdataInf> calcTestData(BattTestDataDTO paramDto, Integer pageNum, Integer pageSize) {
+ //鑾峰彇鍏呮斁鐢垫椂闂磋繃婊ゅ弬鏁�
+ List<PageParam> pageParamList = pageParamService.getList2ByCategoryId(14);
+ int jcDischargeFilterTime = pageParamList.get(2).getStatus() * 60;
+ int jcChargeFilterTime = pageParamList.get(3).getStatus() * 60;
+ paramDto.setJcDischargeFilterTime(jcDischargeFilterTime);
+ paramDto.setJcChargeFilterTime(jcChargeFilterTime);
+
List<BatttestdataInf> calcDataList = new LinkedList<>();
//鏌ヨ鐢垫睜缁� 鐢垫睜淇℃伅鎴栬�呯數瀵间俊鎭�
PageHelper.startPage(pageNum, pageSize, true);
@@ -83,58 +90,7 @@
calcDataList.add(battTestDataInf);
});
- //鑾峰彇鍏呮斁鐢垫椂闂磋繃婊ゅ弬鏁�
- List<PageParam> pageParamList = pageParamService.getList2ByCategoryId(14);
- //杩囨护
- List<BatttestdataInf> finalDataList = calcDataList.stream().filter(data -> {
- Integer testType = data.getTestType();
- Integer testStarttype = data.getTestStarttype();
- Integer testDatatype = data.getTestDatatype();
- Integer testTimeLong = data.getTestTimelong();
- if (testType == 3) {
- // 娴嬭瘯绫诲瀷涓烘斁鐢�
- if (testStarttype == 3) {
- //鏍稿鏀剧數
- if (testTimeLong >= pageParamList.get(0).getStatus() * 60) {
- return true;
- } else {
- return false;
- }
- } else {
- if (testDatatype == 1) {
- //鍋滅數鏀剧數
- return true;
- } else {
- //鐩戞祴鏀剧數
- if (testTimeLong >= pageParamList.get(2).getStatus() * 60) {
- return true;
- } else {
- return false;
- }
- }
- }
- } else if (testType == 2) {
- // 娴嬭瘯绫诲瀷涓哄厖鐢�
- if (testStarttype == 3) {
- //鏍稿鍏呯數
- if (testTimeLong >= pageParamList.get(1).getStatus() * 60) {
- return true;
- } else {
- return false;
- }
- } else {
- //鐩戞祴鍏呯數
- if (testTimeLong >= pageParamList.get(3).getStatus() * 60) {
- return true;
- } else {
- return false;
- }
- }
- } else {
- return true;
- }
- }).collect(Collectors.toList());
- pageInfo.setList(finalDataList);
+ pageInfo.setList(calcDataList);
return pageInfo;
}
--
Gitblit v1.9.1