add

src/main/java/com/zfire/jiasm/syncdata/config/TheaderPoolConfig.java

@@ -21,7 +21,7 @@ public class TheaderPoolConfig {
      */
 
     /** 核心线程数（默认线程数） */
-    private static final int corePoolSize = 20;
+    private static final int corePoolSize = 30;
     /** 最大线程数 */
     private static final int maxPoolSize = 40;
     /** 允许线程空闲时间（单位：默认为秒） */

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

@@ -18,9 +18,9 @@ import org.springframework.stereotype.Component;
  * 3：AnzhuangGongDanBusiness 类处理，数据落本地数所表
  */
 @Slf4j
-@Component
+// @Component
 public class InstallDownload {
-    @Value("${netfsxc}")
+    /*@Value("${netfsxc}")
     private String netfsxc = "";
 
     @Autowired
@@ -37,6 +37,6 @@ public class InstallDownload {
 
         installDownloadService.processInstallDownload();
     }
-
+*/
 
 }

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

@@ -12,21 +12,21 @@ import org.springframework.stereotype.Component;
  * 以旧换新-获取所有驳回的鉴定单 + 修改鉴定单状态为驳回状态
  */
 @Slf4j
-@Component
+// @Component
 public class OldForNewDownload {
-	@Value("${queryejectjddc}")
+/*	@Value("${queryejectjddc}")
 	private String queryejectjddc = "";
 	@Value("${processbusinessc}")
 	private String processbusinessc = "";
 
 
 	@Autowired
-	OldForNewUploadLogic oldForNewUploadLogic;
+	OldForNewUploadLogic oldForNewUploadLogic;*/
 
 	/**
 	 * 以旧换新 - 获取所有驳回的鉴定单
 	 */
-	@Scheduled(fixedDelayString = "${queryejectjdd}")
+/*	@Scheduled(fixedDelayString = "${queryejectjdd}")
 	public void queryRejectJdd() {
 
 
@@ -36,12 +36,12 @@ public class OldForNewDownload {
 
 		// 下载驳回的鉴定单
 		oldForNewUploadLogic.queryRejectJdd();
-	}
+	}*/
 
 	/**
 	 * 以旧换新 - 修改鉴定单状态为驳回状态
 	 */
-	@Scheduled(fixedDelayString = "${processbusiness}")
+/*	@Scheduled(fixedDelayString = "${processbusiness}")
 	public void processBusiness() {
 
 
@@ -51,6 +51,6 @@ public class OldForNewDownload {
 
 		// 修改鉴定单状态 及 同步驳回鉴定单的处理状态
 		oldForNewUploadLogic.processBusiness();
-	}
+	}*/
 
 }

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

@@ -0,0 +1,32 @@
+package com.zfire.jiasm.syncdata.download.order;
+
+
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
+import com.zfire.jiasm.syncdata.service.OrderDownService;
+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;
+
+@Slf4j
+@Component
+public class OrderDownload {
+    @Value("${netfsxc}")
+    private String netfsxc = "";
+
+    @Autowired
+    OrderDownService orderDownService;
+
+
+
+    // 1：下载安装工单数据
+    @Scheduled(fixedDelayString = "${installdown}")
+    public void download() throws Exception {
+        if (netfsxc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        orderDownService.syncData();
+    }
+}

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

@@ -16,9 +16,9 @@ import org.springframework.stereotype.Component;
  *
  */
 @Slf4j
-@Component
+// @Component
 public class RecycleDownload {
-    @Value("${recycledownc}")
+/*    @Value("${recycledownc}")
     private String recycledownc = "";
     @Value("${recyclefkdownc}")
     private String recyclefkdownc = "";
@@ -33,7 +33,7 @@ public class RecycleDownload {
     @Autowired
     RecycleAssignLogic recycleAssignLogic;
     @Autowired
-    RecycleAcquisitionLogic recycleAcquisitionLogic;
+    RecycleAcquisitionLogic recycleAcquisitionLogic;*/
 
 
     /** 未同步->已同步反馈明细->已同步采集数据->同步到业务表->已同步
@@ -42,7 +42,7 @@ public class RecycleDownload {
      * 记录表中的任务号每单独一个任务号；本次拉取数据批次号相同
      * @throws Exception
      */
-    @Scheduled(fixedDelayString = "${recycledown}")
+/*    @Scheduled(fixedDelayString = "${recycledown}")
     public void download() throws Exception {
         if (recycledownc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
@@ -56,7 +56,7 @@ public class RecycleDownload {
         recycleAssignParamBean.setPage("1");
         recycleAssignParamBean.setPageSize("100");
         recycleAssignLogic.assign(recycleAssignParamBean);
-    }
+    }*/
 
     /**
      * 2：从总部获取工单的反馈明细数据 - 只确认刚下载的(SynStatus=greeStatSynStatus=0) 有业务处理过的回收工单不做与总部的确认动作
@@ -65,7 +65,7 @@ public class RecycleDownload {
      *         失败时 记录表、过程反馈、明细表，状态记录 SynStatus=99
      * @throws Exception
      */
-    @Scheduled(fixedDelayString = "${recyclefkdown}")
+/*    @Scheduled(fixedDelayString = "${recyclefkdown}")
     private void updateFkmx() throws Exception {
         if (recyclefkdownc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
@@ -74,7 +74,7 @@ public class RecycleDownload {
         // 获取工单的反馈明细数据 记录表状态改为44
         // 失败时最多重复10次
         recycleAssignLogic.updateFeedback();
-    }
+    }*/
 
     /**
      * 3：从总部获取回收工单对应的采集数据、附件数据、条码明细数据 - 只获取已成功获取反馈明细的工单 (SynStatus=44 greeStatSynStatus=0)
@@ -82,7 +82,7 @@ public class RecycleDownload {
      *     失败 三个表与记录表状态 SynStatus=99
      * @throws Exception
      */
-    @Scheduled(fixedDelayString = "${recyclecjdown}")
+/*    @Scheduled(fixedDelayString = "${recyclecjdown}")
     private void updateAcquisition() {
         if (recyclecjdownc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
@@ -91,7 +91,7 @@ public class RecycleDownload {
         // 下载回收工单采集表数据、附件数据、条码明细数据 记录表及三表状态为66
         // 失败时 SynStatus=99 下次也不再同步 最好加上 99 的及次数
         recycleAcquisitionLogic.updateAcquisition();
-    }
+    }*/
 
     /**
      * 4：与总部进行确认下载完成  - 只确认成功获取采集数据的工单 (SynStatus=66 greeStatSynStatus=0)
@@ -104,7 +104,7 @@ public class RecycleDownload {
      *             回收明细表 改状态 gree_stat_syn_status = 99
      * @throws Exception
      */
-    @Scheduled(fixedDelayString = "${recycleverifydown}")
+/*    @Scheduled(fixedDelayString = "${recycleverifydown}")
     private void updateExtend() throws Exception {
         if (recycleverifydownc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
@@ -112,20 +112,20 @@ public class RecycleDownload {
 
         // 与总部进行确认
         recycleAssignLogic.updateExtend();
-    }
+    }*/
 
     /**
      * 5：同步到业务表
      * @throws Exception
      */
-    @Scheduled(fixedDelayString = "${recyclein}")
+/*    @Scheduled(fixedDelayString = "${recyclein}")
     private void updateRecycleAssignDownloadEntity2Business() {
         if (recycleinc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 
         recycleAssignLogic.processBusiness();
-    }
+    }*/
 
 
 }

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

@@ -12,16 +12,15 @@ import org.springframework.stereotype.Component;
  * 格力品牌维修工单下载
  */
 @Slf4j
-@Component
+// @Component
 public class RepairDownload {
-    @Value("${repairdownc}")
+    /*@Value("${repairdownc}")
     private String repairdownc = "";
 
     @Autowired
     RepairDownloadService repairDownloadService;
 
 
-
     // 下载维修工单数据
     @Scheduled(fixedDelayString = "${repairdown}")
     public void download() throws Exception {
@@ -30,7 +29,7 @@ public class RepairDownload {
         }
 
         repairDownloadService.processRepairDownload();
-    }
+    }*/
 
 
 

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

@@ -11,9 +11,9 @@ import org.springframework.stereotype.Component;
  *
  */
 @Slf4j
-@Component
+// @Component
 public class RepairDownloadGD {
-    @Autowired
+/*    @Autowired
     RepairDownloadGDService repairDownloadGDService;
 
 
@@ -25,7 +25,7 @@ public class RepairDownloadGD {
         }
 
         repairDownloadGDService.processRepairDownload();
-    }
+    }*/
 
 
 

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

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

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

@@ -0,0 +1,53 @@
+package com.zfire.jiasm.syncdata.service.impl;
+
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
+import com.zfire.jiasm.syncdata.service.InstallDownloadService;
+import com.zfire.jiasm.syncdata.service.OrderDownService;
+import com.zfire.jiasm.syncdata.service.RepairDownloadService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+
+@Slf4j
+@Service
+public class OrderDownServiceImpl implements OrderDownService {
+    @Value("${netfsxc}")
+    private String netfsxc = "";
+
+    @Autowired
+    InstallDownloadService installDownloadService;
+    @Autowired
+    RepairDownloadService repairDownloadService;
+
+
+
+    @Override
+    public void syncData() throws Exception {
+
+        // 下载安装工单数据
+        processInstallDownload();
+
+        // 下载维修工单数据
+        processRepairDownload();
+    }
+
+
+
+
+    // 1：下载安装工单数据
+    public void processInstallDownload() throws Exception {
+        installDownloadService.processInstallDownload();
+    }
+
+
+    // 下载维修工单数据
+    public void processRepairDownload() throws Exception {
+        repairDownloadService.processRepairDownload();
+    }
+
+
+
+}