Merge remote-tracking branch 'origin/master'

laws-modules/src/main/java/com/jero/modules/onlyoffice/entity/BusProcessModelHis.java

@@ -58,7 +58,7 @@ public class BusProcessModelHis implements Serializable {
 
     @ApiModelProperty(value = "流程名称")
     @TableField("PRC_NAME")
-    private String prcName;
+    private String fileName;
 
     @ApiModelProperty(value = "创建时间")
     @TableField("CREATE_TIME")

laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java

@@ -45,6 +45,9 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
     @Value("${file.downloadUrl}")
     private String downloadUrl;
 
+    @Value("${file.sourceFilePath}")
+    private String sourceFilePath;
+
     @Override
     public BusProcessModelHis saveEditFile(String model){
         BusProcessModelHis modelHis = new BusProcessModelHis();
@@ -64,8 +67,8 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
             if (!dir.exists()) {
                 dir.mkdirs();
             }
-            String sourcePath = builderModel.toString()+model+".docx";
-
+            String fileName = model+".docx";
+            modelHis.setFileName(fileName);
             StringBuilder builder=new StringBuilder();
             builder.append("model").append("/");
             builder.append(taskId).append("/");
@@ -77,7 +80,7 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
 
             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);
             FileUtils.copyFile(sourceFile, targetFile);
 

laws-single-startup/src/main/resources/application-dev.yml

@@ -389,5 +389,6 @@ OCR:
 file:
   downloadUrl: a
   split:
-    path: /data/slrs/file/splitImage/
-  path: /data/slrs/file
+    path: D://opt//onlyoffice//file//splitImage/
+  sourceFilePath: D://opt//onlyoffice//sourceFile//DOCX.docx
+  path: D://opt//onlyoffice//file//