mapLogisticPoints;
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/LogisticMapController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/LogisticMapController.java
index 19f5db1c..2e759e44 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/LogisticMapController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/LogisticMapController.java
@@ -1,10 +1,18 @@
package com.cloud.kicc.commonbiz.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+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.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.LogisticMap;
+import com.cloud.kicc.commonbiz.service.ILogisticMapService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
+import java.util.Arrays;
/**
*
@@ -15,10 +23,49 @@ import org.springframework.web.bind.annotation.RestController;
* @since 2022-07-22
*/
@RestController
-@RequestMapping("/map")
+@RequestMapping(AppConstants.APP_COMMON + "/logisticMap")
+@RequiredArgsConstructor
public class LogisticMapController {
+ private final ILogisticMapService iLogisticMapService;
+ private LambdaQueryWrapper getQueryWrapper(LogisticMap logisticMap) {
+ return new LambdaQueryWrapper()
+ .eq(StrUtil.isNotBlank(logisticMap.getCourierUserId()), LogisticMap::getCourierUserId, logisticMap.getCourierUserId())
+ .eq(StrUtil.isNotBlank(logisticMap.getBatchCode()), LogisticMap::getBatchCode, logisticMap.getBatchCode())
+ .like(StrUtil.isNotBlank(logisticMap.getName()), LogisticMap::getName, logisticMap.getName())
+ .between(StrUtil.isAllNotBlank(logisticMap.getBeginTime(), logisticMap.getEndTime()), LogisticMap::getCreateTime, logisticMap.getBeginTime(), logisticMap.getEndTime());
+ }
+
+ @GetMapping("/list")
+ public R list(Page page, LogisticMap logisticMap) {
+ IPage iPage = iLogisticMapService.page(page, getQueryWrapper(logisticMap));
+ return R.ok(iPage.getRecords(), iPage.getTotal());
+ }
+
+ @GetMapping("/{id:\\w+}")
+ public R getById(@PathVariable("id") String id) {
+ LogisticMap logisticMap = iLogisticMapService.getById(id);
+ return R.ok(logisticMap);
+ }
+
+ @PostMapping("/save")
+ public R save(@RequestBody LogisticMap logisticMap) {
+ iLogisticMapService.save(logisticMap);
+ return R.ok();
+ }
+
+ @PutMapping("/update")
+ public R update(@RequestBody LogisticMap logisticMap) {
+ iLogisticMapService.updateById(logisticMap);
+ return R.ok();
+ }
+
+ @DeleteMapping("/remove/{ids:[\\w,]+}")
+ public R remove(@PathVariable String[] ids) {
+ iLogisticMapService.removeByIds(Arrays.asList(ids));
+ return R.ok();
+ }
}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapHandoverPresetController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapHandoverPresetController.java
index b43d943c..b7c50c65 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapHandoverPresetController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapHandoverPresetController.java
@@ -1,9 +1,19 @@
package com.cloud.kicc.commonbiz.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+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.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.LogisticMap;
+import com.cloud.kicc.commonbiz.api.entity.MapHandoverPreset;
+import com.cloud.kicc.commonbiz.service.IMapHandoverPresetService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
+import java.util.Arrays;
/**
*
@@ -13,9 +23,30 @@ import org.springframework.stereotype.Controller;
* @author entfrm开发团队-王翔
* @since 2022-07-23
*/
-@Controller
-@RequestMapping("/mapHandoverPreset")
+@RestController
+@RequestMapping(AppConstants.APP_COMMON + "/mapHandoverPreset")
+@RequiredArgsConstructor
public class MapHandoverPresetController {
+ private final IMapHandoverPresetService iMapHandoverPresetService;
+
+ private LambdaQueryWrapper getQueryWrapper(MapHandoverPreset mapHandoverPreset) {
+ return new LambdaQueryWrapper()
+ .eq(StrUtil.isNotBlank(mapHandoverPreset.getMapLogisticId()), MapHandoverPreset::getMapLogisticId, mapHandoverPreset.getMapLogisticId())
+ .eq(StrUtil.isNotBlank(mapHandoverPreset.getCourierUserId()), MapHandoverPreset::getCourierUserId, mapHandoverPreset.getCourierUserId());
+ }
+
+ @GetMapping("/list")
+ public R list(Page page, MapHandoverPreset mapHandoverPreset) {
+ IPage iPage = iMapHandoverPresetService.page(page, getQueryWrapper(mapHandoverPreset));
+ return R.ok(iPage.getRecords(), iPage.getTotal());
+ }
+
+ @GetMapping("/{id:\\w+}")
+ public R getById(@PathVariable("id") String id) {
+ MapHandoverPreset mapHandoverPreset = iMapHandoverPresetService.getById(id);
+ return R.ok(mapHandoverPreset);
+ }
+
}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticPointController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticPointController.java
index 37b1222d..ce361a2c 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticPointController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticPointController.java
@@ -1,9 +1,17 @@
package com.cloud.kicc.commonbiz.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.cloud.kicc.common.core.api.R;
+import com.cloud.kicc.common.core.constant.AppConstants;
+import com.cloud.kicc.commonbiz.api.dto.MapHandoverPresetDto;
+import com.cloud.kicc.commonbiz.api.entity.MapLogisticPoint;
+import com.cloud.kicc.commonbiz.service.IMapLogisticPointService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
+import java.util.List;
/**
*
@@ -13,9 +21,35 @@ import org.springframework.stereotype.Controller;
* @author entfrm开发团队-王翔
* @since 2022-07-23
*/
-@Controller
-@RequestMapping("/mapLogisticPoint")
+@RestController
+@RequestMapping(AppConstants.APP_COMMON + "/mapLogisticPoint")
+@RequiredArgsConstructor
public class MapLogisticPointController {
+ private final IMapLogisticPointService iMapLogisticPointService;
+
+ private LambdaQueryWrapper getQueryWrapper(MapLogisticPoint mapLogisticPoint) {
+ return new LambdaQueryWrapper()
+ .eq(StrUtil.isNotBlank(mapLogisticPoint.getMapLogisticId()), MapLogisticPoint::getMapLogisticId, mapLogisticPoint.getMapLogisticId());
+ }
+
+ @GetMapping("/list")
+ public R list(MapLogisticPoint mapLogisticPoint) {
+ List list = iMapLogisticPointService.list(getQueryWrapper(mapLogisticPoint));
+ return R.ok(list, list.size());
+ }
+
+ @GetMapping("/{id:\\w+}")
+ public R getById(@PathVariable("id") String id) {
+ MapLogisticPoint mapLogisticPoint = iMapLogisticPointService.getById(id);
+ return R.ok(mapLogisticPoint);
+ }
+
+ @PostMapping("/save")
+ public R save(@RequestBody MapHandoverPresetDto mapHandoverPresetDto) {
+ iMapLogisticPointService.insertLogisticPoints(mapHandoverPresetDto.getMapLogisticId(), mapHandoverPresetDto.getMapLogisticPoints());
+ return R.ok();
+ }
+
}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskController.java
index 581dbbb4..846d9b2b 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskController.java
@@ -1,9 +1,19 @@
package com.cloud.kicc.commonbiz.controller;
+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.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.MapTask;
+import com.cloud.kicc.commonbiz.service.IMapTaskService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
/**
*
@@ -13,9 +23,32 @@ import org.springframework.stereotype.Controller;
* @author entfrm开发团队-王翔
* @since 2022-07-23
*/
-@Controller
-@RequestMapping("/mapTask")
+@RestController
+@RequestMapping(AppConstants.APP_COMMON + "/mapTask")
+@RequiredArgsConstructor
public class MapTaskController {
+ private final IMapTaskService iMapTaskService;
+
+ private LambdaQueryWrapper getQueryWrapper(MapTask mapTask) {
+ return new LambdaQueryWrapper()
+ .eq(StrUtil.isNotBlank(mapTask.getMapLogisticId()), MapTask::getMapLogisticId, mapTask.getMapLogisticId())
+ .eq(StrUtil.isNotBlank(mapTask.getBatchCode()), MapTask::getBatchCode, mapTask.getBatchCode())
+ .eq(StrUtil.isNotBlank(mapTask.getTaskType()), MapTask::getTaskType, mapTask.getTaskType());
+ }
+
+ @GetMapping("/list")
+ public R list(Page page, MapTask mapTask) {
+ IPage iPage = iMapTaskService.page(page, getQueryWrapper(mapTask));
+ return R.ok(iPage.getRecords(), iPage.getTotal());
+ }
+
+ @GetMapping("/{id:\\w+}")
+ public R getById(@PathVariable("id") String id) {
+ MapTask mapTask = iMapTaskService.getById(id);
+ return R.ok(mapTask);
+ }
+
+
}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapHandoverPresetService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapHandoverPresetService.java
index 88269bf4..d18dfb61 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapHandoverPresetService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapHandoverPresetService.java
@@ -1,7 +1,9 @@
package com.cloud.kicc.commonbiz.service;
-import com.cloud.kicc.commonbiz.api.entity.MapHandoverPreset;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.cloud.kicc.commonbiz.api.entity.MapHandoverPreset;
+
+import java.util.List;
/**
*
@@ -13,4 +15,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IMapHandoverPresetService extends IService {
+ /**
+ * 新增物流标记点
+ * @param taskId 任务ID
+ * @param mapHandoverPresets 交接点任务数据
+ * @return boolean
+ */
+ boolean insertLogisticPoints(String taskId, List mapHandoverPresets);
+
+
}
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 7e537595..1c0dda8a 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
@@ -2,6 +2,9 @@ package com.cloud.kicc.commonbiz.service;
import com.cloud.kicc.commonbiz.api.entity.MapLogisticPoint;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
/**
*
@@ -13,4 +16,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IMapLogisticPointService extends IService {
+ /**
+ * 新增物流标记点
+ * @param mapLogisticId 主线地图ID
+ * @param mapLogisticPoints 标记点数据
+ * @return boolean
+ */
+ boolean insertLogisticPoints(String mapLogisticId, List mapLogisticPoints);
+
}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapHandoverPresetServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapHandoverPresetServiceImpl.java
index 5a6485f3..4c7f6683 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapHandoverPresetServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapHandoverPresetServiceImpl.java
@@ -1,11 +1,15 @@
package com.cloud.kicc.commonbiz.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.cloud.kicc.commonbiz.api.entity.MapHandoverPreset;
+import com.cloud.kicc.commonbiz.api.entity.MapLogisticPoint;
import com.cloud.kicc.commonbiz.mapper.MapHandoverPresetMapper;
import com.cloud.kicc.commonbiz.service.IMapHandoverPresetService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
*
* 服务实现类
@@ -17,4 +21,10 @@ import org.springframework.stereotype.Service;
@Service
public class MapHandoverPresetServiceImpl extends ServiceImpl implements IMapHandoverPresetService {
+ @Override
+ public boolean insertLogisticPoints(String taskId, List mapHandoverPresets) {
+ remove(Wrappers.update().lambda().eq(MapHandoverPreset::getTaskId, taskId));
+ return saveBatch(mapHandoverPresets);
+ }
+
}
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 1a8be634..ec74d3dc 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
@@ -1,10 +1,14 @@
package com.cloud.kicc.commonbiz.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.cloud.kicc.commonbiz.api.entity.MapLogisticPoint;
import com.cloud.kicc.commonbiz.mapper.MapLogisticPointMapper;
import com.cloud.kicc.commonbiz.service.IMapLogisticPointService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
/**
*
@@ -15,6 +19,13 @@ import org.springframework.stereotype.Service;
* @since 2022-07-23
*/
@Service
+@Transactional(rollbackFor = Exception.class)
public class MapLogisticPointServiceImpl extends ServiceImpl implements IMapLogisticPointService {
+ @Override
+ public boolean insertLogisticPoints(String mapLogisticId, List mapLogisticPoints) {
+ remove(Wrappers.update().lambda().eq(MapLogisticPoint::getMapLogisticId, mapLogisticId));
+ return saveBatch(mapLogisticPoints);
+ }
+
}