From 27cd10e78f10f93c900aacc57e677580dbf6d0ca Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 19 六月 2025 15:30:27 +0800
Subject: [PATCH] 3.1电池/电源告警参数,1.2.7优良电源统计
---
src/main/resources/mapper/PowerInfMapper.xml | 4 +---
src/main/java/com/whyc/service/PwrdevHistorydataIdService.java | 30 ++++++++++++++++++++++++++----
src/main/resources/mapper/BattInfMapper.xml | 4 +---
src/main/java/com/whyc/service/AppParamService.java | 11 +++++++++++
4 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/whyc/service/AppParamService.java b/src/main/java/com/whyc/service/AppParamService.java
index d1afd9e..71b289a 100644
--- a/src/main/java/com/whyc/service/AppParamService.java
+++ b/src/main/java/com/whyc/service/AppParamService.java
@@ -43,4 +43,15 @@
}
return new Response().set(1,true,"璁剧疆鏉冮噸(1.2.16)");
}
+ //鑾峰彇apps涓紭鑹數婧愬垽鏂弬鏁�
+ public List<AppParam> getPwrPerformenceParam() {
+ QueryWrapper wrapper=new QueryWrapper();
+ List<String> params=new ArrayList<>();
+ params.add("power_excellent_val");
+ params.add("power_commonly_val");
+ params.add("power_warning_val");
+ wrapper.in("param_name_psx",params);
+ wrapper.orderByAsc("id");
+ return mapper.selectList(wrapper);
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java b/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
index c0a04ff..c7a72a1 100644
--- a/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
+++ b/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
@@ -10,6 +10,7 @@
import com.whyc.mapper.CommonMapper;
import com.whyc.pojo.db_data_history.BattRealdataId;
import com.whyc.pojo.db_data_history.PwrdevHistorydataId;
+import com.whyc.pojo.db_param.AppParam;
import com.whyc.pojo.db_param.ApptimeParam;
import com.whyc.pojo.db_param.PowerPropertyParam;
import com.whyc.pojo.db_station.PowerInf;
@@ -34,6 +35,9 @@
@Autowired
private PowerInfService powerInfService;
+
+ @Autowired
+ private AppParamService appParamService;
@Autowired
private ApptimeParamService apptimeParamService;
@@ -87,10 +91,6 @@
//1.2.7浼樿壇鐢垫簮缁熻涓婁竴瀛ｅ害鐨勭數婧愭煇涓�灞炴�у拰鍙傛暟闃堝�艰秴杩囩殑娆℃暟
public Integer getPwrQuarter7(Integer powerId,Integer powerType) {
Map<String,Integer> map=new HashMap<>();
- map.put("acin1_vola",0);
- map.put("acout_curra",0);
- map.put("dcoutVol",0);
- map.put("dcoutCurr",0);
//鑾峰彇浼樿壇鐢垫簮鎬ц兘缁熻鍦ㄥ钩鍙颁笂鐨勬椂闂村弬鏁拌缃〃
ApptimeParam apptimeParam=apptimeParamService.getPwrPerformanceStrartTime(powerId);
//鑾峰彇鎸囧畾鏃堕棿鍒板綋鍓嶆椂闂翠竴鍏卞灏戞湀鐨勯泦鍚�
@@ -101,6 +101,7 @@
for (PowerPropertyParam param : paramList) {
paramValues.put(param.getPropertyName()+"_upper", param.getBasisVal()*param.getAlarmLimithUpper());
paramValues.put(param.getPropertyName()+"_lower", param.getBasisVal()*param.getAlarmLimithLowper());
+ map.put(param.getPropertyName(), 0);
}
for (int i=0;i<datelist.size();i++) {
String date=datelist.get(i);
@@ -135,6 +136,27 @@
}
}
}
+
+ return 1;
+ }
+ //鍒ゆ柇浼樿壇鐢垫簮鎬ц兘
+ private Integer judgePwrPerformence(Map<String,Integer> map){
+ //鑾峰彇apps涓紭鑹數婧愬垽鏂弬鏁�
+ List<AppParam> appParamList=appParamService.getPwrPerformenceParam();
+ Float excellentVal=0f;
+ Float commonlyVal=0f;
+ Float warningVal=0f;
+ for (AppParam appParam : appParamList) {
+ if(appParam.getParamNamePsx().equals("power_excellent_val")){
+ excellentVal=appParam.getParamValue();
+ }
+ if(appParam.getParamNamePsx().equals("power_commonly_val")){
+ commonlyVal=appParam.getParamValue();
+ }
+ if(appParam.getParamNamePsx().equals("power_warning_val")){
+ warningVal=appParam.getParamValue();
+ }
+ }
return 1;
}
}
\ No newline at end of file
diff --git a/src/main/resources/mapper/BattInfMapper.xml b/src/main/resources/mapper/BattInfMapper.xml
index f9e749c..2242c18 100644
--- a/src/main/resources/mapper/BattInfMapper.xml
+++ b/src/main/resources/mapper/BattInfMapper.xml
@@ -472,9 +472,7 @@
from db_station.tb_batt_inf,db_station.tb_station_inf
<where>
tb_batt_inf.station_id=tb_station_inf.station_id
- <if test="battgroupId!=null">
- and tb_batt_inf.battgroup_id=#{battgroupId}
- </if>
+ and tb_batt_inf.battgroup_id=#{battgroupId}
</where>
limit 1
</select>
diff --git a/src/main/resources/mapper/PowerInfMapper.xml b/src/main/resources/mapper/PowerInfMapper.xml
index 1937714..a11d19f 100644
--- a/src/main/resources/mapper/PowerInfMapper.xml
+++ b/src/main/resources/mapper/PowerInfMapper.xml
@@ -178,9 +178,7 @@
from db_station.tb_power_inf,db_station.tb_station_inf
<where>
tb_power_inf.station_id=tb_station_inf.station_id
- <if test="powerId!=null">
- and tb_power_inf.power_id=#{powerId}
- </if>
+ and tb_power_inf.power_id=#{powerId}
</where>
limit 1
</select>
--
Gitblit v1.9.1