add

src/main/java/com/zfire/jiasm/syncdata/base/BaseService.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.io.BufferedInputStream;
+import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.HttpURLConnection;
@@ -79,7 +80,7 @@ public class BaseService {
     }
 
 
-    public void saveToFile(String desUrl,String id){
+    public void saveToFile(String desUrl, File id){
         FileOutputStream fos = null;
         BufferedInputStream bis = null ;
         HttpURLConnection httpUrl =null;

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

@@ -332,8 +332,10 @@ public class OldForNewUploadLogic {
 		String oldFile;
 		String newFile;
 		String greeImageIdN;
-		oldFile = sdfs.format(new Date())+IdWorker.getIdStr() + ".jpeg";
-		baseService.saveToFile(ossUtil.getUrlWw(picture), oldFile);
+		oldFile = publicService.path(picture);
+		File nFile = new File(oldFile);
+
+		baseService.saveToFile(ossUtil.getUrlWw(picture), nFile);
 		// 获取文件
 		newFile = oldFile;
 		greeImageIdN = uploadBarCodeexc(newFile, oldFile, websitSH.getWdId());

src/main/java/com/zfire/jiasm/syncdata/download/worker/GLPPWXGQueryAdd.java

@@ -38,15 +38,17 @@ public class GLPPWXGQueryAdd {
     private String wxgwztc = "";
     @Value("${zjzbxc}")
     private String zjzbxc = "";
+    @Resource
+    GLPPWXGQueryAddService glppwxgQueryAddService;
+    @Resource
+    PublicService publicService;
+
+
 
 
 
 
 
-    @Resource
-    GLPPWXGQueryAddService glppwxgQueryAddService;
-    @Resource
-    PublicService publicService;
 
 
     /**

src/main/java/com/zfire/jiasm/syncdata/service/PublicService.java

@@ -133,5 +133,7 @@ public interface PublicService {
 
     Date subOneYear(Date dt);
 
+    String path(String f);
+
 
 }

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

@@ -239,7 +239,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
         workerCertList = workerCertService.lambdaQuery()
                 .eq(WorkerCert::getOutZjljProcess,0)
-                .eq(WorkerCert::getWorkerId,"1696523624660529527")// 测试用
+                .eq(WorkerCert::getWorkerId,"1696834689558614018")// 测试用
                 .isNotNull(WorkerCert::getOutZjlj).list();
 
         for (WorkerCert item :workerCertList){
@@ -757,9 +757,11 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
     private String putCert(String image){
         SimpleDateFormat sdfs = new SimpleDateFormat("yyyyMM/");
         String fileId = "";
-        String id = sdfs.format(new Date())+IdWorker.getIdStr();
+        String id = sdfs.format(new Date())+image;
+        File newFile = new File(id);
+
         try{
-            baseService.saveToFile(greeLogic.greeFileUrl(image), id);
+            baseService.saveToFile(greeLogic.greeFileUrl(image), newFile);
             ossUtil.uploadFile(id, new File(id));
             fileId = id;
             return fileId;

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

@@ -448,11 +448,13 @@ public class GLPPWXGQueryUpdateServiceImpl implements GLPPWXGQueryUpdateService
         if (image.contains(".jpeg")){
             id = IdWorker.getIdStr();
         }*/
-        String id = IdWorker.getIdStr();
-        baseService.saveToFile(greeLogic.greeFileUrl(image), id);
+        String id = publicService.path(image);
+        File nFile = new File(id);
+
+        baseService.saveToFile(greeLogic.greeFileUrl(image), nFile);
         String file = id;
         ossUtil.uploadFile(id, new File(file));
-
+        nFile.delete();
 
         return id;
     }

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

@@ -570,8 +570,10 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
             // 品牌方fileindex未获取上传被忽略
             if (StringUtils.isEmpty(file.getBrandFilePath())){
                 // 上传图片
-                oldFile = sdfs.format(new Date())+IdWorker.getIdStr() + ".jpeg";
-                baseService.saveToFile(ossUtil.getUrlWw(file.getFilePath()),oldFile);
+                oldFile = publicService.path(file.getFilePath());
+                File nFile = new File(oldFile);
+
+                baseService.saveToFile(ossUtil.getUrlWw(file.getFilePath()),nFile);
                 // 获取文件
                 newFile = oldFile;
                 WebsitFWS websitFWS = publicService.shshwdToptshwd(orderBase.getWebsitId(), orderBase);
@@ -890,13 +892,13 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
         SimpleDateFormat sdfs = new SimpleDateFormat("yyyyMM/");
         String oldFile;
         String newFile;
-        oldFile = sdfs.format(new Date())+IdWorker.getIdStr() + ".jpeg";
+        oldFile = sdfs.format(new Date())+code.getPath();
+        File nFile = new File(oldFile);
 
-        baseService.saveToFile(ossUtil.getUrlWw(code.getPath()),oldFile);
+        baseService.saveToFile(ossUtil.getUrlWw(code.getPath()),nFile);
         // 获取文件
         newFile = oldFile;
         WebsitFWS websitFWS = publicService.shshwdToptshwd(orderBase.getWebsitId(),orderBase);
-
         Boolean flag = uploadBarCodeexc(newFile, oldFile,websitFWS.getWebsitId(), code);
         new File(newFile).delete();
         if (!flag) {

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

@@ -820,8 +820,10 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             // 品牌方fileindex未获取上传被忽略
             if (StringUtils.isEmpty(file.getBrandFilePath())){
                 // 上传图片
-                oldFile = sdfs.format(new Date())+IdWorker.getIdStr() + ".jpeg";
-                baseService.saveToFile(ossUtil.getUrlWw(file.getFilePath()),oldFile);
+                oldFile = publicService.path(file.getFilePath());
+                File nFile = new File(oldFile);
+
+                baseService.saveToFile(ossUtil.getUrlWw(file.getFilePath()),nFile);
                 // 获取文件
                 newFile = oldFile;
                 WebsitSH websitSH = publicService.ptshwdToshshwd(orderBase.getWebsitId(), orderBase.getMainId());
@@ -1472,13 +1474,16 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         SimpleDateFormat sdfs = new SimpleDateFormat("yyyyMM/");
         String oldFile;
         String newFile;
-        oldFile = sdfs.format(new Date())+IdWorker.getIdStr() + ".jpeg";
-        baseService.saveToFile(ossUtil.getUrlWw(code.getPath()),oldFile);
+        oldFile = publicService.path(code.getPath());
+        File nFile = new File(oldFile);
+
+        baseService.saveToFile(ossUtil.getUrlWw(code.getPath()),nFile);
         // 获取文件
         newFile = oldFile;
         WebsitSH websitSH = publicService.ptshwdToshshwd(orderBase.getWebsitId(),orderBase.getMainId());
         Boolean flag = uploadBarCodeexc(newFile, oldFile,websitSH.getWdId(), code, synReqId);
         new File(newFile).delete();
+
         if (!flag) {
             return Boolean.FALSE;
         }

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

@@ -1461,6 +1461,12 @@ public class PublicServiceImpl implements PublicService {
         return calendar.getTime();
     }
 
+    @Override
+    public String path(String f){
+        SimpleDateFormat sdfs = new SimpleDateFormat("yyyyMM/");
+        return sdfs.format(new Date())+f;
+    }
+
     private void setLocationByAddress(OrderBase orderBase) {
         if (StringUtils.isEmpty(orderBase.getLng()) || StringUtils.isEmpty(orderBase.getLat())) {
             String add = "";

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

@@ -1359,8 +1359,10 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
             }
             if (StringUtils.isEmpty(file.getBrandFilePath())){
                 // 上传图片
-                oldFile = sdfs.format(new Date())+IdWorker.getIdStr() + ".jpeg";
-                baseService.saveToFile(ossUtil.getUrlWw(file.getFilePath()),oldFile);
+                oldFile = publicService.path(file.getFilePath());
+                File nFile = new File(oldFile);
+
+                baseService.saveToFile(ossUtil.getUrlWw(file.getFilePath()),nFile);
                 // 获取文件
                 newFile = oldFile;
                 WebsitSH websitSH = publicService.ptshwdToshshwd(orderBase.getWebsitId(), orderBase.getMainId());

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

@@ -16,6 +16,7 @@ import com.zfire.jiasm.syncdata.plus.service.WebsitWorkerService;
 import com.zfire.jiasm.syncdata.plus.service.WorkerBrandAccountService;
 import com.zfire.jiasm.syncdata.plus.service.WorkerCertService;
 import com.zfire.jiasm.syncdata.response.ResultData;
+import com.zfire.jiasm.syncdata.service.PublicService;
 import com.zfire.jiasm.syncdata.service.UploadWorkeCertificateService;
 import com.zfire.jiasm.syncdata.utils.oss.OSSUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -42,7 +43,7 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
     @Resource
     BaseService baseService;
     @Resource
-    WebsitWorkerService websitWorkerService;
+    PublicService publicService;
     @Resource
     InsureWorkerRecordService insureWorkerRecordService;
 
@@ -97,14 +98,17 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
 
                 // 生成图片 System.getProperty("java.io.tmpdir")
                 if (StringUtils.isNotEmpty(item.getFileUrl()) && (StringUtils.isEmpty(item.getOutFileUrl()))){
-                    fileo = sdfs.format(new Date())+IdWorker.getIdStr() + ".jpg";
+                    fileo = publicService.path(item.getFileUrl());
+                    File nFile = new File(fileo);
                     // 下载文件生成新文件 fid1
-                    baseService.saveToFile(ossUtil.getUrlWw(item.getFileUrl()),fileo);
+                    baseService.saveToFile(ossUtil.getUrlWw(item.getFileUrl()),nFile);
+
                 }
                 if (StringUtils.isNotEmpty(item.getFileUrl2()) && (StringUtils.isEmpty(item.getOutFileUrl2()))){
-                    filet = sdfs.format(new Date())+IdWorker.getIdStr() + ".jpg";
+                    filet = publicService.path(item.getFileUrl2());
+                    File nFile = new File(filet);
                     // 下载文件生成新文件 fid2
-                    baseService.saveToFile(ossUtil.getUrlWw(item.getFileUrl2()),filet);
+                    baseService.saveToFile(ossUtil.getUrlWw(item.getFileUrl2()),nFile);
                 }
 
                 // 上传图片 按网点上传
@@ -178,7 +182,8 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
                 baseService.initFile(fid1);
             } else {
                 fid1 = IdWorker.getIdStr() + ".jpg";
-                baseService.saveToFile(ossUtil.getUrlWw(wk.getVoucher()),fid1);
+                File nFile = new File(fid1);
+                baseService.saveToFile(ossUtil.getUrlWw(wk.getVoucher()),nFile);
             }
             fileo = fid1;
             uploadInitFileexc(fileo, fid1, wdno.getBrandWebsitId(),wk);