From dab2ba08883998703cdf52e28fa55dfbd006ce6a Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 06 十一月 2018 11:13:41 +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 |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

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 c1e16eb..34228ba 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
@@ -25,8 +25,12 @@
 		// TODO Auto-generated method stub
 		return false;
 	}
+	//缁檊prs鍙戦�佹寚浠�
 	public boolean update(Object obj) {
-		return false;
+		Bts_gprs_state gprs=(Bts_gprs_state) obj;
+		String sql=" update db_ram_db.tb_bts_gprs_state set AT_cmd=? where dev_id=? ";
+		boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{gprs.getAT_cmd(),gprs.getDev_id()});
+		return bl;
 	}
 
 	public boolean del(Object obj) {
@@ -73,22 +77,25 @@
 		return list;
 	}
 	//绯荤粺鍙傛暟鍛戒护鎿嶄綔璁惧鏃剁殑cmd鍜宎ck鏍¢獙	
-	public boolean sendCmdToFBS9100Dev(int cmd,int dev_id)
+	public Bts_gprs_state sendCmdToFBS9100Dev(int cmd,int dev_id)
 	{ 
 		int m_cmd = cmd;
 		int m_cmd_ack = cmd;
+		Bts_gprs_state gprs=new Bts_gprs_state();
+		gprs.setOp_cmd(0);
 		switch(m_cmd) {
 			case FBS9100_ComBase.CMD_ReadGPRSCSQ: m_cmd_ack = FBS9100_ComBase.CMD_ReadGPRSCSQAck; break;
-			default: return false;
+			default: return gprs;
 		}
-		boolean res_exe = false;
+		//boolean res_exe = false;
+		String ack_inf="";
 		String sql = "UPDATE db_ram_db.tb_bts_gprs_state  SET "
 						+ " op_cmd=? " 
 						+ " WHERE dev_id=? ";
 		Boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{m_cmd,dev_id});
 		if(true == bl)
 		{
-			sql = "SELECT op_cmd FROM db_ram_db.tb_bts_gprs_state "+
+			sql = "SELECT op_cmd,ack_inf FROM db_ram_db.tb_bts_gprs_state "+
 						" WHERE dev_id="+dev_id;
 			Connection conn=DBUtil.getConn();
 			PreparedStatement ps = null;
@@ -101,8 +108,10 @@
 						if(rs.next())
 						{
 							if(rs.getInt("op_cmd") == m_cmd_ack)
-							{
-								res_exe = true;
+							{  
+								gprs.setAck_inf(rs.getString("ack_inf"));
+								gprs.setOp_cmd(m_cmd_ack);
+								//res_exe = true;
 								break;
 							}
 						}
@@ -120,7 +129,7 @@
 			}
 			DBUtil.close(rs, ps, conn);
 		}
-		return res_exe;
+		return gprs;
 	}
 	public List serchByInfo(Object obj) {
 		// TODO Auto-generated method stub

--
Gitblit v1.9.1