From ff1ed10ebcb27f4039fb121486261c0b24208baf Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 22 七月 2024 10:43:25 +0800
Subject: [PATCH] 蓄电池单体容量
---
src/main/java/com/whyc/service/BattTestInfService.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattTestInfService.java b/src/main/java/com/whyc/service/BattTestInfService.java
index 290849e..05e0c31 100644
--- a/src/main/java/com/whyc/service/BattTestInfService.java
+++ b/src/main/java/com/whyc/service/BattTestInfService.java
@@ -11,13 +11,12 @@
import com.whyc.mapper.BattAlarmMapper;
import com.whyc.mapper.BattInfMapper;
import com.whyc.mapper.BattTestInfMapper;
-import com.whyc.pojo.AlarmParam;
-import com.whyc.pojo.BattAlarm;
-import com.whyc.pojo.BattInf;
-import com.whyc.pojo.BattTestInf;
+import com.whyc.pojo.*;
+import com.whyc.util.ActionUtil;
import com.whyc.util.PageInfoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.*;
@@ -34,6 +33,10 @@
@Autowired(required = false)
private BattAlarmMapper alarmMapper;
+
+ @Autowired(required = false)
+ private SubTableService subTableService;
+
//鏌ヨ鍏呮斁鐢佃褰�
public Response getTinfHis(int binfId, int pageNum, int pageSize) {
@@ -278,5 +281,31 @@
return map;
}
+ //鐢垫睜鍗曚綋鎬ц兘璇勪及
+ public Response searchMonNumAssess( int binfId, int monNum) {
+ //鑾峰彇鎸囧畾鐢垫睜缁勪俊鎭�
+ QueryWrapper wrapper=Wrappers.query();
+ wrapper.eq("binf_id",binfId);
+ wrapper.last("limit 1");
+ BattInf binf=binfMapper.selectOne(wrapper);
+ Map<String, Object> map = new HashMap<>();
+ //鑾峰彇鏈夋晥鐨勬斁鐢佃褰�
+ List<BattTestInf> list=mapper.searchDischarge(binfId);
+ float cap = 0f;//瀹為檯瀹归噺
+ //鍙栨渶杩戜竴绗旀暟鎹�
+ BattTestInf tinf=list.stream().findFirst().orElse((BattTestInf) ActionUtil.objeNull);
+ if(tinf!=null){
+ int hourRate = BattCapFactory.GetHourRate(binf.getMonCap(), tinf.getTestCurr());
+ //鍙栬鍗曚綋鏈�鍚庝竴绗旀斁鐢佃褰�
+ BattTestInfData tData=subTableService.getMonNumData(binfId,tinf.getTestRecordCount(),tinf.getRecordNum(),monNum);
+ if(tData!=null){
+ cap = (float) BattCapFactory.GetMonomerCap(binf.getMonCap(), hourRate, tinf.getTestCap(), tinf.getMaxMonvol(), tData.getMonVol(), binf.getMonVol(), BattCapFactory.CapType_Real);
+
+ }
+ }
+ map.put("cap",cap);
+ //璇勪及鍗曚綋
+ return new Response().set(1, map, "鏌ヨ鎴愬姛");
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1