luminghui
/
sdny-order
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-hzfpxf' into test

Browse Source
release
高荣琳 2 years ago
parent d610b2e516 35d1efa6b9
commit 9430a113dd
19 changed files with 96 additions and 119 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      order-management-consumer/pom.xml
  2. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/config/XxlJobConfig.java
  3. 12
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/C48LxpTask.java
  4. 16
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/FangGeInvoiceResendMsgTask.java
  5. 12
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/FangGeInvoiceUploadTask.java
  6. 12
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/FangGeSendMsgFlagTask.java
  7. 12
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/FangGeTaxTask.java
  8. 12
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/GetGsClientTask.java
  9. 12
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/GzhProcessFailInvoiceTask.java
  10. 14
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/InvoiceEmailMonthPushTask.java
  11. 12
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/InvoicePushTask.java
  12. 12
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/ProcessQueueTask.java
  13. 10
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/SenderTask.java
  14. 14
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/SyncQdHzqrdTask.java
  15. 11
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/SyncSpecialInvoiceReversalTask.java
  16. 13
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/SyncTask.java
  17. 8
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/TestTask.java
  18. 11
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/U180InvalidInvoiceResultTask.java
  19. 13
      order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/UkeyCheckFailSyncTask.java

7
order-management-consumer/pom.xml
Unescape View File

@ -341,7 +341,7 @@
<dependency>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
<version>1.9.1</version>
<version>2.4.0</version>
</dependency>
<!-- swaggerUi 支持 -->
@ -557,6 +557,11 @@
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.33</version>
</dependency>
</dependencies>
<build>

2
order-management-consumer/src/main/java/com/dxhy/order/consumer/config/XxlJobConfig.java
Unescape View File

