证件号码掩码处理后6位

dgtis-modules/dgtis-modules-data/src/main/java/com/dgtis/data/api/CustomerApiController.java

@@ -458,7 +458,7 @@ public class CustomerApiController {
             jsonObject = JSON.parseObject(result);
             JSONObject hitsobject = (JSONObject) jsonObject.get("hits");
             JSONArray array = JSON.parseArray(hitsobject.get("hits").toString());
-            DecimalFormat   df  = new DecimalFormat("######0.00");//保留两位小数
+            DecimalFormat  df  = new DecimalFormat("######0.0");//保留两位小数改为保留一位小数
             double prem = 0;//标准保费
             double sumprem = 0;//累计保费
             double handedinprem = 0;//已交保费
@@ -1013,19 +1013,43 @@ public class CustomerApiController {
                         customer.setAge(DateUtils.getAge(DateUtils.dateTime(DateUtils.YYYY_MM_DD,birthday)));
                     }
 
-                    String regex = "(\\w{4})(\\w+)(\\w{3})";
+                    //String regex = "(\\w{4})(\\w+)(\\w{0})";
                     if(mp.containsKey("idcard")){
                         customer.setIdType("身份证");
-                        customer.setIdCard("\t"+jsonOb.getString("idcard").replaceAll(regex, "$1****$3"));
+                        String idCard = jsonOb.getString("idcard");
+                        //customer.setIdCard("\t"+jsonOb.getString("idcard").replaceAll(regex, "$1****$3"));
+                        if(idCard.length()>6){
+                            customer.setIdCard("\t"+idCard.replaceAll(idCard.substring(idCard.length()-6), "******"));
+                        }else{
+                            customer.setIdCard("\t"+"******");
+                        }
                     }else if(mp.containsKey("passport")){
                         customer.setIdType("护照");
-                        customer.setIdCard("\t"+jsonOb.getString("passport").replaceAll(regex, "$1****$3"));
+                        String passport = jsonOb.getString("passport");
+                        //customer.setIdCard("\t"+jsonOb.getString("passport").replaceAll(regex, "$1****$3"));
+                        if(passport.length()>6){
+                            customer.setIdCard("\t"+passport.replaceAll(passport.substring(passport.length()-6), "******"));
+                        }else{
+                            customer.setIdCard("\t"+"******");
+                        }
                     }else if(mp.containsKey("dlicense")){
                         customer.setIdType("驾驶证");
-                        customer.setIdCard("\t"+jsonOb.getString("dlicense").replaceAll(regex, "$1****$3"));
+                        String dlicense = jsonOb.getString("dlicense");
+                        //customer.setIdCard("\t"+jsonOb.getString("dlicense").replaceAll(regex, "$1****$3"));
+                        if(dlicense.length()>6){
+                            customer.setIdCard("\t"+dlicense.replaceAll(dlicense.substring(dlicense.length()-6), "******"));
+                        }else{
+                            customer.setIdCard("\t"+"******");
+                        }
                     }else if(mp.containsKey("otheridnumber")){
                         customer.setIdType("其它证件类型");
-                        customer.setIdCard("\t"+jsonOb.getString("otheridnumber").replaceAll(regex, "$1****$3"));
+                        String otheridnumber = jsonOb.getString("otheridnumber");
+                        //customer.setIdCard("\t"+jsonOb.getString("otheridnumber").replaceAll(regex, "$1****$3"));
+                        if(otheridnumber.length()>6){
+                            customer.setIdCard("\t"+otheridnumber.replaceAll(otheridnumber.substring(otheridnumber.length()-6), "******"));
+                        }else{
+                            customer.setIdCard("\t"+"******");
+                        }
                     }
 
                     if(mp.containsKey("custclass")){