From 351bbd8738c89c0302465360c1ca0c92abd18eba Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期五, 07 二月 2025 13:34:35 +0800
Subject: [PATCH] 新增统计月份,季度,年度统计开锁次数

---
 ElectLock_Monitor/src/com/dev/lock/data/ElectLock_Array.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_Array.java b/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_Array.java
index efbef88..f3275bd 100644
--- a/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_Array.java
+++ b/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_Array.java
@@ -2,9 +2,12 @@
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.time.Year;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
+import com.dev.lock.comm.Lock_Task_SQL;
 import com.sql.MysqlConnPool;
 import com.sql.Sql_Mysql;
 
@@ -27,6 +30,8 @@
 		ResultSet res = null;
 		boolean isChange = false;
 		try {
+			int nowYear = Year.now().getValue();
+			
 			res = sql.sqlMysqlQuery(sql_str);
 			while(res.next()) {
 				int lock_id = res.getInt("lock_id");
@@ -37,6 +42,9 @@
 				String lock_address = res.getString("lock_address");	//'閿佸湴鍧�',
 				String lock_path = res.getString("lock_path");			//'鍥剧墖璺緞',
 				String lock_ip = res.getString("lock_ip").trim();		//'鐢靛瓙閿両P鍦板潃[鍐呯綉鍙�氳繃IP鍦板潃璇嗗埆璁惧]',
+				
+				Date lastUpdateTime = res.getTimestamp("last_update_time");
+				int open_count = res.getInt("lock_open_count");
 				
 				boolean isexist = false;
 				for(int k = 0 ;k<mInfs.size();k++) {
@@ -53,7 +61,7 @@
 				if(isexist) {
 					continue;
 				} else {
-					ElectLock_Inf tmp_lock = new ElectLock_Inf();
+					ElectLock_Inf tmp_lock = new ElectLock_Inf(pool);
 					tmp_lock.setLock_id(lock_id);
 					tmp_lock.setArea_id(area_id);				//'鍖哄煙id',
 					tmp_lock.setLock_name(lock_name);			//'閿佸悕绉�',
@@ -62,6 +70,13 @@
 					tmp_lock.setLock_address(lock_address);		//'閿佸湴鍧�',
 					tmp_lock.setLock_path(lock_path);			//'鍥剧墖璺緞',
 					tmp_lock.setLock_ip(lock_ip);;				//'鐢靛瓙閿両P鍦板潃[鍐呯綉鍙�氳繃IP鍦板潃璇嗗埆璁惧]',
+					
+					tmp_lock.setLast_update_time(lastUpdateTime);	//涓婁竴娆¢攣鍏风姸鎬佹洿鏂版椂闂�
+					tmp_lock.setLock_open_count(open_count);		//閿佸叿寮�鍚鏁�
+					
+					Lock_Task_SQL.queryLock_Rt_TableByLockId(pool, lock_id, tmp_lock.lockState);
+					Lock_Task_SQL.queryLock_Report_TableByLockId(pool, lock_id, tmp_lock.lockReport, nowYear);
+					
 					mInfs.add(tmp_lock);
 				}
 				

--
Gitblit v1.9.1