feat: 统一命名

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmLinkWxaDTO.java

@@ -16,7 +16,7 @@ public class HmLinkWxaDTO implements Serializable {
 
     private static final long serialVersionUID = 6473795387449522116L;
 
-    private HmPageTemplateDTO page;
+    private HmPageDTO page;
     // 二维码
     private String hmQrcode;
 
@@ -60,11 +60,11 @@ public class HmLinkWxaDTO implements Serializable {
         this.selectStoreFlag = selectStoreFlag;
     }
 
-    public HmPageTemplateDTO getPage() {
+    public HmPageDTO getPage() {
         return page;
     }
 
-    public void setPage(HmPageTemplateDTO page) {
+    public void setPage(HmPageDTO page) {
         this.page = page;
     }
 }
\ No newline at end of file

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmPageTemplateRespDTO.java → haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmPageDTO.java

 package com.gic.haoban.manage.api.dto.hm;
 
-import java.io.Serializable;
+import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
+
 import java.util.Date;
 
 /**
@@ -9,9 +10,10 @@ import java.util.Date;
  * @Description
  * @Version
  **/
-public class HmPageTemplateRespDTO implements Serializable {
+public class HmPageDTO extends WebLoginDTO {
+
+    private static final long serialVersionUID = 8049920392780217427L;
 
-    private static final long serialVersionUID = 4804653087679367805L;
     /**
      * 落地页id
      */
@@ -87,6 +89,14 @@ public class HmPageTemplateRespDTO implements Serializable {
 
     private Date updateTime;
 
+    public Long getPageId() {
+        return pageId;
+    }
+
+    public void setPageId(Long pageId) {
+        this.pageId = pageId;
+    }
+
     public String getPageCode() {
         return pageCode;
     }
@@ -103,30 +113,6 @@ public class HmPageTemplateRespDTO implements Serializable {
         this.pageName = pageName;
     }
 
-    public String getEnterpriseId() {
-        return enterpriseId;
-    }
-
-    public void setEnterpriseId(String enterpriseId) {
-        this.enterpriseId = enterpriseId;
-    }
-
-    public String getWxEnterpriseId() {
-        return wxEnterpriseId;
-    }
-
-    public void setWxEnterpriseId(String wxEnterpriseId) {
-        this.wxEnterpriseId = wxEnterpriseId;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
     public String getPageTitle() {
         return pageTitle;
     }
@@ -175,6 +161,34 @@ public class HmPageTemplateRespDTO implements Serializable {
         this.guideComment = guideComment;
     }
 
+    @Override
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    @Override
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    @Override
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    @Override
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
     public String getCreateorId() {
         return createorId;
     }
@@ -222,12 +236,4 @@ public class HmPageTemplateRespDTO implements Serializable {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-
-    public Long getPageId() {
-        return pageId;
-    }
-
-    public void setPageId(Long pageId) {
-        this.pageId = pageId;
-    }
 }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmPageRelationRespDTO.java → haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmPageRelationDTO.java

 package com.gic.haoban.manage.api.dto.hm;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Author MUSI
@@ -9,7 +8,7 @@ import java.util.Date;
  * @Description
  * @Version
  **/
-public class HmPageRelationRespDTO implements Serializable {
+public class HmPageRelationDTO implements Serializable {
 
     private static final long serialVersionUID = 8682427720134740563L;
     /**

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmPageTemplateDTO.java

-package com.gic.haoban.manage.api.dto.hm;
-
-import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
-
-/**
- * @Author MUSI
- * @Date 2022/7/3 6:49 PM
- * @Description
- * @Version
- **/
-public class HmPageTemplateDTO extends WebLoginDTO {
-
-    private static final long serialVersionUID = 8049920392780217427L;
-
-    /**
-     * 落地页id
-     */
-    private Long pageId;
-
-    /**
-     * 落地页code
-     */
-    private String pageCode;
-
-    /**
-     * 落地页模板名称
-     */
-    private String pageName;
-
-    /**
-     * 页面标题
-     */
-    private String pageTitle;
-
-    /**
-     * 商户名称
-     */
-    private String merchantName;
-
-    /**
-     * 商户名称
-     */
-    private String merchantPhoneNumber;
-
-    /**
-     * 商户logo
-     */
-    private String merchantLogo;
-
-    /**
-     * 页面背景图
-     */
-    private String pageBackgroundImg;
-
-    /**
-     * 引导语
-     */
-    private String guideComment;
-
-    public Long getPageId() {
-        return pageId;
-    }
-
-    public void setPageId(Long pageId) {
-        this.pageId = pageId;
-    }
-
-    public String getPageCode() {
-        return pageCode;
-    }
-
-    public void setPageCode(String pageCode) {
-        this.pageCode = pageCode;
-    }
-
-    public String getPageName() {
-        return pageName;
-    }
-
-    public void setPageName(String pageName) {
-        this.pageName = pageName;
-    }
-
-    public String getPageTitle() {
-        return pageTitle;
-    }
-
-    public void setPageTitle(String pageTitle) {
-        this.pageTitle = pageTitle;
-    }
-
-    public String getMerchantName() {
-        return merchantName;
-    }
-
-    public void setMerchantName(String merchantName) {
-        this.merchantName = merchantName;
-    }
-
-    public String getMerchantPhoneNumber() {
-        return merchantPhoneNumber;
-    }
-
-    public void setMerchantPhoneNumber(String merchantPhoneNumber) {
-        this.merchantPhoneNumber = merchantPhoneNumber;
-    }
-
-    public String getMerchantLogo() {
-        return merchantLogo;
-    }
-
-    public void setMerchantLogo(String merchantLogo) {
-        this.merchantLogo = merchantLogo;
-    }
-
-    public String getPageBackgroundImg() {
-        return pageBackgroundImg;
-    }
-
-    public void setPageBackgroundImg(String pageBackgroundImg) {
-        this.pageBackgroundImg = pageBackgroundImg;
-    }
-
-    public String getGuideComment() {
-        return guideComment;
-    }
-
-    public void setGuideComment(String guideComment) {
-        this.guideComment = guideComment;
-    }
-}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmPageQueryDTO.java → haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/hm/HmPageQDTO.java

-package com.gic.haoban.manage.api.dto.hm;
+package com.gic.haoban.manage.api.dto.qdto.hm;
 
 import com.gic.haoban.base.api.common.BasePageInfo;
 
@@ -10,7 +10,7 @@ import java.util.Date;
  * @Description
  * @Version
  **/
-public class HmPageQueryDTO extends BasePageInfo {
+public class HmPageQDTO extends BasePageInfo {
 
     private static final long serialVersionUID = 7554464387425111232L;
     private String pageSearchText;

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmPageRelationQueryDTO.java → haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/hm/HmPageRelationQDTO.java

-package com.gic.haoban.manage.api.dto.hm;
+package com.gic.haoban.manage.api.dto.qdto.hm;
 
 import com.gic.haoban.base.api.common.BasePageInfo;
 
@@ -8,7 +8,7 @@ import com.gic.haoban.base.api.common.BasePageInfo;
  * @Description
  * @Version
  **/
-public class HmPageRelationQueryDTO extends BasePageInfo {
+public class HmPageRelationQDTO extends BasePageInfo {
 
     private static final long serialVersionUID = -7239030561346484410L;
     private String searchText;

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmPageTemplateApiService.java → haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmPageApiService.java

@@ -2,11 +2,10 @@ package com.gic.haoban.manage.api.service.hm;
 
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
-import com.gic.haoban.manage.api.dto.hm.HmPageQueryDTO;
-import com.gic.haoban.manage.api.dto.hm.HmPageRelationQueryDTO;
-import com.gic.haoban.manage.api.dto.hm.HmPageRelationRespDTO;
-import com.gic.haoban.manage.api.dto.hm.HmPageTemplateDTO;
-import com.gic.haoban.manage.api.dto.hm.HmPageTemplateRespDTO;
+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.dto.qdto.hm.HmPageRelationQDTO;
 
 /**
  * @Author MUSI
@@ -14,24 +13,24 @@ import com.gic.haoban.manage.api.dto.hm.HmPageTemplateRespDTO;
  * @Description
  * @Version 落地页相关
  **/
-public interface HmPageTemplateApiService {
+public interface HmPageApiService {
 
     /**
      * 保存/修改 落地页模板
      *
-     * @param pageTemplateDTO
+     * @param hmPageDTO
      * @return
      */
 
-    ServiceResponse<Long> saveOrUpdateHmPageTemplate(HmPageTemplateDTO pageTemplateDTO);
+    ServiceResponse<Long> saveOrUpdateHmPage(HmPageDTO hmPageDTO);
 
     /**
      * 删除 活码落地页
      *
-     * @param pageTemplateDTO
+     * @param pageDTO
      * @return
      */
-    ServiceResponse<Boolean> deleteHmPageTemplate(HmPageTemplateDTO pageTemplateDTO);
+    ServiceResponse<Boolean> deleteHmPage(HmPageDTO pageDTO);
 
 
     /**
@@ -40,20 +39,20 @@ public interface HmPageTemplateApiService {
      * @param pageQueryDTO
      * @return
      */
-    ServiceResponse<Page<HmPageTemplateRespDTO>> queryPageTemplateList(HmPageQueryDTO pageQueryDTO);
+    ServiceResponse<Page<HmPageDTO>> queryPageList(HmPageQDTO pageQueryDTO);
 
     /**
      * 条件查询落地页关联详情
      * @param relationQueryDTO
      * @return
      */
-    ServiceResponse<Page<HmPageRelationRespDTO>> queryPageRelation(HmPageRelationQueryDTO relationQueryDTO);
+    ServiceResponse<Page<HmPageRelationDTO>> queryPageRelation(HmPageRelationQDTO relationQueryDTO);
 
     /**
      * 根据页面id 查询
-     * @param templateId
+     * @param pageId
      * @return
      */
-    ServiceResponse<HmPageTemplateRespDTO> queryPageTemplateDetail(Long templateId);
+    ServiceResponse<HmPageDTO> queryPageDetail(Long pageId);
 
 }

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

@@ -11,6 +11,8 @@ import java.io.Serializable;
 
 public class HmGroupRelationBO implements Serializable {
 
+    private static final long serialVersionUID = 777099918625753950L;
+
     private Long groupId;
     private Integer changeCount;
 

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

@@ -11,6 +11,7 @@ import java.util.Date;
  **/
 public class HmPageBO implements Serializable {
 
+    private static final long serialVersionUID = -2930830291522139085L;
     /**
      * 落地页id
      */

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

@@ -10,6 +10,7 @@ import java.io.Serializable;
  **/
 public class HmPageRelationBO implements Serializable {
 
+    private static final long serialVersionUID = 4300459192830013417L;
     /**
      * 落地页模板code
      */

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

 package com.gic.haoban.manage.service.pojo.bo.hm;
 
-import com.gic.haoban.manage.api.enums.hm.HmWelcomeReferType;
-
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author MUSI
@@ -12,34 +11,30 @@ import java.io.Serializable;
  **/
 public class HmWelcomeRelationBO implements Serializable {
 
-    /**
-     * 企业id
-     */
+    private static final long serialVersionUID = -5265091280402568359L;
+    private Long relationId;
+
     private String enterpriseId;
 
     private String wxEnterpriseId;
 
-    /**
-     * 欢迎语id
-     */
     private String welcomeId;
 
-    /**
-     * 引用方code
-     */
     private String referId;
 
-    /**
-     * 引用方名称
-     */
     private String referName;
 
+    private Date createTime;
+
+    private Date updateTime;
+
     /**
-     * 引用方类型
-     * @see HmWelcomeReferType
+     * @see com.gic.haoban.manage.api.enums.hm.HmWelcomeReferType
      */
     private Integer type;
 
+    private Integer status;
+
     public String getEnterpriseId() {
         return enterpriseId;
     }
@@ -87,4 +82,36 @@ public class HmWelcomeRelationBO implements Serializable {
     public void setType(Integer type) {
         this.type = type;
     }
+
+    public Long getRelationId() {
+        return relationId;
+    }
+
+    public void setRelationId(Long relationId) {
+        this.relationId = relationId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
 }

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

 package com.gic.haoban.manage.service.service.hm;
 
 import com.gic.api.base.commons.Page;
-import com.gic.haoban.manage.api.dto.hm.HmPageTemplateDTO;
+import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmPageBO;
 import com.gic.haoban.manage.service.pojo.qo.HmPageTemplateQO;
 
@@ -40,12 +40,12 @@ public interface HmPageService {
      * 删除落地页模板
      * @param pageTemplateDTO
      */
-    void deleteHmPageTemplate(HmPageTemplateDTO pageTemplateDTO);
+    void deleteHmPageTemplate(HmPageDTO pageTemplateDTO);
 
     /**
      * 保存
      * @param pageTemplateDTO
      * @return
      */
-    Long saveOrUpdateHmPageTemplate(HmPageTemplateDTO pageTemplateDTO);
+    Long saveOrUpdateHmPageTemplate(HmPageDTO pageTemplateDTO);
 }

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

 package com.gic.haoban.manage.service.service.hm;
 
-import com.gic.haoban.manage.service.entity.hm.TabHaobanWelcomeTemplateRelation;
+import com.gic.haoban.manage.service.pojo.bo.hm.HmWelcomeRelationBO;
 import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO;
 
 import java.util.List;
@@ -19,12 +19,12 @@ public interface WelcomeRelationService {
      * @param status
      * @return
      */
-    TabHaobanWelcomeTemplateRelation queryWelcomeRelation(String referId, Integer status);
+    HmWelcomeRelationBO queryWelcomeRelation(String referId, Integer status);
 
     /**
      * 条件查询 欢迎语引用列表
      * @param welcomeRelationQo
      * @return
      */
-    List<TabHaobanWelcomeTemplateRelation> queryWelcomeRelationList(WelcomeRelationQO welcomeRelationQo);
+    List<HmWelcomeRelationBO> queryWelcomeRelationList(WelcomeRelationQO welcomeRelationQo);
 }

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

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
 import com.gic.commons.util.UniqueIdUtils;
 import com.gic.haoban.common.utils.PageUtil;
-import com.gic.haoban.manage.api.dto.hm.HmPageTemplateDTO;
+import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
 import com.gic.haoban.manage.api.enums.hm.HmPageTemplateStatus;
 import com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmPageMapper;
 import com.gic.haoban.manage.service.entity.hm.TabHaobanHmPage;
@@ -83,7 +83,7 @@ public class HmPageServiceImpl implements HmPageService {
      * @param pageTemplateDTO
      */
     @Override
-    public void deleteHmPageTemplate(HmPageTemplateDTO pageTemplateDTO) {
+    public void deleteHmPageTemplate(HmPageDTO pageTemplateDTO) {
         TabHaobanHmPage tempHmPage = new TabHaobanHmPage();
         tempHmPage.setPageId(pageTemplateDTO.getPageId());
         tempHmPage.setStatus(HmPageTemplateStatus.DISABLE.getCode());
@@ -101,7 +101,7 @@ public class HmPageServiceImpl implements HmPageService {
      * @return
      */
     @Override
-    public Long saveOrUpdateHmPageTemplate(HmPageTemplateDTO pageTemplateDTO) {
+    public Long saveOrUpdateHmPageTemplate(HmPageDTO pageTemplateDTO) {
         log.info("[saveOrUpdateHmPageTemplate] params:{}", JSON.toJSONString(pageTemplateDTO));
         Date now = new Date();
         if (Objects.isNull(pageTemplateDTO.getPageId())) {

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

@@ -2,12 +2,17 @@ package com.gic.haoban.manage.service.service.hm.impl;
 
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanWelcomeTemplateRelationMapper;
 import com.gic.haoban.manage.service.entity.hm.TabHaobanWelcomeTemplateRelation;
+import com.gic.haoban.manage.service.pojo.bo.hm.HmWelcomeRelationBO;
 import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO;
 import com.gic.haoban.manage.service.service.hm.WelcomeRelationService;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author MUSI
@@ -29,8 +34,14 @@ public class WelcomeRelationServiceImpl implements WelcomeRelationService {
      * @return
      */
     @Override
-    public TabHaobanWelcomeTemplateRelation queryWelcomeRelation(String referId, Integer status) {
-        return welcomeTemplateRelationMapper.queryWelTemplateRelation(null, referId, status);
+    public HmWelcomeRelationBO queryWelcomeRelation(String referId, Integer status) {
+        TabHaobanWelcomeTemplateRelation welcomeTemplateRelation = welcomeTemplateRelationMapper.queryWelTemplateRelation(null, referId, status);
+        if (welcomeTemplateRelation == null) {
+            return null;
+        }
+        HmWelcomeRelationBO welcomeRelationBo = new HmWelcomeRelationBO();
+        BeanUtils.copyProperties(welcomeTemplateRelation, welcomeRelationBo);
+        return welcomeRelationBo;
     }
 
     /**
@@ -40,7 +51,16 @@ public class WelcomeRelationServiceImpl implements WelcomeRelationService {
      * @return
      */
     @Override
-    public List<TabHaobanWelcomeTemplateRelation> queryWelcomeRelationList(WelcomeRelationQO welcomeRelationQo) {
-        return welcomeTemplateRelationMapper.queryWelcomeTemplate(welcomeRelationQo);
+    public List<HmWelcomeRelationBO> queryWelcomeRelationList(WelcomeRelationQO welcomeRelationQo) {
+        List<TabHaobanWelcomeTemplateRelation> tabHaobanWelcomeTemplateRelations = welcomeTemplateRelationMapper.queryWelcomeTemplate(welcomeRelationQo);
+        if (CollectionUtils.isEmpty(tabHaobanWelcomeTemplateRelations)) {
+            return Collections.emptyList();
+        }
+        return tabHaobanWelcomeTemplateRelations.stream()
+                .map(item -> {
+                    HmWelcomeRelationBO welcomeRelationBo = new HmWelcomeRelationBO();
+                    BeanUtils.copyProperties(item, welcomeRelationBo);
+                    return welcomeRelationBo;
+                }).collect(Collectors.toList());
     }
 }

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

@@ -14,6 +14,7 @@ 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.entity.hm.TabHaobanWelcomeTemplateRelation;
+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.qo.WelcomeInfoQO;
 import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO;
@@ -637,12 +638,12 @@ public class WelcomeServiceImpl implements WelcomeService {
         logger.info("[getMatchWelcomeWithReferId] staffId:{}, wxEnterpriseId:{}, referId:{}",
                 staffId, wxEnterpriseId, referId);
         // 根据referId 查询 关联关系表
-        TabHaobanWelcomeTemplateRelation welcomeTemplateRelation = welcomeRelationService.queryWelcomeRelation(referId, WelcomeRelationStatusEnum.ENABLE.getCode());
-        if (welcomeTemplateRelation == null){
+        HmWelcomeRelationBO welcomeRelationBO = welcomeRelationService.queryWelcomeRelation(referId, WelcomeRelationStatusEnum.ENABLE.getCode());
+        if (welcomeRelationBO == null){
             // 不存在
             return null;
         }
-        TabWelcome tabWelcome = welcomeMapper.selectByPrimaryKey(welcomeTemplateRelation.getWelcomeId());
+        TabWelcome tabWelcome = welcomeMapper.selectByPrimaryKey(welcomeRelationBO.getWelcomeId());
         return convertWelcomeToBo(tabWelcome);
     }
 
@@ -670,13 +671,13 @@ public class WelcomeServiceImpl implements WelcomeService {
         }
         WelcomeRelationQO welcomeRelationQo = new WelcomeRelationQO();
         welcomeRelationQo.setWelcomeId(welcomeId);
-        List<TabHaobanWelcomeTemplateRelation> tabHaobanWelcomeTemplateRelations = welcomeRelationService.queryWelcomeRelationList(welcomeRelationQo);
-        if (CollectionUtils.isEmpty(tabHaobanWelcomeTemplateRelations)){
+        List<HmWelcomeRelationBO> hmWelcomeRelationBos = welcomeRelationService.queryWelcomeRelationList(welcomeRelationQo);
+        if (CollectionUtils.isEmpty(hmWelcomeRelationBos)){
             this.removeWelcome(welcomeId);
             return null;
         }
-        Map<Integer, List<TabHaobanWelcomeTemplateRelation>> welcomeGroupByType = tabHaobanWelcomeTemplateRelations.stream()
-                .collect(Collectors.groupingBy(TabHaobanWelcomeTemplateRelation::getType));
+        Map<Integer, List<HmWelcomeRelationBO>> welcomeGroupByType = hmWelcomeRelationBos.stream()
+                .collect(Collectors.groupingBy(HmWelcomeRelationBO::getType));
         WelcomeRemoveDTO welcomeRemoveDTO = new WelcomeRemoveDTO();
         welcomeRemoveDTO.setQrCodeReferNum(Optional.ofNullable(welcomeGroupByType.get(HmWelcomeReferType.HM.getCode()))
                 .map(List::size).orElse(0));

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

@@ -4,13 +4,12 @@ import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon;
 import com.gic.haoban.common.utils.PageUtil;
-import com.gic.haoban.manage.api.dto.hm.HmPageQueryDTO;
-import com.gic.haoban.manage.api.dto.hm.HmPageRelationQueryDTO;
-import com.gic.haoban.manage.api.dto.hm.HmPageRelationRespDTO;
-import com.gic.haoban.manage.api.dto.hm.HmPageTemplateDTO;
-import com.gic.haoban.manage.api.dto.hm.HmPageTemplateRespDTO;
+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.dto.qdto.hm.HmPageRelationQDTO;
 import com.gic.haoban.manage.api.enums.hm.HmPageTemplateStatus;
-import com.gic.haoban.manage.api.service.hm.HmPageTemplateApiService;
+import com.gic.haoban.manage.api.service.hm.HmPageApiService;
 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;
@@ -35,9 +34,9 @@ import java.util.Objects;
  * @Version
  **/
 @Component(value = "hmPageTemplateApiServiceImpl")
-public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService {
+public class HmPageApiServiceImpl implements HmPageApiService {
 
-    private static final Logger log = LoggerFactory.getLogger(HmPageTemplateApiServiceImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(HmPageApiServiceImpl.class);
 
     private static final String TEMPLATE_CODE_PREFIX = "MB01";
     @Autowired
@@ -47,49 +46,49 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService {
     private HmPageService haobanHmPageService;
 
     @Override
-    public ServiceResponse<Long> saveOrUpdateHmPageTemplate(HmPageTemplateDTO pageTemplateDTO) {
+    public ServiceResponse<Long> saveOrUpdateHmPage(HmPageDTO pageDTO) {
 
-        if (Objects.nonNull(pageTemplateDTO.getPageId())) {
+        if (Objects.nonNull(pageDTO.getPageId())) {
             // update
-            HmPageBO pageDetail = haobanHmPageService.queryHmPageDetail(pageTemplateDTO.getPageId());
+            HmPageBO pageDetail = haobanHmPageService.queryHmPageDetail(pageDTO.getPageId());
             if (Objects.isNull(pageDetail)) {
                 // 数据不存在
                 return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_8.getCode() + "", HaoBanErrCodeCommon.ERR_8.getMsg());
             }
-            if (!StringUtils.equals(pageDetail.getEnterpriseId(), pageTemplateDTO.getEnterpriseId())) {
+            if (!StringUtils.equals(pageDetail.getEnterpriseId(), pageDTO.getEnterpriseId())) {
                 // 无权限
                 return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_9.getCode() + "", HaoBanErrCodeCommon.ERR_9.getMsg());
             }
-            if (!StringUtils.equals(pageDetail.getWxEnterpriseId(), pageTemplateDTO.getWxEnterpriseId())) {
+            if (!StringUtils.equals(pageDetail.getWxEnterpriseId(), pageDTO.getWxEnterpriseId())) {
                 // 无权限
                 return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_9.getCode() + "", HaoBanErrCodeCommon.ERR_9.getMsg());
             }
         }
-        return ServiceResponse.success(haobanHmPageService.saveOrUpdateHmPageTemplate(pageTemplateDTO));
+        return ServiceResponse.success(haobanHmPageService.saveOrUpdateHmPageTemplate(pageDTO));
     }
 
     @Override
     @Transactional(rollbackFor = RuntimeException.class)
-    public ServiceResponse<Boolean> deleteHmPageTemplate(HmPageTemplateDTO pageTemplateDTO) {
+    public ServiceResponse<Boolean> deleteHmPage(HmPageDTO pageDTO) {
 
-        HmPageBO pageBo = haobanHmPageService.queryHmPageDetail(pageTemplateDTO.getPageId());
+        HmPageBO pageBo = haobanHmPageService.queryHmPageDetail(pageDTO.getPageId());
         if (Objects.isNull(pageBo) || !Objects.equals(HmPageTemplateStatus.ENABLE.getCode(), pageBo.getStatus())) {
             return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_8.getCode() + "", HaoBanErrCodeCommon.ERR_8.getMsg());
         }
         if (this.checkPageIsBeQuoted(pageBo.getPageCode()) > 0) {
             return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_9.getCode() + "", HaoBanErrCodeCommon.ERR_9.getMsg());
         }
-        haobanHmPageService.deleteHmPageTemplate(pageTemplateDTO);
+        haobanHmPageService.deleteHmPageTemplate(pageDTO);
         return ServiceResponse.success(Boolean.TRUE);
     }
 
     @Override
-    public ServiceResponse<Page<HmPageTemplateRespDTO>> queryPageTemplateList(HmPageQueryDTO pageQueryDTO) {
+    public ServiceResponse<Page<HmPageDTO>> queryPageList(HmPageQDTO pageQueryDTO) {
         HmPageTemplateQO pageTemplateQo = new HmPageTemplateQO();
         BeanUtils.copyProperties(pageQueryDTO, pageTemplateQo);
         pageTemplateQo.setStatus(HmPageTemplateStatus.ENABLE.getCode());
         Page<HmPageBO> hmPageBoPages = haobanHmPageService.queryPageList(pageTemplateQo);
-        Page<HmPageTemplateRespDTO> pageRespVos = PageUtil.changeToCurrentPage(hmPageBoPages, HmPageTemplateRespDTO.class);
+        Page<HmPageDTO> pageRespVos = PageUtil.changeToCurrentPage(hmPageBoPages, HmPageDTO.class);
         return ServiceResponse.success(pageRespVos);
     }
 
@@ -112,7 +111,7 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService {
      * @return
      */
     @Override
-    public ServiceResponse<Page<HmPageRelationRespDTO>> queryPageRelation(HmPageRelationQueryDTO relationQueryDTO) {
+    public ServiceResponse<Page<HmPageRelationDTO>> queryPageRelation(HmPageRelationQDTO relationQueryDTO) {
         HmPageRelationQO hmPageRelationQo = new HmPageRelationQO();
         hmPageRelationQo.setTemplateSearchText(relationQueryDTO.getSearchText());
         hmPageRelationQo.setEnterpriseId(relationQueryDTO.getEnterpriseId());
@@ -121,7 +120,7 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService {
         hmPageRelationQo.setPageSize(relationQueryDTO.getPageSize());
         hmPageRelationQo.setPageCode(relationQueryDTO.getPageId() + "");
         Page<HmPageRelationBO> hmPageRelationPage = pageRelationService.queryPageTemplateRelationWithSearchText(hmPageRelationQo);
-        return ServiceResponse.success(PageUtil.changeToCurrentPage(hmPageRelationPage, HmPageRelationRespDTO.class));
+        return ServiceResponse.success(PageUtil.changeToCurrentPage(hmPageRelationPage, HmPageRelationDTO.class));
     }
 
     /**
@@ -131,13 +130,13 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService {
      * @return
      */
     @Override
-    public ServiceResponse<HmPageTemplateRespDTO> queryPageTemplateDetail(Long pageId) {
+    public ServiceResponse<HmPageDTO> queryPageDetail(Long pageId) {
         HmPageBO pageBO = haobanHmPageService.queryHmPageDetail(pageId);
         if (pageBO == null) {
             return ServiceResponse.success();
         }
-        HmPageTemplateRespDTO hmPageTemplateRespDTO = new HmPageTemplateRespDTO();
-        BeanUtils.copyProperties(pageBO, hmPageTemplateRespDTO);
-        return ServiceResponse.success(hmPageTemplateRespDTO);
+        HmPageDTO hmPageDTO = new HmPageDTO();
+        BeanUtils.copyProperties(pageBO, hmPageDTO);
+        return ServiceResponse.success(hmPageDTO);
     }
 }

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -112,7 +112,7 @@
                    ref="hmGroupApiServiceImpl" timeout="10000" />
     <dubbo:service interface="com.gic.haoban.manage.api.service.hm.HmWelcomeRelationApiService"
                    ref="hmWelcomeRelationApiServiceImpl" timeout="10000" />
-    <dubbo:service interface="com.gic.haoban.manage.api.service.hm.HmPageTemplateApiService"
+    <dubbo:service interface="com.gic.haoban.manage.api.service.hm.HmPageApiService"
                    ref="hmPageTemplateApiServiceImpl" timeout="10000" />
     <dubbo:service interface="com.gic.haoban.manage.api.service.hm.HmQrcodeApiService"
                    ref="hmQrcodeApiServiceImpl" timeout="10000" />

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

 import com.alibaba.fastjson.JSON;
-import com.gic.haoban.manage.api.dto.hm.HmPageTemplateDTO;
+import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
 import com.gic.haoban.manage.service.entity.hm.TabHaobanHmPage;
 import org.springframework.beans.BeanUtils;
 
@@ -12,7 +12,7 @@ import org.springframework.beans.BeanUtils;
 public class TestBeanCopy {
 
     public static void main(String[] args) {
-        HmPageTemplateDTO pageTemplateDTO = new HmPageTemplateDTO();
+        HmPageDTO pageTemplateDTO = new HmPageDTO();
         pageTemplateDTO.setPageBackgroundImg("dadadadasd");
         TabHaobanHmPage temp = new TabHaobanHmPage();
         BeanUtils.copyProperties(pageTemplateDTO, temp);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmLinkController.java

@@ -15,14 +15,12 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
-import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.hm.HmLinkDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
 import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeDetailDTO;
 import com.gic.haoban.manage.api.service.hm.HmLinkApiService;
-import com.gic.haoban.manage.api.service.hm.HmPageTemplateApiService;
+import com.gic.haoban.manage.api.service.hm.HmPageApiService;
 import com.gic.haoban.manage.api.service.out.WelcomeApiService;
-import com.gic.haoban.manage.web.controller.WebBaseController;
 
 /**
  * 
@@ -39,7 +37,7 @@ public class HmLinkController  {
     @Autowired
     private HmLinkApiService hmLinkApiService;
     @Autowired
-    private HmPageTemplateApiService hmPageTemplateApiService;
+    private HmPageApiService hmPageApiService;
     @Autowired
     private WelcomeApiService welcomeApiService;
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/HmPageTemplateListVO.java → haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/HmPageListVO.java

@@ -10,7 +10,7 @@ import java.util.Date;
  * @Description
  * @Version
  **/
-public class HmPageTemplateListVO extends BasePageInfo {
+public class HmPageListVO extends BasePageInfo {
 
     private String pageSearchText;
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/HmPageTemplateSettingVO.java → haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/HmPageSettingVO.java

@@ -8,7 +8,7 @@ import java.io.Serializable;
  * @Description
  * @Version
  **/
-public class HmPageTemplateSettingVO implements Serializable {
+public class HmPageSettingVO implements Serializable {
 
     private Long templateId;
     /**

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/PageTemplateRelationVO.java → haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/PageRelationVO.java

@@ -8,7 +8,7 @@ import com.gic.haoban.base.api.common.BasePageInfo;
  * @Description
  * @Version
  **/
-public class PageTemplateRelationVO extends BasePageInfo {
+public class PageRelationVO extends BasePageInfo {
 
     private Long templateId;
 

haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml

@@ -104,7 +104,7 @@
 
 	<dubbo:reference id="hmGroupApiService" interface="com.gic.haoban.manage.api.service.hm.HmGroupApiService"
 					 timeout="10000" retries="0" check="false" />
-	<dubbo:reference id="hmPageTemplateApiService" interface="com.gic.haoban.manage.api.service.hm.HmPageTemplateApiService"
+	<dubbo:reference id="hmPageTemplateApiService" interface="com.gic.haoban.manage.api.service.hm.HmPageApiService"
 					 timeout="10000" retries="0" check="false" />
 	<dubbo:reference id="hmWelcomeRelationApiService" interface="com.gic.haoban.manage.api.service.hm.HmWelcomeRelationApiService"
 					 timeout="10000" retries="0" check="false" />