From c03c115562854e394a0870b34cfb8e0847d9ee9f Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 16 Jan 2024 17:58:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=90=AF=E6=A2=A6=E5=A4=A9=E7=9A=84?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factory/mt/feign/MtOrderMainClinet.java | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java index c77444944..b691e9a62 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java @@ -38,30 +38,31 @@ public class MtOrderMainClinet implements IMtOrderMainClinet { private RabbitTemplate rabbitTemplate; @Autowired private IMtFactoryDataService mtFactoryDataService; + @Override @GetMapping(TOP) public R sendOrderPackageScan(String orderPackageCode, String operationTime, String distributionContactId, String distributionContactCode, String destinationWarehouse) throws NoSuchAlgorithmException, JsonProcessingException { log.info(">>>>>>> 签收扫描 start"); - Map map = new HashMap<>(); + Map map = new HashMap<>(); JSONObject jsonObject = new JSONObject(); - jsonObject.put("orderPackageCode",orderPackageCode); - jsonObject.put("operationTime",operationTime); - jsonObject.put("distributionContactId",distributionContactId); - jsonObject.put("distributionContactCode",distributionContactCode); - jsonObject.put("destinationWarehouse",destinationWarehouse); - map.put("messageData",jsonObject.toJSONString()); + jsonObject.put("orderPackageCode", orderPackageCode); + jsonObject.put("operationTime", operationTime); + jsonObject.put("distributionContactId", distributionContactId); + jsonObject.put("distributionContactCode", distributionContactCode); + jsonObject.put("destinationWarehouse", destinationWarehouse); + map.put("messageData", jsonObject.toJSONString()); - log.info(">>>>>>>>>>>>>>>>> 司机扫描 {}", DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss.SSS")); + log.info(">>>>>>>>>>>>>>>>> 司机扫描 {}", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS")); - /* rabbitTemplate.convertAndSend(RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_EXCHANGE,RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_ROUTING, map,message -> { + rabbitTemplate.convertAndSend(RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_EXCHANGE, RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_ROUTING, map, message -> { message.getMessageProperties() .setHeader("x-delay", 5000); return message; - });*/ - log.info(">>>>>>>>>>>>>>>>> 司机扫描 {}", DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss.SSS")); + }); + log.info(">>>>>>>>>>>>>>>>> 司机扫描 {}", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS")); return R.success(""); @@ -72,16 +73,16 @@ public class MtOrderMainClinet implements IMtOrderMainClinet { @PostMapping(SENDRECEIVEINFOBYNEWSYSTEM) public R sendReceiveInfoByNewSystem(MtReceiveDTO mtReceiveDTO) throws NoSuchAlgorithmException, JsonProcessingException { log.info(">>>>>>> 文员复核 start"); - Map map = new HashMap<>(); + Map map = new HashMap<>(); String mes = JSONObject.toJSONString(mtReceiveDTO); - map.put("messageData",mes); - log.info(">>>>>>>>>>>>>>>>> 文员复核 {}", DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss.SSS")); + map.put("messageData", mes); + log.info(">>>>>>>>>>>>>>>>> 文员复核 {}", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS")); - /* rabbitTemplate.convertAndSend(RabbitConstant.MT_BUSINESS_DATA_CLERK_CHECK_2_FACTORY_EXCHANGE,RabbitConstant.MT_BUSINESS_DATA_CLERK_CHECK_2_FACTORY_ROUTING, map,message -> { + rabbitTemplate.convertAndSend(RabbitConstant.MT_BUSINESS_DATA_CLERK_CHECK_2_FACTORY_EXCHANGE, RabbitConstant.MT_BUSINESS_DATA_CLERK_CHECK_2_FACTORY_ROUTING, map, message -> { message.getMessageProperties() .setHeader("x-delay", 5000); return message; - });*/ + }); return R.success("");