add

src/main/java/com/zfire/jiasm/syncdata/constant/TaskConfigEnum.java

@@ -0,0 +1,45 @@
+package com.zfire.jiasm.syncdata.constant;
+
+import lombok.Getter;
+
+@Getter
+public enum TaskConfigEnum {
+    // 家盛茂
+    TRUE("TRUE","执行"),
+
+    // 工单系统数据库
+    FALSE("FALSE","不执行"),
+
+    ;
+
+    /**
+     * 编码
+     */
+    private final String code;
+
+    /**
+     * 介绍
+     */
+    private final String text;
+
+    TaskConfigEnum(String code, String text) {
+        this.code = code;
+        this.text = text;
+    }
+
+    /**
+     * 通过code获取枚举
+     * @param code 编码
+     * @return DatabaseEnum
+     */
+    public static TaskConfigEnum getEnumByCode(String code) {
+        TaskConfigEnum result = null;
+        for (TaskConfigEnum item : values()) {
+            if (code==item.getCode()) {
+                result = item;
+                break;
+            }
+        }
+        return result;
+    }
+}

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

@@ -3,6 +3,7 @@ package com.zfire.jiasm.syncdata.download.basedata;
 import com.alibaba.fastjson.JSON;
 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.service.GLPPGFWebsitService;
 import com.zfire.jiasm.syncdata.utils.HttpUtil;
