From 93fe0b66e85e95e3a7e77a28504d6d289b6906b9 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 08 Oct 2021 13:11:22 +0800
Subject: [PATCH] screen-manage screen-api 更改拦截器逻辑，记录token无效的请求IP以及URL。 manage记录到数据库日志中 api记录在日志文件中
---
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 83 ++++++++++++++++-------------------------
1 files changed, 32 insertions(+), 51 deletions(-)
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 7dd0a4a..549adb9 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
@@ -1,7 +1,5 @@
package com.moral.api.service.impl;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -9,7 +7,6 @@
import com.moral.api.entity.MonitorPoint;
import com.moral.api.entity.Organization;
import com.moral.api.entity.User;
-import com.moral.api.mapper.MonitorPointMapper;
import com.moral.api.mapper.OrganizationMapper;
import com.moral.api.mapper.UserMapper;
import com.moral.api.pojo.dto.organization.OrganizationDTO;
@@ -27,17 +24,12 @@
import com.moral.pojo.CompareFieldResult;
import com.moral.util.ConvertUtils;
import com.moral.util.DateUtils;
+
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.ConfigurationProperties;
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.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.*;
import java.util.function.Predicate;
@@ -50,14 +42,10 @@
* @since 2021-04-06
*/
@Service
-@ConfigurationProperties(prefix = "log-aspect")
public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Organization> implements OrganizationService {
@Autowired
OrganizationMapper organizationMapper;
-
- @Autowired
- LogUtils logUtils;
@Autowired
UserService userService;
@@ -67,12 +55,6 @@
@Autowired
MonitorPointService monitorPointService;
-
- Map<String, String> organizationFormMap;
-
- public void setOrganizationFormMap(Map<String, String> organizationFormMap) {
- this.organizationFormMap = organizationFormMap;
- }
/**
* @Description: ������������������
@@ -150,11 +132,10 @@
organizationDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
//������������������
- updateLog(oldOrganization,organization);
+ updateLog(oldOrganization, organization);
return organizationDTO;
}
-
/**
@@ -173,7 +154,7 @@
//������������������������������
List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsByOrganizationId(id);
- if(!ObjectUtils.isEmpty(monitorPoints)){
+ if (!ObjectUtils.isEmpty(monitorPoints)) {
dto.setCode(ResponseCodeEnum.ORGANIZATION_EXIST_MONITORPOINT.getCode());
dto.setMsg(ResponseCodeEnum.ORGANIZATION_EXIST_MONITORPOINT.getMsg());
return dto;
@@ -206,7 +187,7 @@
//���������������������������������������������������������������������������������
for (Integer childId : childrenId) {
List<MonitorPoint> childMonitorPoints = monitorPointService.getMonitorPointsByOrganizationId(childId);
- if(!ObjectUtils.isEmpty(childMonitorPoints)){
+ if (!ObjectUtils.isEmpty(childMonitorPoints)) {
dto.setCode(ResponseCodeEnum.CHILDREN_ORGANIZATION_EXIST_MONITORPOINT.getCode());
dto.setMsg(ResponseCodeEnum.CHILDREN_ORGANIZATION_EXIST_MONITORPOINT.getMsg());
return dto;
@@ -217,7 +198,7 @@
updateWrapper.set("is_delete", Constants.DELETE);
organizationMapper.update(null, updateWrapper);
//���������������������������
- childrenId.forEach(value->userService.deleteUsersByOrganizationId(value));
+ childrenId.forEach(value -> userService.deleteUsersByOrganizationId(value));
} else {//���������
//���������������������������id
@@ -252,7 +233,7 @@
content.append("���������������������;");
else
content.append(";");
- logUtils.saveOperationForManage(content.toString(), Constants.DELETE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(content.toString(), Constants.DELETE_OPERATE_TYPE);
return dto;
}
@@ -351,13 +332,13 @@
}
/**
- * @Description: ������form���id���������������������������������
- * ������id������������������������id������id������������������������������������
- * @Param: [from]
- * @return: com.moral.api.pojo.dto.organization.OrganizationQueryNamesDTO
- * @Author: ���������
- * @Date: 2021/5/7
- */
+ * @Description: ������form���id���������������������������������
+ * ������id������������������������id������id������������������������������������
+ * @Param: [from]
+ * @return: com.moral.api.pojo.dto.organization.OrganizationQueryNamesDTO
+ * @Author: ���������
+ * @Date: 2021/5/7
+ */
@Override
public OrganizationQueryNamesDTO queryNames(OrganizationQueryNamesForm form) {
OrganizationQueryNamesDTO dto = new OrganizationQueryNamesDTO();
@@ -369,7 +350,7 @@
//������������������
List<Organization> organizations = organizationMapper.selectList(queryWrapper);
//������form������������id,���������������������������������������������
- if(!ObjectUtils.isEmpty(id)){
+ if (!ObjectUtils.isEmpty(id)) {
List<Organization> children = getAllChildrenOrganization(id);
List<Integer> thisAndchildrenIds = new ArrayList<>();//���id���������������������������id������
thisAndchildrenIds.add(id);
@@ -379,7 +360,7 @@
organizations.removeIf(new Predicate<Organization>() {//������
@Override
public boolean test(Organization organization) {
- if(thisAndchildrenIds.contains(organization.getId()))
+ if (thisAndchildrenIds.contains(organization.getId()))
return true;
return false;
}
@@ -400,7 +381,8 @@
* @Author: ���������
* @Date: 2021/4/14
*/
- private List<Organization> getAllChildrenOrganization(Integer parentId) {
+ @Override
+ public List<Organization> getAllChildrenOrganization(Integer parentId) {
List<Organization> children = new ArrayList<>();
recursionQueryChildren(parentId, children);
return children;
@@ -429,23 +411,23 @@
}
/**
- * @Description: ������������������������
- * @Param: [organization]
- * @return: void
- * @Author: ���������
- * @Date: 2021/8/25
- */
- private void insertLog(Organization organization){
+ * @Description: ������������������������
+ * @Param: [organization]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/8/25
+ */
+ private void insertLog(Organization organization) {
StringBuilder content = new StringBuilder();
content.append("������������������").append(organization.getName() + ";");
- logUtils.saveOperationForManage(content.toString(), Constants.INSERT_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(content.toString(), Constants.INSERT_OPERATE_TYPE);
}
- public void updateLog(Organization oldOrganization,Organization newOrganization){
+ public void updateLog(Organization oldOrganization, Organization newOrganization) {
List<CompareFieldResult> results = CompareFieldUtils.compare(Organization.class, oldOrganization, newOrganization);
for (CompareFieldResult result : results) {
//���������������������������
- if(result.getFieldName().equals("parentId")){
+ if (result.getFieldName().equals("parentId")) {
//���������id���������������
String oldData = result.getOldData();
String newData = result.getNewData();
@@ -466,17 +448,17 @@
}
//������������������������
- if(result.getFieldName().equals("expireTime")){
+ if (result.getFieldName().equals("expireTime")) {
//DateToString���������������������yyyy-MM-dd
String oldData = result.getOldData();
String newData = result.getNewData();
- if(oldData!=null){
+ if (oldData != null) {
Date oldDate = DateUtils.dateStringToDate(oldData);
oldData = DateUtils.dateToDateString(oldDate, "yyyy-MM-dd");
}
- if(newData!=null){
+ if (newData != null) {
Date newDate = DateUtils.dateStringToDate(newData);
newData = DateUtils.dateToDateString(newDate, "yyyy-MM-dd");
}
@@ -487,9 +469,8 @@
}
}
- String content = CompareFieldUtils.resultsConvertContent(results, "���������������");
- logUtils.saveOperationForManage(content, Constants.UPDATE_OPERATE_TYPE);
+ String content = CompareFieldUtils.resultsConvertContent(results, "���������������;���������������" + oldOrganization.getName());
+ LogUtils.saveOperationForManage(content, Constants.UPDATE_OPERATE_TYPE);
}
-
}
--
Gitblit v1.8.0