From 4c7296d45efe849dc70a3b2e2240c905481a91c9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 29 九月 2025 17:44:46 +0800
Subject: [PATCH] 工控网涉密网联调
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
index 31630c3..33d7a5b 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
@@ -72,7 +72,6 @@
* 鍋忕鍗曟枃浠舵湯灏剧殑妯″紡锛歅+鏁板瓧
*/
private static final String P_NUMBER_PATTERN = "(?i)P\\d+";
- //static String[] encodings = {"UTF-8","GBK", "GB2312", "ISO-8859-1"};
private String getFileKey(){
return "dncimpfile-"+ AuthUtil.getUserId();
}
@@ -120,9 +119,12 @@
result = parseProgramListByCharset(byteInsStream,Charset.forName(encoding));
log.error("浣跨敤缂栫爜 {} 瑙ｆ瀽鎴愬姛 ",encoding);
break;
+ }catch (ServiceException se) {
+ log.error("鏁版嵁涓嶆纭紓甯�:",se);
+ break;
} catch (Exception e) {
byteInsStream.reset();
- log.error("浣跨敤缂栫爜 {} 瑙ｆ瀽澶辫触: ",encoding,e);
+ log.error("浣跨敤缂栫爜 {} 瑙ｆ瀽澶辫触:",encoding,e);
}
}
if(result != null) {
@@ -242,8 +244,7 @@
@Transactional
public void dncFileAccept(String ids) throws IOException {
List<Long> acceptIdList = Func.toLongList(ids);
- //
- NcProgramExchange exchange;
+
String filekey = getFileKey();
String zipFileName = bladeRedis.get(filekey);
log.info("filekey={},鏂囦欢鍚�={}",filekey,zipFileName);
--
Gitblit v1.9.3