feat: 移除落地页关联表

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/HmLinkMapper.java

@@ -62,5 +62,5 @@ public interface HmLinkMapper {
             @Param("searchParams") String searchParams);
 
     public List<TabHmLink> queryPageRelationList(@Param("pageId") Long pageId,
-            @Param("enterpriseId") String enterpriseId);
+            @Param("enterpriseId") String enterpriseId, @Param("searchText") String searchText);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/TabHaobanHmPageRelationMapper.java

-package com.gic.haoban.manage.service.dao.mapper.hm;
-
-import com.gic.haoban.manage.service.entity.hm.TabHaobanHmPageRelation;
-import com.gic.haoban.manage.service.pojo.qo.HmPageRelationQO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface TabHaobanHmPageRelationMapper {
-    int deleteByPrimaryKey(Long relationId);
-
-    int insert(TabHaobanHmPageRelation record);
-
-    int insertSelective(TabHaobanHmPageRelation record);
-
-    TabHaobanHmPageRelation selectByPrimaryKey(Long relationId);
-
-    int updateByPrimaryKeySelective(TabHaobanHmPageRelation record);
-
-    int updateByPrimaryKey(TabHaobanHmPageRelation record);
-
-    List<TabHaobanHmPageRelation> queryPageRelationList(HmPageRelationQO pageRelationQo);
-}
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/hm/TabHaobanHmGroupSetting.java

