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 |    6 ++++--
 1 files changed, 4 insertions(+), 2 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 7077c59..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;
@@ -22,9 +23,10 @@
 		Bts_gprs_state gprs=(Bts_gprs_state) obj;
 		boolean b=dao.update(gprs);
 		if(b){
-			boolean bl=((Bts_gprs_stateImpl)dao).sendCmdToFBS9100Dev(gprs.getNum(), gprs.getDev_id());
-			if(bl){
+			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);

--
Gitblit v1.9.1