From f09c0c68d2ccaa3f79d80c163f2bb5d807eda85e Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 20 六月 2025 14:29:39 +0800
Subject: [PATCH] 一次完整周期的核容测试和未满足标准核容
---
src/main/java/com/whyc/service/BatttestdataInfService.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index 89f956e..5ebae1c 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;
}
@@ -939,18 +941,20 @@
return new Response().setII(1,reslist.size()>0,pageInfo,"鐢垫睜缁勭數姹犳�ц兘缁熻锛堟湭鏀剧數锛屼紭绉�锛屽姡鍖栵紝鎹熷潖锛夌粺璁�(1.2.8/9/10)");
}
//浼樿壇鐢垫簮鏁伴噺缁熻(1.2.7)
- public Response getPwr7Statistic(Pwr7Stic stic) {
+ 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){
--
Gitblit v1.9.1