fix

zhanzhiqin

2022-04-24 ecb88714f8e92f7989e69da0f5e6215e6f65cb4c

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java

@@ -6,6 +6,7 @@
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.enums.ResponseStatusEnums;
import com.sandu.common.log.Log;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.LoginUserInfo;
import com.sandu.common.security.annotation.AnonymousAccess;
@@ -14,10 +15,8 @@
import com.sandu.common.util.IpUtil;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.ClientDto;
import com.sandu.ximon.admin.param.AddClientPrarm;
import com.sandu.ximon.admin.param.AdminLoginParam;
import com.sandu.ximon.admin.param.ResetClientPasswordPrarm;
import com.sandu.ximon.admin.param.UpdateClientPrarm;
import com.sandu.ximon.admin.param.*;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.ClientRoleRelationService;
import com.sandu.ximon.admin.service.ClientService;
@@ -25,6 +24,7 @@
import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.domain.ClientRoleRelation;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.crypto.password.PasswordEncoder;
@@ -49,6 +49,7 @@
    private final RoleService roleService;
    private final ClientRoleRelationService clientRoleRelationService;
    private final TokenProvider tokenProvider;
    private PermissionConfig permissionConfig;

    @PostMapping("/add")
    public ResponseVO<Object> addClient(@RequestBody @Validated AddClientPrarm addClientPrarm) {
@@ -71,10 +72,15 @@
        }
    }

    @PostMapping("/resetClientPassword")
    public ResponseVO<Object> resetClientPassword(@RequestBody @Validated ResetClientPasswordPrarm resetClientPasswordPrarm) {
        boolean b = clientService.resetPassword(resetClientPasswordPrarm);
        if (b) {
    /**
     * 修改普通用户的密码
     */
    @Log("修改普通用户的密码")
    @PostMapping("/updateClientPassword")
    public ResponseVO<Object> updateClientPassword(@Validated @RequestBody UserPwsParm param) {
        boolean result = clientService.updateAdminPassword(param);

        if (result) {
            return ResponseUtil.success("修改成功");
        } else {
            return ResponseUtil.fail("修改失败");
@@ -93,12 +99,16 @@

    @GetMapping("/list")
    public ResponseVO<Object> listLikeClient(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
        if (!permissionConfig.check(MenuEnum.CLIENT_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }

        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        LambdaQueryWrapper<Client> wrapper = Wrappers.lambdaQuery(Client.class);
        if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
            wrapper.eq(Client::getSuperiorId, SecurityUtils.getUserId());
        }
        if (null != keyword) {
        if (keyword != null && !keyword.isEmpty()) {
            wrapper.like(Client::getClientName, keyword)
                    .or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getMobile, keyword))
                    .or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getLinkMan, keyword));
@@ -138,7 +148,6 @@
        loginUserInfo.setUserId(client.getId());
        loginUserInfo.setAccount(client.getClientName());
        loginUserInfo.setIp(IpUtil.getRealIp());
        loginUserInfo.setIcon(client.getIcon());
        loginUserInfo.setAdministratorType(AdministratorEnums.NORMAL.getCode());
        loginUserInfo.setPermission(grantedAuthorities.stream().map(GrantedAuthority::getAuthority).collect(Collectors.joining(",")));