Merge remote-tracking branch 'origin/master'

value

2024-05-23 00ae048ace3f7877a89bfe024344d686d7503511

 user-server/src/main/java/com/yuanchu/mom/controller/UserController.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.Custom;
import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.pojo.User;
@@ -89,6 +90,7 @@
        return Result.fail(map.get("info"));
    }

    @ValueClassify("用户管理")
    @ApiOperation(value = "获取用户列表")
    @PostMapping("/selectUserList")
    public Result selectUserList(@RequestBody Map<String, Object> data) throws Exception {
@@ -97,6 +99,16 @@
        return Result.success(userService.selectUserList(page, user));
    }

    @ValueClassify("用户管理")
    @ApiOperation(value = "资源要求-人员总览")
    @PostMapping("/selectPersonnelOverview")
    public Result selectPersonnelOverview(@RequestBody Map<String, Object> data) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
        UserPageDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserPageDto.class);
        return Result.success(userService.selectPersonnelOverview(page, user));
    }

    @ValueClassify("用户管理")
    @ApiOperation(value = "修改用户信息")
    @PostMapping("/updateUser")
    public Result<?> updateUser(@RequestBody User user) {
@@ -104,7 +116,7 @@
        else user.setPassword(DigestUtils.md5DigestAsHex(user.getPassword().getBytes()));
        return Result.success(userService.updateUser(user));
    }

    @ValueClassify("用户管理")
    @ApiOperation(value = "添加用户信息")
    @PostMapping("/addUser")
    public Result<?> addUser(@RequestBody User user) {
@@ -120,6 +132,7 @@
        return Result.success(userService.getUserMenu());
    }

    @ValueClassify("客户管理")
    @ApiOperation(value = "获取客户列表")
    @PostMapping("/selectCustomPageList")
    public Result selectCustomPageList(@RequestBody Map<String, Object> data) throws Exception {
@@ -127,13 +140,13 @@
        Custom custom = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Custom.class);
        return Result.success(customService.selectCustomPageList(page, custom));
    }

    @ValueClassify("客户管理")
    @ApiOperation(value = "删除客户信息")
    @PostMapping("/delCustomById")
    public Result<?> delCustomById(Integer id) {
        return Result.success(customService.delCustomById(id));
    }

    @ValueClassify("客户管理")
    @ApiOperation(value = "新增客户信息")
    @PostMapping("/addCustom")
    public Result<?> addCustom(@RequestBody Custom custom) {
@@ -148,4 +161,39 @@
        return Result.success(userService.getDeviceManager());
    }

    @ValueAuth
    @GetMapping("/getUserNow")
    @ApiOperation(value = "获取当前登录的客户信息")
    public Result<?> getUserNow(){
        return Result.success(userService.getUserNow());
    }

    @ValueAuth
    @GetMapping("/getUserInfo")
    @ApiOperation(value = "获取当前登录的用户信息")
    public Result<?> getUserInfo(){
        return Result.success(userService.getUserInfo());
    }

    @PostMapping("/upUserPassword")
    @ApiOperation(value = "修改用户密码")
    @ValueAuth
    public Result<?> upUserPassword(String oldPassword, String newPassWord){
        return Result.success(userService.upUserPassword(oldPassword, newPassWord));
    }

    @ValueClassify("人员明细")
    @PostMapping("/upUserDepardLimsId")
    @ApiOperation(value = "修改人员明细所在组织架构")
    public Result<?> upUserDepardLimsId(String ids, String id){
        return Result.success(userService.upUserDepardLimsId(ids, id));
    }

    @ValueClassify("人员明细")
    @PostMapping("/delUserDepardLimsId")
    @ApiOperation(value = "删除人员明细所在组织架构")
    public Result<?> delUserDepardLimsId(Integer id){
        return Result.success(userService.delUserDepardLimsId(id));
    }

}