From db070ecf27c6df1e9f7db15678d4eccab25ef39a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 29 Jul 2021 10:25:47 +0800
Subject: [PATCH] screen-api 字典类型以及字典数据添加日志功能
---
screen-manage/src/main/java/com/moral/api/util/LogUtils.java | 9 ++++
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 4 +-
screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java | 41 +++++++++++++-------
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 2 -
screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java | 13 ++++++
5 files changed, 48 insertions(+), 21 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 4a8b3f6..c7916b7 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -127,7 +127,7 @@
//������������������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
- content.append("������������������").append(device.getName()).append("���").append("mac���").append(mac);
+ content.append("������������������").append(device.getName()).append(":").append("mac���").append(mac);
logUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
}
@@ -203,7 +203,7 @@
Object o1 = method.invoke(oldDevice);
Object o2 = method.invoke(device);
if (o2 != null) {
- content.append(fieldName).append("���").append(o1).append("-->").append(o2).append("���");
+ content.append(fieldName).append("���").append(o1).append("-->").append(o2).append(":");
}
} catch (Exception e) {
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
index 5e40443..b9c95b3 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
@@ -77,8 +77,6 @@
* @Author: ���������
* @Date: 2021/3/22
*/
-
-
@Override
@Transactional
public OrganizationDTO insertOrganization(OrganizationInsertForm organizationInsertForm) {
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java
index 20efc91..08b24e5 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java
@@ -13,6 +13,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.SysDictTypeService;
import com.moral.api.util.CacheUtils;
+import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.constant.ResponseCodeEnum;
@@ -43,6 +44,8 @@
SysDictDataMapper sysDictDataMapper;
@Autowired
RedisTemplate redisTemplate;
+ @Autowired
+ LogUtils logUtils;
@Override
@Transactional
@@ -51,16 +54,23 @@
SysDictDataDTO dto = new SysDictDataDTO();
//������
Integer id = form.getId();
- //���������������������������������������������
+ //������������������������������������������������������
QueryWrapper existWrapper = new QueryWrapper();
existWrapper.eq("is_delete", Constants.NOT_DELETE);
existWrapper.eq("id", id);
SysDictData existData = sysDictDataMapper.selectOne(existWrapper);
+ SysDictType type = sysDictTypeService.getDictTypeById(existData.getDictTypeId());
//������������
UpdateWrapper deleteWrapper = new UpdateWrapper();
deleteWrapper.set("is_delete", Constants.DELETE);
deleteWrapper.eq("id", id);
sysDictDataMapper.update(null, deleteWrapper);
+ //������������
+ StringBuilder content = new StringBuilder("���������������������;");
+ content.append("������:"+type.getName()+"("+type.getDesc()+")"+";");
+ content.append("key:"+existData.getDataKey()+";");
+ content.append("value:"+existData.getDataValue()+";");
+ logUtils.saveOperationForManage(content.toString(),Constants.DELETE_OPERATE_TYPE);
//������������
refreshCache();
//������������������
@@ -79,6 +89,7 @@
existWrapper.eq("is_delete", Constants.NOT_DELETE);
existWrapper.eq("id", sysDictData.getId());
SysDictData existData = sysDictDataMapper.selectOne(existWrapper);
+ SysDictType type = sysDictTypeService.getDictTypeById(existData.getDictTypeId());
//������key������������
String key = sysDictData.getDataKey();
if (!ObjectUtils.isEmpty(key)) {
@@ -95,6 +106,12 @@
}
//������������
sysDictDataMapper.updateById(sysDictData);
+ //������������
+ StringBuilder content = new StringBuilder("���������������������;");
+ content.append("������:"+type.getName()+"("+type.getDesc()+")"+";");
+ content.append("key:"+existData.getDataKey()+";");
+ content.append("value:"+existData.getDataValue()+"->"+sysDictData.getDataValue()+";");
+ logUtils.saveOperationForManage(content.toString(),Constants.UPDATE_OPERATE_TYPE);
//������������
refreshCache();
//������������������
@@ -103,13 +120,7 @@
return dto;
}
- /**
- * @Description: ������������������id������������������������
- * @Param: [form]
- * @return: com.moral.api.pojo.dto.sysDictData.SysDictDataDTO
- * @Author: ���������
- * @Date: 2021/4/16
- */
+
@Override
public SysDictDataDTO insertData(SysDictDataInsertForm form) {
SysDictDataDTO dto = new SysDictDataDTO();
@@ -136,6 +147,12 @@
}
//������������
sysDictDataMapper.insert(sysDictData);
+ //������������
+ StringBuilder content = new StringBuilder("���������������������;");
+ content.append("������:"+type.getName()+"("+type.getDesc()+")"+";");
+ content.append("key:"+sysDictData.getDataKey()+";");
+ content.append("value:"+sysDictData.getDataValue()+";");
+ logUtils.saveOperationForManage(content.toString(),Constants.INSERT_OPERATE_TYPE);
//������������
refreshCache();
//������������������
@@ -144,13 +161,6 @@
return dto;
}
- /**
- * @Description: ���������������������������������������������
- * @Param: [typeName]
- * @return: java.util.Map<java.lang.String , java.lang.Object>
- * @Author: ���������
- * @Date: 2021/4/16
- */
@Override
public Map<String, Object> queryDataByTypeName(String typeName) {
Map<String, List<SysDictData>> datas = getAllDictData();
@@ -216,3 +226,4 @@
return result;
}
}
+
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
index fd27610..74d35c9 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
@@ -14,6 +14,7 @@
import com.moral.api.service.SysDictTypeService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.util.CacheUtils;
+import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.constant.ResponseCodeEnum;
@@ -22,7 +23,10 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -44,6 +48,8 @@
SysDictDataService sysDictDataService;
@Autowired
RedisTemplate redisTemplate;
+ @Autowired
+ LogUtils logUtils;
@Override
@Transactional
@@ -72,6 +78,9 @@
deleteDataWrapper.eq("dict_type_id",typeId);
deleteDataWrapper.set("is_delete",Constants.DELETE);
sysDictDataService.update(null,deleteDataWrapper);
+ //������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ logUtils.saveOperationForManage(request,"������������������:"+type.getName(),Constants.DELETE_OPERATE_TYPE);
//������������������
refreshCache();
//������������������
@@ -79,7 +88,6 @@
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
return dto;
}
-
@Override
@Transactional
@@ -129,6 +137,9 @@
}
//������������
sysDictTypeMapper.insert(sysDictType);
+ //������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ logUtils.saveOperationForManage(request,"������������������:"+sysDictType.getName(),Constants.INSERT_OPERATE_TYPE);
//������������
refreshCache();
//������������������
diff --git a/screen-manage/src/main/java/com/moral/api/util/LogUtils.java b/screen-manage/src/main/java/com/moral/api/util/LogUtils.java
index fbaac38..d87cc42 100644
--- a/screen-manage/src/main/java/com/moral/api/util/LogUtils.java
+++ b/screen-manage/src/main/java/com/moral/api/util/LogUtils.java
@@ -10,6 +10,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
@@ -24,7 +26,12 @@
public class LogUtils {
@Autowired
- public ManageLogMapper manageLogMapper;
+ private ManageLogMapper manageLogMapper;
+
+ public void saveOperationForManage(String content,String type){
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ saveOperationForManage(request,content,type);
+ }
/**
* @Description: ������������������
--
Gitblit v1.8.0