LiJun
2018-11-01 daf105a4c7cfd299d6473939b4d678a3e9f91f23
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
@@ -149,7 +149,7 @@
   //根据机房编号和维护区查询放电机房的信息和放电参数
   public List serchByCondition(Object obj) {
      BattInf binf=(BattInf) obj;
      String sql="select db_battinf.tb_battinf.battgroupid,db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.FBSDeviceIp,db_battinf.tb_battinf.BattGroupName" +
      String sql="select db_battinf.tb_battinf.battgroupid,db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName5,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.FBSDeviceIp,db_battinf.tb_battinf.BattGroupName" +
            ",db_battinf.tb_battinf.GroupIndexInFBSDevice,db_battinf.tb_battinf.MonCount,db_battinf.tb_battinf.MonVolStd,db_battinf.tb_battinf.MonCapStd" +
            ",db_ram_db.tb_fbs9100_setparam.HourRate,db_ram_db.tb_fbs9100_setparam.DisCurr,db_ram_db.tb_fbs9100_setparam.DisCap" +
            ",db_ram_db.tb_fbs9100_setparam.DisTime,db_ram_db.tb_fbs9100_setparam.GroupVol_LOW,db_ram_db.tb_fbs9100_setparam.MonomerVol_LOW" +
@@ -176,6 +176,7 @@
                  BattInf binf=new BattInf();
                  binf.setBattGroupId(rs.getInt("battGroupId"));
                  binf.setStationName(rs.getString("stationName"));
                  binf.setStationName5(rs.getString("stationName5"));
                  binf.setFBSDeviceId(rs.getInt("fBSDeviceId"));
                  binf.setFbsDeviceIp(rs.getString("fbsDeviceIp"));
                  binf.setBattGroupName(rs.getString("battGroupName"));
@@ -231,8 +232,8 @@
      return list;
   }
   
   //机房命令操作设备时的cmd和ack校验
   public boolean sendCmdToFBS9100Dev(int cmd,int dev_id)
   //机房命令操作设备时的cmd和ack校验      test_type  -->默认启动测试的类型
   public boolean sendCmdToFBS9100Dev(int cmd,int test_type,int dev_id)
   { 
      int m_cmd = cmd;
      int m_cmd_ack = cmd;
@@ -243,11 +244,16 @@
         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;
         default: return false;
      }
      String sql_end = "";
      if(test_type > 0 && cmd == FBS9100_ComBase.CMD_Start){               //启动测试时未点击设定参数按钮,会出现启动内阻测试bug修复
         sql_end = ",TestCmd="+test_type;
      }
      boolean res_exe = false;
      String sql = "UPDATE db_ram_db.tb_fbs9100_setparam  SET "
                  + " op_cmd=? "
                  + " op_cmd=? " + sql_end
                  + " WHERE dev_id=? ";
      Boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{m_cmd,dev_id});
      if(true == bl)