diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index 75e254ecf..d6ed5119b 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -8,12 +8,13 @@ public interface ModuleNameConstant { /** * 如果不需要 "" */ - public static final String DEVAUTH =""; + public static final String DEVAUTH ="-pref"; /** * 工厂对接服务名称 */ String APPLICATION_FACTORY_NAME = "logpm-factory"+DEVAUTH; + /** * 工厂对接服务名称 */ diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataContactDTO.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataContactDTO.java new file mode 100644 index 000000000..b3a6107c8 --- /dev/null +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataContactDTO.java @@ -0,0 +1,71 @@ +package com.logpm.oldproject.dto; + +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * 签收客户 + */ +@Data +public class SignPushDataContactDTO { + + /** + * 联系人 + */ + private String contact; + /** + * 电话 + */ + private String phone; + /** + * 地址 + */ + private String address; + + /** + * 配送id + */ + private Long distribution_id; + /** + * 计划装车数 + */ + private int plan; + + /** + * 实际装车数 + */ + private int actual_plan; + + /** + * 配送数 + */ + private int delivery; + /** + * 签收数 + */ + private int sign; + + /** + * 签收状态：1=未签;2=已签 + */ + private int state; + /** + * 创建时间 + */ + private Date create_time; + /** + * 更新时间 + */ + private Date update_time; + + + /** + *签收包条数据 + */ + + private List signPushDataUnitDTOs; + + +} diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataDTO.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataDTO.java new file mode 100644 index 000000000..80593f0c5 --- /dev/null +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataDTO.java @@ -0,0 +1,121 @@ +package com.logpm.oldproject.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; +import java.util.List; + +@Data +public class SignPushDataDTO { + + /** + * id + */ + private long id; + /** + * 仓库名称 + */ + private String warehouse_name; + + /** + * 仓库id + */ + private long warehouse_id; + /** + * 出库方式：1=市配，2=商配，3=自提 + */ + private int type; + /** + * 车牌号 + */ + private String car; + /** + * 车次号 + */ + private String trans_no; + /** + * 出库人ID + */ + private int out_to_id; + + /** + * 出库人 + */ + private String out_to_name; + /** + * 出库时间 + */ + private Date out_to_time; + /** + * 配送时间 + */ + private Date out_time; + /** + * 配送人id + */ + private long out_id; + + /** + * 配送人 + */ + private String out_name; + /** + * 配送人电话 + */ + private String out_phone; + + /** + * 状态：0=未发车，1=已发车【无效，已取消装车概念】 + */ + private int status; + + /** + * 计划装车数 + */ + private int plan; + + /** + * 实际装车数 + */ + private int actual_plan; + + /** + * 备货数 + */ + private int make_num; + /** + * 配送数 + */ + private int delivery; + /** + * 签收数 + */ + private int sign; + + /** + * 完成状态：1=待配送；2=部分签收；3=已签收 + */ + private int finish_state; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 操作人 + */ + private Long administrators_id; + + /** + * 操作人 + */ + private String administrators_name; + + /** + * 签收客户集合 + */ + private List signPushDataContactDTOs; + +} diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataUnitDTO.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataUnitDTO.java new file mode 100644 index 000000000..c5cc7272e --- /dev/null +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataUnitDTO.java @@ -0,0 +1,112 @@ +package com.logpm.oldproject.dto; + +import lombok.Data; + +import java.util.Date; + +/** + * 签收订单和包件信息 + */ +@Data +public class SignPushDataUnitDTO { + + + private long id; + /** + * 仓库ID + */ + private long warehouse_id; + /** + * 配送外围/市配/自提姓名id + */ + private long distribution_contact_id; + /** + * 配送ID + */ + private long distribution_id; + + /** + * 配送车次号 + */ + private String trans_no; + + /** + * 运单号 + */ + private String waybill_no; + + /** + * 订单自编号 + */ + private String orderSelfNum; + + /** + * 包条码 + */ + private String unitNo; + + /** + * 类型：0=已计划,1=装车，2=签收 + */ + private int type; + + + /** + * 是否装车:0=未装车,1=已装车 + */ + private int is_loading; + + /** + * 装车时间 + */ + private Date loading_time; + /** + * 签收时间 + */ + private Date sign_time; + + /** + * 0未下架;1已下架 + */ + private int is_out; + + /** + * 创建时间 + */ + private Date create_time; + + /** + * 更新时间 + */ + private Date update_time; + /** + * 删除时间 + */ + private Date delete_time; + + /** + * 数量 + */ + private int num; + + /** + * 货物类型:1=包件，2=零担 + */ + private int goods_type; + /** + * 签收数量 + */ + private int sign_num; + + /** + * 创建人 + */ + private long administrators_id; + + /** + * 标识状态：1=标记[无用]，2=pda回库，3=pc回库，4=pda签收,5=pc签收 + */ + private int broke_state; + + +} diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/ISignPushClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/ISignPushClient.java new file mode 100644 index 000000000..ce0c497dc --- /dev/null +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/ISignPushClient.java @@ -0,0 +1,22 @@ +package com.logpm.oldproject.feign; + +import com.logpm.oldproject.dto.SignPushDataDTO; +import org.springblade.common.constant.ModuleNameConstant; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 新系统签收数据推送老系统 + */ +@FeignClient( + value = ModuleNameConstant.APPLICATION_OLDPROJECT_NAME +) +public interface ISignPushClient { + + + String API_PREFIX = "/client"; + + @PostMapping(API_PREFIX + "/pushOldSystemSignInfo") + Boolean pushOldSystemSignInfo(@RequestBody SignPushDataDTO signPushDataDTO); +} diff --git a/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java b/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java index 85a1f8479..a55247823 100644 --- a/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java +++ b/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java @@ -395,220 +395,253 @@ public class TestService { // ahsv.add("{\"送货任务ID\":\"215750\",\"收货人\":\"李小飞\",\"签收内容\":[{\"订单编号\":\"cqtkzs01DS-20507-0\",\"包条码\":\"CQTKZS01DS205070001\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231011\"},{\"订单编号\":\"cqtkzs01DS-20507-0\",\"包条码\":\"CQTKZS01DS205070002\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231011\"},{\"订单编号\":\"cqtkzs01DS-20507-0\",\"包条码\":\"CQTKZS01DS205070003\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231011\"},{\"订单编号\":\"cqtkzs01DS-20507-0\",\"包条码\":\"CQTKZS01DS205070004\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231011\"},{\"订单编号\":\"cqtkzs01DS-20507-0\",\"包条码\":\"CQTKZS01DS205070005\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231011\"},{\"订单编号\":\"cqtkzs01DS-20507-0\",\"包条码\":\"CQTKZS01DS205070006\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231011\"},{\"订单编号\":\"cqtkzs01DS-20511-0\",\"包条码\":\"CQTKZS01DS205110001\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231024\"},{\"订单编号\":\"cqtkzs01DS-20511-0\",\"包条码\":\"CQTKZS01DS205110002\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231024\"},{\"订单编号\":\"cqtkzs01DS-20511-0\",\"包条码\":\"CQTKZS01DS205110003\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231024\"},{\"订单编号\":\"cqtkzs01DS-20511-0\",\"包条码\":\"CQTKZS01DS205110004\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231024\"},{\"订单编号\":\"cqtkzs01DS-20511-0\",\"包条码\":\"CQTKZS01DS205110005\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231024\"},{\"订单编号\":\"cqtkzs01DS-20511-0\",\"包条码\":\"CQTKZS01DS205110006\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231024\"},{\"订单编号\":\"cqxdsmj01DS-20053-0\",\"包条码\":\"CQXDSMJ01DS200530001\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230939\"},{\"订单编号\":\"cqxdsmj01DS-20053-0\",\"包条码\":\"CQXDSMJ01DS200530002\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230939\"},{\"订单编号\":\"cqxdsmj01DS-20053-0\",\"包条码\":\"CQXDSMJ01DS200530003\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230939\"},{\"订单编号\":\"cqxdsmj01DS-20053-0\",\"包条码\":\"CQXDSMJ01DS200530004\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230939\"},{\"订单编号\":\"cqxdsmj01DS-20053-0\",\"包条码\":\"CQXDSMJ01DS200530005\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230939\"},{\"订单编号\":\"cqxdsmj01DS-20053-0\",\"包条码\":\"CQXDSMJ01DS200530006\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230939\"},{\"订单编号\":\"cqxdsmj01DS-20053-0\",\"包条码\":\"CQXDSMJ01DS200530007\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230939\"},{\"订单编号\":\"cqxdsmj01DS-20053-0\",\"包条码\":\"CQXDSMJ01DS200530008\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230939\"},{\"订单编号\":\"cqxdsmj01DS-20053-0\",\"包条码\":\"CQXDSMJ01DS200530009\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230939\"},{\"订单编号\":\"cqxdsmj01DS-20065-0\",\"包条码\":\"CQXDSMJ01DS200650001\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230949\"},{\"订单编号\":\"cqxdsmj01DS-20065-0\",\"包条码\":\"CQXDSMJ01DS200650002\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230949\"},{\"订单编号\":\"cqxdsmj01DS-20065-0\",\"包条码\":\"CQXDSMJ01DS200650003\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230949\"},{\"订单编号\":\"cqxdsmj01DS-20065-0\",\"包条码\":\"CQXDSMJ01DS200650004\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230949\"},{\"订单编号\":\"cqxdsmj01DS-20065-0\",\"包条码\":\"CQXDSMJ01DS200650005\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230949\"},{\"订单编号\":\"cqxdsmj01DS-20065-0\",\"包条码\":\"CQXDSMJ01DS200650006\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230949\"},{\"订单编号\":\"cqxdsmj01DS-20065-0\",\"包条码\":\"CQXDSMJ01DS200650007\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230949\"}],\"签收图片\":[{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/7d5d379d8150f763930d1a91d182b7d2.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/7d5d379d8150f763930d1a91d182b7d2.jpg\"}]}"); ahsv.add("{\n" + - " \"送货任务ID\": \"218895\",\n" + + " \"送货任务ID\": \"218360\",\n" + " \"收货人\": \"王舰\",\n" + " \"签收内容\": [\n" + " \n" + - " \n" + - " \n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20531-0\",\n" + - " \"包条码\": \"CQTKZS01DS205310001\",\n" + + " \"订单编号\": \"cqtkzs01DS-20469-0\",\n" + + " \"包条码\": \"CQTKZS01DS204690001\",\n" + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-231064\"\n" + + " \"发货单编号\": \"HYLEJIA-230969\"\n" + " },\n" + - " {\n" + - " \"订单编号\": \"cqtkzs01DS-20531-0\",\n" + - " \"包条码\": \"CQTKZS01DS205310002\",\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20469-0\",\n" + + " \"包条码\": \"CQTKZS01DS204690002\",\n" + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-231064\"\n" + + " \"发货单编号\": \"HYLEJIA-230969\"\n" + " },\n" + + " \n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20531-0\",\n" + - " \"包条码\": \"CQTKZS01DS205310003\",\n" + + " \"订单编号\": \"cqtkzs01DS-20469-0\",\n" + + " \"包条码\": \"CQTKZS01DS204690003\",\n" + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-231064\"\n" + + " \"发货单编号\": \"HYLEJIA-230969\"\n" + " },\n" + - " {\n" + - " \"订单编号\": \"cqtkzs01DS-20531-0\",\n" + - " \"包条码\": \"CQTKZS01DS205310004\",\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20469-0\",\n" + + " \"包条码\": \"CQTKZS01DS204690004\",\n" + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-231064\"\n" + + " \"发货单编号\": \"HYLEJIA-230969\"\n" + " },\n" + - " {\n" + - " \"订单编号\": \"cqtkzs01DS-20531-0\",\n" + - " \"包条码\": \"CQTKZS01DS205310005\",\n" + + " \n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20469-0\",\n" + + " \"包条码\": \"CQTKZS01DS204690005\",\n" + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-231064\"\n" + + " \"发货单编号\": \"HYLEJIA-230969\"\n" + " },\n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20531-0\",\n" + - " \"包条码\": \"CQTKZS01DS205310006\",\n" + + " \"订单编号\": \"cqtkzs01DS-20469-0\",\n" + + " \"包条码\": \"CQTKZS01DS204690006\",\n" + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-231064\"\n" + + " \"发货单编号\": \"HYLEJIA-230969\"\n" + " },\n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20531-0\",\n" + - " \"包条码\": \"CQTKZS01DS205310007\",\n" + + " \"订单编号\": \"cqtkzs01DS-20469-0\",\n" + + " \"包条码\": \"CQTKZS01DS204690007\",\n" + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-231064\"\n" + + " \"发货单编号\": \"HYLEJIA-230969\"\n" + " },\n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20563-0\",\n" + - " \"包条码\": \"CQTKZS01DS205630001\",\n" + + " \"订单编号\": \"cqtkzs01DS-20469-0\",\n" + + " \"包条码\": \"CQTKZS01DS204690008\",\n" + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-230969\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20550-0\",\n" + + " \"包条码\": \"CQTKZS01DS205500001\",\n" + + " \"签收时间\": \"2023-11-10 17:27:56\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + " \"发货单编号\": \"HYLEJIA-231105\"\n" + " },\n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20476-0\",\n" + - " \"包条码\": \"CQTKZS01DS204760001\",\n" + - " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"订单编号\": \"cqtkzs01DS-20550-0\",\n" + + " \"包条码\": \"CQTKZS01DS205500002\",\n" + + " \"签收时间\": \"2023-11-10 17:27:56\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-230969\"\n" + + " \"发货单编号\": \"HYLEJIA-231105\"\n" + " },\n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20476-0\",\n" + - " \"包条码\": \"CQTKZS01DS204760002\",\n" + - " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"订单编号\": \"cqtkzs01DS-20550-0\",\n" + + " \"包条码\": \"CQTKZS01DS205500003\",\n" + + " \"签收时间\": \"2023-11-10 17:27:56\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-230969\"\n" + + " \"发货单编号\": \"HYLEJIA-231105\"\n" + " },\n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20476-0\",\n" + - " \"包条码\": \"CQTKZS01DS204760003\",\n" + - " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"订单编号\": \"cqtkzs01DS-20550-0\",\n" + + " \"包条码\": \"CQTKZS01DS205500004\",\n" + + " \"签收时间\": \"2023-11-10 17:27:56\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-230969\"\n" + + " \"发货单编号\": \"HYLEJIA-231105\"\n" + " },\n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20476-0\",\n" + - " \"包条码\": \"CQTKZS01DS204760004\",\n" + - " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"订单编号\": \"cqtkzs01DS-20550-0\",\n" + + " \"包条码\": \"CQTKZS01DS205500005\",\n" + + " \"签收时间\": \"2023-11-10 17:27:56\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-230969\"\n" + + " \"发货单编号\": \"HYLEJIA-231105\"\n" + " },\n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20476-0\",\n" + - " \"包条码\": \"CQTKZS01DS204760005\",\n" + - " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"订单编号\": \"cqtkzs01DS-20550-0\",\n" + + " \"包条码\": \"CQTKZS01DS205500006\",\n" + + " \"签收时间\": \"2023-11-10 17:27:56\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-230969\"\n" + + " \"发货单编号\": \"HYLEJIA-231105\"\n" + " },\n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20476-0\",\n" + - " \"包条码\": \"CQTKZS01DS204760006\",\n" + - " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"订单编号\": \"cqtkzs01DS-20550-0\",\n" + + " \"包条码\": \"CQTKZS01DS205500007\",\n" + + " \"签收时间\": \"2023-11-10 17:27:56\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-230969\"\n" + + " \"发货单编号\": \"HYLEJIA-231105\"\n" + " },\n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20476-0\",\n" + - " \"包条码\": \"CQTKZS01DS204760007\",\n" + - " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"订单编号\": \"cqtkzs01DS-20556-0\",\n" + + " \"包条码\": \"CQTKZS01DS205560001\",\n" + + " \"签收时间\": \"2023-11-10 17:27:58\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-230969\"\n" + + " \"发货单编号\": \"HYLEJIA-231105\"\n" + " },\n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20476-0\",\n" + - " \"包条码\": \"CQTKZS01DS204760008\",\n" + - " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"订单编号\": \"cqtkzs01DS-20556-0\",\n" + + " \"包条码\": \"CQTKZS01DS205560002\",\n" + + " \"签收时间\": \"2023-11-10 17:27:58\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-230969\"\n" + + " \"发货单编号\": \"HYLEJIA-231105\"\n" + " },\n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20476-0\",\n" + - " \"包条码\": \"CQTKZS01DS204760009\",\n" + - " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"订单编号\": \"cqtkzs01DS-20556-0\",\n" + + " \"包条码\": \"CQTKZS01DS205560003\",\n" + + " \"签收时间\": \"2023-11-10 17:27:58\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-230969\"\n" + + " \"发货单编号\": \"HYLEJIA-231105\"\n" + " },\n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20476-0\",\n" + - " \"包条码\": \"CQTKZS01DS204760010\",\n" + - " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"订单编号\": \"cqtkzs01DS-20556-0\",\n" + + " \"包条码\": \"CQTKZS01DS205560004\",\n" + + " \"签收时间\": \"2023-11-10 17:27:58\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-230969\"\n" + + " \"发货单编号\": \"HYLEJIA-231105\"\n" + " },\n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20539-0\",\n" + - " \"包条码\": \"CQTKZS01DS205390001\",\n" + - " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"订单编号\": \"cqtkzs01DS-20556-0\",\n" + + " \"包条码\": \"CQTKZS01DS205560005\",\n" + + " \"签收时间\": \"2023-11-10 17:27:58\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-231075\"\n" + + " \"发货单编号\": \"HYLEJIA-231105\"\n" + " },\n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20539-0\",\n" + - " \"包条码\": \"CQTKZS01DS205390002\",\n" + - " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"订单编号\": \"cqtkzs01DS-20556-0\",\n" + + " \"包条码\": \"CQTKZS01DS205560006\",\n" + + " \"签收时间\": \"2023-11-10 17:27:58\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-231075\"\n" + + " \"发货单编号\": \"HYLEJIA-231105\"\n" + " },\n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20539-0\",\n" + - " \"包条码\": \"CQTKZS01DS205390003\",\n" + - " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"订单编号\": \"cqtkzs01DS-20556-0\",\n" + + " \"包条码\": \"CQTKZS01DS205560007\",\n" + + " \"签收时间\": \"2023-11-10 17:27:58\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-231105\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20556-0\",\n" + + " \"包条码\": \"CQTKZS01DS205560008\",\n" + + " \"签收时间\": \"2023-11-10 17:27:58\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-231075\"\n" + + " \"发货单编号\": \"HYLEJIA-231105\"\n" + " },\n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20539-0\",\n" + - " \"包条码\": \"CQTKZS01DS205390004\",\n" + - " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"订单编号\": \"cqxdzs01DS-20589-0\",\n" + + " \"包条码\": \"CQXDZS01DS205890001\",\n" + + " \"签收时间\": \"2023-11-10 17:28:01\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-231075\"\n" + + " \"发货单编号\": \"HYLEJIA-230949\"\n" + " },\n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20539-0\",\n" + - " \"包条码\": \"CQTKZS01DS205390005\",\n" + - " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"订单编号\": \"cqxdzs01DS-20589-0\",\n" + + " \"包条码\": \"CQXDZS01DS205890002\",\n" + + " \"签收时间\": \"2023-11-10 17:28:01\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-231075\"\n" + + " \"发货单编号\": \"HYLEJIA-230949\"\n" + " },\n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20539-0\",\n" + - " \"包条码\": \"CQTKZS01DS205390006\",\n" + - " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"订单编号\": \"cqxdzs01DS-20589-0\",\n" + + " \"包条码\": \"CQXDZS01DS205890003\",\n" + + " \"签收时间\": \"2023-11-10 17:28:01\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-231075\"\n" + + " \"发货单编号\": \"HYLEJIA-230949\"\n" + " },\n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20539-0\",\n" + - " \"包条码\": \"CQTKZS01DS205390007\",\n" + - " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"订单编号\": \"cqxdzs01DS-20589-0\",\n" + + " \"包条码\": \"CQXDZS01DS205890004\",\n" + + " \"签收时间\": \"2023-11-10 17:28:01\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-231075\"\n" + + " \"发货单编号\": \"HYLEJIA-230949\"\n" + " },\n" + " {\n" + - " \"订单编号\": \"cqtkzs01DS-20539-0\",\n" + - " \"包条码\": \"CQTKZS01DS205390008\",\n" + - " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"订单编号\": \"cqxdzs01DS-20589-0\",\n" + + " \"包条码\": \"CQXDZS01DS205890005\",\n" + + " \"签收时间\": \"2023-11-10 17:28:01\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-230949\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqxdzs01DS-20589-0\",\n" + + " \"包条码\": \"CQXDZS01DS205890006\",\n" + + " \"签收时间\": \"2023-11-10 17:28:01\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-230949\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqxdzs01DS-20589-0\",\n" + + " \"包条码\": \"CQXDZS01DS205890007\",\n" + + " \"签收时间\": \"2023-11-10 17:28:01\",\n" + " \"仓库编号\": \"CQZXC\",\n" + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + - " \"发货单编号\": \"HYLEJIA-231075\"\n" + + " \"发货单编号\": \"HYLEJIA-230949\"\n" + " }\n" + + " \n" + " ],\n" + " \"签收图片\": [\n" + " {\n" + @@ -618,7 +651,7 @@ public class TestService { " \"image\": \"http://htys.oss-cn-chengdu.aliyuncs.com/htys/f5beded80c8cec8bae63cd06ec02182e.jpg\"\n" + " }\n" + " ]\n" + - "}"); + "}\n"); @@ -653,7 +686,7 @@ public class TestService { // String data ="{\"送货任务ID\":\"209826\",\"收货人\":\"陈洁\",\"签收内容\":[{\"订单编号\":\"scxblzs01DS-20178-0\",\"包条码\":\"SCXBLZS01DS201780001\",\"签收时间\":\"2023-10-26 15:19:14\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231016\"},{\"订单编号\":\"scxblzs01DS-20178-0\",\"包条码\":\"SCXBLZS01DS201780002\",\"签收时间\":\"2023-10-26 15:19:14\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231016\"},{\"订单编号\":\"scxblzs01DS-20178-0\",\"包条码\":\"SCXBLZS01DS201780003\",\"签收时间\":\"2023-10-26 15:19:14\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231016\"},{\"订单编号\":\"scxblzs01DS-20178-0\",\"包条码\":\"SCXBLZS01DS201780004\",\"签收时间\":\"2023-10-26 15:19:14\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231016\"},{\"订单编号\":\"scxblzs01DS-20178-0\",\"包条码\":\"SCXBLZS01DS201780005\",\"签收时间\":\"2023-10-26 15:19:14\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231016\"},{\"订单编号\":\"scxblzs01DS-20178-0\",\"包条码\":\"SCXBLZS01DS201780006\",\"签收时间\":\"2023-10-26 15:19:14\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231016\"},{\"订单编号\":\"scxblzs01DS-20178-0\",\"包条码\":\"SCXBLZS01DS201780007\",\"签收时间\":\"2023-10-26 15:19:14\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231016\"},{\"订单编号\":\"scxblzs01DS-20178-0\",\"包条码\":\"SCXBLZS01DS201780008\",\"签收时间\":\"2023-10-26 15:19:14\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231016\"},{\"订单编号\":\"scxblzs01DS-20178-0\",\"包条码\":\"SCXBLZS01DS201780009\",\"签收时间\":\"2023-10-26 15:19:14\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231016\"}],\"签收图片\":[{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/d087dde59e2d8bebe7e9190fb60ca895.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/9758dab686a42f895cd2fecab30cd33f.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/23b2075a896169601f3013e552d42b2b.jpg\"}]}"; - String token = "AMiwQcwT33JksqEfDeRFbrZl7/QQJUBnW4JG15rpt0RAjGQVZ1IikBGOdXFog0BUPYQo+K6rUwoJ53u58Bv85A=="; + String token = "AMiwQcwT33JksqEfDeRFbrS0U3AMqTekQvprID1bvwL3mG2Rf+kVZqcdnu5IOvUUPYQo+K6rUwoJ53u58Bv85A=="; //处理逻辑 String result = HttpRequest.post(url) .header("APPKEY", appkey) diff --git a/blade-service/logpm-old-project/pom.xml b/blade-service/logpm-old-project/pom.xml index c34c39e7d..4d509a622 100644 --- a/blade-service/logpm-old-project/pom.xml +++ b/blade-service/logpm-old-project/pom.xml @@ -24,10 +24,10 @@ blade-starter-swagger - - - - + + org.springframework.boot + spring-boot-starter-amqp + diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/config/RabbitMqConfiguration.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/config/RabbitMqConfiguration.java index 353ebe67c..1e3d0af9e 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/config/RabbitMqConfiguration.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/config/RabbitMqConfiguration.java @@ -1,4 +1,3 @@ -/* package com.logpm.oldproject.config; import com.alibaba.nacos.shaded.com.google.common.collect.Maps; @@ -15,12 +14,6 @@ import org.springframework.context.annotation.Configuration; import java.util.Map; -*/ -/** - * RabbitMQ配置，主要是配置队列，如果提前存在该队列，可以省略本配置类 - * - * @author yangkai.shen - *//* @Slf4j @Configuration @@ -37,19 +30,7 @@ public class RabbitMqConfiguration { System.out.println("确认回调-相关数据："+correlationData); System.out.println("确认回调-确认情况："+b); System.out.println("确认回调-原因："+s); -// Long id = Long.parseLong(correlationData.getId()); -// UpdateWrapper updateWrapper = new UpdateWrapper<>(); -// if(b){ -// //修改处理日志为已处理 -// updateWrapper.set("status",0) -// .eq("id",id); -// -// }else{ -// //修改处理日志为已处理 -// updateWrapper.set("status",2) -// .eq("id",id); -// } -// panOrderStatusLogService.update(updateWrapper); + } }); @@ -79,12 +60,7 @@ public class RabbitMqConfiguration { return BindingBuilder.bind(errorQueue).to(errorMessageExchange).with(RabbitConstant.ERROR_ROUTING); } - */ -/** - * 消费失败队列 - * @param rabbitTemplate - * @return - *//* + @Bean public MessageRecoverer republishMessageRecoverer(RabbitTemplate rabbitTemplate){ @@ -92,20 +68,15 @@ public class RabbitMqConfiguration { } - */ -/** - * 延迟队列 - *//* + + @Bean public Queue orderStatusQueue() { return new Queue(RabbitConstant.ORDER_STATUS_QUEUE, true); } - */ -/** - * 延迟队列交换器, x-delayed-type 和 x-delayed-message 固定 - *//* + @Bean public CustomExchange orderStatusExchange() { @@ -114,13 +85,6 @@ public class RabbitMqConfiguration { return new CustomExchange(RabbitConstant.ORDER_STATUS_EXCHANGE, "x-delayed-message", true, false, args); } - */ -/** - * 延迟队列绑定自定义交换器 - * - * @param orderStatusQueue 队列 - * @param orderStatusExchange 延迟交换器 - *//* @Bean public Binding orderStatusBinding(Queue orderStatusQueue, CustomExchange orderStatusExchange) { @@ -134,4 +98,3 @@ public class RabbitMqConfiguration { } -*/ diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/SignPushClient.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/SignPushClient.java new file mode 100644 index 000000000..fd2bdaf2f --- /dev/null +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/SignPushClient.java @@ -0,0 +1,21 @@ +package com.logpm.oldproject.feign; + +import com.logpm.oldproject.dto.SignPushDataDTO; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +@ApiIgnore() +@RestController +@AllArgsConstructor +public class SignPushClient implements ISignPushClient{ + @Override + public Boolean pushOldSystemSignInfo(SignPushDataDTO signPushDataDTO) { + + //todo 这里存在调用老系统的接口 将数据会写给老系统 + + + + return null; + } +} diff --git a/blade-service/logpm-old-project/src/main/resources/application-dev.yml b/blade-service/logpm-old-project/src/main/resources/application-dev.yml index f62747cdb..2a188cdd7 100644 --- a/blade-service/logpm-old-project/src/main/resources/application-dev.yml +++ b/blade-service/logpm-old-project/src/main/resources/application-dev.yml @@ -10,6 +10,31 @@ server: # password: ${blade.datasource.dev.password} spring: + rabbitmq: + host: 192.168.10.100 + port: 5672 + username: admin + password: admin + #虚拟host 可以不设置,使用server默认host + virtual-host: / + #确认消息已发送到队列(Queue) + publisher-returns: true + publisher-confirm-type: correlated + # 手动提交消息 + listener: + simple: + acknowledge-mode: auto + default-requeue-rejected: false + retry: + enabled: true # 开启消费者失败重试 + initial-interval: 1000 # 初识的失败等待时长为1秒 + multiplier: 1 # 失败的等待时长倍数，下次等待时长 = multiplier * last-interval + max-attempts: 3 # 最大重试次数 + stateless: true # true无状态；false有状态。如果业务中包含事务，这里改为false + direct: + acknowledge-mode: manual + template: + mandatory: true #排除DruidDataSourceAutoConfigure autoconfigure: exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure