Merge remote-tracking branch 'origin/master'

沈斌

2017-10-24 78b39c39cf7d68c2c0efc3c2fabb8f57963d030d

 src/main/java/com/moral/monitor/controller/ApiController.java

@@ -45,13 +45,11 @@
                             @RequestParam(value ="mac")  String mac ){



        try {

           System.out.println("");

           System.out.println("");

           System.out.println("");

            request.setCharacterEncoding("UTF-8");

        } catch (UnsupportedEncodingException e) {

            e.printStackTrace();

        }



        //插入或更新设备表信息

        ApiData apiData = new ApiData();

        if(StringUtils.isBlank(mac)){

@@ -61,37 +59,22 @@
            return apiData;

        }





        if (StringUtils.isBlank(longitude)){ longitude="0"; }

        if (StringUtils.isBlank(latitude)) { latitude="0"; }



        Equipment equipment = apiService.selectFromequipmentBymac(mac);

        if (equipment==null){

            if (StringUtils.isBlank(longitude)){ longitude="0"; }

            if (StringUtils.isBlank(latitude)) { latitude="0"; }

            //插入

        if (equipment==null){ //插入

            apiService.insertIntoequipment(device_name,address,longitude,latitude,uid,mac);

            apiData.setData("");

            apiData.setMessage("添加设备成功");

            apiData.setErrno(0);

            return apiData;



        }







        //更新

        if (!StringUtils.isBlank(mac)) {



            if (StringUtils.isBlank(longitude)){ longitude="0"; }

            if (StringUtils.isBlank(latitude)) { latitude="0"; }



        } else { //更新

            apiService.updateFromequipmentBymac(device_name, address, longitude, latitude, uid, mac);

            apiData.setData("");

            apiData.setMessage("更新设备成功");

            apiData.setErrno(0);

            return apiData;

        }



            return null;

        return apiData;

    }