设备变迁的查询修改

81041

2018-11-28 e978f1eb746dd9814c3680bb35e890b15498a6df

设备变迁的查询修改

 gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java

@@ -48,7 +48,7 @@
        String sql="";

        String numberSql=" SELECT FOUND_ROWS() number";

        Connection conn=DBUtil.getConn();

        String baseSql="select SQL_CALC_FOUND_ROWS distinct dev_id,rec_time,last_stat,now_stat,state_change_reason,dev_alarm,stationName " +

        String baseSql="select SQL_CALC_FOUND_ROWS distinct dev_id,rec_time,last_stat,now_stat,eve_type,module_num,state_change_reason,dev_alarm,stationName " +

                       "  from db_app_sys.tb_fbsdev_statechange_inf,db_battinf.tb_battinf " +

                       "  where db_app_sys.tb_fbsdev_statechange_inf.dev_id=db_battinf.tb_battinf.fbsdeviceid  " +

                       "  and rec_time>? and rec_time<? ";

@@ -89,6 +89,8 @@
                                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.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

@@ -16,6 +16,8 @@
    private String state_change_reason_name;

    private Integer dev_alarm;

    private String dev_alarm_name;

    private int eve_type;

    private int module_num;

    private String  note;

    private Page page;

    

@@ -136,17 +138,37 @@
        this.page = page;

    }



    public int getEve_type() {

        return eve_type;

    }



    public void setEve_type(int eve_type) {

        this.eve_type = eve_type;

    }



    public int getModule_num() {

        return module_num;

    }



    public void setModule_num(int module_num) {

        this.module_num = module_num;

    }



    @Override

    public String toString() {

        return "Fbsdev_Statechange_inf [num=" + num + ", dev_id=" + dev_id

                + ", rec_time=" + rec_time + ", last_stat=" + last_stat

                + ", last_stat_name=" + last_stat_name + ", now_stat="

                + now_stat + ", now_stat_name=" + now_stat_name

                + ", state_change_reason=" + state_change_reason

                + ", state_change_reason_name=" + state_change_reason_name

                + ", dev_alarm=" + dev_alarm + ", dev_alarm_name="

                + dev_alarm_name + ", note=" + note + ", page=" + page + "]";

                + ", rec_time=" + rec_time + ", rec_time1=" + rec_time1

                + ", last_stat=" + last_stat + ", last_stat_name="

                + last_stat_name + ", now_stat=" + now_stat

                + ", now_stat_name=" + now_stat_name + ", state_change_reason="

                + 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 + "]";

    }



	




}