From f66c10e6a1837a6704f2296d1a7c740a53e88fb4 Mon Sep 17 00:00:00 2001
From: wenzheng.yang <981894274@qq.com>
Date: 星期一, 19 六月 2023 21:15:01 +0800
Subject: [PATCH] 修改了逻辑
---
bin/frame/Index1$3.class | 0
bin/baowen/Insertdatabase.class | 0
bin/data_model/Dell_lixian.class | 0
bin/frame/Index1$4.class | 0
bin/frame/Index1$5.class | 0
bin/frame/Index1$6.class | 0
systemFiles/log.txt | 6 ++++++
src/data_model/Jilu.java | 7 +++++++
bin/frame/Index1$1.class | 0
bin/frame/Index1.class | 0
src/frame/Index1.java | 3 ++-
bin/frame/Index1$7.class | 0
bin/data_model/Jilu.class | 0
bin/frame/Index1$2.class | 0
src/baowen/Insertdatabase.java | 17 +++++++++--------
src/data_model/Dell_lixian.java | 2 ++
16 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/bin/baowen/Insertdatabase.class b/bin/baowen/Insertdatabase.class
index 40327a9..220f09b 100644
--- a/bin/baowen/Insertdatabase.class
+++ b/bin/baowen/Insertdatabase.class
Binary files differ
diff --git a/bin/data_model/Dell_lixian.class b/bin/data_model/Dell_lixian.class
index e05ec4d..1bbef35 100644
--- a/bin/data_model/Dell_lixian.class
+++ b/bin/data_model/Dell_lixian.class
Binary files differ
diff --git a/bin/data_model/Jilu.class b/bin/data_model/Jilu.class
index b62c028..c4e640e 100644
--- a/bin/data_model/Jilu.class
+++ b/bin/data_model/Jilu.class
Binary files differ
diff --git a/bin/frame/Index1$1.class b/bin/frame/Index1$1.class
index da87f50..bde7b8a 100644
--- a/bin/frame/Index1$1.class
+++ b/bin/frame/Index1$1.class
Binary files differ
diff --git a/bin/frame/Index1$2.class b/bin/frame/Index1$2.class
index 5029d09..394da29 100644
--- a/bin/frame/Index1$2.class
+++ b/bin/frame/Index1$2.class
Binary files differ
diff --git a/bin/frame/Index1$3.class b/bin/frame/Index1$3.class
index 59b9830..169b65b 100644
--- a/bin/frame/Index1$3.class
+++ b/bin/frame/Index1$3.class
Binary files differ
diff --git a/bin/frame/Index1$4.class b/bin/frame/Index1$4.class
index 6a90946..3cd6e94 100644
--- a/bin/frame/Index1$4.class
+++ b/bin/frame/Index1$4.class
Binary files differ
diff --git a/bin/frame/Index1$5.class b/bin/frame/Index1$5.class
index 9fc97f5..bad9782 100644
--- a/bin/frame/Index1$5.class
+++ b/bin/frame/Index1$5.class
Binary files differ
diff --git a/bin/frame/Index1$6.class b/bin/frame/Index1$6.class
index cc8d4b2..7c8c78e 100644
--- a/bin/frame/Index1$6.class
+++ b/bin/frame/Index1$6.class
Binary files differ
diff --git a/bin/frame/Index1$7.class b/bin/frame/Index1$7.class
index 51d0839..a3087f9 100644
--- a/bin/frame/Index1$7.class
+++ b/bin/frame/Index1$7.class
Binary files differ
diff --git a/bin/frame/Index1.class b/bin/frame/Index1.class
index 43686ef..6e01dbc 100644
--- a/bin/frame/Index1.class
+++ b/bin/frame/Index1.class
Binary files differ
diff --git a/src/baowen/Insertdatabase.java b/src/baowen/Insertdatabase.java
index c604621..2d9ad78 100644
--- a/src/baowen/Insertdatabase.java
+++ b/src/baowen/Insertdatabase.java
@@ -36,14 +36,15 @@
for(int i=0;i<size;i++) {
tb_shebei shebei=tagvc.get(i);
String time=shebei.getGengxintime();
- String state=shebei.getState();
- int time0=Dell_system.getLixiantime();
- boolean aa=Shi_jian_cha_sss.shijiancha(time,time0);//如果标签更新时间大于离线时间大于timetagoff秒
+ String state=shebei.getState();
if(state.equals("1")) {
- if(aa) {
+ int p=Dell_system.getLixiantime();
+ int b= Shi_jian_cha_sss.get_time_cha_s(GetNowTime.now(),time);
+ //当前时间和之前时间差大于某个数值p
+ if(b>p) {
String tagid=shebei.getTagid();
String name=shebei.getName();
- insertdatabase(tagid,name);
+ insertdatabase(tagid,name,"离线时长:"+p);
shebei.setState("0");
}
}
@@ -52,10 +53,10 @@
/**插入数据进入数据库*/
- public static void insertdatabase(String tagid,String name) {
+ public static void insertdatabase(String tagid,String name,String alltime) {
String addtime=GetNowTime.now();
- String[] ziduan= {"tagid","name","addtime"};
- String[] zhi= {tagid,name,addtime};
+ String[] ziduan= {"tagid","name","addtime","alltime"};
+ String[] zhi= {tagid,name,addtime,alltime};
DatabaseManagement.insertfast("jilu", ziduan, zhi);
}
}
diff --git a/src/data_model/Dell_lixian.java b/src/data_model/Dell_lixian.java
index 6773f4e..4c2a0c3 100644
--- a/src/data_model/Dell_lixian.java
+++ b/src/data_model/Dell_lixian.java
@@ -17,10 +17,12 @@
String tagid=(String) info.get(1);
String name=(String) info.get(2);
String addtime=(String) info.get(3);
+ String alltime=(String) info.get(4);
data.setId(id);
data.setTagid(tagid);
data.setName(name);
data.setAddtime(addtime);
+ data.setAlltime(alltime);
jiluvc.add(data);
}
return jiluvc;
diff --git a/src/data_model/Jilu.java b/src/data_model/Jilu.java
index d555162..0deea85 100644
--- a/src/data_model/Jilu.java
+++ b/src/data_model/Jilu.java
@@ -5,6 +5,7 @@
String tagid;
String name;
String addtime;
+ String alltime;
public String getId() {
return id;
}
@@ -29,4 +30,10 @@
public void setAddtime(String addtime) {
this.addtime = addtime;
}
+ public String getAlltime() {
+ return alltime;
+ }
+ public void setAlltime(String alltime) {
+ this.alltime = alltime;
+ }
}
diff --git a/src/frame/Index1.java b/src/frame/Index1.java
index c86f1f1..d9c4866 100644
--- a/src/frame/Index1.java
+++ b/src/frame/Index1.java
@@ -262,6 +262,7 @@
row.add(a2.getTagid());
row.add(a2.getName());
row.add(a2.getAddtime());
+ row.add(a2.getAlltime());
tableModel2.addRow(row);
}
}
@@ -316,7 +317,7 @@
public JTable getTable2() {//
if(table2==null) {
- String[] columnNames= {"序号","离线","名称","离线添加时间"};//表格列名
+ String[] columnNames= {"序号","离线","名称","离线添加时间","离线时长/s"};//表格列名
//添加表格列向量
Vector<String> columnName=new Vector<>();
for(int i=0;i<columnNames.length;i++){
diff --git a/systemFiles/log.txt b/systemFiles/log.txt
index 8826535..f9d4c89 100644
--- a/systemFiles/log.txt
+++ b/systemFiles/log.txt
@@ -868,3 +868,9 @@
2023-06-18 16:19:30软件打开
2023-06-18 16:22:43软件打开
2023-06-18 16:23:11软件关闭
+2023-06-19 20:36:38软件打开
+2023-06-19 20:36:44软件关闭
+2023-06-19 20:44:47软件打开
+2023-06-19 20:45:01软件关闭
+2023-06-19 20:45:37软件打开
+2023-06-19 20:45:59软件关闭
--
Gitblit v1.9.3