diff --git a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java index 1043de4a..dc01f969 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java @@ -96,7 +96,7 @@ public class OutSourcedController extends BaseController { String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + ffile); pd.put("UNITS_APTITUDE", Const.FILEPATHFILE + ffile + "/" + fileName); - strings.add(Const.FILEPATHFILE + ffile + "/" + fileName); + strings.add(Const.FILEPATHFILE + ffile + "/" + fileName+"@@"+fileName); } if (null != file1 && !file1.isEmpty()) { String suffixName = file1.getOriginalFilename().substring(file1.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); @@ -125,7 +125,7 @@ public class OutSourcedController extends BaseController { String fileName = this.get32UUID() + file2.getOriginalFilename().substring(file2.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file2, fileName, Const.FILEPATHFILE + ffile); pd.put("MANAGE_APTITUDE", Const.FILEPATHFILE + ffile + "/" + fileName); - strings.add(Const.FILEPATHFILE + ffile + "/" + fileName); + strings.add(Const.FILEPATHFILE + ffile + "/" + fileName+"@@"+fileName); } if (null != file3 && !file3.isEmpty()) { String suffixName = file3.getOriginalFilename().substring(file3.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); @@ -139,7 +139,7 @@ public class OutSourcedController extends BaseController { String fileName = this.get32UUID() + file3.getOriginalFilename().substring(file3.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file3, fileName, Const.FILEPATHFILE + ffile); pd.put("DESIGE", Const.FILEPATHFILE + ffile + "/" + fileName); - strings.add(Const.FILEPATHFILE + ffile + "/" + fileName); + strings.add(Const.FILEPATHFILE + ffile + "/" + fileName+"@@"+fileName); } if (null != file4 && !file4.isEmpty()) { String suffixName = file4.getOriginalFilename().substring(file4.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); @@ -153,7 +153,7 @@ public class OutSourcedController extends BaseController { String fileName = this.get32UUID() + file4.getOriginalFilename().substring(file4.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file4, fileName, Const.FILEPATHFILE + ffile); pd.put("ATTACHMENTS", Const.FILEPATHFILE + ffile + "/" + fileName); - strings.add(Const.FILEPATHFILE + ffile + "/" + fileName); + strings.add(Const.FILEPATHFILE + ffile + "/" + fileName+"@@"+fileName); } if (null != file5 && !file5.isEmpty()) { String suffixName = file5.getOriginalFilename().substring(file5.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); @@ -167,7 +167,7 @@ public class OutSourcedController extends BaseController { String fileName = this.get32UUID() + file5.getOriginalFilename().substring(file5.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file5, fileName, Const.FILEPATHFILE + ffile); pd.put("RECORDS", Const.FILEPATHFILE + ffile + "/" + fileName); - strings.add(Const.FILEPATHFILE + ffile + "/" + fileName); + strings.add(Const.FILEPATHFILE + ffile + "/" + fileName+"@@"+fileName); } if (null != file6 && !file6.isEmpty()) { String suffixName = file6.getOriginalFilename().substring(file6.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); @@ -181,7 +181,7 @@ public class OutSourcedController extends BaseController { String fileName = this.get32UUID() + file6.getOriginalFilename().substring(file6.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file6, fileName, Const.FILEPATHFILE + ffile); pd.put("SHEET", Const.FILEPATHFILE + ffile + "/" + fileName); - strings.add(Const.FILEPATHFILE + ffile + "/" + fileName); + strings.add(Const.FILEPATHFILE + ffile + "/" + fileName+"@@"+fileName); } if (null != file7 && !file7.isEmpty()) { String suffixName = file7.getOriginalFilename().substring(file7.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); @@ -195,7 +195,7 @@ public class OutSourcedController extends BaseController { String fileName = this.get32UUID() + file7.getOriginalFilename().substring(file7.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file7, fileName, Const.FILEPATHFILE + ffile); pd.put("EXAMINATION", Const.FILEPATHFILE + ffile + "/" + fileName); - strings.add(Const.FILEPATHFILE + ffile + "/" + fileName); + strings.add(Const.FILEPATHFILE + ffile + "/" + fileName+"@@"+fileName); } if (null != file8 && !file8.isEmpty()) { String suffixName = file8.getOriginalFilename().substring(file8.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); @@ -209,7 +209,7 @@ public class OutSourcedController extends BaseController { String fileName = this.get32UUID() + file8.getOriginalFilename().substring(file8.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file8, fileName, Const.FILEPATHFILE + ffile); pd.put("OATTACHMENTS", Const.FILEPATHFILE + ffile + "/" + fileName); - strings.add(Const.FILEPATHFILE + ffile + "/" + fileName); + strings.add(Const.FILEPATHFILE + ffile + "/" + fileName+"@@"+fileName); } if (null != file9 && file9.length > 0) { @@ -236,7 +236,7 @@ public class OutSourcedController extends BaseController { pdImg.put("FILEPATH", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); pdImg.put("TYPE", "300"); pdImg.put("FOREIGN_KEY", pd.getString("OUTSOURCED_ID")); - Smb.sshSftp(file9One, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile, IMGFILES_ID, pd.getString("OUTSOURCED_ID"), "300"); + Smb.sshSftp(file9One, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile, fileUpdateName,IMGFILES_ID, pd.getString("OUTSOURCED_ID"), "300"); imgfilesService.save(pdImg); } } diff --git a/src/main/java/com/zcloud/util/Smb.java b/src/main/java/com/zcloud/util/Smb.java index 0dd52a49..4bdf83c9 100644 --- a/src/main/java/com/zcloud/util/Smb.java +++ b/src/main/java/com/zcloud/util/Smb.java @@ -285,6 +285,7 @@ public class Smb { pageData.put("BASEIMGPATH", baseimgpath); pageData.put("FILEPATH", path); pageData.put("FILENAME", fileName); + pageData.put("FILE_NAME", FILE_NAME); TenCorpDto tenCorpDto = new TenCorpDto(); tenCorpDto.setMessage("图片消息");