From 4d5eff3b824dac8e50400b2ec1114cba4ed6a87c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 07 Apr 2021 17:05:43 +0800
Subject: [PATCH] screen-manage 完成sysarea模块查询 拦截器逻辑代码完成 修改organization和accountBug
---
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 123 +++++++++++++++++++++++++++++++++++++---
1 files changed, 112 insertions(+), 11 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 ce8b1d6..705f087 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,5 +1,7 @@
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;
@@ -14,18 +16,22 @@
import com.moral.api.pojo.form.organization.OrganizationUpdateForm;
import com.moral.api.service.OrganizationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.ConvertUtils;
import com.moral.util.DateUtils;
+import lombok.Data;
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 java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
/**
* <p>
@@ -33,13 +39,23 @@
* </p>
*
* @author moral
- * @since 2021-03-09
+ * @since 2021-04-06
*/
@Service
+@ConfigurationProperties(prefix = "log-aspect")
public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Organization> implements OrganizationService {
@Autowired
OrganizationMapper organizationMapper;
+
+ @Autowired
+ LogUtils logUtils;
+
+ Map<String, String> organizationFormMap;
+
+ public void setOrganizationFormMap(Map<String, String> organizationFormMap) {
+ this.organizationFormMap = organizationFormMap;
+ }
/**
* @Description: ������������������
@@ -82,11 +98,18 @@
}
//������������
organizationMapper.insert(organization);
+
//������DTO������
organizationDTO.setParentOrganization(parentOrganization);
organizationDTO.setOrganization(organization);
organizationDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
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());
return organizationDTO;
}
@@ -136,7 +159,7 @@
//������������
organizationMapper.updateById(organization);
- //������������������������
+ //������������������������
organization = organizationMapper.selectById(organization.getId());
//������DTO������
@@ -144,6 +167,53 @@
organizationDTO.setOrganization(organization);
organizationDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
organizationDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append("������������������").append(organization.getName()).append(";");
+ //������������������Map
+ Map<String, Object> newParameters = JSONObject.parseObject(JSON.toJSONString(organizationUpdateForm), Map.class);
+ Map<String, Object> oldParameters = JSONObject.parseObject(JSON.toJSONString(existOrganization), Map.class);
+ Set<String> keys = organizationFormMap.keySet();
+ for (String key : keys) {
+ String value = organizationFormMap.get(key);
+ if ("parentName".equals(key)) {//���������������������������
+ if (organizationUpdateForm.getParentId() != null) {//������������������������������������
+ String oldParentName = "���";
+ String newParentName = "���";
+ if (!existOrganization.getParentId().equals(0)) {
+ oldParentName = organizationMapper.selectById(existOrganization.getParentId()).getName();
+ }
+ if (!organization.getParentId().equals(0)) {
+ newParentName = organizationMapper.selectById(organization.getParentId()).getName();
+ }
+ content.append(value + ":" + oldParentName + "->" + newParentName + ";");
+ }
+ } else if ("expireTime".equals(key)) {//expireTime������������������������
+ if (organizationUpdateForm.getExpireTime() != null) {
+ Date oldExpireTime = existOrganization.getExpireTime();
+ Date newExpireTime = organization.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());
+
return organizationDTO;
}
@@ -190,9 +260,18 @@
organizationMapper.update(null, updateChildrenWrapper);
}
+ //������������������
dto.setOrganization(existOrganization);
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("���������������������");
+ logUtils.saveOperationForManage(request, content.toString());
+
return dto;
}
@@ -214,8 +293,6 @@
Integer provinceCode = organizationQueryForm.getProvinceCode();
Integer cityCode = organizationQueryForm.getCityCode();
Integer areaCode = organizationQueryForm.getAreaCode();
- Long townCode = organizationQueryForm.getTownCode();
- Long villageCode = organizationQueryForm.getVillageCode();
String phone = organizationQueryForm.getPhone();
String email = organizationQueryForm.getEmail();
String wechat = organizationQueryForm.getWechat();
@@ -236,8 +313,6 @@
queryWrapper.eq("province_code", provinceCode);
queryWrapper.eq("city_code", cityCode);
queryWrapper.eq("area_code", areaCode);
- queryWrapper.eq("town_code", townCode);
- queryWrapper.eq("village_code", villageCode);
queryWrapper.like("phone", phone);
queryWrapper.like("email", email);
queryWrapper.like("wechat", wechat);
@@ -264,10 +339,12 @@
Page<Organization> resultPage = organizationMapper.selectPage(page, queryWrapper);
List<Organization> organizations = resultPage.getRecords();
List<OrganizationDTO> organizationDTOS = new ArrayList<>();
- //������������������������������
+ //������������������������������������������organization���DTO���
for (Organization child : organizations) {
OrganizationDTO resultDto = new OrganizationDTO();
- Organization parent = organizationMapper.selectById(child.getParentId());
+ Organization parent = organizationMapper.selectById(child.getParentId());//���������������
+ //���������������������
+ changeAddressByOrganization(child);
resultDto.setOrganization(child);
resultDto.setParentOrganization(parent);
organizationDTOS.add(resultDto);
@@ -283,5 +360,29 @@
return dto;
}
+ /**
+ * @Description: ���organization���address���������provinceName cityName areaName������������
+ * @Param: [organization]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/4/2
+ */
+ public void changeAddressByOrganization(Organization organization) {
+ String provinceName = organization.getProvinceName();
+ String cityName = organization.getCityName();
+ String areaName = organization.getAreaName();
+ String address = organization.getAddress();
+ StringBuilder newAddress = new StringBuilder();
+ if (provinceName != null)
+ newAddress.append(provinceName);
+ if (cityName != null)
+ newAddress.append(cityName);
+ if (areaName != null)
+ newAddress.append(areaName);
+ if (address != null)
+ newAddress.append(address);
+
+ organization.setAddress(newAddress.toString());
+ }
}
--
Gitblit v1.8.0