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

hdw

2018-11-28 12e9ba156bb74248258e78e4a6ecaf89518010b6

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

 gx_tieta/src/com/fgkj/actions/BattInfAction.java

@@ -399,7 +399,20 @@
        result = ActionUtil.tojson(model);

        return SUCCESS;

    }

	
    //头部查出已安装的所有机房

    public String serchByDeviceId(){

        User_inf uinf=(User_inf) getUser();

        ServiceModel model = service.serchByDeviceId(uinf);

        result = ActionUtil.tojson(model);

        return SUCCESS;

    }

    //头部查出已安装的电池单体

    public String serchByInstall_count(){

        User_inf uinf=(User_inf) getUser();

        ServiceModel model = service.serchByInstall_count(uinf);

        result = ActionUtil.tojson(model);

        return SUCCESS;

    }

    public BattInf getBif() {

        return bif;

    }


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

@@ -1112,6 +1112,40 @@
        }

        return number;

    }

    //查单体总数(已安装的单体)

    public int serchByInstall_count(Object obj){

        User_inf uinf=(User_inf) obj;

        String sql=" SELECT sum(moncount) as nums FROM db_battinf.tb_battinf  " +

                   " where StationId in(" +

                   " select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id  " +

                   " and db_user.tb_user_battgroup_baojigroup_usr.uId=? " +

                   " ) " +

                   " and db_battinf.tb_battinf.station_install=1";

        //System.out.println(sql);

        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {

			
            public List getResults(ResultSet rs) {

                List list=new ArrayList();

                int nums=0;//单体总数

                try {

                    while(rs.next()){

                        nums=rs.getInt("nums");

                        list.add(nums);

                    }

                } catch (SQLException e) {

                    // TODO Auto-generated catch block

                    e.printStackTrace();

                }

                return list;

            }

			
        });

        int number=0;//存放总数

        if(list!=null&&list.size()>0){

            number=(Integer) list.get(list.size()-1);

        }

        return number;

    }

    //查询设备总数(全部)

    public List serchByDeviceId_all(Object obj){

        User_inf uinf=(User_inf) obj;

@@ -4256,12 +4290,14 @@
        //List<BattInf> list=biml.serchGroupByInfor(binf);

        //List<BattInf> list=biml.searchInform1(bmd);

        //<BattInf> list=biml.serchStationName5(binf);

        List<BattInf> list=biml.serchBattAllInfoByStationId(binf);

        /*List<BattInf> list=biml.serchBattAllInfoByStationId(binf);

        //List<BattInf> list=biml.searchInform_ky();

        for (BattInf b : list) {

            System.out.println(b);

        }

        System.out.println(list.size());

        System.out.println(list.size());*/

        int nums=biml.serchByInstall_count(uinf);

        System.out.println(nums);

    }

    

    public List getResults(ResultSet rs) {


 gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java

@@ -32,7 +32,7 @@
    public boolean addPro(Object obj) {

        BattInf binf=(BattInf) obj;

        String sql=" REPLACE into db_ram_db.tb_fbs9100s_dfu_state(dev_id,dfu_file,dfu_wr_stat,dfu_data_blocknum,dfu_data_blocksum) " +

                " SELECT  DISTINCT fBSDeviceId,'avr_dfu.uc3',1,1,"+binf.getNum()+"  FROM db_battinf.tb_battinf " +

                " SELECT  DISTINCT fBSDeviceId,'avr_dfu.uc3',1,1,"+binf.getSize()+"  FROM db_battinf.tb_battinf " +

                " where fBSDeviceId not in(select DISTINCT dev_id from db_ram_db.tb_fbs9100s_dfu_state where dfu_en=true)  ";

        //条件

        String sql0=" and stationid=? "; //具体机房

@@ -276,8 +276,8 @@
        return listAll;

    }

   

    //升级界面点击添加的时候查询出设备对应的版本号

    public List serchByInfo(Object obj) {

        // TODO Auto-generated method stub

        return null;

    }

    public static void main(String[] args) {


 gx_tieta/src/com/fgkj/services/BattInfServices.java

@@ -999,7 +999,22 @@
        //System.out.println(model.getData());

        return model;

    }



    //头部查出已安装的所有机房

    public ServiceModel serchByDeviceId(Object obj){

        int devNum=(new BattInfImpl()).serchByDeviceId(obj);        //总设备数(已安装)

        model.setCode(1);

        model.setSum(devNum);

        model.setMsg("查询成功!");

        return model;

    }

    //头部查出已安装的电池单体

    public ServiceModel serchByInstall_count(Object obj){

        int devNum=(new BattInfImpl()).serchByInstall_count(obj);        //总设备数(已安装)

        model.setCode(1);

        model.setSum(devNum);

        model.setMsg("查询成功!");

        return model;

    }

    public static void main(String[] args) {

        //new BattInfServices().findMenu();

        BattInf b=new BattInf();