From d6f196106c6ebc45c4a03264b56904549695eec5 Mon Sep 17 00:00:00 2001
From: chenjingjing <chenjingjing@192.168.10.3>
Date: 星期四, 27 十二月 2018 18:03:59 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java | 71 +++++++++++++++++++++++++++++++----
1 files changed, 63 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
index 641d630..93c686a 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
@@ -9,15 +9,19 @@
import sun.security.jca.GetInstance;
import com.fgkj.dao.BaseDAO;
+import com.fgkj.dao.BattinfGroupFactory;
import com.fgkj.dao.CallBack;
import com.fgkj.dao.DAOHelper;
import com.fgkj.dao.FBS9100_ComBase;
+import com.fgkj.dao.UinfDaoFactory;
import com.fgkj.db.DBUtil;
import com.fgkj.db.IDatabaseName;
import com.fgkj.dto.BattInf;
+import com.fgkj.dto.User_log;
import com.fgkj.dto.ram.FBS9100;
import com.fgkj.dto.ram.Fbs9100_setparam;
import com.fgkj.dto.ram.Fbs9100_state;
+import com.fgkj.services.User_logService;
public class Fbs9100_setparamImpl implements BaseDAO,CallBack{
@@ -80,14 +84,27 @@
}
//鎵归噺璁剧疆鏀剧數鍙傛暟
public boolean updatePro(Object obj) {
- Fbs9100_setparam fs=(Fbs9100_setparam) obj;
- String sql="update db_ram_db.tb_Fbs9100_setparam set testCmd=?,HourRate=?," +
- "DisCurr=?,DisCap=?,DisTime=?,groupVol_Low=?,monomerVol_Low=?,monomerLowCount=?,battGroupNum=?," +
- "onlineVolLowAction=?,dCVolHighLimit=?,chargeCurrSet=?,MonomerTmp_High=? where dev_id=?";
- Boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{
- fs.getTestCmd(),fs.getHourRate(),fs.getDisCurr(),fs.getDisCap(),fs.getDisTime(),
- fs.getGroupVol_Low(),fs.getMonomerVol_Low(),fs.getMonomerLowCount(),fs.getBattGroupNum(),fs.getOnlineLowAction(),
- fs.getDCVolHighLimit(),fs.getChargeCurrSet(),fs.getMonomerTmp_High(),fs.getDev_id()});
+ List<Fbs9100_setparam> list=(List<Fbs9100_setparam>) obj;
+ ArrayList sql_str=new ArrayList();
+ List<User_log> listU=new ArrayList<User_log>();//瀛樻斁user_log
+ if(list!=null&&list.size()>0){
+ for (int i = 0; i < list.size(); i++) {
+ Fbs9100_setparam fs=list.get(i);
+ String sql="update db_ram_db.tb_Fbs9100_setparam set op_cmd="+fs.getOp_cmd()+",testCmd="+fs.getTestCmd()+",HourRate="+fs.getHourRate()+"," +
+ "DisCurr="+fs.getDisCurr()+",DisCap="+fs.getDisCap()+",DisTime="+fs.getDisTime()+",groupVol_Low="+fs.getGroupVol_Low()+",monomerVol_Low="+fs.getMonomerVol_Low()+","
+ + "monomerLowCount="+fs.getMonomerLowCount()+",battGroupNum="+fs.getBattGroupNum()+"," +
+ "onlineVolLowAction="+fs.getOnlineLowAction()+",dCVolHighLimit="+fs.getDCVolHighLimit()+",chargeCurrSet="+fs.getChargeCurrSet()+",MonomerTmp_High="+fs.getMonomerTmp_High()+" where dev_id="+fs.getDev_id();
+ sql_str.add(sql);
+ {
+ String msg="淇敼"+fs.getDev_id()+"鏈烘埧鏀剧數鍙傛暟";
+ User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
+ listU.add(ulog);
+ }
+ }
+ }
+
+ Boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
+ (new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
return bl;
}
//淇敼鏀剧數鍙傛暟琛ㄤ腑ld6
@@ -305,6 +322,44 @@
}
return res_exe;
}
+ //鎵归噺璁剧疆鎴愬姛鍚庤鍙栧懡浠ょ殑ACK
+ public boolean getCmdAck(int cmd,int dev_id) {
+ int m_cmd = cmd;
+ int m_cmd_ack = cmd;
+ switch(m_cmd) {
+ case FBS9100_ComBase.CMD_Start: m_cmd_ack = FBS9100_ComBase.CMD_StartAck; break;
+ case FBS9100_ComBase.CMD_Stop: m_cmd_ack = FBS9100_ComBase.CMD_StopAck; break;
+ case FBS9100_ComBase.CMD_SetDischargeParm: m_cmd_ack = FBS9100_ComBase.CMD_SetDischargeParmAck; break;
+ case FBS9100_ComBase.CMD_GetDischargeParm: m_cmd_ack = FBS9100_ComBase.CMD_GetDischargeParmAck; break;
+ case FBS9100_ComBase.CMd_SetIp_Tem: m_cmd_ack = FBS9100_ComBase.CMd_SetIpAck; break;
+ case FBS9100_ComBase.CMd_SetIp_Per: m_cmd_ack = FBS9100_ComBase.CMd_SetIpAck; break;
+ case FBS9100_ComBase.CMD_ResetSystem: m_cmd_ack = FBS9100_ComBase.CMD_ResetSystemAck; break;
+ case FBS9100_ComBase.CMD_READGPRS_BTS_TASK_INF: m_cmd_ack = FBS9100_ComBase.CMD_READGPRS_BTS_TASK_INFACK; break;
+ default: return false;
+ }
+ String sql = "SELECT op_cmd FROM db_ram_db.tb_fbs9100_setparam "+
+ " WHERE dev_id="+dev_id;
+ Connection conn=DBUtil.getConn();
+ PreparedStatement ps = null;
+ ResultSet rs = null;
+ boolean res_exe=false;
+ try {
+ ps = conn.prepareStatement(sql);
+ rs=ps.executeQuery();
+ if(rs.next())
+ {
+ if(rs.getInt("op_cmd") == m_cmd_ack)
+ {
+ res_exe = true;
+ }
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ DBUtil.close(rs, ps, conn);
+ return res_exe;
+ }
//鏍规嵁dev_id鏌ヨ寮瑰嚭妗嗕腑鐨勬暟鎹�
public List serchbyDev_id(Object obj) {
Fbs9100_setparam fsparam=(Fbs9100_setparam) obj;
--
Gitblit v1.9.1