From 330af18d13ef884407a5e1b40e5fac4e52306c32 Mon Sep 17 00:00:00 2001 From: 81041 <81041@DESKTOP-025NVD9> Date: 星期三, 02 一月 2019 10:21:44 +0800 Subject: [PATCH] 修改 --- gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 3 + gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.java | 62 +++++++++++++++++++++++++++++++ gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java | 2 3 files changed, 66 insertions(+), 1 deletions(-) diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java index f976d3b..5fb53e3 100644 --- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java +++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java @@ -90,6 +90,9 @@ } maxb++; sql_str.add(sql); + String baoji_sql="REPLACE into db_user.tb_user_battgroup_baojigroup_battgroup(baoji_group_id,StationId,BattGroupId) " + + " SELECT baoji_group_id,'"+binf.getStationId()+"',"+binf.getBattGroupId()+" from db_user.tb_user_battgroup_baojigroup_usr where uid="+((User_inf)ActionUtil.getUser()).getUId(); + sql_str.add(baoji_sql); { String msg="娣诲姞"+binf.getStationName()+"鏈烘埧"+binf.getBattGroupId()+"鐢垫睜缁勭殑淇℃伅"; User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Increase, msg); diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java index 3bda3d9..2cf11c7 100644 --- a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java +++ b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java @@ -139,7 +139,7 @@ ",'"+binf.getBattProducer()+"','"+binf.getBattModel()+"','"+DAOHelper.sdf.format(binf.getBattProductDate())+"','"+DAOHelper.sdf.format(binf.getBattInUseDate())+"',"+binf.getLoad_curr()+",'"+binf.getInstall_user()+"',"+binf.getDisCurrMax()+",'"+binf.getStation_phone()+"',"+binf.getStation_install()+")"; sql_str.add(sql_insert_binf); String baoji_sql="REPLACE into db_user.tb_user_battgroup_baojigroup_battgroup(baoji_group_id,StationId,BattGroupId) " + - " SELECT baoji_group_id,'"+binf.getStationId()+"',"+binf.getBattGroupId()+" from db_user.tb_user_battgroup_baojigroup "; + " SELECT baoji_group_id,'"+binf.getStationId()+"',"+binf.getBattGroupId()+" from db_user.tb_user_battgroup_baojigroup_usr where uid="+bapply.getApply_uid(); sql_str.add(baoji_sql); { String msg="纭娣诲姞"+binf.getStationName()+"鏈烘埧"+binf.getBattGroupId()+"鐢垫睜缁勭殑淇℃伅"; diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.java index d032799..06804d9 100644 --- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.java +++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.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_setparam; import com.fgkj.dto.ram.Fbs9100_sysparam; +import com.fgkj.services.User_logService; public class Fbs9100_sysparamImpl implements BaseDAO,CallBack{ @@ -33,6 +37,30 @@ "where dev_id=? "; boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{sys.getIPADDR(),sys.getSubIPADDR(),sys.getNetGateADDR(),sys.getGroupVolRange(),sys.getGroupVolSorce(),sys.getCurrentRange(),sys.getCurrentTyte(),sys.getMonomerOrder(),sys.getBackLightTime() ,sys.getMACADDR(),sys.getLoaderCount(),sys.getDtCardCount(),sys.getPowerBreakChargeCurr(),sys.getMajorBattGroupNum(),sys.getPOF_BG_Boost_Cnt(),sys.getPOF_BG_Boost_VolStop(),sys.getPOF_BG_Boost_VolStart(),sys.getDev_id()}); + return bl; + } + //鎵归噺璁剧疆绯荤粺鍙傛暟 + public boolean updatePro(Object obj) { + List<Fbs9100_sysparam> list=(List<Fbs9100_sysparam>) 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_sysparam fs=list.get(i); + String sql="REPLACE into db_ram_db.tb_fbs9100_sysparam(dev_id,IPADDR,SubIPADDR,NetGateADDR,GroupVolRange,GroupVolSorce,CurrentRange,CurrentTyte,MonomerOrder,BackLightTime" + + ",MACADDR,LoaderCount,DtCardCount,PowerBreakChargeCurr,MajorBattGroupNum,POF_BG_Boost_Cnt,POF_BG_Boost_VolStop,POF_BG_Boost_VolStart) " + + " values()"; + 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; } //鏌ヨ绯荤粺鍙傛暟鍓�(濡傛灉娌℃湁榛樿鏁版嵁瑕佺敤REPLACE 娣诲姞涓�绗旀暟鎹�) @@ -152,6 +180,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_GetSYSSetParam: m_cmd_ack = FBS9100_ComBase.CMD_GetSYSSetParamAck; break; + case FBS9100_ComBase.CMD_SetSYSSetParam: m_cmd_ack = FBS9100_ComBase.CMD_SetSYSSetParamAck; break; + default: return false; + } + String sql = "SELECT op_cmd FROM db_ram_db.tb_fbs9100_sysparam "+ + " 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