From 64f046ed41c2ae607dc065c82b6d454f64e90584 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 19 六月 2025 21:52:33 +0800
Subject: [PATCH] 预警分析管理-电源告警
---
src/main/java/com/whyc/service/BatttestdataInfService.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index 219895b..1a81da5 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -939,18 +939,20 @@
return new Response().setII(1,reslist.size()>0,pageInfo,"鐢垫睜缁勭數姹犳�ц兘缁熻锛堟湭鏀剧數锛屼紭绉�锛屽姡鍖栵紝鎹熷潖锛夌粺璁�(1.2.8/9/10)");
}
//浼樿壇鐢垫簮鏁伴噺缁熻(1.2.7)
- public Response getPwr7Statistic(Pwr7Stic stic) {
+ public Response getPwr7Statistic(Pwr7Stic stic) throws NoSuchFieldException, IllegalAccessException {
Date inuseTimeStart =new Date();
- if(stic.getInuseYear()==1){
- //鎶曞叆浣跨敤鏃堕棿鏉′欢绛涢��
- LocalDateTime startTime = LocalDateTime.now().minusYears(5);
- inuseTimeStart = DateUtil.convertToDate(startTime);
- }else{
- //鎶曞叆浣跨敤鏃堕棿鏉′欢绛涢��
- LocalDateTime startTime = LocalDateTime.now().minusYears(stic.getInuseYear());
- inuseTimeStart = DateUtil.convertToDate(startTime);
+ if(stic.getInuseYear()!=null){
+ if(stic.getInuseYear()==1){
+ //鎶曞叆浣跨敤鏃堕棿鏉′欢绛涢��
+ LocalDateTime startTime = LocalDateTime.now().minusYears(5);
+ inuseTimeStart = DateUtil.convertToDate(startTime);
+ }else{
+ //鎶曞叆浣跨敤鏃堕棿鏉′欢绛涢��
+ LocalDateTime startTime = LocalDateTime.now().minusYears(stic.getInuseYear());
+ inuseTimeStart = DateUtil.convertToDate(startTime);
+ }
+ stic.setPwrInUseTime(inuseTimeStart);
}
- stic.setPwrInUseTime(inuseTimeStart);
//1鏌ヨ绗﹀悎鏉′欢鐨勭數姹犵粍
List<PowerInf> pinfList=powerInfService.getPwr7Statistic(stic);
if(pinfList==null||pinfList.size()==0){
@@ -973,7 +975,13 @@
res.setInuseTime(pinf.getPowerInuseTime());
Integer performance= pwrHisdataIdService.getPwrQuarter7(pinf.getPowerId(),pinf.getPowerType());
res.setPerformanceName(PwrCapperformanceEnum.getValue(performance));
- reslist.add(res);
+ if(stic.getPerformance()==null){
+ reslist.add(res);
+ }else{
+ if(performance==stic.getPerformance()){
+ reslist.add(res);
+ }
+ }
}
}
PageInfo pageInfo=PageInfoUtils.list2PageInfo(reslist, stic.getPageNum(), stic.getPageSize());
--
Gitblit v1.9.1