add

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

@@ -51,6 +51,17 @@ public class GLPPWXGQueryAdd {
         wxgQueryAddWXGInfo();
     }
 
+    @Scheduled(fixedDelayString = "${zjzxx}")
+    public void processCert() throws Exception {
+        // 格力总部同步下来的证件照处理
+        // wxgQueryAddCert();
+    }
+
+
+
+
+
+
     @Scheduled(fixedDelayString = "${lmxx}")
     public void processLM() throws Exception {
         if (lmxxc.equals(TaskConfigEnum.FALSE.getCode())){
@@ -86,6 +97,27 @@ public class GLPPWXGQueryAdd {
 
     }
 
+    /**
+     * 从格力总部同步师傅的证件照数据生成平台的证件图信息
+     */
+    public void wxgQueryAddCert() throws Exception {
+        if (zjzxxc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        log.info("开始生成网点师傅证件照信息: \uF0B7{}",sdf.format(new Date()));
+        try {
+            glppwxgQueryAddService.extractedCert();
+            log.info("同步生成网点师傅证件照信息结束: \uF0B7{}",sdf.format(new Date()));
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            log.info("同步生成网点师傅证件照信息失败: \uF0B7{}",sdf.format(new Date()));
+        }
+
+    }
+
 
     /**
      * 新增 师傅服务类目信息 这里只做新增(只新增从格力总部过来的师傅服务的类目信息)

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

@@ -10,6 +10,6 @@ public interface GLPPWXGQueryAddService {
 
     void extracteWxgQueryAddWXGInfo() throws Exception;
 
-
+    void extractedCert() throws Exception;
 
 }

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

@@ -154,9 +154,6 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                 continue;
             }
 
-
-
-
             // 有证件信息的师傅不再新增
             /*if (WorkerCertWorkerIdMaps.containsKey(workerId)){
                 continue;
@@ -201,6 +198,27 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
     }
 
+
+    @Override
+    public void extractedCert() throws Exception{
+        List<WorkerCert> workerCertList = new ArrayList<>();
+        List<WorkerCert> workerCertUpList = new ArrayList<>();
+        // 提取需要处理的证件照数据
+
+        workerCertList = workerCertService.lambdaQuery()
+                .eq(WorkerCert::getOutZjljProcess,0)
+                .isNotNull(WorkerCert::getOutZjlj).list();
+        extractedCertInfo();
+
+        for (WorkerCert item :workerCertList){
+            processCertInfo(item);
+
+        }
+
+
+
+    }
+
     private void upWebsitWorker(List<WebsitWorker> websitWorkerUp) {
         if (websitWorkerUp.size()>0){
             websitWorkerService.saveOrUpdateBatch(websitWorkerUp);
@@ -739,6 +757,33 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         addList.add(add);
     }
 
+
+    private void processCertInfo(WorkerCert workerCert) throws Exception {
+        if (workerCert.getOutZjlj().contains(",")){
+            List<String> result = Arrays.asList(workerCert.getOutZjlj().split(","));
+            // 上传图片
+            String id = putCert(result.get(0));
+            if (StringUtils.isNotEmpty(id)){
+                workerCert.setFileUrl(id);
+                workerCert.setOutFileUrl(result.get(0));
+                new File(id).delete();
+            }
+            String id2 = putCert(result.get(1));
+            if (StringUtils.isNotEmpty(id2)){
+                workerCert.setFileUrl2(id2);
+                workerCert.setOutFileUrl2(result.get(1));
+                new File(id2).delete();
+            }
+        } else {
+            String id = putCert(workerCert.getOutZjlj());
+            if (StringUtils.isNotEmpty(id)){
+                workerCert.setFileUrl(id);
+                workerCert.setOutFileUrl(workerCert.getOutZjlj());
+                new File(id).delete();
+            }
+        }
+    }
+
     private void setAdd(WangdianWxgVos wvos, String workerId, String workerName, ZJInfo zj, WorkerCert add) throws ParseException {
         add.setId(UUID.randomUUID().toString());
         add.setWorkerId(workerId);

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

@@ -241,6 +241,9 @@ public class InstallProduceUploadListServiceImpl implements InstallProduceUpload
 
         // 安装工单处理
         if (orderBase !=null){
+            log.info("预处理前取工单状态值："+ orderBase.getId()+">"+orderBase.getOrderStatus());
+
+
             InstallOrderBase(itemTableNameId, orderBase.getUpdateTime(), orderBase, ojtgutls, itemTableName, itemOrderType);
         }
 

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

@@ -283,6 +283,10 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                 .one();
 
         if (orderBase !=null  && orderBase.getUploadFlag()){
+
+
+            log.info("生成数据前取工单状态值："+ orderBase.getId()+">"+orderBase.getOrderStatus());
+
             // 安装工单产品信息,操作日志,完工明细,完工明细附件
             // 预约改约-总部短信发送请求表,派服务人员-短信发送请求表 以主表的pgguid统一修改
             upPgguid(orderBase);