优化一键生成的时间

src/main/java/ieven/server/webapp/service/alipay/ALIPAY_GENERATED_TRADE.java

@@ -89,7 +89,7 @@ public class ALIPAY_GENERATED_TRADE extends Ops implements Runnable {
                     }
 
                 }
-                String zfbNameds = Ops.getString(originDoc, origin, AlipayHeaders.ACCOUNT_3);
+                /*String zfbNameds = Ops.getString(originDoc, origin, AlipayHeaders.ACCOUNT_3);
                 if (StringUtils.isBlank(zfbNameds)) {
                     //去用户注册中进行数据补全
                     String dateFileId2 = getFileId(AlipayHeaders.getGeneratedName(2), modelId, mongoTemplate);
@@ -106,7 +106,7 @@ public class ALIPAY_GENERATED_TRADE extends Ops implements Runnable {
                         Ops.setString(newDoc, AlipayHeaders.ACCOUNT_4, output, String.valueOf(dataMaps.get(0).get("对手支付宝户名")));
                     }
 
-                }
+                }*/
                 needToSave.add(newDoc);
                 if (needToSave.size() >= 1000) {
                     saveLines(new ArrayList<>(needToSave), mongoTemplate);

src/main/java/ieven/server/webapp/service/alipay/AntiSecurityTrade3.java

@@ -4,6 +4,7 @@ import com.mongodb.client.MongoCursor;
 import ieven.server.webapp.domain.alipay.HeaderProperties;
 import ieven.server.webapp.domain.data.DataMap;
 import ieven.server.webapp.domain.file.FileService;
+import ieven.server.webapp.domain.tenpay.TenpayHeaders;
 import ieven.server.webapp.service.Ops;
 import ieven.server.webapp.util.DataUtils;
 import ieven.server.webapp.util.excel.PublicStatic;
@@ -11,6 +12,8 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.bson.Document;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -132,7 +135,8 @@ public class AntiSecurityTrade3 extends Ops implements Runnable {
                     dataMapUser.put(jyztzh, jyztzhhm);
                 }
 
-            } else if ("入账".equals(flag)) {
+            }
+            else if ("入账".equals(flag)) {
                 dataMap.put("交易主体账号", origin.getString("收款方的支付账号"));
                 dataMap.put("交易主体银行卡号", origin.getString("收款方银行卡所属银行卡号"));
                 dataMap.put("交易主体银行名称", origin.getString("收款方银行卡所属银行名称"));
@@ -150,6 +154,33 @@ public class AntiSecurityTrade3 extends Ops implements Runnable {
             }
             dataMap.put("交易时间", DataUtils.transferDateToStr(origin.getString("交易时间")));
 
+            if ("".equals(dataMap.get("交易主体户名"))) {
+                String account = (String) dataMap.getOrDefault("交易主体账号", "");
+                if (StringUtils.isBlank(account) || "-".equals(account)) {
+                } else {
+                    String newName = accountToName.getOrDefault(account, "");
+                    if (StringUtils.isNotBlank(newName)) {
+                        dataMap.put("交易主体户名", newName);
+                    }else{
+                        //财付通-注册信息
+                        //去用户注册中进行数据补全
+                        String dateFileId2 = getFileId(TenpayHeaders.getGeneratedName(3), modelId, mongoTemplate);
+                        List<DataMap> dataMaps = this.mongoTemplate.find((new Query(
+                                Criteria.where("modelId")
+                                        .is(modelId)
+                                        .and("fileId")
+                                        .is(dateFileId2)
+                                        .and("账号")
+                                        .is(account)
+                                        .and("generated")
+                                        .is(Boolean.TRUE))), DataMap.class);
+                        if(CollectionUtils.isNotEmpty(dataMaps)){
+                            dataMap.put("交易主体户名", dataMaps.get(0).get("注册姓名"));
+                        }
+                    }
+                }
+            }
+
             String jyzthm = String.valueOf(dataMap.get("交易主体户名"));
             if (StringUtils.isBlank(jyzthm) || "-".equals(jyzthm) || "null".equals(jyzthm)) {
                 String account = (String) dataMap.getOrDefault("交易主体账号", "");
@@ -159,7 +190,9 @@ public class AntiSecurityTrade3 extends Ops implements Runnable {
                     if (StringUtils.isNotBlank(newName)) {
                         dataMap.put("交易主体户名", PublicStatic.specialFormatStr(newName));
                     } else {
-                        dataMap.put("交易主体户名", PublicStatic.specialFormatStr(String.valueOf(dataMapUser.get(account))));
+                        if(StringUtils.isNotBlank(String.valueOf(dataMapUser.get(account)))&&!"null".equals(String.valueOf(dataMapUser.get(account)))){
+                            dataMap.put("交易主体户名", PublicStatic.specialFormatStr(String.valueOf(dataMapUser.get(account))));
+                        }
                     }
                 }
             } else {

src/main/java/ieven/server/webapp/service/datastatic/DataStaticAnalysisTotal.java

@@ -94,7 +94,7 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
                         namesSet.add(alipayUsername);
                     }
                     //组装用户基本信息
-                    getDataAll(needToSaveall, origin, alipayIdsAll, newFileIdAll, dataMapUser);
+                    getDataAll(needToSaveall, origin, alipayIdsAll, newFileIdAll, dataMapUser, idToData);
                     if (needToSaveall.size() >= 1000) {
                         List<DataMap> newDataList = new ArrayList<>();
                         for (DataMap map : needToSaveall) {
@@ -181,40 +181,44 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
         if ("财付通".equals(type)) {
             //账户状态", "账号", "注册姓名", "注册时间", "注册身份证号", "绑定手机", "绑定状态", "开户行信息", "银行账号"
             String dateFileId2 = getFileId(TenpayHeaders.getGeneratedName(3), modelId, mongoTemplate);
-            List<DataMap> dataMaps = this.mongoTemplate.find((new Query(
-                    Criteria.where("modelId")
-                            .is(modelId)
-                            .and("fileId")
-                            .is(dateFileId2)
-                            .and("账号")
-                            .is(account)
-                            .and("generated")
-                            .is(Boolean.TRUE))), DataMap.class);
-            if (CollectionUtils.isNotEmpty(dataMaps)) {
-                zjha = String.valueOf(dataMaps.get(0).get("注册身份证号"));
-                bdyhkh = String.valueOf(dataMaps.get(0).get("银行账号"));
-                khyhmc = String.valueOf(dataMaps.get(0).get("开户行信息"));
-                bdsjh = String.valueOf(dataMaps.get(0).get("绑定手机"));
-                zcsj = String.valueOf(dataMaps.get(0).get("注册时间"));
+            if (StringUtils.isNotBlank(dateFileId2)) {
+                List<DataMap> dataMaps = this.mongoTemplate.find((new Query(
+                        Criteria.where("modelId")
+                                .is(modelId)
+                                .and("fileId")
+                                .is(dateFileId2)
+                                .and("账号")
+                                .is(account)
+                                .and("generated")
+                                .is(Boolean.TRUE))), DataMap.class);
+                if (CollectionUtils.isNotEmpty(dataMaps)) {
+                    zjha = String.valueOf(dataMaps.get(0).get("注册身份证号"));
+                    bdyhkh = String.valueOf(dataMaps.get(0).get("银行账号"));
+                    khyhmc = String.valueOf(dataMaps.get(0).get("开户行信息"));
+                    bdsjh = String.valueOf(dataMaps.get(0).get("绑定手机"));
+                    zcsj = String.valueOf(dataMaps.get(0).get("注册时间"));
+                }
             }
         } else if ("五联单".equals(type)) {
 //       "用户ID", "登录邮箱", "登录手机", "账户名称", "证件类型", "证件号", "可用余额", "注册时间", "绑定手机", "绑定银行卡", "对应的协查数据"));
             String dateFileId2 = getFileId(AlipayHeaders.getGeneratedName(2), modelId, mongoTemplate);
-            List<DataMap> dataMaps = this.mongoTemplate.find((new Query(
-                    Criteria.where("modelId")
-                            .is(modelId)
-                            .and("fileId")
-                            .is(dateFileId2)
-                            .and("用户ID")
-                            .is(account)
-                            .and("generated")
-                            .is(Boolean.TRUE))), DataMap.class);
-            if (CollectionUtils.isNotEmpty(dataMaps)) {
-                zjha = String.valueOf(dataMaps.get(0).get("证件号"));
-                bdyhkh = String.valueOf(dataMaps.get(0).get("绑定银行卡"));
-                khyhmc = String.valueOf(dataMaps.get(0).get("账户名称"));
-                bdsjh = String.valueOf(dataMaps.get(0).get("登录手机"));
-                zcsj = String.valueOf(dataMaps.get(0).get("注册时间"));
+            if (StringUtils.isNotBlank(dateFileId2)) {
+                List<DataMap> dataMaps = this.mongoTemplate.find((new Query(
+                        Criteria.where("modelId")
+                                .is(modelId)
+                                .and("fileId")
+                                .is(dateFileId2)
+                                .and("用户ID")
+                                .is(account)
+                                .and("generated")
+                                .is(Boolean.TRUE))), DataMap.class);
+                if (CollectionUtils.isNotEmpty(dataMaps)) {
+                    zjha = String.valueOf(dataMaps.get(0).get("证件号"));
+                    bdyhkh = String.valueOf(dataMaps.get(0).get("绑定银行卡"));
+                    khyhmc = String.valueOf(dataMaps.get(0).get("账户名称"));
+                    bdsjh = String.valueOf(dataMaps.get(0).get("登录手机"));
+                    zcsj = String.valueOf(dataMaps.get(0).get("注册时间"));
+                }
             }
         }
         dataMap.put("证件号码", zjha);
@@ -224,7 +228,7 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
         dataMap.put("注册时间", zcsj);
     }
 
-    public void getDataAll(List<DataMap> needToSaveall, Document origin, Set<String> alipayIdsAll, String newFileIdAll, Map<String, Object> userMap) {
+    public void getDataAll(List<DataMap> needToSaveall, Document origin, Set<String> alipayIdsAll, String newFileIdAll, Map<String, Object> userMap, Map<String, DataMap> havedUser) {
         String type = origin.getString("类型");
         String account = String.valueOf(origin.getString("交易主体账号"));
         String accounthm = String.valueOf(origin.getString("交易主体户名"));
@@ -258,39 +262,49 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
             return;
         }
         if ("财付通".equals(type)) {
+            List<DataMap> dataMaps = new ArrayList<>();
             //账户状态", "账号", "注册姓名", "注册时间", "注册身份证号", "绑定手机", "绑定状态", "开户行信息", "银行账号"
-            String dateFileId2 = getFileId(TenpayHeaders.getGeneratedName(3), modelId, mongoTemplate);
-            List<DataMap> dataMaps = this.mongoTemplate.find((new Query(
-                    Criteria.where("modelId")
-                            .is(modelId)
-                            .and("fileId")
-                            .is(dateFileId2)
-                            .and("账号")
-                            .in(accountList)
-                            .and("generated")
-                            .is(Boolean.TRUE))), DataMap.class);
-            if (CollectionUtils.isNotEmpty(dataMaps)) {
-                for (DataMap dataMap : dataMaps) {
-                    if (!alipayIdsAll.contains(String.valueOf(dataMap.get("账号")))) {
-                        DataMap newDataMap = new DataMap();
-                        newDataMap.put("fileId", newFileIdAll);
-                        newDataMap.put("证件号", String.valueOf(dataMap.get("注册身份证号")));
-                        newDataMap.put("账户名称", String.valueOf(dataMap.get("注册姓名")));
-                        newDataMap.put("账号", String.valueOf(dataMap.get("账号")));
-                        needToSaveall.add(newDataMap);
-                        alipayIdsAll.add(String.valueOf(dataMap.get("账号")));
+            if (CollectionUtils.isNotEmpty(accountList)) {
+                for (String s : accountList) {
+                    DataMap dataMap = havedUser.get(s);
+                    if (dataMap != null) {
+                        dataMaps.add(dataMap);
+                    } else {
+                        String dateFileId2 = getFileId(TenpayHeaders.getGeneratedName(3), modelId, mongoTemplate);
+                        if (StringUtils.isNotBlank(dateFileId2)) {
+                            dataMaps = this.mongoTemplate.find((new Query(
+                                    Criteria.where("modelId")
+                                            .is(modelId)
+                                            .and("fileId")
+                                            .is(dateFileId2)
+                                            .and("账号")
+                                            .in(s))), DataMap.class);
+                        }
                     }
                 }
-            } else {
-                for (String s : accountList) {
-                    if (!alipayIdsAll.contains(s)) {
-                        DataMap newDataMap = new DataMap();
-                        newDataMap.put("fileId", newFileIdAll);
-                        newDataMap.put("证件号", "");
-                        newDataMap.put("账户名称", StringUtils.isBlank(String.valueOf(dataMaphm.get(s))) || "null".equals(String.valueOf(dataMaphm.get(s))) ? "" : String.valueOf(dataMaphm.get(s)));
-                        newDataMap.put("账号", s);
-                        needToSaveall.add(newDataMap);
-                        alipayIdsAll.add(s);
+                if (CollectionUtils.isNotEmpty(dataMaps)) {
+                    for (DataMap dataMap : dataMaps) {
+                        if (!alipayIdsAll.contains(String.valueOf(dataMap.get("账号")))) {
+                            DataMap newDataMap = new DataMap();
+                            newDataMap.put("fileId", newFileIdAll);
+                            newDataMap.put("证件号", String.valueOf(dataMap.get("注册身份证号")));
+                            newDataMap.put("账户名称", String.valueOf(dataMap.get("注册姓名")));
+                            newDataMap.put("账号", String.valueOf(dataMap.get("账号")));
+                            needToSaveall.add(newDataMap);
+                            alipayIdsAll.add(String.valueOf(dataMap.get("账号")));
+                        }
+                    }
+                } else {
+                    for (String s : accountList) {
+                        if (!alipayIdsAll.contains(s)) {
+                            DataMap newDataMap = new DataMap();
+                            newDataMap.put("fileId", newFileIdAll);
+                            newDataMap.put("证件号", "");
+                            newDataMap.put("账户名称", StringUtils.isBlank(String.valueOf(dataMaphm.get(s))) || "null".equals(String.valueOf(dataMaphm.get(s))) ? "" : String.valueOf(dataMaphm.get(s)));
+                            newDataMap.put("账号", s);
+                            needToSaveall.add(newDataMap);
+                            alipayIdsAll.add(s);
+                        }
                     }
                 }
             }
@@ -308,38 +322,49 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
             }
         } else if ("五联单".equals(type)) {
 //       "用户ID", "登录邮箱", "登录手机", "账户名称", "证件类型", "证件号", "可用余额", "注册时间", "绑定手机", "绑定银行卡", "对应的协查数据"));
-            String dateFileId2 = getFileId(AlipayHeaders.getGeneratedName(2), modelId, mongoTemplate);
-            List<DataMap> dataMaps = this.mongoTemplate.find((new Query(
-                    Criteria.where("modelId")
-                            .is(modelId)
-                            .and("fileId")
-                            .is(dateFileId2)
-                            .and("用户ID")
-                            .in(accountList)
-                            .and("generated")
-                            .is(Boolean.TRUE))), DataMap.class);
-            if (CollectionUtils.isNotEmpty(dataMaps)) {
-                for (DataMap dataMap : dataMaps) {
-                    if (!alipayIdsAll.contains(String.valueOf(dataMap.get("用户ID")))) {
-                        DataMap newDataMap = new DataMap();
-                        newDataMap.put("fileId", newFileIdAll);
-                        newDataMap.put("证件号", String.valueOf(dataMap.get("证件号")));
-                        newDataMap.put("账户名称", String.valueOf(dataMap.get("账户名称")));
-                        newDataMap.put("账号", String.valueOf(dataMap.get("用户ID")));
-                        needToSaveall.add(newDataMap);
-                        alipayIdsAll.add(String.valueOf(dataMap.get("用户ID")));
+            List<DataMap> dataMaps = new ArrayList<>();
+            //账户状态", "账号", "注册姓名", "注册时间", "注册身份证号", "绑定手机", "绑定状态", "开户行信息", "银行账号"
+            if (CollectionUtils.isNotEmpty(accountList)) {
+                for (String s : accountList) {
+                    DataMap dataMap = havedUser.get(s);
+                    if (dataMap != null) {
+                        dataMaps.add(dataMap);
+                    } else {
+                        String dateFileId2 = getFileId(AlipayHeaders.getGeneratedName(2), modelId, mongoTemplate);
+                        if (StringUtils.isNotBlank(dateFileId2)) {
+                            dataMaps = this.mongoTemplate.find((new Query(
+                                    Criteria.where("modelId")
+                                            .is(modelId)
+                                            .and("fileId")
+                                            .is(dateFileId2)
+                                            .and("用户ID")
+                                            .in(accountList))), DataMap.class);
+                        }
                     }
                 }
-            } else {
-                for (String s : accountList) {
-                    if (!alipayIdsAll.contains(s)) {
-                        DataMap newDataMap = new DataMap();
-                        newDataMap.put("fileId", newFileIdAll);
-                        newDataMap.put("证件号", "");
-                        newDataMap.put("账户名称", StringUtils.isBlank(String.valueOf(dataMaphm.get(s))) || "null".equals(String.valueOf(dataMaphm.get(s))) ? "" : String.valueOf(dataMaphm.get(s)));
-                        newDataMap.put("账号", s);
-                        needToSaveall.add(newDataMap);
-                        alipayIdsAll.add(s);
+                if (CollectionUtils.isNotEmpty(dataMaps)) {
+                    for (DataMap dataMap : dataMaps) {
+                        if (!alipayIdsAll.contains(String.valueOf(dataMap.get("用户ID")))) {
+                            DataMap newDataMap = new DataMap();
+                            newDataMap.put("fileId", newFileIdAll);
+                            newDataMap.put("证件号", String.valueOf(dataMap.get("证件号")));
+                            newDataMap.put("账户名称", String.valueOf(dataMap.get("账户名称")));
+                            newDataMap.put("账号", String.valueOf(dataMap.get("用户ID")));
+                            needToSaveall.add(newDataMap);
+                            alipayIdsAll.add(String.valueOf(dataMap.get("用户ID")));
+                        }
+                    }
+                } else {
+                    for (String s : accountList) {
+                        if (!alipayIdsAll.contains(s)) {
+                            DataMap newDataMap = new DataMap();
+                            newDataMap.put("fileId", newFileIdAll);
+                            newDataMap.put("证件号", "");
+                            newDataMap.put("账户名称", StringUtils.isBlank(String.valueOf(dataMaphm.get(s))) || "null".equals(String.valueOf(dataMaphm.get(s))) ? "" : String.valueOf(dataMaphm.get(s)));
+                            newDataMap.put("账号", s);
+                            needToSaveall.add(newDataMap);
+                            alipayIdsAll.add(s);
+                        }
                     }
                 }
             }

src/main/java/ieven/server/webapp/service/tenpay/TenpayTrades.java

@@ -149,7 +149,7 @@ public class TenpayTrades extends Ops implements Runnable {
                         String newName = accountToName.getOrDefault(account, "");
                         if (StringUtils.isNotBlank(newName)) {
                             dataMap.put("交易对手户名", newName);
-                        }else {
+                        }/*else {
                             //财付通-注册信息
                             //去用户注册中进行数据补全
                             String dateFileId2 = getFileId(TenpayHeaders.getGeneratedName(3), modelId, mongoTemplate);
@@ -165,7 +165,7 @@ public class TenpayTrades extends Ops implements Runnable {
                             if(CollectionUtils.isNotEmpty(dataMaps)){
                                 dataMap.put("交易主体户名", dataMaps.get(0).get("注册姓名"));
                             }
-                        }
+                        }*/
                     }
                 }
                 needToSave.add(dataMap);
@@ -224,6 +224,59 @@ public class TenpayTrades extends Ops implements Runnable {
                 dataMap.put("网银联单号2", "");
                 dataMap.put("交易主体第三方账号名", origin.getString("第三方账户名称"));
                 dataMap.put("对手第三方账号名", "");
+
+                if ("".equals(dataMap.get("交易主体户名"))) {
+                    String account = (String) dataMap.getOrDefault("交易主体账号", "");
+                    if (StringUtils.isBlank(account) || "-".equals(account)) {
+                    } else {
+                        String newName = accountToName.getOrDefault(account, "");
+                        if (StringUtils.isNotBlank(newName)) {
+                            dataMap.put("交易主体户名", newName);
+                        }else{
+                            //财付通-注册信息
+                            //去用户注册中进行数据补全
+                            String dateFileId2 = getFileId(TenpayHeaders.getGeneratedName(3), modelId, mongoTemplate);
+                            List<DataMap> dataMaps = this.mongoTemplate.find((new Query(
+                                    Criteria.where("modelId")
+                                            .is(modelId)
+                                            .and("fileId")
+                                            .is(dateFileId2)
+                                            .and("账号")
+                                            .is(account)
+                                            .and("generated")
+                                            .is(Boolean.TRUE))), DataMap.class);
+                            if(CollectionUtils.isNotEmpty(dataMaps)){
+                                dataMap.put("交易主体户名", dataMaps.get(0).get("注册姓名"));
+                            }
+                        }
+                    }
+                }
+                if ("".equals(dataMap.get("交易对手户名"))) {
+                    String account = (String) dataMap.getOrDefault("交易对手账号", "");
+                    if (StringUtils.isBlank(account) || "-".equals(account)) {
+                    } else {
+                        String newName = accountToName.getOrDefault(account, "");
+                        if (StringUtils.isNotBlank(newName)) {
+                            dataMap.put("交易对手户名", newName);
+                        }/*else {
+                            //财付通-注册信息
+                            //去用户注册中进行数据补全
+                            String dateFileId2 = getFileId(TenpayHeaders.getGeneratedName(3), modelId, mongoTemplate);
+                            List<DataMap> dataMaps = this.mongoTemplate.find((new Query(
+                                    Criteria.where("modelId")
+                                            .is(modelId)
+                                            .and("fileId")
+                                            .is(dateFileId2)
+                                            .and("账号")
+                                            .is(account)
+                                            .and("generated")
+                                            .is(Boolean.TRUE))), DataMap.class);
+                            if(CollectionUtils.isNotEmpty(dataMaps)){
+                                dataMap.put("交易主体户名", dataMaps.get(0).get("注册姓名"));
+                            }
+                        }*/
+                    }
+                }
                 needToSave.add(dataMap);
                 if (needToSave.size() >= 1000) {
                     saveLines(new ArrayList<>(needToSave), mongoTemplate);

src/main/java/ieven/server/webapp/util/excel/PublicStatic.java

@@ -319,7 +319,7 @@ public class PublicStatic {
     public static String specialFormatStr(String s) {
         // 全角转半角
         String result = "";
-        if (null != s && !"".equals(s)) {
+        if (StringUtils.isNotBlank(s)&&!"null".equals(s)) {
             result = s;
             result = result.replace("-", "－");
             result = result.replace("/", "／");