修改定时任务

blade-service/blade-u9cloud/src/main/java/org/springblade/u9cloud/job/U9CloudTaskJob.java

@@ -1,5 +1,6 @@
 package org.springblade.u9cloud.job;
 
+import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -30,13 +31,20 @@ public class U9CloudTaskJob {
 	 */
 	@XxlJob("syncCustomerDataHandler")
 	@Transactional(rollbackFor = Exception.class)
-	public void syncCustomerData() throws Exception {
+	public ReturnT<String> syncCustomerData() throws Exception {
 		log.info("XXL-JOB: 开始执行客户数据同步任务");
-		executeSyncTask(
-			() -> u9CloudFeignClient.syncCustomerData(),
-			"客户数据"
-		);
-		log.info("XXL-JOB: 客户数据同步任务执行完成");
+		try {
+			executeSyncTask(
+				() -> u9CloudFeignClient.syncCustomerData(),
+				"客户数据"
+			);
+			log.info("XXL-JOB: 客户数据同步任务执行完成");
+			return ReturnT.SUCCESS;
+		} catch (Exception e)
+		{
+			log.error("XXL-JOB: U9 数据完整同步失败", e);
+			return ReturnT.FAIL;
+		}
 	}
 
 	/**
@@ -44,13 +52,20 @@ public class U9CloudTaskJob {
 	 */
 	@XxlJob("syncDepartmentDataHandler")
 	@Transactional(rollbackFor = Exception.class)
-	public void syncDepartmentData() throws Exception {
+	public ReturnT<String> syncDepartmentData() throws Exception {
 		log.info("XXL-JOB: 开始执行部门数据同步任务");
-		executeSyncTask(
-			() -> u9CloudFeignClient.syncDepartmentData(),
-			"部门数据"
-		);
-		log.info("XXL-JOB: 部门数据同步任务执行完成");
+		try {
+			executeSyncTask(
+				() -> u9CloudFeignClient.syncDepartmentData(),
+				"部门数据"
+			);
+			log.info("XXL-JOB: 部门数据同步任务执行完成");
+			return ReturnT.SUCCESS;
+		} catch (Exception e)
+		{
+			log.error("XXL-JOB: U9 部门数据完整同步失败", e);
+			return ReturnT.FAIL;
+		}
 	}
 
 	/**
@@ -58,13 +73,20 @@ public class U9CloudTaskJob {
 	 */
 	@XxlJob("syncItemDataHandler")
 	@Transactional(rollbackFor = Exception.class)
-	public void syncItemData() throws Exception {
+	public ReturnT<String> syncItemData() throws Exception {
 		log.info("XXL-JOB: 开始执行物料数据同步任务");
-		executeSyncTask(
-			() -> u9CloudFeignClient.syncItemData(),
-			"物料数据"
-		);
-		log.info("XXL-JOB: 物料数据同步任务执行完成");
+		try {
+			executeSyncTask(
+				() -> u9CloudFeignClient.syncItemData(),
+				"物料数据"
+			);
+			log.info("XXL-JOB: 物料数据同步任务执行完成");
+			return ReturnT.SUCCESS;
+		} catch (Exception e)
+		{
+			log.error("XXL-JOB: U9 物料数据完整同步失败", e);
+			return ReturnT.FAIL;
+		}
 	}
 
 	/**
@@ -72,13 +94,20 @@ public class U9CloudTaskJob {
 	 */
 	@XxlJob("syncOperatorsDataHandler")
 	@Transactional(rollbackFor = Exception.class)
-	public void syncOperatorsData() throws Exception {
+	public ReturnT<String> syncOperatorsData() throws Exception {
 		log.info("XXL-JOB: 开始执行操作员数据同步任务");
-		executeSyncTask(
-			() -> u9CloudFeignClient.syncOperatorsData(),
-			"操作员数据"
-		);
-		log.info("XXL-JOB: 操作员数据同步任务执行完成");
+		try {
+			executeSyncTask(
+				() -> u9CloudFeignClient.syncOperatorsData(),
+				"操作员数据"
+			);
+			log.info("XXL-JOB: 操作员数据同步任务执行完成");
+			return ReturnT.SUCCESS;
+		} catch (Exception e)
+		{
+			log.error("XXL-JOB: U9 操作员数据完整同步失败", e);
+			return ReturnT.FAIL;
+		}
 	}
 
 	/**
@@ -86,13 +115,21 @@ public class U9CloudTaskJob {
 	 */
 	@XxlJob("syncShipDataHandler")
 	@Transactional(rollbackFor = Exception.class)
-	public void syncShipData() throws Exception {
+	public ReturnT<String> syncShipData() throws Exception {
 		log.info("XXL-JOB: 开始执行物流数据同步任务");
-		executeSyncTask(
-			() -> u9CloudFeignClient.syncShipData(),
-			"物流数据"
-		);
-		log.info("XXL-JOB: 物流数据同步任务执行完成");
+		try {
+			executeSyncTask(
+				() -> u9CloudFeignClient.syncShipData(),
+				"物流数据"
+			);
+			log.info("XXL-JOB: 物流数据同步任务执行完成");
+			return ReturnT.SUCCESS;
+		} catch (Exception e)
+		{
+			log.error("XXL-JOB: U9 物流数据完整同步失败", e);
+			return ReturnT.FAIL;
+		}
+
 	}
 
 	/**
@@ -100,13 +137,20 @@ public class U9CloudTaskJob {
 	 */
 	@XxlJob("syncSupplierDataHandler")
 	@Transactional(rollbackFor = Exception.class)
-	public void syncSupplierData() throws Exception {
+	public ReturnT<String> syncSupplierData() throws Exception {
 		log.info("XXL-JOB: 开始执行供应商数据同步任务");
-		executeSyncTask(
-			() -> u9CloudFeignClient.syncSupplierData(),
-			"供应商数据"
-		);
-		log.info("XXL-JOB: 供应商数据同步任务执行完成");
+		try {
+			executeSyncTask(
+				() -> u9CloudFeignClient.syncSupplierData(),
+				"供应商数据"
+			);
+			log.info("XXL-JOB: 供应商数据同步任务执行完成");
+			return ReturnT.SUCCESS;
+		} catch (Exception e)
+		{
+			log.error("XXL-JOB: U9 供应商数据完整同步失败", e);
+			return ReturnT.FAIL;
+		}
 	}
 
 	/**
@@ -114,13 +158,21 @@ public class U9CloudTaskJob {
 	 */
 	@XxlJob("syncWhqohDataHandler")
 	@Transactional(rollbackFor = Exception.class)
-	public void syncWhqohData() throws Exception {
+	public ReturnT<String> syncWhqohData() throws Exception {
 		log.info("XXL-JOB: 开始执行库存数据同步任务");
-		executeSyncTask(
-			() -> u9CloudFeignClient.syncWhqohData(),
-			"库存数据"
-		);
-		log.info("XXL-JOB: 库存数据同步任务执行完成");
+		try {
+			executeSyncTask(
+				() -> u9CloudFeignClient.syncWhqohData(),
+				"部门数据"
+			);
+			log.info("XXL-JOB: 库存数据同步任务执行完成");
+			return ReturnT.SUCCESS;
+		} catch (Exception e)
+		{
+			log.error("XXL-JOB: U9 库存数据完整同步失败", e);
+			return ReturnT.FAIL;
+		}
+
 	}
 
 	/**
@@ -128,13 +180,20 @@ public class U9CloudTaskJob {
 	 */
 	@XxlJob("syncARBillDataHandler")
 	@Transactional(rollbackFor = Exception.class)
-	public void syncARBillData() throws Exception {
+	public ReturnT<String> syncARBillData() throws Exception {
 		log.info("XXL-JOB: 开始执行应收单数据同步任务");
-		executeSyncTask(
-			() -> u9CloudFeignClient.syncARBillData(),
-			"应收单数据"
-		);
-		log.info("XXL-JOB: 应收单数据同步任务执行完成");
+		try {
+			executeSyncTask(
+				() -> u9CloudFeignClient.syncARBillData(),
+				"部门数据"
+			);
+			log.info("XXL-JOB: 应收单数据同步任务执行完成");
+			return ReturnT.SUCCESS;
+		} catch (Exception e)
+		{
+			log.error("XXL-JOB: U9 应收单数据完整同步失败", e);
+			return ReturnT.FAIL;
+		}
 	}
 
 	/**
@@ -142,13 +201,20 @@ public class U9CloudTaskJob {
 	 */
 	@XxlJob("syncRecBillDataHandler")
 	@Transactional(rollbackFor = Exception.class)
-	public void syncRecBillData() throws Exception {
+	public ReturnT<String> syncRecBillData() throws Exception {
 		log.info("XXL-JOB: 开始执行收款单数据同步任务");
-		executeSyncTask(
-			() -> u9CloudFeignClient.syncRecBillData(),
-			"收款单数据"
-		);
-		log.info("XXL-JOB: 收款单数据同步任务执行完成");
+		try {
+			executeSyncTask(
+				() -> u9CloudFeignClient.syncRecBillData(),
+				"收款单数据"
+			);
+			log.info("XXL-JOB: 收款单数据同步任务执行完成");
+			return ReturnT.SUCCESS;
+		} catch (Exception e)
+		{
+			log.error("XXL-JOB: U9 收款单数据完整同步失败", e);
+			return ReturnT.FAIL;
+		}
 	}
 
 	/**
@@ -156,13 +222,20 @@ public class U9CloudTaskJob {
 	 */
 	@XxlJob("syncSalepriceDataHandler")
 	@Transactional(rollbackFor = Exception.class)
-	public void syncSalepriceData() throws Exception {
+	public ReturnT<String> syncSalepriceData() throws Exception {
 		log.info("XXL-JOB: 开始执行销售价目表数据同步任务");
-		executeSyncTask(
-			() -> u9CloudFeignClient.syncSalepriceData(),
-			"销售价目表数据"
-		);
-		log.info("XXL-JOB: 销售价目表数据同步任务执行完成");
+		try {
+			executeSyncTask(
+				() -> u9CloudFeignClient.syncSalepriceData(),
+				"销售价目表数据"
+			);
+			log.info("XXL-JOB: 销售价目表数据同步任务执行完成");
+			return ReturnT.SUCCESS;
+		} catch (Exception e)
+		{
+			log.error("XXL-JOB: U9 销售价目表数据完整同步失败", e);
+			return ReturnT.FAIL;
+		}
 	}
 
 	/**
@@ -170,7 +243,7 @@ public class U9CloudTaskJob {
 	 */
 	@XxlJob("syncAllDataHandler")
 	@Transactional(rollbackFor = Exception.class)
-	public void syncAllData() throws Exception {
+	public ReturnT<String> syncAllData() throws Exception {
 		log.info("XXL-JOB: ===== 开始执行U9数据完整同步 =====");
 
 		long startTime = System.currentTimeMillis();
@@ -178,43 +251,44 @@ public class U9CloudTaskJob {
 		try {
 			// 按业务顺序执行同步
 			log.info("XXL-JOB: 开始同步部门数据");
-			syncDepartmentData();
+			u9CloudFeignClient.syncDepartmentData();
 
 			log.info("XXL-JOB: 开始同步客户数据");
-			syncCustomerData();
+			u9CloudFeignClient.syncCustomerData();
 
 			log.info("XXL-JOB: 开始同步物料数据");
-			syncItemData();
+			u9CloudFeignClient.syncItemData();
 
 			log.info("XXL-JOB: 开始同步操作员数据");
-			syncOperatorsData();
+			u9CloudFeignClient.syncOperatorsData();
 
 			log.info("XXL-JOB: 开始同步供应商数据");
-			syncSupplierData();
+			u9CloudFeignClient.syncSupplierData();
 
 			log.info("XXL-JOB: 开始同步物流数据");
-			syncShipData();
+			u9CloudFeignClient.syncShipData();
 
 			log.info("XXL-JOB: 开始同步库存数据");
-			syncWhqohData();
+			u9CloudFeignClient.syncWhqohData();
 
 			log.info("XXL-JOB: 开始同步应收单数据");
-			syncARBillData();
+			u9CloudFeignClient.syncARBillData();
 
 			log.info("XXL-JOB: 开始同步收款单数据");
-			syncRecBillData();
+			u9CloudFeignClient.syncRecBillData();
 
 			log.info("XXL-JOB: 开始同步销售价目表数据");
-			syncSalepriceData();
+			u9CloudFeignClient.syncSalepriceData();
 
 			long endTime = System.currentTimeMillis();
 			String successMsg = String.format("XXL-JOB: ===== U9数据完整同步完成，耗时：%s ms =====", (endTime - startTime));
 			log.info(successMsg);
 
+			return ReturnT.SUCCESS;
 		} catch (Exception e) {
 			String errorMsg = "XXL-JOB: U9数据完整同步失败：" + e.getMessage();
 			log.error(errorMsg, e);
-			throw e;
+			return ReturnT.FAIL;
 		}
 	}