@ -46,7 +46,7 @@ public class XxlJobConfig {
log.info(">>>>>>>>>>> xxl-job config init.");
XxlJobExecutor xxlJobExecutor = new XxlJobExecutor();
xxlJobExecutor.setAdminAddresses(adminAddresses);
xxlJobExecutor.setAppName(appName);
xxlJobExecutor.setAppname(appName);
xxlJobExecutor.setIp(ip);
xxlJobExecutor.setPort(port);
xxlJobExecutor.setAccessToken(accessToken);

12
order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/C48LxpTask.java
Unescape View File

@ -23,8 +23,7 @@ import com.dxhy.order.utils.HttpUtils;
import com.dxhy.order.utils.JsonUtils;
import com.dxhy.order.utils.NsrsbhUtils;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.IJobHandler;
import com.xxl.job.core.handler.annotation.JobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.MDC;
import org.slf4j.spi.MDCAdapter;
@ -42,9 +41,8 @@ import java.util.*;
* @date 创建时间: 2022-06-10 9:01
*/
@Slf4j
@JobHandler(value = "C48LxpTask")
@Component
public class C48LxpTask extends IJobHandler {
public class C48LxpTask {
private static final String LOGGER_MSG = "(C48离线票定时任务)";
@ -63,7 +61,7 @@ public class C48LxpTask extends IJobHandler {
@Resource
private InvoiceConfig invoiceConfig;
@Override
@XxlJob("C48LxpTask")
public ReturnT<String> execute(String param) {
log.debug("{}定时任务开始,请求参数:{}", LOGGER_MSG, param);
@ -145,10 +143,10 @@ public class C48LxpTask extends IJobHandler {
} catch (Exception e) {
log.error("{}定时任务执行异常:{}", LOGGER_MSG, e);
return FAIL;
return ReturnT.FAIL;
}
log.debug("{}定时任务完成", LOGGER_MSG);
return SUCCESS;
return ReturnT.SUCCESS;
}
public void getLxp(String nsrsbh, String fjh, String startTime, String endTime, int count1) {

16
order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/FangGeInvoiceResendMsgTask.java
Unescape View File

@ -19,8 +19,7 @@ import com.dxhy.order.model.*;
import com.dxhy.order.utils.CommonUtils;
import com.dxhy.order.utils.JsonUtils;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.IJobHandler;
import com.xxl.job.core.handler.annotation.JobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.MDC;
@ -39,9 +38,8 @@ import java.util.stream.Collectors;
*/
@SuppressWarnings("AlibabaMethodTooLong")
@Slf4j
@JobHandler(value = "fangGeInvoiceResendMsgTask")
@Component
public class FangGeInvoiceResendMsgTask extends IJobHandler {
public class FangGeInvoiceResendMsgTask {
private static final String LOGGER_MSG = "(开票中的数据重新发送消息)";
@ -60,7 +58,7 @@ public class FangGeInvoiceResendMsgTask extends IJobHandler {
@Resource
private FangGeInterfaceService fangGeInterfaceService;
@Override
@XxlJob("fangGeInvoiceResendMsgTask")
public ReturnT<String> execute(String param) {
try {
@ -84,7 +82,7 @@ public class FangGeInvoiceResendMsgTask extends IJobHandler {
log.debug("========>{}定时任务开始！！！！参数:{}", LOGGER_MSG, param);
if (StringUtils.isEmpty(param)) {
log.warn("请输入参数，要重发多少分钟之前的开票信息");
return FAIL;
return ReturnT.FAIL;
}
Calendar beforeTime = Calendar.getInstance();
int minute = Integer.parseInt(param);
@ -103,7 +101,7 @@ public class FangGeInvoiceResendMsgTask extends IJobHandler {
List<OrderProcessInfo> orderProcessInfos = orderProcessService.selectOrderProcessByFpqqlshDdhNsrsbh(paraMap, shList);
log.debug("===========》需要开票的数据：{}", JsonUtils.getInstance().toJsonString(orderProcessInfos));
if (ObjectUtil.isEmpty(orderProcessInfos)) {
return SUCCESS;
return ReturnT.SUCCESS;
}
for (OrderProcessInfo info : orderProcessInfos) {
OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfoByFpqqlsh(info.getFpqqlsh(), shList);
@ -183,9 +181,9 @@ public class FangGeInvoiceResendMsgTask extends IJobHandler {
}
} catch (Exception e) {
log.error("{}定时任务执行异常:{}", LOGGER_MSG, e);
return FAIL;
return ReturnT.FAIL;
}
return SUCCESS;
return ReturnT.SUCCESS;
}
}

12
order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/FangGeInvoiceUploadTask.java
Unescape View File

@ -9,8 +9,7 @@ import com.dxhy.order.baseservice.module.thirdservice.simsback.service.SimsBackS
import com.dxhy.order.invoice.module.fangge.service.FangGeService;
import com.dxhy.order.invoice.module.fangge.service.RegistrationCodeService;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.IJobHandler;
import com.xxl.job.core.handler.annotation.JobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.MDC;
@ -28,9 +27,8 @@ import static com.dxhy.order.constant.OrderInfoEnum.TAX_EQUIPMENT_FG51YZJ;
* @author ZSC-DXHY
*/
@Slf4j
@JobHandler(value = "fangGeInvoiceUploadTask")
@Component
public class FangGeInvoiceUploadTask extends IJobHandler {
public class FangGeInvoiceUploadTask {
private static final String LOGGER_MSG = "(发送发票上传消息)";
@ -41,7 +39,7 @@ public class FangGeInvoiceUploadTask extends IJobHandler {
@Resource
private SimsBackService simsBackService;
@Override
@XxlJob("fangGeInvoiceUploadTask")
public ReturnT<String> execute(String param) {
try {
//添加日志id
@ -85,9 +83,9 @@ public class FangGeInvoiceUploadTask extends IJobHandler {
}
} catch (Exception e) {
log.error("{}定时任务执行异常:{}", LOGGER_MSG, e);
return FAIL;
return ReturnT.FAIL;
}
return SUCCESS;
return ReturnT.SUCCESS;
}

12
order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/FangGeSendMsgFlagTask.java
Unescape View File

@ -3,8 +3,7 @@ package com.dxhy.order.consumer.handle;
import cn.hutool.core.util.RandomUtil;
import com.dxhy.order.invoice.module.fangge.service.FangGeService;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.IJobHandler;
import com.xxl.job.core.handler.annotation.JobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.MDC;
import org.slf4j.spi.MDCAdapter;
@ -19,15 +18,14 @@ import javax.annotation.Resource;
* @date 创建时间: 2020-08-14 14:50
*/
@Slf4j
@JobHandler(value = "fangGeSendMsgFlagTask")
@Component
public class FangGeSendMsgFlagTask extends IJobHandler {
public class FangGeSendMsgFlagTask {
private static final String LOGGER_MSG = "(方格发送消息状态任务)";
@Resource
private FangGeService fangGeService;
@Override
@XxlJob("fangGeSendMsgFlagTask")
public ReturnT<String> execute(String param) {
try {
//添加日志id
@ -37,9 +35,9 @@ public class FangGeSendMsgFlagTask extends IJobHandler {
fangGeService.handlerIsSendFlag();
} catch (Exception e) {
log.error("{}定时任务执行异常:{}", LOGGER_MSG, e);
return FAIL;
return ReturnT.FAIL;
}
return SUCCESS;
return ReturnT.SUCCESS;
}
}

12
order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/FangGeTaxTask.java
Unescape View File

@ -7,8 +7,7 @@ import com.dxhy.order.model.RegistrationCode;
import com.dxhy.order.invoice.module.fangge.service.FangGeService;
import com.dxhy.order.invoice.module.fangge.service.RegistrationCodeService;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.IJobHandler;
import com.xxl.job.core.handler.annotation.JobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.MDC;
import org.slf4j.spi.MDCAdapter;
@ -24,9 +23,8 @@ import java.util.List;
* @date 创建时间: 2021-03-03 17:04
*/
@Slf4j
@JobHandler(value = "fangGeTaxTask")
@Component
public class FangGeTaxTask extends IJobHandler {
public class FangGeTaxTask {
private static final String LOGGER_MSG = "(抄报税定时任务)";
@ -35,7 +33,7 @@ public class FangGeTaxTask extends IJobHandler {
@Resource
private FangGeService fangGeService;
@Override
@XxlJob("fangGeTaxTask")
public ReturnT<String> execute(String param) {
try {
//添加日志id
@ -64,9 +62,9 @@ public class FangGeTaxTask extends IJobHandler {
}
} catch (Exception e) {
log.error("{}定时任务执行异常:{}", LOGGER_MSG, e);
return FAIL;
return ReturnT.FAIL;
}
return SUCCESS;
return ReturnT.SUCCESS;
}

12
order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/GetGsClientTask.java
Unescape View File

@ -16,8 +16,7 @@ import com.dxhy.order.consumer.openapi.protocol.po.PoCommonResponseParam;
import com.dxhy.order.utils.HttpUtils;
import com.dxhy.order.utils.JsonUtils;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.IJobHandler;
import com.xxl.job.core.handler.annotation.JobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@ -34,8 +33,7 @@ import java.util.Map;
*/
@Slf4j
@Component
@JobHandler(value = "/getGsClient")
public class GetGsClientTask extends IJobHandler {
public class GetGsClientTask {
private static final String LOGGER_MSG = "(SAP获取公司client)";
@ -46,7 +44,7 @@ public class GetGsClientTask extends IJobHandler {
@Resource
private GsClientMapper gsClientMapper;
@Override
@XxlJob("/getGsClient")
public ReturnT<String> execute(String s) {
try {
log.debug("{}任务开始", LOGGER_MSG);
@ -96,8 +94,8 @@ public class GetGsClientTask extends IJobHandler {
log.debug("{}任务结束，耗时:{}", LOGGER_MSG, endTime - startTime);
} catch (Exception e) {
log.error("{}定时任务执行异常:{}", LOGGER_MSG, e);
return FAIL;
return ReturnT.FAIL;
}
return SUCCESS;
return ReturnT.SUCCESS;
}
}

12
order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/GzhProcessFailInvoiceTask.java
Unescape View File

@ -15,8 +15,7 @@ import com.dxhy.order.consumer.modules.order.service.OrderProcessService;
import com.dxhy.order.consumer.modules.order.service.OrderQrcodeExtendService;
import com.dxhy.order.consumer.modules.scaninvoice.service.ScanInvoiceService;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.IJobHandler;
import com.xxl.job.core.handler.annotation.JobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.MDC;
@ -34,9 +33,8 @@ import java.util.*;
* @date 创建时间: 2020-08-19 9:34
*/
@Slf4j
@JobHandler(value = "gzhProcessFailInvoiceTask")
@Component
public class GzhProcessFailInvoiceTask extends IJobHandler {
public class GzhProcessFailInvoiceTask {
private static final String LOGGER_MSG = "(公众号处理开具失败数据)";
@ -52,7 +50,7 @@ public class GzhProcessFailInvoiceTask extends IJobHandler {
@Resource
private OrderProcessService orderProcessService;
@Override
@XxlJob("gzhProcessFailInvoiceTask")
public ReturnT<String> execute(String param) {
try {
@ -152,10 +150,10 @@ public class GzhProcessFailInvoiceTask extends IJobHandler {
}
} catch (Exception e) {
log.error("{}处理公众号已授权未开票数据失败,异常信息为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(e));
return FAIL;
return ReturnT.FAIL;
}
return SUCCESS;
return ReturnT.SUCCESS;
}
}

14
order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/InvoiceEmailMonthPushTask.java
Unescape View File

@ -6,8 +6,7 @@ import com.dxhy.order.utils.JsonUtils;
import com.dxhy.order.utils.NsrsbhUtils;
import com.dxhy.order.consumer.modules.manager.service.PushInvoiceService;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.IJobHandler;
import com.xxl.job.core.handler.annotation.JobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.MDC;
@ -30,9 +29,8 @@ import java.util.Map;
* @author xuxueli 2015-12-19 19:43:36
*/
@Slf4j
@JobHandler(value = "InvoiceEmailMonthPushTask")
@Component
public class InvoiceEmailMonthPushTask extends IJobHandler {
public class InvoiceEmailMonthPushTask {
private static final String LOGGER_MSG = "(定时推送开票成功的发票数据)";
@ -40,7 +38,7 @@ public class InvoiceEmailMonthPushTask extends IJobHandler {
PushInvoiceService pushInvoiceService;
@Override
@XxlJob("InvoiceEmailMonthPushTask")
public ReturnT<String> execute(String param) {
try {
//添加日志id
@ -51,7 +49,7 @@ public class InvoiceEmailMonthPushTask extends IJobHandler {
Map paramMap = JsonUtils.getInstance().parseObject(param, Map.class);
if (StringUtils.isBlank(paramMap.get(ConfigureConstant.REQUEST_PARAM_NSRSBH).toString())) {
log.error("{},请求税号为空!", LOGGER_MSG);
return FAIL;
return ReturnT.FAIL;
}
List<String> shList = NsrsbhUtils.transShListByXhfNsrsbh(paramMap.get(ConfigureConstant.REQUEST_PARAM_NSRSBH).toString());
@ -59,8 +57,8 @@ public class InvoiceEmailMonthPushTask extends IJobHandler {
log.info("========>{}定时任务结束！！！！", LOGGER_MSG);
} catch (Exception e) {
log.error("{}定时任务执行异常:{}", LOGGER_MSG, e);
return FAIL;
return ReturnT.FAIL;
}
return SUCCESS;
return ReturnT.SUCCESS;
}
}

12
order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/InvoicePushTask.java
Unescape View File

@ -17,8 +17,7 @@ import com.dxhy.order.invoice.module.invoice.model.PushInfo;
import com.dxhy.order.invoice.module.invoice.service.InvalidInvoiceService;
import com.dxhy.order.invoice.module.invoice.service.OrderInvoiceInfoService;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.IJobHandler;
import com.xxl.job.core.handler.annotation.JobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.MDC;
@ -43,9 +42,8 @@ import java.util.stream.Collectors;
*/
@SuppressWarnings("AlibabaMethodTooLong")
@Slf4j
@JobHandler(value = "InvoicePushTask")
@Component
public class InvoicePushTask extends IJobHandler {
public class InvoicePushTask {
private static final String LOGGER_MSG = "(定时推送开票成功的发票数据)";
@ -63,7 +61,7 @@ public class InvoicePushTask extends IJobHandler {
@SuppressWarnings("AlibabaUndefineMagicConstant")
@Override
@XxlJob("InvoicePushTask")
public ReturnT<String> execute(String param) {
try {
//添加日志id
@ -123,9 +121,9 @@ public class InvoicePushTask extends IJobHandler {
log.info("========>{}定时任务结束！！！！", LOGGER_MSG);
} catch (Exception e) {
log.error("{}定时任务执行异常:{}", LOGGER_MSG, e);
return FAIL;
return ReturnT.FAIL;
}
return SUCCESS;
return ReturnT.SUCCESS;
}
/**

12
order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/ProcessQueueTask.java
Unescape View File

@ -19,8 +19,7 @@ import com.dxhy.order.consumer.model.ProcessQueueInfo;
import com.dxhy.order.utils.DecimalCalculateUtil;
import com.dxhy.order.utils.JsonUtils;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.IJobHandler;
import com.xxl.job.core.handler.annotation.JobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.MDC;
@ -41,9 +40,8 @@ import java.util.stream.Collectors;
* @date 创建时间: 2021-06-28 11:34
*/
@Slf4j
@JobHandler(value = "processQueueTask")
@Component
public class ProcessQueueTask extends IJobHandler {
public class ProcessQueueTask {
private static final String LOGGER_MSG = "(处理队列定时任务)";
@ -59,7 +57,7 @@ public class ProcessQueueTask extends IJobHandler {
@Resource
private BaseServiceConfig baseServiceConfig;
@Override
@XxlJob("processQueueTask")
public ReturnT<String> execute(String param) {
log.debug("{}定时任务开始,请求参数:{}", LOGGER_MSG, param);
@ -169,10 +167,10 @@ public class ProcessQueueTask extends IJobHandler {
} catch (Exception e) {
log.error("{}定时任务执行异常:{}", LOGGER_MSG, e);
return FAIL;
return ReturnT.FAIL;
}
log.debug("{}定时任务完成", LOGGER_MSG);
return SUCCESS;
return ReturnT.SUCCESS;
}

10
order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/SenderTask.java
Unescape View File

@ -6,8 +6,7 @@ import com.dxhy.order.invoicesender.module.sender.model.FpExpress;
import com.dxhy.order.invoicesender.module.sender.model.KdniaoQueryReq;
import com.dxhy.order.invoicesender.module.sender.service.FpExpressService;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.IJobHandler;
import com.xxl.job.core.handler.annotation.JobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.MDC;
import org.slf4j.spi.MDCAdapter;
@ -23,9 +22,8 @@ import java.util.List;
* @date 创建时间: 2020-08-14 15:35
*/
@Component
@JobHandler(value = "/senderTask")
@Slf4j
public class SenderTask extends IJobHandler {
public class SenderTask {
private static final String LOGGER_MSG = "(获取快递信息定时任务)";
@ -34,7 +32,7 @@ public class SenderTask extends IJobHandler {
@Resource
private FpExpressController fpExpressController;
@Override
@XxlJob("/senderTask")
public ReturnT<String> execute(String s) {
log.info("定时任务开始执行");
try {
@ -45,7 +43,7 @@ public class SenderTask extends IJobHandler {
this.getFpExpressList();
} catch (Exception e) {
log.error("{}定时任务执行异常:{}", LOGGER_MSG, e);
return FAIL;
return ReturnT.FAIL;
}
return ReturnT.SUCCESS;
}

14
order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/SyncQdHzqrdTask.java
Unescape View File

@ -18,8 +18,7 @@ import com.dxhy.order.utils.HttpUtils;
import com.dxhy.order.utils.JsonUtils;
import com.google.common.collect.Maps;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.IJobHandler;
import com.xxl.job.core.handler.annotation.JobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.entity.ContentType;
@ -40,9 +39,9 @@ import java.util.*;
**/
@Slf4j
@Component
@JobHandler(value = "/qdHzqrdTask")
//@JobHandler(value = "/qdHzqrdTask")
@RequestMapping(value = "/qdHzqrd")
public class SyncQdHzqrdTask extends IJobHandler {
public class SyncQdHzqrdTask {
private static final String LOGGER_MSG = "(定时同步全电红字确认单)";
@Resource
@ -54,8 +53,9 @@ public class SyncQdHzqrdTask extends IJobHandler {
@Resource
private OpenApiConfig openApiConfig;
@Override
@PostMapping("/sync")
@XxlJob("/qdHzqrdTask")
public ReturnT<String> execute(String param) {
log.debug("{}定时任务开始,请求参数:{}", LOGGER_MSG, param);
try {
@ -122,10 +122,10 @@ public class SyncQdHzqrdTask extends IJobHandler {
}
} catch (Exception e) {
log.error("{}定时任务执行异常:{}", LOGGER_MSG, e);
return FAIL;
return ReturnT.FAIL;
}
log.debug("{}定时任务完成", LOGGER_MSG);
return SUCCESS;
return ReturnT.SUCCESS;
}

11
order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/SyncSpecialInvoiceReversalTask.java
Unescape View File

@ -9,7 +9,7 @@ import com.dxhy.order.invoice.module.invoicespecial.service.SpecialInvoiceRevers
import com.dxhy.order.invoice.module.invoicespecial.service.SpecialInvoiceService;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.IJobHandler;
import com.xxl.job.core.handler.annotation.JobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.MDC;
import org.slf4j.spi.MDCAdapter;
@ -28,8 +28,7 @@ import static com.dxhy.order.constant.OrderInfoEnum.ORDER_INVOICE_TYPE_52;
*/
@Slf4j
@Component
@JobHandler(value = "/syncSpecialInvoiceReversal")
public class SyncSpecialInvoiceReversalTask extends IJobHandler {
public class SyncSpecialInvoiceReversalTask {
private static final String LOGGER_MSG = "(定时同步红字申请单数据)";
@ -39,7 +38,7 @@ public class SyncSpecialInvoiceReversalTask extends IJobHandler {
@Resource
private SpecialInvoiceReversalService specialInvoiceReversalService;
@Override
@XxlJob("/syncSpecialInvoiceReversal")
public ReturnT<String> execute(String s) {
try {
//添加日志id
@ -77,9 +76,9 @@ public class SyncSpecialInvoiceReversalTask extends IJobHandler {
log.debug("{}同步红色申请单定时任务结束，耗时:{}", LOGGER_MSG, endTime - startTime);
} catch (Exception e) {
log.error("{}定时任务执行异常:{}", LOGGER_MSG, e);
return FAIL;
return ReturnT.FAIL;
}
return SUCCESS;
return ReturnT.SUCCESS;
}
}

13
order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/SyncTask.java
Unescape View File

@ -20,7 +20,7 @@ import com.dxhy.order.consumer.modules.manager.service.InvoiceService;
import com.dxhy.order.consumer.modules.order.service.OrderProcessService;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.IJobHandler;
import com.xxl.job.core.handler.annotation.JobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.MDC;
@ -39,9 +39,8 @@ import java.util.Map;
* @date 创建时间: 2021-06-28 11:34
*/
@Slf4j
@JobHandler(value = "ukeySyncTask")
@Component
public class SyncTask extends IJobHandler {
public class SyncTask {
private static final String LOGGER_MSG = "(同步定时任务)";
@ -55,7 +54,7 @@ public class SyncTask extends IJobHandler {
@Resource
private RedisService redisService;
@Override
@XxlJob("ukeySyncTask")
public ReturnT<String> execute(String param) {
log.debug("{}定时任务开始,请求参数:{}", LOGGER_MSG, param);
@ -74,7 +73,7 @@ public class SyncTask extends IJobHandler {
Map paramMap = JsonUtils.getInstance().parseObject(param, Map.class);
if (ObjectUtil.isNull(paramMap)) {
log.error("{}定时任务请求参数为空:{}", LOGGER_MSG, param);
return FAIL;
return ReturnT.FAIL;
}
List<String> shList = NsrsbhUtils.transShListByXhfNsrsbh((String) paramMap.get("xhfNsrsbh"));
@ -127,10 +126,10 @@ public class SyncTask extends IJobHandler {
} catch (Exception e) {
log.error("{}定时任务执行异常:{}", LOGGER_MSG, e);
return FAIL;
return ReturnT.FAIL;
}
log.debug("{}定时任务完成", LOGGER_MSG);
return SUCCESS;
return ReturnT.SUCCESS;
}

8
order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/TestTask.java
Unescape View File

@ -3,7 +3,6 @@ package com.dxhy.order.consumer.handle;
import cn.hutool.core.util.RandomUtil;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.IJobHandler;
import com.xxl.job.core.handler.annotation.JobHandler;
import org.slf4j.MDC;
import org.slf4j.spi.MDCAdapter;
import org.springframework.stereotype.Component;
@ -15,10 +14,9 @@ import org.springframework.stereotype.Component;
* @date 创建时间: 2020-08-14 15:44
*/
@Component
@JobHandler(value = "testTask")
public class TestTask extends IJobHandler {
@Override
//@JobHandler(value = "testTask")
public class TestTask {
public ReturnT<String> execute(String param) {
//添加日志id
MDCAdapter mdc = MDC.getMDCAdapter();

11
order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/U180InvalidInvoiceResultTask.java
Unescape View File

@ -21,7 +21,7 @@ import com.dxhy.order.utils.JsonUtils;
import com.dxhy.order.utils.NsrsbhUtils;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.IJobHandler;
import com.xxl.job.core.handler.annotation.JobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.MDC;
import org.slf4j.spi.MDCAdapter;
@ -39,9 +39,8 @@ import java.util.stream.Collectors;
* @date 创建时间: 2020-08-14 14:50
*/
@Slf4j
@JobHandler(value = "u180InvaliInvoiceResultTask")
@Component
public class U180InvalidInvoiceResultTask extends IJobHandler {
public class U180InvalidInvoiceResultTask {
private static final String LOGGER_MSG = "(U180获取作废结果)";
@ -54,7 +53,7 @@ public class U180InvalidInvoiceResultTask extends IJobHandler {
@Resource
private RabbitMqSendMessageService rabbitMqSendMessageService;
@Override
@XxlJob("u180InvaliInvoiceResultTask")
public ReturnT<String> execute(String param) {
try {
//添加日志id
@ -140,9 +139,9 @@ public class U180InvalidInvoiceResultTask extends IJobHandler {
} catch (Exception e) {
log.error("{}定时任务执行异常:{}", LOGGER_MSG, e);
return FAIL;
return ReturnT.FAIL;
}
return SUCCESS;
return ReturnT.SUCCESS;
}
}

13
order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/UkeyCheckFailSyncTask.java
Unescape View File

@ -33,8 +33,7 @@ import com.dxhy.order.utils.DecimalCalculateUtil;
import com.dxhy.order.utils.JsonUtils;
import com.dxhy.order.utils.NsrsbhUtils;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.IJobHandler;
import com.xxl.job.core.handler.annotation.JobHandler;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.MDC;
import org.slf4j.spi.MDCAdapter;
@ -52,9 +51,9 @@ import java.util.List;
*/
@SuppressWarnings("AlibabaMethodTooLong")
@Slf4j
@JobHandler(value = "ukeyCheckFailSyncTask")
//@JobHandler(value = "ukeyCheckFailSyncTask")
@Component
public class UkeyCheckFailSyncTask extends IJobHandler {
public class UkeyCheckFailSyncTask {
private static final String LOGGER_MSG = "(UKey获取验签失败数据)";
@ -75,7 +74,7 @@ public class UkeyCheckFailSyncTask extends IJobHandler {
@Resource
private UnifyService unifyService;
@Override
@XxlJob("ukeyCheckFailSyncTask")
public ReturnT<String> execute(String param) {
try {
@ -210,9 +209,9 @@ public class UkeyCheckFailSyncTask extends IJobHandler {
} catch (Exception e) {
log.error("{}定时任务执行异常:{}", LOGGER_MSG, e);
return FAIL;
return ReturnT.FAIL;
}
return SUCCESS;
return ReturnT.SUCCESS;
}
}

Write Preview
Loading…
Cancel
Save