From 9b17a26d57da4945fcca4a491e4be95090235ec8 Mon Sep 17 00:00:00 2001 From: gaoshuguang Date: Mon, 6 Jan 2025 14:25:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nm/gsgl/common/Constant.java | 4 +- .../config/MyEnvironmentPostProcessor.java | 10 +- .../service/impl/CreateDbServiceImpl.java | 36 +++++ .../nm/gsgl/service/impl/EctServiceImpl.java | 2 +- .../service/impl/ZipToSqbServiceImpl.java | 125 +++++++++--------- 5 files changed, 105 insertions(+), 72 deletions(-) diff --git a/ParamDownload/src/main/java/com/nm/gsgl/common/Constant.java b/ParamDownload/src/main/java/com/nm/gsgl/common/Constant.java index e4b76b9b..ecb752f0 100644 --- a/ParamDownload/src/main/java/com/nm/gsgl/common/Constant.java +++ b/ParamDownload/src/main/java/com/nm/gsgl/common/Constant.java @@ -64,7 +64,8 @@ public class Constant { /** * 通过动态库生成SQB文件 */ - public final static List DLL_SQB_LIST = Arrays.asList( "111", "801", "802", "808", "809", "919", "920", "3501", "3601"); + public final static List DLL_SQB_LIST = Arrays.asList( "111", "801", "802", "808", "809", "919", "920"); + public final static List MD_DLL_SQB_LIST = Arrays.asList( "3501", "3601"); /** * 通过动态库生成最小费额SQB文件 @@ -77,7 +78,6 @@ public class Constant { /** * 全量（不含绿通全量） */ - //public final static List TOTAL_QUANTITY = Arrays.asList("101", "103", "105", "107", "801", "3501"); public final static List TOTAL_QUANTITY = Arrays.asList("101", "103", "105", "107", "3501"); /** * 通过dll动态库生成DBF文件 diff --git a/ParamDownload/src/main/java/com/nm/gsgl/common/config/MyEnvironmentPostProcessor.java b/ParamDownload/src/main/java/com/nm/gsgl/common/config/MyEnvironmentPostProcessor.java index 2dc48d8f..5c79fed4 100644 --- a/ParamDownload/src/main/java/com/nm/gsgl/common/config/MyEnvironmentPostProcessor.java +++ b/ParamDownload/src/main/java/com/nm/gsgl/common/config/MyEnvironmentPostProcessor.java @@ -121,25 +121,25 @@ public static String driverClassName=""; System.out.println("主数据库驱动: " + properties.getProperty("spring.datasource.dynamic.datasource.master.driver-class-name")); System.out.println("主数据库连接地址: " + properties.getProperty("spring.datasource.dynamic.datasource.master.url")); System.out.println("主数据库用户名: " + properties.getProperty("spring.datasource.dynamic.datasource.master.username")); - System.out.println("主数据库密码: " + properties.getProperty("spring.datasource.dynamic.datasource.master.password")); + //System.out.println("主数据库密码: " + properties.getProperty("spring.datasource.dynamic.datasource.master.password")); System.out.println("从库mysql数据库驱动: " + properties.getProperty("spring.datasource.dynamic.datasource.mysql.driver-class-name")); System.out.println("从库mysql数据库连接地址: " + properties.getProperty("spring.datasource.dynamic.datasource.mysql.url")); System.out.println("从库mysql数据库用户名: " + properties.getProperty("spring.datasource.dynamic.datasource.mysql.username")); - System.out.println("从库mysql数据库密码: " + properties.getProperty("spring.datasource.dynamic.datasource.mysql.password")); + //System.out.println("从库mysql数据库密码: " + properties.getProperty("spring.datasource.dynamic.datasource.mysql.password")); System.out.println(" HRFtpIP : " + properties.getProperty("HRFtpIP")); System.out.println(" HRPort : " + properties.getProperty("HRPort")); System.out.println(" HRFtpUsername : " + properties.getProperty("HRFtpUsername")); - System.out.println(" HRPassword : " + properties.getProperty("HRPassword")); + //System.out.println(" HRPassword : " + properties.getProperty("HRPassword")); System.out.println(" HRConnectionStringOracle : " + properties.getProperty("HRConnectionStringOracle")); System.out.println(" HROracleName : " + properties.getProperty("HROracleName")); System.out.println(" HROraclePass : " + properties.getProperty("HROraclePass")); System.out.println(" MDFtpIP : " + properties.getProperty("MDFtpIP")); System.out.println(" MDPort : " + properties.getProperty("MDPort")); System.out.println(" MDFtpUsername : " + properties.getProperty("MDFtpUsername")); - System.out.println(" MDPassword : " + properties.getProperty("MDPassword")); + //System.out.println(" MDPassword : " + properties.getProperty("MDPassword")); System.out.println(" MDConnectionStringOracle : " + properties.getProperty("MDConnectionStringOracle")); System.out.println(" MDOracleName : " + properties.getProperty("MDOracleName")); - System.out.println(" MDOraclePass : " + properties.getProperty("MDOraclePass")); + //System.out.println(" MDOraclePass : " + properties.getProperty("MDOraclePass")); System.out.println("文件存储路径:" + properties.getProperty("NFSFilePath")); System.out.println(" 联网中心下载的zip文件备份存在时间（天） : " + Newproperties.getProperty("zipTime")); diff --git a/ParamDownload/src/main/java/com/nm/gsgl/service/impl/CreateDbServiceImpl.java b/ParamDownload/src/main/java/com/nm/gsgl/service/impl/CreateDbServiceImpl.java index c8b7f05c..c7e84a8c 100644 --- a/ParamDownload/src/main/java/com/nm/gsgl/service/impl/CreateDbServiceImpl.java +++ b/ParamDownload/src/main/java/com/nm/gsgl/service/impl/CreateDbServiceImpl.java @@ -579,6 +579,7 @@ public class CreateDbServiceImpl implements CreateDbService { } } } + clearList(lists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -625,6 +626,7 @@ public class CreateDbServiceImpl implements CreateDbService { } } + clearList(lists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -677,6 +679,7 @@ public class CreateDbServiceImpl implements CreateDbService { } } } + clearList(lists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -724,6 +727,7 @@ public class CreateDbServiceImpl implements CreateDbService { } } } + clearList(lists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -760,6 +764,7 @@ public class CreateDbServiceImpl implements CreateDbService { } } + clearList(lists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -795,6 +800,7 @@ public class CreateDbServiceImpl implements CreateDbService { count++; } } + clearList(lists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -843,6 +849,7 @@ public class CreateDbServiceImpl implements CreateDbService { } } } + clearList(lists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -894,6 +901,7 @@ public class CreateDbServiceImpl implements CreateDbService { } } } + clearList(mapLists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -942,6 +950,7 @@ public class CreateDbServiceImpl implements CreateDbService { } } } + clearList(lists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -1009,6 +1018,7 @@ public class CreateDbServiceImpl implements CreateDbService { count++; } } + clearList(mapLists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -1056,6 +1066,7 @@ public class CreateDbServiceImpl implements CreateDbService { } } } + clearList(lists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -1101,6 +1112,7 @@ public class CreateDbServiceImpl implements CreateDbService { } } } + clearList(lists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -1147,6 +1159,7 @@ public class CreateDbServiceImpl implements CreateDbService { } } } + clearList(lists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -1235,6 +1248,7 @@ public class CreateDbServiceImpl implements CreateDbService { count++; } } + clearList(lists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -1280,6 +1294,7 @@ public class CreateDbServiceImpl implements CreateDbService { } } } + clearList(lists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -1325,6 +1340,7 @@ public class CreateDbServiceImpl implements CreateDbService { } } } + clearList(lists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -1378,6 +1394,7 @@ public class CreateDbServiceImpl implements CreateDbService { } } } + clearList(lists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -1421,6 +1438,7 @@ public class CreateDbServiceImpl implements CreateDbService { } } } + clearList(lists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -1480,6 +1498,7 @@ public class CreateDbServiceImpl implements CreateDbService { } } } + clearList(lists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -1537,6 +1556,7 @@ public class CreateDbServiceImpl implements CreateDbService { } } } + clearList(lists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -1579,6 +1599,7 @@ public class CreateDbServiceImpl implements CreateDbService { } } } + clearList(mapLists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -1637,6 +1658,7 @@ public class CreateDbServiceImpl implements CreateDbService { } } } + clearList(mapLists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -1721,6 +1743,7 @@ public class CreateDbServiceImpl implements CreateDbService { } } } + clearList(mapLists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_244InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -1791,6 +1814,7 @@ public class CreateDbServiceImpl implements CreateDbService { } } } + clearList(mapLists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -1860,6 +1884,7 @@ public class CreateDbServiceImpl implements CreateDbService { } } } + clearList(mapLists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_242InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -1942,6 +1967,7 @@ public class CreateDbServiceImpl implements CreateDbService { LogUtil.WriteLog_241InsertDB("[uuid:" + uuid + "]-最后插入数据库条数" + ct + ",耗时毫秒=" + (endInsert - startInsert) + ",累计插入条数：" + count, "CreateDbServiceImpl"); } } + clearList(mapLists); //插入统计表记录 int statisticsCount = insertStatistics(protocolType, fileName, recordCount, createTime, jsonCount, dbTableName, count, repeatCount); LogUtil.WriteLog_241InsertDB("[uuid:" + uuid + "]-protocolType为" + protocolType + ",basicFilename为" + fileName + ",插入部中心统计入库表INVENTORY_STATISTICS_JAVA条数为" + statisticsCount, "CreateDbServiceImpl"); @@ -1949,6 +1975,16 @@ public class CreateDbServiceImpl implements CreateDbService { return count; } + + private void clearList(List mapLists){ + // 清空集合中的所有元素 + if (mapLists != null) { + mapLists.clear(); + } + // 将集合对象设置为null，以便垃圾收集器可以回收它 + mapLists = null; + } + /** * 插入统计表记录 */ diff --git a/ParamDownload/src/main/java/com/nm/gsgl/service/impl/EctServiceImpl.java b/ParamDownload/src/main/java/com/nm/gsgl/service/impl/EctServiceImpl.java index 1175d60f..82b833d5 100644 --- a/ParamDownload/src/main/java/com/nm/gsgl/service/impl/EctServiceImpl.java +++ b/ParamDownload/src/main/java/com/nm/gsgl/service/impl/EctServiceImpl.java @@ -123,7 +123,7 @@ public class EctServiceImpl implements EctService { for (BusinessTasks businessTask : businessTasks) { String protocolType = businessTask.getProtocolType(); //调用动态库生成sqb文件 - if (Constant.DLL_SQB_LIST.contains(protocolType)) { + if (Constant.MD_DLL_SQB_LIST.contains(protocolType)) { zipToSqbService.createMDSqbByDll(uuid, businessTask); } } diff --git a/ParamDownload/src/main/java/com/nm/gsgl/service/impl/ZipToSqbServiceImpl.java b/ParamDownload/src/main/java/com/nm/gsgl/service/impl/ZipToSqbServiceImpl.java index f5747156..3ed6bdd0 100644 --- a/ParamDownload/src/main/java/com/nm/gsgl/service/impl/ZipToSqbServiceImpl.java +++ b/ParamDownload/src/main/java/com/nm/gsgl/service/impl/ZipToSqbServiceImpl.java @@ -119,7 +119,7 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { //压缩文件存放-会被删除 if (!FileUtil.fileExists(localPath + fileName)) { - LogUtil.WriteLog_Error("[uuid:" + uuid + "]-下载的zip文件不存在" + localPath + fileName, "ZipToSqbServiceImpl"); + LogUtil.WriteLog_Error("[uuid:" + uuid + "]-下载的zip文件不存在" + localPath + fileName, "ZipToSqbServiceImpl-createSqbByDll"); } else { //调用动态库生成DBF文件 try { @@ -192,7 +192,7 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { bfSqbName = "SQB_EMERCARINC"; break; default: - LogUtil.WriteLog_Error("[uuid:" + uuid + "]-未找到相应的参数处理方法", "ZipToSqbServiceImpl"); + LogUtil.WriteLog_Error("[uuid:" + uuid + "]-未找到相应的参数处理方法", "ZipToSqbServiceImpl-createSqbByDll"); } FileUtil.fileCreat(sqbPath + dbfDir); Date date = new Date(); @@ -215,7 +215,7 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { FileUtil.fileCreat(insertDbPath); FileUtil.copyFile(localPath + fileName, insertDbPath + fileName); } - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-调用动态库生成全量SQB文件中,协议类型为" + protocolType + "zip文件名为" + fileName, "ZipToSqbServiceImpl"); + LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-调用动态库生成全量SQB文件中,协议类型为" + protocolType + "zip文件名为" + fileName, "ZipToSqbServiceImpl-createSqbByDll"); countSqb = CMinFeeCreator.INSTANCE.MakeBlackAllSQB(etcType, version, format, (localPath + fileName).replace("\\", "/"), sqbPathName.replace("\\", "/"), @@ -225,7 +225,7 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { } else { - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-调用动态库生成增量SQB文件中,协议类型为" + protocolType + "zip文件名为" + fileName, "ZipToSqbServiceImpl"); + LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-调用动态库生成增量SQB文件中,协议类型为" + protocolType + "zip文件名为" + fileName, "ZipToSqbServiceImpl-createSqbByDll"); //每天生成一个备份zip文件夹存放增量下载的zip文件 dayBackPath = NFSFilePath + PathUtil.downFileBackup + dbfDir + File.separator + dateTime + File.separator; FileUtil.fileCreat(dayBackPath); @@ -240,7 +240,7 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { NewFileInfo newFileInfo = newFileInfoMapper.selectById(protocolType); if (newFileInfo != null) { Date updateTime = newFileInfo.getUpdateTime(); - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-根据主键protocolType=" + protocolType + "查询DIS_NEWFILEINFO_JAVA表中上次的生成时间为" + updateTime, "ZipToSqbServiceImpl"); + LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-根据主键protocolType=" + protocolType + "查询DIS_NEWFILEINFO_JAVA表中上次的生成时间为" + updateTime, "ZipToSqbServiceImpl-createSqbByDll"); int hours = DateTimeUtil.getHour(date); if (updateTime != null) { if (hours != DateTimeUtil.getHour(updateTime)) { @@ -258,7 +258,7 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { //如果是增量先查询上一版本的版本号 if (Constant.ONE_HOUR_ISSUED.contains(protocolType)) { version = getVersion(protocolType, date); - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-最终增量本次版本号为" + version, "ZipToSqbServiceImpl"); + LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-最终增量本次版本号为" + version, "ZipToSqbServiceImpl-createSqbByDll"); } //增量目录名称 StringBuilder incDirLst = new StringBuilder(); @@ -274,7 +274,7 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { zlibSqbName = bfSqbName + Constant.STR_ + formateString + Constant.STR_ + version + Constant.STR_ZLIB; sqbZlibPathName = sqbPath + dbfDir + File.separator + zlibSqbName; - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-调用动态库生成增量SQB文件中,协议类型为" + protocolType + "zip文件名为" + fileName, "ZipToSqbServiceImpl"); + LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-调用动态库生成增量SQB文件中,协议类型为" + protocolType + "zip文件名为" + fileName, "ZipToSqbServiceImpl-createSqbByDll"); //获取最新的全量sqb文件全路径 //全量文件 @@ -295,54 +295,53 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { //获取当前时间加载增量时间之前的全量文件名 Date tenDaysAgo = DateTimeUtil.addDateDays(new Date(), -(Integer.parseInt(incDays))); String tenDaysVersion = DateTimeUtil.getFormateString(tenDaysAgo, Constant.YYMMDD) + "103"; - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-获取" + incDays + "天前全量SQB,修改时间为" + tenDaysAgo, "ZipToSqbServiceImpl"); if (fileInfos2.size() > 0) { - //LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-获取全量SQB为" + fileInfos2, "ZipToSqbServiceImpl"); //对文件的最后修改时间进行排序 fileInfos2.sort(Comparator.comparing(FileInfo::getLastModified).reversed()); for (FileInfo fileInfo2 : fileInfos2) { if (DateUtils.isSameDay(tenDaysAgo, fileInfo2.getLastModified()) || fileInfo2.getFileName().contains(tenDaysVersion)) { pblackAllFileName = fileInfo2.getFileName(); + break; } } if (StringUtils.isBlank(pblackAllFileName)) { pblackAllFileName = fileInfos2.get(0).getFileName(); } } else { - LogUtil.WriteLog_Error("[uuid:" + uuid + "]-获取" + incDays + "天前全量SQB文件失败", "ZipToSqbServiceImpl"); + LogUtil.WriteLog_Error("[uuid:" + uuid + "]-获取" + incDays + "天前全量SQB文件失败", "ZipToSqbServiceImpl-createSqbByDll"); //更新sqlite任务表的任务状态为2-报错 DatabaseUtil.insertSqlite(sqliteDriverName, sqliteUrl, Constant.ERROR_UPDATE_BUSINESS_HANDLER + businessTask.getId()); } - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-获取" + incDays + "天前全量SQB名称" + pblackAllFileName, "ZipToSqbServiceImpl"); + LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-获取" + incDays + "天前全量SQB名称" + pblackAllFileName, "ZipToSqbServiceImpl-createSqbByDll"); } //如果没有最新的全量SQB文件时，不生成增量文件 if (StringUtils.isNotBlank(pblackAllFileName)) { - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-调用动态库生成增量入参,全量SQB文件全路径" + (sqbQlFileDir + File.separator + pblackAllFileName).replace("\\", "/"), "ZipToSqbServiceImpl"); - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-调用动态库生成增量入参,生成SQB文件全路径" + sqbPathName.replace("\\", "/"), "ZipToSqbServiceImpl"); - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-调用动态库生成增量入参,生成SQBzlib文件全路径" + sqbZlibPathName.replace("\\", "/"), "ZipToSqbServiceImpl"); + LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-调用动态库生成增量入参,全量SQB文件全路径" + (sqbQlFileDir + File.separator + pblackAllFileName).replace("\\", "/"), "ZipToSqbServiceImpl-createSqbByDll"); + LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-调用动态库生成增量入参,生成SQB文件全路径" + sqbPathName.replace("\\", "/"), "ZipToSqbServiceImpl-createSqbByDll"); + LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-调用动态库生成增量入参,生成SQBzlib文件全路径" + sqbZlibPathName.replace("\\", "/"), "ZipToSqbServiceImpl-createSqbByDll"); countSqb = CMinFeeCreator.INSTANCE.MakeBlackIncSQB(etcType, version, format, incDirLst.toString(), (sqbQlFileDir + File.separator + pblackAllFileName).replace("\\", "/"), sqbPathName.replace("\\", "/"), sqbZlibPathName.replace("\\", "/"), bytMd5); - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-]调用动态库生成增量SQB文件完成,返回值为" + countSqb, "ZipToSqbServiceImpl"); + LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-]调用动态库生成增量SQB文件完成,返回值为" + countSqb, "ZipToSqbServiceImpl-createSqbByDll"); } } else { - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-该时间点" + protocolType + "已下发/或者该点不下发", "ZipToSqbServiceImpl"); + LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-该时间点" + protocolType + "已下发/或者该点不下发", "ZipToSqbServiceImpl-createSqbByDll"); //更新sqlite任务表的任务状态为3-不下发 DatabaseUtil.insertSqlite(sqliteDriverName, sqliteUrl, Constant.NOT_DIS_UPDATE_BUSINESS_HANDLER + DateTimeUtil.getFormateString(new Date(), Constant.YYYY_MM_DD_HH_MM_SS) + Constant.WHERE_ID + businessTask.getId()); - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-更新business_tasks_info任务表的下发状态为3-不下发，id为" + businessTask.getId(), "ZipToSqbServiceImpl"); + LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-更新business_tasks_info任务表的下发状态为3-不下发，id为" + businessTask.getId(), "ZipToSqbServiceImpl-createSqbByDll"); } } - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-调用动态库生成SQB返回值count为" + countSqb, "ZipToSqbServiceImpl"); + LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-调用动态库生成SQB返回值count为" + countSqb, "ZipToSqbServiceImpl-createSqbByDll"); if (countSqb != 0) { if (countSqb > 0) { String formateStr = DateTimeUtil.getFormateString(date, Constant.YYYYMMDDHHMMSS); - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-]开始生成SQB备份文件", "ZipToSqbServiceImpl"); + LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-]开始生成SQB备份文件", "ZipToSqbServiceImpl-createSqbByDll"); //sqb备份目录 FileUtil.fileCreat(NFSFilePath + PathUtil.sqbBackPath + dbfDir); @@ -352,7 +351,7 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { //获取生成SQB的zlib的文件名 String zlibFileNameMd5Sqb = FileUtil.zlibFileName(NFSFilePath + PathUtil.sqbPath + dbfDir, zlibSqbName.replace(Constant.STR_ZLIB, Constant.NULL_STRING)); - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-获取zlib的文件名称为" + zlibFileNameMd5Sqb, "ZipToSqbServiceImpl"); + LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-获取zlib的文件名称为" + zlibFileNameMd5Sqb, "ZipToSqbServiceImpl-createSqbByDll"); //更新CMS_NAME_TABLE_AUTO_JAVA表中的下发类型 UpdateWrapper updateWrapper = new UpdateWrapper<>(); //ISHIGHWAY=1，高速 @@ -383,7 +382,7 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { updateWrapper.set("EMERCARINCFLAG", Integer.parseInt(protocolType)); break; default: - LogUtil.WriteLog_Error("[uuid:" + uuid + "]-未找到相应的更新自动下发分中心相应状态方法", "ZipToSqbServiceImpl"); + LogUtil.WriteLog_Error("[uuid:" + uuid + "]-未找到相应的更新自动下发分中心相应状态方法", "ZipToSqbServiceImpl-createSqbByDll"); } @@ -394,29 +393,29 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { String nowString = DateTimeUtil.getFormateString(new Date(), Constant.YYYY_MM_DD_HH_MM_SS); String sqlParam = Constant.UPDATE_BUSINESS_HANDLER + nowString + Constant.PUBLISH_TIME + nowString + Constant.WHERE_ID + businessTask.getId(); if (DatabaseUtil.insertSqlite(sqliteDriverName, sqliteUrl, sqlParam) > 0) { - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-更新business_tasks_info调用动态库任务列表成功,id为" + businessTask.getId(), "ZipToSqbServiceImpl"); + LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-更新business_tasks_info调用动态库任务列表成功,id为" + businessTask.getId(), "ZipToSqbServiceImpl-createSqbByDll"); } - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-调用动态库生成SQB任务,下载协议类型为" + protocolType + "zip文件名为" + fileName + "执行成功", "ZipToSqbServiceImpl"); + LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-调用动态库生成SQB任务,下载协议类型为" + protocolType + "zip文件名为" + fileName + "执行成功", "ZipToSqbServiceImpl-createSqbByDll"); //更新中介库华软的下载状态 DatabaseUtil.updateSql(driverName, HRConnectionStringOracle, HROracleName, HROraclePass, Constant.UPDATE_TF_DOWNLOAD_NOTIFY_HR + businessTask.getId()); - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-更新中介库TF_DOWNLOAD_NOTIFY(id为:" + businessTask.getId()+")下载状态为1-已下载", "CreateDbfByDllServiceImpl"); + LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-更新中介库TF_DOWNLOAD_NOTIFY(id为:" + businessTask.getId()+")下载状态为1-已下载", "ZipToSqbServiceImpl-createSqbByDll"); //删除下载的zip文件 FileUtil.delete(new File(NFSFilePath + PathUtil.downFile + businessTask.getFileName())); } else { //更新sqlite任务表的任务状态为2-报错(等待下次轮询) DatabaseUtil.insertSqlite(sqliteDriverName, sqliteUrl, Constant.ERROR_UPDATE_BUSINESS_HANDLER + businessTask.getId()); - LogUtil.WriteLog_Error("[uuid:" + uuid + "]-]调用动态库生成DBF和SQB操作失败" + ",SQB动态库返回值为" + countSqb, "CreateDbfByDllServiceImpl"); + LogUtil.WriteLog_Error("[uuid:" + uuid + "]-]调用动态库生成DBF和SQB操作失败" + ",SQB动态库返回值为" + countSqb, "ZipToSqbServiceImpl-createSqbByDll"); } } else { - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-该时间点" + protocolType + "已下发/或者该点不下发", "ZipToSqbServiceImpl"); + LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-该时间点" + protocolType + "已下发/或者该点不下发", "ZipToSqbServiceImpl-createSqbByDll"); //更新sqlite任务表的任务状态为3-不下发 DatabaseUtil.insertSqlite(sqliteDriverName, sqliteUrl, Constant.NOT_DIS_UPDATE_BUSINESS_HANDLER + DateTimeUtil.getFormateString(new Date(), Constant.YYYY_MM_DD_HH_MM_SS) + Constant.WHERE_ID + businessTask.getId()); - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-更新business_tasks_info任务表的下发状态为3-不下发，id为" + businessTask.getId(), "ZipToSqbServiceImpl"); + LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-更新business_tasks_info任务表的下发状态为3-不下发，id为" + businessTask.getId(), "ZipToSqbServiceImpl-createSqbByDll"); //更新中介库华软的下载状态 DatabaseUtil.updateSql(driverName, HRConnectionStringOracle, HROracleName, HROraclePass, Constant.UPDATE_TF_DOWNLOAD_NOTIFY_HR + businessTask.getId()); - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-更新中介库TF_DOWNLOAD_NOTIFY(id为:" + businessTask.getId()+")下载状态为1-已下载", "CreateDbfByDllServiceImpl"); + LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-更新中介库TF_DOWNLOAD_NOTIFY(id为:" + businessTask.getId()+")下载状态为1-已下载", "ZipToSqbServiceImpl-createSqbByDll"); //删除下载的zip文件 FileUtil.delete(new File(NFSFilePath + PathUtil.downFile + businessTask.getFileName())); @@ -424,10 +423,10 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { } } catch (Exception e) { - LogUtil.WriteLog_Error("[uuid:" + uuid + "]调用动态库生成SQB失败" + e.getMessage(), "ZipToSqbServiceImpl"); + LogUtil.WriteLog_Error("[uuid:" + uuid + "]调用动态库生成SQB失败" + e.getMessage(), "ZipToSqbServiceImpl-createSqbByDll"); //更新sqlite任务表的任务状态为2-报错 DatabaseUtil.insertSqlite(sqliteDriverName, sqliteUrl, Constant.ERROR_UPDATE_BUSINESS_HANDLER + businessTask.getId()); - LogUtil.WriteLog_Error("[uuid:" + uuid + "]-]调用动态库生成DBF和SQB操作失败" + ",SQB动态库返回值为" + countSqb, "CreateDbfByDllServiceImpl"); + LogUtil.WriteLog_Error("[uuid:" + uuid + "]-]调用动态库生成DBF和SQB操作失败" + ",SQB动态库返回值为" + countSqb, "ZipToSqbServiceImpl-createSqbByDll"); } } @@ -462,7 +461,7 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { //压缩文件存放-会被删除 if (!FileUtil.fileExists(localPath + fileName)) { - LogUtil.WriteLog_Error("[uuid:" + uuid + "]-下载的zip文件不存在" + localPath + fileName, "ZipToSqbServiceImpl"); + LogUtil.WriteLog_Error("[uuid:" + uuid + "]-下载的zip文件不存在" + localPath + fileName, "ZipToSqbServiceImpl-createMDSqbByDll"); } else { //调用动态库生成DBF文件 try { @@ -490,7 +489,7 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { bfSqbName = "SQB_SNBLACKINC"; break; default: - LogUtil.WriteLog_Error("[uuid:" + uuid + "]-未找到相应的参数处理方法", "ZipToSqbServiceImpl"); + LogUtil.WriteLog_Error("[uuid:" + uuid + "]-未找到相应的参数处理方法", "ZipToSqbServiceImpl-createMDSqbByDll"); } FileUtil.fileCreat(sqbPath + dbfDir); Date date = new Date(); @@ -507,16 +506,16 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { dayBackPath = NFSFilePath + PathUtil.downFileBackup + dbfDir + File.separator; FileUtil.fileCreat(dayBackPath); FileUtil.copyFile(localPath + fileName, dayBackPath + fileName); - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-调用动态库生成全量SQB文件中,协议类型为" + protocolType + "zip文件名为" + fileName, "ZipToSqbServiceImpl"); + LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-调用动态库生成全量SQB文件中,协议类型为" + protocolType + "zip文件名为" + fileName, "ZipToSqbServiceImpl-createMDSqbByDll"); countSqb = CMinFeeCreator.INSTANCE.MakeBlackAllSQB(etcType, version, format, (localPath + fileName).replace("\\", "/"), sqbPathName.replace("\\", "/"), sqbZlibPathName.replace("\\", "/"), bytMd5); - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-调用动态库生成全量SQB文件完成,返回值为" + countSqb, "ZipToSqbServiceImpl"); + LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-调用动态库生成全量SQB文件完成,返回值为" + countSqb, "ZipToSqbServiceImpl-createMDSqbByDll"); } else { - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-调用动态库生成增量SQB文件中,协议类型为" + protocolType + "zip文件名为" + fileName, "ZipToSqbServiceImpl"); + LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-调用动态库生成增量SQB文件中,协议类型为" + protocolType + "zip文件名为" + fileName, "ZipToSqbServiceImpl-createMDSqbByDll"); //每天生成一个备份zip文件夹存放增量下载的zip文件 dayBackPath = NFSFilePath + PathUtil.downFileBackup + dbfDir + File.separator + dateTime + File.separator; @@ -532,7 +531,7 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { NewFileInfo newFileInfo = newFileInfoMapper.selectById(protocolType); if (newFileInfo != null) { Date updateTime = newFileInfo.getUpdateTime(); - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-根据主键protocolType=" + protocolType + "查询DIS_NEWFILEINFO_JAVA表中上次的生成时间为" + updateTime, "ZipToSqbServiceImpl"); + LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-根据主键protocolType=" + protocolType + "查询DIS_NEWFILEINFO_JAVA表中上次的生成时间为" + updateTime, "ZipToSqbServiceImpl-createMDSqbByDll"); int hours = DateTimeUtil.getHour(date); if (updateTime != null) { @@ -551,7 +550,7 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { //如果是增量先查询上一版本的版本号 if (Constant.ONE_HOUR_ISSUED.contains(protocolType)) { version = getVersion(protocolType, date); - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-最终增量本次版本号为" + version, "ZipToSqbServiceImpl"); + LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-最终增量本次版本号为" + version, "ZipToSqbServiceImpl-createMDSqbByDll"); } //增量目录名称 StringBuilder incDirLst = new StringBuilder(); @@ -567,7 +566,7 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { zlibSqbName = bfSqbName + Constant.STR_ + formateString + Constant.STR_ + version + Constant.STR_ZLIB; sqbZlibPathName = sqbPath + dbfDir + File.separator + zlibSqbName; - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-调用动态库生成增量SQB文件中,协议类型为" + protocolType + "zip文件名为" + fileName, "ZipToSqbServiceImpl"); + LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-调用动态库生成增量SQB文件中,协议类型为" + protocolType + "zip文件名为" + fileName, "ZipToSqbServiceImpl-createMDSqbByDll"); //获取最新的全量sqb文件全路径 //全量文件 @@ -588,54 +587,52 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { //获取当前时间加载增量时间之前的全量文件名 Date tenDaysAgo = DateTimeUtil.addDateDays(new Date(), -(Integer.parseInt(incDays))); String tenDaysVersion = DateTimeUtil.getFormateString(tenDaysAgo, Constant.YYMMDD) + "103"; - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-获取" + incDays + "天前全量SQB,修改时间为" + tenDaysAgo, "ZipToSqbServiceImpl"); if (fileInfos2.size() > 0) { - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-获取全量SQB为" + fileInfos2, "ZipToSqbServiceImpl"); - //对文件的最后修改时间进行排序 fileInfos2.sort(Comparator.comparing(FileInfo::getLastModified).reversed()); for (FileInfo fileInfo2 : fileInfos2) { if (DateUtils.isSameDay(tenDaysAgo, fileInfo2.getLastModified()) || fileInfo2.getFileName().contains(tenDaysVersion)) { pblackAllFileName = fileInfo2.getFileName(); + break; } } if (StringUtils.isBlank(pblackAllFileName)) { pblackAllFileName = fileInfos2.get(0).getFileName(); } } else { - LogUtil.WriteLog_Error("[uuid:" + uuid + "]-获取" + incDays + "天前全量SQB文件失败", "ZipToSqbServiceImpl"); + LogUtil.WriteLog_Error("[uuid:" + uuid + "]-获取" + incDays + "天前全量SQB文件失败", "ZipToSqbServiceImpl-createMDSqbByDll"); //更新sqlite任务表的任务状态为2-报错 DatabaseUtil.insertSqlite(sqliteDriverName, sqliteUrl, Constant.ERROR_UPDATE_BUSINESS_HANDLER + businessTask.getId()); } - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-获取" + incDays + "天前全量SQB名称" + pblackAllFileName, "ZipToSqbServiceImpl"); + LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-获取" + incDays + "天前全量SQB名称" + pblackAllFileName, "ZipToSqbServiceImpl-createMDSqbByDll"); } //如果没有最新的全量SQB文件时，不生成增量文件 if (StringUtils.isNotBlank(pblackAllFileName)) { - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-调用动态库生成增量入参,全量SQB文件全路径" + (sqbQlFileDir + File.separator + pblackAllFileName).replace("\\", "/"), "ZipToSqbServiceImpl"); - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-调用动态库生成增量入参,生成SQB文件全路径" + sqbPathName.replace("\\", "/"), "ZipToSqbServiceImpl"); - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-调用动态库生成增量入参,生成SQBzlib文件全路径" + sqbZlibPathName.replace("\\", "/"), "ZipToSqbServiceImpl"); + LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-调用动态库生成增量入参,全量SQB文件全路径" + (sqbQlFileDir + File.separator + pblackAllFileName).replace("\\", "/"), "ZipToSqbServiceImpl-createMDSqbByDll"); + LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-调用动态库生成增量入参,生成SQB文件全路径" + sqbPathName.replace("\\", "/"), "ZipToSqbServiceImpl-createMDSqbByDll"); + LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-调用动态库生成增量入参,生成SQBzlib文件全路径" + sqbZlibPathName.replace("\\", "/"), "ZipToSqbServiceImpl-createMDSqbByDll"); countSqb = CMinFeeCreator.INSTANCE.MakeBlackIncSQB(etcType, version, format, incDirLst.toString(), (sqbQlFileDir + File.separator + pblackAllFileName).replace("\\", "/"), sqbPathName.replace("\\", "/"), sqbZlibPathName.replace("\\", "/"), bytMd5); - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-]调用动态库生成增量SQB文件完成,返回值为" + countSqb, "ZipToSqbServiceImpl"); + LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-]调用动态库生成增量SQB文件完成,返回值为" + countSqb, "ZipToSqbServiceImpl-createMDSqbByDll"); } } else { - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-该时间点" + protocolType + "已下发/或者该点不下发", "ZipToSqbServiceImpl"); + LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-该时间点" + protocolType + "已下发/或者该点不下发", "ZipToSqbServiceImpl-createMDSqbByDll"); //更新sqlite任务表的任务状态为3-不下发 DatabaseUtil.insertSqlite(sqliteDriverName, sqliteUrl, Constant.NOT_DIS_UPDATE_BUSINESS_HANDLER + DateTimeUtil.getFormateString(new Date(), Constant.YYYY_MM_DD_HH_MM_SS) + Constant.WHERE_ID + businessTask.getId()); - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-更新business_tasks_info任务表的下发状态为3-不下发，id为" + businessTask.getId(), "ZipToSqbServiceImpl"); + LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-更新business_tasks_info任务表的下发状态为3-不下发，id为" + businessTask.getId(), "ZipToSqbServiceImpl-createMDSqbByDll"); } } - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-调用动态库生成SQB返回值count为" + countSqb, "ZipToSqbServiceImpl"); + LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-调用动态库生成SQB返回值count为" + countSqb, "ZipToSqbServiceImpl-createMDSqbByDll"); if (countSqb != 0) { if (countSqb > 0) { String formateStr = DateTimeUtil.getFormateString(date, Constant.YYYYMMDDHHMMSS); - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-]开始生成SQB备份文件", "ZipToSqbServiceImpl"); + LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-]开始生成SQB备份文件", "ZipToSqbServiceImpl-createMDSqbByDll"); //sqb备份目录 FileUtil.fileCreat(NFSFilePath + PathUtil.sqbBackPath + dbfDir); @@ -645,7 +642,7 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { //获取生成SQB的zlib的文件名 String zlibFileNameMd5Sqb = FileUtil.zlibFileName(NFSFilePath + PathUtil.sqbPath + dbfDir, zlibSqbName.replace(Constant.STR_ZLIB, Constant.NULL_STRING)); - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-获取zlib的文件名称为" + zlibFileNameMd5Sqb, "ZipToSqbServiceImpl"); + LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-获取zlib的文件名称为" + zlibFileNameMd5Sqb, "ZipToSqbServiceImpl-createMDSqbByDll"); //更新CMS_NAME_TABLE_AUTO_JAVA表中的下发类型 @@ -662,7 +659,7 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { updateWrapper.set("BLACKINCFLAG", Integer.parseInt(protocolType)); break; default: - LogUtil.WriteLog_Error("[uuid:" + uuid + "]-未找到相应的更新自动下发分中心相应状态方法", "ZipToSqbServiceImpl"); + LogUtil.WriteLog_Error("[uuid:" + uuid + "]-未找到相应的更新自动下发分中心相应状态方法", "ZipToSqbServiceImpl-createMDSqbByDll"); } //入库新文件的信息表 @@ -672,12 +669,12 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { String nowString = DateTimeUtil.getFormateString(new Date(), Constant.YYYY_MM_DD_HH_MM_SS); String sqlParam = Constant.UPDATE_BUSINESS_HANDLER + nowString + Constant.PUBLISH_TIME + nowString + Constant.WHERE_ID + businessTask.getId(); if (DatabaseUtil.insertSqlite(sqliteDriverName, sqliteUrl, sqlParam) > 0) { - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-更新business_tasks_info调用动态库任务列表成功,id为" + businessTask.getId(), "ZipToSqbServiceImpl"); + LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-更新business_tasks_info调用动态库任务列表成功,id为" + businessTask.getId(), "ZipToSqbServiceImpl-createMDSqbByDll"); } - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-调用动态库生成SQB任务,下载协议类型为" + protocolType + "zip文件名为" + fileName + "执行成功", "ZipToSqbServiceImpl"); + LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-调用动态库生成SQB任务,下载协议类型为" + protocolType + "zip文件名为" + fileName + "执行成功", "ZipToSqbServiceImpl-createMDSqbByDll"); //更新迈道中介库下载任务信息 - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-更新中介库T_PARAM_NOTIFY(id为:" + mdId+"version为"+businessTask.getVersion()+")下载状态为1-已下载", "EctServiceImpl"); + LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-更新中介库T_PARAM_NOTIFY(id为:" + mdId+"version为"+businessTask.getVersion()+")下载状态为1-已下载", "ZipToSqbServiceImpl-createMDSqbByDll"); DatabaseUtil.updateSql(driverName, MDConnectionStringOracle, MDOracleName, MDOraclePass, Constant.UPDATE_T_PARAM_NOTIFY_MD + mdId + Constant.AND_VERSION_MD + businessTask.getVersion() + Constant.SINGLE_LEAD); @@ -687,16 +684,16 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { } else { //更新sqlite任务表的任务状态为2-报错(等待下次轮询) DatabaseUtil.insertSqlite(sqliteDriverName, sqliteUrl, Constant.ERROR_UPDATE_BUSINESS_HANDLER + businessTask.getId()); - LogUtil.WriteLog_Error("[uuid:" + uuid + "]-]调用动态库生成DBF和SQB操作失败" + ",SQB动态库返回值为" + countSqb, "CreateDbfByDllServiceImpl"); + LogUtil.WriteLog_Error("[uuid:" + uuid + "]-]调用动态库生成DBF和SQB操作失败" + ",SQB动态库返回值为" + countSqb, "ZipToSqbServiceImpl-createMDSqbByDll"); } } else { - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-该时间点" + protocolType + "已下发/或者该点不下发", "ZipToSqbServiceImpl"); + LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-该时间点" + protocolType + "已下发/或者该点不下发", "ZipToSqbServiceImpl-createMDSqbByDll"); //更新sqlite任务表的任务状态为3-不下发 DatabaseUtil.insertSqlite(sqliteDriverName, sqliteUrl, Constant.NOT_DIS_UPDATE_BUSINESS_HANDLER + DateTimeUtil.getFormateString(new Date(), Constant.YYYY_MM_DD_HH_MM_SS) + Constant.WHERE_ID + businessTask.getId()); - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-更新business_tasks_info任务表的下发状态为3-不下发，id为" + businessTask.getId(), "ZipToSqbServiceImpl"); + LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-更新business_tasks_info任务表的下发状态为3-不下发，id为" + businessTask.getId(), "ZipToSqbServiceImpl-createMDSqbByDll"); //更新迈道中介库下载任务信息 - LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-更新中介库T_PARAM_NOTIFY(id为:" + mdId+"version为"+businessTask.getVersion()+")下载状态为1-已下载", "EctServiceImpl"); + LogUtil.WriteLog_MDBlackCard("[uuid:" + uuid + "]-更新中介库T_PARAM_NOTIFY(id为:" + mdId+"version为"+businessTask.getVersion()+")下载状态为1-已下载", "ZipToSqbServiceImpl-createMDSqbByDll"); DatabaseUtil.updateSql(driverName, MDConnectionStringOracle, MDOracleName, MDOraclePass, Constant.UPDATE_T_PARAM_NOTIFY_MD + mdId + Constant.AND_VERSION_MD + businessTask.getVersion() + Constant.SINGLE_LEAD); @@ -706,10 +703,10 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { } } catch (Exception e) { - LogUtil.WriteLog_Error("[uuid:" + uuid + "]调用动态库生成SQB失败" + e.getMessage(), "ZipToSqbServiceImpl"); + LogUtil.WriteLog_Error("[uuid:" + uuid + "]调用动态库生成SQB失败" + e.getMessage(), "ZipToSqbServiceImpl-createMDSqbByDll"); //更新sqlite任务表的任务状态为2-报错 DatabaseUtil.insertSqlite(sqliteDriverName, sqliteUrl, Constant.ERROR_UPDATE_BUSINESS_HANDLER + businessTask.getId()); - LogUtil.WriteLog_Error("[uuid:" + uuid + "]-]调用动态库生成DBF和SQB操作失败" + ",SQB动态库返回值为" + countSqb, "CreateDbfByDllServiceImpl"); + LogUtil.WriteLog_Error("[uuid:" + uuid + "]-]调用动态库生成DBF和SQB操作失败" + ",SQB动态库返回值为" + countSqb, "ZipToSqbServiceImpl-createMDSqbByDll"); } } @@ -750,10 +747,10 @@ public class ZipToSqbServiceImpl implements ZipToSqbService { } } } - LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-插入数据库表BASICINFO_TABLE完成" + count + "条数据", "ZipToSqbServiceImpl"); + LogUtil.WriteLog_HRBlackCard("[uuid:" + uuid + "]-插入数据库表BASICINFO_TABLE完成" + count + "条数据", "ZipToSqbServiceImpl-insertDatabase"); } catch (IOException e) { - LogUtil.WriteLog_Error("[uuid:" + uuid + "]入库BASICINFO_TABLE失败" + e.getMessage(), "ZipToSqbServiceImpl"); + LogUtil.WriteLog_Error("[uuid:" + uuid + "]入库BASICINFO_TABLE失败" + e.getMessage(), "ZipToSqbServiceImpl-insertDatabase"); }