81041
2018-11-29 108e84259b6fc890af880e76f7a9e3cb19b8dc4e
设备状态变迁修改
3个文件已修改
67 ■■■■ 已修改文件
gx_tieta/src/com/fgkj/dao/BattTestData.java 46 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dto/Fbsdev_Statechange_inf.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/BattTestData.java
@@ -261,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=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;
    }
}
gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java
@@ -83,13 +83,14 @@
                                state_inf.setDev_id(rs.getInt("dev_id"));
                                state_inf.setRec_time(rs.getTimestamp("rec_time"));
                                state_inf.setLast_stat(rs.getInt("last_stat"));
                                state_inf.setLast_stat_name(BattTestData.getFbsdev_Statechange(rs.getInt("last_stat")));
                                state_inf.setLast_stat_name(BattTestData.getFbsdev_Statechange(rs.getInt("eve_type"),rs.getInt("last_stat")));
                                state_inf.setNow_stat(rs.getInt("now_stat"));
                                state_inf.setNow_stat_name(BattTestData.getFbsdev_Statechange(rs.getInt("now_stat")));
                                state_inf.setNow_stat_name(BattTestData.getFbsdev_Statechange(rs.getInt("eve_type"),rs.getInt("now_stat")));
                                state_inf.setState_change_reason(rs.getInt("state_change_reason"));
                                state_inf.setState_change_reason_name(BattTestData.getStopType(BattTestData.TEST_LOADER_FBS9100S, rs.getInt("state_change_reason")));
                                state_inf.setDev_alarm(rs.getInt("dev_alarm"));
                                state_inf.setEve_type(rs.getInt("eve_type"));
                                state_inf.setEve_type_name(BattTestData.getEve_type_name(rs.getInt("eve_type")));
                                state_inf.setModule_num(rs.getInt("module_num"));
                                state_inf.setNote(rs.getString("stationName"));
                                list.add(state_inf);
gx_tieta/src/com/fgkj/dto/Fbsdev_Statechange_inf.java
@@ -17,6 +17,7 @@
    private Integer dev_alarm;
    private String dev_alarm_name;
    private int eve_type;
    private String eve_type_name;
    private int module_num;
    private String  note;
    private Page page;
@@ -153,6 +154,14 @@
    public void setModule_num(int module_num) {
        this.module_num = module_num;
    }
    public String getEve_type_name() {
        return eve_type_name;
    }
    public void setEve_type_name(String eve_type_name) {
        this.eve_type_name = eve_type_name;
    }
    @Override
    public String toString() {
@@ -164,11 +173,14 @@
                + state_change_reason + ", state_change_reason_name="
                + state_change_reason_name + ", dev_alarm=" + dev_alarm
                + ", dev_alarm_name=" + dev_alarm_name + ", eve_type="
                + eve_type + ", module_num=" + module_num + ", note=" + note
                + ", page=" + page + "]";
                + eve_type + ", eve_type_name=" + eve_type_name
                + ", module_num=" + module_num + ", note=" + note + ", page="
                + page + "]";
    }
    
}