修改优化20200326

src/main/java/cn/quantgroup/report/job/RoutineWorkTask.java

@@ -118,13 +118,13 @@ public class RoutineWorkTask {
                                 //Thread.sleep(500);
                                 dingTalk.talk_ToUser("下载"+newDatenyr+"（ZXLM助贷）百行反馈主日志文件不存在", "下载反馈主日志文件不存在，请注意确认或和百行联系！");
                             }else{
-                                dingTalk.talk("Info", "下载&处理" + newDatenyr + "（ZXLM助贷）百行反馈日志结束", success);
+                                dingTalk.talk("Info", "下载&处理" + newDatenyr + "（ZXLM助贷）百行反馈日志结束——[OK]", success);
                             }
 
                             log.info("下载（众信利民助贷）百行反馈日志结束<<<<<<<<, newDatenyr: {}, 耗时: {} ", newDatenyr, stopwatch.stop().elapsed(TimeUnit.MILLISECONDS));
                             return;
                         } else {
-                            dingTalk.talk("Info", "下载&处理" + newDatenyr + "（ZXLM助贷）百行反馈日志结束", success + "——10分钟后将会自动重新报送，若有问题请及时停止！");
+                            dingTalk.talk("Info", "下载&处理" + newDatenyr + "（ZXLM助贷）百行反馈日志结束", success + "——[10分钟后将会自动重新报送，若有问题请及时停止！]");
 
                             String json_sq_A1 = resultMap.get("json_sq_A1");
                             if (StringUtils.isNotEmpty(json_sq_A1) && "true".equals(json_sq_A1)) {

src/main/java/cn/quantgroup/report/service/manualTool/ManualToolService.java

@@ -413,29 +413,30 @@ public class ManualToolService implements CommonSuperService {
                 } else {
                     log.info("RepaymentLoanInfoDbMapper.getReqIdByRemoteLog redult isEmpty.");
                     resultMap.put("success","百行征信手动报送,获取日志为空");
+                    resultMap.put("isEmpty","isEmpty");
 
-                    ArrayList<String> fileNameList = new ArrayList<>();
-                    String logPath = base_path + "/" +p5;
+                    boolean have_logFile = false;
                     try{
+                        ArrayList<String> fileNameList = new ArrayList<>();
+                        String logPath = base_path + "/" +p5;
                         getAllFileName(logPath, fileNameList);
-                    }catch (Exception e){
-                        log.error("获取报送日志文件夹下文件异常, path: {} ", e);
-                    }
 
-                    boolean have_logFile = false;
-                    if(fileNameList!=null && fileNameList.size()>0){
-                        for (String name : fileNameList) {
-                            log.info("目录: {} 下的文件包括: {}", logPath, name);
-                            if(StringUtils.isNotEmpty(name) && name.endsWith(".log")
-                                    && !name.endsWith("_logicerror.log") && !name.endsWith("_inputerror.log")){
-                                have_logFile = true;
+                        if(fileNameList!=null && fileNameList.size()>0){
+                            for (String name : fileNameList) {
+                                log.info("目录: {} 下的文件包括: {}", logPath, name);
+                                if(StringUtils.isNotEmpty(name) && name.endsWith(".log")
+                                        && !name.endsWith("_logicerror.log") && !name.endsWith("_inputerror.log")){
+                                    have_logFile = true;
+                                }
                             }
                         }
+                    }catch (Exception e){
+                        log.error("获取报送日志文件夹下文件异常, path: {} ", e);
                     }
+
                     if(!have_logFile){
                         resultMap.put("alarm","反馈日志主文件不存在,请注意确认");
                     }
-                    resultMap.put("isEmpty","isEmpty");
 
                     return resultMap;
                 }
@@ -3525,6 +3526,49 @@ public class ManualToolService implements CommonSuperService {
 
 
 
+    private static void bairong_ziduab_build() {
+        try{
+            List<String> strList_1 = ReadOrWriteTxt.readTxtList("C:\\Users\\Administrator\\Desktop\\百融\\客制化数据-my.txt");
+            HashMap<String,String> map_1= new HashMap<>();
+            int index=0;
+            for(String str : strList_1){
+                map_1.put("\""+str.trim()+"\"",  str.trim());
+            }
+            log.info("读取文件files strList_1 size:{} , map siez:{} ", strList_1.size(), map_1.size());
+
+
+            List<String> strList_2 = ReadOrWriteTxt.readTxtList("C:\\Users\\Administrator\\Desktop\\百融\\返回字段.txt");
+            log.info("读取文件files strList_2 size="+strList_2.size());
+
+            for(int i=0; i<strList_2.size(); i++){
+                String[] arry = strList_2.get(i).trim().split("[:]");
+                /*if(jsonStr.length()<30){
+                    continue;
+                }*/
+                //log.info("ST:"+i);
+                //JSONObject jsonObject = JSONObject.parseObject(jsonStr);
+
+                if(map_1.containsKey(arry[0])){
+                    System.out.println("--"+strList_2.get(i));
+                    map_1.remove(arry[0]);
+                }else{
+                    System.out.println(strList_2.get(i));
+                }
+            }
+            log.info("d3_build_manua() All D3还款 LOG:保存记录结束");
+
+
+            if(map_1.size()>0){
+                for(String key : map_1.keySet()){
+                    System.err.println(key);
+                }
+            }
+        }catch (Exception e){
+            log.error("d3_build_manua()处理还款记录异常！", e);
+        }
+    }
+
+
 
     public static void main(String[] args) {
 
@@ -3540,7 +3584,10 @@ public class ManualToolService implements CommonSuperService {
 
        // buildSelectSql_hmd();
 
-        buildSelectInsert_hmd();
+       // buildSelectInsert_hmd();
+
+        bairong_ziduab_build();
+
     }