放假备份。完成集中控制器对接。

Van333

2022-12-29 727a69f859060093e685582fa10e5de82dcc138a

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java

@@ -1,10 +1,9 @@
package com.sandu.ximon.admin.service;

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.lang.Snowflake;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.qcloud.cos.utils.Md5Utils;
import com.sandu.common.enums.RoleLevelStatus;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
@@ -23,7 +22,6 @@
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.AdminMapper;
import lombok.AllArgsConstructor;
import lombok.Data;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -45,6 +43,7 @@
    private final AdminRoleRelationService adminRoleRelationService;
    private final RoleService roleService;
    private AdminMapper adminMapper;
    private Snowflake snowflake;

    public Admin findByUserName(String username) {
        return getOne(Wrappers.lambdaQuery(Admin.class).eq(Admin::getUsername, username).last("limit 1"));
@@ -54,9 +53,14 @@
    public boolean register(AdminParam param) {
        Admin admin = findByUserName(param.getUsername());
        if (admin != null) {
            throw new BusinessException("当前账号" + param.getUsername() + "已经存在");
            throw new BusinessException("当前账号" + param.getUsername() + "已经在管理员中存在");
        }
        Client one = SpringContextHolder.getBean(ClientService.class).getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, param.getUsername()));
        if (one != null) {
            throw new BusinessException("当前账号" + param.getUsername() + "已经在客户中存在");
        }
        Admin save = new Admin();
        save.setId(snowflake.nextId());
        save.setUsername(param.getUsername());
        save.setPassword(passwordEncoder.encode(param.getPassword()));
        save.setNickName(param.getNickName());
@@ -323,8 +327,16 @@
            throw new BusinessException("用户不存在，请重新确认！");
        }

        /**
         * key操作日志
         */
        String content = "操作用户key：" + SecurityUtils.getUsername() + "  被操作用户id：" + userId;


        //获取
        if (type == 1) {
            content += "操作类型:获取key";
            StoreOperationRecordsUtils.storeOperationData(null, null, "操作用户key", content);
            return "用户的便捷登录key为：" + client.getUserKey();
        } else {
            //更新
@@ -332,6 +344,8 @@
            client.setUserKey(md5);
            boolean flag = clientService.updateById(client);
            if (flag) {
                content += "操作类型:生成key,新的key为：" + md5;
                StoreOperationRecordsUtils.storeOperationData(null, null, "操作用户key", content);
                return "生成便捷登录key成功，该用户key为：" + md5 + "，请妥善保管！";
            } else {
                throw new BusinessException("生成便捷登录key失败！");