From a8949c03a4f733f800c1a86d9b7f2c0bc7e79ace Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 29 七月 2022 14:10:14 +0800
Subject: [PATCH] changes
---
dao/src/main/resources/mapper/AirEquipmentMapper.xml | 1 +
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java | 13 ++++++++++---
dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java | 5 +++++
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java b/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java
index 97f09af..81a4963 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java
+++ b/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;
diff --git a/dao/src/main/resources/mapper/AirEquipmentMapper.xml b/dao/src/main/resources/mapper/AirEquipmentMapper.xml
index d17c0f8..1b3f150 100644
--- a/dao/src/main/resources/mapper/AirEquipmentMapper.xml
+++ b/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">
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
index 8a27dd5..4aaf052 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
+++ b/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() + " 琚搷浣滅敤鎴穒d锛�" + userId;
+
+
//鑾峰彇
if (type == 1) {
+ content += "鎿嶄綔绫诲瀷:鑾峰彇key";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鎿嶄綔鐢ㄦ埛key", content);
return "鐢ㄦ埛鐨勪究鎹风櫥褰昸ey涓猴細" + 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澶辫触锛�");
--
Gitblit v1.9.3