fix:优化数据源切换

zkh
路明慧 11 months ago
parent 7709381d0e
commit cb1290a915
  1. 2
      dxhy-consumer/src/main/java/com/dxhy/entrance/dxhyconsumer/aop/SimsOrderSysLogAspect.java
  2. 2
      order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/controller/OrderHandleController.java
  3. 10
      order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java
  4. 4
      order-management-order/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceDataServiceImpl.java

@ -9,6 +9,7 @@ import com.dxhy.base.thirdservice.module.thirdservice.itax.model.SysLogEntity;
import com.dxhy.order.baseservice.annotation.SysLog; import com.dxhy.order.baseservice.annotation.SysLog;
import com.dxhy.order.baseservice.constant.NsrQueueEnum; import com.dxhy.order.baseservice.constant.NsrQueueEnum;
import com.dxhy.order.baseservice.constant.OrderEnum; import com.dxhy.order.baseservice.constant.OrderEnum;
import com.dxhy.order.consumer.modules.bespoke.config.datasource.config.DynamicContextHolder;
import com.dxhy.order.invoice.module.rabbitmq.model.RabbitMqCommonMessage; import com.dxhy.order.invoice.module.rabbitmq.model.RabbitMqCommonMessage;
import com.dxhy.order.invoice.module.rabbitmq.service.RabbitMqSendMessageService; import com.dxhy.order.invoice.module.rabbitmq.service.RabbitMqSendMessageService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -59,6 +60,7 @@ public class SimsOrderSysLogAspect {
public Object around(ProceedingJoinPoint point) throws Throwable { public Object around(ProceedingJoinPoint point) throws Throwable {
long beginTime = System.currentTimeMillis(); long beginTime = System.currentTimeMillis();
DynamicContextHolder.push(com.dxhy.management.common.constant.ConfigureConstant.MAIN);
//执行方法 //执行方法
Object result = point.proceed(); Object result = point.proceed();
//执行时长(毫秒) //执行时长(毫秒)

@ -192,6 +192,8 @@ public class OrderHandleController {
} catch (Exception e){ } catch (Exception e){
log.error("{}保存订单异常", LOGGER_MSG, e); log.error("{}保存订单异常", LOGGER_MSG, e);
return R.error("保存订单异常请联系运维人员"); return R.error("保存订单异常请联系运维人员");
}finally {
DynamicContextHolder.push(com.dxhy.management.common.constant.ConfigureConstant.MAIN);
} }

@ -93,11 +93,12 @@ public class SkOrderServiceImpl implements OrderService {
public R orderRead(ReqParam reqParam) { public R orderRead(ReqParam reqParam) {
int count = ConfigureConstant.INT_0;
try {
DynamicContextHolder.push(reqParam.getNsrsbh()); DynamicContextHolder.push(reqParam.getNsrsbh());
List<SkOrderInfo> skOrderInfoList = skOrderMapper.findOrderHeadList(reqParam); List<SkOrderInfo> skOrderInfoList = skOrderMapper.findOrderHeadList(reqParam);
log.debug("查询到订单数据:{}", JSON.toJSONString(skOrderInfoList)); log.debug("查询到订单数据:{}", JSON.toJSONString(skOrderInfoList));
int count = ConfigureConstant.INT_0;
if (CollectionUtils.isNotEmpty(skOrderInfoList)) { if (CollectionUtils.isNotEmpty(skOrderInfoList)) {
for (SkOrderInfo skOrderInfo : skOrderInfoList) { for (SkOrderInfo skOrderInfo : skOrderInfoList) {
@ -113,6 +114,13 @@ public class SkOrderServiceImpl implements OrderService {
} }
} }
}catch (Exception e) {
log.error("订单读取异常", e);
return R.error("订单读取异常");
} finally {
DynamicContextHolder.push(ConfigureConstant.MAIN);
}
return R.ok("成功读取" + count + "条订单数据"); return R.ok("成功读取" + count + "条订单数据");
} }

@ -112,9 +112,9 @@ public class InvoiceDataServiceImpl implements InvoiceDataService {
commonTsMqData.setNsrsbh(orderInvoiceInfo.getXhfNsrsbh()); commonTsMqData.setNsrsbh(orderInvoiceInfo.getXhfNsrsbh());
commonTsMqData.setEntId(orderInvoiceInfo.getEntId()); commonTsMqData.setEntId(orderInvoiceInfo.getEntId());
commonTsMqData.setFpTsMqData(fpTsMqData); commonTsMqData.setFpTsMqData(fpTsMqData);
// rabbitMqSendMessageService.autoSendRabbitMqMessageForBusiness(NsrQueueEnum.PUSH_MESSAGE.getValue(), JsonUtils.getInstance().toJsonString(commonTsMqData)); rabbitMqSendMessageService.autoSendRabbitMqMessageForBusiness(NsrQueueEnum.PUSH_MESSAGE.getValue(), JsonUtils.getInstance().toJsonString(commonTsMqData));
orderHandleService.backMsg(JSON.toJSONString(commonTsMqData)); // orderHandleService.backMsg(JSON.toJSONString(commonTsMqData));
successCount++; successCount++;
} }

Loading…
Cancel
Save