diff --git a/ParamInsertDb/src/main/java/com/nm/gsgl/common/utils/UnzipUtil.java b/ParamInsertDb/src/main/java/com/nm/gsgl/common/utils/UnzipUtil.java index 3e66149..866780c 100644 --- a/ParamInsertDb/src/main/java/com/nm/gsgl/common/utils/UnzipUtil.java +++ b/ParamInsertDb/src/main/java/com/nm/gsgl/common/utils/UnzipUtil.java @@ -27,7 +27,7 @@ import java.util.zip.ZipInputStream; * @date: 2022年11月09日 10:03 * @description: 解压缩文件工具类 */ -@Slf4j +//@Slf4j public class UnzipUtil { private static final int BUFFER = 1024; private static final String CODING_GBK = "GBK"; @@ -43,11 +43,11 @@ public class UnzipUtil { * @return java.util.List */ public static List UnzipFile(String uuid, String fileAllPath, String destDir) { - log.info("[uuid:{}]解析zip文件插入数据库开始,{}", uuid, fileAllPath); + //log.info("[uuid:{}]解析zip文件插入数据库开始,{}", uuid, fileAllPath); //解压之前先清空解压目标目录 - log.info("[uuid:{}]清空解压目标目录,{}", uuid, destDir); + //log.info("[uuid:{}]清空解压目标目录,{}", uuid, destDir); FileUtil.removeFiles(new File(destDir)); - log.info("[uuid:{}]解析zip文件{}生成json转对象开始", uuid, fileAllPath); + //log.info("[uuid:{}]解析zip文件{}生成json转对象开始", uuid, fileAllPath); //解压缩文件 UnzipUtil.dealUnZip(fileAllPath, destDir); return FileUtil.getJsonPaths(destDir); @@ -65,7 +65,7 @@ public class UnzipUtil { //解压缩执行方法 decompressFile(new File(zipPath), new File(unzipPath), srcList); } catch (Exception e) { - log.error("解压缩失败:{}", e.getMessage(), e); + //log.error("解压缩失败:{}", e.getMessage(), e); throw new PPException(MessageEnum.系统异常.getCode(), MessageEnum.系统异常.getMessage()); } return srcList; diff --git a/ParamInsertDb/src/main/java/com/nm/gsgl/service/impl/InsertParamDbServiceImpl.java b/ParamInsertDb/src/main/java/com/nm/gsgl/service/impl/InsertParamDbServiceImpl.java index d7bd86d..118a25f 100644 --- a/ParamInsertDb/src/main/java/com/nm/gsgl/service/impl/InsertParamDbServiceImpl.java +++ b/ParamInsertDb/src/main/java/com/nm/gsgl/service/impl/InsertParamDbServiceImpl.java @@ -67,6 +67,9 @@ public class InsertParamDbServiceImpl implements InsertParamDbService { for (FileInfo fileInfo : fileInfos) { String fileName = fileInfo.getFileName(); String filePath = fileInfo.getFilePath(); + log.info("[uuid:{}]解析zip文件插入数据库开始,{}", uuid, filePath); + //解压之前先清空解压目标目录 + log.info("[uuid:{}]清空解压目标目录,{}", uuid, destDir); List jsonPathList = UnzipUtil.UnzipFile(uuid, filePath, destDir); //黑名单全量或增量 if (fileName.contains("CARDBLACKLISTDOWN") || fileName.contains("CARDBLACKLISTINCREDOWN")) { diff --git a/ParamInsertDb/src/main/java/com/nm/gsgl/service/impl/MinFeeIntoDataBaseServiceImpl.java b/ParamInsertDb/src/main/java/com/nm/gsgl/service/impl/MinFeeIntoDataBaseServiceImpl.java index 1c4990c..e88048f 100644 --- a/ParamInsertDb/src/main/java/com/nm/gsgl/service/impl/MinFeeIntoDataBaseServiceImpl.java +++ b/ParamInsertDb/src/main/java/com/nm/gsgl/service/impl/MinFeeIntoDataBaseServiceImpl.java @@ -82,6 +82,8 @@ public class MinFeeIntoDataBaseServiceImpl implements MinFeeIntoDataBaseService log.info("[uuid:{}]开始将读取的SQB文件:{},插入数据库ALLROADMINFEE_TABLE_1表", uuid, fileName); DatabaseUtil.insertMinFeeDb(TollBankDriverName, TollBankConnectionStringOracle, TollBankOracleName, TollBankOraclePass, allRoadMinFees, Constant.INSERT_MIN_FEE_1); log.info("[uuid:{}]插入数据库ALLROADMINFEE_TABLE_1表中数据条数为:{}", uuid, listSize); + }else { + log.info("[uuid:{}]暂停入库{}数据库ALLROADMINFEE_TABLE_1表", uuid,TollBankConnectionStringOracle); } if(Constant.STR_ONE.equals(isInJTJT)){ //先删除原来的数据 @@ -91,10 +93,12 @@ public class MinFeeIntoDataBaseServiceImpl implements MinFeeIntoDataBaseService log.info("[uuid:{}]开始将读取的SQB文件:{},插入数据库ALLROADMINFEE_TABLE表", uuid, fileName); DatabaseUtil.insertMinFeeDb(TollBankDriverName, JTJTConnectionStringOracle, JTJTOracleName, JTJTOraclePass, allRoadMinFees, Constant.INSERT_MIN_FEE); log.info("[uuid:{}]插入数据库ALLROADMINFEE_TABLE表中数据条数为:{}", uuid, listSize); + }else { + log.info("[uuid:{}]暂停入库{}数据库ALLROADMINFEE_TABLE表", uuid,JTJTConnectionStringOracle); } - //删除下载的zip文件 + //删除文件 FileUtil.fileDelete(filePath); - log.info("[uuid:{}]删除已入库的文件:{}", uuid, filePath); + log.info("[uuid:{}]删除已入库或者暂停入库的文件:{}", uuid, filePath); } } } diff --git a/ParamInsertDb/target/ParamInsertDb.war b/ParamInsertDb/target/ParamInsertDb.war index f944c018..43c7740 100644 Binary files a/ParamInsertDb/target/ParamInsertDb.war and b/ParamInsertDb/target/ParamInsertDb.war differ diff --git a/ParamInsertDb/target/ParamInsertDb.war.original b/ParamInsertDb/target/ParamInsertDb.war.original index 087689c..d5239dd 100644 Binary files a/ParamInsertDb/target/ParamInsertDb.war.original and b/ParamInsertDb/target/ParamInsertDb.war.original differ diff --git a/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/DatabaseUtil.class b/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/DatabaseUtil.class index 4ad6d7f..85f8751 100644 Binary files a/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/DatabaseUtil.class and b/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/DatabaseUtil.class differ diff --git a/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/FileUtil.class b/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/FileUtil.class index 3e97e62..4e77ef4 100644 Binary files a/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/FileUtil.class and b/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/FileUtil.class differ diff --git a/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/MD5Util.class b/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/MD5Util.class index 6b4a7a2..9ec46e3 100644 Binary files a/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/MD5Util.class and b/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/MD5Util.class differ diff --git a/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/PropertiesUtil.class b/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/PropertiesUtil.class index 8f6420a..d56bf97 100644 Binary files a/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/PropertiesUtil.class and b/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/PropertiesUtil.class differ diff --git a/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/UnzipUtil.class b/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/UnzipUtil.class index 08ef6a4..e955a75 100644 Binary files a/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/UnzipUtil.class and b/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/UnzipUtil.class differ diff --git a/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/ZLibUtils.class b/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/ZLibUtils.class index 67b6114..7ca57e3 100644 Binary files a/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/ZLibUtils.class and b/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/ZLibUtils.class differ diff --git a/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/ZLibUtils2.class b/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/ZLibUtils2.class index 87f8fd1..5ba47cb 100644 Binary files a/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/ZLibUtils2.class and b/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/common/utils/ZLibUtils2.class differ diff --git a/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/service/impl/InsertParamDbServiceImpl.class b/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/service/impl/InsertParamDbServiceImpl.class index 1a55844..f5bea7d 100644 Binary files a/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/service/impl/InsertParamDbServiceImpl.class and b/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/service/impl/InsertParamDbServiceImpl.class differ diff --git a/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/service/impl/MinFeeIntoDataBaseServiceImpl.class b/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/service/impl/MinFeeIntoDataBaseServiceImpl.class index 8a77d34..86cdb04 100644 Binary files a/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/service/impl/MinFeeIntoDataBaseServiceImpl.class and b/ParamInsertDb/target/ParamInsertDb/WEB-INF/classes/com/nm/gsgl/service/impl/MinFeeIntoDataBaseServiceImpl.class differ diff --git a/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/DatabaseUtil.class b/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/DatabaseUtil.class index 4ad6d7f..85f8751 100644 Binary files a/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/DatabaseUtil.class and b/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/DatabaseUtil.class differ diff --git a/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/FileUtil.class b/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/FileUtil.class index 3e97e62..4e77ef4 100644 Binary files a/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/FileUtil.class and b/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/FileUtil.class differ diff --git a/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/MD5Util.class b/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/MD5Util.class index 6b4a7a2..9ec46e3 100644 Binary files a/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/MD5Util.class and b/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/MD5Util.class differ diff --git a/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/PropertiesUtil.class b/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/PropertiesUtil.class index 8f6420a..d56bf97 100644 Binary files a/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/PropertiesUtil.class and b/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/PropertiesUtil.class differ diff --git a/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/UnzipUtil.class b/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/UnzipUtil.class index 08ef6a4..e955a75 100644 Binary files a/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/UnzipUtil.class and b/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/UnzipUtil.class differ diff --git a/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/ZLibUtils.class b/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/ZLibUtils.class index 67b6114..7ca57e3 100644 Binary files a/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/ZLibUtils.class and b/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/ZLibUtils.class differ diff --git a/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/ZLibUtils2.class b/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/ZLibUtils2.class index 87f8fd1..5ba47cb 100644 Binary files a/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/ZLibUtils2.class and b/ParamInsertDb/target/classes/com/nm/gsgl/common/utils/ZLibUtils2.class differ diff --git a/ParamInsertDb/target/classes/com/nm/gsgl/service/impl/InsertParamDbServiceImpl.class b/ParamInsertDb/target/classes/com/nm/gsgl/service/impl/InsertParamDbServiceImpl.class index 1a55844..f5bea7d 100644 Binary files a/ParamInsertDb/target/classes/com/nm/gsgl/service/impl/InsertParamDbServiceImpl.class and b/ParamInsertDb/target/classes/com/nm/gsgl/service/impl/InsertParamDbServiceImpl.class differ diff --git a/ParamInsertDb/target/classes/com/nm/gsgl/service/impl/MinFeeIntoDataBaseServiceImpl.class b/ParamInsertDb/target/classes/com/nm/gsgl/service/impl/MinFeeIntoDataBaseServiceImpl.class index 8a77d34..86cdb04 100644 Binary files a/ParamInsertDb/target/classes/com/nm/gsgl/service/impl/MinFeeIntoDataBaseServiceImpl.class and b/ParamInsertDb/target/classes/com/nm/gsgl/service/impl/MinFeeIntoDataBaseServiceImpl.class differ