手机号码脱敏;其他修改

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;
 
 /**
  * 议题表 议题表
@@ -209,7 +211,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         if (EventIssueItemState.ISSUE_HANDLED_FEEDBACK == dto.getState() || EventIssueItemState.ISSUE_CLOSED == dto.getState()) {
             issueHandleService.insert(handleEntity);
 
-            imgService.saveImages(dto.getImages(),handleEntity.getId(), ImageConstant.TYPE_IMAGE_BIZ_ISSUE_HANDLE);
+            imgService.saveImages(dto.getImages(), handleEntity.getId(), ImageConstant.TYPE_IMAGE_BIZ_ISSUE_HANDLE);
 
             informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_ISSUE_FEEDBACK);
             if (EventIssueItemState.ISSUE_CLOSED == dto.getState()) {
@@ -242,11 +244,11 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                 /**
                  * 内部处理图片
                  */
-                imgService.saveImages(dto.getImages(),itemHandleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_HANDLE);
+                imgService.saveImages(dto.getImages(), itemHandleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_HANDLE);
                 /**
                  * 外部处理图片
                  */
-                imgService.saveImages(dto.getImages(),itemHandleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_OUT_HANDLE);
+                imgService.saveImages(dto.getImages(), itemHandleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_OUT_HANDLE);
 
                 // 插入项目部门关联表
                 ItemDeptEntity itemDeptEntity = new ItemDeptEntity();
@@ -436,22 +438,23 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         itemEntity.setItemState(EventIssueItemState.ITEM_HANDLING);
         itemEntity.setTopicId(issueEntity.getTopicId());
         itemEntity.setLastHandleTime(new Date());
-        itemEntity.setItemCode("PT"+System.currentTimeMillis());
+        itemEntity.setItemCode("PT" + System.currentTimeMillis());
         return itemEntity;
     }
 
     /**
-     *议题数据统计
+     * 议题数据统计
+     *
      * @param formDto
      * @return
      */
     @Override
     public Result<IssueStateStatisticsResultDTO> stateStatistics(IssueStateStatisticsFormDTO formDto) {
         List<Long> list;
-        if (formDto.getDeptId() > 0){
+        if (formDto.getDeptId() > 0) {
             list = new ArrayList<>();
             list.add(formDto.getDeptId());
-        }else {
+        } else {
             list = SecurityUser.getUser().getDeptIdList();
         }
         IssueStateStatisticsResultDTO issueDto = baseDao.selectCountOfIssueState(list);
@@ -462,7 +465,8 @@ 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
      */
@@ -483,10 +488,10 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
         formDto.setPageIndex(pageIndex);
         List<Long> list;
-        if (formDto.getDeptId() > 0){
+        if (formDto.getDeptId() > 0) {
             list = new ArrayList<>();
             list.add(formDto.getDeptId());
-        }else {
+        } else {
             list = SecurityUser.getUser().getDeptIdList();
         }
         formDto.setDeptIdList(list);
@@ -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;
     }
 
     /**
@@ -516,7 +525,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
      * @Author: zy
      * @Date: 2020-01-08
      */
-    private void issueSmsNotification(String userMobiles){
+    private void issueSmsNotification(String userMobiles) {
         List<String> list = new ArrayList<>();
         list.add(userMobiles);
         // 议题转项目 操作发送短信
@@ -543,17 +552,16 @@ 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
      */
     private List<IssueEntity> handleOrganizationInfo(OrganizationModifyDTO dto, List<IssueDTO> issueList) {
         List<IssueEntity> entities = new ArrayList<>();
-        for (IssueDTO issue: issueList) {
+        for (IssueDTO issue : issueList) {
             IssueEntity entity = new IssueEntity();
             if (StringUtils.isNotEmpty(issue.getParentDeptIds()) && StringUtils.isNotEmpty(issue.getParentDeptNames())) {
                 List<String> parentDeptIds = Arrays.asList(issue.getParentDeptIds().split(","));
@@ -604,17 +612,16 @@ 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
      */
     private List<IssueEntity> handleCategoryInfo(CategoryModifyDTO dto, List<IssueDTO> issueList) {
         List<IssueEntity> entities = new ArrayList<>();
-        for (IssueDTO issue: issueList) {
+        for (IssueDTO issue : issueList) {
             if (StringUtils.isNotEmpty(issue.getCategoryFullName())) {
                 List<String> categoryFullName = Arrays.asList(issue.getCategoryFullName().split("-"));
                 int index = categoryFullName.indexOf(dto.getOldCategoryName());