From bacef8016a8beb0c19f47a6eb6e0f8ba65b231db Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Fri, 9 Sep 2022 03:12:29 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=20=E4=BA=A4=E6=8E=A5=E7=82=B9?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=9C=B0=E5=9B=BE=E6=95=B0=E6=8D=AE=E4=B9=9F?= =?UTF-8?q?=E8=83=BD=E5=B1=95=E7=A4=BA=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MapLogisticController.java | 43 +++++++++---------- .../mapper/MapLogisticPointMapper.java | 7 +++ .../service/IMapLogisticPointService.java | 7 +++ .../impl/MapLogisticPointServiceImpl.java | 5 +++ .../mapper/MapLogisticPointMapper.xml | 7 +++ 5 files changed, 46 insertions(+), 23 deletions(-) diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticController.java index a67ae16e..d68861e1 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticController.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticController.java @@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Arrays; import java.util.List; +import java.util.Optional; /** *

@@ -60,29 +61,25 @@ public class MapLogisticController { @GetMapping("getMapDataByCourierUserId/{courierUserId:\\w+}") @ApiOperation(value = "根据收样员id获取地图数据") public R getById(@PathVariable String courierUserId) { - MapLogistic mapLogistic = iMapLogisticService.getOne(Wrappers.lambdaQuery().eq(MapLogistic::getCourierUserId, courierUserId)); - if (ObjectUtil.isNotEmpty(mapLogistic)) { - List mapTaskList = iMapTaskService - .list(Wrappers.lambdaQuery().eq(MapTask::getMapLogisticId, mapLogistic.getId()).orderByAsc(MapTask::getSort)); - mapTaskList.forEach(item -> { - // 需要带上key,前端地图设计器表格是通过唯一key定位行数据,以及保存时通过key绑定地图标记点数据 - item.setKey(item.getId()); - List mapTaskPresetList = iMapTaskPresetService - .list(Wrappers.lambdaQuery().eq(MapTaskPreset::getMapTaskId, item.getId()).orderByAsc(MapTaskPreset::getSort)); - mapTaskPresetList.forEach(childItem -> childItem.setKey(childItem.getId())); - item.setMapTaskPreset(mapTaskPresetList); - }); - List mapLogisticPointList = iMapLogisticPointService - .list(Wrappers.lambdaQuery().eq(MapLogisticPoint::getMapLogisticId, mapLogistic.getId()).orderByAsc(MapLogisticPoint::getSort)); - mapLogisticPointList.forEach(item -> item.setKey(item.getId())); - mapLogistic.setMapTask(mapTaskList); - mapLogistic.setMapLogisticPoint(mapLogisticPointList); - // 针对与没有地图数据的收样员,检查是否有其他收样员设置的交接转办任务 - } else { - - - - } + MapLogistic mapLogistic = Optional.ofNullable(iMapLogisticService + .getOne(Wrappers.lambdaQuery().eq(MapLogistic::getCourierUserId, courierUserId))).orElse(new MapLogistic()); + List mapTaskList = iMapTaskService + .list(Wrappers.lambdaQuery().eq(MapTask::getMapLogisticId, mapLogistic.getId()).orderByAsc(MapTask::getSort)); + mapTaskList.forEach(item -> { + // 需要绑上key,前端地图设计器表格是通过唯一key定位行数据,以及保存时通过key绑定地图标记点数据 + item.setKey(item.getId()); + List mapTaskPresetList = iMapTaskPresetService + .list(Wrappers.lambdaQuery().eq(MapTaskPreset::getMapTaskId, item.getId()).orderByAsc(MapTaskPreset::getSort)); + mapTaskPresetList.forEach(childItem -> childItem.setKey(childItem.getId())); + item.setMapTaskPreset(mapTaskPresetList); + }); + List mapLogisticPointList = iMapLogisticPointService.getTaskPointByCourierUserId(mapLogistic.getCourierUserId()); + List mapTaskPresetLogisticPointList = iMapLogisticPointService.getTaskPresetPointByCourierUserId(mapLogistic.getCourierUserId()); + mapLogisticPointList.forEach(item -> item.setKey(item.getId())); + mapTaskPresetLogisticPointList.forEach(item -> item.setKey(item.getId())); + mapLogistic.setMapTask(mapTaskList); + mapLogistic.setMapLogisticPoint(mapLogisticPointList); + mapLogistic.setMapTaskPresetLogisticPoint(mapTaskPresetLogisticPointList); return R.ok(mapLogistic); } diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapLogisticPointMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapLogisticPointMapper.java index 5c6ebbab..6c792e1a 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapLogisticPointMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapLogisticPointMapper.java @@ -22,4 +22,11 @@ public interface MapLogisticPointMapper extends BaseMapper { */ List getTaskPresetPointByCourierUserId(String courierUserId); + /** + * 获取任务标记点 + * @param courierUserId 快递员id + * @return List + */ + List getTaskPointByCourierUserId(String courierUserId); + } diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapLogisticPointService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapLogisticPointService.java index 2f009c8e..3818c38f 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapLogisticPointService.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapLogisticPointService.java @@ -22,4 +22,11 @@ public interface IMapLogisticPointService extends IService { */ List getTaskPresetPointByCourierUserId(String courierUserId); + /** + * 获取任务标记点 + * @param courierUserId 快递员id + * @return List + */ + List getTaskPointByCourierUserId(String courierUserId); + } diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticPointServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticPointServiceImpl.java index c34b9e4e..ec125dd0 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticPointServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticPointServiceImpl.java @@ -24,4 +24,9 @@ public class MapLogisticPointServiceImpl extends ServiceImpl getTaskPointByCourierUserId(String courierUserId) { + return super.baseMapper.getTaskPointByCourierUserId(courierUserId); + } + } diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapLogisticPointMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapLogisticPointMapper.xml index 2e553f55..996dcd6a 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapLogisticPointMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapLogisticPointMapper.xml @@ -9,4 +9,11 @@ and lp.courier_user_id = #{courierUserId} + +