ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
caozhen
2023-09-14 16:54:02 +08:00
parent a640d55dbe 8084714da2
commit 0a3baa7f3a
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/onlyoffice/entity/BusProcessModelHis.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class BusProcessModelHis implements Serializable {
@ApiModelProperty(value = "流程名称") @ApiModelProperty(value = "流程名称")
@TableField("PRC_NAME") @TableField("PRC_NAME")
private String prcName; private String fileName;
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@TableField("CREATE_TIME") @TableField("CREATE_TIME")
laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java
+6 -3
View File
@@ -45,6 +45,9 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
@Value("${file.downloadUrl}") @Value("${file.downloadUrl}")
private String downloadUrl; private String downloadUrl;
@Value("${file.sourceFilePath}")
private String sourceFilePath;
@Override @Override
public BusProcessModelHis saveEditFile(String model){ public BusProcessModelHis saveEditFile(String model){
BusProcessModelHis modelHis = new BusProcessModelHis(); BusProcessModelHis modelHis = new BusProcessModelHis();
@@ -64,8 +67,8 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
if (!dir.exists()) { if (!dir.exists()) {
dir.mkdirs(); dir.mkdirs();
} }
String sourcePath = builderModel.toString()+model+".docx"; String fileName = model+".docx";
modelHis.setFileName(fileName);
StringBuilder builder=new StringBuilder(); StringBuilder builder=new StringBuilder();
builder.append("model").append("/"); builder.append("model").append("/");
builder.append(taskId).append("/"); builder.append(taskId).append("/");
@@ -77,7 +80,7 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
String targetPath = builder.toString()+taskId+"_"+topId+"_node.docx"; String targetPath = builder.toString()+taskId+"_"+topId+"_node.docx";
File sourceFile = new File(filePath+sourcePath); File sourceFile = new File(sourceFilePath);
File targetFile = new File(filePath+targetPath); File targetFile = new File(filePath+targetPath);
FileUtils.copyFile(sourceFile, targetFile); FileUtils.copyFile(sourceFile, targetFile);
laws-single-startup/src/main/resources/application-dev.yml
+3 -2
View File
@@ -389,5 +389,6 @@ OCR:
file: file:
downloadUrl: a downloadUrl: a
split: split:
path: /data/slrs/file/splitImage/ path: D://opt//onlyoffice//file//splitImage/
path: /data/slrs/file sourceFilePath: D://opt//onlyoffice//sourceFile//DOCX.docx
path: D://opt//onlyoffice//file//