From 9970b367767e5c73f8e0a296615f29770ff4425f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 17 八月 2025 17:13:45 +0800
Subject: [PATCH] 增加dnc入库历史记录
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 24 +++++++++++++++++++++---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/DncBackFile.java | 11 +----------
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/DncBackFileVO.java | 2 --
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml | 12 +++++-------
4 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/DncBackFile.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/DncBackFile.java
index 5d1af03..3517383 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/DncBackFile.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/DncBackFile.java
@@ -20,18 +20,9 @@
/**
* 绋嬪簭鍖呭悕 鑺傜偣 鐨刬d
*/
- private Long approvedId;
- /**
- * 纭鏃堕棿
- */
- private Date confirmTime;
+ private Long ncNodeId;
/**
* 瀵硅薄瀛樺偍鏂囦欢鍚�
*/
private String ossName;
-
- /**
- * 瀵硅薄瀛樺偍鏂囦欢鍦板潃
- */
- private String url;
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml
index 2543dbd..1e76ba2 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml
@@ -13,11 +13,9 @@
<!--DNC鍥炰紶绋嬪簭澶勭悊鍒嗛〉-->
<select id="pageQuery" resultType="org.springblade.mdm.program.vo.DncBackFileVO">
- select f.id,n.name name,f.create_time,m.code machine_code, m.name machine_name,f.create_time
+ select f.id,n.name name,m.code machine_code, m.name machine_name,f.create_time
from mdm_dnc_back_file f
-
- left join mdm_nc_program_approved a on f.approved_id=a.id
- join mdm_nc_node n on a.nc_node_id=n.id
+ join mdm_nc_node n on f.nc_node_id=n.id
left join mdm_machine m on n.machine_code=m.code
<where>
@@ -27,14 +25,14 @@
</if>
<if test="query.keyword!=null and query.keyword!=''">
and (m.code like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%') or m.name like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
- or p.name like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
+ or n.name like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
)
</if>
<if test="query.createTimeBegin!=null">
- and a.create_time >= #{query.createTimeBegin}
+ and f.create_time >= #{query.createTimeBegin}
</if>
<if test="query.createTimeEnd!=null">
- and a.create_time <= #{query.createTimeEnd}
+ and f.create_time <= #{query.createTimeEnd}
</if>
</where>
</select>
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 5fbf450..c96009d 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
@@ -20,6 +20,7 @@
import org.springblade.mdm.flow.service.CureFlowService;
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
+import org.springblade.mdm.program.entity.DncBackFile;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcProgramExchange;
import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;
@@ -56,7 +57,7 @@
private final OssTemplate ossTemplate;
private final BladeRedis bladeRedis;
private final FlowCommonService flowCommonService;
-
+ private final DncBackFileService dncBackFileService;
private String getFileKey(){
return "dncimpfile-"+ AuthUtil.getUserId();
}
@@ -210,6 +211,13 @@
}
+ /**
+ * 澶勭悊鍥炰紶鏂囦欢
+ * @param ossFileName
+ * @param acceptIdList
+ * @return
+ * @throws IOException
+ */
private Map<Long, List<FlowProgramFile>> dealWithBackFile(String ossFileName, List<Long> acceptIdList) throws IOException{
Map<Long, List<FlowProgramFile>> pkgIdFileMap = new HashMap<>();
@@ -248,6 +256,12 @@
if(active){
throw new ServiceException(programPackageName+"姝ｅ湪瀹℃壒涓紝璇峰嬁閲嶅鍏ュ簱銆�");
}
+
+ //楠岃瘉閮借繃浜嗭紝淇濆瓨dncbackFile
+ DncBackFile backFile = new DncBackFile();
+ backFile.setNcNodeId(packageNode.getId());
+ backFile.setOssName(ossFileName);
+ dncBackFileService.save(backFile);
List<FlowProgramFile> flowFiles = new ArrayList<>();
//鏌ユ壘鍖呬笅鐨勬枃浠舵暟鎹�,
@@ -291,6 +305,7 @@
* @param programPackageSubMap 鏂扮殑 绋嬪簭鍖呰妭鐐筰d -> =鏂囦欢鍒楄〃 map锛岀敤浜庡洖浼犳暟鎹�
* @throws IOException 璁块棶鏂囦欢寮傚父
*/
+ /*
List<NcNode> updateNodeDataByDNCBackData(String pkgFileName, List<Long> programPackageIdList,Map<Long,List<NcNode>> programPackageSubMap) throws IOException {
InputStream inputStream = this.ossTemplate.statFileStream(pkgFileName);
Path tempZipFile = createTempFile(inputStream);
@@ -391,7 +406,7 @@
return newProgramPackageNodeList;
}
-
+ */
/**
* 鍒涘缓涓�涓复鏃秡ip鏂囦欢
* @param inputStream 鏂囦欢鐨勮緭鍏ユ祦
@@ -428,7 +443,10 @@
}
try (InputStream fileIns = zipFile.getInputStream(zipFile.getEntry(entryName))) {
ByteArrayInputStream bos = new ByteArrayInputStream(fileIns.readAllBytes());
- boolean isText = FileContentUtil.isTextFile(bos);
+ boolean isText = StringUtils.endsWithIgnoreCase(entryName,".txt") || StringUtils.endsWithIgnoreCase(entryName,".nc")|| StringUtils.endsWithIgnoreCase(entryName,".xml");
+ if(!isText) {
+ isText = FileContentUtil.isTextFile(bos);
+ }
if (isText) {
bos.reset();
result = FileContentUtil.getContentFromStream(bos);
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/DncBackFileVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/DncBackFileVO.java
index 27a563f..621e688 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/DncBackFileVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/DncBackFileVO.java
@@ -20,6 +20,4 @@
private String machineCode;
@Schema(description = "绋嬪簭缂栧彿")
private String code;
- @Schema(description = "鏂囦欢鍒拌揪鏃堕棿")
- private Date arrivedTime;
}
--
Gitblit v1.9.3