结果校验

src/main/java/cn/quantgroup/report/service/baihang/BaiHangFileReportService.java

@@ -875,40 +875,48 @@ public class BaiHangFileReportService {
     }
 
     @Async
-    public void singleFileDataCheck(String type,String singleFileName,String fieldNames) throws Exception{
+    public void singleFileDataCheck(String type,String singleFileName,String checkFieldNames) throws Exception{
         log.info("{}文件数据校验开始...",singleFileName);
         List<String> checkResult = new ArrayList();
-        File subFile = null;
+        Boolean noError = null;
         StringBuffer sBuffer = null;
-        List<String> fileNameList = Arrays.asList(singleFileName);
-        for (String fileName : fileNameList) {
-            subFile = new File(HOST_PATH + fileName.replace("-R.cry",".txt"));
-            List<String> dataList = FileUtils.readLines(subFile, "utf-8");
-            List<String> fieldNameList = Arrays.asList(fieldNames.split(","));
-            for (String dataInfo : dataList) {
-                Boolean noError = Boolean.TRUE;
-                sBuffer = new StringBuffer(fileName).append(",");
-                if ("A1".equalsIgnoreCase(type) || "A1Refuse".equalsIgnoreCase(type)) {
-                    ApplyLoanInfoZhuDai applyLoanInfoZhuDai = JSONObject.parseObject(dataInfo, ApplyLoanInfoZhuDai.class);
-                    log.info("数据 {} 正在校验...",applyLoanInfoZhuDai.getApplyId());
-                    sBuffer.append(applyLoanInfoZhuDai.getApplyId()).append(",");
-                    for (String fieldName : fieldNameList) {
-                        Field declaredField = ApplyLoanInfoZhuDai.class.getDeclaredField(fieldName);
-                        Object property = BeanUtil.getProperty(applyLoanInfoZhuDai, fieldName);
-                        if (Objects.isNull(property) || Objects.isNull(declaredField)) {
-                            noError = Boolean.FALSE;
-                            sBuffer.append(fieldName).append(",");
+        String dataStr = null;
+        BufferedReader bis = null;
+        try {
+            List<String> checkFieldNameList = Arrays.asList(checkFieldNames.split(","));
+            bis = new BufferedReader(new FileReader(HOST_PATH + singleFileName.replace("-R.cry",".txt")));
+            while(null != (dataStr = bis.readLine())) {
+                if (StringUtils.isBlank(dataStr) || StringUtils.equals(dataStr,"#applyInfo") || StringUtils.equals(dataStr,"#singleLoanAccountInfo") || StringUtils.equals(dataStr,"#singleLoanRepayInfo")) {
+
+                } else {
+                    sBuffer = new StringBuffer(singleFileName).append(",");
+                    noError = Boolean.TRUE;
+                    if ("A1".equalsIgnoreCase(type) || "A1Refuse".equalsIgnoreCase(type)) {
+                        ApplyLoanInfoZhuDai applyLoanInfoZhuDai = JSONUtil.toBean(dataStr, ApplyLoanInfoZhuDai.class);
+                        log.info("数据 {} 正在校验...",applyLoanInfoZhuDai.getApplyId());
+                        sBuffer.append(applyLoanInfoZhuDai.getApplyId()).append(",");
+                        for (String checkFieldName : checkFieldNameList) {
+                            Field declaredField = ApplyLoanInfoZhuDai.class.getDeclaredField(checkFieldName);
+                            Object property = BeanUtil.getProperty(applyLoanInfoZhuDai, checkFieldName);
+                            if (Objects.isNull(property) || Objects.isNull(declaredField) || StringUtils.isBlank(property.toString())) {
+                                noError = Boolean.FALSE;
+                                sBuffer.append(checkFieldName).append(",");
+                            }
                         }
                     }
-                }
-                if (!noError) {
-                    checkResult.add(sBuffer.append(System.getProperty("line.separator")).toString());
+                    if (!noError) {
+                        checkResult.add(sBuffer.append(System.getProperty("line.separator")).toString());
+                    }
                 }
             }
-        }
-        if (!CollectionUtils.isEmpty(checkResult)) {
-            File file = new File(HOST_PATH + type + "_fileDataCheck_" + DateUtils.formatDate(new Date(),"yyyyMMddHHmmsss") + ".txt");
-            FileUtils.writeLines(file,checkResult,Boolean.TRUE);
+            if (!CollectionUtils.isEmpty(checkResult)) {
+                File file = new File(HOST_PATH + type + "_fileDataCheck_" + DateUtils.formatDate(new Date(),"yyyyMMddHHmmsss") + ".txt");
+                FileUtils.writeLines(file,checkResult,Boolean.TRUE);
+            }
+        } catch (Exception e) {
+            log.error("{}文件数据校验异常",singleFileName,e);
+        } finally {
+            IoUtil.close(bis);
         }
         log.info("{}文件数据校验结束",singleFileName);
     }