From 606535251ddf9fb585ffc97c3651b383c2db1224 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 20 八月 2025 14:25:14 +0800
Subject: [PATCH] 导入工控网，附件改名
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 116 +---------------------------------------------------------
1 files changed, 2 insertions(+), 114 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
index 55243df..9fe865e 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
@@ -88,15 +88,10 @@
approvedService.updateById(approved);
}
- //鐘舵�佷慨鏀逛负宸插鍑�
- /*
- approvedService.lambdaUpdate().in(NcProgramApproved::getId, Arrays.asList(approvedIdArray))
- .set(NcProgramApproved::getStatus,NcProgramApproved.STATUS_EXPORTED).update();*/
}catch(Exception e){
Throwable [] err = e.getSuppressed();
throw new ServiceException("瀵煎嚭宸ユ帶缃戦敊璇�"+e.getMessage());
}
-
}
/**
@@ -123,7 +118,7 @@
}else if(programPackageNode.hasCured()){
status = "GH";
}
- //List<Dict> annotationList = programAnnotationService.getAnnotionList();
+
for (NcNode node : programNodes) {
String filePathInZip = packageFolder + node.getName();
programFile = this.flowProgramFileService.getById(node.getFlowProgramFileId());
@@ -184,7 +179,7 @@
}*/
-
+ /*
String generateAnnotation(String oriTest,String machineGroupCode,List<Dict> annotationList) {
R<List<Dict>> dictsResult = dictClient.getList(ANNOTATION_DICT);
String annotation = oriTest;
@@ -206,114 +201,7 @@
return annotation;
}
- /**
- * 瀵煎叆鏁版嵁鏂囦欢
- * @param zipOut
- */
- /*
- void addDataJson(ZipOutputStream zipOut, List<Long> programPackageNodeIdList) throws IOException {
- addNodeDataJson(zipOut, programPackageNodeIdList);
- addApproveRecordDataJson(zipOut, programPackageNodeIdList);
- }
*/
-
- /**
- * zip淇濋噸鍔犲叆鑺傜偣鐨勬暟鎹�
- * @param zipOut
- * @param pkgNodeIdList
- * @throws IOException
- */
- /*
- void addNodeDataJson(ZipOutputStream zipOut,List<Long> pkgNodeIdList) throws IOException {
- List<NcNode> pkgNodes = this.ncNodeService.lambdaQuery().in(NcNode::getId, pkgNodeIdList).list();
-
- List<Long> allNodeIds = new ArrayList<>();
- for(NcNode node : pkgNodes){
- allNodeIds.addAll(Func.toLongList(node.getParentIds()));
- allNodeIds.add(node.getId());
- }
- //鍔犲叆绋嬪簭鍖呬笅绾х殑绋嬪簭鑺傜偣
- List<NcNode> programNodes = ncNodeService.lambdaQuery().in(NcNode::getParentId, pkgNodes.stream().map(NcNode::getId).toList()).list();
-
- allNodeIds.addAll(programNodes.stream().map(NcNode::getId).toList());
- List<Long> distinctIds = allNodeIds.stream().distinct().toList();
- List<NcNode> allNodes = this.ncNodeService.lambdaQuery().in(NcNode::getId, distinctIds).list();
- JSONArray jsonArray = new JSONArray();
-
- for(NcNode node : allNodes){
- JSONObject recObj = getNodeJsonObject(node);
- addSuperProperties(recObj,node);
- jsonArray.add(recObj);
- }
- addInputStreamToZip(zipOut,new ByteArrayInputStream(jsonArray.toJSONString().getBytes(StandardCharsets.UTF_8)),NODE_JSON_FILE);
-
- }
- */
- /*
- @NotNull
- private static JSONObject getNodeJsonObject(NcNode node) {
- JSONObject recObj = new JSONObject();
- recObj.put("id", node.getId());
- recObj.put("name", node.getName());
- recObj.put("drawingNo", node.getDrawingNo());
- recObj.put("drawingNoEdition", node.getDrawingNoEdition());
- recObj.put("productModel", node.getProductModel());
- recObj.put("processName", node.getProcessName());
- recObj.put("processEdition", node.getProcessEdition());
- recObj.put("craftEdition", node.getCraftEdition());
- recObj.put("parentIds", node.getParentIds());
- recObj.put("processNo", node.getProcessNo());
-
- recObj.put("isCured", node.getIsCured());
- recObj.put("isLocked", node.getIsLocked());
- recObj.put("nodeType", node.getNodeType());
-
- recObj.put("machineCode", node.getMachineCode());
- recObj.put("flowProgramFileId", node.getFlowProgramFileId());
- recObj.put("processInstanceId", node.getProcessInstanceId());
- return recObj;
- }
- */
- /**
- * 瀵煎叆瀹℃壒璁板綍
- * @param zipOut
- * @param programPackageNodeIdList 绋嬪簭鍖呭悕鐨刬d鍒楄〃
- */
- /*
- void addApproveRecordDataJson(ZipOutputStream zipOut, List<Long> programPackageNodeIdList) throws IOException {
-
- //List<ApproveRecord> records = approveRecordService.lambdaQuery().in(ApproveRecord::getProcessInstanceId, instanceIds).list();
- List<ApproveRecord> records = approveRecordService.lambdaQuery().in(ApproveRecord::getNcNodeId, programPackageNodeIdList).list();
-
- JSONArray jsonArray = new JSONArray();
- for(ApproveRecord record : records){
- JSONObject recObj = new JSONObject();
- recObj.put("id", record.getId());
- recObj.put("comment", record.getComment());
- recObj.put("userId",record.getUserId());
- recObj.put("userNickname",record.getUserNickname());
- recObj.put("operateTime",record.getOperateTime());
- recObj.put("operateResult",record.getOperateResult());
- recObj.put("taskName",record.getTaskName());
- recObj.put("processInstanceId",record.getProcessInstanceId());
- recObj.put("ncNodeId",record.getNcNodeId());
- addSuperProperties(recObj,record);
-
- jsonArray.add(recObj);
- }
- addInputStreamToZip(zipOut,new ByteArrayInputStream(jsonArray.toJSONString().getBytes(StandardCharsets.UTF_8)),"exp_mdm_approve_record.json");
-
- }*/
-
- void addSuperProperties(JSONObject recObj, BizEntity entity){
- recObj.put("tenantId",entity.getTenantId());
- recObj.put("createTime",entity.getCreateTime());
- recObj.put("updateTime",entity.getUpdateTime());
- recObj.put("createUser",entity.getCreateUser());
- recObj.put("updateUser",entity.getUpdateUser());
- recObj.put("status",entity.getStatus());
- recObj.put("createDept",entity.getCreateDept());
- }
/**
* 灏� 杈撳叆娴� 涓殑鍐呭鍐欏叆zip
--
Gitblit v1.9.3