From fbd26bdd7e89693f86b71969a885779a9ab065a3 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 13 六月 2025 14:27:48 +0800
Subject: [PATCH] 1.2.8/9/10电池组优秀劣化损坏统计修改
---
src/main/java/com/whyc/service/BattRtdataService.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattRtdataService.java b/src/main/java/com/whyc/service/BattRtdataService.java
index 2a49c0c..6b60b31 100644
--- a/src/main/java/com/whyc/service/BattRtdataService.java
+++ b/src/main/java/com/whyc/service/BattRtdataService.java
@@ -1,7 +1,10 @@
package com.whyc.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.whyc.constant.BattAlarmIdEnum;
+import com.whyc.mapper.BattAlmparamMapper;
import com.whyc.mapper.BattRtdataMapper;
+import com.whyc.pojo.db_param.BattAlmparam;
import com.whyc.pojo.db_ram_db.BattRtdata;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -12,6 +15,9 @@
public class BattRtdataService {
@Autowired(required = false)
private BattRtdataMapper mapper;
+
+ @Autowired(required = false)
+ private BattAlmparamService almparamService;
//瀹炴椂鑾峰彇鍗曚綋淇℃伅
public List<BattRtdata> getRtdataRealInfo(Integer battgroupId) {
QueryWrapper wrapper=new QueryWrapper();
@@ -29,4 +35,43 @@
BattRtdata rtdata=mapper.selectOne(wrapper);
return rtdata;
}
+ //鏌ヨ褰撳墠鐢垫睜缁勫綋鍓嶅崟浣撶數鍘嬫垨鑰呭崟浣撳唴闃讳綆浜庡叾鍗曚綋鐢靛帇鐨勪笅涓嬮檺鎴栭珮浜庝笂涓婇檺鍒ゅ畾褰撳墠鐢垫睜缁勫姡鍖�
+ public int getVolAndRes(Integer battgroupId) {
+ int flag=0; //1鏄姡鍖栵紝0鏄甯�
+ float monVolUpper=0;
+ float monVolLower=0;
+ float monResUpper=0;
+ float monResLower=0;
+ //鑾峰彇鐢垫睜缁勭殑鍗曚綋鐢靛帇鍜屽崟浣撳唴闃诲憡璀﹂槇鍊�
+ List<BattAlmparam> list=almparamService.getAlmParamVolAndRes(battgroupId);
+ if(list!=null&&list.size()>0){
+ for(BattAlmparam param:list){
+ if(param.getAlmId()== BattAlarmIdEnum.ALARM_119005.getStateId()){
+ monVolUpper=param.getAlmLowCoe();
+ monVolLower=param.getAlmLowCoeLower();
+ }
+ if(param.getAlmId()== BattAlarmIdEnum.ALARM_119006.getStateId()){
+ monResUpper=param.getAlmLowCoe();
+ monResLower=param.getAlmLowCoeLower();
+ }
+ }
+ }
+ QueryWrapper wrapper=new QueryWrapper();
+ wrapper.eq("battgroup_id",battgroupId);
+ wrapper.orderByAsc("mon_num");
+ List<BattRtdata> dataList=mapper.selectList(wrapper);
+ if(dataList!=null&&dataList.size()>0){
+ for(BattRtdata data:dataList){
+ if(data.getMonVol()<monVolLower||data.getMonVol()>monVolUpper||data.getMonRes()<monResLower||data.getMonRes()>monResUpper){
+ flag=1;
+ break;
+ }else{
+ flag=0;
+ }
+ }
+ }else{
+ flag=1;
+ }
+ return flag;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1