fengxiang
2018-05-08 606c896c1b7c9d986cfb13d8464f3482160a1389
手机 设备 保存 api
3 files modified
51 ■■■■■ changed files
src/main/java/com/moral/controller/MobileController.java 38 ●●●● patch | view | raw | blame | history
src/main/java/com/moral/entity/Device.java 9 ●●●●● patch | view | raw | blame | history
src/main/java/com/moral/service/impl/OperateUserServiceImpl.java 4 ●●● patch | view | raw | blame | history
src/main/java/com/moral/controller/MobileController.java
@@ -77,14 +77,38 @@
        return new AppData<OperateUser>(operateUser); 
    }
    /**
     * Install device.终端采集
     *
     * @param device the device
     * @return the result bean
     */
    /**
     *
     * @param request
     * @param uid
     * @param deviceName
     * @param address
     * @param longitude
     * @param latitude
     * @param mac
     * @param monitorpoint
     * @return
     */
    @PostMapping("reportDevice")
    public AppData<String> installDevice(Device device) {
    public AppData<String> installDevice(
            HttpServletRequest request ,
            @RequestParam(value ="uid") Integer uid,
            @RequestParam(value ="device_name")  String deviceName,
            @RequestParam(value ="address")  String address,
            @RequestParam(value ="longitude")  double longitude,
            @RequestParam(value ="latitude")  double latitude,
            @RequestParam(value ="mac")  String mac,
            @RequestParam(value ="monitorpoint")  Integer monitorpoint
    ) {
        // device 适配
        Device device = new Device();
        device.setOperateUserId(uid);
        device.setName(deviceName);
        device.setAddress(address);
        device.setLongitude(longitude);
        device.setLatitude(latitude);
        device.setMac(mac);
        device.setMonitorPointId(monitorpoint);
        deviceService.saveOrUpdateDevice(device);
        return new AppData<String>("");
    }
src/main/java/com/moral/entity/Device.java
@@ -86,15 +86,6 @@
    }
    /**
     * Sets the device name.
     *
     * @param device_name the new device name
     */
    public void setDevice_name(String  device_name) {
        this.name = device_name;
    }
    /**
     * Gets the device name.
     *
     * @return the device name
src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
@@ -89,7 +89,9 @@
        if (parameters.containsKey("sorter")) {
            example.setOrderByClause((String) parameters.get("sorter"));
        }
        criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE);
        Object isDelete = parameters.get("isDelete");
        criteria.andEqualTo("isDelete",isDelete!=null?isDelete:0);
//        criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE);
        PageHelper.startPage(Integer.valueOf((String) parameters.get("pi")), Integer.valueOf((String) parameters.get("ps")));
        List<OperateUser> operateUsers = operateUserMapper.selectByExample(example);
        return new PageBean<OperateUser>(operateUsers);