81041
2018-11-12 01fb6edeac37edb76dade2a2f92201a9bbdc69db
拓扑图显示dcdc16进制
4个文件已修改
112 ■■■■ 已修改文件
gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dcdc_stateAction.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dcdc_stateImpl.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dcdc_state.java 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/services/ram/Fbs9100s_dcdc_stateService.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dcdc_stateAction.java
@@ -21,6 +21,13 @@
        result = tojson(model);
        return SUCCESS;
    }
    //实时页面拓扑图中显示设备的两个dcdc
    public String serchByInfo(){
        Fbs9100s_dcdc_state dcdc = getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Fbs9100s_dcdc_state.class);
        ServiceModel model = service.serchByInfo(dcdc);
        result = tojson(model);
        return SUCCESS;
    }
    //刷新dcdc模块信息表格中数据
    public String refreshTable(){
        List<FBS9100> list= getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, new TypeToken<List<FBS9100>>(){}.getType());
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dcdc_stateImpl.java
@@ -212,10 +212,53 @@
        });
        return list;
    }
    //实时页面拓扑图中显示设备的两个dcdc
    public List serchByInfo(Object obj) {
        // TODO Auto-generated method stub
        return null;
        Fbs9100s_dcdc_state dcdc=(Fbs9100s_dcdc_state) obj;
        String sql=" select   DISTINCT db_ram_db.tb_fbs9100s_dcdc_state.num,dev_id,dcdc_Vsys,dcdc_Vout,dcdc_Vbat,dcdc_Iout,dcdc_Ibuck" +
                ",dcdc_Tmp_Dis, dcdc_Tmp_Chr,dcdc_SMR_Alarm1,dcdc_SMR_Alarm2,dcdc_version" +
                ",dcdc_ModeSetComm,dcdc_RunSetComm,dcdc_BuckISet,dcdc_DisVolSet,dcdc_DisCurrSet" +
                ",dcdc_CommTxCnt,dcdc_CommRxCnt" +
                " from  db_ram_db.tb_fbs9100s_dcdc_state  " +
                " where  db_ram_db.tb_fbs9100s_dcdc_state.dev_id=? " +
                " order by db_ram_db.tb_fbs9100s_dcdc_state.num asc";
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{dcdc.getDev_id()}, new CallBack() {
            public List getResults(ResultSet rs) {
                List list=new ArrayList();
                try {
                    while(rs.next()){
                        Fbs9100s_dcdc_state fd=new Fbs9100s_dcdc_state();
                        fd.setDev_id(rs.getInt("dev_id"));
                        fd.setDcdc_Vsys(rs.getFloat("dcdc_Vsys"));
                        fd.setDcdc_Vout(rs.getFloat("dcdc_Vout"));
                        fd.setDcdc_Vbat(rs.getFloat("dcdc_Vbat"));
                        fd.setDcdc_Iout(rs.getFloat("dcdc_Iout"));
                        fd.setDcdc_Ibuck(rs.getFloat("dcdc_Ibuck"));
                        fd.setDcdc_Tmp_Dis(rs.getFloat("dcdc_Tmp_Dis"));
                        fd.setDcdc_Tmp_Chr(rs.getFloat("dcdc_Tmp_Chr"));
                        fd.setDcdc_SMR_Alarm1(rs.getInt("dcdc_SMR_Alarm1"));
                        fd.setDcdc_SMR_Alarm1_16(Integer.toHexString(rs.getInt("dcdc_SMR_Alarm1")));
                        fd.setDcdc_SMR_Alarm2(rs.getInt("dcdc_SMR_Alarm2"));
                        fd.setDcdc_SMR_Alarm2_16(Integer.toHexString(rs.getInt("dcdc_SMR_Alarm2")));
                        fd.setDcdc_version(rs.getInt("dcdc_version"));
                        fd.setDcdc_ModeSetComm(rs.getInt("dcdc_ModeSetComm"));
                        fd.setDcdc_RunSetComm(rs.getInt("dcdc_RunSetComm"));
                        fd.setDcdc_BuckISet(rs.getFloat("dcdc_BuckISet"));
                        fd.setDcdc_DisVolSet(rs.getFloat("dcdc_DisVolSet"));
                        fd.setDcdc_DisCurrSet(rs.getFloat("dcdc_DisCurrSet"));
                        fd.setDcdc_CommRxCnt(rs.getInt("dcdc_CommRxCnt"));
                        fd.setDcdc_CommTxCnt(rs.getInt("dcdc_CommTxCnt"));
                        list.add(fd);
                    }
                } catch (SQLException e) {
                    // TODO Auto-generated catch block
                    e.printStackTrace();
                }
                return list;
            }
        });
        return list;
    }
    //当dcdc中只存了一笔数据时copy一份数据全为0的对象
    public static FBS9100 cloneDcdc(FBS9100 fbs){
@@ -258,17 +301,22 @@
        Fbs9100s_dcdc_stateImpl fimpl=new Fbs9100s_dcdc_stateImpl();
        FBS9100 fbs=new FBS9100();
        Fbs9100s_dcdc_state fbs9100=new Fbs9100s_dcdc_state();
        fbs9100.setDev_id(910000001);
        fbs9100.setDev_id(910000575);
        fbs.setFd(fbs9100);
        BattInf binf=new BattInf();
        //binf.setStationName("湖北省-鄂州市-丁家老屋基站-铁塔基站");
        //binf.setStationName1("湖北省");
        //binf.setFBSDeviceName("FBS-9100S-6");
        fbs.setBinf(binf);
        List<FBS9100> list=fimpl.serchByCondition(fbs);
        /*List<FBS9100> list=fimpl.serchByCondition(fbs);
        for (FBS9100 fbs_91 : list) {
            System.out.println(fbs_91);
        }
        System.out.println(list.size());*/
        List<Fbs9100s_dcdc_state> list=fimpl.serchByInfo(fbs9100);
        for (Fbs9100s_dcdc_state dcdc : list) {
            System.out.println(dcdc);
        }
        System.out.println(list.size());
    }
gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dcdc_state.java
@@ -13,7 +13,9 @@
   private  Float dcdc_Tmp_Dis; 
   private  Float dcdc_Tmp_Chr;
   private  Integer dcdc_SMR_Alarm1;
   private  String  dcdc_SMR_Alarm1_16;//dcdc_SMR_Alarm1转16进制
   private  Integer dcdc_SMR_Alarm2;
   private  String  dcdc_SMR_Alarm2_16;//dcdc_SMR_Alarm2转16进制
   private  Integer dcdc_version;
   private  Integer dcdc_ModeSetComm;
   private  Integer dcdc_RunSetComm;
@@ -140,6 +142,18 @@
    public void setDcdc_CommRxCnt(Integer dcdc_CommRxCnt) {
        this.dcdc_CommRxCnt = dcdc_CommRxCnt;
    }
    public String getDcdc_SMR_Alarm1_16() {
        return dcdc_SMR_Alarm1_16;
    }
    public void setDcdc_SMR_Alarm1_16(String dcdc_SMR_Alarm1_16) {
        this.dcdc_SMR_Alarm1_16 = dcdc_SMR_Alarm1_16;
    }
    public String getDcdc_SMR_Alarm2_16() {
        return dcdc_SMR_Alarm2_16;
    }
    public void setDcdc_SMR_Alarm2_16(String dcdc_SMR_Alarm2_16) {
        this.dcdc_SMR_Alarm2_16 = dcdc_SMR_Alarm2_16;
    }
    @Override
    public String toString() {
        return "Fbs9100s_dcdc_state [num=" + num + ", dev_id=" + dev_id
@@ -147,15 +161,18 @@
                + ", dcdc_Vbat=" + dcdc_Vbat + ", dcdc_Iout=" + dcdc_Iout
                + ", dcdc_Ibuck=" + dcdc_Ibuck + ", dcdc_Tmp_Dis="
                + dcdc_Tmp_Dis + ", dcdc_Tmp_Chr=" + dcdc_Tmp_Chr
                + ", dcdc_SMR_Alarm1=" + dcdc_SMR_Alarm1 + ", dcdc_SMR_Alarm2="
                + dcdc_SMR_Alarm2 + ", dcdc_version=" + dcdc_version
                + ", dcdc_ModeSetComm=" + dcdc_ModeSetComm
                + ", dcdc_RunSetComm=" + dcdc_RunSetComm + ", dcdc_BuckISet="
                + dcdc_BuckISet + ", dcdc_DisVolSet=" + dcdc_DisVolSet
                + ", dcdc_DisCurrSet=" + dcdc_DisCurrSet + ", dcdc_CommTxCnt="
                + dcdc_CommTxCnt + ", dcdc_CommRxCnt=" + dcdc_CommRxCnt + "]";
                + ", dcdc_SMR_Alarm1=" + dcdc_SMR_Alarm1
                + ", dcdc_SMR_Alarm1_16=" + dcdc_SMR_Alarm1_16
                + ", dcdc_SMR_Alarm2=" + dcdc_SMR_Alarm2
                + ", dcdc_SMR_Alarm2_16=" + dcdc_SMR_Alarm2_16
                + ", dcdc_version=" + dcdc_version + ", dcdc_ModeSetComm="
                + dcdc_ModeSetComm + ", dcdc_RunSetComm=" + dcdc_RunSetComm
                + ", dcdc_BuckISet=" + dcdc_BuckISet + ", dcdc_DisVolSet="
                + dcdc_DisVolSet + ", dcdc_DisCurrSet=" + dcdc_DisCurrSet
                + ", dcdc_CommTxCnt=" + dcdc_CommTxCnt + ", dcdc_CommRxCnt="
                + dcdc_CommRxCnt + "]";
    }
    
   
gx_tieta/src/com/fgkj/services/ram/Fbs9100s_dcdc_stateService.java
@@ -30,7 +30,19 @@
       }
    return model;
   }
   //实时页面拓扑图中显示设备的两个dcdc
   public ServiceModel serchByInfo(Object obj){
       List list=dao.serchByInfo(obj);
       if(list!=null&&list.size()>0){
            model.setCode(1);
            model.setData(list);
            model.setMsg("查询成功!");
       }else{
            model.setCode(0);
            model.setMsg("查询失败!");
       }
    return model;
   }
   //刷新dcdc模块信息表格中数据
   public ServiceModel refreshTable(Object obj){
       List<FBS9100>  list=(List<FBS9100>) obj;