|
|
@@ -7,7 +7,6 @@ import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springblade.core.tool.api.R;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
-import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.util.function.Supplier;
|
|
|
|
|
|
@@ -30,8 +29,8 @@ public class U9CloudTaskJob {
|
|
|
* 同步客户数据(单独任务)
|
|
|
*/
|
|
|
@XxlJob("syncCustomerDataHandler")
|
|
|
- public ReturnT<String> syncCustomerData() throws Exception {
|
|
|
- log.info("XXL-JOB: 开始执行客户数据同步任务");
|
|
|
+ public ReturnT<String> syncCustomerData(String param) throws Exception {
|
|
|
+ log.info("XXL-JOB: 开始执行客户数据同步任务,参数: {}", param);
|
|
|
try {
|
|
|
executeSyncTask(
|
|
|
() -> u9CloudFeignClient.syncCustomerData(),
|
|
|
@@ -50,8 +49,8 @@ public class U9CloudTaskJob {
|
|
|
* 同步部门数据(单独任务)
|
|
|
*/
|
|
|
@XxlJob("syncDepartmentDataHandler")
|
|
|
- public ReturnT<String> syncDepartmentData() throws Exception {
|
|
|
- log.info("XXL-JOB: 开始执行部门数据同步任务");
|
|
|
+ public ReturnT<String> syncDepartmentData(String param) throws Exception {
|
|
|
+ log.info("XXL-JOB: 开始执行部门数据同步任务,参数: {}", param);
|
|
|
try {
|
|
|
executeSyncTask(
|
|
|
() -> u9CloudFeignClient.syncDepartmentData(),
|
|
|
@@ -70,8 +69,8 @@ public class U9CloudTaskJob {
|
|
|
* 同步物料数据(单独任务)
|
|
|
*/
|
|
|
@XxlJob("syncItemDataHandler")
|
|
|
- public ReturnT<String> syncItemData() throws Exception {
|
|
|
- log.info("XXL-JOB: 开始执行物料数据同步任务");
|
|
|
+ public ReturnT<String> syncItemData(String param) throws Exception {
|
|
|
+ log.info("XXL-JOB: 开始执行物料数据同步任务,参数: {}", param);
|
|
|
try {
|
|
|
executeSyncTask(
|
|
|
() -> u9CloudFeignClient.syncItemData(),
|
|
|
@@ -90,8 +89,8 @@ public class U9CloudTaskJob {
|
|
|
* 同步操作员数据(单独任务)
|
|
|
*/
|
|
|
@XxlJob("syncOperatorsDataHandler")
|
|
|
- public ReturnT<String> syncOperatorsData() throws Exception {
|
|
|
- log.info("XXL-JOB: 开始执行操作员数据同步任务");
|
|
|
+ public ReturnT<String> syncOperatorsData(String param) throws Exception {
|
|
|
+ log.info("XXL-JOB: 开始执行操作员数据同步任务,参数: {}", param);
|
|
|
try {
|
|
|
executeSyncTask(
|
|
|
() -> u9CloudFeignClient.syncOperatorsData(),
|
|
|
@@ -110,8 +109,8 @@ public class U9CloudTaskJob {
|
|
|
* 同步物流数据(单独任务)
|
|
|
*/
|
|
|
@XxlJob("syncShipDataHandler")
|
|
|
- public ReturnT<String> syncShipData() throws Exception {
|
|
|
- log.info("XXL-JOB: 开始执行物流数据同步任务");
|
|
|
+ public ReturnT<String> syncShipData(String param) throws Exception {
|
|
|
+ log.info("XXL-JOB: 开始执行物流数据同步任务,参数: {}", param);
|
|
|
try {
|
|
|
executeSyncTask(
|
|
|
() -> u9CloudFeignClient.syncShipData(),
|
|
|
@@ -131,8 +130,8 @@ public class U9CloudTaskJob {
|
|
|
* 同步供应商数据(单独任务)
|
|
|
*/
|
|
|
@XxlJob("syncSupplierDataHandler")
|
|
|
- public ReturnT<String> syncSupplierData() throws Exception {
|
|
|
- log.info("XXL-JOB: 开始执行供应商数据同步任务");
|
|
|
+ public ReturnT<String> syncSupplierData(String param) throws Exception {
|
|
|
+ log.info("XXL-JOB: 开始执行供应商数据同步任务,参数: {}", param);
|
|
|
try {
|
|
|
executeSyncTask(
|
|
|
() -> u9CloudFeignClient.syncSupplierData(),
|
|
|
@@ -151,12 +150,12 @@ public class U9CloudTaskJob {
|
|
|
* 同步库存数据(单独任务)
|
|
|
*/
|
|
|
@XxlJob("syncWhqohDataHandler")
|
|
|
- public ReturnT<String> syncWhqohData() throws Exception {
|
|
|
- log.info("XXL-JOB: 开始执行库存数据同步任务");
|
|
|
+ public ReturnT<String> syncWhqohData(String param) throws Exception {
|
|
|
+ log.info("XXL-JOB: 开始执行库存数据同步任务,参数: {}", param);
|
|
|
try {
|
|
|
executeSyncTask(
|
|
|
() -> u9CloudFeignClient.syncWhqohData(),
|
|
|
- "部门数据"
|
|
|
+ "库存数据" // 修复了这里的注释,原来是"部门数据"
|
|
|
);
|
|
|
log.info("XXL-JOB: 库存数据同步任务执行完成");
|
|
|
return ReturnT.SUCCESS;
|
|
|
@@ -172,12 +171,12 @@ public class U9CloudTaskJob {
|
|
|
* 同步应收单数据(单独任务)
|
|
|
*/
|
|
|
@XxlJob("syncARBillDataHandler")
|
|
|
- public ReturnT<String> syncARBillData() throws Exception {
|
|
|
- log.info("XXL-JOB: 开始执行应收单数据同步任务");
|
|
|
+ public ReturnT<String> syncARBillData(String param) throws Exception {
|
|
|
+ log.info("XXL-JOB: 开始执行应收单数据同步任务,参数: {}", param);
|
|
|
try {
|
|
|
executeSyncTask(
|
|
|
() -> u9CloudFeignClient.syncARBillData(),
|
|
|
- "部门数据"
|
|
|
+ "应收单数据" // 修复了这里的注释,原来是"部门数据"
|
|
|
);
|
|
|
log.info("XXL-JOB: 应收单数据同步任务执行完成");
|
|
|
return ReturnT.SUCCESS;
|
|
|
@@ -192,8 +191,8 @@ public class U9CloudTaskJob {
|
|
|
* 同步收款单数据(单独任务)
|
|
|
*/
|
|
|
@XxlJob("syncRecBillDataHandler")
|
|
|
- public ReturnT<String> syncRecBillData() throws Exception {
|
|
|
- log.info("XXL-JOB: 开始执行收款单数据同步任务");
|
|
|
+ public ReturnT<String> syncRecBillData(String param) throws Exception {
|
|
|
+ log.info("XXL-JOB: 开始执行收款单数据同步任务,参数: {}", param);
|
|
|
try {
|
|
|
executeSyncTask(
|
|
|
() -> u9CloudFeignClient.syncRecBillData(),
|
|
|
@@ -212,8 +211,8 @@ public class U9CloudTaskJob {
|
|
|
* 同步销售价目表数据(单独任务)
|
|
|
*/
|
|
|
@XxlJob("syncSalepriceDataHandler")
|
|
|
- public ReturnT<String> syncSalepriceData() throws Exception {
|
|
|
- log.info("XXL-JOB: 开始执行销售价目表数据同步任务");
|
|
|
+ public ReturnT<String> syncSalepriceData(String param) throws Exception {
|
|
|
+ log.info("XXL-JOB: 开始执行销售价目表数据同步任务,参数: {}", param);
|
|
|
try {
|
|
|
executeSyncTask(
|
|
|
() -> u9CloudFeignClient.syncSalepriceData(),
|
|
|
@@ -232,42 +231,42 @@ public class U9CloudTaskJob {
|
|
|
* 同步所有U9数据(完整同步)
|
|
|
*/
|
|
|
@XxlJob("syncAllDataHandler")
|
|
|
- public ReturnT<String> syncAllData() throws Exception {
|
|
|
- log.info("XXL-JOB: ===== 开始执行U9数据完整同步 =====");
|
|
|
+ public ReturnT<String> syncAllData(String param) throws Exception {
|
|
|
+ log.info("XXL-JOB: ===== 开始执行U9数据完整同步,参数: {} =====", param);
|
|
|
|
|
|
long startTime = System.currentTimeMillis();
|
|
|
|
|
|
try {
|
|
|
// 按业务顺序执行同步
|
|
|
log.info("XXL-JOB: 开始同步部门数据");
|
|
|
- syncDepartmentData();
|
|
|
+ syncDepartmentData(null);
|
|
|
|
|
|
log.info("XXL-JOB: 开始同步客户数据");
|
|
|
- syncCustomerData();
|
|
|
+ syncCustomerData(null);
|
|
|
|
|
|
log.info("XXL-JOB: 开始同步物料数据");
|
|
|
- syncItemData();
|
|
|
+ syncItemData(null);
|
|
|
|
|
|
log.info("XXL-JOB: 开始同步操作员数据");
|
|
|
- syncOperatorsData();
|
|
|
+ syncOperatorsData(null);
|
|
|
|
|
|
log.info("XXL-JOB: 开始同步供应商数据");
|
|
|
- syncSupplierData();
|
|
|
+ syncSupplierData(null);
|
|
|
|
|
|
log.info("XXL-JOB: 开始同步物流数据");
|
|
|
- syncShipData();
|
|
|
+ syncShipData(null);
|
|
|
|
|
|
log.info("XXL-JOB: 开始同步库存数据");
|
|
|
- syncWhqohData();
|
|
|
+ syncWhqohData(null);
|
|
|
|
|
|
log.info("XXL-JOB: 开始同步应收单数据");
|
|
|
- syncARBillData();
|
|
|
+ syncARBillData(null);
|
|
|
|
|
|
log.info("XXL-JOB: 开始同步收款单数据");
|
|
|
- syncRecBillData();
|
|
|
+ syncRecBillData(null);
|
|
|
|
|
|
log.info("XXL-JOB: 开始同步销售价目表数据");
|
|
|
- syncSalepriceData();
|
|
|
+ syncSalepriceData(null);
|
|
|
|
|
|
long endTime = System.currentTimeMillis();
|
|
|
String successMsg = String.format("XXL-JOB: ===== U9数据完整同步完成,耗时:%s ms =====", (endTime - startTime));
|