Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

didiyu

2019-01-08 5f585252c155d62109a937563285e36d32b1b0de

Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_sysparamService.class

Binary files differ

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

@@ -4605,7 +4605,7 @@
        String sql=" select  distinct(tb_battinf.StationId),StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,"

                + "FBSDeviceName,count(FBSDeviceId) as batt_num" +

                 ",MonCount,monVolStd,monResStd,MonSerStd,Load_curr,DisCurrMax,montmpstd,floatVolLevel,offlineVolLevel,battFloatCurrent"

                 + ",GROUP_CONCAT(tb_battinf.MonCapStd) as moncapstds "

                 + ",GROUP_CONCAT(tb_battinf.MonCapStd order by groupIndexInFBSDevice separator '/' ) as moncapstds "

                 + ",db_ram_db.tb_fbs9100_state.dev_version"

                 + ",web_site.tb_batt_endurance.real_cap_group1 ,web_site.tb_batt_endurance.real_cap_group2,web_site.tb_batt_endurance.real_cap_group3,web_site.tb_batt_endurance.real_cap_group4 "

                + " from db_battinf.tb_battinf,db_ram_db.tb_fbs9100_state,web_site.tb_batt_endurance  "


 gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java

@@ -202,7 +202,7 @@
        ServiceModel model=fs.serchBattinfAndParam(binf);

        List list=(List)model.getData();

        for (int i = 0; i < list.size(); i++) {

            System.out.println(((BattInf)list.get(i)).getObj());

            System.out.println(((BattInf)list.get(i)));

        }

    }

}