add

src/main/java/com/zfire/jiasm/syncdata/download/order/InstallBusiness.java

@@ -49,8 +49,6 @@ public class InstallBusiness {
     // 3：工单落入本地表
     @Scheduled(fixedDelayString = "${installin}")
     public void inputOrderInstall() {
-
-
         if (installinc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }

src/main/java/com/zfire/jiasm/syncdata/download/order/OrderDownload.java

@@ -20,7 +20,7 @@ public class OrderDownload {
 
 
 
-    // 1：下载安装工单数据
+    // 下载工单数据
     @Scheduled(fixedDelayString = "${installdown}")
     public void download() throws Exception {
         if (netfsxc.equals(TaskConfigEnum.FALSE.getCode())){

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

@@ -39,13 +39,26 @@ public class GLPPWXGQueryAdd {
     GLPPWXGQueryAddService glppwxgQueryAddService;
 
 
+    @Scheduled(fixedDelayString = "${zjzxx}")
+    public void process() throws Exception {
+
+        wxgQueryAddCertInfo();
+
+        wxgQueryAddCategory();
+
+        wxgQueryAddWXGInfo();
+
+    }
+
+
+
+
     /**
      * 从格力总部同步师傅的证件照 只用来新增
      * 师傅状态离职不同步
      * 师傅在平台中不存在不同步
      * 已同步过的不再同步
      */
-    @Scheduled(fixedDelayString = "${zjzxx}")
     public void wxgQueryAddCertInfo() throws Exception {
         if (zjzxxc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
@@ -64,7 +77,6 @@ public class GLPPWXGQueryAdd {
     /**
      * 新增 师傅服务类目信息 这里只做新增(只新增从格力总部过来的师傅服务的类目信息)
      */
-    @Scheduled(fixedDelayString = "${lmxx}")
     public void wxgQueryAddCategory() throws Exception {
         if (lmxxc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
@@ -83,7 +95,6 @@ public class GLPPWXGQueryAdd {
     /**
      * 新增师傅地理位置  不再执行 由 wxgQueryAddWXGInfo 来完成
      */
-    @Scheduled(fixedDelayString = "${wxgwz}")
     public void wxgQueryAdd() throws Exception {
         if (wxgwzc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
@@ -102,7 +113,6 @@ public class GLPPWXGQueryAdd {
     /**
      * 新增格力网点维修工数据
      */
-    @Scheduled(fixedDelayString = "${wxgwzt}")
     public void wxgQueryAddWXGInfo() throws Exception {
         if (wxgwztc.equals(TaskConfigEnum.FALSE.getCode())){
             return;

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

@@ -0,0 +1,5 @@
+package com.zfire.jiasm.syncdata.service;
+
+public interface WorkerUploadService {
+    void syncData() throws Exception;
+}

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

@@ -0,0 +1,85 @@
+package com.zfire.jiasm.syncdata.service.impl;
+
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
+import com.zfire.jiasm.syncdata.service.UploadWorkeCertificateService;
+import com.zfire.jiasm.syncdata.service.UploadWorkerTOGreeService;
+import com.zfire.jiasm.syncdata.service.WorkerUploadService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Slf4j
+@Service
+public class WorkerUploadServiceImpl implements WorkerUploadService {
+    @Value("${workercertificatec}")
+    private String workercertificatec = "";
+    @Value("${workerceruploadc}")
+    private String workerceruploadc = "";
+
+    @Autowired
+    UploadWorkeCertificateService uploadWorkeCertificateService;
+
+
+    @Autowired
+    UploadWorkerTOGreeService uploadWorkerTOGreeService;
+
+
+
+    @Override
+    public void syncData() throws Exception {
+
+        processUploadTask();
+
+        uploadWorkProcess();
+
+    }
+
+
+
+
+
+
+    // 师傅证件照同步到格力总部
+    public void processUploadTask(){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if (workercertificatec.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        log.info("开始同步师傅证件信息: \uF0B7{}",sdf.format(new Date()));
+
+        uploadWorkeCertificateService.procesUploadWorkeCert();
+
+        log.info("同步师傅证件信息结束: \uF0B7{}",sdf.format(new Date()));
+    }
+
+
+    /** 同步师傅信息到格力总部
+     * 无论新增或是修改-所有证件都必须重新上传一次
+     * 师傅所在网点都要上传一次
+     * @throws Exception
+     */
+    public void uploadWorkProcess() throws Exception {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if (workerceruploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        log.info("开始同步师傅信息到格力总部: \uF0B7{}",sdf.format(new Date()));
+
+        uploadWorkerTOGreeService.procesUploadWorker();
+
+        log.info("同步师傅信息到格力总部完成: \uF0B7{}",sdf.format(new Date()));
+        return;
+    }
+
+
+
+
+
+}

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

@@ -15,7 +15,7 @@ import java.util.Date;
  * 同步证件到格力总部
  */
 @Slf4j
-@Component
+// @Component
 public class UploadWorkeCertificate {
     @Value("${workercertificatec}")
     private String workercertificatec = "";
@@ -26,7 +26,7 @@ public class UploadWorkeCertificate {
 
 
     // 师傅证件照同步到格力总部
-    @Scheduled(fixedDelayString = "${workercertificate}")
+    /*@Scheduled(fixedDelayString = "${workercertificate}")
     public void processUploadTask(){
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -39,6 +39,6 @@ public class UploadWorkeCertificate {
         uploadWorkeCertificateService.procesUploadWorkeCert();
 
         log.info("同步师傅证件信息结束: \uF0B7{}",sdf.format(new Date()));
-    }
+    }*/
 
 }

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

@@ -15,7 +15,7 @@ import java.util.Date;
  * 同步师傅信息到格力总部
  */
 @Slf4j
-@Component
+// @Component
 public class UploadWorkerTOGree {
     @Value("${workerceruploadc}")
     private String workerceruploadc = "";
@@ -30,7 +30,7 @@ public class UploadWorkerTOGree {
      * 师傅所在网点都要上传一次
      * @throws Exception
      */
-    @Scheduled(fixedDelayString = "${workercerupload}")
+    /*@Scheduled(fixedDelayString = "${workercerupload}")
     public void uploadWorkProcess() throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         if (workerceruploadc.equals(TaskConfigEnum.FALSE.getCode())){
@@ -43,6 +43,6 @@ public class UploadWorkerTOGree {
 
         log.info("同步师傅信息到格力总部完成: \uF0B7{}",sdf.format(new Date()));
         return;
-    }
+    }*/
 
 }

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

@@ -0,0 +1,32 @@
+package com.zfire.jiasm.syncdata.upload.worker;
+
+
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
+import com.zfire.jiasm.syncdata.service.UploadWorkeCertificateService;
+import com.zfire.jiasm.syncdata.service.WorkerUploadService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Slf4j
+@Component
+public class WorkerUpload {
+    @Value("${workercertificatec}")
+    private String workercertificatec = "";
+
+    @Autowired
+    WorkerUploadService workerUploadService;
+
+    @Scheduled(fixedDelayString = "${workercertificate}")
+    public void process() throws Exception {
+
+        workerUploadService.syncData();
+
+    }
+
+}