add

src/main/java/com/zfire/jiasm/syncdata/http/PostObjectSample.java

@@ -102,7 +102,6 @@ public class PostObjectSample {
             strBuf.append("Content-Type: " + contentType + "\r\n\r\n");
             out.write(strBuf.toString().getBytes());
             DataInputStream in = new DataInputStream(new FileInputStream(file));
-            // DataInputStream in =new  DataInputStream(ClassUtils.getDefaultClassLoader().getResourceAsStream(String.valueOf(file)));
 
             int bytes = 0;
             byte[] bufferOut = new byte[1024];

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

@@ -68,8 +68,6 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
         for (WorkerCert item:recs){
             fileo ="";
             filet ="";
-            fid1 = "";
-            fid2 = "";
             count = 0;
 
             try{
@@ -95,30 +93,26 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
 
                 // 生成图片 System.getProperty("java.io.tmpdir")
                 if (StringUtils.isNotEmpty(item.getFileUrl()) && (StringUtils.isEmpty(item.getOutFileUrl()))){
-                    fid1 = IdWorker.getIdStr() + ".jpg";
+                    fileo = IdWorker.getIdStr() + ".jpg";
                     // 下载文件生成新文件 fid1
-                    baseService.saveToFile(ossUtil.getUrlWw(item.getFileUrl()),fid1);
-                    // 获取文件
-                    fileo = fid1;
+                    baseService.saveToFile(ossUtil.getUrlWw(item.getFileUrl()),fileo);
                 }
                 if (StringUtils.isNotEmpty(item.getFileUrl2()) && (StringUtils.isEmpty(item.getOutFileUrl2()))){
-                    fid2 = IdWorker.getIdStr() + ".jpg";
+                    filet = IdWorker.getIdStr() + ".jpg";
                     // 下载文件生成新文件 fid2
-                    baseService.saveToFile(ossUtil.getUrlWw(item.getFileUrl()),fid2);
-                    // 获取文件
-                    filet = fid2;
+                    baseService.saveToFile(ossUtil.getUrlWw(item.getFileUrl2()),filet);
                 }
 
                 // 上传图片 按网点上传
                 for (WorkerBrandAccount wdno: workerWdnos){
-                    uploadFileexc(fileo, filet, fid1, fid2,wdno.getBrandWebsitId(),item);
+                    uploadFileexc(fileo, filet,wdno.getBrandWebsitId(),item);
                     delfilet(fid3);
                     // 保险数据同步 保险证不在证件表中
                     fid3 = uploadInsureCert(wdno);
                 }
 
                 // 文件清除
-                delfile(fileo, filet, fid1, fid2,fid3);
+                delfile(fileo, filet, fid3);
             } catch (Exception ex) {
                 ex.printStackTrace();
                 log.info("同步师傅证件失败：【" + item.getId() + "】");
@@ -132,19 +126,13 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
     }
 
 
-    private void delfile(String fileo,String filet,String fid1, String fid2, String file3) {
+    private void delfile(String fileo,String filet,String file3) {
         if (StringUtils.isNotEmpty(fileo)){
             new File(fileo).delete();
         }
         if (StringUtils.isNotEmpty(filet)){
             new File(filet).delete();
         }
-        if (StringUtils.isNotEmpty(fid1)){
-            new File(fid1).delete();
-        }
-        if (StringUtils.isNotEmpty(fid2)){
-            new File(fid2).delete();
-        }
         if (StringUtils.isNotEmpty(file3)){
             new File(file3).delete();
         }
@@ -179,10 +167,10 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
         if (StringUtils.isEmpty(wk.getOutInsureCert())){
             // 生成图片
             if (StringUtils.isEmpty(wk.getInsureCert())){
-                fid1 = "bx.jpeg";
+                fid1 = "bx.jpg";
                 baseService.initFile(fid1);
             } else {
-                fid1 = IdWorker.getIdStr() + ".jpeg12";
+                fid1 = IdWorker.getIdStr() + ".jpg";
                 baseService.saveToFile(ossUtil.getUrlWw(wk.getInsureCert()),fid1);
             }
             fileo = fid1;
@@ -191,7 +179,7 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
         return fid1;
     }
 
-    private Boolean uploadFileexc(String fileo, String filet, String fid1, String fid2,String wdno,WorkerCert item) throws Exception {
+    private Boolean uploadFileexc(String fileo, String filet, String wdno,WorkerCert item) throws Exception {
         Boolean uploadfile = Boolean.TRUE;
         Boolean onlyone = Boolean.FALSE;
         String msg = "";
@@ -206,7 +194,7 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
             GreeFileResponseHelper response =  greeLogic.ossGetSignt(wdno,"GET");
             if (response.getStatusCode() == 200){
                 ResultData resultData = JSONObject.parseObject(response.getData().toString(), ResultData.class);
-                resultData.getExtData().setDir(resultData.getExtData().getDir()+"/"+fid1);
+                resultData.getExtData().setDir(resultData.getExtData().getDir()+"/"+fileo);
                 // 2:文件上传
                 PostObjectSample ossPostObject = new PostObjectSample();
                 String result = ossPostObject.PostObject(fileo, resultData.getExtData());
@@ -215,7 +203,7 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
                 if (StringUtils.isEmpty(result.trim())){
                     Map<String,String> req = new HashMap<>();
                     // 生成对象
-                    getSaveFileInfo(fid1, resultData, req);
+                    getSaveFileInfo(fileo, resultData, req);
                     GreeFileSaveHelper responses = greeLogic.greePostSaveFile(req);
                     if (responses.getStatusCode() == 200){
                         // 保存文件ID   responses.getData().getId()
@@ -247,7 +235,7 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
             GreeFileResponseHelper response =  greeLogic.ossGetSignt(wdno,"GET");
             if (response.getStatusCode() == 200){
                 ResultData resultData = JSONObject.parseObject(response.getData().toString(), ResultData.class);
-                resultData.getExtData().setDir(resultData.getExtData().getDir()+"/"+fid2);
+                resultData.getExtData().setDir(resultData.getExtData().getDir()+"/"+filet);
                 // 2:文件上传
                 PostObjectSample ossPostObject = new PostObjectSample();
                 String result = ossPostObject.PostObject(filet, resultData.getExtData());
@@ -255,7 +243,7 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
                 if (StringUtils.isEmpty(result.trim())){
                     Map<String,String>req = new HashMap<>();
                     // 生成对象
-                    getSaveFileInfo(fid2, resultData, req);
+                    getSaveFileInfo(filet, resultData, req);
                     GreeFileSaveHelper responses = greeLogic.greePostSaveFile(req);
 
                     if (responses.getStatusCode() == 200){