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

5 years ago · 86332c13af
10 changed files with 34 additions and 19 deletions
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagFormDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagFormDTO.java
@ -15,7 +15,7 @@ public class IssueTagFormDTO implements Serializable {

    private String id;

-    private String tagName;
+    private String name;

    private String categoryId;

--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagsFormDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagsFormDTO.java
@ -41,7 +41,7 @@ public class IssueTagsFormDTO implements Serializable {
    /**
     * 标签名称
     */
-    private String tagName;
+    private String name;

    /**
     * 删除标识 0.未删除 1.已删除
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java
@ -129,9 +129,6 @@ public class IssueCategoryController {
    @PostMapping("save")
    public Result saveCategory(@RequestBody IssueSaveCategoryFormDTO formDTO) {
        ValidatorUtils.validateEntity(formDTO, IssueSaveCategoryFormDTO.SaveCategory.class);
-        if(formDTO.getCategoryList().size()< NumConstant.ONE){
-            throw new RenException("请至少选择一个分类保存");
-        }
        issueCategoryService.saveCategory(formDTO);
        return new Result();
    }
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java
@ -177,6 +177,12 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl<IssueCategoryDao,
    @Override
    public void saveCategory(IssueSaveCategoryFormDTO formDTO) {

+        //0.如果传入的分类集合为空不管是否存在过历史分类数据，只执行一次删除操作
+        if(formDTO.getCategoryList().size()< NumConstant.ONE){
+            baseDao.delByIssueId(formDTO.getIssueId());
+            return;
+        }
+
        //1.查询议题所属客户和所属网格信息
        IssueEntity issue = issueService.selectById(formDTO.getIssueId());
        if (null == issue) {
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
@ -35,6 +35,7 @@ import com.epmet.entity.IssueProjectTagDictEntity;
 import com.epmet.redis.IssueProjectTagDictRedis;
 import com.epmet.service.IssueProjectTagDictService;
 import com.epmet.utils.ModuleConstants;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@ -119,10 +120,15 @@ public class IssueProjectTagDictServiceImpl extends BaseServiceImpl<IssueProject
    @Override
    public TagListResultDTO getTagList(TokenDto tokenDto, TagListFormDTO formDTO) {
        TagListResultDTO result = new TagListResultDTO();
-		Map<String,List<IssueCategoryTagResultDTO>> map =  issueProjectTagDictRedis.getTagsOrderByRank(tokenDto.getCustomerId(),
+		Map<String,List<IssueCategoryTagResultDTO>> map =  issueProjectTagDictRedis.getDefaultTagsSortedByCategoryAndCustomizedTagsOrderByRank(tokenDto.getCustomerId(),
 				formDTO.getCategoryIdList());
        result.setDefaulted(map.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME));
-        result.setCustomized(map.get(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME).stream().limit(NumConstant.TEN).collect(Collectors.toList()));
+        List<IssueCategoryTagResultDTO> list = map.get(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME);
+        if (CollectionUtils.isNotEmpty(list)) {
+            result.setCustomized(list.stream().limit(NumConstant.TEN).collect(Collectors.toList()));
+        } else {
+            result.setCustomized(Collections.emptyList());
+        }
        return result;
    }

--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
@ -25,6 +25,7 @@ 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.dao.IssueDao;
 import com.epmet.dao.IssueProjectTagDictDao;
 import com.epmet.dao.IssueTagsDao;
 import com.epmet.dto.IssueTagsDTO;
@ -34,6 +35,7 @@ import com.epmet.dto.form.IssueTagsFormDTO;
 import com.epmet.dto.form.IssueTagsSaveFormDTO;
 import com.epmet.dto.result.AddTagResultDTO;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
+import com.epmet.entity.IssueEntity;
 import com.epmet.entity.IssueProjectTagDictEntity;
 import com.epmet.entity.IssueTagsEntity;
 import com.epmet.redis.IssueProjectTagDictRedis;
@ -67,6 +69,8 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
    private IssueProjectTagDictDao issueProjectTagDictDao;
    @Autowired
    private IssueProjectTagDictRedis dictRedis;
+    @Autowired
+    private IssueDao issueDao;

    @Override
    public PageData<IssueTagsDTO> page(Map<String, Object> params) {
@ -159,7 +163,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
        issueCategoryTagResultDTO.setId(entity.getId());
        issueCategoryTagResultDTO.setName(entity.getTagName());
        dictRedis.addIssueProjectTag(entity.getCustomerId(),entity.getCategoryId(),issueCategoryTagResultDTO);
-        return new AddTagResultDTO();
+        return new AddTagResultDTO(entity.getId());
    }

    /**
@ -180,7 +184,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
                tags.forEach(t -> {
                    // 缓存标签 -1
                    IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
-                    issueCategoryTagResultDTO.setName(t.getTagName());
+                    issueCategoryTagResultDTO.setName(t.getName());
                    issueCategoryTagResultDTO.setId(t.getId());
                    dictRedis.editTagUseCount(customerId,t.getCategoryId(),issueCategoryTagResultDTO,NumConstant.ONE_STR);
                });
@ -194,14 +198,14 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
        // 不为空时走这
        List<IssueTagFormDTO> selectTags = form.getTagList();
        List<IssueTagFormDTO> newTags = issueProjectTagDictDao.selectTagId(selectTags);
-        IssueTagsDTO issueTagsDTO = baseDao.selectOneTagByIssueId(form.getIssueId());
+        IssueEntity issueEntity = issueDao.selectById(form.getIssueId());
        if (!CollectionUtils.isEmpty(newTags)){
            // 需要删除的标签
            List<IssueTagFormDTO> delList = tags.stream().filter(tag -> !newTags.contains(tag)).collect(toList());
            if (!CollectionUtils.isEmpty(delList)){
                delList.forEach(d -> {
                    IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
-                    issueCategoryTagResultDTO.setName(d.getTagName());
+                    issueCategoryTagResultDTO.setName(d.getName());
                    issueCategoryTagResultDTO.setId(d.getId());
                    dictRedis.editTagUseCount(customerId,d.getCategoryId(),issueCategoryTagResultDTO,NumConstant.ONE_STR);
                });
@ -214,7 +218,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
                addList.forEach(a -> {
                    // 缓存标签+1
                    IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
-                    issueCategoryTagResultDTO.setName(a.getTagName());
+                    issueCategoryTagResultDTO.setName(a.getName());
                    issueCategoryTagResultDTO.setId(a.getId());
                    dictRedis.editTagUseCount(customerId,a.getCategoryId(),issueCategoryTagResultDTO,NumConstant.ZERO_STR);
                });
@ -227,7 +231,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
            List<IssueTagsFormDTO> needInsert = ConvertUtils.sourceToTarget(newTags, IssueTagsFormDTO.class);
            needInsert.forEach(n -> {
                n.setCustomerId(customerId);
-                n.setGridId(issueTagsDTO.getGridId());
+                n.setGridId(issueEntity.getGridId());
                n.setIssueId(form.getIssueId());
            });
            baseDao.insertNewTags(needInsert);
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
@ -24,7 +24,7 @@
    <!-- 查询标签ID -->
    <select id="selectTagId" resultType="com.epmet.dto.form.IssueTagFormDTO">
        SELECT ID AS tagId,
-               TAG_NAME,
+               TAG_NAME AS name,
               CATEGORY_ID,
               id
        FROM issue_project_tag_dict
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueTagsDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueTagsDao.xml
@ -42,7 +42,7 @@
    <select id="selectTagsByIssueId" resultType="com.epmet.dto.form.IssueTagFormDTO">
        SELECT
            it.TAG_ID AS id,
-            it.TAG_NAME,
+            it.TAG_NAME as name,
            td.CATEGORY_ID,
            it.TAG_ID AS tagId
        FROM issue_tags it
@ -79,7 +79,7 @@
                #{l.gridId},
                #{l.issueId},
                #{l.tagId},
-                #{l.tagName},
+                #{l.name},
                #{l.delFlag},
                #{l.revision},
                #{l.createdBy},
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java
@ -117,9 +117,6 @@ public class ProjectCategoryController {
    @PostMapping("save")
    public Result saveCategory(@RequestBody ProjectSaveCategoryFormDTO formDTO) {
        ValidatorUtils.validateEntity(formDTO, ProjectSaveCategoryFormDTO.SaveCategory.class);
-        if(formDTO.getCategoryList().size()< NumConstant.ONE){
-            throw new RenException("请至少选择一个分类保存");
-        }
        projectCategoryService.saveCategory(formDTO);
        return new Result();
    }
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java
@ -150,6 +150,11 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
    @Override
    public void saveCategory(ProjectSaveCategoryFormDTO formDTO) {

+        //0.如果传入的分类集合为空不管是否存在过历史分类数据，只执行一次删除操作
+        if(formDTO.getCategoryList().size()< NumConstant.ONE){
+            baseDao.delByProjectId(formDTO.getProjectId());
+            return;
+        }
        //1.查询项目所属客户和所属网格信息以及分类对应的分类信息
        Result<ProjectIssueCategoryResultDTO> result = govIssueOpenFeignClient.getProjectAndCategoryInfo(formDTO);
        if (!result.success()) {