🚀 地图设计器调整完毕

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticController.java

@@ -1,20 +1,29 @@
 package com.cloud.kicc.commonbiz.controller;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.commonbiz.api.entity.MapLogistic;
+import com.cloud.kicc.commonbiz.api.entity.MapLogisticPoint;
+import com.cloud.kicc.commonbiz.api.entity.MapTask;
+import com.cloud.kicc.commonbiz.api.entity.MapTaskPreset;
+import com.cloud.kicc.commonbiz.service.IMapLogisticPointService;
 import com.cloud.kicc.commonbiz.service.IMapLogisticService;
+import com.cloud.kicc.commonbiz.service.IMapTaskPresetService;
+import com.cloud.kicc.commonbiz.service.IMapTaskService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * <p>
@@ -31,6 +40,9 @@ import java.util.Arrays;
 public class MapLogisticController {
 
     private final IMapLogisticService iMapLogisticService;
+    private final IMapTaskService iMapTaskService;
+    private final IMapTaskPresetService iMapTaskPresetService;
+    private final IMapLogisticPointService iMapLogisticPointService;
 
     private LambdaQueryWrapper<MapLogistic> getQueryWrapper(MapLogistic mapLogistic) {
         return new LambdaQueryWrapper<MapLogistic>()
@@ -47,10 +59,32 @@ public class MapLogisticController {
         return R.ok(iPage.getRecords(), iPage.getTotal());
     }
 
-    @GetMapping("/{id:\\w+}")
+    @GetMapping("/{courierUserId:\\w+}")
-    @ApiOperation(value = "根据id获取")
+    @ApiOperation(value = "根据收样员id获取地图数据")
-    public R getById(@PathVariable("id") String id) {
+    public R getById(@PathVariable String courierUserId) {
-        MapLogistic mapLogistic = iMapLogisticService.getById(id);
+        MapLogistic mapLogistic = iMapLogisticService.getOne(Wrappers.<MapLogistic>lambdaQuery().eq(MapLogistic::getCourierUserId, courierUserId));
+        if (ObjectUtil.isNotEmpty(mapLogistic)) {
+            List<MapTask> mapTaskList = iMapTaskService
+                    .list(Wrappers.<MapTask>lambdaQuery().eq(MapTask::getMapLogisticId, mapLogistic.getId()));
+            mapTaskList.forEach(item -> {
+                item.setKey(item.getId());
+                List<MapTaskPreset> mapTaskPresetList = iMapTaskPresetService
+                        .list(Wrappers.<MapTaskPreset>lambdaQuery().eq(MapTaskPreset::getMapTaskId, item.getId()));
+                mapTaskPresetList.forEach(childItem -> {
+                    childItem.setKey(childItem.getId());
+                });
+                item.setMapTaskPreset(mapTaskPresetList);
+            });
+
+            List<MapLogisticPoint> mapLogisticPointList = iMapLogisticPointService
+                    .list(Wrappers.<MapLogisticPoint>lambdaQuery().eq(MapLogisticPoint::getMapLogisticId, mapLogistic.getId()));
+            mapLogisticPointList.forEach(item -> {
+                item.setKey(item.getId());
+            });
+
+            mapLogistic.setMapTask(mapTaskList);
+            mapLogistic.setMapLogisticPoint(mapLogisticPointList);
+        }
         return R.ok(mapLogistic);
     }
 

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticServiceImpl.java

@@ -13,12 +13,9 @@ import com.cloud.kicc.commonbiz.service.IMapLogisticService;
 import com.cloud.kicc.commonbiz.service.IMapTaskPresetService;
 import com.cloud.kicc.commonbiz.service.IMapTaskService;
 import lombok.RequiredArgsConstructor;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Optional;
-
 /**
  * <p>
  * 地图核心主任务表 服务实现类
@@ -48,13 +45,12 @@ public class MapLogisticServiceImpl extends ServiceImpl<MapLogisticMapper, MapLo
             mapTask.setMapLogisticId(mapLogistic.getId());
             iMapTaskService.save(mapTask);
             // 匹配查找跟地图任务关联的地图标记点数据
-            MapLogisticPoint mapLogisticPoint = mapLogistic.getMapLogisticPoint().stream()
+            mapLogistic.getMapLogisticPoint().stream()
-                    .filter(item -> item.getKey().equals("1")).findFirst().get();
+            .filter(item -> item.getKey().equals(mapTask.getKey())).findFirst().ifPresent(item -> {
-            if (ObjectUtil.isNotEmpty(mapLogisticPoint)){
+                item.setMapLogisticId(mapLogistic.getId());
-                mapLogisticPoint.setMapLogisticId(mapLogistic.getId());
+                item.setMapTaskId(mapTask.getId());
-                mapLogisticPoint.setMapTaskId(mapTask.getId());
+                iMapLogisticPointService.save(item);
-                iMapLogisticPointService.save(mapLogisticPoint);
+            });
-            }
             if (ObjectUtil.isNotEmpty(mapTask.getMapTaskPreset())) {
                 mapTask.getMapTaskPreset().forEach(mapTaskPreset -> {
                     mapTaskPreset.setMapLogisticId(mapLogistic.getId());