changes

liuhaonan

2022-07-29 a8949c03a4f733f800c1a86d9b7f2c0bc7e79ace

changes

 dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java

@@ -34,6 +34,11 @@
     */
    private String mac;

    /**
     * 大气mac
     */
    private String airMac;

    @TableField(exist = false)
    private Integer state;


 dao/src/main/resources/mapper/AirEquipmentMapper.xml

@@ -8,6 +8,7 @@
        <id property="id" column="id" jdbcType="BIGINT"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
        <result property="mac" column="mac" jdbcType="VARCHAR"/>
        <result property="airMac" column="air_mac" jdbcType="VARCHAR"/>
    </resultMap>

    <sql id="Base_Column_List">

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

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

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.map.MapUtil;
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 +21,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;
@@ -323,8 +320,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 +337,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失败！");