Skip to content

H
haoban-manage3.0
Commit c9969416 by 墨竹
Options

Merge remote-tracking branch 'origin/developer' into developer

parents 87223fcc 3b83c4ac
Showing with 285 additions and 228 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmPageRelationQueryDTO.java
......@@ -22,6 +22,11 @@ public class HmPageRelationQueryDTO extends BasePageInfo {
*/
private String wxEnterpriseId;
/**
* 落地页模板id
*/
private Long pageId;
public String getEnterpriseId() {
return enterpriseId;
}
......@@ -45,4 +50,12 @@ public class HmPageRelationQueryDTO extends BasePageInfo {
public void setSearchText(String searchText) {
this.searchText = searchText;
}
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/HmPageTemplateDTO.java
......@@ -13,17 +13,17 @@ public class HmPageTemplateDTO extends WebLoginDTO {
/**
* 落地页id
*/
private Long templateId;
private Long pageId;
/**
* 落地页code
*/
private String templateCode;
private String pageCode;
/**
* 落地页模板名称
*/
private String templateName;
private String pageName;
/**
* 页面标题
......@@ -55,28 +55,28 @@ public class HmPageTemplateDTO extends WebLoginDTO {
*/
private String guideComment;
public Long getTemplateId() {
return templateId;
public Long getPageId() {
return pageId;
}
public void setTemplateId(Long templateId) {
this.templateId = templateId;
public void setPageId(Long pageId) {
this.pageId = pageId;
}
public String getTemplateCode() {
return templateCode;
public String getPageCode() {
return pageCode;
}
public void setTemplateCode(String templateCode) {
this.templateCode = templateCode;
public void setPageCode(String pageCode) {
this.pageCode = pageCode;
}
public String getTemplateName() {
return templateName;
public String getPageName() {
return pageName;
}
public void setTemplateName(String templateName) {
this.templateName = templateName;
public void setPageName(String pageName) {
this.pageName = pageName;
}
public String getPageTitle() {
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmPageTemplateRespDTO.java
......@@ -14,17 +14,17 @@ public class HmPageTemplateRespDTO implements Serializable {
/**
* 落地页id
*/
private Long templateId;
private Long pageId;
/**
* 落地页code
*/
private String templateCode;
private String pageCode;
/**
* 落地页模板名称
*/
private String templateName;
private String pageName;
/**
* 企业id
......@@ -58,7 +58,7 @@ public class HmPageTemplateRespDTO implements Serializable {
/**
* 页面背景图
*/
private String pageBackgroudImg;
private String pageBackgroundImg;
/**
* 引导语
......@@ -86,20 +86,20 @@ public class HmPageTemplateRespDTO implements Serializable {
private Date updateTime;
public String getTemplateCode() {
return templateCode;
public String getPageCode() {
return pageCode;
}
public void setTemplateCode(String templateCode) {
this.templateCode = templateCode;
public void setPageCode(String pageCode) {
this.pageCode = pageCode;
}
public String getTemplateName() {
return templateName;
public String getPageName() {
return pageName;
}
public void setTemplateName(String templateName) {
this.templateName = templateName;
public void setPageName(String pageName) {
this.pageName = pageName;
}
public String getEnterpriseId() {
......@@ -158,12 +158,12 @@ public class HmPageTemplateRespDTO implements Serializable {
this.merchantLogo = merchantLogo;
}
public String getPageBackgroudImg() {
return pageBackgroudImg;
public String getPageBackgroundImg() {
return pageBackgroundImg;
}
public void setPageBackgroudImg(String pageBackgroudImg) {
this.pageBackgroudImg = pageBackgroudImg;
public void setPageBackgroundImg(String pageBackgroundImg) {
this.pageBackgroundImg = pageBackgroundImg;
}
public String getGuideComment() {
......@@ -222,11 +222,11 @@ public class HmPageTemplateRespDTO implements Serializable {
this.updateTime = updateTime;
}
public Long getTemplateId() {
return templateId;
public Long getPageId() {
return pageId;
}
public void setTemplateId(Long templateId) {
this.templateId = templateId;
public void setPageId(Long pageId) {
this.pageId = pageId;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmGroupApiService.java
package com.gic.haoban.manage.api.service.hm;
import com.gic.api.base.commons.Page;
import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.dto.hm.HmGroupDTO;
import com.gic.haoban.manage.api.dto.hm.HmGroupQueryDTO;
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmPageTemplateApiService.java
package com.gic.haoban.manage.api.service.hm;
import com.gic.api.base.commons.Page;
import com.gic.haoban.base.api.common.ServiceResponse;
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 javax.xml.ws.Service;
/**
* @Author MUSI
* @Date 2022/7/3 6:31 PM
......@@ -24,6 +22,7 @@ public interface HmPageTemplateApiService {
* @param pageTemplateDTO
* @return
*/
ServiceResponse<Long> saveOrUpdateHmPageTemplate(HmPageTemplateDTO pageTemplateDTO);
/**
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/hm/TabHaobanHmPage.java
......@@ -7,17 +7,17 @@ public class TabHaobanHmPage {
/**
* 落地页id
*/
private Long templateId;
private Long pageId;
/**
* 落地页code
*/
private String templateCode;
private String pageCode;
/**
* 落地页模板名称
*/
private String templateName;
private String pageName;
/**
* 企业id
......@@ -51,7 +51,7 @@ public class TabHaobanHmPage {
/**
* 页面背景图
*/
private String pageBackgroudImg;
private String pageBackgroundImg;
/**
* 引导语
......@@ -79,28 +79,28 @@ public class TabHaobanHmPage {
private Date updateTime;
public Long getTemplateId() {
return templateId;
public Long getPageId() {
return pageId;
}
public void setTemplateId(Long templateId) {
this.templateId = templateId;
public void setPageId(Long pageId) {
this.pageId = pageId;
}
public String getTemplateCode() {
return templateCode;
public String getPageCode() {
return pageCode;
}
public void setTemplateCode(String templateCode) {
this.templateCode = templateCode == null ? null : templateCode.trim();
public void setPageCode(String pageCode) {
this.pageCode = pageCode == null ? null : pageCode.trim();
}
public String getTemplateName() {
return templateName;
public String getPageName() {
return pageName;
}
public void setTemplateName(String templateName) {
this.templateName = templateName == null ? null : templateName.trim();
public void setPageName(String pageName) {
this.pageName = pageName == null ? null : pageName.trim();
}
public String getEnterpriseId() {
......@@ -159,12 +159,12 @@ public class TabHaobanHmPage {
this.merchantLogo = merchantLogo == null ? null : merchantLogo.trim();
}
public String getPageBackgroudImg() {
return pageBackgroudImg;
public String getPageBackgroundImg() {
return pageBackgroundImg;
}
public void setPageBackgroudImg(String pageBackgroudImg) {
this.pageBackgroudImg = pageBackgroudImg == null ? null : pageBackgroudImg.trim();
public void setPageBackgroundImg(String pageBackgroundImg) {
this.pageBackgroundImg = pageBackgroundImg == null ? null : pageBackgroundImg.trim();
}
public String getGuideComment() {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/hm/TabHaobanHmPageRelation.java
......@@ -5,7 +5,7 @@ import java.util.Date;
public class TabHaobanHmPageRelation {
private Long relationId;
private String pageTemplateCode;
private String pageCode;
private String enterpriseId;
......@@ -31,12 +31,12 @@ public class TabHaobanHmPageRelation {
this.relationId = relationId;
}
public String getPageTemplateCode() {
return pageTemplateCode;
public String getPageCode() {
return pageCode;
}
public void setPageTemplateCode(String pageTemplateCode) {
this.pageTemplateCode = pageTemplateCode == null ? null : pageTemplateCode.trim();
public void setPageCode(String pageCode) {
this.pageCode = pageCode == null ? null : pageCode.trim();
}
public String getEnterpriseId() {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/hm/HmPageRelationBO.java
......@@ -13,7 +13,7 @@ public class HmPageRelationBO implements Serializable {
/**
* 落地页模板code
*/
private String pageTemplateCode;
private String pageCode;
/**
......@@ -43,12 +43,19 @@ public class HmPageRelationBO implements Serializable {
*/
private Integer type;
public String getPageTemplateCode() {
return pageTemplateCode;
/**
* 关联状态
* @see com.gic.haoban.manage.api.enums.hm.HmPageTemplateStatus
*
*/
private Integer status;
public String getPageCode() {
return pageCode;
}
public void setPageTemplateCode(String pageTemplateCode) {
this.pageTemplateCode = pageTemplateCode;
public void setPageCode(String pageCode) {
this.pageCode = pageCode;
}
public String getEnterpriseId() {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/qo/HmPageRelationQO.java
......@@ -12,7 +12,7 @@ public class HmPageRelationQO extends BasePageInfo {
private String templateSearchText;
private String templateCode;
private String pageCode;
private Integer status;
......@@ -26,12 +26,12 @@ public class HmPageRelationQO extends BasePageInfo {
*/
private String wxEnterpriseId;
public String getTemplateCode() {
return templateCode;
public String getPageCode() {
return pageCode;
}
public void setTemplateCode(String templateCode) {
this.templateCode = templateCode;
public void setPageCode(String pageCode) {
this.pageCode = pageCode;
}
public Integer getStatus() {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmPageRelationService.java
......@@ -44,4 +44,11 @@ public interface HmPageRelationService {
* @return
*/
Page<HmPageRelationBO> queryPageTemplateRelationWithSearchText(HmPageRelationQO hmPageRelationQo);
/**
* 统计templateCode 被引用的总数
* @param pageTemplateCode
* @return
*/
Integer countPageTemplateRelation(String pageTemplateCode);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmPageRelationServiceImpl.java
......@@ -3,6 +3,7 @@ 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.HmPageTemplateStatus;
import com.gic.haoban.manage.api.enums.hm.HmPageTemplateType;
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;
......@@ -14,7 +15,9 @@ 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;
......@@ -34,8 +37,19 @@ public class HmPageRelationServiceImpl implements HmPageRelationService {
@Override
@Transactional(rollbackFor = RuntimeException.class)
public boolean savePageRelation(HmPageRelationBO hmPageRelationBO) {
return false;
TabHaobanHmPageRelation pageRelation = new TabHaobanHmPageRelation();
pageRelation.setEnterpriseId(hmPageRelationBO.getEnterpriseId());
pageRelation.setWxEnterpriseId(pageRelation.getWxEnterpriseId());
pageRelation.setPageCode(hmPageRelationBO.getPageCode());
pageRelation.setReferId(hmPageRelationBO.getReferId());
pageRelation.setReferName(hmPageRelationBO.getReferName());
pageRelation.setCreateTime(new Date());
pageRelation.setUpdateTime(new Date());
pageRelation.setType(HmPageTemplateType.LINK.getCode());
pageRelation.setStatus(HmPageTemplateStatus.ENABLE.getCode());
return haobanHmPageRelationMapper.insertSelective(pageRelation) == 1;
}
@Override
......@@ -46,10 +60,10 @@ public class HmPageRelationServiceImpl implements HmPageRelationService {
@Override
public List<HmPageRelationBO> queryPageTemplateRelation(String pageTemplateCode) {
HmPageRelationQO hmPageRelationQo = new HmPageRelationQO();
hmPageRelationQo.setTemplateCode(pageTemplateCode);
hmPageRelationQo.setPageCode(pageTemplateCode);
hmPageRelationQo.setStatus(HmPageTemplateStatus.ENABLE.getCode());
hmPageRelationQo.setPageSize(1);
PageHelper.startPage(hmPageRelationQo.getPageNum(), hmPageRelationQo.getPageSize(), Boolean.FALSE);
PageHelper.startPage(hmPageRelationQo.getPageNum(), hmPageRelationQo.getPageSize());
List<TabHaobanHmPageRelation> tabHaobanHmPageRelations =
haobanHmPageRelationMapper.queryPageRelationList(hmPageRelationQo);
return tabHaobanHmPageRelations.stream().map(item -> {
......@@ -71,4 +85,15 @@ public class HmPageRelationServiceImpl implements HmPageRelationService {
(com.github.pagehelper.Page<TabHaobanHmPageRelation>) haobanHmPageRelationMapper.queryPageRelationList(hmPageRelationQo);
return PageUtil.changePageHelperToCurrentPage(pageRelationPage, HmPageRelationBO.class);
}
/**
* 统计templateCode 被引用的总数
*
* @param pageTemplateCode
* @return
*/
@Override
public Integer countPageTemplateRelation(String pageTemplateCode) {
return null;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmGroupApiServiceImpl.java
......@@ -2,8 +2,8 @@ package com.gic.haoban.manage.service.service.out.impl.hm;
import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.UniqueIdUtils;
import com.gic.haoban.base.api.common.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.HmGroupDTO;
......@@ -46,16 +46,11 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
@Override
public ServiceResponse<Long> saveOrUpdateHmGroupSetting(HmGroupDTO hmGroupDTO) {
ServiceResponse<Long> serviceResponse = new ServiceResponse();
if (StringUtils.isBlank(hmGroupDTO.getGroupName())) {
serviceResponse.setCode(HaoBanErrCodeCommon.ERR_5.getCode());
serviceResponse.setMessage(HaoBanErrCodeCommon.ERR_5.getMsg());
return serviceResponse;
return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_5.getCode()+"", HaoBanErrCodeCommon.ERR_5.getMsg());
}
if (StringUtils.equals(DEFAULT_GROUP_NAME, hmGroupDTO.getGroupName())){
serviceResponse.setCode(HaoBanErrCodeCommon.ERR_5.getCode());
serviceResponse.setMessage(HaoBanErrCodeCommon.ERR_5.getMsg());
return serviceResponse;
return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_5.getCode()+"", HaoBanErrCodeCommon.ERR_5.getMsg());
}
HmGroupInfoQO groupInfoQo = new HmGroupInfoQO();
groupInfoQo.setGroupName(hmGroupDTO.getGroupName());
......@@ -67,9 +62,7 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
// insert
// check groupName unique
if (CollectionUtils.isNotEmpty(tabHaobanHmGroupSettings)) {
serviceResponse.setCode(HaoBanErrCodeCommon.ERR_5.getCode());
serviceResponse.setMessage(HaoBanErrCodeCommon.ERR_5.getMsg());
return serviceResponse;
return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_5.getCode()+"", HaoBanErrCodeCommon.ERR_5.getMsg());
}
TabHaobanHmGroupSetting tempGroupSetting = new TabHaobanHmGroupSetting();
tempGroupSetting.setGroupId(UniqueIdUtils.uniqueLong());
......@@ -81,33 +74,26 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
tempGroupSetting.setEnterpriseId(hmGroupDTO.getEnterpriseId());
tempGroupSetting.setWxEnterpriseId(hmGroupDTO.getWxEnterpriseId());
haobanHmGroupSettingMapper.insertSelective(tempGroupSetting);
serviceResponse.setResult(tempGroupSetting.getGroupId());
return ServiceResponse.success(tempGroupSetting.getGroupId());
} else {
// update
if (CollectionUtils.isNotEmpty(tabHaobanHmGroupSettings)
&& tabHaobanHmGroupSettings.size() > 1) {
// 名称重复
serviceResponse.setCode(HaoBanErrCodeCommon.ERR_5.getCode());
serviceResponse.setMessage(HaoBanErrCodeCommon.ERR_5.getMsg());
return serviceResponse;
return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_5.getCode()+"", HaoBanErrCodeCommon.ERR_5.getMsg());
}
if (CollectionUtils.isNotEmpty(tabHaobanHmGroupSettings)
&& !tabHaobanHmGroupSettings.get(0).getGroupId().equals(hmGroupDTO.getGroupId())) {
// 名称重复
serviceResponse.setCode(HaoBanErrCodeCommon.ERR_5.getCode());
return serviceResponse;
return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_5.getCode()+"", HaoBanErrCodeCommon.ERR_5.getMsg());
}
TabHaobanHmGroupSetting tabHaobanHmGroupSetting = haobanHmGroupSettingMapper.selectByPrimaryKey(hmGroupDTO.getGroupId());
if (tabHaobanHmGroupSetting == null) {
serviceResponse.setCode(HaoBanErrCodeCommon.ERR_8.getCode());
serviceResponse.setMessage(HaoBanErrCodeCommon.ERR_8.getMsg());
return serviceResponse;
return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_8.getCode()+"", HaoBanErrCodeCommon.ERR_8.getMsg());
}
if (!StringUtils.equals(tabHaobanHmGroupSetting.getEnterpriseId(), hmGroupDTO.getEnterpriseId())) {
// 无权限
serviceResponse.setCode(HaoBanErrCodeCommon.ERR_9.getCode());
serviceResponse.setMessage(HaoBanErrCodeCommon.ERR_9.getMsg());
return serviceResponse;
return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_9.getCode()+"", HaoBanErrCodeCommon.ERR_9.getMsg());
}
TabHaobanHmGroupSetting tempGroupSetting = new TabHaobanHmGroupSetting();
tempGroupSetting.setGroupId(tabHaobanHmGroupSetting.getGroupId());
......@@ -116,9 +102,8 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
tempGroupSetting.setModifierName(hmGroupDTO.getModifierName());
tempGroupSetting.setUpdateTime(new Date());
haobanHmGroupSettingMapper.updateByPrimaryKeySelective(tempGroupSetting);
serviceResponse.setResult(tempGroupSetting.getGroupId());
return ServiceResponse.success(tempGroupSetting.getGroupId());
}
return serviceResponse;
}
@Override
......@@ -140,9 +125,7 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
result.addAll(hmGroupInfoPage.getResult());
}
hmGroupInfoPage.setResult(result);
ServiceResponse<Page<HmGroupDTO>> serviceResponse = new ServiceResponse<>();
serviceResponse.setResult(hmGroupInfoPage);
return serviceResponse;
return ServiceResponse.success(hmGroupInfoPage);
}
private HmGroupDTO buildDefault(Integer num){
......@@ -157,20 +140,15 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
@Override
public ServiceResponse<Boolean> deleteGroupSetting(HmGroupDTO groupDTO) {
log.info("[deleteGroupSetting] 删除分组, params:{}", JSON.toJSONString(groupDTO));
ServiceResponse<Boolean> serviceResponse = new ServiceResponse<>();
serviceResponse.setResult(Boolean.FALSE);
if (groupDTO.getGroupId() == null) {
serviceResponse.setCode(HaoBanErrCodeCommon.ERR_2.getCode());
return serviceResponse;
return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_2.getCode()+"", HaoBanErrCodeCommon.ERR_2.getMsg());
}
if (DEFAULT_GROUP_ID.equals(groupDTO.getGroupId())){
serviceResponse.setCode(HaoBanErrCodeCommon.ERR_5.getCode());
return serviceResponse;
return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_5.getCode()+"", HaoBanErrCodeCommon.ERR_5.getMsg());
}
TabHaobanHmGroupSetting tabHaobanHmGroupSetting = haobanHmGroupSettingMapper.selectByPrimaryKey(groupDTO.getGroupId());
if (tabHaobanHmGroupSetting == null || !HmGroupStatus.ENABLE.getCode().equals(tabHaobanHmGroupSetting.getStatus())) {
serviceResponse.setCode(HaoBanErrCodeCommon.ERR_5.getCode());
return serviceResponse;
return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_5.getCode()+"", HaoBanErrCodeCommon.ERR_5.getMsg());
}
// todo query hm 校验分组是否被引用
TabHaobanHmGroupSetting tempGroupSetting = new TabHaobanHmGroupSetting();
......@@ -179,8 +157,7 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
tempGroupSetting.setModifierId(groupDTO.getModifierId());
tempGroupSetting.setModifierName(groupDTO.getModifierName());
tempGroupSetting.setUpdateTime(new Date());
serviceResponse.setResult(haobanHmGroupSettingMapper.updateByPrimaryKeySelective(tempGroupSetting) == 1);
return serviceResponse;
return ServiceResponse.success(haobanHmGroupSettingMapper.updateByPrimaryKeySelective(tempGroupSetting) == 1);
}
/**
......@@ -192,9 +169,7 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
*/
@Override
public ServiceResponse<Integer> queryGroupReferCount(String enterpriseId, String wxEnterpriseId) {
ServiceResponse<Integer> serviceResponse = new ServiceResponse<>();
serviceResponse.setResult(0);
// todo query 分组引用的总数
return serviceResponse;
return ServiceResponse.success(0);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmWelcomeRelationApiServiceImpl.java
......@@ -33,12 +33,8 @@ public class HmWelcomeRelationApiServiceImpl implements HmWelcomeRelationApiServ
*/
@Override
public ServiceResponse<Page<HmWelcomeRelationDTO>> queryWelcomeRelation(QueryWelcomeRelationQDTO queryWelcomeRelationQDTO) {
ServiceResponse<Page<HmWelcomeRelationDTO>> serviceResponse = new ServiceResponse<>();
if (queryWelcomeRelationQDTO.getWelcomeId() == null){
serviceResponse.setCode(HaoBanErrCodeCommon.ERR_2.getCode()+"");
serviceResponse.setMessage(HaoBanErrCodeCommon.ERR_2.getMsg());
return serviceResponse;
return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_2.getCode()+"", HaoBanErrCodeCommon.ERR_2.getMsg());
}
WelcomeRelationQO welcomeRelationQo = new WelcomeRelationQO();
welcomeRelationQo.setWelcomeId(queryWelcomeRelationQDTO.getWelcomeId());
......@@ -46,7 +42,6 @@ public class HmWelcomeRelationApiServiceImpl implements HmWelcomeRelationApiServ
com.github.pagehelper.Page<TabHaobanWelcomeTemplateRelation> tabHaobanWelcomeTemplateRelations =
(com.github.pagehelper.Page<TabHaobanWelcomeTemplateRelation>) welcomeTemplateRelationMapper.queryWelcomeTemplate(welcomeRelationQo);
Page<HmWelcomeRelationDTO> hmWelcomeRelationDTOPage = PageUtil.changePageHelperToCurrentPage(tabHaobanWelcomeTemplateRelations, HmWelcomeRelationDTO.class);
serviceResponse.setResult(hmWelcomeRelationDTOPage);
return serviceResponse;
return ServiceResponse.success(hmWelcomeRelationDTOPage);
}
}
haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmPageRelationMapper.xml
......@@ -3,7 +3,7 @@
<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_template_code" property="pageTemplateCode" jdbcType="VARCHAR"/>
<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"/>
......@@ -15,7 +15,7 @@
</resultMap>
<sql id="Base_Column_List">
relation_id
, page_template_code, enterprise_id, wx_enterprise_id, refer_id, refer_name,
, page_code, enterprise_id, wx_enterprise_id, refer_id, refer_name,
create_time, update_time, type, status
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">
......@@ -30,11 +30,11 @@
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_template_code, enterprise_id,
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)
values (#{relationId,jdbcType=BIGINT}, #{pageTemplateCode,jdbcType=VARCHAR}, #{enterpriseId,jdbcType=VARCHAR},
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})
......@@ -45,8 +45,8 @@
<if test="relationId != null">
relation_id,
</if>
<if test="pageTemplateCode != null">
page_template_code,
<if test="pageCode != null">
page_code,
</if>
<if test="enterpriseId != null">
enterprise_id,
......@@ -77,8 +77,8 @@
<if test="relationId != null">
#{relationId,jdbcType=BIGINT},
</if>
<if test="pageTemplateCode != null">
#{pageTemplateCode,jdbcType=VARCHAR},
<if test="pageCode != null">
#{pageCode,jdbcType=VARCHAR},
</if>
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=VARCHAR},
......@@ -110,8 +110,8 @@
parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmPageRelation">
update tab_haoban_hm_page_relation
<set>
<if test="pageTemplateCode != null">
page_template_code = #{pageTemplateCode,jdbcType=VARCHAR},
<if test="pageCode != null">
page_code = #{pageCode,jdbcType=VARCHAR},
</if>
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
......@@ -142,14 +142,14 @@
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmPageRelation">
update tab_haoban_hm_page_relation
set page_template_code = #{pageTemplateCode,jdbcType=VARCHAR},
set page_code = #{pageCode,jdbcType=VARCHAR},
enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
refer_id = #{referId,jdbcType=VARCHAR},
refer_name = #{referName,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
type = #{type,jdbcType=INTEGER},
`type` = #{type,jdbcType=INTEGER},
status = #{status,jdbcType=INTEGER}
where relation_id = #{relationId,jdbcType=BIGINT}
</update>
......@@ -158,8 +158,8 @@
select <include refid="Base_Column_List"/>
from tab_haoban_hm_page_relation
<where>
<if test="templateCode != null and templateCode != ''">
page_template_code = #{templateCode}
<if test="pageCode != null and pageCode != ''">
page_code = #{pageCode}
</if>
<if test="status != null">
and `status` = #{status}
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmGroupController.java
package com.gic.haoban.manage.web.controller.hm;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.haoban.base.api.common.PageResult2;
import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
import com.gic.haoban.common.utils.AuthWebRequestUtil;
import com.gic.haoban.common.utils.PageUtil;
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmPageTemplateController.java
package com.gic.haoban.manage.web.controller.hm;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.haoban.base.api.common.PageResult2;
import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
import com.gic.haoban.common.utils.AuthWebRequestUtil;
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.service.hm.HmPageTemplateApiService;
import com.gic.haoban.manage.web.vo.hm.HmPageTemplateListVO;
import com.gic.haoban.manage.web.vo.hm.HmPageTemplateSettingVO;
import com.gic.haoban.manage.web.vo.hm.PageTemplateRelationVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -34,7 +37,7 @@ public class HmPageTemplateController {
public RestResponse<?> savePageTemplate(HmPageTemplateSettingVO pageTemplateSettingVO){
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
HmPageTemplateDTO pageTemplateDTO = new HmPageTemplateDTO();
pageTemplateDTO.setTemplateName(pageTemplateSettingVO.getTemplateName());
pageTemplateDTO.setPageName(pageTemplateSettingVO.getTemplateName());
pageTemplateDTO.setPageTitle(pageTemplateSettingVO.getPageTitle());
pageTemplateDTO.setMerchantName(pageTemplateSettingVO.getMerchantName());
pageTemplateDTO.setMerchantPhoneNumber(pageTemplateSettingVO.getMerchantPhoneNumber());
......@@ -57,8 +60,8 @@ public class HmPageTemplateController {
public RestResponse<?> editPageTemplate(HmPageTemplateSettingVO pageTemplateSettingVO){
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
HmPageTemplateDTO pageTemplateDTO = new HmPageTemplateDTO();
pageTemplateDTO.setTemplateId(pageTemplateSettingVO.getTemplateId());
pageTemplateDTO.setTemplateName(pageTemplateSettingVO.getTemplateName());
pageTemplateDTO.setPageId(pageTemplateSettingVO.getTemplateId());
pageTemplateDTO.setPageName(pageTemplateSettingVO.getTemplateName());
pageTemplateDTO.setPageTitle(pageTemplateSettingVO.getPageTitle());
pageTemplateDTO.setMerchantName(pageTemplateSettingVO.getMerchantName());
pageTemplateDTO.setMerchantPhoneNumber(pageTemplateSettingVO.getMerchantPhoneNumber());
......@@ -97,7 +100,7 @@ public class HmPageTemplateController {
public RestResponse<?> deletePageTemplate(Long templateId){
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
HmPageTemplateDTO hmPageTemplateDTO = new HmPageTemplateDTO();
hmPageTemplateDTO.setTemplateId(templateId);
hmPageTemplateDTO.setPageId(templateId);
hmPageTemplateDTO.setClerkId(loginUser.getClerkId());
hmPageTemplateDTO.setClerkName(loginUser.getClerkName());
ServiceResponse<Boolean> serviceResponse = pageTemplateApiService.deleteHmPageTemplate(hmPageTemplateDTO);
......@@ -106,4 +109,22 @@ public class HmPageTemplateController {
}
return RestResponse.failure(serviceResponse.getCode()+"", serviceResponse.getMessage());
}
@RequestMapping(path = "/page/detail")
public RestResponse<?> queryPageTemplateDetail(Long templateId){
ServiceResponse<HmPageTemplateRespDTO> serviceResponse = pageTemplateApiService.queryPageTemplateDetail(templateId);
return RestResponse.successResult(serviceResponse.getResult());
}
@RequestMapping(path = "/page/relation")
public RestResponse<?> queryPageTemplateRelationList(PageTemplateRelationVO pageTemplateRelationVO){
HmPageRelationQueryDTO pageRelationQueryDTO = new HmPageRelationQueryDTO();
pageRelationQueryDTO.setPageNum(pageTemplateRelationVO.getPageNum());
pageRelationQueryDTO.setPageSize(pageTemplateRelationVO.getPageSize());
pageRelationQueryDTO.setSearchText(pageTemplateRelationVO.getSearchContent());
pageRelationQueryDTO.setPageId(pageRelationQueryDTO.getPageId());
ServiceResponse<Page<HmPageRelationRespDTO>> serviceResponse = pageTemplateApiService.queryPageRelation(pageRelationQueryDTO);
PageResult2 pageInfo = PageUtil.getPageInfo(serviceResponse.getResult());
return RestResponse.successResult(pageInfo);
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/PageTemplateRelationVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.hm;
import com.gic.haoban.base.api.common.BasePageInfo;
/**
* @Author MUSI
* @Date 2022/7/8 1:52 PM
* @Description
* @Version
**/
public class PageTemplateRelationVO extends BasePageInfo {
private Long templateId;
private String searchContent;
public Long getTemplateId() {
return templateId;
}
public void setTemplateId(Long templateId) {
this.templateId = templateId;
}
public String getSearchContent() {
return searchContent;
}
public void setSearchContent(String searchContent) {
this.searchContent = searchContent;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment