81041
2019-01-18 cf4efde9b2ec3d661269c0346596aaf789eb54ad
gx_tieta/src/com/fgkj/dao/BattTestData.java
@@ -121,9 +121,10 @@
         f = f.getParentFile();
        }
      
      jarPath = f.getParentFile().getAbsolutePath()+File.separator+"Batt_MS_FBSDEV_X64/Batt_MS_FBSDEV/"+"BTSE_DB_Builder.jar";            //主程序中jar的目录
      jarPath = f.getParentFile().getAbsolutePath()+File.separator+"Batt_MS_FBSDEV_X64/Batt_MS_FBSDEV/"+"BTSE_DB_Builder.exe";            //主程序中exe的目录
        //strcmd = "cmd /c start "+batPath;
        strcmd = ("cmd /c start ")+jarPath.replaceAll(" ", "\" \"");         //修复绝对路径中存在空格时执行不成功bug
        System.out.println(strcmd);
        Process child = null;
      InputStream in = null;
      try {
@@ -260,13 +261,45 @@
      return stop_type; 
   }
    //设备状态变换对应关系
   public static String getFbsdev_Statechange(int state){
      String state_name="停止";
      switch(state){
            case 0:state_name="停止";break;
            case 1:state_name="放电";break;
            case 2:state_name="充电";break;
         }
   public static String getFbsdev_Statechange(int eve_type,int state){
      String state_name="未知";
      if(eve_type==0){
         if(state==0){
            state_name="在线监测";
         }else if(state==1){
            state_name="放电测试";
         }else if(state==2){
            state_name="充电测试";
         }else if(state==3){
            state_name="升压续航";
         }
      }else if(eve_type==11){
         if(state==0){
            state_name="正常";
         }else if(state==1){
            state_name="故障";
         }
      }else if(eve_type==12){
         if(state==0){
            state_name="在线";
         }else if(state==1){
            state_name="离线";
         }
      }else if(eve_type==20){
         state_name="0x"+Integer.toHexString(state);
      }
      return state_name;
   }
   //设备状态变换对应eve_type
   public static String getEve_type_name(int eve_type){
      String eve_type_name="未知";
      switch(eve_type){
            case 0:eve_type_name="BTS工作状态";break;
            case 11:eve_type_name="SD卡故障";break;
            case 12:eve_type_name="电池离线状态";break;
            case 20:eve_type_name="DCDC模块告警状态";break;
         }
      return eve_type_name;
   }
}