Merge remote-tracking branch 'origin/master'

liuhaonan

2022-04-24 b86f9136d7b7189d7831d3b0f22e798c80e79e83

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

@@ -6,6 +6,8 @@
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.enums.ResponseStatusEnums;
import com.sandu.common.execption.BusinessException;
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 +16,7 @@
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;
@@ -74,15 +73,24 @@
        }
    }

//    @PostMapping("/resetClientPassword")
//    public ResponseVO<Object> resetClientPassword(@RequestBody @Validated ResetClientPasswordPrarm resetClientPasswordPrarm) {
//        boolean b = clientService.resetPassword(resetClientPasswordPrarm);
//        if (b) {
//            return ResponseUtil.success("修改成功");
//        } else {
//            return ResponseUtil.fail("修改失败");
//        }
//    }
    /**
     * 修改普通用户的密码
     */
    @Log("修改普通用户的密码")
    @PostMapping("/updateClientPassword")
    public ResponseVO<Object> updateClientPassword(@Validated @RequestBody UserPwsParm param) {
        if (!SecurityUtils.getUserDetails().getAdministratorType().equals(AdministratorEnums.ADMIN.getCode())) {
            throw new BusinessException("非超级管理员无法修改密码！");
        }

        boolean result = clientService.updateAdminPassword(param);

        if (result) {
            return ResponseUtil.success("修改成功");
        } else {
            return ResponseUtil.fail("修改失败");
        }
    }

    @PostMapping("/delete/{id}")
    public ResponseVO<Object> deleteClient(@PathVariable Long id) {