From 99285fcc7d30e62f1e84e1c96d29d0ffcd9ccdbc Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期三, 14 十一月 2018 17:33:27 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/services/ram/Bts_gprs_stateService.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
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..9b7f11f 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
@@ -4,6 +4,7 @@
import com.fgkj.dao.BaseDAO;
import com.fgkj.dao.BaseDAOFactory;
+import com.fgkj.dao.FBS9100_ComBase;
import com.fgkj.dao.impl.ram.Bts_gprs_stateImpl;
import com.fgkj.dto.ServiceModel;
import com.fgkj.dto.ram.Bts_gprs_state;
@@ -17,21 +18,29 @@
dao=BaseDAOFactory.getBaseDAO(BaseDAO.BTS_GPRS_STATE);
model=new ServiceModel();
}
- //淇敼绯荤粺鍙傛暟
+ //鑾峰彇gprs淇″彿
public ServiceModel update(Object obj) {
Bts_gprs_state gprs=(Bts_gprs_state) obj;
- boolean bl=((Bts_gprs_stateImpl)dao).sendCmdToFBS9100Dev(gprs.getNum(), gprs.getDev_id());
- if(bl){
- model.setCode(1);
- model.setMsg("鑾峰彇GPRS淇″彿鎴愬姛!");
- }else{
- model.setCode(0);
+ boolean b=dao.update(gprs);
+ if(b){
+ Bts_gprs_state g=((Bts_gprs_stateImpl)dao).sendCmdToFBS9100Dev(gprs.getNum(), gprs.getDev_id());
+ if(g.getOp_cmd()==FBS9100_ComBase.CMD_ReadGPRSCSQAck){
+ model.setCode(1);
+ model.setData(g);
+ model.setMsg("鑾峰彇GPRS淇″彿鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("鑾峰彇GPRS淇″彿澶辫触,璇锋鏌ョ綉缁�!");
+ }
+ }else{
+ model.setCode(0);
model.setMsg("鑾峰彇GPRS淇″彿澶辫触,璇锋鏌ョ綉缁�!");
- }
+ }
+
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