add

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

@@ -1517,9 +1517,7 @@ public class PublicServiceImpl implements PublicService {
 
     @Override
     public String pathToGree(String f){
-        String fileId = IdWorker.getIdStr() + ".jpeg";
-
-        String filedir = "g/" + fileId;
+        String filedir = "g/" + f;
         return filedir;
     }
 

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

@@ -63,8 +63,10 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
     public void procesUploadWorkeCert() {
         List<WorkerCert> recs = new ArrayList<>();
         List<WorkerBrandAccount> workerWdnos = new ArrayList<>();
-        String fileo ="";
-        String filet ="";
+        String filePatho ="";
+        String filePatht ="";
+        String fileIdo ="";
+        String fileIdt ="";
         Integer count = 0;
         Boolean upf=Boolean.TRUE;
         String outFile="";
@@ -95,11 +97,7 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
         recs =  getWorkerUploadstest();
 
         for (WorkerCert item:recs){
-            fileo ="";
-            filet ="";
             count = 0;
-            outFile="";
-            outFilet="";
 
             try{
                 // 证件已同步无需再次同步或是更新
@@ -129,36 +127,40 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
 
                 // 生成图片 System.getProperty("java.io.tmpdir")
                 if (StringUtils.isNotEmpty(item.getFileUrl()) && (StringUtils.isEmpty(item.getOutFileUrl()))){
-                    fileo = publicService.pathToGree(item.getFileUrl());
-                    File nFile = publicService.createf(fileo);
+                    fileIdo = IdWorker.getIdStr() + ".jpeg";
+                    filePatho = publicService.pathToGree(fileIdo);
+                    File nFile = publicService.createf(filePatho);
                     // 下载文件生成新文件 fid1
                     baseService.saveToFile(ossUtil.getUrlWw(item.getFileUrl()),nFile);
 
                 }
                 if (StringUtils.isNotEmpty(item.getFileUrl2()) && (StringUtils.isEmpty(item.getOutFileUrl2()))){
-                    filet = publicService.pathToGree(item.getFileUrl2());
-                    File nFile = publicService.createf(filet);
+                    fileIdt = IdWorker.getIdStr() + ".jpeg";
+                    filePatht = publicService.pathToGree(fileIdt);
+                    File nFile = publicService.createf(filePatht);
                     // 下载文件生成新文件 fid2
                     baseService.saveToFile(ossUtil.getUrlWw(item.getFileUrl2()),nFile);
                 }
 
                 // 上传图片 按网点上传
                 for (WorkerBrandAccount wdno: workerWdnos){
+                    outFile="";
+                    outFilet="";
                     upf=Boolean.TRUE;
 
                     if (StringUtils.isEmpty(wdno.getBrandWebsitId())){
                         continue;
                     }
 
-                    if (StringUtils.isNotEmpty(fileo)){
-                        outFile = uploadWdnoFile(wdno.getBrandWebsitId(), item, fileo);
+                    if (StringUtils.isNotEmpty(filePatho)){
+                        outFile = uploadWdnoFile(wdno.getBrandWebsitId(), item, filePatho, fileIdo);
                         if (StringUtils.isEmpty(outFile)){
                             upf=Boolean.FALSE;
                         }
                     }
 
-                    if (StringUtils.isNotEmpty(filet)){
-                        outFilet = uploadWdnoFile(wdno.getBrandWebsitId(), item, filet);
+                    if (StringUtils.isNotEmpty(filePatht)){
+                        outFilet = uploadWdnoFile(wdno.getBrandWebsitId(), item, filePatht, fileIdt);
                         if (StringUtils.isEmpty(outFilet)){
                             upf=Boolean.FALSE;
                         }
@@ -173,7 +175,7 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
                 extractedEnd(wcgs, item, outFile, outFilet);
 
                 // 文件清除
-                delfile(fileo, filet, "");
+                delfile(filePatho, filePatht, "");
             } catch (Exception ex) {
                 ex.printStackTrace();
                 log.info("同步师傅证件失败：【" + item.getId() + "】");
@@ -620,10 +622,10 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
     }
 
     private String uploadInsureBx(WebsitWorker item,WorkerBrandAccount wdno) throws Exception {
-        String fileo ="";
-        String fid1 = "";
+        String fileAdnPath = "";
         String outInsureCert = "";
         String bxf="";
+        String fileId = "";
 
         // 上传
         if (item.getInsureFiles().contains(",")){
@@ -631,11 +633,12 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
 
             List<String> result = Arrays.asList(item.getInsureFiles().split(","));
             for (String p:result){
-                fid1 = publicService.pathToGree(p);
-                File nFile = publicService.createf(fid1);
-                baseService.saveToFile(ossUtil.getUrlWw(item.getFileUrl()),nFile);
-                fileo = fid1;
-                bxf = uploadInitFileBx(fileo, fid1, wdno.getBrandWebsitId());
+                // 路径
+                fileId = IdWorker.getIdStr() + ".jpeg";
+                fileAdnPath = publicService.pathToGree(fileId);
+                File nFile = publicService.createf(fileAdnPath);
+                baseService.saveToFile(ossUtil.getUrlWw(p),nFile);
+                bxf = uploadInitFileBx(fileAdnPath, fileId, wdno.getBrandWebsitId());
                 if (StringUtils.isEmpty(bxf)){
                     return bxf;
                 }
@@ -645,24 +648,26 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
                 } else {
                     outInsureCert= outInsureCert +","+bxf;
                 }
-                new File(fid1).delete();
+                nFile.delete();
                 num = num +1 ;
             }
         } else {
-            fid1 = publicService.pathToGree(item.getInsureFiles());
-            File nFile = publicService.createf(fid1);
-            baseService.saveToFile(ossUtil.getUrlWw(item.getFileUrl()),nFile);
-            fileo = fid1;
-            bxf = uploadInitFileBx(fileo, fid1, wdno.getBrandWebsitId());
+            // 路径
+            fileId = IdWorker.getIdStr() + ".jpeg";
+            fileAdnPath = publicService.pathToGree(fileId);
+            // 新文件 方便写入
+            File nFile = publicService.createf(fileAdnPath);
+            baseService.saveToFile(ossUtil.getUrlWw(item.getInsureFiles()),nFile);
+            bxf = uploadInitFileBx(fileAdnPath, fileId, wdno.getBrandWebsitId());
             if (StringUtils.isEmpty(bxf)){
                 return bxf;
             }
             outInsureCert = bxf;
-            new File(fid1).delete();
+            nFile.delete();
         }
         item.setOutInsureCert(outInsureCert);
         // 师傅必买保险，所以不会不存在
-        return fid1;
+        return fileAdnPath;
     }
 
     private Boolean uploadFileexc(String fileo, String filet, String wdno,WorkerCert item) throws Exception {
@@ -757,7 +762,7 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
     }
 
 
-    private String  uploadWdnoFile(String wdno,WorkerCert item,String certfile) throws Exception {
+    private String  uploadWdnoFile(String wdno,WorkerCert item,String filePath, String fileId) throws Exception {
         String msg = "";
         String outFile="";
 
@@ -766,16 +771,16 @@ 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()+"/"+certfile);
+            resultData.getExtData().setDir(resultData.getExtData().getDir()+"/"+fileId);
             // 2:文件上传
             PostObjectSample ossPostObject = new PostObjectSample();
-            String result = ossPostObject.PostObject(certfile, resultData.getExtData());
+            String result = ossPostObject.PostObject(filePath, resultData.getExtData());
 
             // 3: 保存文件
             if (StringUtils.isEmpty(result.trim())){
                 Map<String,String> req = new HashMap<>();
                 // 生成对象
-                getSaveFileInfo(certfile, resultData, req);
+                getSaveFileInfo(fileId, resultData, req);
                 GreeFileSaveHelper responses = greeLogic.greePostSaveFile(req);
                 if (responses.getStatusCode() == 200){
                     // 保存文件ID   responses.getData().getId()
@@ -924,22 +929,22 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
     }
 
 
-    private String uploadInitFileBx(String fileo, String fid1,String wdno) throws Exception {
+    private String uploadInitFileBx(String fileAdnPath, String fidId,String wdno) throws Exception {
         String fileId="";
-        if (StringUtils.isNotEmpty(fileo)){
+        if (StringUtils.isNotEmpty(fileAdnPath)){
             // 1: 获取签名信息
             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()+"/"+fidId);
                 // 2:文件上传
                 PostObjectSample ossPostObject = new PostObjectSample();
-                String result = ossPostObject.PostObject(fileo, resultData.getExtData());
+                String result = ossPostObject.PostObject(fileAdnPath, resultData.getExtData());
                 // 3: 保存文件
                 if (StringUtils.isEmpty(result.trim())){
                     Map<String,String>req = new HashMap<>();
                     // 生成对象
-                    getSaveFileInfo(fid1, resultData, req);
+                    getSaveFileInfo(fidId, resultData, req);
                     GreeFileSaveHelper responses = greeLogic.greePostSaveFile(req);
 
                     if (responses.getStatusCode() == 200){
@@ -1029,13 +1034,13 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
     }
 
 
-    private void getSaveFileInfo(String id1, ResultData resultData, Map<String, String> req) {
+    private void getSaveFileInfo(String fileId, ResultData resultData, Map<String, String> req) {
         req.put("bizAppId","flydiy-auto-sit-default-front-greeshmerge");
         req.put("bizTable","default");
         req.put("bizType","default");
         req.put("accessType","auth");
         req.put("url", resultData.getExtData().getDir());
-        req.put("name", id1);
+        req.put("name", fileId);
     }
 
 

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

@@ -112,10 +112,10 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         }
 
         // 获取待同步数据
-        recs = getWorkerUploads();
+        // recs = getWorkerUploads();
 
         // 测试用
-        // recs = getWorkerUploadstest();
+        recs = getWorkerUploadstest();
 
         for (OutWorkerUpload item:recs){
             try{

src/main/java/com/zfire/jiasm/syncdata/upload/worker/UploadWorkBx.java

@@ -14,6 +14,9 @@ import java.util.Date;
 
 /**
  * 同步师傅保险证件到格力总部
+ * WebsitWorker.getInsureStatus=2 && isNotNull(WebsitWorker.getInsureFiles)
+ * 网点证件表保存一份供同步师傅信息使用
+ *
  */
 @Slf4j
 @Component

src/main/java/com/zfire/jiasm/syncdata/upload/worker/UploadWorkeCertificate.java

@@ -13,6 +13,9 @@ import java.util.Date;
 
 /**
  * 同步证件到格力总部
+ * .in(WorkerCert::getOutSyncStatus,0,99)
+ * .lt(WorkerCert::getOutSyncTimes,10)
+ * 网点证件表保存一份供师傅同步使用 这里不修改  WorkerCert.out_sync_status
  */
 @Slf4j
 @Component

src/main/java/com/zfire/jiasm/syncdata/upload/worker/UploadWorkerTOGree.java

@@ -13,6 +13,11 @@ import java.util.Date;
 
 /**
  * 同步师傅信息到格力总部
+ * .eq(OutWorkerUpload::getSyncStatus,0)
+ * .or(wrapper->wrapper.eq(OutWorkerUpload::getSyncStatus,99)
+ * .le(OutWorkerUpload::getSyncTimes,10));
+ *
+ * 网点证件表提取证件信息 同步成功后修改 out_worker_upload.sync_status
  */
 @Slf4j
 @Component

src/main/java/com/zfire/jiasm/syncdata/upload/worker/工程师数据同步.txt

@@ -9,4 +9,7 @@ select * from worker_brand_account;
 -- 2：提取格力品牌商网点维修工数据表
 select * from itf_tbl_wangdian_position_download;
 -- 提取待同步的数据
-select * from OutWorkerUpload;
+select * from OutWorkerUpload;
+
+
+

src/main/resources/bootstrap-prdt.properties

@@ -294,8 +294,8 @@ greesms=10000
 SMSSelf_marketing_Rate=5000
 ######################## 同步定时任务配置 ########################
 #师傅 证件、师傅、工单子表信息
-workercertificatec=FALSE
-workerceruploadc=TRUE
+workercertificatec=TRUE
+workerceruploadc=FALSE
 detaildownc=FALSE
 workercertbxc=FALSE
 #回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表