From c75e43d3b4df36570c01f62cedc0483b0cefc7e5 Mon Sep 17 00:00:00 2001
From: whyclxw <http://whyclxw@118.89.139.230:10101/r/~whyclxw/IdeaTest.git>
Date: 星期六, 25 十二月 2021 11:03:49 +0800
Subject: [PATCH] 在线监测-历史监控-最后一次核容放电数据
---
src/main/java/com/whyc/service/BatttestdataInfService.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index f96b96a..77dfd07 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -5,11 +5,14 @@
import com.github.pagehelper.PageInfo;
import com.whyc.dto.BattTestData;
import com.whyc.dto.Response;
+import com.whyc.mapper.BattTestDataStopMapper;
import com.whyc.mapper.BatttestdataInfMapper;
+import com.whyc.pojo.BattTestDataStop;
import com.whyc.pojo.BatttestdataInf;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
@Service
@@ -17,6 +20,9 @@
@Resource
private BatttestdataInfMapper mapper;
+
+ @Resource
+ private BattTestDataStopMapper stopMapper;
//鍦ㄧ嚎鐩戞祴-鍘嗗彶鐩戞帶-鑾峰彇鍏呮斁鐢佃褰�
public Response searchBattTestInfDataById(int battGroupId) {
@@ -64,6 +70,11 @@
wrapper.eq("test_starttype",3);
wrapper.orderByDesc("test_starttime");
BatttestdataInf tinf=mapper.selectOne(wrapper);
+ List<BattTestDataStop> list=new ArrayList<BattTestDataStop>();
+ if(tinf!=null){
+ list=stopMapper.getTestDataStop(tinf.getBattGroupId(),tinf.getTestStarttime());
+ tinf.setBatttestdataList(list);
+ }
return new Response().set(1,tinf);
}
}
--
Gitblit v1.9.1