手机号码脱敏;其他修改

epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java

@@ -24,9 +24,9 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.analysis.pc.category.EpmetCategoryCodeOption;
 import com.elink.esua.epdc.dto.category.CategoryDTO;
 import com.elink.esua.epdc.dto.category.CategoryOption;
-import com.elink.esua.epdc.dto.category.EpmetCategoryCodeOption;
 import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO;
 import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO;
 import com.elink.esua.epdc.modules.category.excel.CategoryExcel;

epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java

@@ -19,9 +19,9 @@ package com.elink.esua.epdc.modules.category.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.analysis.pc.category.EpmetCategoryCodeOption;
 import com.elink.esua.epdc.dto.category.CategoryDTO;
 import com.elink.esua.epdc.dto.category.CategoryOption;
-import com.elink.esua.epdc.dto.category.EpmetCategoryCodeOption;
 import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO;
 import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO;
 import com.elink.esua.epdc.modules.category.entity.CategoryEntity;

epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java

@@ -35,10 +35,10 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.utils.TreeUtils;
+import com.elink.esua.epdc.dto.analysis.pc.category.EpmetCategoryCodeOption;
 import com.elink.esua.epdc.dto.category.CategoryDTO;
 import com.elink.esua.epdc.dto.category.CategoryOption;
 import com.elink.esua.epdc.dto.category.CategoryTreeDTO;
-import com.elink.esua.epdc.dto.category.EpmetCategoryCodeOption;
 import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO;
 import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO;
 import com.elink.esua.epdc.modules.category.dao.CategoryDao;
@@ -50,7 +50,6 @@ import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO;
 import com.elink.esua.epdc.modules.rocketmq.producer.CategoryModifyProducer;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;

epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/AnalysisFeignClient.java

@@ -2,7 +2,7 @@ package com.elink.esua.epdc.modules.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.category.EpmetCategoryCodeOption;
+import com.elink.esua.epdc.dto.analysis.pc.category.EpmetCategoryCodeOption;
 import com.elink.esua.epdc.modules.feign.fallback.AnalysisFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;

epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AnalysisFeignClientFallback.java

@@ -3,7 +3,7 @@ package com.elink.esua.epdc.modules.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.category.EpmetCategoryCodeOption;
+import com.elink.esua.epdc.dto.analysis.pc.category.EpmetCategoryCodeOption;
 import com.elink.esua.epdc.modules.feign.AnalysisFeignClient;
 import org.springframework.stereotype.Component;
 

epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java

@@ -28,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.DateUtils;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.EventIssueItemState;
 import com.elink.esua.epdc.constant.EventsNoticeConstant;
@@ -73,6 +74,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.regex.Pattern;
 
 /**
  * 议题表 议题表
@@ -442,6 +444,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 
     /**
      * 议题数据统计
+     *
      * @param formDto
      * @return
      */
@@ -463,6 +466,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 
     /**
      * 待回应列表
+     *
      * @param formDto
      * @return
      */
@@ -475,6 +479,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 
     /**
      * 工作端-议题待处理或者已关闭的最新最热列表
+     *
      * @param formDto
      * @return
      */
@@ -506,7 +511,11 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 
     @Override
     public List<IssueProgressResultDTO> listIssueProgress(String issueId) {
-        return baseDao.selectListIssueProgress(issueId);
+        List<IssueProgressResultDTO> dtos = baseDao.selectListIssueProgress(issueId);
+        for (IssueProgressResultDTO dto : dtos) {
+            dto.setMobile(ModuleUtils.hideMobile(dto.getMobile()));
+        }
+        return dtos;
     }
 
     /**
@@ -543,11 +552,10 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     }
 
     /**
-     *
      * 组织机构信息处理
      *
-     * @params [dto, issueList]
      * @return java.util.List<com.elink.esua.epdc.modules.issue.entity.IssueDTO>
+     * @params [dto, issueList]
      * @author liuchuang
      * @since 2020/3/7 1:17
      */
@@ -604,11 +612,10 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     }
 
     /**
-     *
      * 分类信息处理
      *
-     * @params [dto, eventsList]
      * @return java.util.List<com.elink.esua.epdc.modules.events.entity.IssueEntity>
+     * @params [dto, eventsList]
      * @author liuchuang
      * @since 2020/3/7 17:00
      */