From 294468d95066c1f8a4af74b1dbdd44b45564d288 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 05 十一月 2018 17:32:01 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/ram/Bts_gprs_stateImpl.java | 6 +++---
gx_tieta/src/com/fgkj/actions/ram/Bts_gprs_stateAction.java | 6 +++---
gx_tieta/src/com/fgkj/dto/ram/Bts_gprs_state.java | 29 +++++++++++++++--------------
gx_tieta/src/com/fgkj/services/ram/Bts_gprs_stateService.java | 6 +++---
4 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Bts_gprs_stateAction.java b/gx_tieta/src/com/fgkj/actions/ram/Bts_gprs_stateAction.java
index cd3b042..e921a55 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Bts_gprs_stateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Bts_gprs_stateAction.java
@@ -16,9 +16,9 @@
private String result;
//淇敼绯荤粺鍙傛暟
- public String update() {
+ public String updateGprs() {
Bts_gprs_state gprs = getGson().fromJson(json, Bts_gprs_state.class);
- ServiceModel model = service.update(gprs);
+ ServiceModel model = service.updateGprs(gprs);
{ String msg="";
if(gprs.getNum()==FBS9100_ComBase.CMD_ReadGPRSCSQ){
msg="鑾峰彇"+gprs.getDev_id()+"鐨勮澶囩郴缁熷弬鏁�";
@@ -29,7 +29,7 @@
result = tojson(model);
return SUCCESS;
}
- //鏍规嵁璁惧id鏌ヨ绯荤粺鍙傛暟(涓�瀹氭槸琚鐞嗙殑)
+ //鏍规嵁璁惧id璇诲彇鐨勮澶囪繛鎺ョ殑gprs妯″潡鐨勪俊鍙峰��
public String serchByCondition(){
Bts_gprs_state gprs = getGson().fromJson(json, Bts_gprs_state.class);
ServiceModel model = service.serchByCondition(gprs);
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_gprs_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_gprs_stateImpl.java
index 76ba829..c1e16eb 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_gprs_stateImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_gprs_stateImpl.java
@@ -41,7 +41,7 @@
//鏍规嵁璁惧id璇诲彇鐨勮澶囪繛鎺ョ殑gprs妯″潡鐨勪俊鍙峰��
public List serchByCondition(Object obj) {
Bts_gprs_state gprs=(Bts_gprs_state) obj;
- String sql=" select distinct db_ram_db.tb_bts_gprs_state.num,dev_id,op_cmd,record_datetime,scq_val" +
+ String sql=" select distinct db_ram_db.tb_bts_gprs_state.num,dev_id,op_cmd,AT_cmd,ack_inf" +
" ,stationName,FBSDeviceName " +
" from db_ram_db.tb_bts_gprs_state,db_battinf.tb_battinf " +
" where db_ram_db.tb_bts_gprs_state.dev_id=db_battinf.tb_battinf.FBSDeviceId " +
@@ -57,8 +57,8 @@
g.setNum(rs.getInt("num"));
g.setDev_id(rs.getInt("dev_id"));
g.setOp_cmd(rs.getInt("op_cmd"));
- g.setRecord_datetime(rs.getTimestamp("record_datetime"));
- g.setScq_val(rs.getString("scq_val"));
+ g.setAT_cmd(rs.getString("aT_cmd"));
+ g.setAck_inf(rs.getString("ack_inf"));
g.setStationName(rs.getString("stationName"));
g.setFBSDeviceName(rs.getString("fBSDeviceName"));
list.add(g);
diff --git a/gx_tieta/src/com/fgkj/dto/ram/Bts_gprs_state.java b/gx_tieta/src/com/fgkj/dto/ram/Bts_gprs_state.java
index 193283a..4ef3af6 100644
--- a/gx_tieta/src/com/fgkj/dto/ram/Bts_gprs_state.java
+++ b/gx_tieta/src/com/fgkj/dto/ram/Bts_gprs_state.java
@@ -7,8 +7,8 @@
private int num;
private int dev_id;
private int op_cmd;
- private Date record_datetime;
- private String scq_val;
+ private String AT_cmd;
+ private String ack_inf;
private String note;
private String stationName;
private String FBSDeviceName;
@@ -30,17 +30,18 @@
public void setOp_cmd(int op_cmd) {
this.op_cmd = op_cmd;
}
- public Date getRecord_datetime() {
- return record_datetime;
+
+ public String getAT_cmd() {
+ return AT_cmd;
}
- public void setRecord_datetime(Date record_datetime) {
- this.record_datetime = record_datetime;
+ public void setAT_cmd(String aT_cmd) {
+ AT_cmd = aT_cmd;
}
- public String getScq_val() {
- return scq_val;
+ public String getAck_inf() {
+ return ack_inf;
}
- public void setScq_val(String scq_val) {
- this.scq_val = scq_val;
+ public void setAck_inf(String ack_inf) {
+ this.ack_inf = ack_inf;
}
public String getNote() {
return note;
@@ -63,11 +64,11 @@
@Override
public String toString() {
return "Bts_gprs_state [num=" + num + ", dev_id=" + dev_id
- + ", op_cmd=" + op_cmd + ", record_datetime=" + record_datetime
- + ", scq_val=" + scq_val + ", note=" + note + ", stationName="
- + stationName + ", FBSDeviceName=" + FBSDeviceName + "]";
+ + ", op_cmd=" + op_cmd + ", AT_cmd=" + AT_cmd + ", ack_inf="
+ + ack_inf + ", note=" + note + ", stationName=" + stationName
+ + ", FBSDeviceName=" + FBSDeviceName + "]";
}
-
+
}
diff --git a/gx_tieta/src/com/fgkj/services/ram/Bts_gprs_stateService.java b/gx_tieta/src/com/fgkj/services/ram/Bts_gprs_stateService.java
index fe544eb..9d916fa 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Bts_gprs_stateService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Bts_gprs_stateService.java
@@ -17,8 +17,8 @@
dao=BaseDAOFactory.getBaseDAO(BaseDAO.BTS_GPRS_STATE);
model=new ServiceModel();
}
- //淇敼绯荤粺鍙傛暟
- public ServiceModel update(Object obj) {
+ //鑾峰彇gprs淇″彿
+ public ServiceModel updateGprs(Object obj) {
Bts_gprs_state gprs=(Bts_gprs_state) obj;
boolean bl=((Bts_gprs_stateImpl)dao).sendCmdToFBS9100Dev(gprs.getNum(), gprs.getDev_id());
if(bl){
@@ -31,7 +31,7 @@
return model;
}
- //鏍规嵁璁惧id鏌ヨ绯荤粺鍙傛暟(涓�瀹氭槸琚鐞嗙殑)
+ //鏍规嵁璁惧id璇诲彇鐨勮澶囪繛鎺ョ殑gprs妯″潡鐨勪俊鍙峰��
public ServiceModel serchByCondition(Object obj){
List list = dao.serchByCondition(obj);
if(list!=null && list.size()>0){
--
Gitblit v1.9.1