From b57f3705b0b20bfde24a7f7ac80d3289b916875d Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 6 Jun 2024 18:32:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1.bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trunkline/mapper/TrunklineAdvanceDetailMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml index d945081a5..1a44af87b 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml @@ -239,10 +239,10 @@ ltad.weight weight, ltad.volume volume, ltad.send_date_str sendDateStr, - ltcls.load_code trunklineCarsNo, - ltcls.scan_status scanStatus, - ltcls.create_time trunklineLoadingTime, - ltcls.sign_time trunklineSignTime, + m.load_code trunklineCarsNo, + m.scan_status scanStatus, + m.create_time trunklineLoadingTime, + m.sign_time trunklineSignTime, lddl.train_number deliveryTrainNumber, ldl.scan_time deliveryLoadingTime, ldl.signing_time deliverySignTime, From 68161bc03a1bf0ce0a105d2122df807bebfc0098 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Fri, 7 Jun 2024 00:51:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat(all):=20=E5=A2=9E=E5=8A=A0=E6=A2=A6?= =?UTF-8?q?=E5=A4=A9=E6=89=8B=E5=8A=A8=E5=9B=9E=E6=8E=A8=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jobhandler/MengTianPushDataJob.java | 81 +++++++++++++++++++ .../factory/mt/mapper/MtPushDataMapper.java | 10 +++ .../factory/mt/mapper/MtPushDataMapper.xml | 32 ++++++-- 3 files changed, 118 insertions(+), 5 deletions(-) create mode 100644 blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/MengTianPushDataJob.java diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/MengTianPushDataJob.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/MengTianPushDataJob.java new file mode 100644 index 000000000..0041966c2 --- /dev/null +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/MengTianPushDataJob.java @@ -0,0 +1,81 @@ +package com.logpm.factory.jobhandler; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.logpm.factory.mt.dto.MtReceiveContentDTO; +import com.logpm.factory.mt.dto.MtReceiveDTO; +import com.logpm.factory.mt.dto.MtReceiveImagesDTO; +import com.logpm.factory.mt.mapper.MtPushDataMapper; +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.common.constant.RabbitConstant; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @author zhaoqiaobo + * @create 2024-04-02 + */ +@AllArgsConstructor +@Component +@Slf4j +public class MengTianPushDataJob { + + private final MtPushDataMapper mtPushDataMapper; + private final RabbitTemplate rabbitTemplate; + + /** + * 定时扫描梦天手动数据 + * + * @param param + * @return + * @throws Exception + */ + @XxlJob("mengTianCustomPushNodeData") + public ReturnT pushDataJob(String param) throws Exception { + + List js = this.mtPushDataMapper.customPushNodeData(); + if (CollUtil.isEmpty(js)) { + return ReturnT.SUCCESS; + } + MtReceiveDTO dto = new MtReceiveDTO(); + String sendTaskId = js.get(0).getStr("sendTaskId"); + if (StrUtil.isNotEmpty(sendTaskId)) { + dto.setSendTaskId(sendTaskId); + dto.setReceiver(js.get(0).getStr("receiver")); + // js 按sendTaskId 和 receiver分组 + List mtReceiveContentDTOS = js.stream().map(j -> { + MtReceiveContentDTO contentDTO = new MtReceiveContentDTO(); + contentDTO.setWaybillNumber(j.getStr("waybillNumber")); + contentDTO.setUnitNo(j.getStr("unitNo")); + contentDTO.setOperateDate(j.getStr("operateDate")); + contentDTO.setWarehouse(j.getStr("warehouse")); + contentDTO.setWarehouseCode(j.getStr("warehouseCode")); + contentDTO.setOrderCode(j.getStr("orderCode")); + contentDTO.setInvoiceOrderCode(j.getStr("invoiceOrderCode")); + return contentDTO; + }).collect(Collectors.toList()); + dto.setReceiveContentList(mtReceiveContentDTOS); + List images = mtPushDataMapper.customPushNodeDataImage(sendTaskId); + dto.setReceiveImagesList(images); + Map map = new HashMap<>(); + String mes = com.alibaba.fastjson.JSONObject.toJSONString(dto); + map.put("messageData", mes); + log.info("梦天手动回推签收数据：{}", JSONUtil.toJsonStr(map)); + rabbitTemplate.convertAndSend(RabbitConstant.MT_BUSINESS_DATA_CLERK_CHECK_2_FACTORY_EXCHANGE, RabbitConstant.MT_BUSINESS_DATA_CLERK_CHECK_2_FACTORY_ROUTING, map); + mtPushDataMapper.customPushNodeDataSended(sendTaskId); + } + + return ReturnT.SUCCESS; + } + +} diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.java index dcee955c3..e92cfc747 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.java @@ -1,7 +1,17 @@ package com.logpm.factory.mt.mapper; +import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.logpm.factory.mt.dto.MtReceiveImagesDTO; import com.logpm.factory.mt.entity.MtPushData; +import java.util.List; + public interface MtPushDataMapper extends BaseMapper { + + List customPushNodeData(); + + List customPushNodeDataImage(String sendTaskId); + + void customPushNodeDataSended(String sendTaskId); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.xml b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.xml index 507ec5afa..13b5c001f 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.xml +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.xml @@ -1,9 +1,31 @@ - - - - - + + + + update mt_custom_push_data_package + set sendStatus = 1 + where sendTaskId = #{sendTaskId} + From 7f0e06d36e67e19993a213ab2ad03d230e0d0f67 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 7 Jun 2024 11:07:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=B9=B2=E7=BA=BF?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E8=AE=A2=E5=8D=95=E7=A0=81=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=98=BE=E7=A4=BA=E5=A7=8B=E5=8F=91=E4=BB=93=E5=92=8C?= =?UTF-8?q?=E7=9B=AE=E7=9A=84=E4=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionStockArticleMapper.xml | 2 +- .../DistrilbutionBillLadingServiceImpl.java | 32 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 2015edc33..89f879777 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -342,7 +342,7 @@