From a3646e32c81cd62886405a77c4c89aad7fb857e7 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Tue, 31 Aug 2021 13:05:14 +0800 Subject: [PATCH] screen-common 更新kafka主题名称常量类 --- screen-manage/src/main/java/com/moral/api/service/impl/OrganizationLayoutServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 42 insertions(+), 8 deletions(-) diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationLayoutServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationLayoutServiceImpl.java index 2d9a0a2..85dd6ed 100644 --- a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationLayoutServiceImpl.java +++ b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationLayoutServiceImpl.java @@ -1,14 +1,20 @@ package com.moral.api.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.moral.api.entity.OrganizationLayout; import com.moral.api.mapper.OrganizationLayoutMapper; import com.moral.api.service.OrganizationLayoutService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.moral.api.util.LogUtils; +import com.moral.constant.Constants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -27,6 +33,9 @@ @Autowired(required = false) private OrganizationLayoutMapper organizationLayoutMapper; + @Autowired + private LogUtils logUtils; + @Override public List<Map<String, Object>> getData(Map map) { int organization_id = Integer.parseInt(map.get("organization_id").toString()); @@ -34,6 +43,7 @@ QueryWrapper<OrganizationLayout> wrapper_organizationLayout = new QueryWrapper<>(); wrapper_organizationLayout.eq("organization_id",organization_id); wrapper_organizationLayout.eq("version_id",version_id); + wrapper_organizationLayout.eq("is_delete",Constants.NOT_DELETE); List<Map<String,Object>> organizationLayouts = new ArrayList<>(); organizationLayouts = organizationLayoutMapper.selectMaps(wrapper_organizationLayout); return organizationLayouts; @@ -41,18 +51,42 @@ @Transactional @Override - public void delete(Map map) { + public void setUp(Map map, List<OrganizationLayout> list) { int organization_id = Integer.parseInt(map.get("organization_id").toString()); int version_id = Integer.parseInt(map.get("version_id").toString()); QueryWrapper<OrganizationLayout> wrapper_organizationLayout = new QueryWrapper<>(); wrapper_organizationLayout.eq("organization_id",organization_id); wrapper_organizationLayout.eq("version_id",version_id); - organizationLayoutMapper.delete(wrapper_organizationLayout); - } - - @Transactional - @Override - public void insertList(List<OrganizationLayout> list) { - organizationLayoutMapper.insertList(list); + wrapper_organizationLayout.eq("is_delete",Constants.NOT_DELETE); + List<OrganizationLayout> organizationLayouts = organizationLayoutMapper.selectList(wrapper_organizationLayout); + //int delCount = organizationLayoutMapper.delete(wrapper_organizationLayout); + OrganizationLayout organizationLayout_update = new OrganizationLayout(); + organizationLayout_update.setIsDelete(Constants.DELETE); + int delCount = organizationLayoutMapper.update(organizationLayout_update,wrapper_organizationLayout); + if (delCount>0){ + //������������������ + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String content = "������������������������������id���"+organization_id+"���������id���"+version_id+";"+"id:"; + for (OrganizationLayout organizationLayout:organizationLayouts) { + content = content +organizationLayout.getId()+" "; + } + content = content+";"; + logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE); + } + if (!ObjectUtils.isEmpty(list) && list.size()>0){ + organizationLayoutMapper.insertList(list); + QueryWrapper<OrganizationLayout> wrapper_organizationLayoutIns = new QueryWrapper<>(); + wrapper_organizationLayoutIns.eq("organization_id",organization_id); + wrapper_organizationLayoutIns.eq("version_id",version_id); + List<OrganizationLayout> organizationLayoutList = organizationLayoutMapper.selectList(wrapper_organizationLayout); + //������������������ + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String contentInsert = "������������������������������id���"+organization_id+"���������id���"+version_id+";"+"id:"; + for (OrganizationLayout organizationLayout:organizationLayoutList) { + contentInsert = contentInsert + organizationLayout.getId()+" "; + } + contentInsert = contentInsert+";"; + logUtils.saveOperationForManage(request,contentInsert,Constants.INSERT_OPERATE_TYPE); + } } } -- Gitblit v1.8.0