Merge remote-tracking branch 'origin/dev_tmdata' into dev_tmdata

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java

@@ -15,7 +15,6 @@ import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Pattern;
 
 /**
  * desc:脱敏处理器
@@ -173,7 +172,7 @@ public class MaskProcessor {
      * @param originString
      * @return
      */
-    private String maskIdCard(String originString) {
+    public static String maskIdCard(String originString) {
 
         IdCardRegexUtils regexUtil = IdCardRegexUtils.parse(originString);
         if (regexUtil == null) {
@@ -221,7 +220,9 @@ public class MaskProcessor {
     public static void main(String[] args) {
         String[] idc = {"idCard"};
         String[] idct = {MaskResponse.MASK_TYPE_ID_CARD};
-        String r = new MaskProcessor(idc, idct).maskString("333333333333333333", MaskResponse.MASK_TYPE_ID_CARD);
+        String r = new MaskProcessor(idc, idct).maskString("王五(372284152412022222)", MaskResponse.MASK_TYPE_ID_CARD);
         System.out.println(r);
+        String s = MaskProcessor.maskIdCard("372284152412022222");
+        System.out.println(s);
     }
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java

@@ -9,6 +9,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.processor.MaskProcessor;
 import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
@@ -670,7 +671,7 @@ public class CoverageServiceImpl implements CoverageService {
 
                 return new CoverageAnalisisDataListResultDTO(
                         re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType,
-                        re.getName().concat(StrConstant.BRACKET_LEFT).concat(re.getIdCard()).concat(StrConstant.BRACKET_RIGNT),
+                        re.getName().concat(StrConstant.BRACKET_LEFT).concat(MaskProcessor.maskIdCard(re.getIdCard())).concat(StrConstant.BRACKET_RIGNT),
                         coordinates[1], coordinates[0]);
 
             }).collect(Collectors.toList());
@@ -684,7 +685,7 @@ public class CoverageServiceImpl implements CoverageService {
 
                 return new CoverageAnalisisDataListResultDTO(
                         re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType,
-                        re.getName().concat(StrConstant.BRACKET_LEFT).concat(re.getIdNum()).concat(StrConstant.BRACKET_RIGNT),
+                        re.getName().concat(StrConstant.BRACKET_LEFT).concat(MaskProcessor.maskIdCard(re.getIdNum())).concat(StrConstant.BRACKET_RIGNT),
                         coordinates[1], coordinates[0]);
 
             }).collect(Collectors.toList());