From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 178 +++++++++++++++++++++++++++--------------------------------
1 files changed, 82 insertions(+), 96 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 5e40443..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;
@@ -20,20 +17,19 @@
import com.moral.api.service.OrganizationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.UserService;
+import com.moral.api.util.CompareFieldUtils;
import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
+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.util.*;
import java.util.function.Predicate;
@@ -46,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;
@@ -64,12 +56,6 @@
@Autowired
MonitorPointService monitorPointService;
- Map<String, String> organizationFormMap;
-
- public void setOrganizationFormMap(Map<String, String> organizationFormMap) {
- this.organizationFormMap = organizationFormMap;
- }
-
/**
* @Description: ������������������
* @Param: [organizationInsertForm]
@@ -77,8 +63,6 @@
* @Author: ���������
* @Date: 2021/3/22
*/
-
-
@Override
@Transactional
public OrganizationDTO insertOrganization(OrganizationInsertForm organizationInsertForm) {
@@ -105,10 +89,7 @@
organizationDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
//������������������
- HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
- StringBuilder content = new StringBuilder();
- content.append("������������������").append(organization.getName() + ";");
- logUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
+ insertLog(organization);
return organizationDTO;
}
@@ -151,11 +132,10 @@
organizationDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
//������������������
- insertUpdateLog(organizationUpdateForm, organization, oldOrganization);
+ updateLog(oldOrganization, organization);
return organizationDTO;
}
-
/**
@@ -174,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;
@@ -207,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;
@@ -218,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
@@ -247,14 +227,13 @@
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
//������������������
- HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
StringBuilder content = new StringBuilder();
content.append("������������������").append(existOrganization.getName());
if (form.getDeleteChildren().equals(Constants.DELETE_CHILDREN_ORG))
content.append("���������������������;");
else
content.append(";");
- logUtils.saveOperationForManage(request, content.toString(), Constants.DELETE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(content.toString(), Constants.DELETE_OPERATE_TYPE);
return dto;
}
@@ -353,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();
@@ -371,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);
@@ -381,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;
}
@@ -396,69 +375,14 @@
/**
- * @Description: ���������������������������
- * @Param: [updateForm, newOrganization, oldOrganization]
- * @return: void
- * @Author: ���������
- * @Date: 2021/4/8
- */
- private void insertUpdateLog(OrganizationUpdateForm updateForm, Organization newOrganization, Organization oldOrganization) {
- //������������������
- HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
- StringBuilder content = new StringBuilder();
- content.append("������������������").append(oldOrganization.getName()).append(";");
- //������������Map,���������������������������������
- Map<String, Object> newParameters = JSONObject.parseObject(JSON.toJSONString(updateForm), Map.class);
- Map<String, Object> oldParameters = JSONObject.parseObject(JSON.toJSONString(oldOrganization), Map.class);
- //������������������������Map���������������������������
- Set<String> keys = organizationFormMap.keySet();
- for (String key : keys) {
- String value = organizationFormMap.get(key);//���������������������
- if ("parentName".equals(key)) {//���������������������������
- if (updateForm.getParentId() != null) {//������������������������������������
- String oldParentName = "���";
- String newParentName = "���";
- if (!oldOrganization.getParentId().equals(0)) {
- oldParentName = organizationMapper.selectById(oldOrganization.getParentId()).getName();
- }
- if (!newOrganization.getParentId().equals(0)) {
- newParentName = organizationMapper.selectById(newOrganization.getParentId()).getName();
- }
- content.append(value + ":" + oldParentName + "->" + newParentName + ";");
- }
- } else if ("expireTime".equals(key)) {//expireTime������������������������
- if (updateForm.getExpireTime() != null) {
- Date oldExpireTime = oldOrganization.getExpireTime();
- Date newExpireTime = newOrganization.getExpireTime();
- String oldExpireTimeStr = DateUtils.dateToDateString(oldExpireTime, "yyyy-MM-dd");
- String newExpireTimeStr = DateUtils.dateToDateString(newExpireTime, "yyyy-MM-dd");
- content.append(value + ":" + oldExpireTimeStr + "->" + newExpireTimeStr + ";");
- }
- } else {//������������������
- if (newParameters.get(key) != null) {
- String newValue = "���";
- String oldValue = "���";
- if (newParameters.get(key) != null && !newParameters.get(key).equals(" ")) {
- newValue = String.valueOf(newParameters.get(key));
- }
- if (oldParameters.get(key) != null && !oldParameters.get(key).equals(" ")) {
- oldValue = String.valueOf(oldParameters.get(key));
- }
- content.append(value + ":" + oldValue + "->" + newValue + ";");
- }
- }
- }
- logUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
- }
-
- /**
* @Description: ������������������������������������
* @Param: []
* @return: java.util.List<com.moral.api.entity.Organization>
* @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;
@@ -486,5 +410,67 @@
}
}
+ /**
+ * @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);
+ }
+
+ 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")) {
+ //���������id���������������
+ String oldData = result.getOldData();
+ String newData = result.getNewData();
+
+ if (!oldData.equals("0"))
+ oldData = organizationMapper.selectById(Integer.parseInt(oldData)).getName();
+ else
+ oldData = "null";
+
+ if (!newData.equals("0"))
+ newData = organizationMapper.selectById(Integer.parseInt(newData)).getName();
+ else
+ newData = "null";
+
+ result.setNewData(newData);
+ result.setOldData(oldData);
+ result.setFieldAnnoName("���������");
+ }
+
+ //������������������������
+ if (result.getFieldName().equals("expireTime")) {
+ //DateToString���������������������yyyy-MM-dd
+ String oldData = result.getOldData();
+ String newData = result.getNewData();
+
+ if (oldData != null) {
+ Date oldDate = DateUtils.dateStringToDate(oldData);
+ oldData = DateUtils.dateToDateString(oldDate, "yyyy-MM-dd");
+ }
+
+ if (newData != null) {
+ Date newDate = DateUtils.dateStringToDate(newData);
+ newData = DateUtils.dateToDateString(newDate, "yyyy-MM-dd");
+ }
+
+ result.setNewData(newData);
+ result.setOldData(oldData);
+ result.setFieldAnnoName("������������");
+ }
+ }
+
+ String content = CompareFieldUtils.resultsConvertContent(results, "���������������;���������������" + oldOrganization.getName());
+ LogUtils.saveOperationForManage(content, Constants.UPDATE_OPERATE_TYPE);
+ }
}
--
Gitblit v1.8.0