From 8a82d07ca9eb56f12826bee3a55e3ced6876d66e Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Fri, 12 Jan 2024 15:53:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E7=82=B9=E7=AE=A1=E7=90=86=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=A0=87=E7=AD=BE=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/entity/SiteInfoTag.java | 11 +++ .../resources/mapper/SiteInfoTagMapper.xml | 6 +- .../service/impl/SiteInfoServiceImpl.java | 76 +++++++++---------- .../service/impl/SiteInfoServiceImpl.java | 6 ++ 4 files changed, 57 insertions(+), 42 deletions(-) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SiteInfoTag.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SiteInfoTag.java index 117606b..2a12808 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SiteInfoTag.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SiteInfoTag.java @@ -26,6 +26,9 @@ public class SiteInfoTag extends BaseEntity @Excel(name = "标签主键") private Long tagId; + /** 标签类型 */ + private Integer tagType; + /** 状态（0正常 1禁用） */ @Excel(name = "状态", readConverterExp = "0=正常,1=禁用") private Long status; @@ -67,6 +70,14 @@ public class SiteInfoTag extends BaseEntity return status; } + public Integer getTagType() { + return tagType; + } + + public void setTagType(Integer tagType) { + this.tagType = tagType; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoTagMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoTagMapper.xml index 84c7b19..e7d3b0b 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoTagMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoTagMapper.xml @@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -17,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, site_id, tag_id, status, create_by, create_time, update_by, update_time, remark from site_info_tag + select id, site_id, tag_id, tag_type, status, create_by, create_time, update_by, update_time, remark from site_info_tag @@ -45,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, remark, + tag_type, #{siteId}, @@ -55,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{remark}, + #{tagType}, diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SiteInfoServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SiteInfoServiceImpl.java index daa5ef2..8a1ba88 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SiteInfoServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SiteInfoServiceImpl.java @@ -1,15 +1,13 @@ package com.flossom.miniProgram.service.impl; -import com.flossom.common.core.domain.entity.SiteInfo; -import com.flossom.common.core.domain.entity.SiteLog; -import com.flossom.common.core.domain.entity.WxUserMember; -import com.flossom.common.core.domain.entity.WxUserTag; +import com.flossom.common.core.domain.entity.*; import com.flossom.common.core.enums.SiteOpenTypeEnum; import com.flossom.common.core.enums.SitePushTypeEnum; import com.flossom.common.core.enums.SiteTypeEnum; import com.flossom.common.core.enums.TagTypeStatus; import com.flossom.common.core.exception.ServiceException; import com.flossom.common.core.mapper.SiteInfoMapper; +import com.flossom.common.core.mapper.SiteInfoTagMapper; import com.flossom.common.core.mapper.SiteLogMapper; import com.flossom.common.core.mapper.WxUserTagMapper; import com.flossom.common.core.utils.DateUtils; @@ -41,6 +39,9 @@ public class SiteInfoServiceImpl implements ISiteInfoService { @Autowired private WxUserTagMapper wxUserTagMapper; + @Autowired + private SiteInfoTagMapper siteInfoTagMapper; + @Override public List popupList(Integer openType) { @@ -152,52 +153,45 @@ public class SiteInfoServiceImpl implements ISiteInfoService { userWecomTageIdList = userWecomTags.stream().map(WxUserTag::getTagId).collect(Collectors.toList()); } - // 4.2、禁止小程序标签 - String forbidWechatTagId = info.getForbidWechatTagId(); - if (StringUtils.isNotBlank(forbidWechatTagId)) { - List forbidWechatTagIdList = Arrays.asList(forbidWechatTagId.split(",")); - if (forbidWechatTagIdList != null && forbidWechatTagIdList.size() > 0) { - if (userMiniTageIdList.size() > 0) { - for (Long tagid : userMiniTageIdList) { - if (forbidWechatTagIdList.contains(tagid)) { - continue; - } + // 4.2、禁止标签 + SiteInfoTag siteInfoTag = new SiteInfoTag(); + siteInfoTag.setSiteId(info.getId()); + siteInfoTag.setStatus(1L); + List forbidSiteInfoTags = siteInfoTagMapper.selectSiteInfoTagList(siteInfoTag); + if (forbidSiteInfoTags != null && forbidSiteInfoTags.size() > 0) { + List forbidTagIdList = forbidSiteInfoTags.stream().map(SiteInfoTag::getTagId).collect(Collectors.toList()); + if (userMiniTageIdList.size() > 0) { + for (Long tagid : userMiniTageIdList) { + if (forbidTagIdList.contains(tagid)) { + continue; } - } - } - } - // 4.3、禁止企微标签 - String forbidCompanyTagId = info.getForbidCompanyTagId(); - if (StringUtils.isNotBlank(forbidCompanyTagId)) { - List forbidCompanyTagIdList = Arrays.asList(forbidCompanyTagId.split(",")); - if (forbidCompanyTagIdList != null && forbidCompanyTagIdList.size() > 0) { - if (userWecomTageIdList.size() > 0) { - for (Long tagid : userWecomTageIdList) { - if (forbidCompanyTagIdList.contains(tagid)) { - continue; - } + if (forbidTagIdList.contains(tagid)) { + continue; } } } } + // 4.4、可见小程序标签 - String showWechatTagId = info.getShowWechatTagId(); - if (StringUtils.isNotBlank(showWechatTagId)) { - List showWechatTagIdList = Arrays.asList(showWechatTagId.split(",")); - if (showWechatTagIdList != null && userMiniTageIdList.size() > 0) { - if (!userMiniTageIdList.containsAll(showWechatTagIdList)) { - continue; - } + siteInfoTag.setSiteId(info.getId()); + siteInfoTag.setTagType(1); + siteInfoTag.setStatus(0L); + List showWechatSiteInfoTags = siteInfoTagMapper.selectSiteInfoTagList(siteInfoTag); + if (showWechatSiteInfoTags != null && showWechatSiteInfoTags.size() > 0) { + List showWechatTagIdList = showWechatSiteInfoTags.stream().map(SiteInfoTag::getTagId).collect(Collectors.toList()); + if (userMiniTageIdList == null || !userMiniTageIdList.containsAll(showWechatTagIdList)) { + continue; } } // 4.5、可见企微标签 - String showCompanyTagId = info.getShowCompanyTagId(); - if (StringUtils.isNotBlank(showCompanyTagId)) { - List showCompanyTagIdList = Arrays.asList(showCompanyTagId.split(",")); - if (userWecomTageIdList != null && userWecomTageIdList.size() > 0) { - if (!userWecomTageIdList.containsAll(showCompanyTagIdList)) { - continue; - } + siteInfoTag.setSiteId(info.getId()); + siteInfoTag.setTagType(2); + siteInfoTag.setStatus(0L); + List showCompanySiteInfoTags = siteInfoTagMapper.selectSiteInfoTagList(siteInfoTag); + if (showCompanySiteInfoTags != null && showCompanySiteInfoTags.size() > 0) { + List showCompanyTagIdList = showCompanySiteInfoTags.stream().map(SiteInfoTag::getTagId).collect(Collectors.toList()); + if (userWecomTageIdList == null || !userWecomTageIdList.containsAll(showCompanyTagIdList)) { + continue; } } diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java index b783967..9a22f71 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java @@ -160,6 +160,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService SiteInfoTag infoTag = new SiteInfoTag(); infoTag.setSiteId(siteInfo.getId()); infoTag.setTagId(tag.getId()); + infoTag.setTagType(1); infoTag.setStatus(0l); infoTag.setCreateBy(SecurityUtils.getUsername()); infoTag.setCreateTime(DateUtils.getNowDate()); @@ -170,6 +171,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService SiteInfoTag infoTag = new SiteInfoTag(); infoTag.setSiteId(siteInfo.getId()); infoTag.setTagId(tag.getId()); + infoTag.setTagType(2); infoTag.setStatus(0l); infoTag.setCreateBy(SecurityUtils.getUsername()); infoTag.setCreateTime(DateUtils.getNowDate()); @@ -180,6 +182,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService SiteInfoTag infoTag = new SiteInfoTag(); infoTag.setSiteId(siteInfo.getId()); infoTag.setTagId(tag.getId()); + infoTag.setTagType(1); infoTag.setStatus(1l); infoTag.setCreateBy(SecurityUtils.getUsername()); infoTag.setCreateTime(DateUtils.getNowDate()); @@ -190,6 +193,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService SiteInfoTag infoTag = new SiteInfoTag(); infoTag.setSiteId(siteInfo.getId()); infoTag.setTagId(tag.getId()); + infoTag.setTagType(2); infoTag.setStatus(1l); infoTag.setCreateBy(SecurityUtils.getUsername()); infoTag.setCreateTime(DateUtils.getNowDate()); @@ -210,6 +214,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService SiteInfoTag infoTag = new SiteInfoTag(); infoTag.setSiteId(siteInfo.getId()); infoTag.setTagId(tag.getId()); + infoTag.setTagType(1); infoTag.setStatus(2l); infoTag.setCreateBy(SecurityUtils.getUsername()); infoTag.setCreateTime(DateUtils.getNowDate()); @@ -220,6 +225,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService SiteInfoTag infoTag = new SiteInfoTag(); infoTag.setSiteId(siteInfo.getId()); infoTag.setTagId(tag.getId()); + infoTag.setTagType(2); infoTag.setStatus(2l); infoTag.setCreateBy(SecurityUtils.getUsername()); infoTag.setCreateTime(DateUtils.getNowDate());