From ba4993e6eb1c9456d4c40a186fd8284ad7ad9ac2 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 15 Apr 2021 17:44:26 +0800
Subject: [PATCH] 添加列表根据父菜单和order排序
---
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 386 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 385 insertions(+), 1 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 827683d..9a6a587 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,10 +1,37 @@
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;
+import com.moral.api.config.mybatis.wrapper.NullFilterWrapper;
import com.moral.api.entity.Organization;
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.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 javax.servlet.http.HttpServletRequest;
+import java.util.*;
/**
* <p>
@@ -12,9 +39,366 @@
* </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: ������������������
+ * @Param: [organizationInsertForm]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/3/22
+ */
+ @Override
+ @Transactional
+ public OrganizationDTO insertOrganization(OrganizationInsertForm organizationInsertForm) {
+ OrganizationDTO organizationDTO = new OrganizationDTO();
+ QueryWrapper<Organization> queryWrapper = new QueryWrapper<>();
+ //form������entity
+ Organization organization = organizationInsertForm.formConvertEntity();
+ //������������������������������������
+ Organization existOrganization = new Organization();
+ existOrganization.setName(organization.getName());
+ existOrganization.setIsDelete(Constants.NOT_DELETE);
+ queryWrapper.setEntity(existOrganization);
+ Organization existOrganizationResult = organizationMapper.selectOne(queryWrapper);
+ if (!ObjectUtils.isEmpty(existOrganizationResult)) {
+ organizationDTO.setCode(ResponseCodeEnum.ORGANIZATION_EXIST.getCode());
+ organizationDTO.setMsg(ResponseCodeEnum.ORGANIZATION_EXIST.getMsg());
+ return organizationDTO;
+ }
+ //���������������������������
+ Integer parentId = organization.getParentId();
+ Organization parentOrganization = new Organization();
+ if (!ObjectUtils.isEmpty(parentId)) {
+ parentOrganization.setId(parentId);
+ parentOrganization.setIsDelete(Constants.NOT_DELETE);
+ queryWrapper.setEntity(parentOrganization);
+ parentOrganization = organizationMapper.selectOne(queryWrapper);
+ if (ObjectUtils.isEmpty(parentOrganization)) {
+ organizationDTO.setCode(ResponseCodeEnum.ORGANIZATION_PARENT_NOT_EXIST.getCode());
+ organizationDTO.setMsg(ResponseCodeEnum.ORGANIZATION_PARENT_NOT_EXIST.getMsg());
+ return organizationDTO;
+ }
+ }
+ //������������
+ 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(),Constants.INSERT_OPERATE_TYPE);
+ return organizationDTO;
+ }
+
+ /**
+ * @Description: ������������������
+ * @Param: [organizationUpdateForm]
+ * @return: com.moral.api.pojo.dto.organization.OrganizationDTO
+ * @Author: ���������
+ * @Date: 2021/3/24
+ */
+ @Override
+ @Transactional
+ public OrganizationDTO updateOrganization(OrganizationUpdateForm organizationUpdateForm) {
+ OrganizationDTO organizationDTO = new OrganizationDTO();
+ //form���entity
+ Organization organization = organizationUpdateForm.formConvertEntity();
+
+ //������������������������
+ QueryWrapper<Organization> existWrapper = new QueryWrapper<>();
+ Organization existOrganization = new Organization();
+ existOrganization.setId(organization.getId());
+ existOrganization.setIsDelete(Constants.NOT_DELETE);
+ existWrapper.setEntity(existOrganization);
+ existOrganization = organizationMapper.selectOne(existWrapper);
+ if (ObjectUtils.isEmpty(existOrganization)) {
+ organizationDTO.setCode(ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getCode());
+ organizationDTO.setMsg(ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getMsg());
+ return organizationDTO;
+ }
+
+ //������������������������������������������������������
+ Integer parentId = organization.getParentId();
+ Organization parentOrganization = new Organization();
+ if (!ObjectUtils.isEmpty(parentId) && parentId != 0) {
+ QueryWrapper<Organization> existParentWrapper = new QueryWrapper<>();
+ parentOrganization.setId(parentId);
+ parentOrganization.setIsDelete(Constants.NOT_DELETE);
+ existParentWrapper.setEntity(parentOrganization);
+ parentOrganization = organizationMapper.selectOne(existParentWrapper);
+ if (ObjectUtils.isEmpty(parentOrganization)) {
+ organizationDTO.setCode(ResponseCodeEnum.ORGANIZATION_PARENT_NOT_EXIST.getCode());
+ organizationDTO.setMsg(ResponseCodeEnum.ORGANIZATION_PARENT_NOT_EXIST.getMsg());
+ return organizationDTO;
+ }
+ }
+
+ //������������
+ organizationMapper.updateById(organization);
+
+ //������������������������
+ organization = organizationMapper.selectById(organization.getId());
+
+ //������DTO������
+ organizationDTO.setParentOrganization(parentOrganization);
+ organizationDTO.setOrganization(organization);
+ organizationDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ organizationDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+
+ //������������������
+ insertUpdateLog(organizationUpdateForm,organization,existOrganization);
+
+ return organizationDTO;
+ }
+
+ /**
+ * @Description: ������������������
+ * @Param: [organizationDeleteForm]
+ * @return: com.moral.api.pojo.dto.organization.OrganizationDTO
+ * @Author: ���������
+ * @Date: 2021/3/25
+ */
+ @Override
+ @Transactional
+ public OrganizationDTO deleteOrganization(OrganizationDeleteForm form) {
+ OrganizationDTO dto = new OrganizationDTO();
+ //������
+ Integer id = form.getOrganizationId();
+ //������������������������
+ Organization existOrganization = new Organization();
+ existOrganization.setIsDelete(Constants.NOT_DELETE);
+ existOrganization.setId(id);
+ QueryWrapper queryExistWrapper = new QueryWrapper();
+ queryExistWrapper.setEntity(existOrganization);
+ existOrganization = organizationMapper.selectOne(queryExistWrapper);
+ if (ObjectUtils.isEmpty(existOrganization)) {
+ dto.setCode(ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getCode());
+ 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);
+ }
+
+ //������������������
+ 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(),Constants.DELETE_OPERATE_TYPE);
+
+ return dto;
+ }
+
+ /**
+ * @Description: ������������������
+ * @Param: [organizationQueryForm]
+ * @return: com.moral.api.pojo.dto.organization.OrganizationQueryDTO
+ * @Author: ���������
+ * @Date: 2021/3/25
+ */
+ @Override
+ public OrganizationQueryDTO queryOrganization(OrganizationQueryForm organizationQueryForm) {
+ OrganizationQueryDTO dto = new OrganizationQueryDTO();
+ //������
+ Integer pageCount = organizationQueryForm.getPage();
+ Integer size = organizationQueryForm.getSize();
+ Integer parentId = organizationQueryForm.getParentId();
+ String name = organizationQueryForm.getName();
+ Integer provinceCode = organizationQueryForm.getProvinceCode();
+ Integer cityCode = organizationQueryForm.getCityCode();
+ Integer areaCode = organizationQueryForm.getAreaCode();
+ String phone = organizationQueryForm.getPhone();
+ String email = organizationQueryForm.getEmail();
+ String wechat = organizationQueryForm.getWechat();
+ String isDelete = organizationQueryForm.getIsDelete();
+ String order = organizationQueryForm.getOrder();
+ String orderType = organizationQueryForm.getOrderType();
+ Date createStartTime = organizationQueryForm.getCreateStartTime();
+ Date createEndTime = DateUtils.getDateOfDay(organizationQueryForm.getCreateEndTime(), 1);
+ Date expireStartTime = organizationQueryForm.getExpireStartTime();
+ Date expireEndTime = DateUtils.getDateOfDay(organizationQueryForm.getExpireEndTime(), 1);
+
+ //������������
+ Page<Organization> page = new Page<>(pageCount, size);
+ NullFilterWrapper<Organization> queryWrapper = new NullFilterWrapper<>();
+
+ queryWrapper.eq("parent_id", parentId);
+ queryWrapper.like("name", name);
+ queryWrapper.eq("province_code", provinceCode);
+ queryWrapper.eq("city_code", cityCode);
+ queryWrapper.eq("area_code", areaCode);
+ queryWrapper.like("phone", phone);
+ queryWrapper.like("email", email);
+ queryWrapper.like("wechat", wechat);
+ queryWrapper.between("create_time", createStartTime, createEndTime);
+ queryWrapper.between("expire_time", expireStartTime, expireEndTime);
+
+ if (!ObjectUtils.isEmpty(isDelete)) {
+ queryWrapper.eq("is_delete", isDelete);
+ } else {
+ queryWrapper.eq("is_delete", Constants.NOT_DELETE);
+ }
+
+ //������������
+ if (!ObjectUtils.isEmpty(order)) {
+ if (!ObjectUtils.isEmpty(orderType)) {
+ if (orderType.equals(Constants.ORDER_ASC))
+ queryWrapper.orderByAsc(ConvertUtils.toLine(order));
+ else
+ queryWrapper.orderByDesc(ConvertUtils.toLine(order));
+ }
+ }
+
+ //������������
+ 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());//���������������
+ //���������������������
+ changeAddressByOrganization(child);
+ resultDto.setOrganization(child);
+ resultDto.setParentOrganization(parent);
+ organizationDTOS.add(resultDto);
+ }
+
+ dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+ dto.setOrganizationDTOS(organizationDTOS);
+ dto.setCurrent(page.getCurrent());
+ dto.setPage(page.getPages());
+ dto.setSize(page.getSize());
+ dto.setTotal(page.getTotal());
+ return dto;
+ }
+
+
+ /**
+ * @Description: ���organization���address���������provinceName cityName areaName������������
+ * @Param: [organization]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/4/2
+ */
+ private 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());
+ }
+
+ /**
+ * @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);
+ }
+
+
}
--
Gitblit v1.8.0