From b4d10ff7535002dddb63a0b28ddb37fee7ed1e9d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 03 十二月 2025 16:30:53 +0800
Subject: [PATCH] 增加pdf，xlsx，docx文件预览功能
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java
index f949f78..6cd6635 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java
@@ -171,6 +171,7 @@
oldProgramNode.setIsLastEdition(0);
//褰撳墠鍥哄寲绋嬪簭鍖呭悕涓嬬殑鈥滃叾浠栨枃浠垛�濋潪绋嬪簭鏂囦欢銆備笉璁剧疆涓鸿�佺増鏈紝鐩存帴鎸埌鍥哄寲鏍戜笅,涓や釜缃戠粶涔嬮棿鍙氦鎹㈢▼搴忔枃浠讹紝鍏朵粬鏂囦欢鍙兘淇濈暀
//鍏朵粬鏂囦欢锛岄渶瑕佸鍒跺埌鏂板缓鐨勫浐鍖栬妭鐐逛笅锛堢▼搴忔枃浠朵笉澶嶅埗锛�
+ /*
pfile = flowProgramFileService.getById(oldProgramNode.getFlowProgramFileId());
if(!pfile.isProgram()) {
NcNode newFileNode = new NcNode();
@@ -181,11 +182,17 @@
newFileNode.setIsLastEdition(1);
nodeService.save(newFileNode);
}
-
+ */
}
nodeService.updateBatchById(oriProgramNodes);
}
+ /**
+ * 鍔犲叆鏂扮殑绋嬪簭鑺傜偣
+ * @param cureNode 鍥哄寲鑺傜偣
+ * @param processInstanceId 娴佺▼瀹炰緥id
+ * @throws IOException
+ */
void addNewProgramNode(NcNode cureNode,String processInstanceId) throws IOException {
Machine machine = machineService.getByCode(cureNode.getMachineCode());
List<DictBiz> annoDicts = programAnnotationService.getAnnotionDictList();
@@ -240,8 +247,6 @@
cureNode.upgradeVersionNumber();
}
- //nodeService.save(cureNode);
-
return cureNode;
}
/**
@@ -256,13 +261,12 @@
byte[] bytes = IOUtils.toByteArray(ins);
ByteArrayInputStream byteInputStream = new ByteArrayInputStream(bytes);
- //InputStream finishedStream = programAnnotationService.setGHAnnotation(byteInputStream,controlSystem,annoDicts);
List<DictBiz> annoDictList = programAnnotationService.getAnnotionDictList();
AnnotationProperties annoProps = config.getConfigMap().get(controlSystem);
if(annoProps == null){
annoProps = AnnotationProperties.getDefault();
}
- InputStream finishedStream =AnnotationUtil.setAnnotationAndGetInputStream(byteInputStream, "GH", annoProps.getStatusLineIndex(), controlSystem, annoDictList);
+ InputStream finishedStream =AnnotationUtil.setAnnotationAndGetInputStream(byteInputStream, AnnotationUtil.GH, annoProps.getStatusLineIndex(), controlSystem, annoDictList);
try(finishedStream) {
finishedStream.reset();
BladeFile bfile = ossTemplate.putFile(flowProgramFile.getName(), finishedStream);
--
Gitblit v1.9.3