From d8475b8670b6b4cbcd1bc9e57d30a6f433d206ab Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期一, 23 六月 2025 23:33:54 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem
---
src/main/java/com/whyc/service/BatttestdataInfService.java | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index 759b222..b462679 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -113,7 +113,8 @@
wrapper.eq("battgroup_id", battgroupId);
wrapper.eq("test_type", 3);
wrapper.eq("test_starttype", 3);
- wrapper.last(" and test_timelong >= 7200 ORDER BY test_starttime DESC ");
+ wrapper.eq("data_available", 1);//涓�娆℃湁鏁堢殑璁板綍
+ wrapper.last(" ORDER BY test_starttime DESC ");
wrapper.last("limit 1");
BatttestdataInf tinf = mapper.selectOne(wrapper);
tinf.setTestStoptypeReason(StopReasonEnum.getValue(tinf.getTestStoptype()));
@@ -132,8 +133,9 @@
if(testEndTime!=null){
wrapper.lt("test_starttime",testEndTime);
}
- wrapper.last(" and test_timelong >= 7200 ORDER BY test_starttime DESC ");
- wrapper.last("limit 1");
+ wrapper.eq("data_available", 1);//涓�娆℃湁鏁堢殑璁板綍
+ wrapper.last(" ORDER BY test_starttime DESC ");
+ wrapper.last(" limit 1 ");
BatttestdataInf tinf = mapper.selectOne(wrapper);
return tinf;
}
@@ -276,7 +278,6 @@
if(param.getParamNamePsx().equals("batt_mon_damage_val")){
damageValue=param.getParamValue();
}
-
}
}
//1鏌ヨ绗﹀悎鏉′欢鐨勭數姹犵粍
@@ -581,13 +582,12 @@
dto.setMoncapstd(binf.getMoncapstd());
dto.setMonCount(binf.getMoncount());
dto.setMonvolstd(binf.getMonvolstd());
+ dto.setFloatchartVol(tinf.getFloatGroupVol());
if(battRtstate!=null){
Float restTime= BattCapFactory.getTheoryTime(battRtstate.getLoadCurr(), realCap, binf.getMoncapstd());
dto.setRestTime(restTime);
- dto.setFloatchartVol(battRtstate.getGroupVol());
}else{
dto.setRestTime(0f);
- dto.setFloatchartVol(0f);
}
//鎵捐繖娆℃斁鐢电殑鎸囧畾涓�绗旀暟鎹�
List<BatttestdataId> idDataList=battTestdataIdService.getLastDataByBattgroupId(tinf.getBattgroupId(),tinf.getTestRecordCount(),1);
@@ -941,16 +941,18 @@
//浼樿壇鐢垫簮鏁伴噺缁熻(1.2.7)
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){
@@ -994,4 +996,20 @@
public int getHrDisCount(Integer userId, Date startTime, Date endTime) {
return mapper.getHrDisCount(userId, startTime, endTime);
}
+ //鑾峰彇杩欎竴娆＄殑鏀剧數淇℃伅
+ public BatttestdataInf getTinfByTestRecordCount(Integer battgroupId, Integer testRecordCount) {
+ QueryWrapper wrapper=new QueryWrapper();
+ wrapper.eq("battgroup_id",battgroupId);
+ wrapper.eq("test_record_count",testRecordCount);
+ wrapper.last(" limit 1");
+ return mapper.selectOne(wrapper);
+ }
+ //鍘嗗彶娴嬭瘯鏁版嵁瀵煎嚭
+ public BatttestdataInf exportTinfDataByTestRecordCount(Integer battgroupId, Integer testRecordCount) {
+ QueryWrapper wrapper =new QueryWrapper();
+ wrapper.eq("battgroup_id",battgroupId);
+ wrapper.eq("test_record_count",testRecordCount);
+ wrapper.last(" limit 1");
+ return mapper.selectOne(wrapper);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1