diff --git 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 index b49075bce4..3b9cfedb13 100644 --- 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; diff --git 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 index e813b866f5..8cb89dc4d7 100644 --- 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.已删除 diff --git 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 index 2da6a153eb..bfd770a5ff 100644 --- 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(); } diff --git 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 index 32dcd13338..f806f28032 100644 --- 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> map = issueProjectTagDictRedis.getTagsOrderByRank(tokenDto.getCustomerId(), + Map> 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 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; } diff --git 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 index fbe4f9782c..9598d00fbc 100644 --- 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 page(Map params) { @@ -159,7 +163,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl { // 缓存标签 -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 selectTags = form.getTagList(); List newTags = issueProjectTagDictDao.selectTagId(selectTags); - IssueTagsDTO issueTagsDTO = baseDao.selectOneTagByIssueId(form.getIssueId()); + IssueEntity issueEntity = issueDao.selectById(form.getIssueId()); if (!CollectionUtils.isEmpty(newTags)){ // 需要删除的标签 List 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 { // 缓存标签+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 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); diff --git 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 index 2c5f2aab17..8ed29444c2 100644 --- 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 @@ 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}, diff --git 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 index 2160f44778..f9c6b2acda 100644 --- 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(); } diff --git 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 index 74ed9133ee..8cb2ec5a0b 100644 --- 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 result = govIssueOpenFeignClient.getProjectAndCategoryInfo(formDTO); if (!result.success()) {