From 512733908ae4f3a851f40f0551724d2186ce56ec Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期四, 13 十二月 2018 11:20:11 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/ram/Bts_gprs_stateAction.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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 49359b6..09f6120 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
@@ -15,13 +15,13 @@
private String json;
private String result;
- //淇敼绯荤粺鍙傛暟
- public String updateGprs() {
+ //鑾峰彇gprs淇″彿
+ public String update() {
Bts_gprs_state gprs = getGson().fromJson(json, Bts_gprs_state.class);
ServiceModel model = service.update(gprs);
{ String msg="";
if(gprs.getNum()==FBS9100_ComBase.CMD_ReadGPRSCSQ){
- msg="鑾峰彇"+gprs.getDev_id()+"鐨勮澶囩郴缁熷弬鏁�";
+ msg="鑾峰彇"+gprs.getDev_id()+"鐨勮澶噂prs淇″彿";
}
User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
@@ -29,7 +29,21 @@
result = tojson(model);
return SUCCESS;
}
- //鏍规嵁璁惧id璇诲彇鐨勮澶囪繛鎺ョ殑gprs妯″潡鐨勪俊鍙峰��
+ //鑾峰彇璁惧杩涚▼淇℃伅
+ public String update_bts_task_inf() {
+ Bts_gprs_state gprs = getGson().fromJson(json, Bts_gprs_state.class);
+ ServiceModel model = service.update_bts_task_inf(gprs);
+ { String msg="";
+ if(gprs.getNum()==FBS9100_ComBase.CMD_READGPRS_BTS_TASK_INF){
+ msg="鑾峰彇"+gprs.getDev_id()+"鐨勮澶囪繘绋嬩俊鎭�";
+ }
+ User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
+ uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+ }
+ result = tojson(model);
+ return SUCCESS;
+ }
+ //鏍规嵁璁惧id璇诲彇鐨勮澶囪繛鎺ョ殑gprs妯″潡鐨勪俊鍙峰��/璁惧杩涚▼淇℃伅
public String serchByCondition(){
Bts_gprs_state gprs = getGson().fromJson(json, Bts_gprs_state.class);
ServiceModel model = service.serchByCondition(gprs);
--
Gitblit v1.9.1