From f127214ad1076769c9cb4a97963ee3ad5053e970 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 18 三月 2025 10:15:47 +0800
Subject: [PATCH] 锂电设备A200相关代码更新
---
src/main/java/com/whyc/service/SubTablePageInfoService.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index 5c6b176..3cdfc2f 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -3,7 +3,7 @@
import com.whyc.dto.DevA200AlarmDto;
import com.whyc.mapper.CallBack;
import com.whyc.pojo.db_alarm.DevLithiumAlarmDataYear;
-import com.whyc.pojo.db_batt_testdata.BattTestDataId;
+import com.whyc.pojo.db_lithium_testdata.BattLithiumTestData;
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -19,16 +19,16 @@
@Autowired
private MybatisSqlExecuteService sqlExecuteService;
//鑾峰彇璁惧鏌愭璁板綍璇︾粏鐨勫崟浣撴斁鐢佃繃绋�
- public List<BattTestDataId> getTdataById(Integer devId, Integer testRecordCount) {
+ public List<BattLithiumTestData> getTdataById(Integer devId, Integer testRecordCount) {
String sql="select * from db_batt_testdata.tb_batttestdata_" +devId
+" where need_test=1 and test_record_count="+testRecordCount+" ";
sql+=" ORDER BY record_num asc ";
List list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
@Override
public List getResults(ResultSet rs) throws SQLException {
- List<BattTestDataId> list=new ArrayList<>();
+ List<BattLithiumTestData> list=new ArrayList<>();
while (rs.next()){
- BattTestDataId tdata=new BattTestDataId();
+ BattLithiumTestData tdata=new BattLithiumTestData();
tdata.setNum(rs.getInt("num"));
tdata.setDevId(rs.getInt("dev_id"));
tdata.setBattIdx(rs.getInt("batt_idx"));
@@ -59,7 +59,7 @@
}
//鑾峰彇璁惧鏌愭璁板綍璇︾粏鐨勫崟浣撴斁鐢佃繃绋�
- public List<BattTestDataId> getTdataByIdWithListA200(Integer devId, Integer testRecordCount) {
+ public List<BattLithiumTestData> getTdataByIdWithListA200(Integer devId, Integer testRecordCount) {
String sql="select * from db_batt_testdata.tb_batttestdata_" +devId
+" where need_test=1 and test_record_count="+testRecordCount+" ";
sql+=" ORDER BY record_num asc ";
@@ -69,7 +69,7 @@
List list=new ArrayList<>();
List<Float> monVols=null;
List<Integer> monNums=null;
- BattTestDataId tdata=null;
+ BattLithiumTestData tdata=null;
int num=0;
try {
while (rs.next()){
@@ -82,7 +82,7 @@
tdata.setMonNums(monNums);
list.add(tdata);
}
- tdata=new BattTestDataId();
+ tdata=new BattLithiumTestData();
monVols=new ArrayList<>();
monNums=new ArrayList<>();
tdata.setDevId(rs.getInt("dev_id"));
@@ -212,7 +212,7 @@
}
- public List<BattTestDataId> getTdataByIdWithListActm(Integer devId, Integer testRecordCount) {
+ public List<BattLithiumTestData> getTdataByIdWithListActm(Integer devId, Integer testRecordCount) {
String sql="select * from db_batt_testdata.tb_batttestdata_" +devId
+" where need_test=1 and test_record_count="+testRecordCount+" ";
sql+=" ORDER BY record_num asc ";
@@ -225,7 +225,7 @@
List<Float> monCaps=null;
List<Float> monWhs=null;
List<Integer> monNums=null;
- BattTestDataId tdata=null;
+ BattLithiumTestData tdata=null;
int num=0;
try {
while (rs.next()){
@@ -245,7 +245,7 @@
tdata.setMonWhs(monWhs);
list.add(tdata);
}
- tdata=new BattTestDataId();
+ tdata=new BattLithiumTestData();
monVols=new ArrayList<>();
monNums=new ArrayList<>();
monCurrs=new ArrayList<>();
--
Gitblit v1.9.1