add

src/main/java/com/zfire/jiasm/syncdata/common/OldForNewUploadLogic.java

@@ -328,10 +328,11 @@ public class OldForNewUploadLogic {
 
 	@Nullable
 	private String getImage(String picture, WebsitSH websitSH) {
+		SimpleDateFormat sdfs = new SimpleDateFormat("yyyyMM/");
 		String oldFile;
 		String newFile;
 		String greeImageIdN;
-		oldFile = IdWorker.getIdStr() + ".jpeg";
+		oldFile = sdfs.format(new Date())+IdWorker.getIdStr() + ".jpeg";
 		baseService.saveToFile(ossUtil.getUrlWw(picture), oldFile);
 		// 获取文件
 		newFile = oldFile;

src/main/java/com/zfire/jiasm/syncdata/service/impl/InstallProduceDataUploadServiceImpl.java

@@ -548,6 +548,7 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
     }
 
     private void uploadOrderDetailFile(@NotNull OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap, OrderBase orderBase) {
+        SimpleDateFormat sdfs = new SimpleDateFormat("yyyyMM/");
         String oldFile ="";
         String newFile ="";
         // 根据产品类别名称 生成不同的完工明细数据
@@ -569,7 +570,7 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
             // 品牌方fileindex未获取上传被忽略
             if (StringUtils.isEmpty(file.getBrandFilePath())){
                 // 上传图片
-                oldFile = IdWorker.getIdStr() + ".jpeg";
+                oldFile = sdfs.format(new Date())+IdWorker.getIdStr() + ".jpeg";
                 baseService.saveToFile(ossUtil.getUrlWw(file.getFilePath()),oldFile);
                 // 获取文件
                 newFile = oldFile;
@@ -886,9 +887,10 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
     }
 
     private boolean uploadImage(OrderBase orderBase, OrderInstallDetailCode code) {
+        SimpleDateFormat sdfs = new SimpleDateFormat("yyyyMM/");
         String oldFile;
         String newFile;
-        oldFile = IdWorker.getIdStr() + ".jpeg";
+        oldFile = sdfs.format(new Date())+IdWorker.getIdStr() + ".jpeg";
 
         baseService.saveToFile(ossUtil.getUrlWw(code.getPath()),oldFile);
         // 获取文件

src/main/java/com/zfire/jiasm/syncdata/service/impl/OrderBaseInstallCjOrWgServiceImpl.java

@@ -811,6 +811,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     }
 
     public void uploadOrderDetailFilePiture(@NotNull OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap, OrderBase orderBase) {
+        SimpleDateFormat sdfs = new SimpleDateFormat("yyyyMM/");
         String oldFile ="";
         String newFile ="";
         // 根据产品类别名称 生成不同的完工明细数据
@@ -838,7 +839,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             // 品牌方fileindex未获取上传被忽略
             if (StringUtils.isEmpty(file.getBrandFilePath())){
                 // 上传图片
-                oldFile = IdWorker.getIdStr() + ".jpeg";
+                oldFile = sdfs.format(new Date())+IdWorker.getIdStr() + ".jpeg";
                 baseService.saveToFile(ossUtil.getUrlWw(file.getFilePath()),oldFile);
                 // 获取文件
                 newFile = oldFile;
@@ -1487,9 +1488,10 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     }
 
     public boolean uploadImage(OrderBase orderBase, OrderInstallDetailCode code, Long synReqId) {
+        SimpleDateFormat sdfs = new SimpleDateFormat("yyyyMM/");
         String oldFile;
         String newFile;
-        oldFile = IdWorker.getIdStr() + ".jpeg";
+        oldFile = sdfs.format(new Date())+IdWorker.getIdStr() + ".jpeg";
         baseService.saveToFile(ossUtil.getUrlWw(code.getPath()),oldFile);
         // 获取文件
         newFile = oldFile;

src/main/java/com/zfire/jiasm/syncdata/service/impl/RepairProduceDataUploadServiceImpl.java

@@ -1345,6 +1345,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
     }
 
     public void OrderDetailFileUpload(OrderBase orderBase, OrderRepairDetail detail){
+        SimpleDateFormat sdfs = new SimpleDateFormat("yyyyMM/");
         String oldFile ="";
         String newFile ="";
         // 提取数据采集附件数据
@@ -1358,7 +1359,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
             }
             if (StringUtils.isEmpty(file.getBrandFilePath())){
                 // 上传图片
-                oldFile = IdWorker.getIdStr() + ".jpeg";
+                oldFile = sdfs.format(new Date())+IdWorker.getIdStr() + ".jpeg";
                 baseService.saveToFile(ossUtil.getUrlWw(file.getFilePath()),oldFile);
                 // 获取文件
                 newFile = oldFile;

src/main/java/com/zfire/jiasm/syncdata/service/impl/UploadWorkeCertificateServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.io.File;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 
@@ -49,7 +50,7 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
 
     @Override
     public void procesUploadWorkeCert() {
-
+        SimpleDateFormat sdfs = new SimpleDateFormat("yyyyMM/");
         List<WorkerCert> recs = new ArrayList<>();
         List<WorkerBrandAccount> workerWdnos = new ArrayList<>();
         String fileo ="";
@@ -96,12 +97,12 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
 
                 // 生成图片 System.getProperty("java.io.tmpdir")
                 if (StringUtils.isNotEmpty(item.getFileUrl()) && (StringUtils.isEmpty(item.getOutFileUrl()))){
-                    fileo = IdWorker.getIdStr() + ".jpg";
+                    fileo = sdfs.format(new Date())+IdWorker.getIdStr() + ".jpg";
                     // 下载文件生成新文件 fid1
                     baseService.saveToFile(ossUtil.getUrlWw(item.getFileUrl()),fileo);
                 }
                 if (StringUtils.isNotEmpty(item.getFileUrl2()) && (StringUtils.isEmpty(item.getOutFileUrl2()))){
-                    filet = IdWorker.getIdStr() + ".jpg";
+                    filet = sdfs.format(new Date())+IdWorker.getIdStr() + ".jpg";
                     // 下载文件生成新文件 fid2
                     baseService.saveToFile(ossUtil.getUrlWw(item.getFileUrl2()),filet);
                 }
@@ -163,6 +164,7 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
      *               不为空正常生成
      */
     private String uploadInsureCert(WorkerBrandAccount wdno) throws Exception {
+        SimpleDateFormat sdfs = new SimpleDateFormat("yyyyMM/");
         String fileo ="";
         String fid1 = "";
         InsureWorkerRecord wk = insureWorkerRecordService.lambdaQuery()
@@ -172,7 +174,7 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
         if (StringUtils.isEmpty(wk.getOutVoucher())){
             // 生成图片
             if (StringUtils.isEmpty(wk.getVoucher())){
-                fid1 = "bx.jpg";
+                fid1 = sdfs.format(new Date())+"bx.jpg";
                 baseService.initFile(fid1);
             } else {
                 fid1 = IdWorker.getIdStr() + ".jpg";