Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

fengxiang

2017-12-22 9a24e9adbc0477719fed960b879f8e5dcf870aba

 src/main/java/com/moral/controller/UserController.java

@@ -17,7 +17,7 @@
    @Resource
    private OperateUserService operateUserService;

    @RequestMapping(value = "/operate_user", method = RequestMethod.GET)
    @GetMapping("/operate_user")
    public PageResult findOperateUserList() {

        Long total = operateUserService.findOperateUserCount();
@@ -25,15 +25,32 @@
        return new PageResult(total, data);
    }

    @RequestMapping(value = "/operate_user/{id}", method = RequestMethod.GET)
    @GetMapping("/operate_user/{id}")
    public OperateUser findOperateUserById(@PathVariable(value = "id") int id) {

        return operateUserService.findOperateUserById(id);
        return operateUserService.findOperateUser(id);
    }

    @RequestMapping(value = "/operate_user/save", method = RequestMethod.POST)
    public int saveOrUpdate(@RequestBody OperateUser operateUser) {
        System.out.println(JSON.toJSONString(operateUser));
        return 1;
    @PostMapping("/operate_user/save")
    public int saveOrUpdate(@RequestBody OperateUser user) {
        int result = 1;
        Integer id = user.getId();
        if(id != null && id > 0) {
            result = operateUserService.updateOperateUser(user);
        } else {
            result = operateUserService.insertOperateUser(user);
        }
        return result;
    }

    @DeleteMapping("/operate_user/{id}")
    public int delete(@PathVariable(value = "id") int id) {
        return operateUserService.deleteOperateUser(id);
    }

    @PostMapping("/operate_user/deleteList")
    public int deleteUserList(@RequestBody String[] ids) {
        System.out.println(ids);
        return operateUserService.deleteOperateUserList(ids);
    }
}