add

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

@@ -38,7 +38,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 @Slf4j
 @Service
-public class DataUploadLogic {
+public class DataUploadLogic {/*
     @Value("${baseurl}")
     private String baseurl;
     @Autowired
@@ -419,5 +419,5 @@ public class DataUploadLogic {
             redis.set(Constant.RedisPrefix.TOKEN_GREE_UPLOAD, DataUploadNew.accessToken,5 * 60);
         }
         return DataUploadNew.accessToken;
-    }
+    }*/
 }

src/main/java/com/zfire/jiasm/syncdata/download/basedata/GLPPGFWebsit.java

@@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.zfire.jiasm.syncdata.constant.InterFaceTypeEnum;
 import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.data.Token;
+import com.zfire.jiasm.syncdata.plus.entity.Brand;
+import com.zfire.jiasm.syncdata.plus.service.BrandService;
 import com.zfire.jiasm.syncdata.service.GLPPGFWebsitService;
 import com.zfire.jiasm.syncdata.utils.HttpUtil;
 import com.zfire.jiasm.syncdata.utils.JSONResult;
@@ -17,9 +19,7 @@ import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 格力品牌广佛网点基础资料下载(销售与售后)
@@ -42,165 +42,69 @@ public class GLPPGFWebsit {
     TokenCenter tokenCenter;
     @Resource
     GLPPGFWebsitService glppgfWebsitService;
+    @Resource
+    BrandService brandService;
+
 
 
-    /**
-     * X2300000 佛山销售网点基础资料下载
-     * @return
-     */
     @Scheduled(fixedDelayString = "${netfsx}")
-    public void processFSXSWDTask() throws Exception {
+    public void process() throws Exception {
         if (netfsxc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Map<String, String> paramMap = new HashMap<String, String>();
-
-        log.info("开始下载佛山销售网点基础资料信息: \uF0B7{}",sdf.format(new Date()));
-
-        Token token = tokenCenter.getCurrentToken();
-        String url = baseurl + InterFaceTypeEnum.GLXSSH_WEBSIT.getCode() + "/querylist";
-        paramMap.put("belongCompany", InterFaceTypeEnum.FSXS_WEBSIT_CODE.getCode());
-        String paramJson= JSON.toJSONString(paramMap);
-
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载佛山销售网点基础资料信息失败！: {}",jsonResult.getMessage());
-            return;
-        }
-
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
-        if (jsonArray != null) {
-            log.info("佛山销售网点下载了{}条数据",jsonArray.size());
-
-            glppgfWebsitService.extractedFSXS(jsonArray);
-
-            log.info("佛山销售网点基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
-    }
-
-    /**
-     * X2100000 广州销售网点基础资料下载
-     * @return
-     */
-    @Scheduled(fixedDelayString = "${netgzx}")
-    public void processGZXSWDTask() throws Exception {
-
-
-        if (netgzxc.equals(TaskConfigEnum.FALSE.getCode())){
-            return;
-        }
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Map<String, String> paramMap = new HashMap<String, String>();
-
-        log.info("开始下载广州销售网点基础资料信息: \uF0B7{}",sdf.format(new Date()));
-
-        Token token = tokenCenter.getCurrentToken();
-        String url = baseurl + InterFaceTypeEnum.GLXSSH_WEBSIT.getCode() + "/querylist";
-        paramMap.put("belongCompany", InterFaceTypeEnum.GZXS_WEBSIT_CODE.getCode());
-        String paramJson= JSON.toJSONString(paramMap);
-
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载广州销售网点基础资料信息失败！: {}",jsonResult.getMessage());
-            return;
-        }
-
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
-        if (jsonArray != null) {
-            log.info("广州销售网点下载了{}条数据",jsonArray.size());
-
-            glppgfWebsitService.extractedGZXS(jsonArray);
-
-            log.info("广州销售网点基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
-    }
-
-    /**
-     * S9219807 佛山售后网点基础资料下载
-     * @return
-     */
-    @Scheduled(fixedDelayString = "${netfss}")
-    public void processFSSHWDTask() throws Exception {
-
-
-        if (netfssc.equals(TaskConfigEnum.FALSE.getCode())){
-            return;
-        }
-
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Map<String, String> paramMap = new HashMap<String, String>();
+        List<String> req = new ArrayList<>();
 
-        log.info("开始下载佛山售后网点基础资料信息: \uF0B7{}",sdf.format(new Date()));
-
-
-        Token token = tokenCenter.getCurrentToken();
-        String url = baseurl + InterFaceTypeEnum.GLXSSH_WEBSIT.getCode() + "/querylist";
-        paramMap.put("belongCompany", InterFaceTypeEnum.FSSH_WEBSIT_CODE.getCode());
-        String paramJson= JSON.toJSONString(paramMap);
-
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载佛山售后网点基础资料信息失败！: {}",jsonResult.getMessage());
+        // 提取品牌信息
+        Brand record = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
+        if (record == null){
+            log.info("格力品牌信息不存在【brand】");
             return;
         }
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
 
-        if (jsonArray != null) {
-            log.info("佛山售后网点下载了{}条数据",jsonArray.size());
+        req.add(InterFaceTypeEnum.FSXS_WEBSIT_CODE.getCode());
+        req.add(InterFaceTypeEnum.GZXS_WEBSIT_CODE.getCode());
+        req.add(InterFaceTypeEnum.FSSH_WEBSIT_CODE.getCode());
+        req.add(InterFaceTypeEnum.GSSH_WEBSIT_CODE.getCode());
+        String synTaskNo = UUID.randomUUID().toString();
 
-            glppgfWebsitService.extractedFSSH(jsonArray);
-
-            log.info("佛山售后网点基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
-    }
-
-
-    /**
-     * S9219801 广州售后网点基础资料下载
-     * @return
-     */
-    @Scheduled(fixedDelayString = "${netgzs}")
-    public void processGZSHWDTask() throws Exception {
-
-        if (netgzsc.equals(TaskConfigEnum.FALSE.getCode())){
-            return;
-        }
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Map<String, String> paramMap = new HashMap<String, String>();
-
-        log.info("开始下载广州售后网点基础资料信息: \uF0B7{}",sdf.format(new Date()));
+        log.info("开始下载网点基础资料信息: \uF0B7{}",sdf.format(new Date()));
 
         Token token = tokenCenter.getCurrentToken();
         String url = baseurl + InterFaceTypeEnum.GLXSSH_WEBSIT.getCode() + "/querylist";
-        paramMap.put("belongCompany",InterFaceTypeEnum.GSSH_WEBSIT_CODE.getCode());
-        String paramJson= JSON.toJSONString(paramMap);
-
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (StringUtils.isEmpty(jsonResult.getStatus()) || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载广州售后网点基础资料信息失败！: {}",jsonResult.getMessage());
-            return;
+        for (String bc :req){
+            try{
+                paramMap.put("belongCompany", bc);
+                String paramJson= JSON.toJSONString(paramMap);
+
+                JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+                if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+                    log.info("下载网点基础资料信息失败！: {}",jsonResult.getMessage());
+                    continue;
+                }
+
+                JSONArray jsonArray = (JSONArray) jsonResult.getData();
+                if (jsonArray != null) {
+                    log.info("网点下载了{}条数据",jsonArray.size());
+                    if (bc.equals(InterFaceTypeEnum.FSXS_WEBSIT_CODE.getCode())){
+                        glppgfWebsitService.extractedFSXS(jsonArray, record, synTaskNo);
+                    } else if (bc.equals(InterFaceTypeEnum.GZXS_WEBSIT_CODE.getCode())){
+                        glppgfWebsitService.extractedGZXS(jsonArray, record, synTaskNo);
+                    } else if (bc.equals(InterFaceTypeEnum.FSSH_WEBSIT_CODE.getCode())){
+                        glppgfWebsitService.extractedFSSH(jsonArray, record, synTaskNo);
+                    } else if (bc.equals(InterFaceTypeEnum.GSSH_WEBSIT_CODE.getCode())){
+                        glppgfWebsitService.extractedGZSH(jsonArray, record, synTaskNo);
+                    }
+                }else {
+                    log.info("["+url+"]无数据");
+                }
+            } catch (Exception ex) {
+                log.info("网点基础资料信息处理失败");
+                ex.printStackTrace();
+            }
         }
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
 
-        if (!StringUtils.isEmpty(jsonArray)) {
-            log.info("广州售后网点下载了{}条数据",jsonArray.size());
-
-            glppgfWebsitService.extractedGZSH(jsonArray);
-
-            log.info("广州售后网点基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
+        log.info("网点基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
     }
-
 }

src/main/java/com/zfire/jiasm/syncdata/download/basedata/GLPPGFWebsitBak.java

@@ -0,0 +1,215 @@
+package com.zfire.jiasm.syncdata.download.basedata;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/** 线程太多合到到一个线程中处理
+ * 格力品牌广佛网点基础资料下载(销售与售后)
+ */
+@Slf4j
+@Component
+public class GLPPGFWebsitBak {
+    /*
+    @Value("${baseurl}")
+    private String baseurl = "";
+    @Value("${netfsxc}")
+    private String netfsxc = "";
+    @Value("${netgzsc}")
+    private String netgzsc = "";
+    @Value("${netgzxc}")
+    private String netgzxc = "";
+    @Value("${netfssc}")
+    private String netfssc = "";
+
+    @Resource
+    TokenCenter tokenCenter;
+    @Resource
+    GLPPGFWebsitService glppgfWebsitService;
+    @Resource
+    BrandService brandService;
+
+
+    // X2300000 佛山销售网点基础资料下载
+    @Scheduled(fixedDelayString = "${netfsx}")
+    public void processFSXSWDTask() throws Exception {
+        if (netfsxc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map<String, String> paramMap = new HashMap<String, String>();
+
+        // 提取品牌信息
+        Brand record = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
+        if (record == null){
+            log.info("格力品牌信息不存在【brand】");
+            return;
+        }
+
+        String synTaskNo = UUID.randomUUID().toString();
+
+
+        log.info("开始下载佛山销售网点基础资料信息: \uF0B7{}",sdf.format(new Date()));
+
+        Token token = tokenCenter.getCurrentToken();
+        String url = baseurl + InterFaceTypeEnum.GLXSSH_WEBSIT.getCode() + "/querylist";
+        paramMap.put("belongCompany", InterFaceTypeEnum.FSXS_WEBSIT_CODE.getCode());
+        String paramJson= JSON.toJSONString(paramMap);
+
+        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+            log.info("下载佛山销售网点基础资料信息失败！: {}",jsonResult.getMessage());
+            return;
+        }
+
+        JSONArray jsonArray = (JSONArray) jsonResult.getData();
+        if (jsonArray != null) {
+            log.info("佛山销售网点下载了{}条数据",jsonArray.size());
+
+            glppgfWebsitService.extractedFSXS(jsonArray, record, synTaskNo);
+
+            log.info("佛山销售网点基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
+        }else {
+            log.info("["+url+"]无数据");
+        }
+    }
+
+    // X2100000 广州销售网点基础资料下载
+    @Scheduled(fixedDelayString = "${netgzx}")
+    public void processGZXSWDTask() throws Exception {
+
+
+        if (netgzxc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map<String, String> paramMap = new HashMap<String, String>();
+
+        // 提取品牌信息
+        Brand record = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
+        if (record == null){
+            log.info("格力品牌信息不存在【brand】");
+            return;
+        }
+
+        String synTaskNo = UUID.randomUUID().toString();
+
+        log.info("开始下载广州销售网点基础资料信息: \uF0B7{}",sdf.format(new Date()));
+
+        Token token = tokenCenter.getCurrentToken();
+        String url = baseurl + InterFaceTypeEnum.GLXSSH_WEBSIT.getCode() + "/querylist";
+        paramMap.put("belongCompany", InterFaceTypeEnum.GZXS_WEBSIT_CODE.getCode());
+        String paramJson= JSON.toJSONString(paramMap);
+
+        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+            log.info("下载广州销售网点基础资料信息失败！: {}",jsonResult.getMessage());
+            return;
+        }
+
+        JSONArray jsonArray = (JSONArray) jsonResult.getData();
+        if (jsonArray != null) {
+            log.info("广州销售网点下载了{}条数据",jsonArray.size());
+
+            glppgfWebsitService.extractedGZXS(jsonArray, record, synTaskNo);
+
+            log.info("广州销售网点基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
+        }else {
+            log.info("["+url+"]无数据");
+        }
+    }
+
+    // S9219807 佛山售后网点基础资料下载
+    @Scheduled(fixedDelayString = "${netfss}")
+    public void processFSSHWDTask() throws Exception {
+
+
+        if (netfssc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        // 提取品牌信息
+        Brand record = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
+        if (record == null){
+            log.info("格力品牌信息不存在【brand】");
+            return;
+        }
+
+        String synTaskNo = UUID.randomUUID().toString();
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map<String, String> paramMap = new HashMap<String, String>();
+
+        log.info("开始下载佛山售后网点基础资料信息: \uF0B7{}",sdf.format(new Date()));
+
+
+        Token token = tokenCenter.getCurrentToken();
+        String url = baseurl + InterFaceTypeEnum.GLXSSH_WEBSIT.getCode() + "/querylist";
+        paramMap.put("belongCompany", InterFaceTypeEnum.FSSH_WEBSIT_CODE.getCode());
+        String paramJson= JSON.toJSONString(paramMap);
+
+        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+            log.info("下载佛山售后网点基础资料信息失败！: {}",jsonResult.getMessage());
+            return;
+        }
+        JSONArray jsonArray = (JSONArray) jsonResult.getData();
+
+        if (jsonArray != null) {
+            log.info("佛山售后网点下载了{}条数据",jsonArray.size());
+
+            glppgfWebsitService.extractedFSSH(jsonArray, record, synTaskNo);
+
+            log.info("佛山售后网点基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
+        }else {
+            log.info("["+url+"]无数据");
+        }
+    }
+
+
+    // S9219801 广州售后网点基础资料下载
+    @Scheduled(fixedDelayString = "${netgzs}")
+    public void processGZSHWDTask() throws Exception {
+
+        if (netgzsc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        // 提取品牌信息
+        Brand record = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
+        if (record == null){
+            log.info("格力品牌信息不存在【brand】");
+            return;
+        }
+
+        String synTaskNo = UUID.randomUUID().toString();
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map<String, String> paramMap = new HashMap<String, String>();
+
+        log.info("开始下载广州售后网点基础资料信息: \uF0B7{}",sdf.format(new Date()));
+
+        Token token = tokenCenter.getCurrentToken();
+        String url = baseurl + InterFaceTypeEnum.GLXSSH_WEBSIT.getCode() + "/querylist";
+        paramMap.put("belongCompany",InterFaceTypeEnum.GSSH_WEBSIT_CODE.getCode());
+        String paramJson= JSON.toJSONString(paramMap);
+
+        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+        if (StringUtils.isEmpty(jsonResult.getStatus()) || !jsonResult.getStatus().toString().equals("200")) {
+            log.info("下载广州售后网点基础资料信息失败！: {}",jsonResult.getMessage());
+            return;
+        }
+        JSONArray jsonArray = (JSONArray) jsonResult.getData();
+
+        if (!StringUtils.isEmpty(jsonArray)) {
+            log.info("广州售后网点下载了{}条数据",jsonArray.size());
+
+            glppgfWebsitService.extractedGZSH(jsonArray, record, synTaskNo);
+
+            log.info("广州售后网点基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
+        }else {
+            log.info("["+url+"]无数据");
+        }
+    }*/
+
+}

src/main/java/com/zfire/jiasm/syncdata/download/basedata/GLPPGFWebsitWorker.java

@@ -16,9 +16,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 格力品牌广佛网点维修工基础资料下载（销售与售后网点维修工）
@@ -50,158 +48,60 @@ public class GLPPGFWebsitWorker {
     GLPPGFWebsitWorkerService glppgfWebsitWorkerService;
 
 
-
-
-    /**
-     * X2300000 佛山销售网点维修工基础资料下载
-     * @return
-     */
+    // 网点维修工基础资料下载
     @Scheduled(fixedDelayString = "${fsxwxg}")
-    public void processFSXSWDTask() throws Exception {
+    public void process() throws Exception {
         if (fsxwxgc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        List<String> req = new ArrayList<>();
         Map<String, String> paramMap = new HashMap<String, String>();
 
-        log.info("开始下载佛山销售网点维修工基础资料信息: \uF0B7{}",sdf.format(new Date()));
-
-        Token token = tokenCenter.getCurrentToken();
-        String url = baseurl + InterFaceTypeEnum.GLXSSH_WEBSIT_WORK.getCode() + "/querylist";
-        paramMap.put("belongCompany", InterFaceTypeEnum.FSXS_WEBSIT_CODE.getCode());
-        String paramJson= JSON.toJSONString(paramMap);
-
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载佛山销售网点维修工基础资料信息失败！: {}",jsonResult.getMessage());
-            return;
-        }
-
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
-        if (jsonArray != null) {
-            log.info("佛山销售网点维修工下载了{}条数据",jsonArray.size());
-
-            glppgfWebsitWorkerService.extractedFSXS(jsonArray);
-
-            log.info("佛山销售网点维修工基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
-    }
-
-    /**
-     * X2100000 广州销售网点维修工基础资料下载
-     * @return
-     */
-    @Scheduled(fixedDelayString = "${gzxwxg}")
-    public void processGZXSWDTask() throws Exception {
-        if (gzxwxgc.equals(TaskConfigEnum.FALSE.getCode())){
-            return;
-        }
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Map<String, String> paramMap = new HashMap<String, String>();
-
-        log.info("开始下载广州销售网点维修工基础资料信息: \uF0B7{}",sdf.format(new Date()));
-
-        Token token = tokenCenter.getCurrentToken();
-        String url = baseurl + InterFaceTypeEnum.GLXSSH_WEBSIT_WORK.getCode() + "/querylist";
-        paramMap.put("belongCompany", InterFaceTypeEnum.GZXS_WEBSIT_CODE.getCode());
-        String paramJson= JSON.toJSONString(paramMap);
-
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载广州销售网点维修工基础资料信息失败！: {}",jsonResult.getMessage());
-            return;
-        }
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
-
-        if (jsonArray != null) {
-            log.info("广州销售网点维修工下载了{}条数据",jsonArray.size());
-
-            glppgfWebsitWorkerService.extractedGZXS(jsonArray);
-
-            log.info("广州销售网点维修工基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
-    }
-
-    /**
-     * S9219807 佛山售后网点维修工基础资料下载
-     * @return
-     */
-    @Scheduled(fixedDelayString = "${fsswxg}")
-    public void processFSSHWDTask() throws Exception {
-        if (fsswxgc.equals(TaskConfigEnum.FALSE.getCode())){
-            return;
-        }
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Map<String, String> paramMap = new HashMap<String, String>();
-
-        log.info("开始下载佛山售后网点维修工基础资料信息: \uF0B7{}",sdf.format(new Date()));
-
-        Token token = tokenCenter.getCurrentToken();
-        String url = baseurl + InterFaceTypeEnum.GLXSSH_WEBSIT_WORK.getCode() + "/querylist";
-        paramMap.put("belongCompany", InterFaceTypeEnum.FSSH_WEBSIT_CODE.getCode());
-        String paramJson= JSON.toJSONString(paramMap);
-
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载佛山售后网点维修工基础资料信息失败！: {}",jsonResult.getMessage());
-            return;
-        }
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
-
-        if (jsonArray != null) {
-            log.info("佛山售后网点维修工下载了{}条数据",jsonArray.size());
+        req.add(InterFaceTypeEnum.FSXS_WEBSIT_CODE.getCode());
+        req.add(InterFaceTypeEnum.GZXS_WEBSIT_CODE.getCode());
+        req.add(InterFaceTypeEnum.FSSH_WEBSIT_CODE.getCode());
+        req.add(InterFaceTypeEnum.GSSH_WEBSIT_CODE.getCode());
 
-            glppgfWebsitWorkerService.extractedFSSH(jsonArray);
-
-            log.info("佛山售后网点维修工基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
-    }
-
-    /**
-     * S9219801 广州售后网点维修工基础资料下载
-     * @return
-     */
-    @Scheduled(fixedDelayString = "${gzswxg}")
-    public void processGZSHWDTask() throws Exception {
-        if (gzswxgc.equals(TaskConfigEnum.FALSE.getCode())){
-            return;
-        }
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Map<String, String> paramMap = new HashMap<String, String>();
-
-        log.info("开始下载广州售后网点维修工基础资料信息: \uF0B7{}",sdf.format(new Date()));
+        log.info("开始下载网点维修工基础资料信息: \uF0B7{}",sdf.format(new Date()));
 
         Token token = tokenCenter.getCurrentToken();
         String url = baseurl + InterFaceTypeEnum.GLXSSH_WEBSIT_WORK.getCode() + "/querylist";
-        paramMap.put("belongCompany", InterFaceTypeEnum.GSSH_WEBSIT_CODE.getCode());
-        String paramJson= JSON.toJSONString(paramMap);
-
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载广州售后网点维修工基础资料信息失败！: {}",jsonResult.getMessage());
-            return;
+        for (String bc :req){
+            try{
+                paramMap.put("belongCompany", bc);
+                String paramJson= JSON.toJSONString(paramMap);
+
+                JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+                if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+                    log.info("下载佛山销售网点维修工基础资料信息失败！: {}",jsonResult.getMessage());
+                    continue;
+                }
+
+                JSONArray jsonArray = (JSONArray) jsonResult.getData();
+                if (jsonArray != null) {
+                    log.info("网点维修工下载了{}条数据",jsonArray.size());
+
+                    if (bc.equals(InterFaceTypeEnum.FSXS_WEBSIT_CODE.getCode())){
+                        glppgfWebsitWorkerService.extractedFSXS(jsonArray);
+                    } else if (bc.equals(InterFaceTypeEnum.GZXS_WEBSIT_CODE.getCode())){
+                        glppgfWebsitWorkerService.extractedGZXS(jsonArray);
+                    } else if (bc.equals(InterFaceTypeEnum.FSSH_WEBSIT_CODE.getCode())){
+                        glppgfWebsitWorkerService.extractedFSSH(jsonArray);
+                    } else if (bc.equals(InterFaceTypeEnum.GSSH_WEBSIT_CODE.getCode())){
+                        glppgfWebsitWorkerService.extractedGZSH(jsonArray);
+                    }
+                }else {
+                    log.info("["+url+"]无数据");
+                }
+            } catch (Exception ex) {
+                log.info("网点维修工基础资料信息处理失败");
+                ex.printStackTrace();
+            }
         }
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
 
-        if (jsonArray != null) {
-            log.info("广州售后网点维修工下载了{}条数据",jsonArray.size());
-
-            glppgfWebsitWorkerService.extractedGZSH(jsonArray);
-
-            log.info("广州售后网点维修工基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
+        log.info("网点维修工基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
     }
 
 
@@ -209,7 +109,7 @@ public class GLPPGFWebsitWorker {
     // 师傅信息一定新增
     // 品牌网点与平台网点有对应关系才会同步生成相应的网点数据
     @Scheduled(fixedDelayString = "${gfwww}")
-    private void process() {
+    private void processData() {
         if (gfwwwc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }

src/main/java/com/zfire/jiasm/syncdata/download/basedata/GLPPGFWebsitWorkerBak.java

@@ -1,751 +0,0 @@
-package com.zfire.jiasm.syncdata.download.basedata;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
-import com.zfire.jiasm.syncdata.constant.InterFaceTypeEnum;
-import com.zfire.jiasm.syncdata.data.Token;
-import com.zfire.jiasm.syncdata.plus.entity.ItfTblWangdianWxgDownload;
-import com.zfire.jiasm.syncdata.plus.entity.WebsitWorker;
-import com.zfire.jiasm.syncdata.plus.service.ItfTblWangdianWxgDownloadService;
-import com.zfire.jiasm.syncdata.plus.service.WebsitWorkerService;
-import com.zfire.jiasm.syncdata.utils.HttpUtil;
-import com.zfire.jiasm.syncdata.utils.JSONResult;
-import com.zfire.jiasm.syncdata.utils.MyBeanUtils;
-import com.zfire.jiasm.syncdata.utils.TokenCenter;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 格力品牌广佛网点维修工基础资料下载（销售与售后网点维修工）
- */
-@Slf4j
-@Component
-public class GLPPGFWebsitWorkerBak {
-    @Value("${baseurl}")
-    private String baseurl = "";
-
-    @Resource
-    TokenCenter tokenCenter;
-    @Resource
-    ItfTblWangdianWxgDownloadService itfTblWangdianWxgDownloadService;
-    @Resource
-    WebsitWorkerService websitWorkerService;
-
-
-
-    /**
-     * X2300000 佛山销售网点维修工基础资料下载
-     * @return
-     */
-    @Scheduled(fixedDelayString = "${fsxwxg}")
-    @Transactional(rollbackFor = Exception.class)
-    public void processFSXSWDTask() throws Exception {
-        if (1==1){
-            return;
-        }
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Map<String, String> paramMap = new HashMap<String, String>();
-        List<ItfTblWangdianWxgDownload> addRec = new ArrayList<>();
-        List<ItfTblWangdianWxgDownload> updateRec = new ArrayList<>();
-
-        log.info("开始下载佛山销售网点维修工基础资料信息: \uF0B7{}",sdf.format(new Date()));
-
-        Token token = tokenCenter.getCurrentToken();
-        String url = baseurl + InterFaceTypeEnum.GLXSSH_WEBSIT_WORK.getCode() + "/querylist";
-        paramMap.put("belongCompany", InterFaceTypeEnum.FSXS_WEBSIT_CODE.getCode());
-        String paramJson= JSON.toJSONString(paramMap);
-
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载佛山销售网点维修工基础资料信息失败！: {}",jsonResult.getMessage());
-            return;
-        }
-
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
-        if (jsonArray != null) {
-            log.info("佛山销售网点维修工下载了{}条数据",jsonArray.size());
-
-            // 数据同步落到同步信息表
-            extractedAddOrUpdate(addRec, updateRec, jsonArray);
-
-            // 数据同步到本地表
-            extractedLocalAddOrUpdate(addRec, updateRec);
-
-
-            log.info("佛山销售网点维修工基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
-    }
-
-    /**
-     * X2100000 广州销售网点维修工基础资料下载
-     * @return
-     */
-    @Scheduled(fixedDelayString = "${gzxwxg}")
-    @Transactional(rollbackFor = Exception.class)
-    public void processGZXSWDTask() throws Exception {
-        if (1==1){
-            return;
-        }
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Map<String, String> paramMap = new HashMap<String, String>();
-        List<ItfTblWangdianWxgDownload> addRec = new ArrayList<>();
-        List<ItfTblWangdianWxgDownload> updateRec = new ArrayList<>();
-
-        log.info("开始下载广州销售网点维修工基础资料信息: \uF0B7{}",sdf.format(new Date()));
-
-        Token token = tokenCenter.getCurrentToken();
-        String url = baseurl + InterFaceTypeEnum.GLXSSH_WEBSIT_WORK.getCode() + "/querylist";
-        paramMap.put("belongCompany", InterFaceTypeEnum.GZXS_WEBSIT_CODE.getCode());
-        String paramJson= JSON.toJSONString(paramMap);
-
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载广州销售网点维修工基础资料信息失败！: {}",jsonResult.getMessage());
-            return;
-        }
-
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
-        if (jsonArray != null) {
-            log.info("广州销售网点维修工下载了{}条数据",jsonArray.size());
-
-            // 数据同步落到同步信息表
-            extractedAddOrUpdate(addRec, updateRec, jsonArray);
-
-            // 数据同步到本地表
-            extractedLocalAddOrUpdate(addRec, updateRec);
-
-            log.info("广州销售网点维修工基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
-    }
-
-    /**
-     * S9219807 佛山售后网点维修工基础资料下载
-     * @return
-     */
-    @Scheduled(fixedDelayString = "${fsswxg}")
-    @Transactional(rollbackFor = Exception.class)
-    public void processFSSHWDTask() throws Exception {
-        if (1==1){
-            return;
-        }
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Map<String, String> paramMap = new HashMap<String, String>();
-        List<ItfTblWangdianWxgDownload> addRec = new ArrayList<>();
-        List<ItfTblWangdianWxgDownload> updateRec = new ArrayList<>();
-
-        log.info("开始下载佛山售后网点维修工基础资料信息: \uF0B7{}",sdf.format(new Date()));
-
-        Token token = tokenCenter.getCurrentToken();
-        String url = baseurl + InterFaceTypeEnum.GLXSSH_WEBSIT_WORK.getCode() + "/querylist";
-        paramMap.put("belongCompany", InterFaceTypeEnum.FSSH_WEBSIT_CODE.getCode());
-        String paramJson= JSON.toJSONString(paramMap);
-
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载佛山售后网点维修工基础资料信息失败！: {}",jsonResult.getMessage());
-            return;
-        }
-
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
-        if (jsonArray != null) {
-            log.info("佛山售后网点维修工下载了{}条数据",jsonArray.size());
-
-            // 数据同步落到同步信息表
-            extractedAddOrUpdate(addRec, updateRec, jsonArray);
-
-            // 数据同步到本地表
-            extractedLocalAddOrUpdate(addRec, updateRec);
-
-            log.info("佛山售后网点维修工基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
-    }
-
-    /**
-     * S9219801 广州售后网点维修工基础资料下载
-     * @return
-     */
-    @Scheduled(fixedDelayString = "${gzswxg}")
-    @Transactional(rollbackFor = Exception.class)
-    public void processGZSHWDTask() throws Exception {
-        if (1==1){
-            return;
-        }
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Map<String, String> paramMap = new HashMap<String, String>();
-        List<ItfTblWangdianWxgDownload> addRec = new ArrayList<>();
-        List<ItfTblWangdianWxgDownload> updateRec = new ArrayList<>();
-
-        log.info("开始下载广州售后网点维修工基础资料信息: \uF0B7{}",sdf.format(new Date()));
-
-        Token token = tokenCenter.getCurrentToken();
-        String url = baseurl + InterFaceTypeEnum.GLXSSH_WEBSIT_WORK.getCode() + "/querylist";
-        paramMap.put("belongCompany", InterFaceTypeEnum.GSSH_WEBSIT_CODE.getCode());
-        String paramJson= JSON.toJSONString(paramMap);
-
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载广州售后网点维修工基础资料信息失败！: {}",jsonResult.getMessage());
-            return;
-        }
-
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
-        if (jsonArray != null) {
-            log.info("广州售后网点维修工下载了{}条数据",jsonArray.size());
-
-            // 数据同步落到同步信息表
-            extractedAddOrUpdate(addRec, updateRec, jsonArray);
-
-            // 数据同步到本地表
-            extractedLocalAddOrUpdate(addRec, updateRec);
-
-            log.info("广州售后网点维修工基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
-    }
-
-    private void extractedLocalAddOrUpdate(List<ItfTblWangdianWxgDownload> addRec, List<ItfTblWangdianWxgDownload> updateRec) {
-        List<WebsitWorker> addWorkerRec = new ArrayList<>();
-        List<WebsitWorker> updateWorkerRec = new ArrayList<>();
-
-        // 获取新增的
-        if (addRec.size()>0){
-            extractedWorkerAddNew(addRec, addWorkerRec);
-        }
-
-
-        // 新增的插入到表
-        if (addWorkerRec.size()>0){
-            websitWorkerService.saveBatch(addWorkerRec);
-            log.info("本地网点维修工人员信息表新增插入了{}条数据", addWorkerRec.size());
-        }
-        // 更新
-        if (updateWorkerRec.size()>0){
-            websitWorkerService.updateBatchById(updateWorkerRec);
-            log.info("本地网点维修工人员信息表更新修改了{}条数据", updateWorkerRec.size());
-        }
-    }
-
-    private void extractedWorkerAddNew(List<ItfTblWangdianWxgDownload> addRec, List<WebsitWorker> addWorkerRec) {
-        // 提取原有的信息
-        List<WebsitWorker> oldWorkerRec =  websitWorkerService.lambdaQuery()
-                .select(WebsitWorker::getWebsitWorkerId).list();
-        Map<String, List<WebsitWorker>> oldRecMap = oldWorkerRec.stream().collect(Collectors.groupingBy(WebsitWorker::getWebsitWorkerId));
-        List<String> sfzens = new ArrayList<>();
-
-        for (ItfTblWangdianWxgDownload m : addRec){
-            // 已存在不再添加
-            if (oldRecMap.containsKey(m.getSfzen()) || sfzens.contains(m.getSfzen())){
-                continue;
-            }
-
-            // 无效的数据不新增
-            if (m.getFlag() != null){
-                if (!m.getFlag().trim().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())){
-                    continue;
-                }
-            }
-
-            // 生成对象
-            getWorker(addWorkerRec, sfzens, m);
-
-            // 新增的插入到表
-            if (addWorkerRec.size()>=3000){
-                websitWorkerService.saveBatch(addWorkerRec);
-                log.info("本地网点维修工人员信息表新增插入了{}条数据", addWorkerRec.size());
-                addWorkerRec.clear();
-            }
-        }
-    }
-
-    private void getWorker(List<WebsitWorker> addWorkerRec, List<String> sfzens, ItfTblWangdianWxgDownload m) {
-        WebsitWorker v = new WebsitWorker();
-         v.setSyncFlag(1);
-        v.setWorkerId(String.valueOf(m.getSfzen()));
-        //v.setIsReal("YES");
-        // v.setFddReal("NO");
-        // v.setFddSerialNo();
-        // v.setIsApplyOver("NO");
-        v.setCreateBy("system");
-        v.setUpdateBy("system");
-        v.setCreateTime(new Date());
-        v.setUpdateTime(new Date());
-            /*if (m.getCreatedBy() != null){
-                v.setCreateBy(m.getCreatedBy());
-            }
-            if (m.getCreatedDate() != null){
-                v.setCreateTime(m.getCreatedDate());
-            }
-            if (m.getLastModifiedBy() != null){
-                v.setUpdateBy(m.getLastModifiedBy());
-            }
-            if (m.getLastModifiedDate() != null){
-                v.setUpdateTime(m.getLastModifiedDate());
-            }*/
-        v.setWorkerName(m.getWxgmc());
-        // v.setStatus(DictTypeEnum.DICT_TYPE_ON.getCode());
-            /*if (m.getFlag() != null){
-                if (!m.getFlag().trim().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())){
-                    v.setStatus(DictTypeEnum.DICT_TYPE_OFF.getCode());
-                }
-            }*/
-
-        // 工程师类型
-        // v.setWorkerType();
-        // v.setBirthDate();
-        v.setGender(m.getXingb());
-        v.setMobile(m.getYddh());
-        v.setIdcard(m.getSfzen());
-        v.setAge(m.getNianl());
-        // v.setNameLevel();
-        // v.setIntegralLevel();
-        // v.setUserNameLevel();
-        // v.setIntegralFree()
-        v.setEducation(m.getXueli());
-
-
-
-
-        // v.setAddress();
-        /*v.setIsSmsNotice(DictTypeEnum.RECEIVE_TYPE_NO.getCode());
-        if (m.getIfmessage() != null){
-            if (!m.getIfmessage().trim().equals(DictTypeEnum.RECEIVE_TYPE_YES.getText())){
-                v.setIsSmsNotice(DictTypeEnum.RECEIVE_TYPE_YES.getCode());
-            }
-        }
-        v.setIsBlackList(DictTypeEnum.HMD_TYPE_NO.getCode());
-        if (m.getSfhmd() != null){
-            if (!m.getSfhmd().trim().equals(DictTypeEnum.HMD_TYPE_YES.getText())){
-                v.setIsBlackList(DictTypeEnum.HMD_TYPE_YES.getCode());
-            }
-        }
-        v.setBlackListRemark(m.getHmdbz());
-        v.setExamineStatus(v.getStatus());*/
-
-        v.setNvq(m.getZgzh());
-        // v.setWebsitNumber(m.getWdno());
-        v.setSafeNo(m.getGmbxdh());
-        // v.setTrain(m.getPxqk());
-        v.setSkillLevel(m.getJsdj());
-        v.setRemark(m.getBeiz());
-
-        // 不能用
-        // v.setAdminUserId(m.getUsid());
-
-        v.setIsZst(DictTypeEnum.ZST_TYPE_NO.getCode());
-        if (m.getSfzst() != null){
-            if (!m.getSfzst().trim().equals(DictTypeEnum.ZST_TYPE_YES.getText())){
-                v.setIsZst(DictTypeEnum.ZST_TYPE_YES.getCode());
-            }
-        }
-        v.setZstExamineRemark(m.getShyj());
-        v.setZstTime(m.getZstsj());
-
-        v.setSafeCompany(m.getGmbxgs());
-        v.setGmbxyxq(m.getGmbxyxq());
-
-        /*v.setTrainStatus(Boolean.FALSE);
-        if (m.getSfpxhg()>0){
-            v.setTrainStatus(Boolean.TRUE);
-        }*/
-        v.setNewOldFlag(m.getXjflag());
-        v.setCollectNum(m.getMrcjgdl());
-        v.setCollectEnginNum(m.getMrcjgcjgdl());
-        v.setCollectLimitNum(m.getYxcjgdl());
-        v.setCollectEnginLimitNum(m.getYxcjgcjgdl());
-        v.setMrdate(m.getMrdate());
-        v.setSaleExamineBy(m.getXsgsshren());
-        v.setSaleExamineTime(m.getXsgsshsj());
-        v.setSaleExamineStatus(m.getXsgsshstat());
-        v.setSaleExamineRemark(m.getXsgsshbeiz());
-        v.setSaleZstExamineBy(m.getZstshren());
-        v.setScore(m.getWxfensu());
-        v.setOldMobile(m.getYddhold());
- /*       v.setHasFace(m.getHasface());
-        v.setFacePath(m.getFacepath());
-        v.setFaceCheck(m.getFacecheck());*/
-        v.setCarNo(m.getCphm());
-        v.setGpsMachineId(m.getGpsid());
-        v.setVipFlag(m.getVipflag());
-
-
-
-        addWorkerRec.add(v);
-        sfzens.add(m.getSfzen());
-    }
-
-    private void getUpdateInfo(List<WebsitWorker> updateWorkerRec, Boolean flag, ItfTblWangdianWxgDownload m, WebsitWorker o) {
-        WebsitWorker v = new WebsitWorker();
-        v.setWorkerId(o.getWorkerId());
-
-
-        v.setUpdateBy("system");
-        v.setUpdateTime(new Date());
-        if (m.getLastModifiedBy() != null){
-            v.setUpdateBy(m.getLastModifiedBy());
-        }
-        if (m.getLastModifiedDate() != null){
-            v.setUpdateTime(m.getLastModifiedDate());
-        }
-
-        if (!o.getWorkerName().equals(m.getWxgmc())){
-            v.setWorkerName(m.getWxgmc());
-            flag = Boolean.TRUE;
-        }
-        if (!o.getGender().equals(m.getXingb())){
-            v.setGender(m.getXingb());
-            flag = Boolean.TRUE;
-        }
-        if (m.getSfzen() !=null && !o.getIdcard().equals(m.getSfzen())){
-            v.setIdcard(m.getSfzen());
-            flag = Boolean.TRUE;
-        }
-        if (m.getXueli() !=null && !o.getEducation().equals(m.getXueli())){
-            v.setEducation(m.getXueli());
-            flag = Boolean.TRUE;
-        }
-        if (!o.getAge().equals(m.getNianl())){
-            v.setAge(m.getNianl());
-            flag = Boolean.TRUE;
-        }
-        if (m.getYddh() !=null && !o.getMobile().equals(m.getYddh())){
-            v.setMobile(m.getYddh());
-            flag = Boolean.TRUE;
-        }
-
-        if (m.getZgzh() !=null && !o.getNvq().equals(m.getZgzh())){
-            v.setNvq(m.getZgzh());
-            flag = Boolean.TRUE;
-        }
-        if (m.getGmbxdh() !=null && !o.getSafeNo().equals(m.getGmbxdh())){
-            v.setSafeNo(m.getGmbxdh());
-            flag = Boolean.TRUE;
-        }
-
-        if (m.getJsdj() !=null && !o.getSkillLevel().equals(m.getJsdj())){
-            v.setSkillLevel(m.getJsdj());
-            flag = Boolean.TRUE;
-        }
-        if (m.getBeiz() !=null && !o.getRemark().equals(m.getBeiz())){
-            v.setRemark(m.getBeiz());
-            flag = Boolean.TRUE;
-        }
-
-        if (m.getSfzst().trim().equals(DictTypeEnum.ZST_TYPE_YES.getText())) {
-            if (!o.getIsZst().equals(DictTypeEnum.ZST_TYPE_YES.getCode())){
-                v.setIsZst(DictTypeEnum.ZST_TYPE_YES.getCode());
-                flag = Boolean.TRUE;
-            }
-        } else {
-            if (!o.getIsZst().equals(DictTypeEnum.ZST_TYPE_NO.getCode())){
-                v.setIsZst(DictTypeEnum.ZST_TYPE_NO.getCode());
-                flag = Boolean.TRUE;
-            }
-        }
-        if (m.getShyj() !=null && !o.getZstExamineRemark().equals(m.getShyj())){
-            v.setZstExamineRemark(m.getShyj());
-            flag = Boolean.TRUE;
-        }
-        if (m.getZstsj() !=null && !o.getZstTime().equals(m.getZstsj())){
-            v.setZstTime(m.getZstsj());
-            flag = Boolean.TRUE;
-        }
-        if (m.getSfhmd().trim().equals(DictTypeEnum.HMD_TYPE_YES.getText())) {
-            if (!o.getIsBlackList().equals(DictTypeEnum.HMD_TYPE_YES.getCode())){
-                v.setIsBlackList(DictTypeEnum.HMD_TYPE_YES.getCode());
-                flag = Boolean.TRUE;
-            }
-        } else {
-            if (!o.getIsBlackList().equals(DictTypeEnum.HMD_TYPE_NO.getCode())){
-                v.setIsBlackList(DictTypeEnum.HMD_TYPE_NO.getCode());
-                flag = Boolean.TRUE;
-            }
-        }
-        if (m.getGmbxgs() !=null && !o.getSafeCompany().equals(m.getGmbxgs())){
-            v.setSafeCompany(m.getGmbxgs());
-            flag = Boolean.TRUE;
-        }
-        if (m.getGmbxyxq() !=null && !o.getGmbxyxq().equals(m.getGmbxyxq())){
-            v.setGmbxyxq(m.getGmbxyxq());
-            flag = Boolean.TRUE;
-        }
-        if (m.getHmdbz() !=null && !o.getBlackListRemark().equals(m.getHmdbz())){
-            v.setBlackListRemark(m.getHmdbz());
-            flag = Boolean.TRUE;
-        }
-        /*if (m.getSfpxhg()>0){
-            if (!o.getTrainStatus()){
-                v.setTrainStatus(Boolean.TRUE);
-                flag = Boolean.TRUE;
-            }
-        } else {
-            if (o.getTrainStatus()){
-                v.setTrainStatus(Boolean.FALSE);
-                flag = Boolean.TRUE;
-            }
-        }*/
-        if (!o.getNewOldFlag().equals(m.getXjflag())){
-            v.setNewOldFlag(m.getXjflag());
-            flag = Boolean.TRUE;
-        }
-        if (!o.getCollectNum().equals(m.getMrcjgdl())){
-            v.setCollectNum(m.getMrcjgdl());
-            flag = Boolean.TRUE;
-        }
-        if (!o.getCollectEnginNum().equals(m.getMrcjgcjgdl())){
-            v.setCollectEnginNum(m.getMrcjgcjgdl());
-            flag = Boolean.TRUE;
-        }
-        if (!o.getCollectLimitNum().equals(m.getYxcjgdl())){
-            v.setCollectLimitNum(m.getYxcjgdl());
-            flag = Boolean.TRUE;
-        }
-        if (!o.getCollectEnginLimitNum().equals(m.getYxcjgcjgdl())){
-            v.setCollectEnginLimitNum(m.getYxcjgcjgdl());
-            flag = Boolean.TRUE;
-        }
-        if (m.getMrdate() !=null && !o.getMrdate().equals(m.getMrdate())){
-            v.setMrdate(m.getMrdate());
-            flag = Boolean.TRUE;
-        }
-        if (m.getXsgsshren() !=null && !o.getSaleExamineBy().equals(m.getXsgsshren())){
-            v.setSaleExamineBy(m.getXsgsshren());
-            flag = Boolean.TRUE;
-        }
-        if (m.getXsgsshsj() !=null && !o.getSaleExamineTime().equals(m.getXsgsshsj())){
-            v.setSaleExamineTime(m.getXsgsshsj());
-            flag = Boolean.TRUE;
-        }
-        if (!o.getSaleExamineStatus().equals(m.getXsgsshstat())){
-            v.setSaleExamineStatus(m.getXsgsshstat());
-            flag = Boolean.TRUE;
-        }
-        if (m.getXsgsshbeiz() !=null && !o.getSaleExamineRemark().equals(m.getXsgsshbeiz())){
-            v.setSaleExamineRemark(m.getXsgsshbeiz());
-            flag = Boolean.TRUE;
-        }
-        if (m.getZstshren() !=null && !o.getSaleZstExamineBy().equals(m.getZstshren())){
-            v.setSaleZstExamineBy(m.getZstshren());
-            flag = Boolean.TRUE;
-        }
-        if (!o.getScore().equals(m.getWxfensu())){
-            v.setScore(m.getWxfensu());
-            flag = Boolean.TRUE;
-        }
-        if (m.getYddhold() !=null && !o.getOldMobile().equals(m.getYddhold())){
-            v.setOldMobile(m.getYddhold());
-            flag = Boolean.TRUE;
-        }
-        if (!o.getHasFace().equals(m.getHasface())){
-            v.setHasFace(m.getHasface());
-            flag = Boolean.TRUE;
-        }
-        if (m.getFacepath() !=null && !o.getFacePath().equals(m.getFacepath())){
-            v.setFacePath(m.getFacepath());
-            flag = Boolean.TRUE;
-        }
-        if (!o.getFaceCheck().equals(m.getFacecheck())){
-            v.setFaceCheck(m.getFacecheck());
-            flag = Boolean.TRUE;
-        }
-        if (m.getCphm() !=null && !o.getCarNo().equals(m.getCphm())){
-            v.setCarNo(m.getCphm());
-            flag = Boolean.TRUE;
-        }
-        if (m.getGpsid() !=null && !o.getGpsMachineId().equals(m.getGpsid())){
-            v.setGpsMachineId(m.getGpsid());
-            flag = Boolean.TRUE;
-        }
-        if (m.getVipflag() !=null && !o.getVipFlag().equals(m.getVipflag())){
-            v.setVipFlag(m.getVipflag());
-            flag = Boolean.TRUE;
-        }
-        if (flag){
-            updateWorkerRec.add(v);
-        }
-    }
-
-    // 备份不用
-    private void extractedWorkerAdd(List<ItfTblWangdianWxgDownload> addRec, List<WebsitWorker> addWorkerRec) {
-        for (ItfTblWangdianWxgDownload m : addRec){
-            WebsitWorker v = new WebsitWorker();
-            v.setWorkerId(String.valueOf(m.getWxgid()));
-            /*if (StringUtils.isNotEmpty(m.getWxgno())){
-                v.setWorkerNo(m.getWxgno());
-            }*/
-            v.setCreateBy("system");
-            v.setUpdateBy("system");
-            v.setCreateTime(new Date());
-            v.setUpdateTime(new Date());
-            if (m.getCreatedBy() != null){
-                v.setCreateBy(m.getCreatedBy());
-            }
-            if (m.getCreatedDate() != null){
-                v.setCreateTime(m.getCreatedDate());
-            }
-            if (m.getLastModifiedBy() != null){
-                v.setUpdateBy(m.getLastModifiedBy());
-            }
-            if (m.getLastModifiedDate() != null){
-                v.setUpdateTime(m.getLastModifiedDate());
-            }
-            v.setWorkerName(m.getWxgmc());
-            v.setGender(m.getXingb());
-            v.setIdcard(m.getSfzen());
-            v.setEducation(m.getXueli());
-            v.setAge(m.getNianl());
-            v.setMobile(m.getYddh());
-            v.setJob(m.getXcsgz());
-            v.setJobAge(m.getCsgzns());
-            v.setNvq(m.getZgzh());
-            // v.setWebsitNumber(m.getWdno());
-            v.setSafeNo(m.getGmbxdh());
-            v.setTrain(m.getPxqk());
-            v.setSkillLevel(m.getJsdj());
-            v.setRemark(m.getBeiz());
-            v.setStatus(DictTypeEnum.DICT_TYPE_ON.getCode());
-            if (m.getFlag() != null){
-                if (!m.getFlag().trim().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())){
-                    v.setStatus(DictTypeEnum.DICT_TYPE_OFF.getCode());
-                }
-            }
-            v.setAdminUserId(m.getUsid());
-            v.setIsSmsNotice(DictTypeEnum.RECEIVE_TYPE_NO.getCode());
-            if (m.getIfmessage() != null){
-                if (!m.getIfmessage().trim().equals(DictTypeEnum.RECEIVE_TYPE_YES.getText())){
-                    v.setIsSmsNotice(DictTypeEnum.RECEIVE_TYPE_YES.getCode());
-                }
-            }
-            v.setIsZst(DictTypeEnum.ZST_TYPE_NO.getCode());
-            if (m.getSfzst() != null){
-                if (!m.getSfzst().trim().equals(DictTypeEnum.ZST_TYPE_YES.getText())){
-                    v.setIsZst(DictTypeEnum.ZST_TYPE_YES.getCode());
-                }
-            }
-            v.setZstExamineRemark(m.getShyj());
-            v.setZstTime(m.getZstsj());
-            // HMD_TYPE_YES
-            v.setIsBlackList(DictTypeEnum.HMD_TYPE_NO.getCode());
-            if (m.getSfhmd() != null){
-                if (!m.getSfhmd().trim().equals(DictTypeEnum.HMD_TYPE_YES.getText())){
-                    v.setIsBlackList(DictTypeEnum.HMD_TYPE_YES.getCode());
-                }
-            }
-            v.setSafeCompany(m.getGmbxgs());
-            v.setGmbxyxq(m.getGmbxyxq());
-            v.setBlackListRemark(m.getHmdbz());
-            /*v.setTrainStatus(Boolean.FALSE);
-            if (m.getSfpxhg()>0){
-                v.setTrainStatus(Boolean.TRUE);
-            }*/
-            v.setNewOldFlag(m.getXjflag());
-            v.setCollectNum(m.getMrcjgdl());
-            v.setCollectEnginNum(m.getMrcjgcjgdl());
-            v.setCollectLimitNum(m.getYxcjgdl());
-            v.setCollectEnginLimitNum(m.getYxcjgcjgdl());
-            v.setMrdate(m.getMrdate());
-            v.setSaleExamineBy(m.getXsgsshren());
-            v.setSaleExamineTime(m.getXsgsshsj());
-            v.setSaleExamineStatus(m.getXsgsshstat());
-            v.setSaleExamineRemark(m.getXsgsshbeiz());
-            v.setSaleZstExamineBy(m.getZstshren());
-            v.setScore(m.getWxfensu());
-            v.setOldMobile(m.getYddhold());
-            v.setHasFace(m.getHasface());
-            v.setFacePath(m.getFacepath());
-            v.setFaceCheck(m.getFacecheck());
-            v.setCarNo(m.getCphm());
-            v.setGpsMachineId(m.getGpsid());
-            v.setVipFlag(m.getVipflag());
-            addWorkerRec.add(v);
-
-            // 新增的插入到表
-            if (addWorkerRec.size()>=3000){
-                websitWorkerService.saveBatch(addWorkerRec);
-                log.info("本地网点维修工人员信息表新增插入了{}条数据", addWorkerRec.size());
-                addWorkerRec.clear();
-            }
-        }
-    }
-
-    private void extractedAddOrUpdate(List<ItfTblWangdianWxgDownload> addRec, List<ItfTblWangdianWxgDownload> updateRec, JSONArray jsonArray) {
-        String synTaskNo = UUID.randomUUID().toString();
-        List<ItfTblWangdianWxgDownload> add = new ArrayList<>();
-        List<ItfTblWangdianWxgDownload> update = new ArrayList<>();
-        // 提取现有的数据信息
-        List<ItfTblWangdianWxgDownload> oldRec =  itfTblWangdianWxgDownloadService.lambdaQuery().list();
-        List<Long> oldRecWxgId = oldRec.stream().map(ItfTblWangdianWxgDownload::getWxgid).collect(Collectors.toList());
-        Map<Long, List<ItfTblWangdianWxgDownload>> oldRecMap = oldRec.stream().collect(Collectors.groupingBy(ItfTblWangdianWxgDownload::getWxgid));
-
-
-        for (int i = 0; i < jsonArray.size(); i++) {
-            JSONObject aData = jsonArray.getJSONObject(i);
-            ItfTblWangdianWxgDownload item = JSON.toJavaObject(aData,ItfTblWangdianWxgDownload.class);
-            // 新增或修改数据
-            // 修改
-            if (oldRecWxgId.contains(item.getWxgid())){
-                ItfTblWangdianWxgDownload old = oldRecMap.get(item.getWxgid()).get(0);
-                MyBeanUtils.copyProperties(item,old);
-                update.add(old);
-                if (update.size()>3000){
-                    itfTblWangdianWxgDownloadService.updateBatchById(update);
-                    log.info("网点维修工基础资料信息同步更新修改了{}条数据", update.size());
-                    updateRec.addAll(update);
-                    update.clear();
-                }
-            } else {
-                // 新增
-                item.setSynTaskNo(synTaskNo);
-                item.setSynReqTime(new Date());
-                item.setSynStatus(1);
-                item.setSynTime(new Date());
-                item.setSynTimes(0);
-                add.add(item);
-
-                if (add.size()>=3000){
-                    itfTblWangdianWxgDownloadService.saveBatch(add);
-                    log.info("网点维修工基础资料信息同步新增插入了{}条数据", add.size());
-                    addRec.addAll(add);
-                    add.clear();
-                }
-            }
-        }
-
-        // 新增的插入到表
-        if (add.size()>0){
-            itfTblWangdianWxgDownloadService.saveBatch(add);
-            log.info("网点维修工基础资料信息同步新增插入了{}条数据", add.size());
-            addRec.addAll(add);
-            add.clear();
-        }
-        // 更新
-        if (update.size()>0){
-            itfTblWangdianWxgDownloadService.updateBatchById(update);
-            log.info("网点维修工基础资料信息同步更新修改了{}条数据", update.size());
-            updateRec.addAll(update);
-            update.clear();
-        }
-    }
-
-
-}

src/main/java/com/zfire/jiasm/syncdata/download/basedata/GLPPGFWebsitWorkerbak.java

@@ -0,0 +1,190 @@
+package com.zfire.jiasm.syncdata.download.basedata;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/** 线程太多，合并线程
+ * 格力品牌广佛网点维修工基础资料下载（销售与售后网点维修工）
+ * 1: 落下载表 存在修改不存在新增
+ * 新增或修改生成 worker:师傅信息表，
+ * 商户网点与平台网点存在对应关系时 同步师傅数据到网点表 websit_worker:网点师傅信息表， worker_brand_account：师傅网点对应品牌网点信息表
+ */
+@Slf4j
+@Component
+public class GLPPGFWebsitWorkerbak {
+    /*
+    @Value("${baseurl}")
+    private String baseurl = "";
+    @Value("${fsxwxgc}")
+    private String fsxwxgc = "";
+    @Value("${gzxwxgc}")
+    private String gzxwxgc = "";
+    @Value("${fsswxgc}")
+    private String fsswxgc = "";
+    @Value("${gzswxgc}")
+    private String gzswxgc = "";
+    @Value("${gfwwwc}")
+    private String gfwwwc = "";
+
+
+
+    @Resource
+    TokenCenter tokenCenter;
+    @Resource
+    GLPPGFWebsitWorkerService glppgfWebsitWorkerService;
+
+    // X2300000 佛山销售网点维修工基础资料下载
+    @Scheduled(fixedDelayString = "${fsxwxg}")
+    public void processFSXSWDTask() throws Exception {
+        if (fsxwxgc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map<String, String> paramMap = new HashMap<String, String>();
+
+        log.info("开始下载佛山销售网点维修工基础资料信息: \uF0B7{}",sdf.format(new Date()));
+
+        Token token = tokenCenter.getCurrentToken();
+        String url = baseurl + InterFaceTypeEnum.GLXSSH_WEBSIT_WORK.getCode() + "/querylist";
+        paramMap.put("belongCompany", InterFaceTypeEnum.FSXS_WEBSIT_CODE.getCode());
+        String paramJson= JSON.toJSONString(paramMap);
+
+        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+            log.info("下载佛山销售网点维修工基础资料信息失败！: {}",jsonResult.getMessage());
+            return;
+        }
+
+        JSONArray jsonArray = (JSONArray) jsonResult.getData();
+        if (jsonArray != null) {
+            log.info("佛山销售网点维修工下载了{}条数据",jsonArray.size());
+
+            glppgfWebsitWorkerService.extractedFSXS(jsonArray);
+
+            log.info("佛山销售网点维修工基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
+        }else {
+            log.info("["+url+"]无数据");
+        }
+    }
+
+    // X2100000 广州销售网点维修工基础资料下载
+    @Scheduled(fixedDelayString = "${gzxwxg}")
+    public void processGZXSWDTask() throws Exception {
+        if (gzxwxgc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map<String, String> paramMap = new HashMap<String, String>();
+
+        log.info("开始下载广州销售网点维修工基础资料信息: \uF0B7{}",sdf.format(new Date()));
+
+        Token token = tokenCenter.getCurrentToken();
+        String url = baseurl + InterFaceTypeEnum.GLXSSH_WEBSIT_WORK.getCode() + "/querylist";
+        paramMap.put("belongCompany", InterFaceTypeEnum.GZXS_WEBSIT_CODE.getCode());
+        String paramJson= JSON.toJSONString(paramMap);
+
+        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+            log.info("下载广州销售网点维修工基础资料信息失败！: {}",jsonResult.getMessage());
+            return;
+        }
+        JSONArray jsonArray = (JSONArray) jsonResult.getData();
+
+        if (jsonArray != null) {
+            log.info("广州销售网点维修工下载了{}条数据",jsonArray.size());
+
+            glppgfWebsitWorkerService.extractedGZXS(jsonArray);
+
+            log.info("广州销售网点维修工基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
+        }else {
+            log.info("["+url+"]无数据");
+        }
+    }
+
+    // S9219807 佛山售后网点维修工基础资料下载
+    @Scheduled(fixedDelayString = "${fsswxg}")
+    public void processFSSHWDTask() throws Exception {
+        if (fsswxgc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map<String, String> paramMap = new HashMap<String, String>();
+
+        log.info("开始下载佛山售后网点维修工基础资料信息: \uF0B7{}",sdf.format(new Date()));
+
+        Token token = tokenCenter.getCurrentToken();
+        String url = baseurl + InterFaceTypeEnum.GLXSSH_WEBSIT_WORK.getCode() + "/querylist";
+        paramMap.put("belongCompany", InterFaceTypeEnum.FSSH_WEBSIT_CODE.getCode());
+        String paramJson= JSON.toJSONString(paramMap);
+
+        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+            log.info("下载佛山售后网点维修工基础资料信息失败！: {}",jsonResult.getMessage());
+            return;
+        }
+        JSONArray jsonArray = (JSONArray) jsonResult.getData();
+
+        if (jsonArray != null) {
+            log.info("佛山售后网点维修工下载了{}条数据",jsonArray.size());
+
+            glppgfWebsitWorkerService.extractedFSSH(jsonArray);
+
+            log.info("佛山售后网点维修工基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
+        }else {
+            log.info("["+url+"]无数据");
+        }
+    }
+
+    // S9219801 广州售后网点维修工基础资料下载
+    @Scheduled(fixedDelayString = "${gzswxg}")
+    public void processGZSHWDTask() throws Exception {
+        if (gzswxgc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map<String, String> paramMap = new HashMap<String, String>();
+
+        log.info("开始下载广州售后网点维修工基础资料信息: \uF0B7{}",sdf.format(new Date()));
+
+        Token token = tokenCenter.getCurrentToken();
+        String url = baseurl + InterFaceTypeEnum.GLXSSH_WEBSIT_WORK.getCode() + "/querylist";
+        paramMap.put("belongCompany", InterFaceTypeEnum.GSSH_WEBSIT_CODE.getCode());
+        String paramJson= JSON.toJSONString(paramMap);
+
+        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+            log.info("下载广州售后网点维修工基础资料信息失败！: {}",jsonResult.getMessage());
+            return;
+        }
+        JSONArray jsonArray = (JSONArray) jsonResult.getData();
+
+        if (jsonArray != null) {
+            log.info("广州售后网点维修工下载了{}条数据",jsonArray.size());
+
+            glppgfWebsitWorkerService.extractedGZSH(jsonArray);
+
+            log.info("广州售后网点维修工基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
+        }else {
+            log.info("["+url+"]无数据");
+        }
+    }
+
+
+    // 数据同步到本地表(worker:师傅信息表 + worker_brand_account：师傅网点对应品牌网点信息表 + websit_worker:网点师傅信息表)
+    // 师傅信息一定新增
+    // 品牌网点与平台网点有对应关系才会同步生成相应的网点数据
+    @Scheduled(fixedDelayString = "${gfwww}")
+    private void process() {
+        if (gfwwwc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        glppgfWebsitWorkerService.inputData();
+    }*/
+
+
+}

src/main/java/com/zfire/jiasm/syncdata/download/basedata/GLPPGuZhandDaiMa.java

@@ -49,8 +49,6 @@ public class GLPPGuZhandDaiMa {
      */
     @Scheduled(fixedDelayString = "${guzdm}")
     public void processGZDMTask() throws Exception {
-
-
         if (guzdmc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }

src/main/java/com/zfire/jiasm/syncdata/download/basedata/GLPPLeiBie.java

@@ -16,9 +16,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 格力品牌类别系列基础资料下载（大类、小类、系列、机型）
@@ -43,148 +41,59 @@ public class GLPPLeiBie {
     GLPPLeiBieService glppLeiBieService;
 
 
-    //格力品牌大类基础资料信息同步
+    //格力品牌类别基础资料信息同步
     @Scheduled(fixedDelayString = "${lbdl}")
-    public void processDLTask() throws Exception {
-
-
+    public void process() throws Exception {
         if (lbdlc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Map<String, String> paramMap = new HashMap<String, String>();
+        List<String> req = new ArrayList<>();
 
-        log.info("开始下载格力大类基础资料信息: \uF0B7{}",sdf.format(new Date()));
-
-        Token token = tokenCenter.getCurrentToken();
-        String url = baseurl + InterFaceTypeEnum.GELI_DL.getCode() + "/querylist";
-        String paramJson= JSON.toJSONString(paramMap);
-
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载格力大类基础资料信息失败！: {}",jsonResult.getMessage());
-            return;
-        }
-
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
-        if (jsonArray != null) {
-            log.info("下载了{}条数据",jsonArray.size());
-
-            glppLeiBieService.extractedDL(jsonArray);
-
-            log.info("格力大类基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
-    }
-
-    //格力品牌小类基础资料信息同步
-    @Scheduled(fixedDelayString = "${lbxl}")
-    public void processXLTask() throws Exception {
-
-
-        if (lbxlc.equals(TaskConfigEnum.FALSE.getCode())){
-            return;
-        }
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Map<String, String> paramMap = new HashMap<String, String>();
+        req.add(InterFaceTypeEnum.GELI_DL.getCode());
+        req.add(InterFaceTypeEnum.GELI_XL.getCode());
+        req.add(InterFaceTypeEnum.GELI_PPXL.getCode());
+        req.add(InterFaceTypeEnum.GELI_PPJX.getCode());
 
-        log.info("开始下载格力小类基础资料信息: \uF0B7{}",sdf.format(new Date()));
+        log.info("开始下载格力产品类别基础资料信息: \uF0B7{}",sdf.format(new Date()));
 
         Token token = tokenCenter.getCurrentToken();
-        String url = baseurl + InterFaceTypeEnum.GELI_XL.getCode() + "/querylist";
-        String paramJson= JSON.toJSONString(paramMap);
-
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载格力小类基础资料信息失败！: {}",jsonResult.getMessage());
-            return;
-        }
-
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
-        if (jsonArray != null) {
-            log.info("下载了{}条数据",jsonArray.size());
-
-            glppLeiBieService.extractedXL(jsonArray);
-
-            log.info("格力小类基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
-    }
-
-    //格力品牌系列基础资料信息同步
-    @Scheduled(fixedDelayString = "${lbxlt}")
-    public void processPPXLTask() throws Exception {
-
-
-        if (lbxltc.equals(TaskConfigEnum.FALSE.getCode())){
-            return;
+        for (String bc :req){
+            try{
+                String url = baseurl + bc + "/querylist";
+                String paramJson= JSON.toJSONString(paramMap);
+
+                JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+                if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+                    log.info("下载格力产品类别基础资料信息失败！: {}",jsonResult.getMessage());
+                    continue;
+                }
+
+                JSONArray jsonArray = (JSONArray) jsonResult.getData();
+                if (jsonArray != null) {
+                    log.info("下载了{}条数据",jsonArray.size());
+
+                    if (bc.equals(InterFaceTypeEnum.GELI_DL.getCode())){
+                        glppLeiBieService.extractedDL(jsonArray);
+                    } else if (bc.equals(InterFaceTypeEnum.GELI_XL.getCode())){
+                        glppLeiBieService.extractedXL(jsonArray);
+                    } else if (bc.equals(InterFaceTypeEnum.GELI_PPXL.getCode())){
+                        glppLeiBieService.extractedXiLie(jsonArray);
+                    } else if (bc.equals(InterFaceTypeEnum.GELI_PPJX.getCode())){
+                        glppLeiBieService.extractedJX(jsonArray);
+                    }
+                }else {
+                    log.info("["+url+"]无数据");
+                }
+            } catch (Exception ex) {
+                log.info("格力产品类别基础资料信息处理失败");
+                ex.printStackTrace();
+            }
         }
 
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Map<String, String> paramMap = new HashMap<String, String>();
-
-        log.info("开始下载格力品牌系列基础资料信息: \uF0B7{}",sdf.format(new Date()));
-
-        Token token = tokenCenter.getCurrentToken();
-        String url = baseurl + InterFaceTypeEnum.GELI_PPXL.getCode() + "/querylist";
-        String paramJson= JSON.toJSONString(paramMap);
-
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载格力品牌系列基础资料信息失败！: {}",jsonResult.getMessage());
-            return;
-        }
-
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
-        if (jsonArray != null) {
-            log.info("下载了{}条数据",jsonArray.size());
-
-            glppLeiBieService.extractedXiLie(jsonArray);
-
-            log.info("格力品牌系列基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
-    }
-
-    //格力品牌机型基础资料信息同步
-    @Scheduled(fixedDelayString = "${lbjx}")
-    public void processPPJXTask() throws Exception {
-
-
-        if (lbjxc.equals(TaskConfigEnum.FALSE.getCode())){
-            return;
-        }
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Map<String, String> paramMap = new HashMap<String, String>();
-
-        log.info("开始下载格力品牌机型基础资料信息: \uF0B7{}",sdf.format(new Date()));
-
-        Token token = tokenCenter.getCurrentToken();
-        String url = baseurl + InterFaceTypeEnum.GELI_PPJX.getCode() + "/querylist";
-        String paramJson= JSON.toJSONString(paramMap);
-
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载格力品牌机型基础资料信息失败！: {}",jsonResult.getMessage());
-            return;
-        }
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
-
-        if (jsonArray != null) {
-            log.info("下载了{}条数据",jsonArray.size());
-
-            glppLeiBieService.extractedJX(jsonArray);
-
-            log.info("格力品牌机型基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
+        log.info("格力产品类别基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
     }
 
 }

src/main/java/com/zfire/jiasm/syncdata/download/basedata/GLPPLeiBiebak.java

@@ -0,0 +1,166 @@
+package com.zfire.jiasm.syncdata.download.basedata;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/** 线程太多，合并线程
+ * 格力品牌类别系列基础资料下载（大类、小类、系列、机型）
+ */
+@Slf4j
+@Component
+public class GLPPLeiBiebak {
+    /*
+    @Value("${baseurl}")
+    private String baseurl = "";
+    @Value("${lbdlc}")
+    private String lbdlc = "";
+    @Value("${lbxlc}")
+    private String lbxlc = "";
+    @Value("${lbxltc}")
+    private String lbxltc = "";
+    @Value("${lbjxc}")
+    private String lbjxc = "";
+
+    @Resource
+    TokenCenter tokenCenter;
+    @Resource
+    GLPPLeiBieService glppLeiBieService;
+
+
+    //格力品牌大类基础资料信息同步
+    @Scheduled(fixedDelayString = "${lbdl}")
+    public void processDLTask() throws Exception {
+        if (lbdlc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map<String, String> paramMap = new HashMap<String, String>();
+
+        log.info("开始下载格力大类基础资料信息: \uF0B7{}",sdf.format(new Date()));
+
+        Token token = tokenCenter.getCurrentToken();
+        String url = baseurl + InterFaceTypeEnum.GELI_DL.getCode() + "/querylist";
+        String paramJson= JSON.toJSONString(paramMap);
+
+        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+            log.info("下载格力大类基础资料信息失败！: {}",jsonResult.getMessage());
+            return;
+        }
+
+        JSONArray jsonArray = (JSONArray) jsonResult.getData();
+        if (jsonArray != null) {
+            log.info("下载了{}条数据",jsonArray.size());
+
+            glppLeiBieService.extractedDL(jsonArray);
+
+            log.info("格力大类基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
+        }else {
+            log.info("["+url+"]无数据");
+        }
+    }
+
+    //格力品牌小类基础资料信息同步
+    @Scheduled(fixedDelayString = "${lbxl}")
+    public void processXLTask() throws Exception {
+        if (lbxlc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map<String, String> paramMap = new HashMap<String, String>();
+
+        log.info("开始下载格力小类基础资料信息: \uF0B7{}",sdf.format(new Date()));
+
+        Token token = tokenCenter.getCurrentToken();
+        String url = baseurl + InterFaceTypeEnum.GELI_XL.getCode() + "/querylist";
+        String paramJson= JSON.toJSONString(paramMap);
+
+        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+            log.info("下载格力小类基础资料信息失败！: {}",jsonResult.getMessage());
+            return;
+        }
+
+        JSONArray jsonArray = (JSONArray) jsonResult.getData();
+        if (jsonArray != null) {
+            log.info("下载了{}条数据",jsonArray.size());
+
+            glppLeiBieService.extractedXL(jsonArray);
+
+            log.info("格力小类基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
+        }else {
+            log.info("["+url+"]无数据");
+        }
+    }
+
+    //格力品牌系列基础资料信息同步
+    @Scheduled(fixedDelayString = "${lbxlt}")
+    public void processPPXLTask() throws Exception {
+        if (lbxltc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map<String, String> paramMap = new HashMap<String, String>();
+
+        log.info("开始下载格力品牌系列基础资料信息: \uF0B7{}",sdf.format(new Date()));
+
+        Token token = tokenCenter.getCurrentToken();
+        String url = baseurl + InterFaceTypeEnum.GELI_PPXL.getCode() + "/querylist";
+        String paramJson= JSON.toJSONString(paramMap);
+
+        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+            log.info("下载格力品牌系列基础资料信息失败！: {}",jsonResult.getMessage());
+            return;
+        }
+
+        JSONArray jsonArray = (JSONArray) jsonResult.getData();
+        if (jsonArray != null) {
+            log.info("下载了{}条数据",jsonArray.size());
+
+            glppLeiBieService.extractedXiLie(jsonArray);
+
+            log.info("格力品牌系列基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
+        }else {
+            log.info("["+url+"]无数据");
+        }
+    }
+
+    //格力品牌机型基础资料信息同步
+    @Scheduled(fixedDelayString = "${lbjx}")
+    public void processPPJXTask() throws Exception {
+        if (lbjxc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map<String, String> paramMap = new HashMap<String, String>();
+
+        log.info("开始下载格力品牌机型基础资料信息: \uF0B7{}",sdf.format(new Date()));
+
+        Token token = tokenCenter.getCurrentToken();
+        String url = baseurl + InterFaceTypeEnum.GELI_PPJX.getCode() + "/querylist";
+        String paramJson= JSON.toJSONString(paramMap);
+
+        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+            log.info("下载格力品牌机型基础资料信息失败！: {}",jsonResult.getMessage());
+            return;
+        }
+        JSONArray jsonArray = (JSONArray) jsonResult.getData();
+
+        if (jsonArray != null) {
+            log.info("下载了{}条数据",jsonArray.size());
+
+            glppLeiBieService.extractedJX(jsonArray);
+
+            log.info("格力品牌机型基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
+        }else {
+            log.info("["+url+"]无数据");
+        }
+    }
+*/
+}

src/main/java/com/zfire/jiasm/syncdata/download/basedata/GLPPXuQiuLeiBie.java

@@ -18,9 +18,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 格力品牌 需求类别 - 需求类别基础资料下载（需求大类、需求小类）
@@ -42,71 +40,22 @@ public class GLPPXuQiuLeiBie {
     @Resource
     GLPPXuQiuLeiBieService glppXuQiuLeiBieService;
 
-
-
-    /**
-     * 格力品牌需求大类基础资料信息同步
-     * @return
-     */
+    // 格力品牌需求大类基础资料信息同步
     @Scheduled(fixedDelayString = "${xqdl}")
-    public void processXQDLTask() throws Exception {
-
-
+    public void process() throws Exception {
         if (xqdlc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Map<String, String> paramMap = new HashMap<String, String>();
+        List<String> req = new ArrayList<>();
 
-        log.info("开始下载格力品牌需求大类信息: \uF0B7{}",sdf.format(new Date()));
-
-        // 提取品牌信息
-        Brand brandRec = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
-        if (brandRec == null){
-            log.info("格力品牌信息不存在【brand】");
-            return;
-        }
-
-        Token token = tokenCenter.getCurrentToken();
-        String url = baseurl + InterFaceTypeEnum.GELI_XQDL.getCode() + "/querylist";
-        String paramJson= JSON.toJSONString(paramMap);
+        req.add(InterFaceTypeEnum.GELI_XQDL.getCode());
+        req.add(InterFaceTypeEnum.GELI_XQXL.getCode());
 
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载格力品牌需求大类信息失败！: {}",jsonResult.getMessage());
-            return;
-        }
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
-
-        if (jsonArray != null) {
 
-            log.info("下载了{}条数据",jsonArray.size());
-
-            glppXuQiuLeiBieService.extractedXQDL(brandRec,jsonArray);
-
-            log.info("格力品牌需求大类处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
-    }
-
-    /**
-     * 格力品牌需求小类基础资料信息同步
-     * @return
-     */
-    @Scheduled(fixedDelayString = "${xqxl}")
-    public void processXQXLTask() throws Exception {
-
-
-        if (xqxlc.equals(TaskConfigEnum.FALSE.getCode())){
-            return;
-        }
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Map<String, String> paramMap = new HashMap<String, String>();
-
-        log.info("开始下载格力品牌需求小类信息: \uF0B7{}",sdf.format(new Date()));
+        log.info("开始下载格力品牌需求类别信息: \uF0B7{}",sdf.format(new Date()));
 
         // 提取品牌信息
         Brand brandRec = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
@@ -116,27 +65,37 @@ public class GLPPXuQiuLeiBie {
         }
 
         Token token = tokenCenter.getCurrentToken();
-        String url = baseurl + InterFaceTypeEnum.GELI_XQXL.getCode() + "/querylist";
-        String paramJson= JSON.toJSONString(paramMap);
 
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载格力品牌需求小类信息失败！: {}",jsonResult.getMessage());
-            return;
+        for (String bc :req){
+            try{
+                String url = baseurl + bc + "/querylist";
+                String paramJson= JSON.toJSONString(paramMap);
+
+                JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+                if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+                    log.info("下载格力品牌需求类别信息失败！: {}",jsonResult.getMessage());
+                    continue;
+                }
+                JSONArray jsonArray = (JSONArray) jsonResult.getData();
+
+                if (jsonArray != null) {
+                    log.info("下载了{}条数据",jsonArray.size());
+
+                    if (bc.equals(InterFaceTypeEnum.GELI_XQDL.getCode())){
+                        glppXuQiuLeiBieService.extractedXQDL(brandRec,jsonArray);
+                    } else if (bc.equals(InterFaceTypeEnum.GELI_XQXL.getCode())){
+                        glppXuQiuLeiBieService.extractedXQXL(brandRec,jsonArray);
+                    }
+                }else {
+                    log.info("["+url+"]无数据");
+                }
+            } catch (Exception ex) {
+                log.info("格力品牌需求类别信息处理失败");
+                ex.printStackTrace();
+            }
         }
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
-
-        if (jsonArray != null) {
 
-            log.info("下载了{}条数据",jsonArray.size());
-
-            glppXuQiuLeiBieService.extractedXQXL(brandRec,jsonArray);
-
-
-            log.info("格力品牌需求小类处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
+        log.info("格力品牌需求类别处理完成: \uF0B7{}",sdf.format(new Date()));
     }
 
 }

src/main/java/com/zfire/jiasm/syncdata/download/basedata/GLPPXuQiuLeiBiebak.java

@@ -0,0 +1,118 @@
+package com.zfire.jiasm.syncdata.download.basedata;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/** 线程太多，合并线程
+ * 格力品牌 需求类别 - 需求类别基础资料下载（需求大类、需求小类）
+ */
+@Slf4j
+@Component
+public class GLPPXuQiuLeiBiebak {
+    /*
+    @Value("${baseurl}")
+    private String baseurl = "";
+    @Value("${xqdlc}")
+    private String xqdlc = "";
+    @Value("${xqxlc}")
+    private String xqxlc = "";
+
+    @Resource
+    TokenCenter tokenCenter;
+    @Resource
+    BrandService brandService;
+    @Resource
+    GLPPXuQiuLeiBieService glppXuQiuLeiBieService;
+
+
+
+    // 格力品牌需求大类基础资料信息同步
+    @Scheduled(fixedDelayString = "${xqdl}")
+    public void processXQDLTask() throws Exception {
+
+
+        if (xqdlc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map<String, String> paramMap = new HashMap<String, String>();
+
+        log.info("开始下载格力品牌需求大类信息: \uF0B7{}",sdf.format(new Date()));
+
+        // 提取品牌信息
+        Brand brandRec = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
+        if (brandRec == null){
+            log.info("格力品牌信息不存在【brand】");
+            return;
+        }
+
+        Token token = tokenCenter.getCurrentToken();
+        String url = baseurl + InterFaceTypeEnum.GELI_XQDL.getCode() + "/querylist";
+        String paramJson= JSON.toJSONString(paramMap);
+
+        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+            log.info("下载格力品牌需求大类信息失败！: {}",jsonResult.getMessage());
+            return;
+        }
+        JSONArray jsonArray = (JSONArray) jsonResult.getData();
+
+        if (jsonArray != null) {
+
+            log.info("下载了{}条数据",jsonArray.size());
+
+            glppXuQiuLeiBieService.extractedXQDL(brandRec,jsonArray);
+
+            log.info("格力品牌需求大类处理完成: \uF0B7{}",sdf.format(new Date()));
+        }else {
+            log.info("["+url+"]无数据");
+        }
+    }
+
+    // 格力品牌需求小类基础资料信息同步
+    @Scheduled(fixedDelayString = "${xqxl}")
+    public void processXQXLTask() throws Exception {
+
+
+        if (xqxlc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map<String, String> paramMap = new HashMap<String, String>();
+
+        log.info("开始下载格力品牌需求小类信息: \uF0B7{}",sdf.format(new Date()));
+
+        // 提取品牌信息
+        Brand brandRec = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
+        if (brandRec == null){
+            log.info("格力品牌信息不存在【brand】");
+            return;
+        }
+
+        Token token = tokenCenter.getCurrentToken();
+        String url = baseurl + InterFaceTypeEnum.GELI_XQXL.getCode() + "/querylist";
+        String paramJson= JSON.toJSONString(paramMap);
+
+        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+            log.info("下载格力品牌需求小类信息失败！: {}",jsonResult.getMessage());
+            return;
+        }
+        JSONArray jsonArray = (JSONArray) jsonResult.getData();
+
+        if (jsonArray != null) {
+
+            log.info("下载了{}条数据",jsonArray.size());
+
+            glppXuQiuLeiBieService.extractedXQXL(brandRec,jsonArray);
+
+
+            log.info("格力品牌需求小类处理完成: \uF0B7{}",sdf.format(new Date()));
+        }else {
+            log.info("["+url+"]无数据");
+        }
+    }
+*/
+}

src/main/java/com/zfire/jiasm/syncdata/download/basedata/GLPPYHSXXXQD.java

@@ -16,9 +16,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 格力品牌用户属性、信息渠道 基础资料下载（用户属性、用户等级、信息渠道、信息来源）
@@ -49,155 +47,58 @@ public class GLPPYHSXXXQD {
      * @return
      */
     @Scheduled(fixedDelayString = "${yhsx}")
-    public void processYHSXTask() throws Exception {
-
-
+    public void process() throws Exception {
         if (yhsxc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Map<String, String> paramMap = new HashMap<String, String>();
+        List<String> req = new ArrayList<>();
 
-        log.info("开始下载格力品牌用户属性信息: \uF0B7{}",sdf.format(new Date()));
-
-        Token token = tokenCenter.getCurrentToken();
-        String url = baseurl + InterFaceTypeEnum.GLPP_YHSX.getCode() + "/querylist";
-        String paramJson= JSON.toJSONString(paramMap);
-
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载格力品牌用户属性信息失败！: {}",jsonResult.getMessage());
-            return;
-        }
+        req.add(InterFaceTypeEnum.GLPP_YHSX.getCode());
+        req.add(InterFaceTypeEnum.GLPP_YHDJ.getCode());
+        req.add(InterFaceTypeEnum.GLPP_XXQD.getCode());
+        req.add(InterFaceTypeEnum.GLPP_XXLY.getCode());
 
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
-        if (jsonArray != null) {
-            log.info("下载了{}条数据",jsonArray.size());
 
-            glppyhsxxxqdService.extractedYHSX(jsonArray);
-
-            log.info("格力品牌用户属性信息处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
-    }
-
-    /**
-     * 格力品牌用户等级信息同步
-     * @return
-     */
-    @Scheduled(fixedDelayString = "${yhdj}")
-    public void processYHDJTask() throws Exception {
-
-
-        if (yhdjc.equals(TaskConfigEnum.FALSE.getCode())){
-            return;
-        }
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Map<String, String> paramMap = new HashMap<String, String>();
-
-        log.info("开始下载格力品牌用户等级信息: \uF0B7{}",sdf.format(new Date()));
-
-        Token token = tokenCenter.getCurrentToken();
-        String url = baseurl + InterFaceTypeEnum.GLPP_YHDJ.getCode() + "/querylist";
-        String paramJson= JSON.toJSONString(paramMap);
-
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载格力品牌用户等级信息失败！: {}",jsonResult.getMessage());
-            return;
-        }
-
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
-        if (jsonArray != null) {
-            log.info("下载了{}条数据",jsonArray.size());
-
-            glppyhsxxxqdService.extractedYHDJ(jsonArray);
-
-            log.info("格力品牌用户等级信息处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
-    }
-
-    /**
-     * 格力品牌信息渠道信息同步
-     * @return
-     */
-    @Scheduled(fixedDelayString = "${xxqd}")
-    public void processXXQDTask() throws Exception {
-
-
-        if (xxqdc.equals(TaskConfigEnum.FALSE.getCode())){
-            return;
-        }
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Map<String, String> paramMap = new HashMap<String, String>();
-
-        log.info("开始下载格力品牌信息渠道信息: \uF0B7{}",sdf.format(new Date()));
-
-        Token token = tokenCenter.getCurrentToken();
-        String url = baseurl + InterFaceTypeEnum.GLPP_XXQD.getCode() + "/querylist";
-        String paramJson= JSON.toJSONString(paramMap);
-
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载格力品牌信息渠道信息失败！: {}",jsonResult.getMessage());
-            return;
-        }
-
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
-        if (jsonArray != null) {
-            log.info("下载了{}条数据",jsonArray.size());
-
-            glppyhsxxxqdService.extractedXXQD(jsonArray);
-
-            log.info("格力品牌信息渠道信息处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
-    }
-
-    /**
-     * 格力品牌信息来源信息同步
-     * @return
-     */
-    @Scheduled(fixedDelayString = "${xxly}")
-    public void processXXLYTask() throws Exception {
-
-
-        if (xxlyc.equals(TaskConfigEnum.FALSE.getCode())){
-            return;
-        }
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Map<String, String> paramMap = new HashMap<String, String>();
-
-        log.info("开始下载格力品牌信息来源信息: \uF0B7{}",sdf.format(new Date()));
+        log.info("开始下载格力品牌用户属性信息: \uF0B7{}",sdf.format(new Date()));
 
         Token token = tokenCenter.getCurrentToken();
-        String url = baseurl + InterFaceTypeEnum.GLPP_XXLY.getCode() + "/querylist";
-        String paramJson= JSON.toJSONString(paramMap);
-
-        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-            log.info("下载格力品牌信息来源信息失败！: {}",jsonResult.getMessage());
-            return;
+        for (String bc :req){
+            try {
+                String url = baseurl + bc + "/querylist";
+                String paramJson= JSON.toJSONString(paramMap);
+
+                JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+                if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+                    log.info("下载格力品牌用户属性信息失败！: {}",jsonResult.getMessage());
+                    continue;
+                }
+
+                JSONArray jsonArray = (JSONArray) jsonResult.getData();
+                if (jsonArray != null) {
+                    log.info("下载了{}条数据",jsonArray.size());
+
+                    if (bc.equals(InterFaceTypeEnum.GLPP_YHSX.getCode())){
+                        glppyhsxxxqdService.extractedYHSX(jsonArray);
+                    } else if (bc.equals(InterFaceTypeEnum.GLPP_YHDJ.getCode())){
+                        glppyhsxxxqdService.extractedYHDJ(jsonArray);
+                    } else if (bc.equals(InterFaceTypeEnum.GLPP_XXQD.getCode())){
+                        glppyhsxxxqdService.extractedXXQD(jsonArray);
+                    } else if (bc.equals(InterFaceTypeEnum.GLPP_XXLY.getCode())){
+                        glppyhsxxxqdService.extractedXXLY(jsonArray);
+                    }
+                }else {
+                    log.info("["+url+"]无数据");
+                }
+            } catch (Exception ex) {
+                log.info("格力品牌用户属性信息处理失败");
+                ex.printStackTrace();
+            }
         }
 
-        JSONArray jsonArray = (JSONArray) jsonResult.getData();
-        if (jsonArray != null) {
-            log.info("下载了{}条数据",jsonArray.size());
-
-            glppyhsxxxqdService.extractedXXLY(jsonArray);
-
-            log.info("格力品牌信息来源信息处理完成: \uF0B7{}",sdf.format(new Date()));
-        }else {
-            log.info("["+url+"]无数据");
-        }
+        log.info("格力品牌用户属性信息处理完成: \uF0B7{}",sdf.format(new Date()));
     }
 
 }

src/main/java/com/zfire/jiasm/syncdata/download/basedata/GLPPYHSXXXQDbak.java

@@ -0,0 +1,175 @@
+package com.zfire.jiasm.syncdata.download.basedata;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/** 线程太多，合并线程
+ * 格力品牌用户属性、信息渠道 基础资料下载（用户属性、用户等级、信息渠道、信息来源）
+ */
+@Slf4j
+@Component
+public class GLPPYHSXXXQDbak {
+    /*
+    @Value("${baseurl}")
+    private String baseurl = "";
+    @Value("${yhsxc}")
+    private String yhsxc = "";
+    @Value("${yhdjc}")
+    private String yhdjc = "";
+    @Value("${xxqdc}")
+    private String xxqdc = "";
+    @Value("${xxlyc}")
+    private String xxlyc = "";
+
+
+    @Resource
+    TokenCenter tokenCenter;
+    @Resource
+    GLPPYHSXXXQDService glppyhsxxxqdService;
+
+
+    // 格力品牌用户属性信息同步
+    @Scheduled(fixedDelayString = "${yhsx}")
+    public void processYHSXTask() throws Exception {
+
+
+        if (yhsxc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map<String, String> paramMap = new HashMap<String, String>();
+
+        log.info("开始下载格力品牌用户属性信息: \uF0B7{}",sdf.format(new Date()));
+
+        Token token = tokenCenter.getCurrentToken();
+        String url = baseurl + InterFaceTypeEnum.GLPP_YHSX.getCode() + "/querylist";
+        String paramJson= JSON.toJSONString(paramMap);
+
+        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+            log.info("下载格力品牌用户属性信息失败！: {}",jsonResult.getMessage());
+            return;
+        }
+
+        JSONArray jsonArray = (JSONArray) jsonResult.getData();
+        if (jsonArray != null) {
+            log.info("下载了{}条数据",jsonArray.size());
+
+            glppyhsxxxqdService.extractedYHSX(jsonArray);
+
+            log.info("格力品牌用户属性信息处理完成: \uF0B7{}",sdf.format(new Date()));
+        }else {
+            log.info("["+url+"]无数据");
+        }
+    }
+
+    // 格力品牌用户等级信息同步
+    @Scheduled(fixedDelayString = "${yhdj}")
+    public void processYHDJTask() throws Exception {
+
+
+        if (yhdjc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map<String, String> paramMap = new HashMap<String, String>();
+
+        log.info("开始下载格力品牌用户等级信息: \uF0B7{}",sdf.format(new Date()));
+
+        Token token = tokenCenter.getCurrentToken();
+        String url = baseurl + InterFaceTypeEnum.GLPP_YHDJ.getCode() + "/querylist";
+        String paramJson= JSON.toJSONString(paramMap);
+
+        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+            log.info("下载格力品牌用户等级信息失败！: {}",jsonResult.getMessage());
+            return;
+        }
+
+        JSONArray jsonArray = (JSONArray) jsonResult.getData();
+        if (jsonArray != null) {
+            log.info("下载了{}条数据",jsonArray.size());
+
+            glppyhsxxxqdService.extractedYHDJ(jsonArray);
+
+            log.info("格力品牌用户等级信息处理完成: \uF0B7{}",sdf.format(new Date()));
+        }else {
+            log.info("["+url+"]无数据");
+        }
+    }
+
+    // 格力品牌信息渠道信息同步
+    @Scheduled(fixedDelayString = "${xxqd}")
+    public void processXXQDTask() throws Exception {
+
+
+        if (xxqdc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map<String, String> paramMap = new HashMap<String, String>();
+
+        log.info("开始下载格力品牌信息渠道信息: \uF0B7{}",sdf.format(new Date()));
+
+        Token token = tokenCenter.getCurrentToken();
+        String url = baseurl + InterFaceTypeEnum.GLPP_XXQD.getCode() + "/querylist";
+        String paramJson= JSON.toJSONString(paramMap);
+
+        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+            log.info("下载格力品牌信息渠道信息失败！: {}",jsonResult.getMessage());
+            return;
+        }
+
+        JSONArray jsonArray = (JSONArray) jsonResult.getData();
+        if (jsonArray != null) {
+            log.info("下载了{}条数据",jsonArray.size());
+
+            glppyhsxxxqdService.extractedXXQD(jsonArray);
+
+            log.info("格力品牌信息渠道信息处理完成: \uF0B7{}",sdf.format(new Date()));
+        }else {
+            log.info("["+url+"]无数据");
+        }
+    }
+
+    // 格力品牌信息来源信息同步
+    @Scheduled(fixedDelayString = "${xxly}")
+    public void processXXLYTask() throws Exception {
+
+
+        if (xxlyc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map<String, String> paramMap = new HashMap<String, String>();
+
+        log.info("开始下载格力品牌信息来源信息: \uF0B7{}",sdf.format(new Date()));
+
+        Token token = tokenCenter.getCurrentToken();
+        String url = baseurl + InterFaceTypeEnum.GLPP_XXLY.getCode() + "/querylist";
+        String paramJson= JSON.toJSONString(paramMap);
+
+        JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+        if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+            log.info("下载格力品牌信息来源信息失败！: {}",jsonResult.getMessage());
+            return;
+        }
+
+        JSONArray jsonArray = (JSONArray) jsonResult.getData();
+        if (jsonArray != null) {
+            log.info("下载了{}条数据",jsonArray.size());
+
+            glppyhsxxxqdService.extractedXXLY(jsonArray);
+
+            log.info("格力品牌信息来源信息处理完成: \uF0B7{}",sdf.format(new Date()));
+        }else {
+            log.info("["+url+"]无数据");
+        }
+    }
+*/
+}

src/main/java/com/zfire/jiasm/syncdata/download/basedata/ProvinceCityAreaTown.java

@@ -21,10 +21,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 /**
@@ -60,202 +57,79 @@ public class ProvinceCityAreaTown {
      * @return
      */
     @Scheduled(fixedDelayString = "${sx}")
-    public void processProvinceTask() {
-        try{
-
-
-            if (sxc.equals(TaskConfigEnum.FALSE.getCode())){
-                return;
-            }
-
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-            log.info("开始下载省份基础资料信息: \uF0B7{}",sdf.format(new Date()));
-
-            Map<String, String> paramMap = new HashMap<String, String>();
-            Token token = tokenCenter.getCurrentToken();
-            String url = baseurl + InterFaceTypeEnum.TBL_PROVINCE.getCode() + "/querylist";
-            String paramJson= JSON.toJSONString(paramMap);
-
-            JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-            if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-                log.info("下载省份基础资料信息失败！: {}",jsonResult.getMessage());
-                return;
-            }
-            JSONArray jsonArray = (JSONArray) jsonResult.getData();
-
-            if (jsonArray != null) {
-                log.info("下载了{}条数据",jsonArray.size());
-
-                provinceCityAreaTownService.extractedProvince(jsonArray);
-
-                log.info("省份基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
-            }else {
-                log.info("["+url+"]无数据");
-            }
-        } catch (Exception ex){
-            log.error("下载省份基础资料信息失败！", ex);
-        }
-    }
-
-    /**
-     * 市基础资料信息同步
-     * @return
-     */
-    @Scheduled(fixedDelayString = "${ssx}")
-    public void processCityTask() {
-        try{
-
-
-            if (ssxc.equals(TaskConfigEnum.FALSE.getCode())){
-                return;
-            }
-
-            // 提取省份信息
-            List<Province> provinceRec =  provinceService.lambdaQuery().list();
-            // 省份信息未同步时先不同步
-            if (CollectionUtils.isEmpty(provinceRec)){
-                return;
-            }
-            provinceRec.clear();
-
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String dt = sdf.format(new Date());
-
-            log.info("开始下载市基础资料信息: {}",dt);
-
-            Map<String, String> paramMap = new HashMap<String, String>();
-            Token token = tokenCenter.getCurrentToken();
-            String url = baseurl + InterFaceTypeEnum.TBL_CITY.getCode() + "/querylist";
-            String paramJson= JSON.toJSONString(paramMap);
-
-            JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-            if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-                log.info("下载市基础资料信息失败！: {}",jsonResult.getMessage());
-                return;
-            }
-            JSONArray jsonArray = (JSONArray) jsonResult.getData();
-
-            if (jsonArray != null) {
-                log.info("下载了{}条数据"+jsonArray.size());
-
-                provinceCityAreaTownService.extractedCity(jsonArray);
-
-                log.info("市基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
-
-            }else {
-                log.info("["+url+"]无数据");
-            }
-        } catch (Exception ex){
-            log.error("下载市基础资料信息失败！", ex);
+    public void process() throws Exception {
+        if (sxc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
         }
-    }
-
-    /**
-     * 区基础资料信息同步
-     * @return
-     */
-    @Scheduled(fixedDelayString = "${qx}")
-    public void processCountyTask() {
-        try{
-
-
-            if (qxc.equals(TaskConfigEnum.FALSE.getCode())){
-                return;
-            }
-
-
-            // 提取市信息
-            List<City> cityRec =  cityService.lambdaQuery().list();
-            // 市信息未同步时先不同步
-            if (CollectionUtils.isEmpty(cityRec)){
-                return;
-            }
-            cityRec.clear();
-
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String dt = sdf.format(new Date());
 
-            log.info("开始下载区基础资料信息: {}",dt);
-
-            Map<String, String> paramMap = new HashMap<String, String>();
-            Token token = tokenCenter.getCurrentToken();
-            String url = baseurl + InterFaceTypeEnum.TBL_COUNTY.getCode() + "/querylist";
-            String paramJson= JSON.toJSONString(paramMap);
-
-            JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-            if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-                log.info("下载区基础资料信息失败！: {}",jsonResult.getMessage());
-                return;
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map<String, String> paramMap = new HashMap<String, String>();
+        List<String> req = new ArrayList<>();
+
+        req.add(InterFaceTypeEnum.TBL_PROVINCE.getCode());
+        req.add(InterFaceTypeEnum.TBL_CITY.getCode());
+        req.add(InterFaceTypeEnum.TBL_COUNTY.getCode());
+        req.add(InterFaceTypeEnum.TBL_CITY_JDXZ.getCode());
+
+        log.info("开始下载地理位置基础资料信息: \uF0B7{}",sdf.format(new Date()));
+
+        Token token = tokenCenter.getCurrentToken();
+        for (String bc :req){
+            try {
+
+                if (bc.equals(InterFaceTypeEnum.TBL_CITY.getCode())){
+                    // 提取省份信息
+                    List<Province> provinceRec =  provinceService.lambdaQuery().list();
+                    // 省份信息未同步时先不同步
+                    if (CollectionUtils.isEmpty(provinceRec)){
+                        provinceRec.clear();
+                        continue;
+                    }
+                }
+
+                if (bc.equals(InterFaceTypeEnum.TBL_COUNTY.getCode()) ||
+                        bc.equals(InterFaceTypeEnum.TBL_CITY_JDXZ.getCode()) ){
+                    // 提取市信息
+                    List<City> cityRec =  cityService.lambdaQuery().list();
+                    // 市信息未同步时先不同步
+                    if (CollectionUtils.isEmpty(cityRec)){
+                        cityRec.clear();
+                        continue;
+                    }
+                }
+
+                String url = baseurl + bc + "/querylist";
+                String paramJson= JSON.toJSONString(paramMap);
+
+                JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+                if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+                    log.info("下载地理位置基础资料信息失败！: {}",jsonResult.getMessage());
+                    continue;
+                }
+
+                JSONArray jsonArray = (JSONArray) jsonResult.getData();
+                if (jsonArray != null) {
+                    log.info("下载了{}条数据",jsonArray.size());
+
+                    if (bc.equals(InterFaceTypeEnum.TBL_PROVINCE.getCode())){
+                        provinceCityAreaTownService.extractedProvince(jsonArray);
+                    } else if (bc.equals(InterFaceTypeEnum.TBL_CITY.getCode())){
+                        provinceCityAreaTownService.extractedCity(jsonArray);
+                    } else if (bc.equals(InterFaceTypeEnum.TBL_COUNTY.getCode())){
+                        provinceCityAreaTownService.extractedCounty(jsonArray);
+                    } else if (bc.equals(InterFaceTypeEnum.TBL_CITY_JDXZ.getCode())){
+                        provinceCityAreaTownService.extractedStreet(jsonArray);
+                    }
+                }else {
+                    log.info("["+url+"]无数据");
+                }
+            } catch (Exception ex) {
+                log.info("地理位置基础资料信息处理失败");
+                ex.printStackTrace();
             }
-            JSONArray jsonArray = (JSONArray) jsonResult.getData();
-
-            if (jsonArray != null) {
-                log.info("下载了{}条数据"+jsonArray.size());
-
-                provinceCityAreaTownService.extractedCounty(jsonArray);
-
-                log.info("区基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
-
-            }else {
-                log.info("["+url+"]无数据");
-            }
-        } catch (Exception ex){
-            log.error("下载区基础资料信息失败！", ex);
         }
-    }
-
-    /**
-     * 乡镇基础资料信息同步
-     * @return
-     */
-    @Scheduled(fixedDelayString = "${zx}")
-    public void processCityJDTask() {
-        try{
-
-
-            if (zxc.equals(TaskConfigEnum.FALSE.getCode())){
-                return;
-            }
-
-
-            // 提取市信息
-            List<City> cityRec =  cityService.lambdaQuery().list();
-            // 市信息未同步时先不同步
-            if (CollectionUtils.isEmpty(cityRec)){
-                return;
-            }
-            cityRec.clear();
 
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String dt = sdf.format(new Date());
-
-            log.info("开始下载乡镇基础资料信息: {}",dt);
-
-            Map<String, String> paramMap = new HashMap<String, String>();
-            Token token = tokenCenter.getCurrentToken();
-            String url = baseurl + InterFaceTypeEnum.TBL_CITY_JDXZ.getCode() + "/querylist";
-            String paramJson= JSON.toJSONString(paramMap);
-
-            JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
-            if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
-                log.info("下载乡镇基础资料信息失败！: {}",jsonResult.getMessage());
-                return;
-            }
-            JSONArray jsonArray = (JSONArray) jsonResult.getData();
-
-            if (jsonArray != null) {
-                log.info("下载了{}条数据"+jsonArray.size());
-
-                provinceCityAreaTownService.extractedStreet(jsonArray);
-
-                log.info("乡镇基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
-            }else {
-                log.info("["+url+"]无数据");
-            }
-        } catch (Exception ex){
-            log.error("下载乡镇基础资料信息失败！", ex);
-        }
+        log.info("地理位置基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
     }
 
 }

src/main/java/com/zfire/jiasm/syncdata/download/basedata/ProvinceCityAreaTownbak.java

@@ -0,0 +1,228 @@
+package com.zfire.jiasm.syncdata.download.basedata;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+
+/** 线程太多，合并线程
+ * 省、市、区、镇、数据同步
+ */
+@Slf4j
+@Component
+public class ProvinceCityAreaTownbak {
+    /*
+    @Value("${baseurl}")
+    private String baseurl = "";
+    @Value("${sxc}")
+    private String sxc = "";
+    @Value("${ssxc}")
+    private String ssxc = "";
+    @Value("${qxc}")
+    private String qxc = "";
+    @Value("${zxc}")
+    private String zxc = "";
+
+    @Resource
+    TokenCenter tokenCenter;
+    @Resource
+    ProvinceCityAreaTownService provinceCityAreaTownService;
+    @Resource
+    CityService cityService;
+    @Resource
+    ProvinceService provinceService;
+
+
+
+    // 省份基础资料信息同步
+    @Scheduled(fixedDelayString = "${sx}")
+    public void processProvinceTask() {
+        try{
+
+
+            if (sxc.equals(TaskConfigEnum.FALSE.getCode())){
+                return;
+            }
+
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+            log.info("开始下载省份基础资料信息: \uF0B7{}",sdf.format(new Date()));
+
+            Map<String, String> paramMap = new HashMap<String, String>();
+            Token token = tokenCenter.getCurrentToken();
+            String url = baseurl + InterFaceTypeEnum.TBL_PROVINCE.getCode() + "/querylist";
+            String paramJson= JSON.toJSONString(paramMap);
+
+            JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+            if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+                log.info("下载省份基础资料信息失败！: {}",jsonResult.getMessage());
+                return;
+            }
+            JSONArray jsonArray = (JSONArray) jsonResult.getData();
+
+            if (jsonArray != null) {
+                log.info("下载了{}条数据",jsonArray.size());
+
+                provinceCityAreaTownService.extractedProvince(jsonArray);
+
+                log.info("省份基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
+            }else {
+                log.info("["+url+"]无数据");
+            }
+        } catch (Exception ex){
+            log.error("下载省份基础资料信息失败！", ex);
+        }
+    }
+
+    // 市基础资料信息同步
+    @Scheduled(fixedDelayString = "${ssx}")
+    public void processCityTask() {
+        try{
+
+
+            if (ssxc.equals(TaskConfigEnum.FALSE.getCode())){
+                return;
+            }
+
+            // 提取省份信息
+            List<Province> provinceRec =  provinceService.lambdaQuery().list();
+            // 省份信息未同步时先不同步
+            if (CollectionUtils.isEmpty(provinceRec)){
+                return;
+            }
+            provinceRec.clear();
+
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String dt = sdf.format(new Date());
+
+            log.info("开始下载市基础资料信息: {}",dt);
+
+            Map<String, String> paramMap = new HashMap<String, String>();
+            Token token = tokenCenter.getCurrentToken();
+            String url = baseurl + InterFaceTypeEnum.TBL_CITY.getCode() + "/querylist";
+            String paramJson= JSON.toJSONString(paramMap);
+
+            JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+            if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+                log.info("下载市基础资料信息失败！: {}",jsonResult.getMessage());
+                return;
+            }
+            JSONArray jsonArray = (JSONArray) jsonResult.getData();
+
+            if (jsonArray != null) {
+                log.info("下载了{}条数据"+jsonArray.size());
+
+                provinceCityAreaTownService.extractedCity(jsonArray);
+
+                log.info("市基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
+
+            }else {
+                log.info("["+url+"]无数据");
+            }
+        } catch (Exception ex){
+            log.error("下载市基础资料信息失败！", ex);
+        }
+    }
+
+    // 区基础资料信息同步
+    @Scheduled(fixedDelayString = "${qx}")
+    public void processCountyTask() {
+        try{
+
+
+            if (qxc.equals(TaskConfigEnum.FALSE.getCode())){
+                return;
+            }
+
+
+            // 提取市信息
+            List<City> cityRec =  cityService.lambdaQuery().list();
+            // 市信息未同步时先不同步
+            if (CollectionUtils.isEmpty(cityRec)){
+                return;
+            }
+            cityRec.clear();
+
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String dt = sdf.format(new Date());
+
+            log.info("开始下载区基础资料信息: {}",dt);
+
+            Map<String, String> paramMap = new HashMap<String, String>();
+            Token token = tokenCenter.getCurrentToken();
+            String url = baseurl + InterFaceTypeEnum.TBL_COUNTY.getCode() + "/querylist";
+            String paramJson= JSON.toJSONString(paramMap);
+
+            JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+            if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+                log.info("下载区基础资料信息失败！: {}",jsonResult.getMessage());
+                return;
+            }
+            JSONArray jsonArray = (JSONArray) jsonResult.getData();
+
+            if (jsonArray != null) {
+                log.info("下载了{}条数据"+jsonArray.size());
+
+                provinceCityAreaTownService.extractedCounty(jsonArray);
+
+                log.info("区基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
+
+            }else {
+                log.info("["+url+"]无数据");
+            }
+        } catch (Exception ex){
+            log.error("下载区基础资料信息失败！", ex);
+        }
+    }
+
+    // 乡镇基础资料信息同步
+    @Scheduled(fixedDelayString = "${zx}")
+    public void processCityJDTask() {
+        try{
+
+
+            if (zxc.equals(TaskConfigEnum.FALSE.getCode())){
+                return;
+            }
+
+
+            // 提取市信息
+            List<City> cityRec =  cityService.lambdaQuery().list();
+            // 市信息未同步时先不同步
+            if (CollectionUtils.isEmpty(cityRec)){
+                return;
+            }
+            cityRec.clear();
+
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String dt = sdf.format(new Date());
+
+            log.info("开始下载乡镇基础资料信息: {}",dt);
+
+            Map<String, String> paramMap = new HashMap<String, String>();
+            Token token = tokenCenter.getCurrentToken();
+            String url = baseurl + InterFaceTypeEnum.TBL_CITY_JDXZ.getCode() + "/querylist";
+            String paramJson= JSON.toJSONString(paramMap);
+
+            JSONResult jsonResult = HttpUtil.httpRequestWithToken(url, "POST", paramJson, token);
+            if (jsonResult.getStatus() == null || !jsonResult.getStatus().toString().equals("200")) {
+                log.info("下载乡镇基础资料信息失败！: {}",jsonResult.getMessage());
+                return;
+            }
+            JSONArray jsonArray = (JSONArray) jsonResult.getData();
+
+            if (jsonArray != null) {
+                log.info("下载了{}条数据"+jsonArray.size());
+
+                provinceCityAreaTownService.extractedStreet(jsonArray);
+
+                log.info("乡镇基础资料信息处理完成: \uF0B7{}",sdf.format(new Date()));
+            }else {
+                log.info("["+url+"]无数据");
+            }
+        } catch (Exception ex){
+            log.error("下载乡镇基础资料信息失败！", ex);
+        }
+    }
+    */
+
+}

src/main/java/com/zfire/jiasm/syncdata/download/other/accessories/AccessoriesQuery.java

@@ -14,13 +14,14 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
-/**
+/** 未上线
  * 配件查询接口
  * 根据原件配件编码查询通用配件、适用机型
  */
 @Slf4j
 @Component
 public class AccessoriesQuery {
+    /*
     @Value("${pjcxc}")
     private String pjcxc = "";
 
@@ -55,5 +56,6 @@ public class AccessoriesQuery {
             }
         }
         log.info("配件查询下载结束: \uF0B7{}",sdf.format(new Date()));
-    }
+    }*/
+
 }

src/main/java/com/zfire/jiasm/syncdata/download/other/install/DataAdd.java

@@ -12,12 +12,13 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
-/**
+/** 未上线
  * 家用特殊安装申请新增
  */
 @Slf4j
 @Component
 public class DataAdd {
+    /*
     @Resource
     TblAddUploadListService tblAddUploadListService;
     @Resource
@@ -27,9 +28,6 @@ public class DataAdd {
     @Scheduled(fixedDelayString = "${jytsazxz}")
     public void add(){
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        if (1==1){
-            return;
-        }
 
         log.info("开始新增家用特殊安装工单: \uF0B7{}",sdf.format(new Date()));
         // 提取家用特殊安装工单需要新增的数据
@@ -51,4 +49,5 @@ public class DataAdd {
         }
         log.info("新增家用特殊安装工单结束: \uF0B7{}",sdf.format(new Date()));
     }
+    */
 }

src/main/java/com/zfire/jiasm/syncdata/download/other/install/DataAddFeedback.java

@@ -12,12 +12,13 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
-/**
+/** 未上线
  * 新增质量信息反馈
  */
 @Slf4j
 @Component
 public class DataAddFeedback {
+    /*
     @Resource
     TblAddUploadListService tblAddUploadListService;
     @Resource
@@ -28,9 +29,6 @@ public class DataAddFeedback {
     @Scheduled(fixedDelayString = "${xzzlfk}")
     public void add(){
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        if (1==1){
-            return;
-        }
 
         log.info("开始新增质量信息反馈: \uF0B7{}",sdf.format(new Date()));
         // 提取家用特殊安装工单需要新增的数据
@@ -46,5 +44,5 @@ public class DataAddFeedback {
             }
         }
         log.info("新增质量信息反馈结束: \uF0B7{}",sdf.format(new Date()));
-    }
+    }*/
 }

src/main/java/com/zfire/jiasm/syncdata/download/other/install/QueryDataDown.java

@@ -12,13 +12,14 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
-/**
+/** 未上线
  * 查询质量信息反馈列表
  * 家用特殊安装查询
  */
 @Slf4j
 @Component
 public class QueryDataDown {
+    /*
     @Resource
     TableDataQueryTimeService tableDataQueryTimeService;
     @Resource
@@ -30,9 +31,6 @@ public class QueryDataDown {
 
     @Scheduled(fixedDelayString = "${jytsazxzt}")
     public void query(){
-        if (1==1){
-            return;
-        }
 
         // 提取需要同步下载的数据
         List<TableDataQueryTime> tdqts = tableDataQueryTimeService.lambdaQuery()
@@ -71,4 +69,5 @@ public class QueryDataDown {
         }
         log.info("开始查询下载结束: \uF0B7{}",sdf.format(new Date()));
     }
+    */
 }

src/main/java/com/zfire/jiasm/syncdata/download/other/install/QueryDataUpload.java

@@ -12,12 +12,13 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
-/**
+/**  未上线
  * 家用特殊安装申请更新
  */
 @Slf4j
 @Component
 public class QueryDataUpload {
+    /*
     @Resource
     OtherDownService otherDownService;
     @Resource
@@ -29,10 +30,6 @@ public class QueryDataUpload {
     public void upload(){
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-        if (1==1){
-            return;
-        }
-
         log.info("开始更新家用特殊安装工单: \uF0B7{}",sdf.format(new Date()));
 
         // 提取家用特殊安装工单需要更新的数据
@@ -54,5 +51,5 @@ public class QueryDataUpload {
         }
         log.info("更新家用特殊安装工单结束: \uF0B7{}",sdf.format(new Date()));
     }
-
+*/
 }

src/main/java/com/zfire/jiasm/syncdata/download/other/install/Settlement.java

@@ -12,13 +12,14 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
-/**
+/**  未上线
  * 安装转结算 - 广佛等销司发起转结算动作v2
  * /api/ext/azwgmx/launchSettlementV2
  */
 @Slf4j
 @Component
 public class Settlement {
+    /*
     @Resource
     OtherDownService otherDownService;
     @Resource
@@ -51,7 +52,7 @@ public class Settlement {
 
     }
 
-
+*/
 
 
 

src/main/java/com/zfire/jiasm/syncdata/download/other/install/SettlementStatus.java

@@ -13,13 +13,14 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
-/**
+/**  未上线
  * 安装转结算查询最终结果 - 广佛等销司发起转结算动作v2
  * /api/ext/azwgmx/launchSettlementV2
  */
 @Slf4j
 @Component
 public class SettlementStatus {
+    /*
     @Resource
     OtherDownService otherDownService;
     @Resource
@@ -52,4 +53,5 @@ public class SettlementStatus {
         }
         log.info("查询安装转结算最终结果结束: \uF0B7{}",sdf.format(new Date()));
     }
+    */
 }

src/main/java/com/zfire/jiasm/syncdata/download/other/refunds/Add.java

@@ -13,13 +13,14 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
-/**
+/**  未上线
  * 总部退换货录入
  * /api/zbthh/ext/submit
  */
 @Slf4j
 @Component
 public class Add {
+    /*
     @Resource
     TblAddUploadListService tblAddUploadListService;
     @Resource
@@ -49,4 +50,5 @@ public class Add {
         }
         log.info("新增退换货结束: \uF0B7{}",sdf.format(new Date()));
     }
+    */
 }

src/main/java/com/zfire/jiasm/syncdata/download/other/refunds/DataAcquisition.java

@@ -12,7 +12,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
-/**
+/**  未上线
  * 家用空调/家用空气能数据采集
  * /api/acquisition/ext/domestic
  * 退货旧机记录上传记录表  tbl_thh_dcjs_lc_upload
@@ -25,6 +25,7 @@ import java.util.List;
 @Slf4j
 @Component
 public class DataAcquisition {
+    /*
     @Resource
     TblAddUploadListService tblAddUploadListService;
     @Resource
@@ -35,10 +36,6 @@ public class DataAcquisition {
     public void acquisition(){
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-        if (1==1){
-            return;
-        }
-
         log.info("开始家用空调/家用空气数据采集: \uF0B7{}",sdf.format(new Date()));
         // 提取家用特殊安装工单需要新增的数据
         List<TblAddUploadList> taus = tblAddUploadListService.lambdaQuery()
@@ -54,4 +51,5 @@ public class DataAcquisition {
         }
         log.info("家用空调/家用空气数据采集结束: \uF0B7{}",sdf.format(new Date()));
     }
+    */
 }

src/main/java/com/zfire/jiasm/syncdata/download/other/refunds/Feedback.java

@@ -12,12 +12,13 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
-/**
+/**  未上线
  * 过程反馈
  */
 @Slf4j
 @Component
 public class Feedback {
+    /*
     @Resource
     TblAddUploadListService tblAddUploadListService;
     @Resource
@@ -28,10 +29,6 @@ public class Feedback {
     public void refresh(){
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-        if (1==1){
-            return;
-        }
-
         log.info("开始过程反馈: \uF0B7{}",sdf.format(new Date()));
         // 提取家用特殊安装工单需要新增的数据
         List<TblAddUploadList> taus = tblAddUploadListService.lambdaQuery()
@@ -47,4 +44,5 @@ public class Feedback {
         }
         log.info("过程反馈结束: \uF0B7{}",sdf.format(new Date()));
     }
+    */
 }

src/main/java/com/zfire/jiasm/syncdata/download/other/refunds/JDWebEvaluation.java

@@ -19,6 +19,7 @@ import java.util.List;
 @Slf4j
 @Component
 public class JDWebEvaluation {
+    /*
     @Resource
     TableDataQueryTimeService tableDataQueryTimeService;
     @Resource
@@ -28,9 +29,6 @@ public class JDWebEvaluation {
 
     @Scheduled(fixedDelayString = "${jdddpj}")
     public void getInfo(){
-        if (1==1){
-            return;
-        }
 
         // 提取数据
         List<TableDataQueryTime> tdqts = tableDataQueryTimeService.lambdaQuery()
@@ -50,5 +48,6 @@ public class JDWebEvaluation {
             }
         }
         log.info("京东订单评价下载结束: \uF0B7{}",sdf.format(new Date()));
-    }
+    }*/
+
 }

src/main/java/com/zfire/jiasm/syncdata/download/other/refunds/Message.java

@@ -19,6 +19,7 @@ import java.util.List;
 @Slf4j
 @Component
 public class Message {
+    /*
     @Resource
     TableDataQueryTimeService tableDataQueryTimeService;
     @Resource
@@ -28,9 +29,6 @@ public class Message {
 
     @Scheduled(fixedDelayString = "${cxdxxq}")
     public void getMessage(){
-        if (1==1){
-            return;
-        }
         // 提取数据
         List<TableDataQueryTime> tdqts = tableDataQueryTimeService.lambdaQuery()
                 .eq(TableDataQueryTime::getType,6)
@@ -49,5 +47,6 @@ public class Message {
             }
         }
         log.info("查询总部发送短信的详细信息结束: \uF0B7{}",sdf.format(new Date()));
-    }
+    }*/
+
 }

src/main/java/com/zfire/jiasm/syncdata/download/other/refunds/Query.java

@@ -19,6 +19,7 @@ import java.util.List;
 @Slf4j
 @Component
 public class Query {
+    /*
     @Resource
     TableDataQueryTimeService tableDataQueryTimeService;
     @Resource
@@ -51,4 +52,5 @@ public class Query {
         }
         log.info("总部退换货下载结束: \uF0B7{}",sdf.format(new Date()));
     }
+    */
 }

src/main/java/com/zfire/jiasm/syncdata/download/other/refunds/SolidAcquisition.java

@@ -20,6 +20,7 @@ import java.util.List;
 @Slf4j
 @Component
 public class SolidAcquisition {
+    /*
     @Resource
     TblAddUploadListService tblAddUploadListService;
     @Resource
@@ -49,4 +50,5 @@ public class SolidAcquisition {
         }
         log.info("家用空调/家用空气能故障机数据采集结束: \uF0B7{}",sdf.format(new Date()));
     }
+    */
 }

src/main/java/com/zfire/jiasm/syncdata/download/other/refunds/Update.java

@@ -18,6 +18,7 @@ import java.util.List;
 @Slf4j
 @Component
 public class Update {
+    /*
     @Resource
     TblAddUploadListService tblAddUploadListService;
     @Resource
@@ -28,10 +29,6 @@ public class Update {
     public void refresh(){
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-        if (1==1){
-            return;
-        }
-
         log.info("开始退换货更新: \uF0B7{}",sdf.format(new Date()));
         // 提取家用特殊安装工单需要新增的数据
         List<TblAddUploadList> taus = tblAddUploadListService.lambdaQuery()
@@ -47,4 +44,5 @@ public class Update {
         }
         log.info("退换货更新结束: \uF0B7{}",sdf.format(new Date()));
     }
+    */
 }

src/main/java/com/zfire/jiasm/syncdata/download/other/repair/RepairSettlement.java

@@ -18,6 +18,7 @@ import java.util.List;
 @Slf4j
 @Component
 public class RepairSettlement {
+    /*
     @Resource
     OtherDownService otherDownService;
     @Resource
@@ -28,10 +29,6 @@ public class RepairSettlement {
     public void process() {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-        if (1 == 1) {
-            return;
-        }
-
         log.info("开始维修转结算: \uF0B7{}",sdf.format(new Date()));
 
         // 提取家用特殊安装工单需要新增的数据
@@ -49,7 +46,7 @@ public class RepairSettlement {
         log.info("维修转结算结束: \uF0B7{}",sdf.format(new Date()));
 
     }
-
+*/
 
 
 }

src/main/java/com/zfire/jiasm/syncdata/download/other/repair/RepairSettlementStatus.java

@@ -18,6 +18,7 @@ import java.util.List;
 @Slf4j
 @Component
 public class RepairSettlementStatus {
+    /*
     @Resource
     OtherDownService otherDownService;
     @Resource
@@ -48,7 +49,7 @@ public class RepairSettlementStatus {
         }
         log.info("查询维修转结算最终结果结束: \uF0B7{}",sdf.format(new Date()));
     }
-
+*/
 
 
 

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

@@ -1,14 +1,15 @@
 package com.zfire.jiasm.syncdata.service;
 
 import com.alibaba.fastjson.JSONArray;
+import com.zfire.jiasm.syncdata.plus.entity.Brand;
 
 public interface GLPPGFWebsitService {
 
-    void extractedFSXS(JSONArray jsonArray);
+    void extractedFSXS(JSONArray jsonArray, Brand record, String synTaskNo);
 
-    void extractedGZXS(JSONArray jsonArray);
+    void extractedGZXS(JSONArray jsonArray, Brand record, String synTaskNo);
 
-    void extractedFSSH(JSONArray jsonArray);
+    void extractedFSSH(JSONArray jsonArray, Brand record, String synTaskNo);
 
-    void extractedGZSH(JSONArray jsonArray);
+    void extractedGZSH(JSONArray jsonArray, Brand record, String synTaskNo);
 }

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

@@ -41,18 +41,11 @@ public class GLPPGFWebsitServiceImpl implements GLPPGFWebsitService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void extractedFSXS(JSONArray jsonArray) {
+    public void extractedFSXS(JSONArray jsonArray, Brand record, String synTaskNo) {
 
         List<ItfTblXinWangdianDownload> addRec = new ArrayList<>();
         List<ItfTblXinWangdianDownload> updateRec = new ArrayList<>();
-        // 提取品牌信息
-        Brand record = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
-        if (record == null){
-            log.info("格力品牌信息不存在【brand】");
-            return;
-        }
 
-        String synTaskNo = UUID.randomUUID().toString();
 
         // 数据同步落到同步信息表
         extractedFSXSWDAddOrUpdate(addRec, updateRec,  jsonArray, synTaskNo);
@@ -69,19 +62,10 @@ public class GLPPGFWebsitServiceImpl implements GLPPGFWebsitService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void extractedGZXS(JSONArray jsonArray){
+    public void extractedGZXS(JSONArray jsonArray, Brand record, String synTaskNo){
         List<ItfTblXinWangdianDownload> addRec = new ArrayList<>();
         List<ItfTblXinWangdianDownload> updateRec = new ArrayList<>();
 
-        // 提取品牌信息
-        Brand record = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
-        if (record == null){
-            log.info("格力品牌信息不存在【brand】");
-            return;
-        }
-
-        String synTaskNo = UUID.randomUUID().toString();
-
         // 数据同步落到同步信息表
         extractedFSXSWDAddOrUpdate(addRec, updateRec,  jsonArray, synTaskNo);
 
@@ -92,19 +76,10 @@ public class GLPPGFWebsitServiceImpl implements GLPPGFWebsitService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void extractedFSSH(JSONArray jsonArray){
+    public void extractedFSSH(JSONArray jsonArray, Brand record, String synTaskNo){
         List<ItfTblXinWangdianDownload> addRec = new ArrayList<>();
         List<ItfTblXinWangdianDownload> updateRec = new ArrayList<>();
 
-        // 提取品牌信息
-        Brand record = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
-        if (record == null){
-            log.info("格力品牌信息不存在【brand】");
-            return;
-        }
-
-        String synTaskNo = UUID.randomUUID().toString();
-
         // 数据同步落到同步信息表
         extractedFSXSWDAddOrUpdate(addRec, updateRec,  jsonArray, synTaskNo);
 
@@ -115,19 +90,10 @@ public class GLPPGFWebsitServiceImpl implements GLPPGFWebsitService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void extractedGZSH(JSONArray jsonArray){
+    public void extractedGZSH(JSONArray jsonArray, Brand record, String synTaskNo){
         List<ItfTblXinWangdianDownload> addRec = new ArrayList<>();
         List<ItfTblXinWangdianDownload> updateRec = new ArrayList<>();
 
-        // 提取品牌信息
-        Brand record = brandService.lambdaQuery().eq(Brand::getBrand,"格力").one();
-        if (record == null){
-            log.info("格力品牌信息不存在【brand】");
-            return;
-        }
-
-        String synTaskNo = UUID.randomUUID().toString();
-
         // 数据同步落到同步信息表
         extractedFSXSWDAddOrUpdate(addRec, updateRec, jsonArray, synTaskNo);
 

src/main/java/com/zfire/jiasm/syncdata/upload/order/DataUpload.java

@@ -2,6 +2,7 @@ package com.zfire.jiasm.syncdata.upload.order;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.data.Token;
 import com.zfire.jiasm.syncdata.plus.entity.OutJiasmToGreeSynRule;
 import com.zfire.jiasm.syncdata.service.CommonService;
@@ -24,7 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-/**  不再使用
+/**
  * 工单数据同步到格力总部
  * 1:需要生成上传任务清单列表   ProduceUploadList处理
  * 2:生成需要上传的数据   ProduceDataUploadList处理
@@ -39,6 +40,8 @@ import java.util.concurrent.ConcurrentHashMap;
 public class DataUpload {
     @Value("${baseurl}")
     private String baseurl;
+    @Value("${datauploadc}")
+    private String datauploadc = "";
 
     @Autowired
     private TokenCenter tokenCenter;
@@ -52,8 +55,9 @@ public class DataUpload {
 
 
     // @Scheduled(fixedDelay = 1 * 5 * 1000)
+    @Scheduled(fixedDelayString = "${dataupload}")
     public void uploadProcess() throws Exception {
-        if (1==1){
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

src/main/java/com/zfire/jiasm/syncdata/upload/order/DataUploadNew.java

@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-/**
+/** 线程数太大使用旧的
  * 工单数据同步到格力总部
  * 1:需要生成上传任务清单列表   ProduceUploadList处理
  * 2:生成需要上传的数据   ProduceDataUploadList处理
@@ -20,7 +20,7 @@ import org.springframework.stereotype.Component;
  */
 @Slf4j
 @Component
-public class DataUploadNew {
+public class DataUploadNew {/*
     @Value("${datauploadc}")
     private String datauploadc = "";
 
@@ -263,5 +263,5 @@ public class DataUploadNew {
         }
         // 新增安装阅读记录维护表
         dataUploadLogic.uploaditftblazassignxzyd();
-    }
+    }*/
 }

src/main/resources/bootstrap.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=dev
+spring.profiles.active=test
 spring.application.name=jiasm-syncdata
 spring.main.allow-bean-definition-overriding=true