From d7ca520b4680df9d53b3ec4ff5dee0a4b60d2d9c Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080> Date: Sat, 2 Dec 2023 18:23:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AC=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=93=81=E6=97=A0=E8=AE=A2=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionParcelListServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index 308d69ab0..3bf59904b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -659,7 +659,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl Date: Mon, 4 Dec 2023 13:58:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E5=9B=9E=E6=8E=A8=E8=80=81=E7=B3=BB=E7=BB=9F=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 2435b1566..a7af5303b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -2970,7 +2970,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>>>>>> 推送老系统 的签收数据 {} ",distributionSignfor); - //rabbitTemplate.convertAndSend(RabbitConstant.CLERK_CHECK_PUSH_DATA_EXCHANGE, RabbitConstant.CLERK_CHECK_PUSH_DATA_ROUTING, map); + rabbitTemplate.convertAndSend(RabbitConstant.CLERK_CHECK_PUSH_DATA_EXCHANGE, RabbitConstant.CLERK_CHECK_PUSH_DATA_ROUTING, map); } From 9e29e09caef2f7a72adbded9eab74bbeb25c1931 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 4 Dec 2023 14:24:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionSignforServiceImpl.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index a7af5303b..5fe01845e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -3028,24 +3028,39 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>>> handlePicture {}",1); if (Func.isEmpty(ids)){ log.error("#########ids字段缺失:{}",ids); } List signIds = Func.toLongList(",", ids); List reservationCodes= new ArrayList<>(); + log.info(">>>>>> handlePicture {}",2); + List distributionSignforEntities = this.listByIds(signIds); + log.info(">>>>>> handlePicture {}",3); + if (Func.isNotEmpty(distributionSignforEntities)) { for (DistributionSignforEntity distributionSignforEntity : distributionSignforEntities) { + log.info(">>>>>> handlePicture {}",3-1); + DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(distributionSignforEntity.getReservationId()); + log.info(">>>>>> handlePicture {}",3-2); + List printEntities = baseMapper.selectSignImgsUrl(distributionSignforEntity.getReservationId()); + log.info(">>>>>> handlePicture {}",3-3); + if (Func.isNotEmpty(printEntities)){ //进行分组 Map> signingPictureGroup = printEntities.stream().collect(Collectors.groupingBy(DistributionSignPrintVO::getType)); + log.info(">>>>>> handlePicture {}",3-4); //进行图片 signingPictureGroup.forEach((k,v)->{ + log.info(">>>>>> handlePicture {}",3-5); //这个方法会根据 List urls = v.stream().map(DistributionSignPrintVO::getUrlRoute).collect(Collectors.toList()); + log.info(">>>>>> handlePicture {}",3-6); FileUtil.handleSignPictureZip(urls, k, distributionReservationEntity.getReservationCode(), distributionReservationEntity.getConsignee()); + log.info(">>>>>> handlePicture {}",3-7); }); //拼接ReservationCode @@ -3054,8 +3069,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>>> handlePicture {}",5); + //将指定的文件进行压缩 String fileName = FileUtil.reservationPictureFileToZip(String.join(",",reservationCodes)); + log.info(">>>>>> handlePicture {}",6); //获得压缩后的文件进行前端下载数据推送 File file = FileUtil.getZipFile(fileName);