From 4b8e20b85c1e114aacdab2a31bd851012f71b755 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 27 Apr 2021 17:11:20 +0800
Subject: [PATCH] 递归查询前端传入的所有子菜单的父菜单
---
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 244 +++++++++++++++++++++++++++++++-----------------
1 files changed, 158 insertions(+), 86 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 705f087..d7ac38c 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
@@ -10,10 +10,8 @@
import com.moral.api.mapper.OrganizationMapper;
import com.moral.api.pojo.dto.organization.OrganizationDTO;
import com.moral.api.pojo.dto.organization.OrganizationQueryDTO;
-import com.moral.api.pojo.form.organization.OrganizationDeleteForm;
-import com.moral.api.pojo.form.organization.OrganizationInsertForm;
-import com.moral.api.pojo.form.organization.OrganizationQueryForm;
-import com.moral.api.pojo.form.organization.OrganizationUpdateForm;
+import com.moral.api.pojo.dto.organization.OrganizationQueryNameDTO;
+import com.moral.api.pojo.form.organization.*;
import com.moral.api.service.OrganizationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.util.LogUtils;
@@ -32,6 +30,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.*;
+import java.util.function.Predicate;
/**
* <p>
@@ -64,6 +63,8 @@
* @Author: ���������
* @Date: 2021/3/22
*/
+
+
@Override
@Transactional
public OrganizationDTO insertOrganization(OrganizationInsertForm organizationInsertForm) {
@@ -108,8 +109,8 @@
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
StringBuilder content = new StringBuilder();
- content.append("������������������").append(organization.getName());
- logUtils.saveOperationForManage(request, content.toString());
+ content.append("������������������").append(organization.getName() + ";");
+ logUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
return organizationDTO;
}
@@ -169,50 +170,7 @@
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());
+ insertUpdateLog(organizationUpdateForm, organization, existOrganization);
return organizationDTO;
}
@@ -230,6 +188,7 @@
OrganizationDTO dto = new OrganizationDTO();
//������
Integer id = form.getOrganizationId();
+
//������������������������
Organization existOrganization = new Organization();
existOrganization.setIsDelete(Constants.NOT_DELETE);
@@ -242,22 +201,40 @@
dto.setMsg(ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getMsg());
return dto;
}
+
//������������������
UpdateWrapper deleteWrapper = new UpdateWrapper();
deleteWrapper.eq("id", id);
deleteWrapper.set("is_delete", Constants.DELETE);
organizationMapper.update(null, deleteWrapper);
- //������������������������������������������������������������������parentId���0
- if (form.getDeleteChildren().equals(Constants.DELETE_CHILDREN_ORG)) {
- UpdateWrapper deleteChildrenWrapper = new UpdateWrapper();
- deleteChildrenWrapper.eq("parent_id", id);
- deleteChildrenWrapper.set("is_delete", Constants.DELETE);
- organizationMapper.update(null, deleteChildrenWrapper);
- } else {
- UpdateWrapper updateChildrenWrapper = new UpdateWrapper();
- updateChildrenWrapper.eq("parent_id", id);
- updateChildrenWrapper.set("parent_id", 0);
- organizationMapper.update(null, updateChildrenWrapper);
+
+ //���������������������������
+ List<Organization> children = getAllChildrenOrganization(existOrganization);
+ if (!ObjectUtils.isEmpty(children)) {//���������������������
+ //������������������������������������������������������������������������������������������������������������������
+ UpdateWrapper updateWrapper = new UpdateWrapper();
+ if (form.getDeleteChildren().equals(Constants.DELETE_CHILDREN_ORG)) {//���������������������
+ //������������������������id���������������
+ List<Integer> childrenId = new ArrayList<>();
+ children.forEach(value -> {
+ childrenId.add(value.getId());
+ });
+ //������������
+ updateWrapper.in("id", childrenId);
+ updateWrapper.set("is_delete", Constants.DELETE);
+ organizationMapper.update(null, updateWrapper);
+ } else {//���������
+ //���������������������������id
+ List<Integer> childrenId = new ArrayList<>();
+ children.forEach(value -> {
+ if (value.getParentId().equals(id))
+ childrenId.add(value.getId());
+ });
+ //������������
+ updateWrapper.in("id", childrenId);
+ updateWrapper.set("parent_id", 0);
+ organizationMapper.update(null, updateWrapper);
+ }
}
//������������������
@@ -268,9 +245,11 @@
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());
+ if (form.getDeleteChildren().equals(Constants.DELETE_CHILDREN_ORG))
+ content.append("���������������������;");
+ else
+ content.append(";");
+ logUtils.saveOperationForManage(request, content.toString(), Constants.DELETE_OPERATE_TYPE);
return dto;
}
@@ -343,8 +322,6 @@
for (Organization child : organizations) {
OrganizationDTO resultDto = new OrganizationDTO();
Organization parent = organizationMapper.selectById(child.getParentId());//���������������
- //���������������������
- changeAddressByOrganization(child);
resultDto.setOrganization(child);
resultDto.setParentOrganization(parent);
organizationDTOS.add(resultDto);
@@ -361,28 +338,123 @@
}
/**
- * @Description: ���organization���address���������provinceName cityName areaName������������
- * @Param: [organization]
+ * @Description: ������������������������������Id���������������
+ * @Param: [organizationQueryNameForm]
+ * @return: com.moral.api.pojo.dto.organization.OrganizationQueryNameDTO
+ * @Author: ���������
+ * @Date: 2021/4/13
+ */
+ @Override
+ public OrganizationQueryNameDTO queryOrganizationNames(OrganizationQueryNameForm form) {
+ OrganizationQueryNameDTO dto = new OrganizationQueryNameDTO();
+ //������
+ String name = form.getName();
+ //������������������
+ NullFilterWrapper<Organization> queryWrapper = new NullFilterWrapper();
+ queryWrapper.like("name", name);
+ queryWrapper.eq("is_delete", Constants.NOT_DELETE);
+ //������
+ List<Organization> organizations = organizationMapper.selectList(queryWrapper);
+
+ //������������������
+ dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+ dto.setOrganizations(organizations);
+ return dto;
+ }
+
+
+ /**
+ * @Description: ���������������������������
+ * @Param: [updateForm, newOrganization, oldOrganization]
* @return: void
* @Author: ���������
- * @Date: 2021/4/2
+ * @Date: 2021/4/8
*/
- 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());
+ 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(Organization parent) {
+ List<Organization> children = new ArrayList<>();
+ recursionQueryChildren(parent, children);
+ return children;
+ }
+
+ /**
+ * @Description: ���������������������������������������������������children���
+ * @Param: [parent, children]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/4/14
+ */
+ private void recursionQueryChildren(Organization parent, List<Organization> children) {
+ Integer parentId = parent.getId();
+ QueryWrapper<Organization> queryWrapper = new QueryWrapper();
+ queryWrapper.eq("is_delete", Constants.NOT_DELETE);
+ queryWrapper.eq("parent_id", parentId);
+ List<Organization> organizations = organizationMapper.selectList(queryWrapper);
+ if (!ObjectUtils.isEmpty(organizations)) {
+ children.addAll(organizations);
+ for (Organization organization : organizations) {
+ recursionQueryChildren(organization, children);
+ }
+ } else {
+ return;
+ }
+ }
+
+
}
--
Gitblit v1.8.0