@@ -28,6 +29,14 @@ import java.util.Map;
 public class GLPPGFWebsit {
     @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;
@@ -41,9 +50,9 @@ public class GLPPGFWebsit {
      */
     @Scheduled(fixedDelayString = "${netfsx}")
     public void processFSXSWDTask() throws Exception {
-        /*if (1==1){
+        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>();
@@ -79,9 +88,11 @@ public class GLPPGFWebsit {
      */
     @Scheduled(fixedDelayString = "${netgzx}")
     public void processGZXSWDTask() throws Exception {
-        /*if (1==1){
+
+
+        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>();
@@ -117,9 +128,11 @@ public class GLPPGFWebsit {
      */
     @Scheduled(fixedDelayString = "${netfss}")
     public void processFSSHWDTask() throws Exception {
-        /*if (1==1){
+
+
+        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>();
@@ -157,9 +170,10 @@ public class GLPPGFWebsit {
      */
     @Scheduled(fixedDelayString = "${netgzs}")
     public void processGZSHWDTask() throws Exception {
-        /*if (1==1){
+
+        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>();

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

@@ -3,6 +3,7 @@ package com.zfire.jiasm.syncdata.download.basedata;
 import com.alibaba.fastjson.JSON;
 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.service.GLPPGFWebsitWorkerService;
 import com.zfire.jiasm.syncdata.utils.HttpUtil;
@@ -30,6 +31,14 @@ import java.util.Map;
 public class GLPPGFWebsitWorker {
     @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 = "";
 
     @Resource
     TokenCenter tokenCenter;
@@ -44,9 +53,9 @@ public class GLPPGFWebsitWorker {
      */
     @Scheduled(fixedDelayString = "${fsxwxg}")
     public void processFSXSWDTask() throws Exception {
-        /*if (1==1){
+        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>();
@@ -82,9 +91,9 @@ public class GLPPGFWebsitWorker {
      */
     @Scheduled(fixedDelayString = "${gzxwxg}")
     public void processGZXSWDTask() throws Exception {
-        /*if (1==1){
+        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>();
@@ -120,9 +129,9 @@ public class GLPPGFWebsitWorker {
      */
     @Scheduled(fixedDelayString = "${fsswxg}")
     public void processFSSHWDTask() throws Exception {
-        /*if (1==1){
+        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>();
@@ -158,9 +167,9 @@ public class GLPPGFWebsitWorker {
      */
     @Scheduled(fixedDelayString = "${gzswxg}")
     public void processGZSHWDTask() throws Exception {
-        /*if (1==1){
+        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>();

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

@@ -3,6 +3,7 @@ package com.zfire.jiasm.syncdata.download.basedata;
 import com.alibaba.fastjson.JSON;
 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;
@@ -29,6 +30,8 @@ import java.util.Map;
 public class GLPPGuZhandDaiMa {
     @Value("${baseurl}")
     private String baseurl = "";
+    @Value("${guzdmc}")
+    private String guzdmc = "";
 
     @Resource
     TokenCenter tokenCenter;
@@ -46,7 +49,9 @@ public class GLPPGuZhandDaiMa {
      */
     @Scheduled(fixedDelayString = "${guzdm}")
     public void processGZDMTask() throws Exception {
-        if (1==1){
+
+
+        if (guzdmc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 

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

@@ -3,6 +3,7 @@ package com.zfire.jiasm.syncdata.download.basedata;
 import com.alibaba.fastjson.JSON;
 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.service.GLPPLeiBieService;
 import com.zfire.jiasm.syncdata.utils.HttpUtil;
@@ -27,6 +28,14 @@ import java.util.Map;
 public class GLPPLeiBie {
     @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;
@@ -37,9 +46,11 @@ public class GLPPLeiBie {
     //格力品牌大类基础资料信息同步
     @Scheduled(fixedDelayString = "${lbdl}")
     public void processDLTask() throws Exception {
-        /*if (1==1){
+
+
+        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>();
@@ -71,9 +82,11 @@ public class GLPPLeiBie {
     //格力品牌小类基础资料信息同步
     @Scheduled(fixedDelayString = "${lbxl}")
     public void processXLTask() throws Exception {
-        /*if (1==1){
+
+
+        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>();
@@ -105,9 +118,11 @@ public class GLPPLeiBie {
     //格力品牌系列基础资料信息同步
     @Scheduled(fixedDelayString = "${lbxlt}")
     public void processPPXLTask() throws Exception {
-        /*if (1==1){
+
+
+        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>();
@@ -139,9 +154,11 @@ public class GLPPLeiBie {
     //格力品牌机型基础资料信息同步
     @Scheduled(fixedDelayString = "${lbjx}")
     public void processPPJXTask() throws Exception {
-        /*if (1==1){
+
+
+        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>();

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

@@ -3,6 +3,7 @@ package com.zfire.jiasm.syncdata.download.basedata;
 import com.alibaba.fastjson.JSON;
 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.service.GLPPXSLXDownloadService;
 import com.zfire.jiasm.syncdata.utils.HttpUtil;
@@ -27,6 +28,8 @@ import java.util.Map;
 public class GLPPXSLXDownload {
     @Value("${baseurl}")
     private String baseurl = "";
+    @Value("${azxslxc}")
+    private String azxslxc = "";
 
     @Resource
     TokenCenter tokenCenter;
@@ -41,9 +44,9 @@ public class GLPPXSLXDownload {
      */
     @Scheduled(fixedDelayString = "${azxslx}")
     public void processXSLXTask() throws Exception {
-        /*if (1==1){
+        if (azxslxc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
-        }*/
+        }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Map<String, String> paramMap = new HashMap<String, String>();

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

@@ -5,6 +5,7 @@ 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.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.data.Token;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.*;
@@ -31,6 +32,10 @@ import java.util.stream.Collectors;
 public class GLPPXuQiuLeiBie {
     @Value("${baseurl}")
     private String baseurl = "";
+    @Value("${xqdlc}")
+    private String xqdlc = "";
+    @Value("${xqxlc}")
+    private String xqxlc = "";
 
     @Resource
     TokenCenter tokenCenter;
@@ -47,9 +52,11 @@ public class GLPPXuQiuLeiBie {
      */
     @Scheduled(fixedDelayString = "${xqdl}")
     public void processXQDLTask() throws Exception {
-        /*if (1==1){
+
+
+        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>();
@@ -92,9 +99,11 @@ public class GLPPXuQiuLeiBie {
      */
     @Scheduled(fixedDelayString = "${xqxl}")
     public void processXQXLTask() throws Exception {
-        /*if (1==1){
+
+
+        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>();

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

@@ -3,6 +3,7 @@ package com.zfire.jiasm.syncdata.download.basedata;
 import com.alibaba.fastjson.JSON;
 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.service.GLPPYHSXXXQDService;
 import com.zfire.jiasm.syncdata.utils.HttpUtil;
@@ -27,6 +28,14 @@ import java.util.Map;
 public class GLPPYHSXXXQD {
     @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
@@ -41,9 +50,11 @@ public class GLPPYHSXXXQD {
      */
     @Scheduled(fixedDelayString = "${yhsx}")
     public void processYHSXTask() throws Exception {
-        /*if (1==1){
+
+
+        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>();
@@ -78,9 +89,11 @@ public class GLPPYHSXXXQD {
      */
     @Scheduled(fixedDelayString = "${yhdj}")
     public void processYHDJTask() throws Exception {
-        /*if (1==1){
+
+
+        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>();
@@ -115,9 +128,11 @@ public class GLPPYHSXXXQD {
      */
     @Scheduled(fixedDelayString = "${xxqd}")
     public void processXXQDTask() throws Exception {
-        /*if (1==1){
+
+
+        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>();
@@ -152,9 +167,11 @@ public class GLPPYHSXXXQD {
      */
     @Scheduled(fixedDelayString = "${xxly}")
     public void processXXLYTask() throws Exception {
-        /*if (1==1){
+
+
+        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>();

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

@@ -3,6 +3,7 @@ package com.zfire.jiasm.syncdata.download.basedata;
 import com.alibaba.fastjson.JSON;
 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.City;
 import com.zfire.jiasm.syncdata.plus.entity.Province;
@@ -34,6 +35,14 @@ import java.util.Map;
 public class ProvinceCityAreaTown {
     @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;
@@ -53,9 +62,11 @@ public class ProvinceCityAreaTown {
     @Scheduled(fixedDelayString = "${sx}")
     public void processProvinceTask() {
         try{
-            /*if (1==1){
+
+
+            if (sxc.equals(TaskConfigEnum.FALSE.getCode())){
                 return;
-            }*/
+            }
 
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -94,9 +105,12 @@ public class ProvinceCityAreaTown {
     @Scheduled(fixedDelayString = "${ssx}")
     public void processCityTask() {
         try{
-            /*if (1==1){
+
+
+            if (ssxc.equals(TaskConfigEnum.FALSE.getCode())){
                 return;
-            }*/
+            }
+
             // 提取省份信息
             List<Province> provinceRec =  provinceService.lambdaQuery().list();
             // 省份信息未同步时先不同步
@@ -144,9 +158,12 @@ public class ProvinceCityAreaTown {
     @Scheduled(fixedDelayString = "${qx}")
     public void processCountyTask() {
         try{
-            /*if (1==1){
+
+
+            if (qxc.equals(TaskConfigEnum.FALSE.getCode())){
                 return;
-            }*/
+            }
+
 
             // 提取市信息
             List<City> cityRec =  cityService.lambdaQuery().list();
@@ -195,9 +212,12 @@ public class ProvinceCityAreaTown {
     @Scheduled(fixedDelayString = "${zx}")
     public void processCityJDTask() {
         try{
-            /*if (1==1){
+
+
+            if (zxc.equals(TaskConfigEnum.FALSE.getCode())){
                 return;
-            }*/
+            }
+
 
             // 提取市信息
             List<City> cityRec =  cityService.lambdaQuery().list();

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

@@ -3,6 +3,7 @@ package com.zfire.jiasm.syncdata.download.order;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.data.DetailDownloadData;
 import com.zfire.jiasm.syncdata.data.Token;
 import com.zfire.jiasm.syncdata.plus.entity.SysDict;
@@ -30,6 +31,9 @@ import java.util.*;
 public class DetailDownloadInstallTask {
 	@Value("${baseurl}")
 	private String baseurl = "";
+	@Value("${detaildownc}")
+	private String detaildownc = "";
+
 	@Autowired
 	private TokenCenter tokenCenter;
 	@Autowired
@@ -43,9 +47,11 @@ public class DetailDownloadInstallTask {
 	@Scheduled(fixedDelayString = "${detaildown}")
 	private void process() {
 		try {
-			/*if (1 == 1) {
+
+
+			if (detaildownc.equals(TaskConfigEnum.FALSE.getCode())){
 				return;
-			}*/
+			}
 
 			Map<String, List<SysDict>> sysDictRefDLMap = new HashMap<>();
 			sysDictRefDLMap = publicService.getStringListMapXqLb();

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

@@ -5,12 +5,14 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.zfire.jiasm.syncdata.base.BaseService;
 import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.ItfTblAzAssignLcLsDownloadService;
 import com.zfire.jiasm.syncdata.plus.service.OrderBaseService;
 import com.zfire.jiasm.syncdata.plus.service.SysDictRefService;
 import com.zfire.jiasm.syncdata.service.AddInstallBusiness;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -27,6 +29,9 @@ import java.util.stream.Collectors;
 @Slf4j
 @Component
 public class InstallBusiness {
+    @Value("${installinc}")
+    private String installinc = "";
+
     @Resource
     ItfTblAzAssignLcLsDownloadService itfTblAzAssignLcLsDownloadService;
     @Resource
@@ -44,7 +49,9 @@ public class InstallBusiness {
     // 3：工单落入本地表
     @Scheduled(fixedDelayString = "${installin}")
     public void inputOrderInstall() {
-        if (1 == 1) {
+
+
+        if (installinc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 

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

@@ -3,6 +3,7 @@ package com.zfire.jiasm.syncdata.download.order;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.zfire.jiasm.syncdata.base.BaseService;
 import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.ItfTblAzAssignLcLsDownloadService;
 import com.zfire.jiasm.syncdata.plus.service.OrderBaseService;
@@ -11,6 +12,7 @@ import com.zfire.jiasm.syncdata.service.AddInstallBusiness;
 import com.zfire.jiasm.syncdata.service.JiasmApi;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -26,6 +28,9 @@ import java.util.stream.Collectors;
 @Slf4j
 @Component
 public class InstallBusinessApi {
+    @Value("${installinc}")
+    private String installinc = "";
+
     @Autowired
     JiasmApi jiasmApi;
     @Autowired
@@ -42,9 +47,12 @@ public class InstallBusinessApi {
     // 3：工单落入本地表
     @Scheduled(fixedDelayString = "${installin}")
     public void inputOrderInstall() {
-        /*if (1 == 1) {
+
+
+        if (installinc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
-        }*/
+        }
+
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<ItfTblAzAssignLcLsDownload> lcls = new ArrayList<>();
         List<String> lclslist = new ArrayList<>();

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zfire.jiasm.syncdata.constant.ESInstallEnum;
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.data.Token;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.*;
@@ -38,6 +39,8 @@ import java.util.*;
 public class InstallDownload {
     @Value("${baseurl}")
     private String baseurl = "";
+    @Value("${netfsxc}")
+    private String netfsxc = "";
 
     @Resource
     InstallDownload installDownload;
@@ -68,9 +71,11 @@ public class InstallDownload {
     // 1：下载安装工单数据
     @Scheduled(fixedDelayString = "${installdown}")
     public void download() throws Exception {
-        /*if (1 == 1) {
+
+        if (netfsxc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
-        }*/
+        }
+
         List<ItfInstallBatchDownloadRec> rec = new ArrayList<>();
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

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

@@ -1,8 +1,10 @@
 package com.zfire.jiasm.syncdata.download.order;
 
 import com.zfire.jiasm.syncdata.common.OldForNewUploadLogic;
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -12,6 +14,12 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 public class OldForNewDownload {
+	@Value("${queryejectjddc}")
+	private String queryejectjddc = "";
+	@Value("${processbusinessc}")
+	private String processbusinessc = "";
+
+
 	@Autowired
 	OldForNewUploadLogic oldForNewUploadLogic;
 
@@ -20,6 +28,12 @@ public class OldForNewDownload {
 	 */
 	@Scheduled(fixedDelayString = "${queryejectjdd}")
 	public void queryRejectJdd() {
+
+
+		if (queryejectjddc.equals(TaskConfigEnum.FALSE.getCode())){
+			return;
+		}
+
 		// 下载驳回的鉴定单
 		oldForNewUploadLogic.queryRejectJdd();
 	}
@@ -29,6 +43,12 @@ public class OldForNewDownload {
 	 */
 	@Scheduled(fixedDelayString = "${processbusiness}")
 	public void processBusiness() {
+
+
+		if (processbusinessc.equals(TaskConfigEnum.FALSE.getCode())){
+			return;
+		}
+
 		// 修改鉴定单状态 及 同步驳回鉴定单的处理状态
 		oldForNewUploadLogic.processBusiness();
 	}

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

@@ -1,10 +1,12 @@
 package com.zfire.jiasm.syncdata.download.order;
 
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.gree.recycle.RecycleAcquisitionLogic;
 import com.zfire.jiasm.syncdata.gree.recycle.RecycleAssignLogic;
 import com.zfire.jiasm.syncdata.gree.recycle.RecycleAssignParamBean;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -16,6 +18,18 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 public class RecycleDownload {
+    @Value("${recycledownc}")
+    private String recycledownc = "";
+    @Value("${recyclefkdownc}")
+    private String recyclefkdownc = "";
+    @Value("${recyclecjdownc}")
+    private String recyclecjdownc = "";
+    @Value("${recycleverifydownc}")
+    private String recycleverifydownc = "";
+    @Value("${recycleinc}")
+    private String recycleinc = "";
+
+
     @Autowired
     RecycleAssignLogic recycleAssignLogic;
     @Autowired
@@ -30,7 +44,9 @@ public class RecycleDownload {
      */
     @Scheduled(fixedDelayString = "${recycledown}")
     public void download() throws Exception {
-        if (1 == 1) {
+
+
+        if (recycledownc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 
@@ -53,7 +69,9 @@ public class RecycleDownload {
      */
     @Scheduled(fixedDelayString = "${recyclefkdown}")
     private void updateFkmx() throws Exception {
-        if (1 == 1) {
+
+
+        if (recyclefkdownc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 
@@ -70,7 +88,9 @@ public class RecycleDownload {
      */
     @Scheduled(fixedDelayString = "${recyclecjdown}")
     private void updateAcquisition() {
-        if (1 == 1) {
+
+
+        if (recyclecjdownc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 
@@ -92,7 +112,9 @@ public class RecycleDownload {
      */
     @Scheduled(fixedDelayString = "${recycleverifydown}")
     private void updateExtend() throws Exception {
-        if (1 == 1) {
+
+
+        if (recycleverifydownc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 
@@ -106,7 +128,9 @@ public class RecycleDownload {
      */
     @Scheduled(fixedDelayString = "${recyclein}")
     private void updateRecycleAssignDownloadEntity2Business() {
-        if (1 == 1) {
+
+
+        if (recycleinc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 

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

@@ -1,6 +1,7 @@
 package com.zfire.jiasm.syncdata.download.order;
 
 import com.zfire.jiasm.syncdata.base.BaseService;
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.plus.entity.Brand;
 import com.zfire.jiasm.syncdata.plus.entity.ItfTblAssignDownload;
 import com.zfire.jiasm.syncdata.plus.entity.OrderBase;
@@ -10,6 +11,7 @@ import com.zfire.jiasm.syncdata.plus.service.OrderBaseService;
 import com.zfire.jiasm.syncdata.service.AddRepairBusiness;
 import com.zfire.jiasm.syncdata.service.PublicService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -28,6 +30,10 @@ import java.util.stream.Collectors;
 @Slf4j
 @Component
 public class RepairBusiness {
+    @Value("${repairinc}")
+    private String repairinc = "";
+
+
     @Resource
     ItfTblAssignDownloadService itfTblAssignDownloadService;
     @Resource
@@ -45,9 +51,12 @@ public class RepairBusiness {
     // 1：工单落入本地表 TL_SynDataFrom_tbl_assign_batch
     @Scheduled(fixedDelayString = "${repairin}")
     public void inputOrder() {
-        if (1 == 1) {
+
+
+        if (repairinc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
+
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<ItfTblAssignDownload> repairRec = new ArrayList<>();
         List<Long> pgids = new ArrayList<>();

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

@@ -1,6 +1,7 @@
 package com.zfire.jiasm.syncdata.download.order;
 
 import com.zfire.jiasm.syncdata.base.BaseService;
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.plus.entity.Brand;
 import com.zfire.jiasm.syncdata.plus.entity.ItfTblAssignDownload;
 import com.zfire.jiasm.syncdata.plus.entity.OrderBase;
@@ -10,6 +11,7 @@ import com.zfire.jiasm.syncdata.plus.service.OrderBaseService;
 import com.zfire.jiasm.syncdata.service.AddRepairBusiness;
 import com.zfire.jiasm.syncdata.service.PublicService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -28,6 +30,10 @@ import java.util.stream.Collectors;
 @Slf4j
 @Component
 public class RepairBusinessApi {
+    @Value("${repairinc}")
+    private String repairinc = "";
+
+
     @Resource
     ItfTblAssignDownloadService itfTblAssignDownloadService;
     @Resource
@@ -45,9 +51,13 @@ public class RepairBusinessApi {
     // 1：工单落入本地表 TL_SynDataFrom_tbl_assign_batch
     @Scheduled(fixedDelayString = "${repairin}")
     public void inputOrder() {
-        /*if (1 == 1) {
+
+
+        if (repairinc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
-        }*/
+        }
+
+
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<ItfTblAssignDownload> repairRec = new ArrayList<>();
         List<Long> pgids = new ArrayList<>();

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

@@ -3,6 +3,7 @@ package com.zfire.jiasm.syncdata.download.order;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 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.ItfGreeToFaRepairSynRule;
 import com.zfire.jiasm.syncdata.plus.service.ItfGreeToFaRepairSynRuleService;
@@ -37,6 +38,9 @@ public class RepairDownload {
     private String baseurl = "";
     @Value("${nullCols}")
     private String nullCols;
+    @Value("${repairdownc}")
+    private String repairdownc = "";
+
 
     @Resource
     RepairDownload repairDownload;
@@ -52,10 +56,13 @@ public class RepairDownload {
     @Scheduled(fixedDelayString = "${repairdown}")
     public void download() throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        if (1 == 1) {
+
+
+        if (repairdownc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 
+
         try {
             ItfGreeToFaRepairSynRule synRule = itfGreeToFaRepairSynRuleService.lambdaQuery()
                     .orderByAsc(ItfGreeToFaRepairSynRule::getId).one();

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

@@ -55,9 +55,9 @@ public class RepairDownloadGD {
         DownRepairOrderGD data = new DownRepairOrderGD();
         JSONArray datas = new JSONArray();
 
-        /*if (1 == 1) {
+        if (1 == 1) {
             return;
-        }*/
+        }
 
         try {
             ItfGreeToFaRepairSynRule synRule = itfGreeToFaRepairSynRuleService.lambdaQuery()

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

@@ -1,9 +1,11 @@
 package com.zfire.jiasm.syncdata.download.other.accessories;
 
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.plus.entity.TableDataQueryTime;
 import com.zfire.jiasm.syncdata.plus.service.TableDataQueryTimeService;
 import com.zfire.jiasm.syncdata.service.OtherDownService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -19,6 +21,9 @@ import java.util.List;
 @Slf4j
 @Component
 public class AccessoriesQuery {
+    @Value("${pjcxc}")
+    private String pjcxc = "";
+
     @Resource
     TableDataQueryTimeService tableDataQueryTimeService;
     @Resource
@@ -28,7 +33,7 @@ public class AccessoriesQuery {
 
     @Scheduled(fixedDelayString = "${pjcx}")
     public void getInfo(){
-        if (1==1){
+        if (pjcxc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.zfire.jiasm.syncdata.base.BaseService;
 import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
 import com.zfire.jiasm.syncdata.constant.ServiceCategoryEnum;
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.gree.GreeLogic;
 import com.zfire.jiasm.syncdata.helper.GreeResponseHelper;
 import com.zfire.jiasm.syncdata.plus.entity.*;
@@ -22,6 +23,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -47,6 +49,15 @@ import java.util.stream.Collectors;
 @Component
 public class GLPPWXGQueryAdd {
     String wdqyapi = "/outapp/wxg/list";
+
+    @Value("${wxgwzc}")
+    private String wxgwzc = "";
+    @Value("${lmxxc}")
+    private String lmxxc = "";
+    @Value("${zjzxxc}")
+    private String zjzxxc = "";
+
+
     @Resource
     BaseService baseService;
     @Resource
@@ -96,9 +107,11 @@ public class GLPPWXGQueryAdd {
      */
     @Scheduled(fixedDelayString = "${zjzxx}")
     public void wxgQueryAddCertInfo() throws Exception {
-        /*if (1==1){
+
+
+        if (zjzxxc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
-        }*/
+        }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         WangdianWxgVos wvos = new WangdianWxgVos();
@@ -183,9 +196,11 @@ public class GLPPWXGQueryAdd {
      */
     @Scheduled(fixedDelayString = "${lmxx}")
     public void wxgQueryAddCategory() throws Exception {
-        /*if (1==1){
+
+
+        if (lmxxc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
-        }*/
+        }
 
         List<WorkerBrandAccount> workerBrandAccounts = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -277,7 +292,9 @@ public class GLPPWXGQueryAdd {
      */
     @Scheduled(fixedDelayString = "${wxgwz}")
     public void wxgQueryAdd() throws Exception {
-        if (1==1){
+
+
+        if (wxgwzc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.zfire.jiasm.syncdata.base.BaseService;
 import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
 import com.zfire.jiasm.syncdata.constant.ServiceCategoryEnum;
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.gree.GreeLogic;
 import com.zfire.jiasm.syncdata.helper.GreeResponseHelper;
 import com.zfire.jiasm.syncdata.plus.entity.*;
@@ -18,6 +19,7 @@ import com.zfire.jiasm.syncdata.utils.oss.OSSUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +38,8 @@ import java.util.stream.Collectors;
 @Component
 public class GLPPWXGQueryUpdate {
     String wdqyapi = "/outapp/wxg/list";
+    @Value("${wxgxgc}")
+    private String wxgxgc = "";
 
 
     @Resource
@@ -73,7 +77,9 @@ public class GLPPWXGQueryUpdate {
      */
     @Scheduled(fixedDelayString = "${wxgxg}")
     public void wxgQueryUpdate() throws Exception {
-        if (1==1){
+
+
+        if (wxgxgc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 

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

@@ -21,7 +21,7 @@ public interface OrderService extends IService<OrderBase> {
     void setParame(Brand brand, OrderBase orderBase, ItfTblAssignDownload item);
     void setParameUpdate(Brand brand, OrderBase orderBase, ItfTblAssignDownload item);
 
-    // 商户工单地理位置转成平台工单地理位置 依商户的为准
+    // 商户工单地理位置转成平台工单地理位置 无对应关系时商户的为准
     void shPositionTopt(OrderBase orderBase);
     // 平台工单地理位置转成商户工单地理位置 无依平台为准
     void tpPositionTosh(ItfTblAzAssignLcLsUpload lcls);

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

@@ -95,4 +95,7 @@ public interface PublicService {
 
     SatisfactionList getAppraiseStatus(String pjly);
 
+    // 获取安装工单对应的师傅信息
+    Worker getInstallOrderWorker(Long azrenid);
+
 }

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

@@ -268,9 +268,9 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         // 工单主表、机型、辅材、清洗、预约改约记录、师傅、创建日志、生成采集数据不要
         getOrderApi(orderProducts, orderBase, orderWorker, orderInstall, createOrder,
                 orderProductList, orderMaterialList, orderCleanItems, flag);
-        log.info("request:{}", JSONObject.toJSONString(createOrder));
+        // log.info("request:{}", JSONObject.toJSONString(createOrder));
         ResponseHelper respone = jiasmApi.orderAdd(createOrder);
-        log.info("respone:{}", JSONObject.toJSONString(respone));
+        // log.info("respone:{}", JSONObject.toJSONString(respone));
         if (respone.getCode()==200){
             // 安装工单数据落本地表
             addOrderDataApi(item.getSynReqId(), synReqIds, synReqFkMxIds, synReqYfYyIds, fyqd, getpjSynReqId,
@@ -449,9 +449,9 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
 
         // 工单主表、机型、辅材、清洗、预约改约记录、师傅、创建日志、生成采集数据不要
         getOrderApi(orderProductsUpdate, upInfo, own, orderInstall, order, orderProductList, orderMaterialList, orderCleanItems,flag);
-        log.info("request:{}", JSONObject.toJSONString(order));
+        // log.info("request:{}", JSONObject.toJSONString(order));
         ResponseHelper respone = jiasmApi.orderAdd(order);
-        log.info("respone:{}", JSONObject.toJSONString(respone));
+        // log.info("respone:{}", JSONObject.toJSONString(respone));
         if (respone.getCode()==200){
             // 安装工单数据修改落本地表
             addOrUpdateOrderDataApi(item, mxsynreqids, synreqids,
@@ -2655,6 +2655,15 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
 
         // 生成工单基础表 对象
         orderBase = azGDLcLsDownloadMapper.getOrderBase(orderPar);
+        // 赋值接收师傅信息
+        Worker worker= publicService.getInstallOrderWorker(item.getAzrenid());
+        if (worker !=null){
+            orderBase.setWorkerId(worker.getWorkerId());
+            orderBase.setWorkerName(worker.getWorkerName());
+            orderBase.setWorkerMobile(worker.getMobile());
+            orderBase.setWorkerIdcard(worker.getIdcard());
+        }
+
         orderBase.setId("33"+IdWorker.getIdStr());
         // 总部下来的工单新增时统一为待接收状态
         orderBase.setDispatchStatus("DJS");
@@ -2685,6 +2694,15 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
 
         // 生成工单基础表 对象
         orderBase = azGDLcLsDownloadMapper.getOrderBase(orderPar);
+        // 赋值接收师傅信息
+        Worker worker= publicService.getInstallOrderWorker(item.getAzrenid());
+        if (worker !=null){
+            orderBase.setWorkerId(worker.getWorkerId());
+            orderBase.setWorkerName(worker.getWorkerName());
+            orderBase.setWorkerMobile(worker.getMobile());
+            orderBase.setWorkerIdcard(worker.getIdcard());
+        }
+
         orderBase.setSource("GREE");
         orderBase.setId("G" + IdWorker.getIdStr());
         // 总部下来的工单新增时统一为待接收状态
@@ -2715,6 +2733,15 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         orderPar.setBrandId(brand.getBrandId());
         // 生成工单基础表 对象
         orderBase = azGDLcLsDownloadMapper.getOrderBase(orderPar);
+        // 赋值接收师傅信息
+        Worker worker= publicService.getInstallOrderWorker(item.getAzrenid());
+        if (worker !=null){
+            orderBase.setWorkerId(worker.getWorkerId());
+            orderBase.setWorkerName(worker.getWorkerName());
+            orderBase.setWorkerMobile(worker.getMobile());
+            orderBase.setWorkerIdcard(worker.getIdcard());
+        }
+
         // 重置部分数据
         orderService.setParUp(item, orderBase,oads,its);
 
@@ -2729,6 +2756,14 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         orderPar.setBrandId(brand.getBrandId());
         // 生成工单基础表 对象
         orderBase = azGDLcLsDownloadMapper.getOrderBase(orderPar);
+        // 赋值接收师傅信息
+        Worker worker= publicService.getInstallOrderWorker(item.getAzrenid());
+        if (worker !=null){
+            orderBase.setWorkerId(worker.getWorkerId());
+            orderBase.setWorkerName(worker.getWorkerName());
+            orderBase.setWorkerMobile(worker.getMobile());
+            orderBase.setWorkerIdcard(worker.getIdcard());
+        }
         // 重置部分数据
         orderService.setParUpApi(item, orderBase,oads,its);
 

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

@@ -291,9 +291,9 @@ public class AddRepairBusinessImpl implements AddRepairBusiness {
 
         // 工单主表、机型、辅材、清洗、预约改约记录、师傅、创建日志、生成采集数据不要
         getOrderApi(item, addmx, order, orderWorker, or, orderApi, orderProductList, orderMaterialList, orderCleanItems,flag);
-        log.info("request:{}", JSONObject.toJSONString(order));
+        // log.info("request:{}", JSONObject.toJSONString(order));
         ResponseHelper respone = jiasmApi.orderAdd(orderApi);
-        log.info("respone:{}", JSONObject.toJSONString(respone));
+        // log.info("respone:{}", JSONObject.toJSONString(respone));
         if (respone.getCode()==200){
             // 同步更新状态
             updateSynStatus(addmx, upMxd, orols, fkmxd, pjups, orderAppeal, oanew, faGreeSms, oilist, oilistUp, upappointds);
@@ -387,9 +387,9 @@ public class AddRepairBusinessImpl implements AddRepairBusiness {
 
         // 工单主表、机型、辅材、清洗、预约改约记录、师傅、创建日志、生成采集数据不要
         getOrderApi(item, addmx, order, orderWorker, or, orderApi, orderProductList, orderMaterialList, orderCleanItems,flag);
-        log.info("request:{}", JSONObject.toJSONString(orderApi));
+        // log.info("request:{}", JSONObject.toJSONString(orderApi));
         ResponseHelper respone = jiasmApi.orderAdd(orderApi);
-        log.info("respone:{}", JSONObject.toJSONString(respone));
+        // log.info("respone:{}", JSONObject.toJSONString(respone));
         if (respone.getCode()==200){
             // 同步更新状态
             synStatus(item, addmx, ups, pjups, orderAppeal, oanew, faGreeSms, oilist, ydups, fkmxups, us, order);
@@ -947,6 +947,14 @@ public class AddRepairBusinessImpl implements AddRepairBusiness {
         orderPar.setSynReqId(item.getSynReqId());
         orderPar.setBrandId(brand.getBrandId());
         OrderBase upOrder = repairDownloadMapper.getUpOrderBase(orderPar);
+        // 赋值接收师傅信息
+        Worker worker= publicService.getInstallOrderWorker(item.getWxrenid());
+        if (worker !=null){
+            upOrder.setWorkerId(worker.getWorkerId());
+            upOrder.setWorkerName(worker.getWorkerName());
+            upOrder.setWorkerMobile(worker.getMobile());
+            upOrder.setWorkerIdcard(worker.getIdcard());
+        }
 
         upOrder.setId(oldOrder.getId());
         upOrder.setOutUpdateSynReqId(item.getSynReqId());
@@ -2549,6 +2557,15 @@ public class AddRepairBusinessImpl implements AddRepairBusiness {
         orderPar.setSynReqId(item.getSynReqId());
         orderPar.setBrandId(brand.getBrandId());
         OrderBase order = repairDownloadMapper.getOrderBase(orderPar);
+        // 赋值接收师傅信息
+        Worker worker= publicService.getInstallOrderWorker(item.getWxrenid());
+        if (worker !=null){
+            order.setWorkerId(worker.getWorkerId());
+            order.setWorkerName(worker.getWorkerName());
+            order.setWorkerMobile(worker.getMobile());
+            order.setWorkerIdcard(worker.getIdcard());
+        }
+
         order.setId("G" + IdWorker.getIdStr());
         if (isChildInfo){
             order.setIsChildInfo("YES");

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

@@ -78,7 +78,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         extractedAddOrUpdate(addRec, updateRec, jsonArray);
 
         // 数据同步到本地表
-        extractedLocalAddOrUpdate(addRec, updateRec);
+         extractedLocalAddOrUpdate(addRec, updateRec);
     }
 
     @Override
@@ -102,11 +102,11 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         Map<String,List<Websit>> websitMap = new HashMap<>();
         List<WorkerBrandAccount> addwbas = new ArrayList<>();
         List<WebsitWorker> websitWorkeradd = new ArrayList<>();
-        List<WorkerBrandAccount> wbas = new ArrayList<>();
+        List<WorkerBrandAccount> upWorkerBrandAccount = new ArrayList<>();
 
-        // 提取师傅信息
+        // 提取平台师傅信息
         List<Worker> oldWorkerRec =  workerService.lambdaQuery()
-                .select(Worker::getIdcard,Worker::getWorkerId).list();
+                .select(Worker::getIdcard,Worker::getWorkerId,Worker::getWorkerName).list();
         if (CollectionUtils.isNotEmpty(oldWorkerRec)){
             workerIdCardMap = oldWorkerRec.stream().collect(Collectors.groupingBy(Worker::getIdcard));
         }
@@ -125,12 +125,13 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
 
         if (addRec.size()>0){
             // 生成平台网点及品牌商网点师傅数据
-            wbas = getWebsitWorkerBrandAccounts(addRec, websitOrderSignMap, workerIdCardMap, websitMap, addwbas, websitWorkeradd, wbas);
+            getWebsitWorkerBrandAccounts(addRec, websitOrderSignMap, workerIdCardMap, websitMap, addwbas,
+                    websitWorkeradd, upWorkerBrandAccount);
 
             // 修改品牌商网点师傅数据
-            if (wbas.size()>0){
-                workerBrandAccountService.updateBatchById(wbas);
-                wbas.clear();
+            if (upWorkerBrandAccount.size()>0){
+                workerBrandAccountService.updateBatchById(upWorkerBrandAccount);
+                upWorkerBrandAccount.clear();
             }
 
             // 新增品牌师傅网点信息
@@ -149,12 +150,12 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
 
         if (updateRec.size()>0){
             // 生成平台网点及品牌商网点师傅数据
-            wbas = getWebsitWorkerBrandAccounts(updateRec, websitOrderSignMap, workerIdCardMap, websitMap, addwbas, websitWorkeradd, wbas);
+            getWebsitWorkerBrandAccounts(updateRec, websitOrderSignMap, workerIdCardMap, websitMap, addwbas, websitWorkeradd, upWorkerBrandAccount);
 
             // 修改品牌商网点师傅数据
-            if (wbas.size()>0){
-                workerBrandAccountService.updateBatchById(wbas);
-                wbas.clear();
+            if (upWorkerBrandAccount.size()>0){
+                workerBrandAccountService.updateBatchById(upWorkerBrandAccount);
+                upWorkerBrandAccount.clear();
             }
 
             // 新增品牌师傅网点信息
@@ -172,26 +173,26 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
     }
 
     @Nullable
-    private List<WorkerBrandAccount> getWebsitWorkerBrandAccounts(List<ItfTblWangdianWxgDownload> addRec,
+    private void getWebsitWorkerBrandAccounts(List<ItfTblWangdianWxgDownload> addRec,
                                                                   Map<String, List<WebsitOrderSign>> websitOrderSignMap,
-                                                                  Map<String, List<Worker>> workerMap,
+                                                                  Map<String, List<Worker>> workerIdCardMap,
                                                                   Map<String, List<Websit>> websitMap,
                                                                   List<WorkerBrandAccount> addwbas,
                                                                   List<WebsitWorker> websitWorkeradd,
-                                                                  List<WorkerBrandAccount> wbas) {
+                                                                  List<WorkerBrandAccount> upWorkerBrandAccounts) {
         for (ItfTblWangdianWxgDownload m : addRec){
-            // 只有存在才可以新增进来 存在品牌网点对应平台多网点
+            // 只有存在网点对应关系才可以新增师傅到网点信息中来 存在品牌网点对应平台多网点
             if (!websitOrderSignMap.containsKey(m.getWdno())){
                 continue;
             }
             // 看师傅+网点信息 在品牌商网点信息是否存在 存在修改，不存在新增 会存在多条记录
-            wbas = workerBrandAccountService.lambdaQuery()
+            List<WorkerBrandAccount>  oldwbas = workerBrandAccountService.lambdaQuery()
                     .eq(WorkerBrandAccount::getBrandWebsitId,m.getWdno())
                     .eq(WorkerBrandAccount::getBrandWorkerId,m.getWxgid()).list();
 
-            // 存在修改
-            if (CollectionUtils.isNotEmpty(wbas)){
-                for (WorkerBrandAccount wba : wbas){
+            // 存在修只改师傅帐号状态
+            if (CollectionUtils.isNotEmpty(oldwbas)){
+                for (WorkerBrandAccount wba : oldwbas){
                     // 修改网点师傅信息
                     wba.setBrandWorkerStatus(DictTypeEnum.DICT_TYPE_OFF.getCode());
                     if (m.getFlag() != null){
@@ -201,28 +202,34 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
                     }
                     wba.setOutSyncTime(new Date());
                 }
+                upWorkerBrandAccounts.addAll(oldwbas);
                 // 修改平台网点师傅信息 要求存在就不修改只新增
             } else {
-                // 新增师傅所在品牌商网点信息
+                // 新增师傅所在品牌、商网点信息
                 List<WebsitOrderSign> wosrec = new ArrayList<>();
                 wosrec = websitOrderSignMap.get(m.getWdno());
                 // 存在品牌网点对应平台多网点 平台网点信息
                 for (WebsitOrderSign i : wosrec){
                     // 生成品牌师傅网点信息对像
-                    WorkerBrandAccount add = getWorkerBrandAccount(workerMap, websitMap, m, addwbas, i);
-                    // 生成师傅所在平台网点信息对像
-                    getWebsitWorker(workerMap, websitMap, m, websitWorkeradd, i, add);
+                    WorkerBrandAccount add = getWorkerBrandAccount(workerIdCardMap, websitMap, m, addwbas, i);
+                    // 生成师傅所在平台网点信息对像(如已存在不再新增 即不修改平台网点师傅信息)
+                    WebsitWorker ww = websitWorkerService.lambdaQuery()
+                            .eq(WebsitWorker::getWorkerId,workerIdCardMap.get(m.getSfzen()).get(0).getWorkerId())
+                            .eq(WebsitWorker::getWebsitId,i.getWebsitId()).one();
+                    if (ww == null){
+                        getWebsitWorker(workerIdCardMap, websitMap, m, websitWorkeradd, i, add);
+                    }
                 }
             }
         }
-        return wbas;
     }
 
-    private void getWebsitWorker(Map<String, List<Worker>> workerMap, Map<String, List<Websit>> websitrecMap, ItfTblWangdianWxgDownload m, List<WebsitWorker> websitWorkeradd, WebsitOrderSign i, WorkerBrandAccount add) {
+    private void getWebsitWorker(Map<String, List<Worker>> workerIdCardMap, Map<String, List<Websit>> websitrecMap, ItfTblWangdianWxgDownload m, List<WebsitWorker> websitWorkeradd, WebsitOrderSign i, WorkerBrandAccount add) {
         WebsitWorker v = new WebsitWorker();
         // 一定要与worker_brand_account.websit_worker_id相同
         v.setWebsitWorkerId(add.getWebsitWorkerId());
         v.setServiceId(websitrecMap.get(i.getWebsitId()).get(0).getServiceId());
+        v.setWebsitId(add.getWebsitId());
         v.setWorkerId(add.getWorkerId());
         v.setCreateBy("system");
         v.setUpdateBy("system");
@@ -240,7 +247,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         if (m.getLastModifiedDate() != null){
             v.setUpdateTime(m.getLastModifiedDate());
         }
-        v.setWorkerName(workerMap.get(m.getSfzen()).get(0).getWorkerName());
+        v.setWorkerName(workerIdCardMap.get(m.getSfzen()).get(0).getWorkerName());
         v.setStatus(DictTypeEnum.DICT_TYPE_ON.getCode());
         if (m.getFlag() != null){
             if (!m.getFlag().trim().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())){
@@ -322,9 +329,11 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
     }
 
     @NotNull
-    private WorkerBrandAccount getWorkerBrandAccount(Map<String, List<Worker>> workerMap, Map<String, List<Websit>> websitrecMap, ItfTblWangdianWxgDownload m, List<WorkerBrandAccount> addwbas, WebsitOrderSign i) {
+    private WorkerBrandAccount getWorkerBrandAccount(Map<String, List<Worker>> workerIdCardMap, Map<String, List<Websit>> websitrecMap,
+                                                     ItfTblWangdianWxgDownload m,
+                                                     List<WorkerBrandAccount> addwbas, WebsitOrderSign i) {
         WorkerBrandAccount add = new WorkerBrandAccount();
-        add.setWorkerId(workerMap.get(m.getSfzen()).get(0).getWorkerId());
+        add.setWorkerId(workerIdCardMap.get(m.getSfzen()).get(0).getWorkerId());
         // 自生成 一定要与websit_worker.websit_worker_id相同
         add.setWebsitWorkerId(IdWorker.getIdStr());
         add.setGroupCompanyId(i.getGroupCompanyId());
@@ -335,7 +344,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         add.setBrandWebsitId(i.getBrandWebsitId());
         add.setBrandWebsitName(i.getBrandWebsitName());
         add.setBrandWorkerId(String.valueOf(m.getWxgid()));
-        add.setBrandWorkerId(m.getWxgno());
+        add.setBrandWorkerNumber(m.getWxgno());
         add.setBrandWorkerStatus(DictTypeEnum.DICT_TYPE_OFF.getCode());
         if (m.getFlag() != null){
             if (m.getFlag().trim().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())){
@@ -546,7 +555,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
                 ItfTblWangdianWxgDownload old = oldRecMap.get(item.getWxgid()).get(0);
                 MyBeanUtils.copyProperties(item,old);
                 update.add(old);
-                if (update.size()>3000){
+                if (update.size()>2000){
                     itfTblWangdianWxgDownloadService.updateBatchById(update);
                     log.info("网点维修工基础资料信息同步更新修改了{}条数据", update.size());
                     updateRec.addAll(update);
@@ -561,7 +570,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
                 item.setSynTimes(0);
                 add.add(item);
 
-                if (add.size()>=3000){
+                if (add.size()>=2000){
                     itfTblWangdianWxgDownloadService.saveBatch(add);
                     log.info("网点维修工基础资料信息同步新增插入了{}条数据", add.size());
                     addRec.addAll(add);

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

@@ -187,7 +187,7 @@ public class ProvinceCityAreaTownServiceImpl implements ProvinceCityAreaTownServ
                 }
 
                 // 新增的插入到表
-                if (addStreet.size()>500){
+                if (addStreet.size()>2000){
                     streetService.saveBatch(addStreet);
                     addStreet.clear();
                     log.info("本地乡镇信息表新增插入了{}条数据",addStreet.size());
@@ -243,7 +243,7 @@ public class ProvinceCityAreaTownServiceImpl implements ProvinceCityAreaTownServ
                 }
 
                 // 更新
-                if (updateStreet.size()>500){
+                if (updateStreet.size()>2000){
                     streetService.updateBatchById(updateStreet);
                     log.info("本地乡镇信息表更新修改了{}条数据", updateStreet.size());
                     updateStreet.clear();
@@ -334,7 +334,7 @@ public class ProvinceCityAreaTownServiceImpl implements ProvinceCityAreaTownServ
                 addRec.add(item);
             }
 
-            if (addRec.size()>=500){
+            if (addRec.size()>=2000){
                 // 插入到表
                 itfTblCityJdxzDownloadService.saveBatch(addRec);
                 log.info("乡镇信息同步新增插入了{}条数据", addRec.size());
@@ -342,7 +342,7 @@ public class ProvinceCityAreaTownServiceImpl implements ProvinceCityAreaTownServ
                 addRec.clear();
             }
 
-            if (updateRecn.size()>=500){
+            if (updateRecn.size()>=2000){
                 // 插入到表
                 itfTblCityJdxzDownloadService.saveBatch(updateRecn);
                 log.info("乡镇信息同步更新修改了{}条数据", updateRecn.size());
@@ -504,7 +504,7 @@ public class ProvinceCityAreaTownServiceImpl implements ProvinceCityAreaTownServ
                 }
 
                 // 新增的插入到表
-                if (addCity.size()>500){
+                if (addCity.size()>2000){
                     cityService.saveBatch(addCity);
                     addCity.clear();
                     log.info("本地市信息表新增插入了{}条数据",addCity.size());
@@ -532,7 +532,7 @@ public class ProvinceCityAreaTownServiceImpl implements ProvinceCityAreaTownServ
                 }
 
                 // 更新
-                if (updateCity.size()>500){
+                if (updateCity.size()>2000){
                     cityService.updateBatchById(updateCity);
                     updateCity.clear();
                     log.info("本地市信息表更新修改了{}条数据", updateCity.size());
@@ -554,13 +554,13 @@ public class ProvinceCityAreaTownServiceImpl implements ProvinceCityAreaTownServ
 
     private void extractedLocalCityAddOrUpdata(List<ItfTblCityDownload> addRec, List<ItfTblCityDownload> updateRec) {
         // 新增的插入到表
-        if (addRec.size()>500){
+        if (addRec.size()>2000){
             itfTblCityDownloadService.saveBatch(addRec);
             addRec.clear();
             log.info("市信息同步新增插入了{}条数据", addRec.size());
         }
         // 更新
-        if (updateRec.size()>500){
+        if (updateRec.size()>2000){
             itfTblCityDownloadService.updateBatchById(updateRec);
             updateRec.clear();
             log.info("市信息同步更新修改了{}条数据", updateRec.size());
@@ -670,13 +670,13 @@ public class ProvinceCityAreaTownServiceImpl implements ProvinceCityAreaTownServ
             }
 
             // 新增的插入到表
-            if (addRecn.size()>500){
+            if (addRecn.size()>2000){
                 itfTblCountyDownloadService.saveBatch(addRecn);
                 log.info("区信息同步新增插入了{}条数据", addRecn.size());
                 addRecn.clear();
             }
             // 更新
-            if (updateRecn.size()>500){
+            if (updateRecn.size()>2000){
                 itfTblCountyDownloadService.updateBatchById(updateRecn);
                 log.info("区信息同步更新修改了{}条数据", updateRecn.size());
                 updateRecn.clear();
@@ -766,7 +766,7 @@ public class ProvinceCityAreaTownServiceImpl implements ProvinceCityAreaTownServ
                 }
 
                 // 更新
-                if (updateArea.size()>500){
+                if (updateArea.size()>2000){
                     areaService.updateBatchById(updateArea);
                     updateArea.clear();
                     log.info("本地区信息表更新修改了{}条数据", updateArea.size());
@@ -811,7 +811,7 @@ public class ProvinceCityAreaTownServiceImpl implements ProvinceCityAreaTownServ
                     addArea.add(v);
 
                     // 新增的插入到表
-                    if (addArea.size()>500){
+                    if (addArea.size()>2000){
                         areaService.saveBatch(addArea);
                         addArea.clear();
                         log.info("本地区信息表新增插入了{}条数据",addArea.size());

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

@@ -4,6 +4,7 @@ import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.sun.corba.se.spi.orbutil.threadpool.Work;
 import com.zfire.jiasm.syncdata.constant.Constant;
 import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
 import com.zfire.jiasm.syncdata.constant.InterFaceTypeEnum;
@@ -80,7 +81,8 @@ public class PublicServiceImpl implements PublicService {
     SatisfactionListService satisfactionListService;
     @Autowired
     RedisUtil redis;
-
+    @Resource
+    ItfTblWangdianWxgDownloadService itfTblWangdianWxgDownloadService;
 
 
     private static String ALISMS_RESERVE = "尊敬的客户，您好！师傅上门时间为%s，服务网点电话：%s，如本次上门时间与您的安排有冲突，请拨打服务网点电话联系，我们将竭诚为您服务！";
@@ -968,6 +970,21 @@ public class PublicServiceImpl implements PublicService {
         return null;
     }
 
+    // 获取安装工单对应的师傅信息
+    @Override
+    public Worker getInstallOrderWorker(Long azrenid){
+        Worker worker = null;
+        ItfTblWangdianWxgDownload wdwxg = itfTblWangdianWxgDownloadService.lambdaQuery()
+                .eq(ItfTblWangdianWxgDownload::getWxgid,azrenid).one();
+        // 根据身份证取师傅信息
+        if (wdwxg !=null){
+            worker = workerService.lambdaQuery()
+                    .eq(Worker::getIdcard,wdwxg.getSfzen()).one();
+        }
+
+        return worker;
+    }
+
 
     // SATISFACTION=好GENERAL=中DISPLEASURE=差 ELIMINATE=剔除 OTHER_APPRISE=其他
     // 评价状态 A=满意  B=一般  C=不满意

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

@@ -51,7 +51,6 @@ public class DataUpload {
 
 
 
-
     // @Scheduled(fixedDelay = 1 * 5 * 1000)
     public void uploadProcess() throws Exception {
         if (1==1){

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

@@ -1,8 +1,10 @@
 package com.zfire.jiasm.syncdata.upload.order;
 
 import com.zfire.jiasm.syncdata.common.DataUploadLogic;
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -19,6 +21,9 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 public class DataUploadNew {
+    @Value("${datauploadc}")
+    private String datauploadc = "";
+
     @Autowired
     DataUploadLogic dataUploadLogic;
 
@@ -27,156 +32,235 @@ public class DataUploadNew {
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblazassignappointment() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
         // 用户预约改约
         dataUploadLogic.uploaditftblazassignappointment();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblazwgmxjyktfj() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 家用空调数据采集附件
         dataUploadLogic.uploaditftblazwgmxjyktfj();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblazwgmxsyktfj() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 商用空调数据采集附件
         dataUploadLogic.uploaditftblazwgmxsyktfj();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblazwgmxqitafj() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 其他数据采集附件
         dataUploadLogic.uploaditftblazwgmxqitafj();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblazwgmxjykttmmx() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 家用空调条码明细
         dataUploadLogic.uploaditftblazwgmxjykttmmx();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblazwgmxsykttmmxls() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 商用完工明细数据采集条码明细
         dataUploadLogic.uploaditftblazwgmxsykttmmxls();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblazwgmxqitatmmx() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 其他完工明细数据采集条码明细
         dataUploadLogic.uploaditftblazwgmxqitatmmx();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblazassignfkmx() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 安装反馈明细
         dataUploadLogic.uploaditftblazassignfkmx();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblazassignfee() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 空调安装费用清单
         dataUploadLogic.uploaditftblazassignfee();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblazassignlcls() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 安装主表
         dataUploadLogic.uploaditftblazassignlcls();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblazwgmxqita() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 完工明细(其他)
         dataUploadLogic.uploaditftblazwgmxqita();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblazwgmxjykt() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 完工明细(家用空调)
         dataUploadLogic.uploaditftblazwgmxjykt();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblazwgmxsykt() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 完工明细(商用空调)
         dataUploadLogic.uploaditftblazwgmxsykt();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblazassignmx() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 安装工单明细
         dataUploadLogic.uploaditftblazassignmx();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblwxjspjmxjykt() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 配件表
         dataUploadLogic.uploaditftblwxjspjmxjykt();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblwxjswxxmjykt() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 维修项目
         dataUploadLogic.uploaditftblwxjswxxmjykt();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblwxjsxxyyjykt() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 维修现象
         dataUploadLogic.uploaditftblwxjsxxyyjykt();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblwxjsfjjykt() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 维修附件表
         dataUploadLogic.uploaditftblwxjsfjjykt();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblassignfee() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 维修费用表
         dataUploadLogic.uploaditftblassignfee();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblassignxzyd() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 新增阅读记录维护表
         dataUploadLogic.uploaditftblassignxzyd();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblwxjsjykt() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 维修结算表
         dataUploadLogic.uploaditftblwxjsjykt();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblassign() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 维修单表
         dataUploadLogic.uploaditftblassign();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblassignmx() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 维修单明细
         dataUploadLogic.uploaditftblassignmx();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblassignappointment() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 维修单预约改约信息
         dataUploadLogic.uploaditftblassignappointment();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblassignfkmx() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 维修工单反馈信息
         dataUploadLogic.uploaditftblassignfkmx();
     }
 
     @Scheduled(fixedDelayString = "${dataupload}")
     private void uploaditftblazassignxzyd() throws Exception {
+        if (datauploadc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
         // 新增安装阅读记录维护表
         dataUploadLogic.uploaditftblazassignxzyd();
     }

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

@@ -26,6 +26,7 @@ import com.zfire.jiasm.syncdata.utils.oss.OSSUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -81,6 +82,10 @@ import java.util.stream.Collectors;
 @Slf4j
 @Component
 public class InstallProduceDataUpload {
+    @Value("${azuploadyscc}")
+    private String azuploadyscc = "";
+
+
     @Resource
     InstallProduceDataUpload installProduceDataUpload;
     @Resource
@@ -184,9 +189,9 @@ public class InstallProduceDataUpload {
 
     @Scheduled(fixedDelayString = "${azuploadysc}")
     private void produceList(){
-        /*if (1==1){
+        if (azuploadyscc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
-        }*/
+        }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String cjOrWg = "";

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

@@ -2,6 +2,7 @@ package com.zfire.jiasm.syncdata.upload.order;
 
 import com.zfire.jiasm.syncdata.constant.GDOrderStatusEnum;
 import com.zfire.jiasm.syncdata.constant.OrderTypeEnum;
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.*;
 import com.zfire.jiasm.syncdata.service.PrepareService;
@@ -33,6 +34,8 @@ import java.util.*;
 public class InstallProduceUploadList {
     @Value("${baseurl}")
     private String baseurl = "";
+    @Value("${azuploadscc}")
+    private String azuploadscc = "";
 
     @Resource
     InstallProduceUploadList installProduceUploadList;
@@ -58,9 +61,11 @@ public class InstallProduceUploadList {
 
     @Scheduled(fixedDelayString = "${azuploadsc}")
     private void produceList(){
-        /*if (1==1){
+        if (azuploadscc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
-        }*/
+        }
+
+
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<OutJiasmToGreeUploadTaskList> ojtgutls = new ArrayList<>();

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

@@ -1,8 +1,10 @@
 package com.zfire.jiasm.syncdata.upload.order;
 
 import com.zfire.jiasm.syncdata.common.OldForNewUploadLogic;
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -13,6 +15,14 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 public class OldForNewUpload {
+	@Value("${yjhxjddc}")
+	private String yjhxjddc = "";
+	@Value("${yjhxsctmc}")
+	private String yjhxsctmc = "";
+	@Value("${yjhxtmscc}")
+	private String yjhxtmscc = "";
+
+
 	@Autowired
 	OldForNewUploadLogic oldForNewUploadLogic;
 
@@ -28,6 +38,10 @@ public class OldForNewUpload {
 	 */
 	@Scheduled(fixedDelayString = "${yjhxjdd}")
 	public void tradeOldForNewCollection() {
+
+		if (yjhxjddc.equals(TaskConfigEnum.FALSE.getCode())){
+			return;
+		}
 		// 上传鉴定单数据 + 新增一条待入库条码上传任务记录
 		oldForNewUploadLogic.collection();
 	}
@@ -37,6 +51,11 @@ public class OldForNewUpload {
 	 */
 	@Scheduled(fixedDelayString = "${yjhxsctm}")
 	public void stockBarcodeInfoDonwlodToUpload() {
+
+		if (yjhxsctmc.equals(TaskConfigEnum.FALSE.getCode())){
+			return;
+		}
+
 		// 根据入库条码上传任务记录表数据 生成条码信息上传表数据 同时修改任务记录表状态
 		oldForNewUploadLogic.stockBarcodeInfoDonwlodToUpload();
 	}
@@ -46,6 +65,11 @@ public class OldForNewUpload {
 	 */
 	@Scheduled(fixedDelayString = "${yjhxtmsc}")
 	public void stockBarcodeInfoUpload() {
+
+		if (yjhxtmscc.equals(TaskConfigEnum.FALSE.getCode())){
+			return;
+		}
+
 		// 上传鉴定单条码数据到总部同时更新状态
 		oldForNewUploadLogic.stockBarcodeInfoUpload();
 	}

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

@@ -1,9 +1,11 @@
 package com.zfire.jiasm.syncdata.upload.order;
 
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.gree.recycle.RecycleAcquisitionLogic;
 import com.zfire.jiasm.syncdata.gree.recycle.RecycleAssignLogic;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -13,6 +15,12 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 public class RecycleUpload {
+    @Value("${hsgdzttmc}")
+    private String hsgdzttmc = "";
+    @Value("${hsgdcjtmc}")
+    private String hsgdcjtmc = "";
+
+
     @Autowired
     RecycleAssignLogic recycleAssignLogic;
     @Autowired
@@ -25,7 +33,8 @@ public class RecycleUpload {
      */
     @Scheduled(fixedDelayString = "${hsgdzttm}")
     private void statusBatchUpload() {
-        if (1 == 1) {
+
+        if (hsgdzttmc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 
@@ -38,7 +47,7 @@ public class RecycleUpload {
      */
     @Scheduled(fixedDelayString = "${hsgdcjtm}")
     private void acquisitionUpload() {
-        if (1 == 1) {
+        if (hsgdcjtmc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 

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

@@ -9,6 +9,7 @@ import com.zfire.jiasm.syncdata.base.BaseService;
 import com.zfire.jiasm.syncdata.constant.GDAppointStatusEnum;
 import com.zfire.jiasm.syncdata.constant.GDOrderStatusEnum;
 import com.zfire.jiasm.syncdata.constant.OrderTypeEnum;
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.dao.mapper.*;
 import com.zfire.jiasm.syncdata.data.Token;
 import com.zfire.jiasm.syncdata.parameter.InstallCJDetailFile;
@@ -50,6 +51,8 @@ public class RepairProduceDataUpload {
     private String baseurl4pgid;
     @Value("${baseurl}")
     private String baseurl;
+    @Value("${wxuploadyscc}")
+    private String wxuploadyscc = "";
 
 
     @Resource
@@ -149,9 +152,10 @@ public class RepairProduceDataUpload {
 
     @Scheduled(fixedDelayString = "${wxuploadysc}")
     private void produceList() throws Exception {
-        /*if (1==1){
+
+        if (wxuploadyscc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
-        }*/
+        }
 
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.zfire.jiasm.syncdata.constant.GDAppointStatusEnum;
 import com.zfire.jiasm.syncdata.constant.GDOrderStatusEnum;
 import com.zfire.jiasm.syncdata.constant.OrderTypeEnum;
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.dao.mapper.OrderInformationNewMapper;
 import com.zfire.jiasm.syncdata.data.Token;
 import com.zfire.jiasm.syncdata.parameter.OrderPar;
@@ -36,6 +37,8 @@ import java.util.*;
 public class RepairProduceUploadList {
     @Value("${baseurl}")
     private String baseurl = "";
+    @Value("${wxuploadscc}")
+    private String wxuploadscc = "";
 
     @Autowired
     private TokenCenter tokenCenter;
@@ -69,9 +72,10 @@ public class RepairProduceUploadList {
     private void produceList() {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<OutJiasmToGreeUploadTaskList> ojtgutls = new ArrayList<>();
-        /*if (1==1){
+
+        if (wxuploadscc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
-        }*/
+        }
 
 
           log.info("开始预处理需要上传的维修工单数据: \uF0B7{}",sdf.format(new Date()));

src/main/java/com/zfire/jiasm/syncdata/upload/settlement/SettlementInstallJY.java

@@ -1,8 +1,10 @@
 package com.zfire.jiasm.syncdata.upload.settlement;
 
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.utils.OLDSystemUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -12,14 +14,18 @@ import java.util.Date;
 @Slf4j
 @Component
 public class SettlementInstallJY {
+    @Value("${installjyc}")
+    private String installjyc = "";
+
     @Autowired
     private OLDSystemUtil oldSystemTask;
 
     @Scheduled(fixedDelayString = "${installjy}")
     private void process() {
-        /*if (1==1){
+
+        if (installjyc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
-        }*/
+        }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         log.info("开始家用空调数据同步: \uF0B7{}",sdf.format(new Date()));

src/main/java/com/zfire/jiasm/syncdata/upload/settlement/SettlementInstallRepair.java

@@ -1,8 +1,10 @@
 package com.zfire.jiasm.syncdata.upload.settlement;
 
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.utils.OLDSystemUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -12,14 +14,18 @@ import java.util.Date;
 @Slf4j
 @Component
 public class SettlementInstallRepair {
+    @Value("${repairjsc}")
+    private String repairjsc = "";
+
     @Autowired
     private OLDSystemUtil oldSystemTask;
 
     @Scheduled(fixedDelayString = "${repairjs}")
     private void process() {
-        /*if (1==1){
+
+        if (repairjsc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
-        }*/
+        }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         log.info("开始维修结算数据同步: \uF0B7{}",sdf.format(new Date()));

src/main/java/com/zfire/jiasm/syncdata/upload/settlement/SettlementInstallSH.java

@@ -1,8 +1,10 @@
 package com.zfire.jiasm.syncdata.upload.settlement;
 
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.utils.OLDSystemUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -12,14 +14,17 @@ import java.util.Date;
 @Slf4j
 @Component
 public class SettlementInstallSH {
+    @Value("${installshc}")
+    private String installshc = "";
     @Autowired
     private OLDSystemUtil oldSystemTask;
 
     @Scheduled(fixedDelayString = "${installsh}")
     private void process() {
-        /*if (1==1){
+
+        if (installshc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
-        }*/
+        }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         log.info("开始生活电器数据同步: \uF0B7{}",sdf.format(new Date()));

src/main/java/com/zfire/jiasm/syncdata/upload/settlement/SettlementInstallSY.java

@@ -1,8 +1,10 @@
 package com.zfire.jiasm.syncdata.upload.settlement;
 
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.utils.OLDSystemUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -12,14 +14,17 @@ import java.util.Date;
 @Slf4j
 @Component
 public class SettlementInstallSY {
+    @Value("${installsyc}")
+    private String installsyc = "";
     @Autowired
     private OLDSystemUtil oldSystemTask;
 
     @Scheduled(fixedDelayString = "${installsy}")
     private void process() {
-        /*if (1==1){
+
+        if (installsyc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
-        }*/
+        }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         log.info("开始商用空调数据同步: \uF0B7{}",sdf.format(new Date()));

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

@@ -3,6 +3,7 @@ package com.zfire.jiasm.syncdata.upload.worker;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.zfire.jiasm.syncdata.base.BaseService;
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.gree.GreeLogic;
 import com.zfire.jiasm.syncdata.helper.GreeFileResponseHelper;
 import com.zfire.jiasm.syncdata.helper.GreeFileSaveHelper;
@@ -18,6 +19,7 @@ import com.zfire.jiasm.syncdata.response.ResultData;
 import com.zfire.jiasm.syncdata.utils.oss.OSSUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -32,6 +34,9 @@ import java.util.*;
 @Slf4j
 @Component
 public class UploadWorkeCertificate {
+    @Value("${workercertificatec}")
+    private String workercertificatec = "";
+
     @Resource
     OSSUtil ossUtil;
     @Resource
@@ -51,9 +56,12 @@ public class UploadWorkeCertificate {
     // 师傅证件照同步到格力总部
     @Scheduled(fixedDelayString = "${workercertificate}")
     public void processUploadTask() throws Exception {
-        /*if (1==1){
+
+        if (workercertificatec.equals(TaskConfigEnum.FALSE.getCode())){
             return;
-        }*/
+        }
+
+
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<WorkerCert> recs = new ArrayList<>();
         List<WorkerBrandAccount> workerWdnos = new ArrayList<>();

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

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.zfire.jiasm.syncdata.base.BaseService;
 import com.zfire.jiasm.syncdata.base.WorkerCertificateInfo;
 import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.gree.GreeLogic;
 import com.zfire.jiasm.syncdata.helper.GreeResponseHelper;
 import com.zfire.jiasm.syncdata.plus.entity.*;
@@ -21,6 +22,7 @@ import com.zfire.jiasm.syncdata.service.PublicService;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -36,6 +38,9 @@ import java.util.stream.Collectors;
 @Slf4j
 @Component
 public class UploadWorkerTOGree {
+    @Value("${workerceruploadc}")
+    private String workerceruploadc = "";
+
     @Resource
     BaseService baseService;
     @Resource
@@ -72,9 +77,10 @@ public class UploadWorkerTOGree {
      */
     @Scheduled(fixedDelayString = "${workercerupload}")
     public void uploadWorkProcess() throws Exception {
-        /*if (1==1) {
+
+        if (workerceruploadc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
-        }*/
+        }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<OutWorkerUpload> recs = new ArrayList<>();
@@ -129,7 +135,7 @@ public class UploadWorkerTOGree {
                 }
                 worker = workersMap.get(item.getWorkerId()).get(0);
 
-                // 查看师傅是否已选中品牌商 先同步状态为无效状态
+                // 查看师傅是否已选中品牌商 同步状态为有效状态
                 // 这里存在一个商户网点对应平台多个网点
                 workerBrandAccount = getWorkerBrandAccount(brand, item, worker);
                 if (CollectionUtils.isEmpty(workerBrandAccount)) {
@@ -672,7 +678,7 @@ public class UploadWorkerTOGree {
         if (response.getStatus() == 200){
             // 成功 修改同步状态
             updateWorkerUploadSuccess(item);
-            // 修改师傅品牌帐号
+            // 修改师傅品牌网点帐号
             updataWorker(id, response);
         } else {
             // 失败 修改同步状态
@@ -1154,7 +1160,6 @@ public class UploadWorkerTOGree {
                 .eq(WorkerBrandAccount::getGroupCompanyId, brand.getBrandId())
                 .eq(WorkerBrandAccount::getBrandWorkerStatus,"ON")
                 .eq(WorkerBrandAccount::getDel, 0)
-                .groupBy(WorkerBrandAccount::getBrandWebsitId)
                 .orderByAsc(WorkerBrandAccount::getCreateTime)
                 .list();
 

src/main/java/com/zfire/jiasm/syncdata/utils/HttpUtil.java

@@ -608,7 +608,7 @@ public class HttpUtil {
 			httpUrlConn.setRequestProperty("Content-Type", "application/json");
 			httpUrlConn.setRequestMethod(requestMethod);
 
-			log.info("url[" + url + "],send[" + outputStr + "]");
+			// log.info("url[" + url + "],send[" + outputStr + "]");
 
 			if (null != outputStr) {
 				OutputStream outputStream = httpUrlConn.getOutputStream();
@@ -635,7 +635,7 @@ public class HttpUtil {
 			inputStream.close();
 			httpUrlConn.disconnect();
 			result = buffer.toString();
-			log.info("receive[" + result + "],url[" + url + "],send[" + outputStr + "]");
+			// log.info("receive[" + result + "],url[" + url + "],send[" + outputStr + "]");
 		} catch (ConnectException ce) {
 			log.error("发生错误", ce);
 			throw ce;

src/main/resources/bootstrap-dev.properties

@@ -7,13 +7,13 @@ spring.servlet.multipart.location=/tmp
 #是否直接web端打印错误信息
 spring.devtools.add-properties=true
 
+##SQL执行分析，该插件有性能损耗，不建议生产环境使用
 spring.datasource.druid.db-type=mysql
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://121.43.111.127:3306/jiasm?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+spring.datasource.url=jdbc:mysql://121.43.111.127:3306/jiasm?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8&serverTimezone=Asia/Shanghai
 spring.datasource.username=root
 spring.datasource.password=xch!eCdvc124@
-
 spring.datasource.druid.connection-init-sqls=set names utf8mb4
 spring.datasource.druid.initial-size=5
 spring.datasource.druid.minIdle=5
@@ -35,9 +35,13 @@ spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20
 spring.datasource.druid.filters=stat,wall
 ### 通过connectProperties属性来打开mergeSql功能；慢SQL记录
 spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+feign.client.config.default.connectTimeout=60000
+feign.client.config.default.readTimeout=60000
 
 ### log4j配置
-logging.config=classpath:logback.xml
+logging.config=classpath:logbackback.xml
+# 禁控制台输出日志
+#logging.pattern.console=
 #undertow_web容器配置
 server.undertow.accesslog.dir=${user.dir}/logs/access
 server.undertow.accesslog.enabled=true
@@ -53,26 +57,21 @@ server.undertow.max-http-post-size=10240000
 mybatis-plus.mapper-locations=classpath*:/mapper/**Mapper.xml
 #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
 mybatis-plus.global-config.db-config.id-type=id_worker_str
-feign.client.config.default.connectTimeout=60000
-feign.client.config.default.readTimeout=60000
-
-
-#开启sql日志
-#mybatis-plus.configuration.log-impl = org.apache.ibatis.logging.stdout.StdOutImpl
-#map-underscore-to-camel-case = true
-
 #jackson组件时区
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
 spring.jackson.timeZone=GMT+08:00
 spring.jackson.serialization.write_dates_as_timestamps=false
 spring.mvc.date-format=yyyy-MM-dd HH:mm:ss
+web.upload-path=${user.dir}/static/
+web.imageService=https://xxxxx
 
 #高德
 lbs.web.key=b772f8b0ace6bc96c04ae8e48f241e36
 #家盛茂创建工单
 jiasmorderurl=https://jiasm.zfire.top/pcapi/order/add
 
+
 #####################redis 单机版 start################
 spring.redis.port=6388
 spring.redis.host=121.43.111.127
@@ -93,9 +92,8 @@ ali.oss.endpoint=oss-cn-hangzhou-internal.aliyuncs.com/
 ali.oss.type.pic=uploadfile/
 ali.sms.msg.code=SMS_212320165
 
-######################## 下载 ##############################
+######################## 从格力下载 ##############################
 masterbaseurl=https://gateway.yshcs.gree.com:9635/api/sso/autoapp-default-server-guangzhou/
-#masterbaseurl=https://api-sms.gree.com/api/sso/autoapp-default-server-guangzhou/
 clientId=guangfoserver
 clientSecret=f81f5ac8-ad24-4212-9b2d-9cc78f982562
 tokenURL=https://idm.yshcs.gree.com:9635/auth/realms/fdp-shyun-test%20/protocol/openid-connect/token
@@ -103,10 +101,9 @@ clientId4Pgid=guangfo
 clientSecret4Pgid=378ebb2e-cb56-44bc-8153-6c9c507574b8
 baseurl=https://gateway.yshcs.gree.com:9635/api/sso/autoapp-default-server-guangzhou/
 nullCols=wcsj,yhqwsmsj,qwsmjssj,fwrybwgsj,zjczsj,dqjdsj,yhyyczsj,qwsmjssj,fwrybwgsj,gmsj,czsj,fksj,xjwdsj,zjczsj,xjwdsj,bxdue,yblength,created_date,last_modified_date,ydsj,wwsl,jxid,tmjscount,bmysj,jssj,kssj
-######################## 上传 ##############################
+######################## 上传格力总部 ##############################
 uploadbaseurl=https://gateway.yshcs.gree.com:9635/api/sso/autoapp-default-server-guangzhou/api/outapp/default/general
 gree.V3.gettoken=https://idm.yshcs.gree.com:9635/auth/realms/fdp-shyun-test/protocol/openid-connect/token
-
 gree.gz.appid=O921980101
 gree.fs.appid=O921980701
 gree.tm.appid=O932982901
@@ -124,7 +121,6 @@ imagesign=https://gateway.yshcs.gree.com:9635/api/sso/nts-foundation-attachmentm
 gree.gettoken=https://idm.yshcs.gree.com:9635/auth/realms/fdp-shyun-test/protocol/openid-connect/token
 gree.file.client.id=guangfo
 gree.V3.client.file.secert=378ebb2e-cb56-44bc-8153-6c9c507574b8
-
 ######################## 格力总部查询接口 ##############################
 clientid=guangfoserver
 otherurl=https://api-sms-pre-test.gree.com:9635/api/sso
@@ -140,16 +136,13 @@ SMSSelf_templateId=1196771
 SMSSelf_startTime=07:00
 SMSSelf_endTime=24:00
 FAILURE_EXE_COUNT=10
-
 ######################## 完工评价短信发送到格力总部 ###########################
-repaireMessageFinishTopicName=messageHuifangTopic
 installTopicName=azdatacollection
 repaireTopicName=WxDtoTopic
-
+repaireMessageFinishTopicName=messageHuifangTopic
 
 ########################  派工短信发送  ###########################
 repaireMessageDispatchTopicName=messageTopic
-
 ######################## 完工结算滞后时间单位分 ########################
 finishlag=5
 
@@ -163,7 +156,7 @@ gree.V3.api.url=${gree.url}/api/sso/autoapp-default-server-greeshmobile/api/yunp
 gree.web.url=${gree.url}/api/sso/autoapp-default-server-guangzhou
 
 ######################## 京东 ########################
-jdueurl=https://gateway.yshcs.gree.com:9635/api/sso/autoapp-default-server-jingdongorderhandlerjob/
+jdueurl=https://api-sms.gree.com/api/sso/autoapp-default-server-jingdongorderhandlerjob/
 
 ######################## nacos ########################
 spring.cloud.nacos.config.server-addr=121.43.111.127:8848
@@ -285,3 +278,114 @@ hsgdzttm=10000
 hsgdcjtm=10000
 #工单数据向上同步
 dataupload=2000
+######################## 同步定时任务配置 ########################
+#师傅 证件、师傅、工单子表信息
+workercertificatec=FALSE
+workerceruploadc=FALSE
+detaildownc=FALSE
+#安装工单下载 、入本地表
+installdownc=FALSE
+installinc=FALSE
+#维修工单下载、入本地表
+repairdownc=FALSE
+repairinc=FALSE
+#回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
+recycledownc=FALSE
+recyclefkdownc=FALSE
+recyclecjdownc=FALSE
+recycleverifydownc=FALSE
+recycleinc=FALSE
+#以旧换新-获取所有驳回的鉴定单、修改鉴定单状态为驳回状态
+queryejectjddc=FALSE
+processbusinessc=FALSE
+#安装家用空调、商用空调、生活电器
+installjyc=FALSE
+installsyc=FALSE
+installshc=FALSE
+#维修结算、数据预生成
+repairjsc=FALSE
+repaironec=FALSE
+#故障维修
+masterdownloadratec=FALSE
+masterratec=FALSE
+guzdmc=FALSE
+#网点 佛山销售网点|售后网点、广州销售网点|售后网点
+netfsxc=FALSE
+netfssc=FALSE
+netgzxc=FALSE
+netgzsc=FALSE
+#网点 维修工 佛山销售|售后、广州销售|售后
+fsxwxgc=FALSE
+fsswxgc=TRUE
+gzxwxgc=FALSE
+gzswxgc=FALSE
+#类别大类、小类、系列、机型
+lbdlc=FALSE
+lbxlc=FALSE
+lbxltc=FALSE
+lbjxc=FALSE
+#销售类型
+azxslxc=FALSE
+#需求类别 需求大类、小类
+xqdlc=FALSE
+xqxlc=FALSE
+#用户属性、用户等级、信息渠道、信息来源
+yhsxc=FALSE
+yhdjc=FALSE
+xxqdc=FALSE
+xxlyc=FALSE
+#省、市、区、镇
+sxc=FALSE
+ssxc=FALSE
+qxc=FALSE
+zxc=FALSE
+#安装 配件查询、家用特殊安装申请新增、新增质量信息反馈、家用特殊安装查询、家用特殊安装申请更新、安装转结算、安装转结算查询最终结果
+pjcxc=FALSE
+jytsazxzc=FALSE
+xzzlfkc=FALSE
+jytsazxztc=FALSE
+jytsazxzgxc=FALSE
+azzjsc=FALSE
+azzjscxc=FALSE
+#退货 总部退换货录入、据采集、过程反馈、京东订单评价、根据工单号查询总部发送短信的详细信息、总部退换货总查询、故障机采集、总部退换货更新
+thlrc=FALSE
+thcjc=FALSE
+thfkc=FALSE
+jdddpjc=FALSE
+cxdxxqc=FALSE
+ththhcxc=FALSE
+thgzjcjc=FALSE
+ththhgxc=FALSE
+#维修转结算、维修转结算查询最终结果
+wxzjsc=FALSE
+wxzjscxc=FALSE
+#网点维修工 证件照，服务类目，位置、新增同步到本地、修改
+zjzxxc=FALSE
+lmxxc=FALSE
+wxgwzc=FALSE
+wxgxgc=FALSE
+#京东商城 预约改约、指派改派网点、作废取消、报完工、指派改派人员
+jdyygyc=FALSE
+jdzpgpwdc=FALSE
+jdzfqxc=FALSE
+jdbwgc=FALSE
+jdzpgpryc=FALSE
+#格力商城
+glscc=FALSE
+#天猫商城
+tmscc=FALSE
+#安装工单上传  生成需要上传的数据、生成上传任务清单列表
+azuploadyscc=FALSE
+azuploadscc=FALSE
+#维修工单上传  生成需要上传的数据、生成上传任务清单列表
+wxuploadyscc=FALSE
+wxuploadscc=FALSE
+#以旧换新 鉴定单、生成条码、条码上传
+yjhxjddc=FALSE
+yjhxsctmc=FALSE
+yjhxtmscc=FALSE
+#回收工单
+hsgdzttmc=FALSE
+hsgdcjtmc=FALSE
+#工单数据向上同步
+datauploadc=FALSE

src/main/resources/bootstrap-devback.properties

@@ -0,0 +1,287 @@
+#常规设置
+server.port =10006
+server.servlet.context-path=
+spring.servlet.multipart.max-file-size=40MB
+spring.servlet.multipart.max-request-size=40MB
+spring.servlet.multipart.location=/tmp
+#是否直接web端打印错误信息
+spring.devtools.add-properties=true
+
+spring.datasource.druid.db-type=mysql
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url=jdbc:mysql://121.43.111.127:3306/jiasm?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+spring.datasource.username=root
+spring.datasource.password=xch!eCdvc124@
+
+spring.datasource.druid.connection-init-sqls=set names utf8mb4
+spring.datasource.druid.initial-size=5
+spring.datasource.druid.minIdle=5
+spring.datasource.druid.maxActive=20
+### 配置获取连接等待超时的时间，单位是毫秒
+spring.datasource.druid.maxWait=60000
+### 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+spring.datasource.druid.timeBetweenEvictionRunsMillis=60000
+### 配置一个连接在池中最小生存的时间，单位是毫秒
+spring.datasource.druid.minEvictableIdleTimeMillis=300000
+spring.datasource.druid.validationQuery=SELECT 1 FROM DUAL
+spring.datasource.druid.testWhileIdle=true
+spring.datasource.druid.testOnBorrow=false
+spring.datasource.druid.testOnReturn=false
+### 打开PSCache，并且指定每个连接上PSCache的大小
+spring.datasource.druid.poolPreparedStatements=true
+spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20
+### 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+spring.datasource.druid.filters=stat,wall
+### 通过connectProperties属性来打开mergeSql功能；慢SQL记录
+spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+
+### log4j配置
+logging.config=classpath:logback.xml
+#undertow_web容器配置
+server.undertow.accesslog.dir=${user.dir}/logs/access
+server.undertow.accesslog.enabled=true
+server.undertow.accesslog.pattern=%h %l %u %t "%r" %s %b %D
+server.undertow.accesslog.prefix=access_log.
+server.undertow.accesslog.rotate=true
+server.undertow.accesslog.suffix=log
+server.undertow.max-http-post-size=10240000
+#swagger-login-account
+#spring.security.user.name=admin
+#spring.security.user.password=gree2021
+#mybatis-plus配置
+mybatis-plus.mapper-locations=classpath*:/mapper/**Mapper.xml
+#主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
+mybatis-plus.global-config.db-config.id-type=id_worker_str
+feign.client.config.default.connectTimeout=60000
+feign.client.config.default.readTimeout=60000
+
+
+#开启sql日志
+#mybatis-plus.configuration.log-impl = org.apache.ibatis.logging.stdout.StdOutImpl
+#map-underscore-to-camel-case = true
+
+#jackson组件时区
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+spring.jackson.time-zone=GMT+8
+spring.jackson.timeZone=GMT+08:00
+spring.jackson.serialization.write_dates_as_timestamps=false
+spring.mvc.date-format=yyyy-MM-dd HH:mm:ss
+
+#高德
+lbs.web.key=b772f8b0ace6bc96c04ae8e48f241e36
+#家盛茂创建工单
+jiasmorderurl=https://jiasm.zfire.top/pcapi/order/add
+
+#####################redis 单机版 start################
+spring.redis.port=6388
+spring.redis.host=121.43.111.127
+#redis密码
+spring.redis.password=private123@^
+spring.redis.lettuce.pool.max-active=300
+spring.redis.lettuce.pool.max-wait=1000ms
+spring.redis.lettuce.pool.max-idle=100
+spring.redis.lettuce.pool.min-idle=0
+spring.redis.timeout=100000ms
+
+#################### 阿里云配置 ######################
+ali.access.key.id=LTAI4GK1q4mnpCFbonMd1pji
+ali.access.key.secert=E5LW0V1H8HBxqjKkExIxaXUgSyex6C
+ali.oss.bucket.name=zfiresupply
+ali.oss.endpoint.ww=oss-cn-hangzhou.aliyuncs.com/
+ali.oss.endpoint=oss-cn-hangzhou-internal.aliyuncs.com/
+ali.oss.type.pic=uploadfile/
+ali.sms.msg.code=SMS_212320165
+
+######################## 下载 ##############################
+masterbaseurl=https://gateway.yshcs.gree.com:9635/api/sso/autoapp-default-server-guangzhou/
+#masterbaseurl=https://api-sms.gree.com/api/sso/autoapp-default-server-guangzhou/
+clientId=guangfoserver
+clientSecret=f81f5ac8-ad24-4212-9b2d-9cc78f982562
+tokenURL=https://idm.yshcs.gree.com:9635/auth/realms/fdp-shyun-test%20/protocol/openid-connect/token
+clientId4Pgid=guangfo
+clientSecret4Pgid=378ebb2e-cb56-44bc-8153-6c9c507574b8
+baseurl=https://gateway.yshcs.gree.com:9635/api/sso/autoapp-default-server-guangzhou/
+nullCols=wcsj,yhqwsmsj,qwsmjssj,fwrybwgsj,zjczsj,dqjdsj,yhyyczsj,qwsmjssj,fwrybwgsj,gmsj,czsj,fksj,xjwdsj,zjczsj,xjwdsj,bxdue,yblength,created_date,last_modified_date,ydsj,wwsl,jxid,tmjscount,bmysj,jssj,kssj
+######################## 上传 ##############################
+uploadbaseurl=https://gateway.yshcs.gree.com:9635/api/sso/autoapp-default-server-guangzhou/api/outapp/default/general
+gree.V3.gettoken=https://idm.yshcs.gree.com:9635/auth/realms/fdp-shyun-test/protocol/openid-connect/token
+
+gree.gz.appid=O921980101
+gree.fs.appid=O921980701
+gree.tm.appid=O932982901
+gree.gz.appkey=4Bx3m3fOMatutVv1u08kUdtIYZ4FsN4x
+gree.fs.appkey=4Bx3m3fOMatutVv1u08kUdtIYZ4FsN4x
+gree.client.id=guangfoserver
+gree.V3.client.secert=f81f5ac8-ad24-4212-9b2d-9cc78f982562
+baseurl4pgid=https://gateway.yshcs.gree.com:9635/api/sso/autoapp-default-server-greeshservice/
+
+######################## 上传格力总部文件 ##############################
+downfileurl=https://gateway.yshcs.gree.com:9635/api/pub/nts-foundation-attachmentmanager/api/v2/attachment/download?id=%s&access_token=%s
+sevefileurl=https://gateway.yshcs.gree.com:9635/api/sso/nts-foundation-attachmentmanager/api/v2/attachment/saveFileInfo
+imageurl=https://gateway.yshcs.gree.com:9635/api/sso/nts-foundation-attachmentmanager/api/v2/attachment/saveFileInfo
+imagesign=https://gateway.yshcs.gree.com:9635/api/sso/nts-foundation-attachmentmanager/api/v2/attachment/getSignWithWdno?wdno=%s
+gree.gettoken=https://idm.yshcs.gree.com:9635/auth/realms/fdp-shyun-test/protocol/openid-connect/token
+gree.file.client.id=guangfo
+gree.V3.client.file.secert=378ebb2e-cb56-44bc-8153-6c9c507574b8
+
+######################## 格力总部查询接口 ##############################
+clientid=guangfoserver
+otherurl=https://api-sms-pre-test.gree.com:9635/api/sso
+
+######################## 自建工单短信发送配置 ##############################
+SMSSelf_accountSID=8a216da880d67afb01814728462d130f_error
+SMSSelf_authToken=efe907d67dda4abd8e1351757b649682
+SMSSelf_softVersion=2013-12-26
+SMSSelf_baseURL=https://app.cloopen.com:8883
+SMSSelf_appId=8a216da880d67afb0181472847271316_error
+SMSSelf_smsType=0
+SMSSelf_templateId=1196771
+SMSSelf_startTime=07:00
+SMSSelf_endTime=24:00
+FAILURE_EXE_COUNT=10
+
+######################## 完工评价短信发送到格力总部 ###########################
+repaireMessageFinishTopicName=messageHuifangTopic
+installTopicName=azdatacollection
+repaireTopicName=WxDtoTopic
+
+
+########################  派工短信发送  ###########################
+repaireMessageDispatchTopicName=messageTopic
+
+######################## 完工结算滞后时间单位分 ########################
+finishlag=5
+
+######################## 旧机回收 ##############################
+gree.check.barcode=https://gateway.yshcs.gree.com:9635/api/sso/autoapp-default-server-installaccounts/api/ext/azwgmx/checkBarcode
+gree.repair.settle.get=https://gateway.yshcs.gree.com:9635/api/sso/autoapp-default-server-greerepairaccounts/api/JsBzController/xsGetJsbzByJxxmh
+gree.repair.settle.do=https://gateway.yshcs.gree.com:9635/api/sso/autoapp-default-server-greerepairaccounts/api/repairsettlement/gzBatchSettlement
+gree.url=https://gateway.yshcs.gree.com:9635
+gree.api.url=${gree.url}/api/sso/autoapp-default-server-guangzhou/api/outapp/default/general
+gree.V3.api.url=${gree.url}/api/sso/autoapp-default-server-greeshmobile/api/yunpaigong/accessories
+gree.web.url=${gree.url}/api/sso/autoapp-default-server-guangzhou
+
+######################## 京东 ########################
+jdueurl=https://gateway.yshcs.gree.com:9635/api/sso/autoapp-default-server-jingdongorderhandlerjob/
+
+######################## nacos ########################
+spring.cloud.nacos.config.server-addr=121.43.111.127:8848
+spring.cloud.nacos.config.namespace=a47fcffb-6156-4ab1-8e0b-1c5839a9f839
+spring.cloud.nacos.discovery.server-addr=121.43.111.127:8848
+spring.cloud.nacos.discovery.namespace=a47fcffb-6156-4ab1-8e0b-1c5839a9f839
+
+######################## 工单系统获取工单数据 ########################
+gdbaseurl=http://121.41.110.30:8112/
+
+######################## 同步定时任务时间隔 ########################
+#师傅 证件、师傅、工单子表信息
+workercertificate=5000
+workercerupload=5000
+detaildown=2000
+#安装工单下载 、入本地表
+installdown=5000
+installin=5000
+#维修工单下载、入本地表
+repairdown=5000
+repairin=5000
+#回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
+recycledown=60000
+recyclefkdown=60000
+recyclecjdown=60000
+recycleverifydown=60000
+recyclein=60000
+#以旧换新-获取所有驳回的鉴定单、修改鉴定单状态为驳回状态
+queryejectjdd=60000
+processbusiness=60000
+#安装家用空调、商用空调、生活电器
+installjy=10000
+installsy=10000
+installsh=10000
+#维修结算、数据预生成
+repairjs=10000
+repairone=5000
+#故障维修
+masterdownloadrate=10000
+masterrate=10000
+guzdm=3600000
+#网点 佛山销售网点|售后网点、广州销售网点|售后网点
+netfsx=10000
+netfss=10000
+netgzx=10000
+netgzs=10000
+#网点 维修工 佛山销售|售后、广州销售|售后
+fsxwxg=60000
+fsswxg=10000
+gzxwxg=10000
+gzswxg=10000
+#类别大类、小类、系列、机型
+lbdl=60000
+lbxl=60000
+lbxlt=60000
+lbjx=60000
+#销售类型
+azxslx=60000
+#需求类别 需求大类、小类
+xqdl=60000
+xqxl=60000
+#用户属性、用户等级、信息渠道、信息来源
+yhsx=60000
+yhdj=60000
+xxqd=60000
+xxly=60000
+#省、市、区、镇
+sx=60000
+ssx=60000
+qx=60000
+zx=60000
+#安装 配件查询、家用特殊安装申请新增、新增质量信息反馈、家用特殊安装查询、家用特殊安装申请更新、安装转结算、安装转结算查询最终结果
+pjcx=60000
+jytsazxz=60000
+xzzlfk=60000
+jytsazxzt=60000
+jytsazxzgx=60000
+azzjs=60000
+azzjscx=60000
+#退货 总部退换货录入、据采集、过程反馈、京东订单评价、根据工单号查询总部发送短信的详细信息、总部退换货总查询、故障机采集、总部退换货更新
+thlr=60000
+thcj=60000
+thfk=60000
+jdddpj=60000
+cxdxxq=60000
+ththhcx=60000
+thgzjcj=60000
+ththhgx=60000
+#维修转结算、维修转结算查询最终结果
+wxzjs=60000
+wxzjscx=60000
+#网点维修工 证件照，服务类目，位置、新增同步到本地、修改
+zjzxx=60000
+lmxx=60000
+wxgwz=60000
+wxgxg=60000
+#京东商城 预约改约、指派改派网点、作废取消、报完工、指派改派人员
+jdyygy=30000
+jdzpgpwd=30000
+jdzfqx=30000
+jdbwg=30000
+jdzpgpry=30000
+#格力商城
+glsc=2000
+#天猫商城
+tmsc=2000
+#安装工单上传  生成需要上传的数据、生成上传任务清单列表
+azuploadysc=2000
+azuploadsc=2000
+#维修工单上传  生成需要上传的数据、生成上传任务清单列表
+wxuploadysc=2000
+wxuploadsc=2000
+#以旧换新 鉴定单、生成条码、条码上传
+yjhxjdd=2000
+yjhxsctm=2000
+yjhxtmsc=20000
+#回收工单
+hsgdzttm=10000
+hsgdcjtm=10000
+#工单数据向上同步
+dataupload=2000

src/main/resources/bootstrap-prd.properties

@@ -39,7 +39,7 @@ feign.client.config.default.connectTimeout=60000
 feign.client.config.default.readTimeout=60000
 
 ### log4j配置
-logging.config=classpath:logback.xml
+logging.config=classpath:logbackback.xml
 #undertow_web容器配置
 server.undertow.accesslog.dir=${user.dir}/logs/access
 server.undertow.accesslog.enabled=true
@@ -253,4 +253,115 @@ yjhxtmsc=20000
 hsgdzttm=10000
 hsgdcjtm=10000
 #工单数据向上同步
-dataupload=2000
+dataupload=2000
+######################## 同步定时任务配置 ########################
+#师傅 证件、师傅、工单子表信息
+workercertificatec=TRUE
+workerceruploadc=TRUE
+detaildownc=TRUE
+#安装工单下载 、入本地表
+installdownc=TRUE
+installinc=TRUE
+#维修工单下载、入本地表
+repairdownc=TRUE
+repairinc=TRUE
+#回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
+recycledownc=TRUE
+recyclefkdownc=TRUE
+recyclecjdownc=TRUE
+recycleverifydownc=TRUE
+recycleinc=TRUE
+#以旧换新-获取所有驳回的鉴定单、修改鉴定单状态为驳回状态
+queryejectjddc=TRUE
+processbusinessc=TRUE
+#安装家用空调、商用空调、生活电器
+installjyc=TRUE
+installsyc=TRUE
+installshc=TRUE
+#维修结算、数据预生成
+repairjsc=TRUE
+repaironec=TRUE
+#故障维修
+masterdownloadratec=TRUE
+masterratec=TRUE
+guzdmc=TRUE
+#网点 佛山销售网点|售后网点、广州销售网点|售后网点
+netfsxc=TRUE
+netfssc=TRUE
+netgzxc=TRUE
+netgzsc=TRUE
+#网点 维修工 佛山销售|售后、广州销售|售后
+fsxwxgc=TRUE
+fsswxgc=TRUE
+gzxwxgc=TRUE
+gzswxgc=TRUE
+#类别大类、小类、系列、机型
+lbdlc=TRUE
+lbxlc=TRUE
+lbxltc=TRUE
+lbjxc=TRUE
+#销售类型
+azxslxc=TRUE
+#需求类别 需求大类、小类
+xqdlc=TRUE
+xqxlc=TRUE
+#用户属性、用户等级、信息渠道、信息来源
+yhsxc=TRUE
+yhdjc=TRUE
+xxqdc=TRUE
+xxlyc=TRUE
+#省、市、区、镇
+sxc=TRUE
+ssxc=TRUE
+qxc=TRUE
+zxc=TRUE
+#安装 配件查询、家用特殊安装申请新增、新增质量信息反馈、家用特殊安装查询、家用特殊安装申请更新、安装转结算、安装转结算查询最终结果
+pjcxc=TRUE
+jytsazxzc=TRUE
+xzzlfkc=TRUE
+jytsazxztc=TRUE
+jytsazxzgxc=TRUE
+azzjsc=TRUE
+azzjscxc=TRUE
+#退货 总部退换货录入、据采集、过程反馈、京东订单评价、根据工单号查询总部发送短信的详细信息、总部退换货总查询、故障机采集、总部退换货更新
+thlrc=TRUE
+thcjc=TRUE
+thfkc=TRUE
+jdddpjc=TRUE
+cxdxxqc=TRUE
+ththhcxc=TRUE
+thgzjcjc=TRUE
+ththhgxc=TRUE
+#维修转结算、维修转结算查询最终结果
+wxzjsc=TRUE
+wxzjscxc=TRUE
+#网点维修工 证件照，服务类目，位置、新增同步到本地、修改
+zjzxxc=TRUE
+lmxxc=TRUE
+wxgwzc=TRUE
+wxgxgc=TRUE
+#京东商城 预约改约、指派改派网点、作废取消、报完工、指派改派人员
+jdyygyc=TRUE
+jdzpgpwdc=TRUE
+jdzfqxc=TRUE
+jdbwgc=TRUE
+jdzpgpryc=TRUE
+#格力商城
+glscc=TRUE
+#天猫商城
+tmscc=TRUE
+#安装工单上传  生成需要上传的数据、生成上传任务清单列表
+azuploadyscc=TRUE
+azuploadscc=TRUE
+#维修工单上传  生成需要上传的数据、生成上传任务清单列表
+wxuploadyscc=TRUE
+wxuploadscc=TRUE
+#以旧换新 鉴定单、生成条码、条码上传
+yjhxjddc=TRUE
+yjhxsctmc=TRUE
+yjhxtmscc=TRUE
+#回收工单
+hsgdzttmc=TRUE
+hsgdcjtmc=TRUE
+#工单数据向上同步
+datauploadc=TRUE

src/main/resources/bootstrap-test.properties

@@ -39,7 +39,10 @@ feign.client.config.default.connectTimeout=60000
 feign.client.config.default.readTimeout=60000
 
 ### log4j配置
-logging.config=classpath:logback.xml
+logging.config=classpath:logbackback.xml
+# 禁控制台输出日志
+#logging.pattern.console=
+
 #undertow_web容器配置
 server.undertow.accesslog.dir=${user.dir}/logs/access
 server.undertow.accesslog.enabled=true
@@ -275,4 +278,115 @@ yjhxtmsc=60000
 hsgdzttm=60000
 hsgdcjtm=60000
 #工单数据向上同步
-dataupload=60000
+dataupload=60000
+######################## 同步定时任务配置 ########################
+#师傅 证件、师傅、工单子表信息
+workercertificatec=TRUE
+workerceruploadc=TRUE
+detaildownc=TRUE
+#安装工单下载 、入本地表
+installdownc=TRUE
+installinc=TRUE
+#维修工单下载、入本地表
+repairdownc=TRUE
+repairinc=TRUE
+#回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
+recycledownc=TRUE
+recyclefkdownc=TRUE
+recyclecjdownc=TRUE
+recycleverifydownc=TRUE
+recycleinc=TRUE
+#以旧换新-获取所有驳回的鉴定单、修改鉴定单状态为驳回状态
+queryejectjddc=TRUE
+processbusinessc=TRUE
+#安装家用空调、商用空调、生活电器
+installjyc=TRUE
+installsyc=TRUE
+installshc=TRUE
+#维修结算、数据预生成
+repairjsc=TRUE
+repaironec=TRUE
+#故障维修
+masterdownloadratec=TRUE
+masterratec=TRUE
+guzdmc=TRUE
+#网点 佛山销售网点|售后网点、广州销售网点|售后网点
+netfsxc=TRUE
+netfssc=TRUE
+netgzxc=TRUE
+netgzsc=TRUE
+#网点 维修工 佛山销售|售后、广州销售|售后
+fsxwxgc=TRUE
+fsswxgc=TRUE
+gzxwxgc=TRUE
+gzswxgc=TRUE
+#类别大类、小类、系列、机型
+lbdlc=TRUE
+lbxlc=TRUE
+lbxltc=TRUE
+lbjxc=TRUE
+#销售类型
+azxslxc=TRUE
+#需求类别 需求大类、小类
+xqdlc=TRUE
+xqxlc=TRUE
+#用户属性、用户等级、信息渠道、信息来源
+yhsxc=TRUE
+yhdjc=TRUE
+xxqdc=TRUE
+xxlyc=TRUE
+#省、市、区、镇
+sxc=TRUE
+ssxc=TRUE
+qxc=TRUE
+zxc=TRUE
+#安装 配件查询、家用特殊安装申请新增、新增质量信息反馈、家用特殊安装查询、家用特殊安装申请更新、安装转结算、安装转结算查询最终结果
+pjcxc=FALSE
+jytsazxzc=FALSE
+xzzlfkc=FALSE
+jytsazxztc=FALSE
+jytsazxzgxc=FALSE
+azzjsc=FALSE
+azzjscxc=FALSE
+#退货 总部退换货录入、据采集、过程反馈、京东订单评价、根据工单号查询总部发送短信的详细信息、总部退换货总查询、故障机采集、总部退换货更新
+thlrc=FALSE
+thcjc=FALSE
+thfkc=FALSE
+jdddpjc=FALSE
+cxdxxqc=FALSE
+ththhcxc=FALSE
+thgzjcjc=FALSE
+ththhgxc=FALSE
+#维修转结算、维修转结算查询最终结果
+wxzjsc=FALSE
+wxzjscxc=FALSE
+#网点维修工 证件照，服务类目，位置、新增同步到本地、修改
+zjzxxc=TRUE
+lmxxc=TRUE
+wxgwzc=TRUE
+wxgxgc=TRUE
+#京东商城 预约改约、指派改派网点、作废取消、报完工、指派改派人员
+jdyygyc=TRUE
+jdzpgpwdc=TRUE
+jdzfqxc=TRUE
+jdbwgc=TRUE
+jdzpgpryc=TRUE
+#格力商城
+glscc=TRUE
+#天猫商城
+tmscc=TRUE
+#安装工单上传  生成需要上传的数据、生成上传任务清单列表
+azuploadyscc=TRUE
+azuploadscc=TRUE
+#维修工单上传  生成需要上传的数据、生成上传任务清单列表
+wxuploadyscc=TRUE
+wxuploadscc=TRUE
+#以旧换新 鉴定单、生成条码、条码上传
+yjhxjddc=TRUE
+yjhxsctmc=TRUE
+yjhxtmscc=TRUE
+#回收工单
+hsgdzttmc=TRUE
+hsgdcjtmc=TRUE
+#工单数据向上同步
+datauploadc=TRUE

src/main/resources/bootstrap.properties

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

src/main/resources/logback.xml

@@ -1,81 +1,131 @@
-<!-- Logback configuration. See http://logback.qos.ch/manual/index.html -->
-<configuration scan="true" scanPeriod="2 seconds">
-    <property name="LOG_PATH" value="../logs" />
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<configuration>
+    <jmxConfigurator/>
+
+    <property name="LOG_HOME" value="logs"/>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <!-- 日志输出编码 -->
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <encoder>
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-                <charset>UTF-8</charset>
-            </encoder>
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -
+                %msg%n
+            </pattern>
+        </layout>
     </appender>
 
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/syndata.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+            <!--<maxFileSize>50MB</maxFileSize>-->
+        </rollingPolicy>
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -
+                %msg%n
+            </Pattern>
+        </layout>
+    </appender>
 
-    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>logs/info.log</File>
+    <appender name="NETDATA" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>logs/info-%d{yyyyMMdd}.log.%i</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>500MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <maxHistory>2</maxHistory>
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/syndata_netdata.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+            <!--<maxFileSize>50MB</maxFileSize>-->
         </rollingPolicy>
         <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n
+            <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -
+                %msg%n
+            </Pattern>
+        </layout>
+    </appender>
+
+    <appender name="UPLOADDATA" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/syndata_uploaddata.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+            <!--<maxFileSize>50MB</maxFileSize>-->
+        </rollingPolicy>
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -
+                %msg%n
+            </Pattern>
+        </layout>
+    </appender>
+
+    <appender name="PREPAREDATA" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/prepare.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+            <!--<maxFileSize>50MB</maxFileSize>-->
+        </rollingPolicy>
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -
+                %msg%n
             </Pattern>
         </layout>
     </appender>
 
-    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
 
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+    <!-- ERROR级别日志 -->
+    <!-- 滚动记录文件，先将日志记录到指定文件，当符合某个条件时，将日志记录到其他文件 RollingFileAppender-->
+    <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
         </filter>
-        <File>logs/error.log</File>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>logs/error-%d{yyyyMMdd}.log.%i
-            </fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>500MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <maxHistory>2</maxHistory>
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/error.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+            <!--<maxFileSize>50MB</maxFileSize>-->
         </rollingPolicy>
         <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n
+            <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -
+                %msg%n
             </Pattern>
         </layout>
     </appender>
 
+    <logger name="com.gree.syndata.util.HttpUtil" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="NETDATA"/>
+    </logger>
+
+    <logger name="com.gree.syndata.util.SMSSelfManager" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="NETDATA"/>
+    </logger>
+
+    <logger name="com.gree.syndata.task.UploadTask" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="UPLOADDATA"/>
+    </logger>
+
+    <logger name="com.gree.syndata.util.PrepareTaskLog" additivity="false">
+        <level value="DEBUG"/>
+        <appender-ref ref="PREPAREDATA"/>
+    </logger>
+
+    <logger name="com.gree.syndata.util.DetailErrorLog" additivity="false">
+        <level value="ERROR"/>
+        <appender-ref ref="ERROR"/>
+    </logger>
+
+    <logger name="com.gree.syndata">
+        <level value="INFO"/>
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="FILE"/>
+        <appender-ref ref="ERROR"/>
+    </logger>
 
-    <!--日志归集-->
-        <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-            <destination>116.62.158.92:5044</destination>
-            <!-- encoder必须配置,有多种可选 -->
-            <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder" >
-                <customFields>{"server_name":"supply-service"}</customFields>
-            </encoder>
-        </appender>
-
-
-    <logger name="com.ibatis" level="INFO" />
-    <logger name="com.ibatis.common.jdbc.SimpleDataSource" level="INFO" />
-    <logger name="com.ibatis.common.jdbc.ScriptRunner" level="INFO" />
-    <logger name="com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate" level="INFO" />
-    <logger name="java.sql.Connection" level="INFO" />
-    <logger name="java.sql.Statement" level="INFO" />
-    <logger name="java.sql.PreparedStatement" level="INFO" />
-    <logger name="me.chanjar.weixin.cp.api.impl.BaseWxCpServiceImpl" level="OFF" />
-    <logger name="me.chanjar.weixin.common.error.WxErrorException" level="OFF" />
-
-
-    <root level="INFO">
-        <appender-ref ref="INFO_FILE" />
-        <appender-ref ref="ERROR_FILE" />
-        <appender-ref ref="STDOUT" />
-        <springProfile name="test,prd">
-            <appender-ref ref="LOGSTASH" />
-        </springProfile>
-    </root>
-
-</configuration>
+</configuration>

src/main/resources/logbackback.xml

@@ -0,0 +1,81 @@
+<!-- Logback configuration. See http://logback.qos.ch/manual/index.html -->
+<configuration scan="true" scanPeriod="2 seconds">
+    <property name="LOG_PATH" value="../logs" />
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- 日志输出编码 -->
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <encoder>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+                <charset>UTF-8</charset>
+            </encoder>
+    </appender>
+
+
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <File>logs/info.log</File>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>logs/info-%d{yyyyMMdd}.log.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>500MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <maxHistory>2</maxHistory>
+        </rollingPolicy>
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n
+            </Pattern>
+        </layout>
+    </appender>
+
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+        <File>logs/error.log</File>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>logs/error-%d{yyyyMMdd}.log.%i
+            </fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>500MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <maxHistory>2</maxHistory>
+        </rollingPolicy>
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n
+            </Pattern>
+        </layout>
+    </appender>
+
+
+    <!--日志归集-->
+        <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+            <destination>116.62.158.92:5044</destination>
+            <!-- encoder必须配置,有多种可选 -->
+            <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder" >
+                <customFields>{"server_name":"supply-service"}</customFields>
+            </encoder>
+        </appender>
+
+
+    <logger name="com.ibatis" level="INFO" />
+    <logger name="com.ibatis.common.jdbc.SimpleDataSource" level="INFO" />
+    <logger name="com.ibatis.common.jdbc.ScriptRunner" level="INFO" />
+    <logger name="com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate" level="INFO" />
+    <logger name="java.sql.Connection" level="INFO" />
+    <logger name="java.sql.Statement" level="INFO" />
+    <logger name="java.sql.PreparedStatement" level="INFO" />
+    <logger name="me.chanjar.weixin.cp.api.impl.BaseWxCpServiceImpl" level="OFF" />
+    <logger name="me.chanjar.weixin.common.error.WxErrorException" level="OFF" />
+
+
+    <root level="INFO">
+        <appender-ref ref="INFO_FILE" />
+        <appender-ref ref="ERROR_FILE" />
+        <appender-ref ref="STDOUT" />
+        <springProfile name="test,prd">
+            <appender-ref ref="LOGSTASH" />
+        </springProfile>
+    </root>
+
+</configuration>

src/main/resources/mapper/AZGDLcLsDownloadMapper.xml

@@ -2,8 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zfire.jiasm.syncdata.dao.mapper.AZGDLcLsDownloadMapper">
     <select id="getOrderBase" parameterType="com.zfire.jiasm.syncdata.parameter.OrderPar" resultType="com.zfire.jiasm.syncdata.plus.entity.OrderBase">
-        select pgid,pgguid,'INSTALL' as order_type,'INSTALL' as order_small_type,b.sfzen as worker_id,b.wxgmc as worker_name,
-               b.yddh as worker_mobile,b.sfzen as worker_idcard,c.order_state as order_status,
+        select pgid,pgguid,'INSTALL' as order_type,'INSTALL' as order_small_type,c.order_state as order_status,
                a.dqjdsj as order_status_time,d.order_state as last_order_status,e.order_state as dispatch_status,
                a.pgsj as dispatch_time,a.yhmc as user_name,a.lxren as link_name,a.yddh as user_mobile,a.yddh2 as user_mobile2,
                a.yhsx as user_attr,IFNULL(a.quhao, '') as area_code,IFNULL(a.dhhm,'') as tel_phone,a.fjhm,a.extendfiled2 as vip,a.email,
@@ -33,7 +32,6 @@
                a.fjhm as gree_virtualnumber,
                case a.dqjd when 1100 then '1' when 1122 then '1' when 1130 then '1' else '0' end as is_reservation
         from itf_tbl_az_assign_lc_ls_download a
-                 left join itf_tbl_wangdian_wxg_download b on a.azrenid=b.wxgid and b.wdno=a.jspgwdno
                  left join order_state_contrast c on a.dqjd=c.brand_order_state and c.state_type=10 and c.brand_id = #{request.brandId}
                  left join order_state_contrast d on a.syjd=d.brand_order_state and d.state_type=10 and d.brand_id = #{request.brandId}
                  left join order_state_contrast e on a.dqjd=e.brand_order_state and e.state_type=11 and e.brand_id = #{request.brandId}

src/main/resources/mapper/RepairDownloadMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zfire.jiasm.syncdata.dao.mapper.RepairDownloadMapper">
     <select id="getOrderBase" parameterType="com.zfire.jiasm.syncdata.parameter.OrderPar" resultType="com.zfire.jiasm.syncdata.plus.entity.OrderBase">
-        select a.pgid,a.pgguid,'REPAIR' as order_type,b.sfzen as worker_id,b.wxgmc as worker_name,b.yddh as worker_mobile,
-               b.sfzen as worker_idcard,c.order_state as order_status,d.order_state as last_order_status,a.dqjdsj as order_status_time,
-               IFNULL(a.yxji,'1') as priority,a.xjwdsj as dispatch_time,a.xjwdsj as dispatch_websit_time,a.yhmc as user_name,a.yddh as user_mobile,
+        select a.pgid,a.pgguid,'REPAIR' as order_type,c.order_state as order_status,d.order_state as last_order_status,
+               a.dqjdsj as order_status_time,IFNULL(a.yxji,'1') as priority,a.xjwdsj as dispatch_time,
+               a.xjwdsj as dispatch_websit_time,a.yhmc as user_name,a.yddh as user_mobile,
                a.yddh2 as user_mobile2,a.yhsx as user_attr,a.quhao as area_code,a.dhhm as tel_phone,a.fjhm,a.email,a.vip,
                a.sfen as province,a.cshi as city,a.xian as area,a.xzhen as street,
                a.sfenid as province_id,a.cshiid as city_id,a.xianid as area_id,a.xzhenid as street_id,
@@ -28,7 +28,6 @@
                                when '特级投诉' then 'SUPER' else 'NO' end as complaint,
                case when a.spid=102 then '商用' when a.spid=109 then '商用' else '家用' end as service_flag
         from itf_tbl_assign_download a
-                 left join itf_tbl_wangdian_wxg_download b on b.wxgid=a.wxrenid and b.wdno=a.wxwdno
                  left join order_state_contrast c on c.brand_order_state=a.stat and c.state_type=60 and c.brand_id = #{request.brandId}
                  left join order_state_contrast d on d.brand_order_state=a.qystat and d.state_type=60 and d.brand_id = #{request.brandId}
                  left join sys_dict_ref e on e.ref_dict_code=a.spid and e.brand_id = #{request.brandId} and e.dict_type='MAIN_TYPE'
@@ -43,8 +42,7 @@
                a.sfenid as province_id,a.cshiid as city_id,a.xianid as area_id,a.xzhenid as street_id,
                a.dizi as address,a.beiz as remark,IFNULL(a.last_modified_date,a.zjczsj) as update_time,
                case when a.spid=102 then '商用' when a.spid=109 then '商用' else '家用' end as service_flag,
-               b.sfzen as worker_id,b.wxgmc as worker_name,b.yddh as worker_mobile,a.last_modified_by as update_by,
-               b.sfzen as worker_idcard,IFNULL(a.yxji,'1') as priority,a.gpsdzxx as gps_address,
+               a.last_modified_by as update_by,IFNULL(a.yxji,'1') as priority,a.gpsdzxx as gps_address,
                case a.tsdengji when '一级投诉' then 'FIRST'
                                when '二级投诉' then 'SECOND'
                                when '三级投诉' then 'THIRD'
@@ -55,7 +53,6 @@
                a.fjhm,a.gdhao as file_no,a.zxhao as seat_no,a.xjwdsj as rece_time,a.yhqwsmsj as appointment_time,
                a.yhqwsmsj as expect_start_time,a.qwsmjssj as expect_end_time,a.fjhm,a.wxcount as out_wxcount
         from itf_tbl_assign_download a
-                 left join itf_tbl_wangdian_wxg_download b on b.wxgid=a.wxrenid and b.wdno=a.wxwdno
         where a.syn_req_id = #{request.synReqId}
     </select>