Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

hdw

2019-01-19 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd

 gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java

@@ -40,6 +40,16 @@
         ,bparam.getBattTemp(),bparam.getFloatChargeVol(),bparam.getFloatChargeCurr(),bparam.getOnlineVolLow(),bparam.getGroupConnType()});

      return bl;

   }

   //批量设置参数前往表中加入数据

   public boolean updatePL(Object obj) {

      Fbs9100_battparam bparam=(Fbs9100_battparam) obj;

      /*String sql=" update db_ram_db.tb_fbs9100_battparam set STD_CAP=?,STD_RES=?,BattGroupCount=?,EachGroupBattCount=?,MonomerVol=?,GroupVol=?,BattTemp=?,FloatChargeVol=?,FloatChargeCurr=?,OnlineVolLow=?,GroupConnType=? " +

            " where dev_id=? ";*/

      String sql=" replace into db_ram_db.tb_fbs9100_battparam(dev_id,op_cmd,dev_ip,STD_CAP,STD_RES,BattGroupCount,EachGroupBattCount,MonomerVol,GroupVol,BattTemp,FloatChargeVol,FloatChargeCurr,OnlineVolLow,GroupConnType) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";

      boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{bparam.getDev_id(),bparam.getOp_cmd(),bparam.getDev_ip(),bparam.getSTD_CAP(),bparam.getSTD_RES(),bparam.getBattGroupCount(),bparam.getEachGroupBattCount(),bparam.getMonomerVol(),bparam.getGroupVol()

         ,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;

@@ -48,13 +58,36 @@
      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"

            String sql="replace into db_ram_db.tb_fbs9100_battparam(dev_id,op_cmd,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()

                  + " values("+fs.getDev_id()+","+fs.getOp_cmd()+",'"+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 readPL(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,op_cmd) "

                  + " values("+fs.getDev_id()+","+fs.getOp_cmd()+")";

            sql_str.add(sql);

            {

               String msg="获取"+fs.getDev_id()+"电池参数";

               User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);

               listU.add(ulog);

             }

@@ -206,7 +239,6 @@
      DBUtil.close(rs, ps, conn);

      return res_exe;

   }

	
   public List serchByInfo(Object obj) {

      // TODO Auto-generated method stub

      return null;