From 5752f03cf3236b9d7dc12dff1f88f188c80b727b Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 27 六月 2025 17:10:13 +0800
Subject: [PATCH] 拦截放行退出登录，实时数据统计曲线-交流单元修改
---
src/main/java/com/whyc/service/SubTablePageInfoService.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index 4087681..47ba6f3 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -700,19 +700,24 @@
return list;
}
//鏌ヨ鐢垫簮瀛楁鐨勫紓鍔ㄧ殑璁板綍
- public List<Integer> getChangesRecordNum(String tableName, Date recordDatetime, Date recordDatetime1, String value, float upperLimit, float lowerLimit) {
+ public List<Object> getChangesRecordNum(String tableName, Date recordDatetime, Date recordDatetime1, String value, float upperLimit, float lowerLimit) {
String sql=" select distinct record_datetime,record_num "+
" from "+tableName+" where record_datetime>='"+ActionUtil.sdf.format(recordDatetime)+"'" +
" and record_datetime<='"+ActionUtil.sdf.format(recordDatetime1)+"'" +
" and "+value+">"+upperLimit+" or "+value+"<"+lowerLimit+" ";
sql+=" order by record_num asc";
- List<Integer> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
+ List<Object> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
@Override
public List getResults(ResultSet rs) throws SQLException {
- List<Integer> list=new ArrayList<>();
+ List list=new ArrayList<>();
+ List numList=new ArrayList<>();
+ List timeList=new ArrayList<>();
while (rs.next()){
- list.add(rs.getInt("record_num"));
+ numList.add(rs.getInt("record_num"));
+ timeList.add(rs.getString("record_datetime"));
}
+ list.add(numList);
+ list.add(timeList);
return list;
}
});
--
Gitblit v1.9.1