Skip to content

H
haoban-manage3.0
Commit 3b83c4ac by songyinghui
Options

feat: 字段命名调整

parent 764e44f1
Showing with 51 additions and 79 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/hm/HmPageRelationBO.java
......@@ -43,6 +43,13 @@ public class HmPageRelationBO implements Serializable {
*/
private Integer type;
/**
* 关联状态
* @see com.gic.haoban.manage.api.enums.hm.HmPageTemplateStatus
*
*/
private Integer status;
public String getPageCode() {
return pageCode;
}
......
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
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmGroupApiServiceImpl.java
......@@ -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/HmPageTemplateApiServiceImpl.java
......@@ -53,7 +53,6 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService {
@Override
public ServiceResponse<Long> saveOrUpdateHmPageTemplate(HmPageTemplateDTO pageTemplateDTO) {
ServiceResponse<Long> serviceResponse = new ServiceResponse<>();
if (Objects.isNull(pageTemplateDTO.getPageId())) {
// save
TabHaobanHmPage haobanHmPage = new TabHaobanHmPage();
......@@ -68,27 +67,21 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService {
haobanHmPage.setUpdateTime(new Date());
haobanHmPage.setStatus(HmPageTemplateStatus.ENABLE.getCode());
haobanHmPageMapper.insertSelective(haobanHmPage);
serviceResponse.setResult(haobanHmPage.getPageId());
return ServiceResponse.success(haobanHmPage.getPageId());
} else {
// update
TabHaobanHmPage tempPageTemplate = haobanHmPageMapper.selectByPrimaryKey(pageTemplateDTO.getPageId());
if (Objects.isNull(tempPageTemplate)) {
// 数据不存在
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(tempPageTemplate.getEnterpriseId(), pageTemplateDTO.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());
}
if (!StringUtils.equals(tempPageTemplate.getWxEnterpriseId(), pageTemplateDTO.getWxEnterpriseId())) {
// 无权限
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());
}
TabHaobanHmPage haobanHmPage = new TabHaobanHmPage();
BeanUtils.copyProperties(pageTemplateDTO, haobanHmPage);
......@@ -98,9 +91,8 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService {
haobanHmPage.setModifierId(pageTemplateDTO.getClerkId());
haobanHmPage.setModifierName(pageTemplateDTO.getClerkName());
haobanHmPageMapper.updateByPrimaryKeySelective(haobanHmPage);
serviceResponse.setResult(pageTemplateDTO.getPageId());
return ServiceResponse.success(haobanHmPage.getPageId());
}
return serviceResponse;
}
@Override
......@@ -110,14 +102,10 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService {
ServiceResponse<Boolean> serviceResponse = new ServiceResponse<>();
TabHaobanHmPage haobanHmPage = haobanHmPageMapper.selectByPrimaryKey(pageTemplateDTO.getPageId());
if (Objects.isNull(haobanHmPage) || !Objects.equals(HmPageTemplateStatus.ENABLE.getCode(), haobanHmPage.getStatus())) {
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 (checkPageIsBeQuoted(haobanHmPage.getPageCode()) > 0) {
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());
}
TabHaobanHmPage tempHmPage = new TabHaobanHmPage();
tempHmPage.setPageId(haobanHmPage.getPageId());
......@@ -126,8 +114,7 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService {
tempHmPage.setModifierId(pageTemplateDTO.getClerkId());
tempHmPage.setModifierName(pageTemplateDTO.getClerkName());
haobanHmPageMapper.updateByPrimaryKeySelective(tempHmPage);
serviceResponse.setResult(Boolean.TRUE);
return serviceResponse;
return ServiceResponse.success(Boolean.TRUE);
}
@Override
......@@ -140,9 +127,7 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService {
(com.github.pagehelper.Page<TabHaobanHmPage>) haobanHmPageMapper.queryHmPageTemplateList(pageTemplateQO);
Page<HmPageTemplateRespDTO> pageTemplateRespDTO =
PageHelperUtils.changePageHelperToCurrentPage(tabHaobanHmPages, HmPageTemplateRespDTO.class);
ServiceResponse<Page<HmPageTemplateRespDTO>> serviceResponse = new ServiceResponse<>();
serviceResponse.setResult(pageTemplateRespDTO);
return serviceResponse;
return ServiceResponse.success(pageTemplateRespDTO);
}
/**
......@@ -173,9 +158,7 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService {
hmPageRelationQo.setPageSize(relationQueryDTO.getPageSize());
hmPageRelationQo.setPageCode(relationQueryDTO.getPageId()+"");
Page<HmPageRelationBO> hmPageRelationPage = pageRelationService.queryPageTemplateRelationWithSearchText(hmPageRelationQo);
ServiceResponse<Page<HmPageRelationRespDTO>> serviceResponse = new ServiceResponse<>();
serviceResponse.setResult(PageUtil.changeToCurrentPage(hmPageRelationPage, HmPageRelationRespDTO.class));
return serviceResponse;
return ServiceResponse.success(PageUtil.changeToCurrentPage(hmPageRelationPage, HmPageRelationRespDTO.class));
}
/**
......@@ -194,14 +177,12 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService {
*/
@Override
public ServiceResponse<HmPageTemplateRespDTO> queryPageTemplateDetail(Long templateId) {
ServiceResponse<HmPageTemplateRespDTO> serviceResponse = new ServiceResponse<>();
TabHaobanHmPage haobanHmPage = haobanHmPageMapper.selectByPrimaryKey(templateId);
if (haobanHmPage == null){
return serviceResponse;
return ServiceResponse.success();
}
HmPageTemplateRespDTO hmPageTemplateRespDTO = new HmPageTemplateRespDTO();
BeanUtils.copyProperties(haobanHmPage, hmPageTemplateRespDTO);
serviceResponse.setResult(hmPageTemplateRespDTO);
return serviceResponse;
return ServiceResponse.success(hmPageTemplateRespDTO);
}
}
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);
}
}
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