feat(all): 增加梦天手动回传签收扫描逻辑

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 ;

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<String, Object> 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<String> 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<String, Object> 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;
+	}
+
 }

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<MtPushData> {
 
 	List<JSONObject> customPushNodeData();
+	JSONObject customPushNodeDataScan();
 
 	List<MtReceiveImagesDTO> customPushNodeDataImage(String sendTaskId);
 
-	void customPushNodeDataSended(String sendTaskId);
+	void customPushNodeDataSended(@Param("sendTaskId") String sendTaskId, @Param("pushType") int pushType);
 }

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
+    </select>
+    <select id="customPushNodeDataScan" resultType="cn.hutool.json.JSONObject">
+        select t1.sendTaskId,
+               t1.receiver,
+               t1.orderCode,
+               t1.unitNo,
+               t1.operateDate,
+               t1.warehouseCode,
+               t1.warehouse,
+               t1.invoiceOrderCode,
+               t1.waybillNumber
+          from mt_custom_push_data_package t1
+        where t1.push_type = 1
+        limit 1
     </select>
     <select id="customPushNodeDataImage" resultType="com.logpm.factory.mt.dto.MtReceiveImagesDTO">
         select image
@@ -26,6 +41,6 @@
     <update id="customPushNodeDataSended">
         update mt_custom_push_data_package
            set sendStatus = 1
-         where sendTaskId = #{sendTaskId}
+         where sendTaskId = #{sendTaskId} and push_type = #{pushType}
     </update>
 </mapper>