luyan
/
epmet-cloud-rizhao0920
forked from rongchao/epmet-cloud-rizhao
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev_issue_category' into dev_temp

dev
sunyuchao 5 years ago
parent
be268c6c94 93a928b793
commit
e56f7f34fd
2 changed files with 54 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 41
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
  2. 24
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java

41
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
View File

@ -31,7 +31,10 @@ import com.epmet.dao.IssueCategoryDao;
import com.epmet.dao.IssueProjectCategoryDictDao;
import com.epmet.dao.IssueProjectRelationDao;
import com.epmet.dao.IssueProjectTagDictDao;
import com.epmet.dto.*;
import com.epmet.dto.IssueCategoryDTO;
import com.epmet.dto.IssueDTO;
import com.epmet.dto.IssueProjectCategoryDictDTO;
import com.epmet.dto.ProjectCategoryDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
import com.epmet.entity.IssueProjectCategoryDictEntity;
@ -145,6 +148,18 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
@Override
public List<CustomerCategoryListResultDTO> categoryList(String customerId) {
List<CustomerCategoryListResultDTO> resultList = baseDao.selectCustomerCategoryList(customerId);
//2021.3.24 sun 客户初始化分类标签的接口不想加到新客户创建的程序里，因此加到这里 在标签列表的查询方法中也有关于初始化分类标签的逻辑
try {
if(CollectionUtils.isEmpty(resultList)){
CategoryTagInitFormDTO dto = new CategoryTagInitFormDTO();
dto.setCustomerId(customerId);
init(dto);
resultList = baseDao.selectCustomerCategoryList(customerId);
}
} catch (Exception e) {
logger.error("客户初始化分类、标签失败，客户Id->"+customerId, e);
}
//end
return resultList;
}
@ -201,35 +216,21 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
@Override
@Transactional(rollbackFor = Exception.class)
public void init(CategoryTagInitFormDTO formDTO) {
//2021.3.23 sun 不传客户Id时默认查询所有有效客户列表 循环添加
List<String> customerIdList = new ArrayList<>();
if(StringUtils.isBlank(formDTO.getCustomerId())){
Result<List<CustomerDTO>> resultList = operCrmOpenFeignClient.getAllCustomerList();
if(!resultList.success()){
throw new RuntimeException("crm库获取有效客户列表失败！");
}
customerIdList = resultList.getData().stream().map(cu->cu.getId()).collect(Collectors.toList());
}else {
customerIdList.add(formDTO.getCustomerId());
}
//end sun
customerIdList.forEach(cu->{
List<IssueProjectCategoryDictEntity> list = baseDao.selectCategoryListByCustomer(cu);
List<IssueProjectCategoryDictEntity> list = baseDao.selectCategoryListByCustomer(formDTO.getCustomerId());
if (CollectionUtils.isEmpty(list)) {
//分类初始化
List<IssueProjectCategoryDictEntity> categoryList = baseDao.selectCategoryListByCustomer("default");
categoryList.forEach(item -> {
item.setCustomerId(cu);
item.setCustomerId(formDTO.getCustomerId());
});
this.insertBatch(categoryList);
//标签初始化
List<IssueProjectTagDictEntity> tagList = issueProjectTagDictService.getTagListByCustomer("default");
tagList.forEach(item -> {
item.setCustomerId(cu);
item.setCustomerId(formDTO.getCustomerId());
});
issueProjectTagDictService.insertBatch(tagList);
}
});
}
/**
@ -345,7 +346,7 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
entity.setPid(NumConstant.ZERO_STR );
entity.setPids(NumConstant.ZERO_STR );
entity.setParentCategoryCode(NumConstant.ZERO_STR);
// 查询 当前客户下，+1 后最大的一级分类数。从1开始
// 查询 当前客户下最大的一级分类数。
Integer maxCategoryCode = baseDao.getMaxCategoryCode(formDTO.getCustomerId(), NumConstant.ZERO_STR);
if (NumConstant.ZERO == maxCategoryCode) {
maxCategoryCode = 1001;
@ -406,7 +407,7 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
entity.setPids(formDTO.getParentCategoryId());
IssueProjectCategoryDictEntity parentCategoryCode = baseDao.selectById(formDTO.getParentCategoryId());
entity.setParentCategoryCode(parentCategoryCode.getCategoryCode());
// 查询 当前客户下，+1 后最大的一级分类数
// 查询 当前客户下最大的一级分类数。
Integer maxCategoryCode = baseDao.getMaxCategoryCode(formDTO.getCustomerId(), parentCategoryCode.getCategoryCode());
if (NumConstant.ZERO == maxCategoryCode) {
maxCategoryCode = Integer.valueOf(parentCategoryCode.getCategoryCode() + "1001");

24
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
View File

@ -20,25 +20,28 @@ package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.constant.GovIssueRedisKeys;
import com.epmet.dao.IssueProjectTagDictDao;
import com.epmet.dto.IssueProjectTagDictDTO;
import com.epmet.dto.form.CategoryTagInitFormDTO;
import com.epmet.dto.form.TagDifferentSetFormDTO;
import com.epmet.dto.form.TagListFormDTO;
import com.epmet.dto.result.IssueCategoryTagResultDTO;
import com.epmet.dto.result.IssueProjectTagsResultDTO;
import com.epmet.dto.result.TagListResultDTO;
import com.epmet.entity.IssueProjectTagDictEntity;
import com.epmet.redis.IssueProjectTagDictRedis;
import com.epmet.service.IssueProjectCategoryDictService;
import com.epmet.service.IssueProjectTagDictService;
import com.epmet.utils.ModuleConstants;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -55,8 +58,11 @@ import java.util.stream.Collectors;
@Service
public class IssueProjectTagDictServiceImpl extends BaseServiceImpl<IssueProjectTagDictDao, IssueProjectTagDictEntity> implements IssueProjectTagDictService {
private static Logger logger = LoggerFactory.getLogger(IssueProjectTagDictServiceImpl.class);
@Autowired
private IssueProjectTagDictRedis issueProjectTagDictRedis;
@Autowired
private IssueProjectCategoryDictService issueProjectCategoryDictService;
@Override
public PageData<IssueProjectTagDictDTO> page(Map<String, Object> params) {
@ -125,6 +131,20 @@ public class IssueProjectTagDictServiceImpl extends BaseServiceImpl<IssueProject
Map<String,List<IssueCategoryTagResultDTO>> map = issueProjectTagDictRedis.getDefaultTagsSortedByCategoryAndCustomizedTagsOrderByRank(tokenDto.getCustomerId(),
formDTO.getCategoryIdList());
result.setDefaulted(map.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME));
//2021.3.24 sun 客户初始化分类标签的接口不想加到新客户创建的程序里，因此加到这里 在分类列表的查询方法中也有关于初始化分类标签的逻辑
try {
if(CollectionUtils.isEmpty(result.getDefaulted())){
CategoryTagInitFormDTO dto = new CategoryTagInitFormDTO();
dto.setCustomerId(tokenDto.getCustomerId());
issueProjectCategoryDictService.init(dto);
Map<String,List<IssueCategoryTagResultDTO>> map1 = issueProjectTagDictRedis.getDefaultTagsSortedByCategoryAndCustomizedTagsOrderByRank(tokenDto.getCustomerId(),
formDTO.getCategoryIdList());
result.setDefaulted(map1.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME));
}
} catch (Exception e) {
logger.error("客户初始化分类、标签失败，客户Id->"+tokenDto.getCustomerId(), e);
}
//end
List<IssueCategoryTagResultDTO> list = map.get(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME);
if (CollectionUtils.isNotEmpty(list)) {
result.setCustomized(list.stream().limit(NumConstant.TEN).collect(Collectors.toList()));

Write Preview
Loading…
Cancel
Save