314637581
/
flossom-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

小程序-查询未绑定仪器

Browse Source
master
382696293@qq.com 2 years ago
parent 111993cf0f
commit aca84759d5
10 changed files with 82 additions and 64 deletions
Show Stats Download Patch File Download Diff File

4
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/TagTypeStatus.java → flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/TagTypeStatusEnum.java
Unescape Escape View File

@ -5,13 +5,13 @@ package com.flossom.common.core.enums;
* *
* @author flossom * @author flossom
*/ */
public enum TagTypeStatus { public enum TagTypeStatusEnum {
MINI_PROGRAM(1, "小程序标签"), ENTERPRISE_WECHAT(2, "企业微信标签"); MINI_PROGRAM(1, "小程序标签"), ENTERPRISE_WECHAT(2, "企业微信标签");
private final Integer code; private final Integer code;
private final String info; private final String info;
TagTypeStatus(Integer code, String info) { TagTypeStatusEnum(Integer code, String info) {
this.code = code; this.code = code;
this.info = info; this.info = info;
} }

20
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SiteInfoServiceImpl.java
Unescape Escape View File

@ -4,7 +4,7 @@ import com.flossom.common.core.domain.entity.*;
import com.flossom.common.core.enums.SiteOpenTypeEnum; import com.flossom.common.core.enums.SiteOpenTypeEnum;
import com.flossom.common.core.enums.SitePushTypeEnum; import com.flossom.common.core.enums.SitePushTypeEnum;
import com.flossom.common.core.enums.SiteTypeEnum; import com.flossom.common.core.enums.SiteTypeEnum;
import com.flossom.common.core.enums.TagTypeStatus; import com.flossom.common.core.enums.TagTypeStatusEnum;
import com.flossom.common.core.exception.ServiceException; import com.flossom.common.core.exception.ServiceException;
import com.flossom.common.core.mapper.*; import com.flossom.common.core.mapper.*;
import com.flossom.common.core.utils.DateUtils; import com.flossom.common.core.utils.DateUtils;
@ -84,29 +84,29 @@ public class SiteInfoServiceImpl implements ISiteInfoService {
SiteInfoTag siteInfoTag = new SiteInfoTag(); SiteInfoTag siteInfoTag = new SiteInfoTag();
siteInfoTag.setSiteId(siteInfoId); siteInfoTag.setSiteId(siteInfoId);
// 小程序标签 // 小程序标签
siteInfoTag.setTagType(TagTypeStatus.MINI_PROGRAM.getCode()); siteInfoTag.setTagType(TagTypeStatusEnum.MINI_PROGRAM.getCode());
siteInfoTag.setStatus(2L); siteInfoTag.setStatus(2L);
List<SiteInfoTag> addMiniTagList = siteInfoTagMapper.selectSiteInfoTagList(siteInfoTag); List<SiteInfoTag> addMiniTagList = siteInfoTagMapper.selectSiteInfoTagList(siteInfoTag);
if (addMiniTagList != null && addMiniTagList.size() > 0) { if (addMiniTagList != null && addMiniTagList.size() > 0) {
List<Integer> tagIdList = addMiniTagList.stream().map(SiteInfoTag::getTagId).map(Long::intValue).collect(Collectors.toList()); List<Integer> tagIdList = addMiniTagList.stream().map(SiteInfoTag::getTagId).map(Long::intValue).collect(Collectors.toList());
List<Integer> userIdList = Arrays.asList(SecurityUtils.getLoginUser().getWxUserMember().getId()).stream().map(Long::intValue).collect(Collectors.toList()); List<Integer> userIdList = Arrays.asList(SecurityUtils.getLoginUser().getWxUserMember().getId()).stream().map(Long::intValue).collect(Collectors.toList());
batchAddTag(tagIdList, userIdList, TagTypeStatus.MINI_PROGRAM.getCode()); batchAddTag(tagIdList, userIdList, TagTypeStatusEnum.MINI_PROGRAM.getCode());
} }
// 外部标签 // 外部标签
siteInfoTag.setTagType(TagTypeStatus.ENTERPRISE_WECHAT.getCode()); siteInfoTag.setTagType(TagTypeStatusEnum.ENTERPRISE_WECHAT.getCode());
siteInfoTag.setStatus(2L); siteInfoTag.setStatus(2L);
List<SiteInfoTag> addWecomTagList = siteInfoTagMapper.selectSiteInfoTagList(siteInfoTag); List<SiteInfoTag> addWecomTagList = siteInfoTagMapper.selectSiteInfoTagList(siteInfoTag);
if (addWecomTagList != null && addWecomTagList.size() > 0) { if (addWecomTagList != null && addWecomTagList.size() > 0) {
List<Integer> tagIdList = addWecomTagList.stream().map(SiteInfoTag::getTagId).map(Long::intValue).collect(Collectors.toList()); List<Integer> tagIdList = addWecomTagList.stream().map(SiteInfoTag::getTagId).map(Long::intValue).collect(Collectors.toList());
List<Integer> userIdList = Arrays.asList(SecurityUtils.getLoginUser().getWxUserMember().getId()).stream().map(Long::intValue).collect(Collectors.toList()); List<Integer> userIdList = Arrays.asList(SecurityUtils.getLoginUser().getWxUserMember().getId()).stream().map(Long::intValue).collect(Collectors.toList());
batchAddTag(tagIdList, userIdList, TagTypeStatus.ENTERPRISE_WECHAT.getCode()); batchAddTag(tagIdList, userIdList, TagTypeStatusEnum.ENTERPRISE_WECHAT.getCode());
} }
} }
/** /**
* 批量添加标签 * 批量添加标签
* code 标签类型 {@link com.flossom.common.core.enums.TagTypeStatus} * code 标签类型 {@link TagTypeStatusEnum}
* *
* @param tagIdList * @param tagIdList
* @param userIdList * @param userIdList
@ -156,13 +156,13 @@ public class SiteInfoServiceImpl implements ISiteInfoService {
WxUserMember wxUserMember = SecurityUtils.getLoginUser().getWxUserMember(); WxUserMember wxUserMember = SecurityUtils.getLoginUser().getWxUserMember();
WxUserTag wxUserTag = new WxUserTag(); WxUserTag wxUserTag = new WxUserTag();
wxUserTag.setUserId(wxUserMember.getId()); wxUserTag.setUserId(wxUserMember.getId());
wxUserTag.setType(TagTypeStatus.MINI_PROGRAM.getCode()); wxUserTag.setType(TagTypeStatusEnum.MINI_PROGRAM.getCode());
// 用户拥有的小程序标签 // 用户拥有的小程序标签
List<WxUserTag> userMiniProgramTags = wxUserTagMapper.selectWxUserTagList(wxUserTag); List<WxUserTag> userMiniProgramTags = wxUserTagMapper.selectWxUserTagList(wxUserTag);
if (userMiniProgramTags != null && userMiniProgramTags.size() > 0) { if (userMiniProgramTags != null && userMiniProgramTags.size() > 0) {
userMiniTageIdList = userMiniProgramTags.stream().map(WxUserTag::getTagId).collect(Collectors.toList()); userMiniTageIdList = userMiniProgramTags.stream().map(WxUserTag::getTagId).collect(Collectors.toList());
} }
wxUserTag.setType(TagTypeStatus.ENTERPRISE_WECHAT.getCode()); wxUserTag.setType(TagTypeStatusEnum.ENTERPRISE_WECHAT.getCode());
// 用户拥有的外部标签 // 用户拥有的外部标签
List<WxUserTag> userWecomTags = wxUserTagMapper.selectWxUserTagList(wxUserTag); List<WxUserTag> userWecomTags = wxUserTagMapper.selectWxUserTagList(wxUserTag);
if (userWecomTags != null && userWecomTags.size() > 0) { if (userWecomTags != null && userWecomTags.size() > 0) {
@ -253,7 +253,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService {
// 4.4、可见小程序标签 // 4.4、可见小程序标签
siteInfoTag.setSiteId(info.getId()); siteInfoTag.setSiteId(info.getId());
siteInfoTag.setTagType(TagTypeStatus.MINI_PROGRAM.getCode()); siteInfoTag.setTagType(TagTypeStatusEnum.MINI_PROGRAM.getCode());
siteInfoTag.setStatus(0L); siteInfoTag.setStatus(0L);
List<SiteInfoTag> showWechatSiteInfoTags = siteInfoTagMapper.selectSiteInfoTagList(siteInfoTag); List<SiteInfoTag> showWechatSiteInfoTags = siteInfoTagMapper.selectSiteInfoTagList(siteInfoTag);
if (showWechatSiteInfoTags != null && showWechatSiteInfoTags.size() > 0) { if (showWechatSiteInfoTags != null && showWechatSiteInfoTags.size() > 0) {
@ -264,7 +264,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService {
} }
// 4.5、可见外部标签 // 4.5、可见外部标签
siteInfoTag.setSiteId(info.getId()); siteInfoTag.setSiteId(info.getId());
siteInfoTag.setTagType(TagTypeStatus.ENTERPRISE_WECHAT.getCode()); siteInfoTag.setTagType(TagTypeStatusEnum.ENTERPRISE_WECHAT.getCode());
siteInfoTag.setStatus(0L); siteInfoTag.setStatus(0L);
List<SiteInfoTag> showCompanySiteInfoTags = siteInfoTagMapper.selectSiteInfoTagList(siteInfoTag); List<SiteInfoTag> showCompanySiteInfoTags = siteInfoTagMapper.selectSiteInfoTagList(siteInfoTag);
if (showCompanySiteInfoTags != null && showCompanySiteInfoTags.size() > 0) { if (showCompanySiteInfoTags != null && showCompanySiteInfoTags.size() > 0) {

42
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java
Unescape Escape View File

@ -1,10 +1,7 @@
package com.flossom.miniProgram.service.impl; package com.flossom.miniProgram.service.impl;
import com.flossom.common.core.domain.entity.*; import com.flossom.common.core.domain.entity.*;
import com.flossom.common.core.enums.BindingStatusEnums; import com.flossom.common.core.enums.*;
import com.flossom.common.core.enums.InstrumentFileClassifyEnum;
import com.flossom.common.core.enums.SerialValidStatusEnums;
import com.flossom.common.core.enums.Status;
import com.flossom.common.core.exception.ServiceException; import com.flossom.common.core.exception.ServiceException;
import com.flossom.common.core.exception.ServiceReturnCodeException; import com.flossom.common.core.exception.ServiceReturnCodeException;
import com.flossom.common.core.mapper.*; import com.flossom.common.core.mapper.*;
@ -21,8 +18,10 @@ import org.springframework.transaction.annotation.Transactional;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneId; import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
/** /**
* 仪器列Service业务层处理 * 仪器列Service业务层处理
@ -53,6 +52,12 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
@Autowired @Autowired
private WxInstrumentModeMapper wxInstrumentModeMapper; private WxInstrumentModeMapper wxInstrumentModeMapper;
@Autowired
private WxInstrumentTagMapper wxInstrumentTagMapper;
@Autowired
private WxUserTagMapper wxUserTagMapper;
@Override @Override
public List<WxInstrument> bindingInstrumentList() { public List<WxInstrument> bindingInstrumentList() {
return wxInstrumentMapper.selectBindingInstrumentListByUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); return wxInstrumentMapper.selectBindingInstrumentListByUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());
@ -60,7 +65,34 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
@Override @Override
public List<WxInstrument> unbindingInstrumentInfoList() { public List<WxInstrument> unbindingInstrumentInfoList() {
return wxInstrumentMapper.selectUnbindingInstrumentListByUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); List<WxInstrument> returnList = new ArrayList<>();
List<WxInstrument> wxInstrumentList = wxInstrumentMapper.selectUnbindingInstrumentListByUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());
if (wxInstrumentList != null && wxInstrumentList.size() > 0) {
// 用户拥有的标签
WxUserTag wxUserTag = new WxUserTag();
wxUserTag.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());
List<WxUserTag> userTagList = wxUserTagMapper.selectWxUserTagList(wxUserTag);
List<Long> userTagIdList;
if (userTagList != null && userTagList.size() > 0) {
userTagIdList = userTagList.stream().map(WxUserTag::getTagId).collect(Collectors.toList());
} else {
userTagIdList = null;
}
// 仪器标签
for (WxInstrument wxInstrument : wxInstrumentList) {
WxInstrumentTag wxInstrumentTag = new WxInstrumentTag();
wxInstrumentTag.setInstrumentId(wxInstrument.getId());
List<WxInstrumentTag> wxInstrumentTagList = wxInstrumentTagMapper.selectWxInstrumentTagList(wxInstrumentTag);
if (wxInstrumentTagList != null && wxInstrumentTagList.size() > 0) {
List<Long> instrumentTagIdList = wxInstrumentTagList.stream().map(WxInstrumentTag::getTagId).collect(Collectors.toList());
if (userTagIdList == null || !userTagIdList.containsAll(instrumentTagIdList)) {
continue;
}
}
returnList.add(wxInstrument);
}
}
return returnList;
} }
@Override @Override

8
flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysTagController.java
Unescape Escape View File

@ -2,11 +2,9 @@ package com.flossom.system.controller;
import com.flossom.common.core.constant.UserConstants; import com.flossom.common.core.constant.UserConstants;
import com.flossom.common.core.domain.R; import com.flossom.common.core.domain.R;
import com.flossom.common.core.domain.SysFiringInfo;
import com.flossom.common.core.domain.entity.SysDept;
import com.flossom.common.core.domain.entity.SysTag; import com.flossom.common.core.domain.entity.SysTag;
import com.flossom.common.core.domain.entity.WxUserTag; import com.flossom.common.core.domain.entity.WxUserTag;
import com.flossom.common.core.enums.TagTypeStatus; import com.flossom.common.core.enums.TagTypeStatusEnum;
import com.flossom.common.core.utils.DateUtils; import com.flossom.common.core.utils.DateUtils;
import com.flossom.common.core.utils.StringUtils; import com.flossom.common.core.utils.StringUtils;
import com.flossom.common.core.utils.poi.ExcelUtil; import com.flossom.common.core.utils.poi.ExcelUtil;
@ -177,14 +175,14 @@ public class SysTagController extends BaseController {
{ {
String sheetName = ""; String sheetName = "";
String s = DateUtils.dateTimeNow("yyyyMMddHHmmss"); String s = DateUtils.dateTimeNow("yyyyMMddHHmmss");
if (TagTypeStatus.MINI_PROGRAM.getCode().toString().equals(tag.getType())) { if (TagTypeStatusEnum.MINI_PROGRAM.getCode().toString().equals(tag.getType())) {
sheetName += "小程序标签数据"+ s ; sheetName += "小程序标签数据"+ s ;
} else { } else {
sheetName += "外部标签数据"+ s ; sheetName += "外部标签数据"+ s ;
} }
List<SysTag> list = tagService.selectDeptList(tag); List<SysTag> list = tagService.selectDeptList(tag);
for (SysTag sysTag: list) { for (SysTag sysTag: list) {
if (TagTypeStatus.MINI_PROGRAM.getCode().toString().equals(sysTag.getType())) { if (TagTypeStatusEnum.MINI_PROGRAM.getCode().toString().equals(sysTag.getType())) {
sysTag.setType("小程序标签"); sysTag.setType("小程序标签");
} else { } else {
sysTag.setType("外部标签"); sysTag.setType("外部标签");

5
flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxModeController.java
Unescape Escape View File

@ -1,7 +1,6 @@
package com.flossom.system.controller; package com.flossom.system.controller;
import java.util.List; import java.util.List;
import java.io.IOException;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -11,7 +10,7 @@ import com.flossom.common.core.domain.entity.SysTag;
import com.flossom.common.core.domain.R; import com.flossom.common.core.domain.R;
import com.flossom.common.core.domain.entity.WxMode; import com.flossom.common.core.domain.entity.WxMode;
import com.flossom.common.core.domain.entity.WxModeTag; import com.flossom.common.core.domain.entity.WxModeTag;
import com.flossom.common.core.enums.TagTypeStatus; import com.flossom.common.core.enums.TagTypeStatusEnum;
import com.flossom.common.core.utils.poi.ExcelUtil; import com.flossom.common.core.utils.poi.ExcelUtil;
import com.flossom.common.core.web.controller.BaseController; import com.flossom.common.core.web.controller.BaseController;
import com.flossom.common.core.web.domain.AjaxResult; import com.flossom.common.core.web.domain.AjaxResult;
@ -72,7 +71,7 @@ public class WxModeController extends BaseController
if (Objects.nonNull(tagId)) { if (Objects.nonNull(tagId)) {
SysTag sysTag = sysTagService.selectDeptById(tagId); SysTag sysTag = sysTagService.selectDeptById(tagId);
if (Objects.nonNull(sysTag)) { if (Objects.nonNull(sysTag)) {
if (String.valueOf(TagTypeStatus.MINI_PROGRAM.getCode()).equals(String.valueOf(wxModeTag.getTagType()))) { if (String.valueOf(TagTypeStatusEnum.MINI_PROGRAM.getCode()).equals(String.valueOf(wxModeTag.getTagType()))) {
wechatList.add(sysTag.getTagName()); wechatList.add(sysTag.getTagName());
} else { } else {
companyList.add(sysTag.getTagName()); companyList.add(sysTag.getTagName());

9
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysTagServiceImpl.java
Unescape Escape View File

@ -1,14 +1,12 @@
package com.flossom.system.service.impl; package com.flossom.system.service.impl;
import com.flossom.common.core.constant.UserConstants; import com.flossom.common.core.constant.UserConstants;
import com.flossom.common.core.domain.entity.SysDept;
import com.flossom.common.core.domain.entity.SysRole; import com.flossom.common.core.domain.entity.SysRole;
import com.flossom.common.core.domain.entity.SysTag; import com.flossom.common.core.domain.entity.SysTag;
import com.flossom.common.core.domain.entity.SysUser; import com.flossom.common.core.domain.entity.SysUser;
import com.flossom.common.core.domain.vo.TreeSelect; import com.flossom.common.core.domain.vo.TreeSelect;
import com.flossom.common.core.enums.TagTypeStatus; import com.flossom.common.core.enums.TagTypeStatusEnum;
import com.flossom.common.core.exception.ServiceException; import com.flossom.common.core.exception.ServiceException;
import com.flossom.common.core.mapper.SysDeptMapper;
import com.flossom.common.core.mapper.SysRoleMapper; import com.flossom.common.core.mapper.SysRoleMapper;
import com.flossom.common.core.mapper.SysTagMapper; import com.flossom.common.core.mapper.SysTagMapper;
import com.flossom.common.core.text.Convert; import com.flossom.common.core.text.Convert;
@ -16,7 +14,6 @@ import com.flossom.common.core.utils.SpringUtils;
import com.flossom.common.core.utils.StringUtils; import com.flossom.common.core.utils.StringUtils;
import com.flossom.common.datascope.annotation.DataScope; import com.flossom.common.datascope.annotation.DataScope;
import com.flossom.common.security.utils.SecurityUtils; import com.flossom.common.security.utils.SecurityUtils;
import com.flossom.system.service.ISysDeptService;
import com.flossom.system.service.ISysTagService; import com.flossom.system.service.ISysTagService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -286,7 +283,7 @@ public class SysTagServiceImpl implements ISysTagService {
public List<Map<String, Object>> getMiniProgramTags() { public List<Map<String, Object>> getMiniProgramTags() {
List<Map<String, Object>> tagList = new ArrayList<>(); List<Map<String, Object>> tagList = new ArrayList<>();
// 获取小程序标签 // 获取小程序标签
List<SysTag> miniProgramTags = tagMapper.selectSecondTagByType(TagTypeStatus.MINI_PROGRAM.getCode()); List<SysTag> miniProgramTags = tagMapper.selectSecondTagByType(TagTypeStatusEnum.MINI_PROGRAM.getCode());
if (miniProgramTags != null && miniProgramTags.size() > 0) { if (miniProgramTags != null && miniProgramTags.size() > 0) {
Map<String, Object> map; Map<String, Object> map;
for (SysTag miniProgramTag : miniProgramTags) { for (SysTag miniProgramTag : miniProgramTags) {
@ -303,7 +300,7 @@ public class SysTagServiceImpl implements ISysTagService {
public List<Map<String, Object>> getWecomTags() { public List<Map<String, Object>> getWecomTags() {
List<Map<String, Object>> tagList = new ArrayList<>(); List<Map<String, Object>> tagList = new ArrayList<>();
// 获取小程序标签 // 获取小程序标签
List<SysTag> miniProgramTags = tagMapper.selectSecondTagByType(TagTypeStatus.ENTERPRISE_WECHAT.getCode()); List<SysTag> miniProgramTags = tagMapper.selectSecondTagByType(TagTypeStatusEnum.ENTERPRISE_WECHAT.getCode());
if (miniProgramTags != null && miniProgramTags.size() > 0) { if (miniProgramTags != null && miniProgramTags.size() > 0) {
Map<String, Object> map; Map<String, Object> map;
for (SysTag miniProgramTag : miniProgramTags) { for (SysTag miniProgramTag : miniProgramTags) {

8
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxModeServiceImpl.java
Unescape Escape View File

@ -1,17 +1,15 @@
package com.flossom.system.service.impl; package com.flossom.system.service.impl;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.common.utils.CollectionUtils;
import com.flossom.common.core.domain.entity.WxMode; import com.flossom.common.core.domain.entity.WxMode;
import com.flossom.common.core.domain.entity.WxModeTag; import com.flossom.common.core.domain.entity.WxModeTag;
import com.flossom.common.core.enums.TagTypeStatus; import com.flossom.common.core.enums.TagTypeStatusEnum;
import com.flossom.common.core.mapper.WxModeMapper; import com.flossom.common.core.mapper.WxModeMapper;
import com.flossom.common.core.mapper.WxModeTagMapper; import com.flossom.common.core.mapper.WxModeTagMapper;
import com.flossom.common.core.utils.DateUtils; import com.flossom.common.core.utils.DateUtils;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.flossom.system.service.IWxModeService; import com.flossom.system.service.IWxModeService;
@ -44,8 +42,8 @@ public class WxModeServiceImpl implements IWxModeService
wxModeTag.setModeId(id); wxModeTag.setModeId(id);
List<WxModeTag> wxModeTags = wxModeTagMapper.selectWxModeTagList(wxModeTag); List<WxModeTag> wxModeTags = wxModeTagMapper.selectWxModeTagList(wxModeTag);
if (CollectionUtils.isNotEmpty(wxModeTags)) { if (CollectionUtils.isNotEmpty(wxModeTags)) {
List<WxModeTag> wechatList = wxModeTags.stream().filter(x -> String.valueOf(TagTypeStatus.MINI_PROGRAM.getCode()).equals(String.valueOf(x.getTagType()))).collect(Collectors.toList()); List<WxModeTag> wechatList = wxModeTags.stream().filter(x -> String.valueOf(TagTypeStatusEnum.MINI_PROGRAM.getCode()).equals(String.valueOf(x.getTagType()))).collect(Collectors.toList());
List<WxModeTag> companyList = wxModeTags.stream().filter(x -> String.valueOf(TagTypeStatus.ENTERPRISE_WECHAT.getCode()).equals(String.valueOf(x.getTagType()))).collect(Collectors.toList()); List<WxModeTag> companyList = wxModeTags.stream().filter(x -> String.valueOf(TagTypeStatusEnum.ENTERPRISE_WECHAT.getCode()).equals(String.valueOf(x.getTagType()))).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(wechatList)) { if (CollectionUtils.isNotEmpty(wechatList)) {
List<Long> wechatIds = wechatList.stream().map(WxModeTag::getTagId).collect(Collectors.toList()); List<Long> wechatIds = wechatList.stream().map(WxModeTag::getTagId).collect(Collectors.toList());
wxMode.setLockWechatTagArray(wechatIds); wxMode.setLockWechatTagArray(wechatIds);

19
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxScriptTemplateServiceImpl.java
Unescape Escape View File

@ -10,12 +10,11 @@ import com.flossom.common.core.domain.entity.SysTag;
import com.flossom.common.core.domain.entity.WxScriptTag; import com.flossom.common.core.domain.entity.WxScriptTag;
import com.flossom.common.core.domain.entity.WxScriptTemplate; import com.flossom.common.core.domain.entity.WxScriptTemplate;
import com.flossom.common.core.domain.vo.TreeSelect; import com.flossom.common.core.domain.vo.TreeSelect;
import com.flossom.common.core.enums.TagTypeStatus; import com.flossom.common.core.enums.TagTypeStatusEnum;
import com.flossom.common.core.mapper.SysTagMapper; import com.flossom.common.core.mapper.SysTagMapper;
import com.flossom.common.core.mapper.WxScriptTagMapper; import com.flossom.common.core.mapper.WxScriptTagMapper;
import com.flossom.common.core.mapper.WxScriptTemplateMapper; import com.flossom.common.core.mapper.WxScriptTemplateMapper;
import com.flossom.common.core.utils.DateUtils; import com.flossom.common.core.utils.DateUtils;
import com.flossom.common.core.utils.SpringUtils;
import com.flossom.common.core.utils.StringUtils; import com.flossom.common.core.utils.StringUtils;
import com.flossom.common.security.utils.SecurityUtils; import com.flossom.common.security.utils.SecurityUtils;
import org.apache.commons.compress.utils.Lists; import org.apache.commons.compress.utils.Lists;
@ -57,7 +56,7 @@ public class WxScriptTemplateServiceImpl implements IWxScriptTemplateService {
List<WxScriptTag> wxScriptTagList = wxScriptTagMapper.selectWxScriptTagList(scriptTag); List<WxScriptTag> wxScriptTagList = wxScriptTagMapper.selectWxScriptTagList(scriptTag);
for (WxScriptTag wxScriptTag: wxScriptTagList) { for (WxScriptTag wxScriptTag: wxScriptTagList) {
SysTag sysTag = sysTagMapper.selectDeptById(wxScriptTag.getTagId()); SysTag sysTag = sysTagMapper.selectDeptById(wxScriptTag.getTagId());
if (TagTypeStatus.MINI_PROGRAM.getCode().toString().equals(sysTag.getType())){ if (TagTypeStatusEnum.MINI_PROGRAM.getCode().toString().equals(sysTag.getType())){
wechatTagList.add(sysTag.getId()); wechatTagList.add(sysTag.getId());
} else { } else {
companyTagList.add(sysTag.getId()); companyTagList.add(sysTag.getId());
@ -89,7 +88,7 @@ public class WxScriptTemplateServiceImpl implements IWxScriptTemplateService {
for (WxScriptTag wxScriptTag: wxScriptTagList) { for (WxScriptTag wxScriptTag: wxScriptTagList) {
SysTag sysTag = sysTagMapper.selectDeptById(wxScriptTag.getTagId()); SysTag sysTag = sysTagMapper.selectDeptById(wxScriptTag.getTagId());
if (Objects.nonNull(sysTag)) { if (Objects.nonNull(sysTag)) {
if (String.valueOf(TagTypeStatus.MINI_PROGRAM.getCode()).equals(sysTag.getType())){ if (String.valueOf(TagTypeStatusEnum.MINI_PROGRAM.getCode()).equals(sysTag.getType())){
wechatTagList.add(sysTag); wechatTagList.add(sysTag);
} else { } else {
companyTagList.add(sysTag); companyTagList.add(sysTag);
@ -155,10 +154,10 @@ public class WxScriptTemplateServiceImpl implements IWxScriptTemplateService {
WxScriptTag scriptTag = new WxScriptTag(); WxScriptTag scriptTag = new WxScriptTag();
scriptTag.setScriptId(wxScriptTemplate.getId()); scriptTag.setScriptId(wxScriptTemplate.getId());
scriptTag.setTagId(tag.getId()); scriptTag.setTagId(tag.getId());
if(TagTypeStatus.MINI_PROGRAM.getCode() == wxScriptTemplate.getLevel().intValue()) { if(TagTypeStatusEnum.MINI_PROGRAM.getCode() == wxScriptTemplate.getLevel().intValue()) {
scriptTag.setTagType(TagTypeStatus.MINI_PROGRAM.getCode()); scriptTag.setTagType(TagTypeStatusEnum.MINI_PROGRAM.getCode());
} else { } else {
scriptTag.setTagType(TagTypeStatus.ENTERPRISE_WECHAT.getCode()); scriptTag.setTagType(TagTypeStatusEnum.ENTERPRISE_WECHAT.getCode());
} }
scriptTag.setStatus(0l); scriptTag.setStatus(0l);
scriptTag.setCreateBy(SecurityUtils.getLoginUser().getUsername()); scriptTag.setCreateBy(SecurityUtils.getLoginUser().getUsername());
@ -216,10 +215,10 @@ public class WxScriptTemplateServiceImpl implements IWxScriptTemplateService {
WxScriptTag scriptTag = new WxScriptTag(); WxScriptTag scriptTag = new WxScriptTag();
scriptTag.setScriptId(wxScriptTemplate.getId()); scriptTag.setScriptId(wxScriptTemplate.getId());
scriptTag.setTagId(tag.getId()); scriptTag.setTagId(tag.getId());
if(TagTypeStatus.MINI_PROGRAM.getCode() == Integer.valueOf(tag.getType())) { if(TagTypeStatusEnum.MINI_PROGRAM.getCode() == Integer.valueOf(tag.getType())) {
scriptTag.setTagType(TagTypeStatus.MINI_PROGRAM.getCode()); scriptTag.setTagType(TagTypeStatusEnum.MINI_PROGRAM.getCode());
} else { } else {
scriptTag.setTagType(TagTypeStatus.ENTERPRISE_WECHAT.getCode()); scriptTag.setTagType(TagTypeStatusEnum.ENTERPRISE_WECHAT.getCode());
} }
scriptTag.setStatus(0l); scriptTag.setStatus(0l);
scriptTag.setCreateBy(SecurityUtils.getLoginUser().getUsername()); scriptTag.setCreateBy(SecurityUtils.getLoginUser().getUsername());

20
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java
Unescape Escape View File

@ -13,7 +13,7 @@ import com.flossom.common.core.domain.ret.WxUserMemberRet;
import com.flossom.common.core.domain.vo.WxUserMemberVo; import com.flossom.common.core.domain.vo.WxUserMemberVo;
import com.flossom.common.core.enums.IntegralChangeTypeEnum; import com.flossom.common.core.enums.IntegralChangeTypeEnum;
import com.flossom.common.core.enums.Status; import com.flossom.common.core.enums.Status;
import com.flossom.common.core.enums.TagTypeStatus; import com.flossom.common.core.enums.TagTypeStatusEnum;
import com.flossom.common.core.exception.ServiceException; import com.flossom.common.core.exception.ServiceException;
import com.flossom.common.core.mapper.*; import com.flossom.common.core.mapper.*;
import com.flossom.common.core.utils.DateUtils; import com.flossom.common.core.utils.DateUtils;
@ -73,7 +73,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
BeanUtils.copyProperties(wxUserMember, wxUserMemberVo); BeanUtils.copyProperties(wxUserMember, wxUserMemberVo);
// 查询小程序标签 // 查询小程序标签
WxUserTag query = new WxUserTag(); WxUserTag query = new WxUserTag();
query.setType(TagTypeStatus.MINI_PROGRAM.getCode()); query.setType(TagTypeStatusEnum.MINI_PROGRAM.getCode());
query.setUserId(wxUserMember.getId()); query.setUserId(wxUserMember.getId());
List<WxUserTag> miniProgramUserTagList = wxUserTagMapper.selectWxUserTagList(query); List<WxUserTag> miniProgramUserTagList = wxUserTagMapper.selectWxUserTagList(query);
List<Long> collect = null; List<Long> collect = null;
@ -82,7 +82,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
} }
wxUserMemberVo.setMiniProgramTags(collect); wxUserMemberVo.setMiniProgramTags(collect);
// 查询外部标签 // 查询外部标签
query.setType(TagTypeStatus.ENTERPRISE_WECHAT.getCode()); query.setType(TagTypeStatusEnum.ENTERPRISE_WECHAT.getCode());
List<WxUserTag> wecomUserTags = wxUserTagMapper.selectWxUserTagList(query); List<WxUserTag> wecomUserTags = wxUserTagMapper.selectWxUserTagList(query);
collect = null; collect = null;
if (wecomUserTags != null && wecomUserTags.size() > 0) { if (wecomUserTags != null && wecomUserTags.size() > 0) {
@ -233,7 +233,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
*/ */
@Override @Override
public void batchAddWecomTag(List<Integer> tagIdList, List<Integer> userIdList) { public void batchAddWecomTag(List<Integer> tagIdList, List<Integer> userIdList) {
batchAddTag(tagIdList, userIdList, TagTypeStatus.ENTERPRISE_WECHAT.getCode()); batchAddTag(tagIdList, userIdList, TagTypeStatusEnum.ENTERPRISE_WECHAT.getCode());
} }
/** /**
@ -244,12 +244,12 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
*/ */
@Override @Override
public void batchAddMiniProgramTag(List<Integer> tagIdList, List<Integer> userIdList) { public void batchAddMiniProgramTag(List<Integer> tagIdList, List<Integer> userIdList) {
batchAddTag(tagIdList, userIdList, TagTypeStatus.MINI_PROGRAM.getCode()); batchAddTag(tagIdList, userIdList, TagTypeStatusEnum.MINI_PROGRAM.getCode());
} }
/** /**
* 批量添加标签 * 批量添加标签
* code 标签类型 {@link com.flossom.common.core.enums.TagTypeStatus} * code 标签类型 {@link TagTypeStatusEnum}
* *
* @param tagIdList * @param tagIdList
* @param userIdList * @param userIdList
@ -385,9 +385,9 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
for (WxUserMemberRet wxUserMemberRet : wxUserMemberRetList) { for (WxUserMemberRet wxUserMemberRet : wxUserMemberRetList) {
WxUserTag wxUserTag = new WxUserTag(); WxUserTag wxUserTag = new WxUserTag();
wxUserTag.setUserId(wxUserMemberRet.getId()); wxUserTag.setUserId(wxUserMemberRet.getId());
wxUserTag.setType(TagTypeStatus.MINI_PROGRAM.getCode()); wxUserTag.setType(TagTypeStatusEnum.MINI_PROGRAM.getCode());
wxUserMemberRet.setMiniProgramTags(wxUserTagMapper.selectWxUserTagList(wxUserTag)); wxUserMemberRet.setMiniProgramTags(wxUserTagMapper.selectWxUserTagList(wxUserTag));
wxUserTag.setType(TagTypeStatus.ENTERPRISE_WECHAT.getCode()); wxUserTag.setType(TagTypeStatusEnum.ENTERPRISE_WECHAT.getCode());
wxUserMemberRet.setWecomTags(wxUserTagMapper.selectWxUserTagList(wxUserTag)); wxUserMemberRet.setWecomTags(wxUserTagMapper.selectWxUserTagList(wxUserTag));
} }
} }
@ -402,9 +402,9 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
for (WxUserMemberRet wxUserMemberRet : wxUserMemberRetList) { for (WxUserMemberRet wxUserMemberRet : wxUserMemberRetList) {
WxUserTag wxUserTag = new WxUserTag(); WxUserTag wxUserTag = new WxUserTag();
wxUserTag.setUserId(wxUserMemberRet.getId()); wxUserTag.setUserId(wxUserMemberRet.getId());
wxUserTag.setType(TagTypeStatus.MINI_PROGRAM.getCode()); wxUserTag.setType(TagTypeStatusEnum.MINI_PROGRAM.getCode());
wxUserMemberRet.setMiniProgramTags(wxUserTagMapper.selectWxUserTagList(wxUserTag)); wxUserMemberRet.setMiniProgramTags(wxUserTagMapper.selectWxUserTagList(wxUserTag));
wxUserTag.setType(TagTypeStatus.ENTERPRISE_WECHAT.getCode()); wxUserTag.setType(TagTypeStatusEnum.ENTERPRISE_WECHAT.getCode());
wxUserMemberRet.setWecomTags(wxUserTagMapper.selectWxUserTagList(wxUserTag)); wxUserMemberRet.setWecomTags(wxUserTagMapper.selectWxUserTagList(wxUserTag));
list.add(wxUserMemberRet); list.add(wxUserMemberRet);
} }

11
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserScriptLogServiceImpl.java
Unescape Escape View File

@ -1,23 +1,18 @@
package com.flossom.system.service.impl; package com.flossom.system.service.impl;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
import com.flossom.common.core.domain.entity.SysTag;
import com.flossom.common.core.domain.entity.WxScriptTag; import com.flossom.common.core.domain.entity.WxScriptTag;
import com.flossom.common.core.domain.entity.WxScriptTemplate; import com.flossom.common.core.domain.entity.WxScriptTemplate;
import com.flossom.common.core.domain.entity.WxUserScriptLog; import com.flossom.common.core.domain.entity.WxUserScriptLog;
import com.flossom.common.core.domain.req.WxUserScriptReq; import com.flossom.common.core.domain.req.WxUserScriptReq;
import com.flossom.common.core.enums.IsScriptTemplateEnum; import com.flossom.common.core.enums.IsScriptTemplateEnum;
import com.flossom.common.core.enums.Status; import com.flossom.common.core.enums.Status;
import com.flossom.common.core.enums.TagTypeStatus; import com.flossom.common.core.enums.TagTypeStatusEnum;
import com.flossom.common.core.enums.WxUserIntegralMessageTypeEnum; import com.flossom.common.core.enums.WxUserIntegralMessageTypeEnum;
import com.flossom.common.core.mapper.*; import com.flossom.common.core.mapper.*;
import com.flossom.common.core.utils.DateUtils; import com.flossom.common.core.utils.DateUtils;
import com.flossom.common.core.utils.StringUtils;
import com.flossom.common.security.utils.SecurityUtils; import com.flossom.common.security.utils.SecurityUtils;
import com.flossom.system.service.IWxUserMemberService; import com.flossom.system.service.IWxUserMemberService;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
@ -149,13 +144,13 @@ public class WxUserScriptLogServiceImpl implements IWxUserScriptLogService {
if (wxScriptTagList != null && wxScriptTagList.size() > 0) { if (wxScriptTagList != null && wxScriptTagList.size() > 0) {
// 小程序标签集合 // 小程序标签集合
List<Integer> miniProgramTagIdList = wxScriptTagList.stream() List<Integer> miniProgramTagIdList = wxScriptTagList.stream()
.filter(scriptTag -> TagTypeStatus.MINI_PROGRAM.getCode().equals(scriptTag.getTagType())) .filter(scriptTag -> TagTypeStatusEnum.MINI_PROGRAM.getCode().equals(scriptTag.getTagType()))
.map(WxScriptTag::getTagId) .map(WxScriptTag::getTagId)
.map(Long::intValue) .map(Long::intValue)
.collect(Collectors.toList()); .collect(Collectors.toList());
// 外部标签集合 // 外部标签集合
List<Integer> wecomTagIdList = wxScriptTagList.stream() List<Integer> wecomTagIdList = wxScriptTagList.stream()
.filter(scriptTag -> TagTypeStatus.ENTERPRISE_WECHAT.getCode().equals(scriptTag.getTagType())) .filter(scriptTag -> TagTypeStatusEnum.ENTERPRISE_WECHAT.getCode().equals(scriptTag.getTagType()))
.map(WxScriptTag::getTagId) .map(WxScriptTag::getTagId)
.map(Long::intValue) .map(Long::intValue)
.collect(Collectors.toList()); .collect(Collectors.toList());

Write Preview
Loading…
Cancel
Save