From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/App_bts_comm_task.java | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
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 0ef987f..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;
@@ -16,7 +17,7 @@
private int battgroup_index3;
private int battgroup_id4;
private int battgroup_index4;
- private Date connect_time;
+ private Date connet_time;
private Date dev_comm_runtime;
private int break_type;//break_type 锛�0锛屾垚鍔熻繛鎺ワ紱1锛屾壘涓嶅埌瀵瑰簲dev_id锛�2锛岄�氫俊寮傚父鏂紑
private String stationName;
@@ -98,11 +99,11 @@
public void setBattgroup_index4(int battgroup_index4) {
this.battgroup_index4 = battgroup_index4;
}
- public Date getConnect_time() {
- return connect_time;
+ public Date getConnet_time() {
+ return connet_time;
}
- public void setConnect_time(Date connect_time) {
- this.connect_time = connect_time;
+ public void setConnet_time(Date connet_time) {
+ this.connet_time = connet_time;
}
public Date getDev_comm_runtime() {
return dev_comm_runtime;
@@ -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=" + connect_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