add

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

@@ -40,7 +40,7 @@ public class DetailDownloadInstallTask {
 
 
 
-	@Scheduled(fixedDelay = 1 * 2 * 1000)
+	@Scheduled(fixedDelayString = "${detaildown}")
 	private void process() {
 		try {
 			/*if (1 == 1) {

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

@@ -96,7 +96,7 @@ public class InstallBusiness {
 
 
     // 3：工单落入本地表
-    @Scheduled(fixedDelay = 1 * 5 * 1000)
+    @Scheduled(fixedDelayString = "${installin}")
     public void inputOrderInstall() {
         /*if (1 == 1) {
             return;

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

@@ -66,7 +66,7 @@ public class InstallDownload {
 
 
     // 1：下载安装工单数据
-    @Scheduled(fixedDelay = 1 * 5 * 1000)
+    @Scheduled(fixedDelayString = "${installdown}")
     public void download() throws Exception {
         /*if (1 == 1) {
             return;

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

@@ -18,7 +18,7 @@ public class OldForNewDownload {
 	/**
 	 * 以旧换新 - 获取所有驳回的鉴定单
 	 */
-	@Scheduled(fixedDelay = 20 * 60 * 1000)
+	@Scheduled(fixedDelayString = "${queryejectjdd}")
 	public void queryRejectJdd() {
 		// 下载驳回的鉴定单
 		oldForNewUploadLogic.queryRejectJdd();
@@ -27,7 +27,7 @@ public class OldForNewDownload {
 	/**
 	 * 以旧换新 - 修改鉴定单状态为驳回状态
 	 */
-	@Scheduled(fixedDelay = 20 * 60 * 1000)
+	@Scheduled(fixedDelayString = "${processbusiness}")
 	public void processBusiness() {
 		// 修改鉴定单状态 及 同步驳回鉴定单的处理状态
 		oldForNewUploadLogic.processBusiness();

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

@@ -26,7 +26,7 @@ public class RecycleDownload {
      * 记录表中的任务号每条记录单独一个任务号；本次拉取数据批次号相同
      * @throws Exception
      */
-    @Scheduled(fixedDelay = 1 * 5 * 1000)
+    @Scheduled(fixedDelayString = "${recycledown}")
     public void download() throws Exception {
         if (1 == 1) {
             return;
@@ -48,7 +48,7 @@ public class RecycleDownload {
      *         失败时 记录表、过程反馈、明细表，状态记录 SynStatus=99
      * @throws Exception
      */
-    @Scheduled(fixedDelay = 10 * 1000)
+    @Scheduled(fixedDelayString = "${recyclefkdown}")
     private void updateFkmx() throws Exception {
         recycleAssignLogic.updateFeedback();
     }
@@ -59,7 +59,7 @@ public class RecycleDownload {
      *     失败 三个表与记录表状态 SynStatus=99
      * @throws Exception
      */
-    @Scheduled(fixedDelay = 10 * 1000)
+    @Scheduled(fixedDelayString = "${recyclecjdown}")
     private void updateAcquisition() {
         recycleAcquisitionLogic.updateAcquisition();
     }
@@ -75,7 +75,7 @@ public class RecycleDownload {
      *             回收明细表 改状态 gree_stat_syn_status = 99
      * @throws Exception
      */
-    @Scheduled(fixedDelay = 10 * 1000)
+    @Scheduled(fixedDelayString = "${recycleverifydown}")
     private void updateExtend() throws Exception {
         recycleAssignLogic.updateExtend();
     }
@@ -84,7 +84,7 @@ public class RecycleDownload {
      * 5：同步到业务表
      * @throws Exception
      */
-    @Scheduled(fixedDelay = 10 * 1000)
+    @Scheduled(fixedDelayString = "${recyclein}")
     private void updateRecycleAssignDownloadEntity2Business() {
         if (1 == 1) {
             return;

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

@@ -94,7 +94,7 @@ public class RepairBusiness {
 
 
     // 1：工单落入本地表 TL_SynDataFrom_tbl_assign_batch
-    @Scheduled(fixedDelay = 1 * 5 * 1000)
+    @Scheduled(fixedDelayString = "${repairin}")
     public void inputOrder() {
         /*if (1 == 1) {
             return;

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

@@ -49,7 +49,7 @@ public class RepairDownload {
     private Set<String> nullDateCols;
 
     // 下载维修工单数据
-    @Scheduled(fixedDelay = 1 * 5 * 1000)
+    @Scheduled(fixedDelayString = "${repairdown}")
     public void download() throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         /*if (1 == 1) {

src/main/java/com/zfire/jiasm/syncdata/upload/order/数据上传.txt

@@ -86,9 +86,14 @@ select * from itf_fa_to_gree_syn_rule;
 下派/改派网点,下派改派师傅，用户预约/改约，完工，作废 操作  区分渠道(京东,格力,天猫) 操作记录到不同的表中
 
 维修：
-source_name = TBL_JD_UE_DISPATCH_ORDER: // 京东商城
-              TBL_NEW_DS_ORDERINFO: // 格力商城
+source_name = TBL_NEW_DS_ORDERINFO: // 格力商城
+              TBL_JD_UE_DISPATCH_ORDER: // 京东商城
               TBL_TMALL_ORDERINFO: // 天猫商城
               TBL_TMALL_ORDER_INFO: // 天猫商城
 服务人员接单、服务人员报完工、服务人员预约、作废，非广佛作废、工单关闭 回传请求
 
+天猫商城：
+安装:qqlymc = TBL_TMALL_ORDERINFO: // 天猫商城
+              TBL_TMALL_ORDER_INFO: // 天猫商城
+
+

src/main/resources/bootstrap-dev.properties

@@ -162,6 +162,30 @@ jdueurl=https://gateway.yshcs.gree.com:9635/api/sso/autoapp-default-server-jingd
 
 
 ######################## 同步定时任务时间隔 ########################
+#安装工单下载
+installdown=5000
+#工单落入本地表
+installin=5000
+#维修工单下载
+repairdown=5000
+#维修落入本地表
+repairin=5000
+#工单子表信息
+detaildown=2000
+#回收工单下载
+recycledown=60000
+#回收工单获取工单的反馈明细数据
+recyclefkdown=60000
+#回收工单获取对应的采集数据、附件数据、条码明细数据
+recyclecjdown=60000
+#回收工单与总部进行确认下载完成
+recycleverifydown=60000
+#回收工单同步到业务表
+recyclein=60000
+#以旧换新-获取所有驳回的鉴定单
+queryejectjdd=60000
+#以旧换新-修改鉴定单状态为驳回状态
+processbusiness=60000
 #安装家用空调
 installjy=10000
 #安装商用空调

src/main/resources/bootstrap-prd.properties

@@ -127,6 +127,30 @@ gree.web.url=${gree.url}/api/sso/autoapp-default-server-guangzhou
 jdueurl=https://gateway.yshcs.gree.com:9635/api/sso/autoapp-default-server-jingdongorderhandlerjob/
 
 ######################## 同步定时任务时间隔 ########################
+#安装工单下载
+installdown=5000
+#工单落入本地表
+installin=5000
+#维修工单下载
+repairdown=5000
+#维修落入本地表
+repairin=5000
+#工单子表信息
+detaildown=2000
+#回收工单下载
+recycledown=60000
+#回收工单获取工单的反馈明细数据
+recyclefkdown=60000
+#回收工单获取对应的采集数据、附件数据、条码明细数据
+recyclecjdown=60000
+#回收工单与总部进行确认下载完成
+recycleverifydown=60000
+#回收工单同步到业务表
+recyclein=60000
+#以旧换新-获取所有驳回的鉴定单
+queryejectjdd=60000
+#以旧换新-修改鉴定单状态为驳回状态
+processbusiness=60000
 #安装家用空调
 installjy=10000
 #安装商用空调

src/main/resources/bootstrap-test.properties

@@ -151,6 +151,30 @@ jdueurl=https://api-sms.gree.com/api/sso/autoapp-default-server-jingdongorderhan
 
 
 ######################## 同步定时任务时间隔 ########################
+#安装工单下载
+installdown=5000
+#工单落入本地表
+installin=5000
+#维修工单下载
+repairdown=5000
+#维修落入本地表
+repairin=5000
+#工单子表信息
+detaildown=2000
+#回收工单下载
+recycledown=60000
+#回收工单获取工单的反馈明细数据
+recyclefkdown=60000
+#回收工单获取对应的采集数据、附件数据、条码明细数据
+recyclecjdown=60000
+#回收工单与总部进行确认下载完成
+recycleverifydown=60000
+#回收工单同步到业务表
+recyclein=60000
+#以旧换新-获取所有驳回的鉴定单
+queryejectjdd=60000
+#以旧换新-修改鉴定单状态为驳回状态
+processbusiness=60000
 #安装家用空调
 installjy=10000
 #安装商用空调

src/main/resources/mapper/RepairDownloadMapper.xml

@@ -21,7 +21,7 @@
                a.jindu as lng,a.weidu as lat,a.wcsj as over_time,a.cjdt as create_time,a.cjren as create_by,a.cjrmc as create_name,
                IFNULL(a.last_modified_date,a.zjczsj) as update_time,a.last_modified_by as update_by,a.wxrenid as dispatch_flag,1 as upload_flag,
                a.xjwdsj as rece_time,a.xxlbid as info_type_id,a.xxlyid as info_source_id,
-               a.yhsxid as user_attr_id,a.qqlymc as external_name,a.qqlyxh as external_no,a.wxcount as out_wxcount,a.xxqdid as info_channel_id,
+               a.yhsxid as user_attr_id,a.qqlymc as external_name2,a.qqlyxh as external_no,a.wxcount as out_wxcount,a.xxqdid as info_channel_id,
                case a.tsdengji when '一级投诉' then 'FIRST'
                                when '二级投诉' then 'SECOND'
                                when '三级投诉' then 'THIRD'