diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtPushData.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtPushData.java index 71e746cfc..0ab56159c 100644 --- a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtPushData.java +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtPushData.java @@ -65,6 +65,11 @@ public class MtPushData extends BaseEntity { */ @ApiModelProperty(name = "推送状态", notes = " 1 已推送 0 未推送 默认未推送") private Integer pushStatus; + /** + * 推送类型 + */ + @ApiModelProperty(name = "推送类型", notes = "1 签收扫描 2 文员复核") + private Integer pushType; /** 推送时间 */ @ApiModelProperty(name = "推送时间", notes = "") private Date pushTime ; 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 index 0041966c2..b1de43b3b 100644 --- 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 @@ -1,6 +1,7 @@ package com.logpm.factory.jobhandler; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; @@ -34,7 +35,7 @@ public class MengTianPushDataJob { private final RabbitTemplate rabbitTemplate; /** - * 定时扫描梦天手动数据 + * 定时扫描梦天手动数据 文员复核 * * @param param * @return @@ -70,12 +71,39 @@ public class MengTianPushDataJob { Map map = new HashMap<>(); String mes = com.alibaba.fastjson.JSONObject.toJSONString(dto); map.put("messageData", mes); - log.info("梦天手动回推签收数据:{}", JSONUtil.toJsonStr(map)); + 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); + mtPushDataMapper.customPushNodeDataSended(sendTaskId, 2); } return ReturnT.SUCCESS; } + /** + * 定时扫描梦天手动数据 签收扫描 + * + * @param param + * @return + * @throws Exception + */ + @XxlJob("mengTianCustomPushNodeScanData") + public ReturnT mengTianCustomPushNodeScanData(String param) throws Exception { + + JSONObject js = this.mtPushDataMapper.customPushNodeDataScan(); + if (ObjectUtil.isEmpty(js)) { + return ReturnT.SUCCESS; + } + JSONObject entries = new JSONObject(); + entries.set("orderPackageCode", js.getStr("unitNo")); + entries.set("operationTime", js.getStr("operateDate")); + entries.set("distributionContactId", js.getStr("sendTaskId")); + entries.set("destinationWarehouse", js.getStr("warehouse")); + Map map = new HashMap<>(); + map.put("messageData", entries); + log.info("梦天手动回推签收扫描数据:{}", JSONUtil.toJsonStr(map)); + rabbitTemplate.convertAndSend(RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_EXCHANGE, RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_ROUTING, map); + mtPushDataMapper.customPushNodeDataSended(js.getStr("sendTaskId"), 1); + 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 e92cfc747..9db326954 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 @@ -4,14 +4,16 @@ 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 org.apache.ibatis.annotations.Param; import java.util.List; public interface MtPushDataMapper extends BaseMapper { List customPushNodeData(); + JSONObject customPushNodeDataScan(); List customPushNodeDataImage(String sendTaskId); - void customPushNodeDataSended(String sendTaskId); + void customPushNodeDataSended(@Param("sendTaskId") String sendTaskId, @Param("pushType") int pushType); } 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 13b5c001f..cf85318da 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 @@ -14,9 +14,24 @@ from mt_custom_push_data_package t1 join (select t.sendTaskId from mt_custom_push_data_package t - where t.sendStatus = 0 + where t.sendStatus = 0 and t.push_type = 2 group by t.sendTaskId limit 1) t2 on t1.sendTaskId = t2.sendTaskId + where t1.push_type = 2 + +