@@ -11,8 +11,6 @@ public class TabHaobanHmGroupSetting {
 
     private String wxEnterpriseId;
 
-    private Integer referNum;
-
     private Integer status;
 
     private Integer sort;
@@ -61,14 +59,6 @@ public class TabHaobanHmGroupSetting {
         this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
     }
 
-    public Integer getReferNum() {
-        return referNum;
-    }
-
-    public void setReferNum(Integer referNum) {
-        this.referNum = referNum;
-    }
-
     public Integer getStatus() {
         return status;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/hm/HmWelcomeRelationBO.java

@@ -14,6 +14,9 @@ public class HmWelcomeRelationBO implements Serializable {
     private static final long serialVersionUID = -5265091280402568359L;
     private Long relationId;
 
+    /**
+     *
+     */
     private String enterpriseId;
 
     private String wxEnterpriseId;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/WelcomeService.java

@@ -132,10 +132,10 @@ public interface WelcomeService {
      *
      * @param staffId
      * @param wxEnterpriseId
-     * @param state
+     * @param referId 活码 / 链接id
      * @return
      */
-    WelcomeDetailBO getMatchWelcomeWithReferId(String staffId, String wxEnterpriseId, String state);
+    WelcomeDetailBO getMatchWelcomeWithReferId(String staffId, String wxEnterpriseId, String referId);
 
     /**
      * 删除欢迎语

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmGroupService.java

@@ -16,21 +16,6 @@ import java.util.List;
  **/
 public interface HmGroupService {
 
-    /**
-     * 更新 分组被引用数量
-     *
-     * @param groupId
-     * @param changeCount
-     * @return
-     */
-    Boolean updateGroupRelationCount(Long groupId, Integer changeCount);
-
-
-    /**
-     * @param groupRelations
-     * @return
-     */
-    Boolean batchUpdateGroupRelationCount(List<HmGroupRelationBO> groupRelations);
 
     /**
      * 查询分组被引用的次数

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmLinkService.java

@@ -23,6 +23,6 @@ public interface HmLinkService {
 
     public Page<HmLinkBO> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo);
 
-    public Page<HmLinkBO> queryPageRelationList(Long pageId, String enterpriseId, BasePageInfo basePageInfo);
+    public Page<HmLinkBO> queryPageRelationList(Long pageId, String enterpriseId, String searchText, BasePageInfo basePageInfo);
 
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmPageRelationService.java

-package com.gic.haoban.manage.service.service.hm;
-
-import com.gic.api.base.commons.Page;
-import com.gic.haoban.manage.service.pojo.bo.hm.HmPageRelationBO;
-import com.gic.haoban.manage.service.pojo.qo.HmPageRelationQO;
-
-import java.util.List;
-
-/**
- * @Author MUSI
- * @Date 2022/7/1 5:37 PM
- * @Description
- * @Version
- **/
-public interface HmPageRelationService {
-
-
-    /**
-     * 保存活码 与落地页的引用关系
-     *
-     * @param hmPageRelationBO
-     *
-     * @return true 保存成功
-     */
-    boolean savePageRelation(HmPageRelationBO hmPageRelationBO);
-
-    /**
-     * 更新 落地页关联状态
-     * referId pageId
-     *
-     * @param hmPageRelationBO
-     * @return
-     */
-    boolean updatePageRelation(HmPageRelationBO hmPageRelationBO);
-
-    /**
-     * 根据落地页模板code 查询关联的引用方
-     *
-     * @param pageCode
-     * @return
-     */
-    List<HmPageRelationBO> queryPageRelation(String pageCode);
-
-    /**
-     * 链接code/模板名称 条件查询
-     * @param hmPageRelationQo
-     * @return
-     */
-    Page<HmPageRelationBO> queryPageRelationWithSearchText(HmPageRelationQO hmPageRelationQo);
-
-    /**
-     * 统计pageCode 被引用的总数
-     * @param pageCode
-     * @return
-     */
-    Integer countPageTemplateRelation(String pageCode);
-}

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmPageService.java

@@ -14,12 +14,6 @@ import com.gic.haoban.manage.service.pojo.qo.HmPageTemplateQO;
  **/
 public interface HmPageService {
 
-    /**
-     * 根据 referId 查询关联的落地页数据
-     * @param referId
-     * @return
-     */
-    HmPageBO queryHmPageTemplateWithReferId(String referId);
 
 
     /**

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/WelcomeRelationService.java

@@ -56,7 +56,6 @@ public interface WelcomeRelationService {
      *
      * @param hmWelcomeRelationBO
      *
-     * @see com.gic.haoban.manage.api.enums.WelcomeRelationStatusEnum
      * @return
      */
     Boolean updateWelcomeRelation(HmWelcomeRelationBO hmWelcomeRelationBO);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmGroupServiceImpl.java

@@ -42,28 +42,6 @@ public class HmGroupServiceImpl implements HmGroupService {
     @Autowired
     private TabHaobanHmGroupSettingMapper haobanHmGroupSettingMapper;
 
-    @Override
-    public Boolean updateGroupRelationCount(Long groupId, Integer changeCount) {
-
-        if (groupId == null){
-            return Boolean.TRUE;
-        }
-        TabHaobanHmGroupSetting tabHaobanHmGroupSetting = haobanHmGroupSettingMapper.selectByPrimaryKey(groupId);
-        if (tabHaobanHmGroupSetting == null || !HmGroupStatus.ENABLE.getCode().equals(tabHaobanHmGroupSetting.getStatus())){
-            return Boolean.FALSE;
-        }
-        return haobanHmGroupSettingMapper.updateGroupSettingCount(groupId, changeCount) == 1;
-    }
-
-    @Override
-    @Transactional(rollbackFor = RuntimeException.class)
-    public Boolean batchUpdateGroupRelationCount(List<HmGroupRelationBO> groupRelations) {
-        groupRelations.forEach(item -> {
-            haobanHmGroupSettingMapper.updateGroupSettingCount(item.getGroupId(), item.getChangeCount());
-        });
-        return null;
-    }
-
     /**
      * 查询分组被引用的次数
      *

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmLinkServiceImpl.java

@@ -131,6 +131,7 @@ public class HmLinkServiceImpl implements HmLinkService {
         welcome.setEnterpriseId(dto.getEnterpriseId());
         welcome.setReferName(dto.getName());
         welcome.setRelationId(dto.getLinkId());
+        welcome.setReferId(dto.getLinkId()+"");
         welcome.setReferCode(dto.getLinkCode());
         welcome.setType(HmWelcomeReferType.LINK.getCode());
         // 新增
@@ -155,9 +156,9 @@ public class HmLinkServiceImpl implements HmLinkService {
     }
     
     @Override
-    public Page<HmLinkBO> queryPageRelationList(Long pageId, String enterpriseId, BasePageInfo basePageInfo) {
+    public Page<HmLinkBO> queryPageRelationList(Long pageId, String enterpriseId, String searchText, BasePageInfo basePageInfo) {
         PageHelper.startPage(basePageInfo);
-        List<TabHmLink> list = this.linkMapper.queryPageRelationList(pageId, enterpriseId);
+        List<TabHmLink> list = this.linkMapper.queryPageRelationList(pageId, enterpriseId, searchText);
         Page<HmLinkBO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, HmLinkBO.class);
         return retPage;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmPageRelationServiceImpl.java

-package com.gic.haoban.manage.service.service.hm.impl;
-
-import com.gic.api.base.commons.Page;
-import com.gic.haoban.common.utils.PageUtil;
-import com.gic.haoban.manage.api.enums.hm.HmPageStatus;
-import com.gic.haoban.manage.api.enums.hm.HmPageType;
-import com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmPageRelationMapper;
-import com.gic.haoban.manage.service.entity.hm.TabHaobanHmPageRelation;
-import com.gic.haoban.manage.service.pojo.bo.hm.HmPageRelationBO;
-import com.gic.haoban.manage.service.pojo.qo.HmPageRelationQO;
-import com.gic.haoban.manage.service.service.hm.HmPageRelationService;
-import com.github.pagehelper.PageHelper;
-import org.apache.commons.collections.CollectionUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Author MUSI
- * @Date 2022/7/3 9:45 PM
- * @Description
- * @Version
- **/
-@Component
-public class HmPageRelationServiceImpl implements HmPageRelationService {
-
-    private static final Logger log = LoggerFactory.getLogger(HmPageRelationServiceImpl.class);
-
-    @Autowired
-    private TabHaobanHmPageRelationMapper haobanHmPageRelationMapper;
-
-
-    @Override
-    @Transactional(rollbackFor = RuntimeException.class)
-    public boolean savePageRelation(HmPageRelationBO hmPageRelationBO) {
-        TabHaobanHmPageRelation pageRelation = new TabHaobanHmPageRelation();
-        pageRelation.setEnterpriseId(hmPageRelationBO.getEnterpriseId());
-        pageRelation.setWxEnterpriseId(hmPageRelationBO.getWxEnterpriseId());
-        pageRelation.setPageCode(hmPageRelationBO.getPageCode());
-        pageRelation.setReferId(hmPageRelationBO.getReferId());
-        pageRelation.setReferCode(hmPageRelationBO.getReferCode());
-        pageRelation.setReferName(hmPageRelationBO.getReferName());
-        pageRelation.setCreateTime(new Date());
-        pageRelation.setUpdateTime(new Date());
-        pageRelation.setType(HmPageType.LINK.getCode());
-        pageRelation.setStatus(HmPageStatus.ENABLE.getCode());
-        return haobanHmPageRelationMapper.insertSelective(pageRelation) == 1;
-    }
-
-    @Override
-    public boolean updatePageRelation(HmPageRelationBO hmPageRelationBO) {
-        // 移除该referId之前的引用
-        Date now = new Date();
-        HmPageRelationQO pageRelationQo = new HmPageRelationQO();
-        pageRelationQo.setStatus(HmPageStatus.ENABLE.getCode());
-        pageRelationQo.setReferId(hmPageRelationBO.getReferId());
-        List<TabHaobanHmPageRelation> tabHaobanHmPageRelations = haobanHmPageRelationMapper.queryPageRelationList(pageRelationQo);
-        if (CollectionUtils.isNotEmpty(tabHaobanHmPageRelations)){
-            for (TabHaobanHmPageRelation tabHaobanHmPageRelation : tabHaobanHmPageRelations) {
-                tabHaobanHmPageRelation.setStatus(HmPageStatus.DISABLE.getCode());
-                tabHaobanHmPageRelation.setUpdateTime(now);
-                haobanHmPageRelationMapper.updateByPrimaryKey(tabHaobanHmPageRelation);
-            }
-        }
-        // insert new relation
-        return this.savePageRelation(hmPageRelationBO);
-    }
-
-    @Override
-    public List<HmPageRelationBO> queryPageRelation(String pageCode) {
-        HmPageRelationQO hmPageRelationQo = new HmPageRelationQO();
-        hmPageRelationQo.setPageCode(pageCode);
-        hmPageRelationQo.setStatus(HmPageStatus.ENABLE.getCode());
-        hmPageRelationQo.setPageSize(1);
-        PageHelper.startPage(hmPageRelationQo.getPageNum(), hmPageRelationQo.getPageSize());
-        List<TabHaobanHmPageRelation> tabHaobanHmPageRelations =
-                haobanHmPageRelationMapper.queryPageRelationList(hmPageRelationQo);
-        return tabHaobanHmPageRelations.stream().map(item -> {
-            HmPageRelationBO temp = new HmPageRelationBO();
-            BeanUtils.copyProperties(item, temp);
-            return temp;
-        }).collect(Collectors.toList());
-    }
-
-    /**
-     * 链接code/模板名称 条件查询
-     *
-     * @return
-     */
-    @Override
-    public Page<HmPageRelationBO> queryPageRelationWithSearchText(HmPageRelationQO hmPageRelationQo) {
-        PageHelper.startPage(hmPageRelationQo.getPageNum(), hmPageRelationQo.getPageSize());
-        com.github.pagehelper.Page<TabHaobanHmPageRelation> pageRelationPage =
-                (com.github.pagehelper.Page<TabHaobanHmPageRelation>) haobanHmPageRelationMapper.queryPageRelationList(hmPageRelationQo);
-        return PageUtil.changePageHelperToCurrentPage(pageRelationPage, HmPageRelationBO.class);
-    }
-
-    /**
-     * 统计templateCode 被引用的总数
-     *
-     * @param pageCode
-     * @return
-     */
-    @Override
-    public Integer countPageTemplateRelation(String pageCode) {
-        return null;
-    }
-}

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmPageServiceImpl.java

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.service.service.hm.impl;
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
 import com.gic.commons.util.UniqueIdUtils;
+import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
 import com.gic.haoban.manage.api.enums.hm.HmPageStatus;
@@ -11,6 +12,7 @@ import com.gic.haoban.manage.service.entity.hm.TabHaobanHmPage;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmPageBO;
 import com.gic.haoban.manage.service.pojo.qo.HmPageTemplateQO;
 import com.gic.haoban.manage.service.service.hm.HmPageService;
+import com.gic.redis.data.util.RedisUtil;
 import com.github.pagehelper.PageHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,6 +22,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @Author MUSI
@@ -37,16 +40,9 @@ public class HmPageServiceImpl implements HmPageService {
 
     private static final String TEMPLATE_CODE_PREFIX = "MB01";
 
-    /**
-     * 根据 referId 查询关联的落地页数据
-     *
-     * @param referId
-     * @return
-     */
-    @Override
-    public HmPageBO queryHmPageTemplateWithReferId(String referId) {
-        return null;
-    }
+    private static final String PAGE_CACHE_KEY_PRE = "HM:page:";
+
+    private static final Long PAGE_CACHE_KEY_EXPIRE_TIME = 5 * 60L;
 
     /**
      * 根据pageId 查询落地页详情
@@ -54,13 +50,18 @@ public class HmPageServiceImpl implements HmPageService {
      * @return
      */
     public HmPageBO queryHmPageDetail(Long pageId){
+        String pageCacheKey = PAGE_CACHE_KEY_PRE + pageId;
+        HmPageBO pageCache = RedisUtil.getCache(pageCacheKey, HmPageBO.class);
+        if (pageCache != null){
+            return pageCache;
+        }
         TabHaobanHmPage haobanHmPage = haobanHmPageMapper.selectByPrimaryKey(pageId);
         if (haobanHmPage == null){
             return null;
         }
-        HmPageBO pageBO = new HmPageBO();
-        BeanUtils.copyProperties(haobanHmPage, pageBO);
-        return pageBO;
+        HmPageBO pageBo = EntityUtil.changeEntityByOrika(HmPageBO.class, haobanHmPage);
+        RedisUtil.setCache(pageCacheKey, pageBo, PAGE_CACHE_KEY_EXPIRE_TIME, TimeUnit.SECONDS);
+        return pageBo;
     }
 
     /**
@@ -92,6 +93,12 @@ public class HmPageServiceImpl implements HmPageService {
         tempHmPage.setModifierName(pageDTO.getModifierName());
         log.info("[deleteHmPageTemplate] params:{}", JSON.toJSONString(tempHmPage));
         haobanHmPageMapper.updateByPrimaryKeySelective(tempHmPage);
+        this.removeCache(pageDTO.getPageId());
+    }
+
+    private void removeCache(Long pageId){
+        String pageCacheKey = PAGE_CACHE_KEY_PRE + pageId;
+        RedisUtil.delCache(pageCacheKey);
     }
 
     /**
@@ -129,6 +136,7 @@ public class HmPageServiceImpl implements HmPageService {
             haobanHmPage.setModifierId(pageDTO.getModifierId());
             haobanHmPage.setModifierName(pageDTO.getModifierName());
             haobanHmPageMapper.updateByPrimaryKeySelective(haobanHmPage);
+            this.removeCache(pageDTO.getPageId());
             return haobanHmPage.getPageId();
         }
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/WelcomeRelationServiceImpl.java

@@ -13,8 +13,10 @@ import com.gic.haoban.manage.service.pojo.bo.welcome.WelcomeDetailBO;
 import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO;
 import com.gic.haoban.manage.service.service.WelcomeService;
 import com.gic.haoban.manage.service.service.hm.WelcomeRelationService;
+import com.gic.redis.data.util.RedisUtil;
 import com.github.pagehelper.PageHelper;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -25,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /**
@@ -44,6 +47,10 @@ public class WelcomeRelationServiceImpl implements WelcomeRelationService {
     @Autowired
     private WelcomeService welcomeService;
 
+    private static final String WELCOME_RELATION_KEY = "HM:welcome:relation:";
+    private static final Long WELCOME_RELATION_CACHE_TIME = 5 * 60L;
+
+
     /**
      * 查询欢迎语关联关系
      *
@@ -53,11 +60,18 @@ public class WelcomeRelationServiceImpl implements WelcomeRelationService {
      */
     @Override
     public HmWelcomeRelationBO queryWelcomeRelation(String referId, Integer status) {
+        String welcomeRelationCacheKey = WELCOME_RELATION_KEY + referId;
+        HmWelcomeRelationBO cache = RedisUtil.getCache(welcomeRelationCacheKey, HmWelcomeRelationBO.class);
+        if (cache != null){
+            return cache;
+        }
         List<TabHaobanWelcomeTemplateRelation> welcomeTemplateRelations = welcomeTemplateRelationMapper.queryWelTemplateRelation(null, referId, status);
         if (CollectionUtils.isEmpty(welcomeTemplateRelations)) {
             return null;
         }
-        return EntityUtil.changeEntityByOrika(HmWelcomeRelationBO.class, welcomeTemplateRelations.get(0));
+        HmWelcomeRelationBO welcomeRelationBO = EntityUtil.changeEntityByOrika(HmWelcomeRelationBO.class, welcomeTemplateRelations.get(0));
+        RedisUtil.setCache(welcomeRelationCacheKey, welcomeRelationBO, WELCOME_RELATION_CACHE_TIME, TimeUnit.SECONDS);
+        return welcomeRelationBO;
     }
 
     /**
@@ -148,11 +162,23 @@ public class WelcomeRelationServiceImpl implements WelcomeRelationService {
         // 取消该referId已有的引用
         List<TabHaobanWelcomeTemplateRelation> tabHaobanWelcomeTemplateRelations =
                 welcomeTemplateRelationMapper.queryWelTemplateRelation(null, hmWelcomeRelationBO.getReferId(), WelcomeRelationStatusEnum.ENABLE.getCode());
-        for (TabHaobanWelcomeTemplateRelation tabHaobanWelcomeTemplateRelation : tabHaobanWelcomeTemplateRelations) {
-            tabHaobanWelcomeTemplateRelation.setStatus(WelcomeRelationStatusEnum.DISABLE.getCode());
-            tabHaobanWelcomeTemplateRelation.setUpdateTime(new Date());
-            welcomeTemplateRelationMapper.updateByPrimaryKeySelective(tabHaobanWelcomeTemplateRelation);
+        TabHaobanWelcomeTemplateRelation welcomeTemplateRelation = tabHaobanWelcomeTemplateRelations.get(0);
+        if (StringUtils.equals(welcomeTemplateRelation.getReferId(), hmWelcomeRelationBO.getReferId())){
+            return Boolean.TRUE;
         }
+        welcomeTemplateRelation.setUpdateTime(new Date());
+        welcomeTemplateRelation.setStatus(WelcomeRelationStatusEnum.ENABLE.getCode());
+        welcomeTemplateRelationMapper.updateByPrimaryKeySelective(welcomeTemplateRelation);
+        // 定义
+        this.removeWelcomeRelationCache(welcomeTemplateRelation.getReferId());
+        if (StringUtils.isNotBlank(welcomeTemplateRelation.getWelcomeId())) {
             return this.saveHmWelcomeRelation(hmWelcomeRelationBO);
         }
+        return Boolean.TRUE;
+    }
+
+    private void removeWelcomeRelationCache(String referId){
+        String welcomeRelationCacheKey = WELCOME_RELATION_KEY + referId;
+        RedisUtil.delCache(welcomeRelationCacheKey);
+    }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WelcomeServiceImpl.java

 package com.gic.haoban.manage.service.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.commons.util.UniqueIdUtils;
 import com.gic.haoban.common.utils.StringUtil;
-import com.gic.haoban.manage.api.dto.KeyDataDTO;
 import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveCheckDTO;
 import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO;
 import com.gic.haoban.manage.api.enums.FriendSettingTypeEnum;
-import com.gic.haoban.manage.api.enums.KeyDataEnum;
 import com.gic.haoban.manage.api.enums.WelcomeMediaTypeEnum;
 import com.gic.haoban.manage.api.enums.WelcomeRelationStatusEnum;
 import com.gic.haoban.manage.api.enums.WelcomeSuitTypeEnum;
 import com.gic.haoban.manage.api.enums.hm.HmWelcomeReferType;
 import com.gic.haoban.manage.api.enums.hm.HmWelcomeType;
-import com.gic.haoban.manage.service.dao.mapper.*;
-import com.gic.haoban.manage.service.entity.*;
+import com.gic.haoban.manage.service.dao.mapper.StaffDepartmentRelatedMapper;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanFriendSettingMapper;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanWelcomeMapper;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanWelcomeMediaMapper;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanWelcomeSuitRangMapper;
+import com.gic.haoban.manage.service.dao.mapper.TabMiniprogramSettingMapper;
+import com.gic.haoban.manage.service.entity.TabHaobanFriendSetting;
+import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated;
+import com.gic.haoban.manage.service.entity.TabHaobanWelcomeMedia;
+import com.gic.haoban.manage.service.entity.TabHaobanWelcomeSuitRang;
+import com.gic.haoban.manage.service.entity.TabMiniprogramSetting;
+import com.gic.haoban.manage.service.entity.TabWelcome;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmWelcomeRelationBO;
-import com.gic.haoban.manage.service.pojo.bo.welcome.*;
+import com.gic.haoban.manage.service.pojo.bo.welcome.FriendSettingDetailBO;
+import com.gic.haoban.manage.service.pojo.bo.welcome.SaveFriendSettingBO;
+import com.gic.haoban.manage.service.pojo.bo.welcome.SaveWelcomeBO;
+import com.gic.haoban.manage.service.pojo.bo.welcome.SaveWelcomeMediaBO;
+import com.gic.haoban.manage.service.pojo.bo.welcome.WelcomeDetailBO;
+import com.gic.haoban.manage.service.pojo.bo.welcome.WelcomeListBO;
+import com.gic.haoban.manage.service.pojo.bo.welcome.WelcomeMediaBO;
+import com.gic.haoban.manage.service.pojo.bo.welcome.WelcomeSuitDepartmentBO;
+import com.gic.haoban.manage.service.pojo.bo.welcome.WelcomeSuitStaffBO;
 import com.gic.haoban.manage.service.pojo.qo.WelcomeInfoQO;
 import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO;
 import com.gic.haoban.manage.service.service.KeyDataService;
@@ -33,7 +47,13 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -641,30 +661,14 @@ public class WelcomeServiceImpl implements WelcomeService {
     }
 
     @Override
-    public WelcomeDetailBO getMatchWelcomeWithReferId(String staffId, String wxEnterpriseId, String state) {
+    public WelcomeDetailBO getMatchWelcomeWithReferId(String staffId, String wxEnterpriseId, String referId) {
         logger.info("[getMatchWelcomeWithReferId] staffId:{}, wxEnterpriseId:{}, referId:{}",
-                staffId, wxEnterpriseId, state);
-        String referId = "";
-        if (StringUtils.startsWith(state, "HM")){
-            // 活码
-            // 根据referId 查询 关联关系表
-           referId = StringUtils.substring(state, 2);
-        }
-        if (StringUtils.startsWith(staffId, "DT")){
-            // 链接 key
-            KeyDataDTO keyData = keyDataService.getDataByKey(StringUtils.substring(state, 2), KeyDataEnum.DYNAMIC_HM, null);
-            if (keyData != null){
-                JSONObject jsonObject = JSONObject.parseObject(keyData.getData());
-                if (jsonObject != null){
-                    referId = jsonObject.get("ljid").toString();
-                }
-            }
-        }
+                staffId, wxEnterpriseId, referId);
 
         if (StringUtils.isBlank(referId)){
             return null;
         }
-        HmWelcomeRelationBO welcomeRelationBO = welcomeRelationService.queryWelcomeRelation(state, WelcomeRelationStatusEnum.ENABLE.getCode());
+        HmWelcomeRelationBO welcomeRelationBO = welcomeRelationService.queryWelcomeRelation(referId, WelcomeRelationStatusEnum.ENABLE.getCode());
         if (welcomeRelationBO == null){
             // 不存在
             return null;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmGroupApiServiceImpl.java

@@ -12,8 +12,10 @@ import com.gic.haoban.manage.api.enums.hm.HmGroupStatus;
 import com.gic.haoban.manage.api.service.hm.HmGroupApiService;
 import com.gic.haoban.manage.service.errorcode.HaoBanErrCode;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmGroupSettingBO;
+import com.gic.haoban.manage.service.pojo.bo.hm.HmQrcodeGroupNumBO;
 import com.gic.haoban.manage.service.pojo.qo.HmGroupInfoQO;
 import com.gic.haoban.manage.service.service.hm.HmGroupService;
+import com.gic.haoban.manage.service.service.hm.HmQrcodeService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
@@ -25,6 +27,10 @@ import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * @Author MUSI
@@ -43,6 +49,9 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
     @Autowired
     private HmGroupService groupService;
 
+    @Autowired
+    private HmQrcodeService qrcodeService;
+
     @Override
     public ServiceResponse<Long> saveOrUpdateHmGroupSetting(HmGroupDTO hmGroupDTO) {
         log.info("[saveOrUpdateHmGroupSetting] params:{}", JSON.toJSONString(hmGroupDTO));
@@ -100,13 +109,20 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
         Page<HmGroupDTO> groupDtoPage = PageUtil.changeToCurrentPage(groupSettingPage, HmGroupDTO.class);
         List<HmGroupDTO> result = new ArrayList<>();
         if (groupQueryDTO.getPageNum() == 1) {
-            // 第一页展示默认分组选项
-            // todo query 活码 默认分组的总数
+            // 仅第一页展示默认分组选项
             result.add(buildDefault(0));
         }
-        if (CollectionUtils.isNotEmpty(groupDtoPage.getResult())) {
-            groupDtoPage.getResult().forEach(item -> item.setDefaultFlag(0));
         result.addAll(groupDtoPage.getResult());
+        List<Long> groupIds = result.stream().map(HmGroupDTO::getGroupId).collect(Collectors.toList());
+        List<HmQrcodeGroupNumBO> qrcodeGroupNumBoList = qrcodeService.getGroupIdNumByEnterpriseId(groupQueryDTO.getEnterpriseId());
+        Map<Integer, Integer> qrcodeGroupNumMap = qrcodeGroupNumBoList.stream()
+                .collect(Collectors.toMap(HmQrcodeGroupNumBO::getHmGroupId, HmQrcodeGroupNumBO::getNum, (v1, v2) -> v1));
+        for (HmGroupDTO groupDTO : result) {
+            Integer referNum = Optional.ofNullable(qrcodeGroupNumMap.get(groupDTO.getGroupId().intValue())).orElse(0);
+            groupDTO.setReferNum(referNum);
+            if (!DEFAULT_GROUP_ID.equals(groupDTO.getGroupId())){
+                groupDTO.setDefaultFlag(0);
+            }
         }
         groupDtoPage.setResult(result);
         return ServiceResponse.success(groupDtoPage);
@@ -151,8 +167,8 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
      */
     @Override
     public ServiceResponse<Integer> queryGroupTotalReferCount(String enterpriseId, String wxEnterpriseId) {
-        Integer referCount = groupService.queryGroupTotalReferCount(enterpriseId, wxEnterpriseId);
-        return ServiceResponse.success(referCount);
+        int totalReferCount = qrcodeService.getTotalByEnterpriseId(enterpriseId);
+        return ServiceResponse.success(totalReferCount);
     }
 
     /**

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmPageApiServiceImpl.java

 package com.gic.haoban.manage.service.service.out.impl.hm;
 
 import com.alibaba.fastjson.JSON;
+import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon;
@@ -11,13 +12,11 @@ import com.gic.haoban.manage.api.dto.qdto.hm.HmPageQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmPageRelationQDTO;
 import com.gic.haoban.manage.api.enums.hm.HmPageStatus;
 import com.gic.haoban.manage.api.service.hm.HmPageApiService;
+import com.gic.haoban.manage.service.pojo.bo.hm.HmLinkBO;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmPageBO;
-import com.gic.haoban.manage.service.pojo.bo.hm.HmPageRelationBO;
-import com.gic.haoban.manage.service.pojo.qo.HmPageRelationQO;
 import com.gic.haoban.manage.service.pojo.qo.HmPageTemplateQO;
-import com.gic.haoban.manage.service.service.hm.HmPageRelationService;
+import com.gic.haoban.manage.service.service.hm.HmLinkService;
 import com.gic.haoban.manage.service.service.hm.HmPageService;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,12 +39,13 @@ import java.util.stream.Collectors;
 public class HmPageApiServiceImpl implements HmPageApiService {
 
     private static final Logger log = LoggerFactory.getLogger(HmPageApiServiceImpl.class);
-    @Autowired
-    private HmPageRelationService pageRelationService;
 
     @Autowired
     private HmPageService haobanHmPageService;
 
+    @Autowired
+    private HmLinkService linkService;
+
     @Override
     public ServiceResponse<Long> saveOrUpdateHmPage(HmPageDTO pageDTO) {
 
@@ -76,7 +76,7 @@ public class HmPageApiServiceImpl implements HmPageApiService {
         if (Objects.isNull(pageBo) || !Objects.equals(HmPageStatus.ENABLE.getCode(), pageBo.getStatus())) {
             return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_8.getCode() + "", HaoBanErrCodeCommon.ERR_8.getMsg());
         }
-        if (this.checkPageIsBeQuoted(pageBo.getPageCode()) > 0) {
+        if (this.checkPageIsBeQuoted(pageBo.getPageId(), pageBo.getEnterpriseId()) > 0) {
             return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_9.getCode() + "", HaoBanErrCodeCommon.ERR_9.getMsg());
         }
         haobanHmPageService.deleteHmPage(pageDTO);
@@ -96,13 +96,15 @@ public class HmPageApiServiceImpl implements HmPageApiService {
     /**
      * 校验落地页模板pageTemplateCode 是否被关联
      *
-     * @param pageCode
+     * @param pageId
      * @return true 存在关联
      * false 不存在关联关系
      */
-    private Integer checkPageIsBeQuoted(String pageCode) {
-        List<HmPageRelationBO> relations = pageRelationService.queryPageRelation(pageCode);
-        return relations.size();
+    private Integer checkPageIsBeQuoted(Long pageId, String enterpriseId) {
+        BasePageInfo pageInfo = new BasePageInfo();
+        pageInfo.setPageSize(1);
+        Page<HmLinkBO> linkBOPage = linkService.queryPageRelationList(pageId, enterpriseId, null, pageInfo);
+        return linkBOPage.getTotalCount();
     }
 
     /**
@@ -113,17 +115,21 @@ public class HmPageApiServiceImpl implements HmPageApiService {
      */
     @Override
     public ServiceResponse<Page<HmPageRelationDTO>> queryPageRelation(HmPageRelationQDTO relationQueryDTO) {
-        HmPageRelationQO hmPageRelationQo = new HmPageRelationQO();
-        hmPageRelationQo.setTemplateSearchText(relationQueryDTO.getSearchText());
-        hmPageRelationQo.setEnterpriseId(relationQueryDTO.getEnterpriseId());
-        hmPageRelationQo.setWxEnterpriseId(relationQueryDTO.getWxEnterpriseId());
-        hmPageRelationQo.setPageNum(relationQueryDTO.getPageNum());
-        hmPageRelationQo.setPageSize(relationQueryDTO.getPageSize());
-        hmPageRelationQo.setPageCode(relationQueryDTO.getPageId() + "");
-        hmPageRelationQo.setStatus(HmPageStatus.ENABLE.getCode());
-        Page<HmPageRelationBO> hmPageRelationPage = pageRelationService.queryPageRelationWithSearchText(hmPageRelationQo);
-        Page<HmPageRelationDTO> pageRelationResult = PageUtil.changeToCurrentPage(hmPageRelationPage, HmPageRelationDTO.class);
-        return ServiceResponse.success(pageRelationResult);
+        BasePageInfo pageInfo = new BasePageInfo();
+        pageInfo.setPageNum(relationQueryDTO.getPageNum());
+        pageInfo.setPageSize(relationQueryDTO.getPageSize());
+        Page<HmLinkBO> hmLinkBOPage = linkService.queryPageRelationList(relationQueryDTO.getPageId(), relationQueryDTO.getEnterpriseId(), relationQueryDTO.getSearchText(), pageInfo);
+        List<HmPageRelationDTO> pageRelations = hmLinkBOPage.getResult().stream()
+                .map(item -> {
+                    HmPageRelationDTO pageRelation = new HmPageRelationDTO();
+                    pageRelation.setReferName(item.getName());
+                    pageRelation.setReferId(item.getLinkId() + "");
+                    pageRelation.setReleationId(item.getLinkCode());
+                    return pageRelation;
+                }).collect(Collectors.toList());
+        Page<HmPageRelationDTO> pageRelationDTOPage = PageUtil.changeToCurrentPage(hmLinkBOPage, HmPageRelationDTO.class);
+        pageRelationDTOPage.setResult(pageRelations);
+        return ServiceResponse.success(pageRelationDTOPage);
     }
 
     /**

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmQrcodeApiServiceImpl.java

@@ -141,10 +141,6 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
         }
         int saveResult = hmQrcodeService.insert(hmQrcodeQDTO);
         if (saveResult == 1) {
-            // update group refer count
-            if (hmQrcodeQDTO.getHmGroupId() != null) {
-                groupService.updateGroupRelationCount(hmQrcodeQDTO.getHmGroupId(), 1);
-            }
             // save welcome relation
             this.saveWelcomeRelation(hmQrcodeQDTO);
         }
@@ -219,7 +215,6 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
         
         int updateResult = hmQrcodeService.update(hmQrcodeQDTO);
         if (updateResult == 1) {
-            // 更新分组引用次数
             // 更新欢迎语引用次数
             this.updateWelcomeRelation(hmQrcodeQDTO);
         }

haoban-manage3-service/src/main/resources/mapper/hm/HmLinkMapper.xml

@@ -147,9 +147,12 @@
   	and status_flag = 1
   </select>
 
-    <select id="queryPageRelationList" resultMap="BaseResultMap">
+    <select id="queryPageRelationList" resultMap="result-map-tabHaobanHmLink">
         select <include refid="Base_Column_List"/>
         from tab_haoban_hm_link where  page_id = #{pageId} and enterprise_id=#{enterpriseId}
+		<if test="searchText != null and searchText != '' ">
+			and ( link_code = #{searchText} or name like CONCAT('%', #{searchText},'%'))
+		</if>
     </select>
 
 </mapper> 
\ No newline at end of file

haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmGroupSettingMapper.xml

@@ -6,7 +6,6 @@
         <result column="group_name" property="groupName" jdbcType="VARCHAR"/>
         <result column="enterprise_id" property="enterpriseId" jdbcType="VARCHAR"/>
         <result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR"/>
-        <result column="refer_num" property="referNum" jdbcType="INTEGER"/>
         <result column="status" property="status" jdbcType="INTEGER"/>
         <result column="sort" property="sort" jdbcType="INTEGER"/>
         <result column="creator_id" property="creatorId" jdbcType="VARCHAR"/>
@@ -18,7 +17,7 @@
     </resultMap>
     <sql id="Base_Column_List">
         group_id
-        , group_name, enterprise_id, wx_enterprise_id, refer_num, status, sort, creator_id,
+        , group_name, enterprise_id, wx_enterprise_id, status, sort, creator_id,
     creator_name, modifier_id, create_time, update_time, modifier_name
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">
@@ -35,12 +34,12 @@
     <insert id="insert" useGeneratedKeys="true" keyProperty="groupId"
             parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmGroupSetting">
         insert into tab_haoban_hm_group_setting (group_id, group_name, enterprise_id,
-                                                 wx_enterprise_id, refer_num, status,
+                                                 wx_enterprise_id, status,
                                                  sort, creator_id, creator_name,
                                                  modifier_id, create_time, update_time,
                                                  modifier_name)
         values (#{groupId,jdbcType=BIGINT}, #{groupName,jdbcType=VARCHAR}, #{enterpriseId,jdbcType=VARCHAR},
-                #{wxEnterpriseId,jdbcType=VARCHAR}, #{referNum,jdbcType=INTEGER}, #{status,jdbcType=INTEGER},
+                #{wxEnterpriseId,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
                 #{sort,jdbcType=INTEGER}, #{creatorId,jdbcType=VARCHAR}, #{creatorName,jdbcType=VARCHAR},
                 #{modifierId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
                 #{modifierName,jdbcType=VARCHAR})
@@ -61,9 +60,6 @@
             <if test="wxEnterpriseId != null">
                 wx_enterprise_id,
             </if>
-            <if test="referNum != null">
-                refer_num,
-            </if>
             <if test="status != null">
                 status,
             </if>
@@ -102,9 +98,6 @@
             <if test="wxEnterpriseId != null">
                 #{wxEnterpriseId,jdbcType=VARCHAR},
             </if>
-            <if test="referNum != null">
-                #{referNum,jdbcType=INTEGER},
-            </if>
             <if test="status != null">
                 #{status,jdbcType=INTEGER},
             </if>
@@ -144,9 +137,6 @@
             <if test="wxEnterpriseId != null">
                 wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
             </if>
-            <if test="referNum != null">
-                refer_num = #{referNum,jdbcType=INTEGER},
-            </if>
             <if test="status != null">
                 status = #{status,jdbcType=INTEGER},
             </if>
@@ -179,7 +169,6 @@
         set group_name       = #{groupName,jdbcType=VARCHAR},
             enterprise_id    = #{enterpriseId,jdbcType=VARCHAR},
             wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
-            refer_num        = #{referNum,jdbcType=INTEGER},
             status           = #{status,jdbcType=INTEGER},
             sort             = #{sort,jdbcType=INTEGER},
             creator_id       = #{creatorId,jdbcType=VARCHAR},

haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmPageRelationMapper.xml

-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmPageRelationMapper">
-    <resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.hm.TabHaobanHmPageRelation">
-        <id column="relation_id" property="relationId" jdbcType="BIGINT"/>
-        <result column="page_code" property="pageCode" jdbcType="VARCHAR"/>
-        <result column="enterprise_id" property="enterpriseId" jdbcType="VARCHAR"/>
-        <result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR"/>
-        <result column="refer_id" property="referId" jdbcType="VARCHAR"/>
-        <result column="refer_code" property="referCode" jdbcType="VARCHAR"/>
-        <result column="refer_name" property="referName" jdbcType="VARCHAR"/>
-        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
-        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
-        <result column="type" property="type" jdbcType="INTEGER"/>
-        <result column="status" property="status" jdbcType="INTEGER"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        relation_id
-        , page_code, enterprise_id, wx_enterprise_id, refer_id, refer_name,
-    create_time, update_time, type, status, refer_code
-    </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">
-        select
-        <include refid="Base_Column_List"/>
-        from tab_haoban_hm_page_relation
-        where relation_id = #{relationId,jdbcType=BIGINT}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-        delete
-        from tab_haoban_hm_page_relation
-        where relation_id = #{relationId,jdbcType=BIGINT}
-    </delete>
-    <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmPageRelation">
-        insert into tab_haoban_hm_page_relation (relation_id, page_code, enterprise_id,
-                                                  wx_enterprise_id, refer_id, refer_name,
-                                                  create_time, update_time, type,
-                                                  status, refer_code)
-        values (#{relationId,jdbcType=BIGINT}, #{pageCode,jdbcType=VARCHAR}, #{enterpriseId,jdbcType=VARCHAR},
-                #{wxEnterpriseId,jdbcType=VARCHAR}, #{referId,jdbcType=VARCHAR}, #{referName,jdbcType=VARCHAR},
-                #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{type,jdbcType=INTEGER},
-                #{status,jdbcType=INTEGER}, #{referCode,jdbcType=VARCHAR})
-    </insert>
-    <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmPageRelation">
-        insert into tab_haoban_hm_page_relation
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="relationId != null">
-                relation_id,
-            </if>
-            <if test="pageCode != null">
-                page_code,
-            </if>
-            <if test="enterpriseId != null">
-                enterprise_id,
-            </if>
-            <if test="wxEnterpriseId != null">
-                wx_enterprise_id,
-            </if>
-            <if test="referId != null">
-                refer_id,
-            </if>
-            <if test="referCode != null">
-                refer_code,
-            </if>
-            <if test="referName != null">
-                refer_name,
-            </if>
-            <if test="createTime != null">
-                create_time,
-            </if>
-            <if test="updateTime != null">
-                update_time,
-            </if>
-            <if test="type != null">
-                type,
-            </if>
-            <if test="status != null">
-                status,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="relationId != null">
-                #{relationId,jdbcType=BIGINT},
-            </if>
-            <if test="pageCode != null">
-                #{pageCode,jdbcType=VARCHAR},
-            </if>
-            <if test="enterpriseId != null">
-                #{enterpriseId,jdbcType=VARCHAR},
-            </if>
-            <if test="wxEnterpriseId != null">
-                #{wxEnterpriseId,jdbcType=VARCHAR},
-            </if>
-            <if test="referId != null">
-                #{referId,jdbcType=VARCHAR},
-            </if>
-            <if test="referCode != null">
-                #{referCode,jdbcType=VARCHAR},
-            </if>
-            <if test="referName != null">
-                #{referName,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime != null">
-                #{createTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updateTime != null">
-                #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="type != null">
-                #{type,jdbcType=INTEGER},
-            </if>
-            <if test="status != null">
-                #{status,jdbcType=INTEGER},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKeySelective"
-            parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmPageRelation">
-        update tab_haoban_hm_page_relation
-        <set>
-            <if test="pageCode != null">
-                page_code = #{pageCode,jdbcType=VARCHAR},
-            </if>
-            <if test="enterpriseId != null">
-                enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
-            </if>
-            <if test="wxEnterpriseId != null">
-                wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
-            </if>
-            <if test="referId != null">
-                refer_id = #{referId,jdbcType=VARCHAR},
-            </if>
-            <if test="referCode != null">
-                refer_code = #{referCode,jdbcType=VARCHAR},
-            </if>
-            <if test="referName != null">
-                refer_name = #{referName,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime != null">
-                create_time = #{createTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updateTime != null">
-                update_time = #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="type != null">
-                type = #{type,jdbcType=INTEGER},
-            </if>
-            <if test="status != null">
-                status = #{status,jdbcType=INTEGER},
-            </if>
-        </set>
-        where relation_id = #{relationId,jdbcType=BIGINT}
-    </update>
-    <update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmPageRelation">
-        update tab_haoban_hm_page_relation
-        set page_code = #{pageCode,jdbcType=VARCHAR},
-            enterprise_id      = #{enterpriseId,jdbcType=VARCHAR},
-            wx_enterprise_id   = #{wxEnterpriseId,jdbcType=VARCHAR},
-            refer_id           = #{referId,jdbcType=VARCHAR},
-            refer_code = #{referCode,jdbcType=VARCHAR},
-            refer_name         = #{referName,jdbcType=VARCHAR},
-            create_time        = #{createTime,jdbcType=TIMESTAMP},
-            update_time        = #{updateTime,jdbcType=TIMESTAMP},
-            `type`             = #{type,jdbcType=INTEGER},
-            status             = #{status,jdbcType=INTEGER}
-        where relation_id = #{relationId,jdbcType=BIGINT}
-    </update>
-
-    <select id="queryPageRelationList" resultMap="BaseResultMap">
-        select <include refid="Base_Column_List"/>
-        from tab_haoban_hm_page_relation
-        <where>
-            <if test="pageCode != null and pageCode != ''">
-                page_code = #{pageCode}
-            </if>
-            <if test="status != null">
-                and `status` = #{status}
-            </if>
-        </where>
-        order by relation_id desc
-    </select>
-</mapper>
\ No newline at end of file

haoban-manage3-service/src/test/java/HmLinkTest.java

@@ -117,7 +117,7 @@ public class HmLinkTest {
     public void test3() {
         this.keyDataApiService.saveMobileData("112","10000", "15999") ;
 
-        System.out.println(this.keyDataApiService.getDataByKey("679f17d8c2e940a28dc484689c0339db", KeyDataEnum.MOBILE));
+        //System.out.println(this.keyDataApiService.getDataByKey("679f17d8c2e940a28dc484689c0339db", KeyDataEnum.MOBILE));
     }
 
     @Test

haoban-manage3-service/src/test/java/HmPageServiceTest.java

-import cn.hutool.core.thread.ConcurrencyTester;
-import cn.hutool.core.thread.ThreadUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
+import com.gic.haoban.manage.api.dto.hm.HmGroupDTO;
+import com.gic.haoban.manage.api.dto.hm.HmGroupQueryDTO;
 import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
+import com.gic.haoban.manage.api.dto.hm.HmPageRelationDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmPageQDTO;
-import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
-import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
-import com.gic.haoban.manage.api.service.StaffApiService;
-import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
+import com.gic.haoban.manage.api.dto.qdto.hm.HmPageRelationQDTO;
 import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
+import com.gic.haoban.manage.api.service.hm.HmGroupApiService;
 import com.gic.haoban.manage.api.service.hm.HmPageApiService;
-import com.gic.haoban.manage.service.pojo.qo.HmPageTemplateQO;
-import com.gic.haoban.manage.service.service.StaffService;
-import com.gic.haoban.manage.service.service.TestService;
-import com.gic.haoban.manage.service.service.hm.HmPageService;
-import com.gic.wechat.api.dto.qywx.DepartmentDTO;
-import com.gic.wechat.api.service.qywx.QywxDepartmentApiService;
-import com.gic.wechat.api.service.qywx.QywxUserApiService;
-import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import java.util.List;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:applicationContext-conf.xml"})
 public class HmPageServiceTest {
 
-    private static final Logger logger = LoggerFactory.getLogger(HmPageServiceTest.class);
-
     @Autowired
     private HmPageApiService pageService;
 
     @Autowired
     private WxEnterpriseRelatedApiService enterpriseRelatedApiService;
 
+    @Autowired
+    private HmGroupApiService groupService;
+
     @Test
     public void test(){
         HmPageQDTO pageQDTO = new HmPageQDTO();
@@ -57,4 +44,29 @@ public class HmPageServiceTest {
         System.out.println(JSON.toJSONString(enterpriseDetailDTOServiceResponse));
     }
 
+    @Test
+    public void queryPageList(){
+        HmPageRelationQDTO pageRelationQDTO = new HmPageRelationQDTO();
+        pageRelationQDTO.setPageId(418460224953786370L);
+        pageRelationQDTO.setEnterpriseId("ff8080815dacd3a2015dacd3ef5c0000");
+        pageRelationQDTO.setSearchText("LJ01419636016144465921");
+        ServiceResponse<Page<HmPageRelationDTO>> pageServiceResponse = pageService.queryPageRelation(pageRelationQDTO);
+        System.out.println(JSON.toJSONString(pageServiceResponse));
+    }
+
+    @Test
+    public void deletePage(){
+        HmPageDTO pageDTO = new HmPageDTO();
+        pageDTO.setPageId(418460224953786370L);
+        ServiceResponse<Boolean> booleanServiceResponse = pageService.deleteHmPage(pageDTO);
+        System.out.println(JSON.toJSONString(booleanServiceResponse));
+    }
+
+    @Test
+    public void groupList(){
+        HmGroupQueryDTO groupQueryDTO = new HmGroupQueryDTO();
+        ServiceResponse<Page<HmGroupDTO>> pageServiceResponse = groupService.queryHmGroupSettingList(groupQueryDTO);
+        System.out.println(JSON.toJSONString(pageServiceResponse));
+    }
+
 }