A1,D2格式校验错误修改。

src/main/java/cn/quantgroup/report/controller/external/ExZhuDaiBaiHangReSendController.java

@@ -2,6 +2,11 @@ package cn.quantgroup.report.controller.external;
 
 import cn.quantgroup.report.response.GlobalResponse;
 import cn.quantgroup.report.service.baihang.BaiHangZhuDaiService;
+import cn.quantgroup.report.utils.ReadOrWriteTxt;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,8 +14,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.io.File;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 百行征信报送出现错误的贷款记录信息重新报送
@@ -247,4 +255,40 @@ public class ExZhuDaiBaiHangReSendController {
         }
     }
 
+    @RequestMapping("/test/bulidD2")
+    public GlobalResponse bulidD2(String jsonFile){
+        try{
+            String sourceStr = FileUtils.readFileToString(new File(jsonFile), "utf-8");
+            JSONObject sourceJson = JSON.parseObject(sourceStr);
+            JSONArray recordsJsonArr = sourceJson.getJSONArray("RECORDS");
+
+            List<String> lineList = new ArrayList<>(recordsJsonArr.size());
+            for(int i=0; i<recordsJsonArr.size(); i++){
+                lineList.add(recordsJsonArr.get(i).toString());
+            }
+
+
+            baiHangZhuDaiService.sendHandLoaInfoReportToBaiHang(false,lineList);
+            return GlobalResponse.generate("百行征信助贷模式手动报送D2数据成功");
+        }catch(Exception e){
+            log.error("百行征信助贷模式报送放款异常", e);
+            return GlobalResponse.generate("百行征信助贷模式手动报送D2数据失败");
+        }
+    }
+
+
+    @RequestMapping("/test/bulidA1")
+    public GlobalResponse bulidA1(String jsonFile){
+        try{
+            List<String> lineList = ReadOrWriteTxt.readTxtList("D:\\用户目录\\Downloads\\A1_M.txt");
+            System.out.println("lineList:"+lineList.size());
+
+            baiHangZhuDaiService.build_A1(lineList);
+            return GlobalResponse.generate("百行征信助贷模式手动报送D2数据成功");
+        }catch(Exception e){
+            log.error("百行征信助贷模式报送放款异常", e);
+            return GlobalResponse.generate("百行征信助贷模式手动报送D2数据失败");
+        }
+    }
+
 }

src/main/java/cn/quantgroup/report/service/baihang/util/TuoMinUtils.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Expand;
 import org.apache.tools.ant.taskdefs.Zip;
@@ -14,6 +15,8 @@ import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.Random;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 
 public class TuoMinUtils {
@@ -72,6 +75,46 @@ public class TuoMinUtils {
     }
 
 
+    public static boolean checkEmail(String email) {
+        //电子邮件
+        if(StringUtils.isBlank(email)){
+            return false;
+        }
+        String regex =  "^([a-z0-9A-Z]+[-|\\.]?)+[a-z0-9A-Z]@([a-z0-9]+(-[a-z0-9]+)?\\.)+[a-z]{2,}$";
+        //"^([a-z0-9A-Z]+[-|\\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z]{2,}$"
+        //"^\\s*\\w+(?:\\.{0,1}[\\w-]+)*@[a-zA-Z0-9]+(?:[-.][a-zA-Z0-9]+)*\\.[a-zA-Z]+\\s*$"
+        //"^\\s*\\w+(?:\\.{0,1}[\\w-]+)*@[a-zA-Z0-9]+(?:[-.][a-zA-Z0-9]+)*\\.[a-zA-Z]+\\s*$"
+        boolean b1 =  Pattern.compile(regex).matcher(email).matches(); //email.matches(email);
+
+        String ends = "";
+        if(email.contains("@")){
+            ends = email.substring(email.lastIndexOf("@"), email.length());
+        }
+
+        boolean b2 = Pattern.compile("\\s+").matcher(ends).find();;
+
+        String regex2 =".*[A-Z]+.*"; //"[A-Z]*"
+        boolean b3 =  Pattern.compile(regex2).matcher(ends).matches();
+
+        return b1 && !b2 && !b3;
+    }
+
+    //判断Email合法性
+    public static boolean isEmail(String email) {
+        if (email == null)
+            return false;
+        String rule = "[\\w!#$%&'*+/=?^_`{|}~-]+(?:\\.[\\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\\w](?:[\\w-]*[\\w])?\\.)+[\\w](?:[\\w-]*[\\w])?";
+
+        Pattern pattern = Pattern.compile(rule);
+        Matcher matcher = pattern.matcher(email);
+        if (matcher.matches())
+            return true;
+        else
+            return false;
+    }
+
+
+
 
     public static void main(String[] args) {
         //System.out.println(random_name("郝彦辉"));
@@ -80,7 +123,7 @@ public class TuoMinUtils {
 
        // System.out.println(random_mobile("18010105506"));
 
-        String readAddr = "E:\\桌面_工作\\数据备份\\201911061315贷款申请关联用户.json";
+       /* String readAddr = "E:\\桌面_工作\\数据备份\\201911061315贷款申请关联用户.json";
         String writeAddr = "E:\\桌面_工作\\数据备份\\201911061315用户脱敏.txt";
         try {
             long log_stUtc = System.currentTimeMillis();
@@ -115,7 +158,22 @@ public class TuoMinUtils {
         } catch (IOException e) {
             e.printStackTrace();
         }
+*/
+
+       String email = "630226318@QQ.COM";
+        //String email = "294603191@qq.c0m";
+        //String email = "139@139.com13902502392";
+
+
+
+        //System.out.println(checkEmail(email));
+        //System.out.println(isEmail(email));
 
+        System.out.println(checkEmail("630226318@qq.com"));
+        System.out.println(checkEmail("630226318@QQ.C OM"));
+        System.out.println(checkEmail("630226318@QQ.COM"));
+        System.out.println(checkEmail("139@139.com13902502392"));
+        System.out.println(checkEmail("294603191@qq.c0m"));
     }
 
 }