Merge branch 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagsFormDTO.java

@@ -43,6 +43,11 @@ public class IssueTagsFormDTO implements Serializable {
      */
     private String name;
 
+    /**
+     * 是否禁用(enable:启用 disable:禁用)
+     */
+    private String isDisable;
+
     /**
      * 删除标识 0.未删除 1.已删除
      */

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java

@@ -37,7 +37,7 @@ import java.util.List;
 public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategoryDictEntity> {
 
     /**
-     * @Description 客户分类列表查询，按分类升序排列
+     * @Description 客户分类列表查询，按分类升序排列，查询未被禁用的
      * @Author sun
      **/
     List<CustomerCategoryListResultDTO> selectCustomerCategoryList(@Param("customerId") String customerId);

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java

@@ -98,6 +98,7 @@ public class IssueProjectTagDictRedis {
         }
 
         IssueProjectCategoryDictEntity otherCategory = categoryDictDao.selectSingleByCustomerIdAndCategoryNameAndCategoryType(customerId, ModuleConstants.CATEGORY_NAME_OTHERS, null);
+        //是否传入的类别Id中只包含"其他"分类，因为自定义分类和默认分类排序规则不一样
         boolean ifOtherOnly = null == otherCategory ? false : (!CollectionUtils.isEmpty(category) && category.size() == NumConstant.ONE && category.contains(otherCategory.getId()) ? true : false);
 
         Map<String,List<IssueCategoryTagResultDTO>> result = new HashMap<>();
@@ -127,10 +128,9 @@ public class IssueProjectTagDictRedis {
                 result.put(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,customizedResult);
             }
 
-            //默认、自定义标签，只要有一个是空就触发补偿
+            //查询结果是空就触发补偿
             //不信任缓存数据
-            if(!CollectionUtils.isEmpty(result) && !CollectionUtils.isEmpty(result.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME))
-                && !CollectionUtils.isEmpty(result.get(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME)))
+            if(!CollectionUtils.isEmpty(result))
             return result;
 
 
@@ -154,7 +154,7 @@ public class IssueProjectTagDictRedis {
      * @Description    FIXME 该方法保留，默认查询缓存，默认和自定义两种标签均按热度排序
      *                 FIXME 如果缓存中没有相关数据，则进行补偿，返回的数据为：1、默认标签(分类排序) 2、自定义标签(热度排序)
      *                 FIXME 补偿机制均是在缓存中存储热度得分，因此在业务改变之前不要调用该方法
-     *                 category为空，则补偿全部，返回默认标签和自定义标签
+     *                 category为空，返回默认标签和自定义标签
      *                 category仅包含"其他"这个分类的Id时，同上
      *                 category不为空且不只有"其他"这个分类的Id时，则返回集合中的类别标签以及自定义标签
      *                 默认标签不按照热度排序，自定义标签按照热度排序
@@ -358,6 +358,18 @@ public class IssueProjectTagDictRedis {
         redisUtils.zSetAdd(key,o);
     }
 
+    /**
+     * @Description 给客户下的分类/标签批量增加/减少热度
+     * param   :
+     *              key     : 0  代表减一     1 代表加一
+     *              value   :
+     *                          key     : 某一客户下分类/标签的redisKey
+     *                          value  :  需要修改的分类/标签
+     * @param param
+     * @return void
+     * @author wangc
+     * @date 2021.03.20 01:04
+    */
     public void batchIncrScore(Map<String,Map<String,List<IssueCategoryTagResultDTO>>> param){
         if(CollectionUtils.isEmpty(param)) return;
         redisTemplate.executePipelined((RedisCallback) connection -> {

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

@@ -208,6 +208,8 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl<IssueCategoryDao,
             categoryList.forEach(cl -> {
                 if (ca.getId().equals(cl.getId())) {
                     entity.setCategoryPids(cl.getPids());
+                    entity.setCategoryCode(cl.getCategoryCode());
+                    entity.setIsDisable(cl.getIsDisable());
                 }
             });
             entityList.add(entity);

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

@@ -123,7 +123,7 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
     /**
      * @param customerId
      * @return
-     * @Description 客户分类列表查询，按分类升序排列
+     * @Description 客户分类列表查询，按分类升序排列，查询未被禁用的
      * @Author sun
      **/
     @Override

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

@@ -158,6 +158,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
         entity.setIsDefault(NumConstant.ONE_STR);
         entity.setIssueUseCount(NumConstant.ZERO);
         entity.setProjectUseCount(NumConstant.ZERO);
+        entity.setIsDisable(ModuleConstants.ID_ENABLE);
         issueProjectTagDictDao.insert(entity);
         IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
         issueCategoryTagResultDTO.setId(entity.getId());
@@ -234,6 +235,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
                 n.setCustomerId(customerId);
                 n.setGridId(issueEntity.getGridId());
                 n.setIssueId(form.getIssueId());
+                n.setIsDisable(ModuleConstants.ID_ENABLE);
             });
             baseDao.insertNewTags(needInsert);
         }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java

@@ -170,4 +170,12 @@ public interface ModuleConstants {
      * 类别名称：其他
      */
     String CATEGORY_NAME_OTHERS = "其他";
+    /**
+     * 是否禁用  enable:启用
+     */
+    String ID_ENABLE = "enable";
+    /**
+     * 是否禁用  disable:禁用
+     */
+    String IS_DISABLE = "disable";
 }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml

@@ -23,6 +23,7 @@
             del_flag = '0'
         AND category_type = '1'
         AND customer_id = #{customerId}
+        AND is_disable = 'enable'
         ORDER BY sort ASC
     </select>
     <select id="subCategoryList" resultMap="categoryTree">
@@ -36,6 +37,7 @@
             del_flag = '0'
         AND pid = #{id}
         AND customer_id = #{customerId}
+        AND is_disable = 'enable'
         ORDER BY sort ASC
     </select>
     <!-- sql递归 查询客户议题项目的分类信息以及递归查询二级分类信息 end-->

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueTagsDao.xml

@@ -70,7 +70,7 @@
 
     <!-- 插入新的标签 -->
     <insert id="insertNewTags">
-        INSERT INTO issue_tags ( ID, CUSTOMER_ID, GRID_ID, ISSUE_ID, TAG_ID, TAG_NAME, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
+        INSERT INTO issue_tags ( ID, CUSTOMER_ID, GRID_ID, ISSUE_ID, TAG_ID, TAG_NAME, IS_DISABLE, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
         VALUES
             <foreach collection="tags" item="l" separator=",">
                 (
@@ -80,6 +80,7 @@
                 #{l.issueId},
                 #{l.tagId},
                 #{l.name},
+                #{l.isDisable},
                 #{l.delFlag},
                 #{l.revision},
                 #{l.createdBy},

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectCategoryDTOResultDTO.java

@@ -32,6 +32,11 @@ public class ProjectCategoryDTOResultDTO implements Serializable {
 	 */
 	private String pids;
 
+	/**
+	 * 上级分类编码
+	 */
+	private String parentCategoryCode;
+
 	/**
 	 * 分类编码，分类编码+customer_id唯一
 	 */
@@ -52,4 +57,9 @@ public class ProjectCategoryDTOResultDTO implements Serializable {
 	 */
 	private Integer sort;
 
+	/**
+	 * 是否禁用(enable:启用 disable:禁用)
+	 */
+	private String isDisable;
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java

@@ -64,6 +64,14 @@ public class ProjectTagsController {
         return new Result<ProjectTagsDTO>().ok(data);
     }
 
+    /**
+     * @Description 保存项目与标签的关联并更新标签热度
+     * @param dto
+     * @param token
+     * @return com.epmet.commons.tools.utils.Result
+     * @author wangc
+     * @date 2021.03.20 02:34
+    */
     @PostMapping("save")
     public Result save(@RequestBody ProjectTagHookFormDTO dto, @LoginUser TokenDto token){
         dto.setCustomerId(token.getCustomerId());

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java

@@ -175,6 +175,8 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
             categoryList.forEach(cl -> {
                 if (ca.getId().equals(cl.getId())) {
                     entity.setCategoryPids(cl.getPids());
+                    entity.setCategoryCode(cl.getCategoryCode());
+                    entity.setIsDisable(cl.getIsDisable());
                 }
             });
             entityList.add(entity);

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTagsServiceImpl.java

@@ -41,6 +41,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.Arrays;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -142,8 +143,9 @@ public class ProjectTagsServiceImpl extends BaseServiceImpl<ProjectTagsDao, Proj
         if(null != orientIds && null == newIds) differentSet.setMinus(orientIds);
         if(null == orientIds && null != newIds) differentSet.setPlus(newIds);
         if(null != orientIds && null != newIds){
+            List<String> replaceNews = new LinkedList<>(newIds);
             differentSet.setPlus(newIds.removeAll(orientIds) ? newIds : null);
-            differentSet.setMinus(orientIds.removeAll(newIds) ? orientIds : null);
+            differentSet.setMinus(orientIds.removeAll(replaceNews) ? orientIds : null);
         }
         Result result = issueClient.updateCitations(differentSet);
         if(!result.success()) throw new RenException(result.getInternalMsg());