解决冲突

jiangping

2023-09-14 0ebb006ea17307cbd9d681f45467f8f49715a5fb

 server/company/src/main/java/com/doumee/api/system/SystemUserController.java

@@ -7,10 +7,8 @@
import com.doumee.core.constants.OperaType;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.system.dto.CreateSystemUserDTO;
import com.doumee.dao.system.dto.CreateUserRoleDTO;
import com.doumee.dao.system.dto.QuerySystemUserDTO;
import com.doumee.dao.system.dto.ResetSystemUserPwdDTO;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.*;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.system.vo.SystemUserListVO;
import com.doumee.service.system.SystemUserService;
@@ -126,4 +124,61 @@
        return ApiResponse.success(systemUserService.findById(id));
    }


    @Trace(withRequestParameters = false)
    @PreventRepeat
    @ApiOperation("新建员工")
    @PostMapping("/companyCreateUser")
    @RequiresPermissions("system:user:create")
    public ApiResponse companyCreate(@Validated(OperaType.Create.class) @RequestBody CreateCompanyUserDTO createCompanyUserDTO) {
        createCompanyUserDTO.setType(Constants.UserType.COMPANY.getKey());
        systemUserBiz.companyCreateUser(createCompanyUserDTO);
        return ApiResponse.success(null);
    }

    @Trace(withRequestParameters = false)
    @PreventRepeat
    @ApiOperation("新建主播")
    @PostMapping("/companyCreateAnchor")
//    @RequiresPermissions("system:user:create")
    public ApiResponse companyCreateAnchor(@Validated(OperaType.Create.class) @RequestBody CreateCompanyUserDTO createCompanyUserDTO) {
        createCompanyUserDTO.setType(Constants.UserType.ZHUBO.getKey());
        systemUserBiz.companyCreateUser(createCompanyUserDTO);
        return ApiResponse.success(null);
    }


    @Trace(withRequestParameters = false)
    @PreventRepeat
    @ApiOperation("修改员工信息")
    @PostMapping("/companyUpdUser")
    @RequiresPermissions("system:user:create")
    public ApiResponse companyUpdUser(@Validated(OperaType.Create.class) @RequestBody CreateCompanyUserDTO createCompanyUserDTO) {
        createCompanyUserDTO.setType(Constants.UserType.COMPANY.getKey());
        systemUserBiz.companyCreateUser(createCompanyUserDTO);
        return ApiResponse.success(null);
    }

    @Trace(withRequestParameters = false)
    @PreventRepeat
    @ApiOperation("修改主播信息")
    @PostMapping("/companyUpdAnchor")
    @RequiresPermissions("system:user:create")
    public ApiResponse companyUpdAnchor(@Validated(OperaType.Create.class) @RequestBody CreateCompanyUserDTO createCompanyUserDTO) {
        createCompanyUserDTO.setType(Constants.UserType.ZHUBO.getKey());
        systemUserBiz.companyUpdUser(createCompanyUserDTO);
        return ApiResponse.success(null);
    }


    @Trace(withRequestParameters = false)
    @PreventRepeat
    @ApiOperation("修改密码")
    @PostMapping("/updPassword")
//    @RequiresPermissions("system:user:create")
    public ApiResponse updPassword(@Validated(OperaType.Create.class) @RequestBody CreateCompanyUserDTO createCompanyUserDTO) {
        systemUserBiz.updPassword(createCompanyUserDTO);
        return ApiResponse.success(null);
    }

}