From 2f967bc373b23a48ff986a965155361a70bd2eb0 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.112>
Date: 星期五, 04 一月 2019 15:40:25 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java | 64 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java
index 1b23589..809a553 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java
@@ -11,8 +11,12 @@
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.dto.User_log;
import com.fgkj.dto.ram.Fbs9100_battparam;
+import com.fgkj.dto.ram.Fbs9100_sysparam;
+import com.fgkj.services.User_logService;
import com.mysql.fabric.xmlrpc.base.Array;
public class Fbs9100_battparamImpl implements BaseDAO,CallBack{
@@ -36,7 +40,31 @@
,bparam.getBattTemp(),bparam.getFloatChargeVol(),bparam.getFloatChargeCurr(),bparam.getOnlineVolLow(),bparam.getGroupConnType()});
return bl;
}
-
+ //鎵归噺淇敼鐢垫睜鍙傛暟
+ public boolean updatePro(Object obj) {
+ List<Fbs9100_battparam> list=(List<Fbs9100_battparam>) 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_battparam fs=list.get(i);
+ String sql="replace into db_ram_db.tb_fbs9100_battparam(dev_id,dev_ip,STD_CAP,STD_RES,BattGroupCount,EachGroupBattCount"
+ + ",MonomerVol,GroupVol,BattTemp,FloatChargeVol,FloatChargeCurr,OnlineVolLow,GroupConnType) "
+ + " values("+fs.getDev_id()+",'"+fs.getDev_ip()+"',"+fs.getSTD_CAP()+","+fs.getSTD_RES()+","+fs.getBattGroupCount()+","+fs.getEachGroupBattCount()
+ +","+fs.getMonomerVol()+","+fs.getGroupVol()+","+fs.getBattTemp()+","+fs.getFloatChargeVol()+","+fs.getFloatChargeCurr()+","+fs.getOnlineVolLow()+","+fs.getGroupConnType()+")";
+ 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;
+ }
public boolean del(Object obj) {
// TODO Auto-generated method stub
return false;
@@ -145,6 +173,40 @@
}
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_GetBattParam: m_cmd_ack = FBS9100_ComBase.CMD_GetBattParamACK; break;
+ case FBS9100_ComBase.CMD_SetBattParam: m_cmd_ack = FBS9100_ComBase.CMD_SetBattParamACK; break;
+ default: return false;
+ }
+ String sql = "SELECT op_cmd FROM db_ram_db.tb_fbs9100_battparam "+
+ " 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;
+ }
+
public List serchByInfo(Object obj) {
// TODO Auto-generated method stub
return null;
--
Gitblit v1.9.1