From 10574a67b78e2578fc10e8fbe83965bf4832c36a Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 12 六月 2025 17:06:40 +0800
Subject: [PATCH] 优良电源数量统计(1.2.7)
---
src/main/java/com/whyc/service/BatttestdataInfService.java | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index 1cf2ea5..19b4222 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -17,6 +17,7 @@
import com.whyc.pojo.db_ram_db.BattRtdata;
import com.whyc.pojo.db_ram_db.BattRtstate;
import com.whyc.pojo.db_station.BattInf;
+import com.whyc.pojo.db_station.PowerInf;
import com.whyc.pojo.db_user.Baojigroup;
import com.whyc.util.ActionUtil;
import com.whyc.util.PageInfoUtils;
@@ -49,8 +50,11 @@
@Autowired(required = false)
private BaojigroupService bjService;
+ @Autowired(required = false)
+ private PowerInfService powerInfService;
-
+ @Autowired(required = false)
+ private PwrdevHistorydataIdService pwrHisdataIdService;
//鑾峰彇鏈�鍚庝竴娆℃祴璇曟暟鎹苟璁＄畻鍓╀綑瀹归噺
@@ -875,24 +879,35 @@
}
//浼樿壇鐢垫簮鏁伴噺缁熻(1.2.7)
public Response getPwr7Statistic(Pwr7Stic stic) {
- //鑾峰彇鏍稿浼樺姡锛屾崯鍧忓弬鏁�
- List<AppParam> paramList=appParamService.getHrParam();
- Float badValue=0f;
- Float damageValue=0f;
- if(paramList!=null){
- for (AppParam param:paramList) {
- if(param.getParamNamePsx().equals("batt_mon_deteriorate_val")){
- badValue=param.getParamValue();
+ //1鏌ヨ绗﹀悎鏉′欢鐨勭數姹犵粍
+ List<PowerInf> pinfList=powerInfService.getPwr7Statistic(stic);
+ if(pinfList==null||pinfList.size()==0){
+ return new Response().set(1,false,"褰撳墠鐢ㄦ埛鏈鐞嗘弧瓒虫潯浠剁殑鐢垫睜缁�");
+ }
+ List<SticPwr7Res> reslist=new ArrayList<>();
+ for (PowerInf pinf:pinfList) {
+ SticPwr7Res res=new SticPwr7Res();
+ //鏌ヨ鐢垫睜缁勬墍鍦ㄧ殑鐝粍
+ String groupName = bjService.getGroupName(pinf.getPowerId());
+ if(groupName.equals("none")){
+ continue;
+ }else{
+ if(stic.getGroupName()==null||res.getGroupName()==stic.getGroupName()){
+ res.setProvice(pinf.getProvice());
+ res.setCity(pinf.getCity());
+ res.setCountry(pinf.getCountry());
+ res.setStationName(pinf.getStationName());
+ res.setPowerName(pinf.getPowerName());
+ res.setCompany(pinf.getCompany());
+ res.setStationType(pinf.getStationType());
+ res.setGroupName(groupName);
+ res.setInuseTime(pinf.getPowerInuseTime());
+ Map<String,Integer> map=pwrHisdataIdService.getPwrQuarter7(pinf.getPowerId(),null);
+ reslist.add(res);
}
- if(param.getParamNamePsx().equals("batt_mon_damage_val")){
- damageValue=param.getParamValue();
- }
-
}
}
- //1鏌ヨ绗﹀悎鏉′欢鐨勭數姹犵粍
- List<BattInf> binfList=battInfService.getPwr7Statistic(stic);
- List<PerformanceRes> reslist=new ArrayList<>();
+
PageInfo pageInfo=PageInfoUtils.list2PageInfo(reslist, stic.getPageNum(), stic.getPageSize());
return new Response().setII(1,reslist.size()>0,pageInfo,"浼樿壇鐢垫簮鏁伴噺缁熻(1.2.7)");
}
--
Gitblit v1.9.1