From 8ca6bed46f6f37d0de80e9487dd0b9143d380bc2 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 3 May 2024 17:35:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:1.=E5=8F=96=E6=B6=88=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=80=81=E7=B3=BB=E7=BB=9F=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E6=97=A5=E5=BF=97=202.=E5=A2=9E=E5=8A=A0=E5=8F=B8=E6=9C=BA?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=9A=84=E9=85=8D=E7=BD=AE=E9=A1=B9=20?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=A4=9A=E4=B8=AA=E5=8F=B8=E6=9C=BA=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E7=9A=84=E5=8A=9F=E8=83=BD=E6=9D=83=E9=99=90=E7=9A=84?= =?UTF-8?q?=E5=9C=BA=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/DistributionSignforClient.java | 1 + .../impl/DistributionDeliveryListServiceImpl.java | 15 ++++++++++++--- .../impl/DistributionSignforServiceImpl.java | 10 +++++++--- .../logpm/oldproject/feign/SignPushClient.java | 13 +++++-------- .../patch/jobhandle/DistributionDatarepair.java | 13 +++++++++---- .../patch/mapper/WarehouseMappingDataMapper.java | 2 +- .../patch/mapper/WarehouseMappingDataMapper.xml | 4 ++++ 7 files changed, 39 insertions(+), 19 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java index 7779e124b..f60ef670f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java @@ -239,6 +239,7 @@ public class DistributionSignforClient implements IDistributionSignforClient { } + log.info(">>>> clerkCheckPushData SignPushDataDTO :{}",delivery); Boolean b = oldSystemDataPushClient.pushOldSystemSignInfo(delivery); return b; } catch (Exception e) { diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 30d59f8d5..299b168c5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -2313,9 +2313,18 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl value = dictBizClient.getValue("role_class", roleId); if (delivery) { 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 0d9c3fbb0..dd9a2386a 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 @@ -93,6 +93,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; +import org.springblade.system.cache.DictBizCache; import org.springblade.system.entity.User; import org.springblade.system.feign.IDictBizClient; import org.springblade.system.feign.IUserClient; @@ -3988,12 +3989,15 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl distributionAppDeliveryListVOS = new ArrayList<>(); - R value = dictBizClient.getValue("role_class", "delivery_driver_new"); +// R value = dictBizClient.getValue("role_class", "delivery_driver_new"); - log.info(">>>>>> 获取配置的司机角色 {}", value.getData()); + String value1 = DictBizCache.getValue("role_class", "delivery_driver_new"); + + + log.info(">>>>>> 获取配置的司机角色 {}", value1); // 得到配置的多个配送角色 - String[] split = value.getData().split(","); + String[] split = value1.split(","); boolean isDriver = false; for (String s : split) { 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 index 5b2346c28..bfa0285ec 100644 --- 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 @@ -30,26 +30,23 @@ public class SignPushClient implements IOldSignPushClient { //todo 这里存在调用老系统的接口 将数据会写给老系统 + Boolean result =false; + log.info(">>>> pushOldSystemSignInfo 程序执行 start time: {}",System.currentTimeMillis()); String authCode = oldLogin(signPushDataDTO.getWarehouseId()+""); - log.info("##################pushOldSystemSignInfo: 请求老系统接口 start map {}", signPushDataDTO); - String url = oldSystemProperties.getUrl() + "openApi/newSystem.OptimsSign/index"; String data = JSON.toJSONString(signPushDataDTO); String body = HttpRequest.post(url).body(data).header("token", authCode).execute().body(); - log.info("##################pushOldSystemSignInfo: 请求老系统接口,url:{},body:{}", url, body); if (StringUtil.isNotBlank(body)) { - JSONObject res = JSON.parseObject(body); if ("200".equals(res.getString("code"))) { - return true; + result= true; } - } + log.info(">>>> pushOldSystemSignInfo 程序执行 end time : {} >> return result :{} ",System.currentTimeMillis(),result); - - return false; + return result; } @Override diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java index f18b73abc..54bfc89d5 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java @@ -18,6 +18,7 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.RabbitConstant; import org.springblade.common.utils.CommonUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.core.tool.utils.StringUtil; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -183,21 +184,25 @@ public class DistributionDatarepair { public ReturnT pushNotification(String params) { // 得到当前仓库所有的签收任务 - List allSignfor = warehouseMappingDataMapper.findAllSignfor(); + Integer parmeId = null; + if(StringUtil.isNotBlank(params)){ + parmeId = Integer.parseInt(params); + } + List allSignfor = warehouseMappingDataMapper.findAllSignfor(parmeId); for (JSONObject entries : allSignfor) { Long id = entries.getLong("singnforId"); Boolean b = distributionSignforClient.clerkCheckPushData(id); - if(b){ + if(b!=null&&b){ warehouseMappingDataMapper.updateClearSignforStatus(id, entries.getLong("warehouseId"), 1); log.info(">>> 推送成功 {}",id); }else{ log.error(">>> 推送失败 id="+id); } + } - } return ReturnT.SUCCESS; @@ -210,7 +215,7 @@ public class DistributionDatarepair { // 得到当前仓库所有的签收任务 - List allSignfor = warehouseMappingDataMapper.findAllSignfor(); + List allSignfor = warehouseMappingDataMapper.findAllSignfor(null); for (JSONObject entries : allSignfor) { Long id = entries.getLong("singnforId"); diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java index a7e01afa9..d728ada61 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java @@ -91,7 +91,7 @@ public interface WarehouseMappingDataMapper { void updatePackageUpdownStatus(@Param("id") Integer id, @Param("syncStatus") Integer syncStatus); - List findAllSignfor(); + List findAllSignfor(@Param("id") Integer id); void updateClearSignforStatus(@Param("singnforId") Long singnforId, @Param("warehouseId") Long warehouseId, @Param("dealStatus") Integer dealStatus); diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml index cc92c108e..1100b8547 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml @@ -276,6 +276,10 @@ warehouse_id warehouseId from clear_singnfor_status_record where deal_status = 0 + + and id > #{id} + +