diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SiteInfoTagMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SiteInfoTagMapper.java
index fab8ad5..7d59c53 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SiteInfoTagMapper.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SiteInfoTagMapper.java
@@ -69,4 +69,12 @@ public interface SiteInfoTagMapper
* @return 结果
*/
public int deleteSiteInfoTagBySiteId(Long id);
+
+ /**
+ * 删除站点与标签关联
+ *
+ * @param tagId 站点与标签关联主键
+ * @return 结果
+ */
+ public int deleteSiteInfoTagByTagId(Long tagId);
}
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 e7d3b0b..10c761d 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
@@ -92,4 +92,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delete from site_info_tag where site_id = #{id}
+
+ delete from site_info_tag where tag_id = #{tagId}
+
+
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysTagController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysTagController.java
index a064bfe..8991be8 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysTagController.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysTagController.java
@@ -16,10 +16,7 @@ import com.flossom.common.log.annotation.Log;
import com.flossom.common.log.enums.BusinessType;
import com.flossom.common.security.annotation.RequiresPermissions;
import com.flossom.common.security.utils.SecurityUtils;
-import com.flossom.system.service.ISysDeptService;
-import com.flossom.system.service.ISysTagService;
-import com.flossom.system.service.IWxScriptTagService;
-import com.flossom.system.service.IWxUserTagService;
+import com.flossom.system.service.*;
import org.apache.commons.compress.utils.Lists;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,6 +42,8 @@ public class SysTagController extends BaseController {
private IWxScriptTagService wxScriptTagService;
@Autowired
private IWxUserTagService userTagService;
+ @Autowired
+ private ISiteInfoService siteInfoService;
/**
* 获取标签列表
*/
@@ -124,6 +123,8 @@ public class SysTagController extends BaseController {
wxUserTagService.deleteWxUserTagByTagId(id);
// 删除话术关联标签
wxScriptTagService.deleteWxScriptTagByTagId(id);
+ // 删除站点关联标签
+ siteInfoService.deleteSiteInfoByTagId(id);
// 删除用户标签
// if (tagService.checkDeptExistUser(id))
// {
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISiteInfoService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISiteInfoService.java
index 7e1f424..a64d6d0 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISiteInfoService.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISiteInfoService.java
@@ -59,4 +59,11 @@ public interface ISiteInfoService
* @return 结果
*/
public int deleteSiteInfoById(Long id);
+ /**
+ * 删除站点管理标签信息
+ *
+ * @param tagId 站点管理主键
+ * @return 结果
+ */
+ public int deleteSiteInfoByTagId(Long tagId);
}
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 9a22f71..6145910 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
@@ -69,34 +69,61 @@ public class SiteInfoServiceImpl implements ISiteInfoService
List pushTimerList = Arrays.asList(siteInfo.getPushTimer().split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
siteInfo.setPushTimerArray(pushTimerList);
}
+ // 查询用的标签关联实体
+ SiteInfoTag infoTag = new SiteInfoTag();
+ infoTag.setSiteId(id);
// 处理禁用企微标签数组
if (StringUtils.isNotEmpty(siteInfo.getForbidCompanyTagId())) {
- List forbidCompanyList = Arrays.asList(siteInfo.getForbidCompanyTagId().split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
+ // 关联表查询数据
+ infoTag.setTagType(2);
+ infoTag.setStatus(1l);
+ List siteInfoTags = siteInfoTagMapper.selectSiteInfoTagList(infoTag);
+ List forbidCompanyList = siteInfoTags.stream().map(SiteInfoTag::getTagId).collect(Collectors.toList());
siteInfo.setForbidCompanyTagArray(forbidCompanyList);
}
// 处理禁用小程序标签数组
if (StringUtils.isNotEmpty(siteInfo.getForbidWechatTagId())) {
- List forbidWechatList = Arrays.asList(siteInfo.getForbidWechatTagId().split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
+ // 关联表查询数据
+ infoTag.setTagType(1);
+ infoTag.setStatus(1l);
+ List siteInfoTags = siteInfoTagMapper.selectSiteInfoTagList(infoTag);
+ List forbidWechatList = siteInfoTags.stream().map(SiteInfoTag::getTagId).collect(Collectors.toList());
siteInfo.setForbidWechatTagArray(forbidWechatList);
}
// 处理可见小程序标签数组
if (StringUtils.isNotEmpty(siteInfo.getShowWechatTagId())) {
- List showWechatList = Arrays.asList(siteInfo.getShowWechatTagId().split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
+ // 关联表查询数据
+ infoTag.setTagType(1);
+ infoTag.setStatus(0l);
+ List siteInfoTags = siteInfoTagMapper.selectSiteInfoTagList(infoTag);
+ List showWechatList = siteInfoTags.stream().map(SiteInfoTag::getTagId).collect(Collectors.toList());
siteInfo.setShowWechatTagArray(showWechatList);
}
// 处理可见企微标签数组
if (StringUtils.isNotEmpty(siteInfo.getShowCompanyTagId())) {
- List showCompanyList = Arrays.asList(siteInfo.getShowCompanyTagId().split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
+ // 关联表查询数据
+ infoTag.setTagType(2);
+ infoTag.setStatus(0l);
+ List siteInfoTags = siteInfoTagMapper.selectSiteInfoTagList(infoTag);
+ List showCompanyList = siteInfoTags.stream().map(SiteInfoTag::getTagId).collect(Collectors.toList());
siteInfo.setShowCompanyTagArray(showCompanyList);
}
// 处理弹窗活动小程序标签
if (StringUtils.isNotEmpty(siteInfo.getHandlerWechatTagId())){
- List handlerWechatList = Arrays.asList(siteInfo.getHandlerWechatTagId().split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
+ // 关联表查询数据
+ infoTag.setTagType(1);
+ infoTag.setStatus(2l);
+ List siteInfoTags = siteInfoTagMapper.selectSiteInfoTagList(infoTag);
+ List handlerWechatList = siteInfoTags.stream().map(SiteInfoTag::getTagId).collect(Collectors.toList());
siteInfo.setHandlerWechatTagArray(handlerWechatList);
}
// 处理弹窗活动企微标签
if (StringUtils.isNotEmpty(siteInfo.getHandlerCompanyTagId())){
- List handlerCompanyList = Arrays.asList(siteInfo.getHandlerCompanyTagId().split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
+ // 关联表查询数据
+ infoTag.setTagType(2);
+ infoTag.setStatus(2l);
+ List siteInfoTags = siteInfoTagMapper.selectSiteInfoTagList(infoTag);
+ List handlerCompanyList = siteInfoTags.stream().map(SiteInfoTag::getTagId).collect(Collectors.toList());
siteInfo.setHandlerCompanyTagArray(handlerCompanyList);
}
// 处理渠道展示
@@ -452,4 +479,10 @@ public class SiteInfoServiceImpl implements ISiteInfoService
{
return siteInfoMapper.deleteSiteInfoById(id);
}
+
+ @Override
+ public int deleteSiteInfoByTagId(Long tagId) {
+
+ return siteInfoTagMapper.deleteSiteInfoTagByTagId(tagId);
+ }
}