From de8f3559c7e3bfe2153efded3b2885435aa93f0e Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 18 一月 2019 16:16:21 +0800
Subject: [PATCH] 修改设备连接和电池组连接
---
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl$1.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_battgroup.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_comm_task.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl$1.class | 0
gx_tieta/src/com/fgkj/dto/App_bts_comm_task.java | 29 ++++++++------
gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java | 3 +
gx_tieta/src/com/fgkj/dao/impl/App_bts_battgroupImpl.java | 5 ++
gx_tieta/src/com/fgkj/dto/App_bts_battgroup.java | 31 +++++++++++++--
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl.class | 0
10 files changed, 49 insertions(+), 19 deletions(-)
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl$1.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl$1.class
index 0a69d65..e2b07c4 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl$1.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl$1.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl.class
index 22bf55e..c058611 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl$1.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl$1.class
index a8db2b6..832a54a 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl$1.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl$1.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl.class
index eac3588..b642f5f 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_battgroup.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_battgroup.class
index 0e9dd0c..ca78fe5 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_battgroup.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_battgroup.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_comm_task.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_comm_task.class
index 108f3b7..9b62a11 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_comm_task.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_comm_task.class
Binary files differ
diff --git a/gx_tieta/src/com/fgkj/dao/impl/App_bts_battgroupImpl.java b/gx_tieta/src/com/fgkj/dao/impl/App_bts_battgroupImpl.java
index 412f992..124a76b 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/App_bts_battgroupImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/App_bts_battgroupImpl.java
@@ -54,7 +54,7 @@
Page page=binf.getPage();
Connection conn=DBUtil.getConn();
String numberSql=" SELECT FOUND_ROWS() number";
- String sql=" select SQL_CALC_FOUND_ROWS distinct dev_id,battgroup_id,battgroup_index,battgroup_mon_cnt " +
+ String sql=" select SQL_CALC_FOUND_ROWS distinct dev_id,battgroup_id,battgroup_index,battgroup_mon_cnt,battgroup_float_vol,battgroup_float_curr,battgroup_register_code " +
" ,stationName,stationName1,stationName2,stationName3,stationName5,StationId " +
" from db_app_sys.tb_app_bts_battgroup " +
" left outer join db_battinf.tb_battinf on db_app_sys.tb_app_bts_battgroup.dev_id=db_battinf.tb_battinf.fBSDeviceId " +
@@ -89,6 +89,9 @@
abattgroup.setBattgroup_id(rs.getInt("battgroup_id"));
abattgroup.setBattgroup_index(rs.getInt("battgroup_index"));
abattgroup.setBattgroup_mon_cnt(rs.getInt("battgroup_mon_cnt"));
+ abattgroup.setBattgroup_float_vol(rs.getFloat("battgroup_float_vol"));
+ abattgroup.setBattgroup_float_curr(rs.getFloat("battgroup_float_curr"));
+ abattgroup.setBattgroup_register_code(rs.getString("battgroup_register_code"));
abattgroup.setStationId(rs.getString("stationId"));
abattgroup.setStationName(rs.getString("stationName"));
abattgroup.setStationName1(rs.getString("stationName1"));
diff --git a/gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java b/gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java
index ef9d2fc..e9daa0e 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java
@@ -49,7 +49,7 @@
Page page=binf.getPage();
Connection conn=DBUtil.getConn();
String numberSql=" SELECT FOUND_ROWS() number";
- String sql=" select SQL_CALC_FOUND_ROWS distinct dev_id,thread_id,battgroup_cnt,battgroup_id1,battgroup_index1,battgroup_id2,battgroup_index2,battgroup_id3,battgroup_index3,battgroup_id4,battgroup_index4,connet_time,dev_comm_runtime,break_type " +
+ String sql=" select SQL_CALC_FOUND_ROWS distinct dev_id,thread_id,dev_mcu_uid,battgroup_cnt,battgroup_id1,battgroup_index1,battgroup_id2,battgroup_index2,battgroup_id3,battgroup_index3,battgroup_id4,battgroup_index4,connet_time,dev_comm_runtime,break_type " +
" ,stationName,stationName1,stationName2,stationName3,stationName5,StationId " +
" from db_app_sys.tb_app_bts_comm_task " +
" left outer join db_battinf.tb_battinf on db_app_sys.tb_app_bts_comm_task.dev_id=db_battinf.tb_battinf.fBSDeviceId " +
@@ -83,6 +83,7 @@
atask.setDev_id(rs.getInt("dev_id"));
atask.setThread_id(rs.getInt("thread_id"));
atask.setBattgroup_cnt(rs.getInt("battgroup_cnt"));
+ atask.setDev_mcu_uid(rs.getString("dev_mcu_uid"));
atask.setBattgroup_id1(rs.getInt("battgroup_id1"));
atask.setBattgroup_index1(rs.getInt("battgroup_index1"));
atask.setBattgroup_id2(rs.getInt("battgroup_id2"));
diff --git a/gx_tieta/src/com/fgkj/dto/App_bts_battgroup.java b/gx_tieta/src/com/fgkj/dto/App_bts_battgroup.java
index 2dd9220..cf60cd8 100644
--- a/gx_tieta/src/com/fgkj/dto/App_bts_battgroup.java
+++ b/gx_tieta/src/com/fgkj/dto/App_bts_battgroup.java
@@ -8,6 +8,9 @@
private int battgroup_id;
private int battgroup_index;
private int battgroup_mon_cnt;
+ private float battgroup_float_vol;
+ private float battgroup_float_curr;
+ private String battgroup_register_code;
private String stationName;
private String stationName1;
private String stationName2;
@@ -87,14 +90,34 @@
public void setNote(String note) {
this.note = note;
}
+ public float getBattgroup_float_vol() {
+ return battgroup_float_vol;
+ }
+ public void setBattgroup_float_vol(float battgroup_float_vol) {
+ this.battgroup_float_vol = battgroup_float_vol;
+ }
+ public float getBattgroup_float_curr() {
+ return battgroup_float_curr;
+ }
+ public void setBattgroup_float_curr(float battgroup_float_curr) {
+ this.battgroup_float_curr = battgroup_float_curr;
+ }
+ public String getBattgroup_register_code() {
+ return battgroup_register_code;
+ }
+ public void setBattgroup_register_code(String battgroup_register_code) {
+ this.battgroup_register_code = battgroup_register_code;
+ }
@Override
public String toString() {
return "App_bts_battgroup [num=" + num + ", dev_id=" + dev_id + ", battgroup_id=" + battgroup_id
- + ", battgroup_index=" + battgroup_index + ", battgroup_mon_cnt=" + battgroup_mon_cnt + ", stationName="
- + stationName + ", stationName1=" + stationName1 + ", stationName2=" + stationName2 + ", stationName3="
- + stationName3 + ", stationName5=" + stationName5 + ", stationId=" + stationId + ", note=" + note + "]";
+ + ", battgroup_index=" + battgroup_index + ", battgroup_mon_cnt=" + battgroup_mon_cnt
+ + ", battgroup_float_vol=" + battgroup_float_vol + ", battgroup_float_curr=" + battgroup_float_curr
+ + ", battgroup_register_code=" + battgroup_register_code + ", stationName=" + stationName
+ + ", stationName1=" + stationName1 + ", stationName2=" + stationName2 + ", stationName3=" + stationName3
+ + ", stationName5=" + stationName5 + ", stationId=" + stationId + ", note=" + note + "]";
}
-
+
}
diff --git a/gx_tieta/src/com/fgkj/dto/App_bts_comm_task.java b/gx_tieta/src/com/fgkj/dto/App_bts_comm_task.java
index 70d3385..0ddee33 100644
--- a/gx_tieta/src/com/fgkj/dto/App_bts_comm_task.java
+++ b/gx_tieta/src/com/fgkj/dto/App_bts_comm_task.java
@@ -7,6 +7,7 @@
private int num;
private int thread_id;
private int dev_id;
+ private String dev_mcu_uid;
private int battgroup_cnt;
private int battgroup_id1;
private int battgroup_index1;
@@ -158,24 +159,26 @@
public void setStationId(String stationId) {
this.stationId = stationId;
}
+ public String getDev_mcu_uid() {
+ return dev_mcu_uid;
+ }
+ public void setDev_mcu_uid(String dev_mcu_uid) {
+ this.dev_mcu_uid = dev_mcu_uid;
+ }
@Override
public String toString() {
- return "App_bts_comm_task [num=" + num + ", thread_id=" + thread_id
- + ", dev_id=" + dev_id + ", battgroup_cnt=" + battgroup_cnt
- + ", battgroup_id1=" + battgroup_id1 + ", battgroup_index1="
- + battgroup_index1 + ", battgroup_id2=" + battgroup_id2
- + ", battgroup_index2=" + battgroup_index2 + ", battgroup_id3="
- + battgroup_id3 + ", battgroup_index3=" + battgroup_index3
- + ", battgroup_id4=" + battgroup_id4 + ", battgroup_index4="
- + battgroup_index4 + ", connect_time=" + connet_time
- + ", dev_comm_runtime=" + dev_comm_runtime + ", break_type="
- + break_type + ", stationName=" + stationName
- + ", stationName1=" + stationName1 + ", stationName2="
- + stationName2 + ", stationName3=" + stationName3
- + ", stationName5=" + stationName5 + ", stationId=" + stationId
+ return "App_bts_comm_task [num=" + num + ", thread_id=" + thread_id + ", dev_id=" + dev_id + ", dev_mcu_uid="
+ + dev_mcu_uid + ", battgroup_cnt=" + battgroup_cnt + ", battgroup_id1=" + battgroup_id1
+ + ", battgroup_index1=" + battgroup_index1 + ", battgroup_id2=" + battgroup_id2 + ", battgroup_index2="
+ + battgroup_index2 + ", battgroup_id3=" + battgroup_id3 + ", battgroup_index3=" + battgroup_index3
+ + ", battgroup_id4=" + battgroup_id4 + ", battgroup_index4=" + battgroup_index4 + ", connet_time="
+ + connet_time + ", dev_comm_runtime=" + dev_comm_runtime + ", break_type=" + break_type
+ + ", stationName=" + stationName + ", stationName1=" + stationName1 + ", stationName2=" + stationName2
+ + ", stationName3=" + stationName3 + ", stationName5=" + stationName5 + ", stationId=" + stationId
+ ", note=" + note + "]";
}
+
}
--
Gitblit v1.9.1