Merge branch 'dev_issue_category' into dev_temp

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;
 

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.已删除

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();
     }

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) {

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java

@@ -180,7 +180,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);
                 });
@@ -201,7 +201,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
             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 +214,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);
                 });

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

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},

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();
     }

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()) {