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

Administrator

2018-12-20 4845b337be059e93621d353b5c2e57ac480a8e33

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

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/BattMap_informationAction.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattMap_informationImpl$1.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattMap_informationImpl$2.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattMap_informationImpl$3.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattMap_informationImpl$4.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattMap_informationImpl$5.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattMap_informationImpl$6.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattMap_informationImpl$7.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattMap_informationImpl$8.class

Binary files differ

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

Binary files differ

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

Binary files differ

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

@@ -29,6 +29,18 @@
        result = tojson(model);

        return SUCCESS;

    }

    //9.1录入机房信息(手机端)

    public String replace(){

        BattMap_information binfo = getGson().fromJson(json, BattMap_information.class);

        ServiceModel model = service.replace(binfo);

        {

            String msg="设置"+binfo.getStationName()+"在"+binfo.getAddress();

            User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Increase, msg);

            uservice.add(ulog);//将用户的操作记录下来

        }

        result = tojson(model);

        return SUCCESS;

    }

    public String update(){

        BattMap_information binfo = getGson().fromJson(json, BattMap_information.class);

        ServiceModel model = service.update(binfo);


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

@@ -51,7 +51,14 @@
            binformation.getAddress(),binformation.getLongitude(),binformation.getLatitude()});

        return bl;

    }



     //9.1录入机房信息(手机端)

    public boolean replace(Object obj) {

        BattMap_information binformation=(BattMap_information) obj;

        String sql="replace into web_site.tb_battmap_information(StationId,StationName,address,longitude,latitude) values(?,?,?,?,?)";

        Boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{binformation.getStationId(),binformation.getStationName(),

            binformation.getAddress(),binformation.getLongitude(),binformation.getLatitude()});

        return bl;

    }

    public boolean update(Object obj) {

        BattMap_information binformation=(BattMap_information) obj;

        String sql="update web_site.tb_battmap_information set StationId=?,StationName=?,address=?,longitude=?,latitude=?,information=? where num=?";


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

@@ -43,6 +43,18 @@
        }

        return model;

    }

    //9.1录入机房信息(手机端)

    public ServiceModel replace(Object obj){

        Boolean bl=((BattMap_informationImpl)dao).replace(obj);

        if(bl){

            model.setCode(1);

            model.setMsg("添加成功!");

        }else{

            model.setCode(0);

            model.setMsg("添加失败!");

        }

        return model;

    }

    public ServiceModel update(Object obj){

        Boolean bl=dao.update(obj);

        if(bl){