From 55a9fab7d8b5d05fb77f3286f789df2216ac47e5 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Mon, 15 Aug 2022 17:57:53 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=AC=E7=BC=96=E5=86=99=E5=9C=B0?=
=?UTF-8?q?=E5=9B=BE=E6=A8=A1=E5=9D=97api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/entity/MapHandoverPreset.java | 8 +--
.../api/entity/MapLogisticPoint.java | 8 +--
.../kicc/commonbiz/api/entity/MapManage.java | 72 +++++++++++++++++++
.../kicc/commonbiz/api/entity/MapTask.java | 10 +--
.../MapHandoverPresetController.java | 32 +++++++--
.../MapLogisticPointController.java | 35 ++++++---
.../controller/MapManageController.java | 70 ++++++++++++++++++
.../controller/MapTaskController.java | 40 +++++++----
.../mapper/MapHandoverPresetMapper.java | 2 +-
.../mapper/MapLogisticPointMapper.java | 2 +-
.../commonbiz/mapper/MapManageMapper.java | 16 +++++
.../kicc/commonbiz/mapper/MapTaskMapper.java | 2 +-
.../service/IMapHandoverPresetService.java | 15 +---
.../service/IMapLogisticPointService.java | 13 +---
.../commonbiz/service/IMapManageService.java | 16 +++++
.../commonbiz/service/IMapTaskService.java | 2 +-
.../impl/MapHandoverPresetServiceImpl.java | 12 +---
.../impl/MapLogisticPointServiceImpl.java | 13 +---
.../service/impl/MapManageServiceImpl.java | 20 ++++++
.../service/impl/MapTaskServiceImpl.java | 2 +-
.../main/resources/mapper/MapManageMapper.xml | 5 ++
.../main/test/SimpleCrudGeneratorTest.java | 10 +--
22 files changed, 305 insertions(+), 100 deletions(-)
create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapManage.java
create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapManageController.java
create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapManageMapper.java
create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapManageService.java
create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapManageServiceImpl.java
create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapManageMapper.xml
diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapHandoverPreset.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapHandoverPreset.java
index 17d350fb..a0a870a6 100644
--- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapHandoverPreset.java
+++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapHandoverPreset.java
@@ -7,20 +7,20 @@ import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
/**
*
- *
+ * 地图交接预设点表
*
*
* @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
*/
-@Getter
-@Setter
+@Data
@Accessors(chain = true)
@TableName("common_map_handover_preset")
@ApiModel(value = "MapHandoverPreset对象", description = "")
diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogisticPoint.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogisticPoint.java
index 2384cd8f..07e5302a 100644
--- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogisticPoint.java
+++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogisticPoint.java
@@ -6,20 +6,20 @@ import java.io.Serializable;
import java.math.BigDecimal;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
/**
*
- * 地图核心主任务表
+ * 地图地图标记点表
*
*
* @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
*/
-@Getter
-@Setter
+@Data
@Accessors(chain = true)
@TableName("common_map_logistic_point")
@ApiModel(value = "MapLogisticPoint对象", description = "地图核心主任务表")
diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapManage.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapManage.java
new file mode 100644
index 00000000..c3956401
--- /dev/null
+++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapManage.java
@@ -0,0 +1,72 @@
+package com.cloud.kicc.commonbiz.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.cloud.kicc.common.data.entity.CommonEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 地图核心主任务表
+ *
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-08-15
+ */
+@Data
+@Accessors(chain = true)
+@TableName("common_map")
+@ApiModel(value = "Map对象", description = "地图核心主任务表")
+public class MapManage extends CommonEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键id")
+ private String id;
+
+ @ApiModelProperty("主线物流名称")
+ private String name;
+
+ @ApiModelProperty("收样员ID")
+ private String courierUserId;
+
+ @ApiModelProperty("收样员名称")
+ private String courierUserName;
+
+ @ApiModelProperty("收样员起点经度值")
+ private BigDecimal courierLng;
+
+ @ApiModelProperty("收样员起点纬度值")
+ private BigDecimal courierLat;
+
+ @ApiModelProperty("发单下级医院ID")
+ private String sendOrderId;
+
+ @ApiModelProperty("发单下级医院名称")
+ private String sendOrderName;
+
+ @ApiModelProperty("发单起点经度值")
+ private BigDecimal sendOrderLng;
+
+ @ApiModelProperty("发单起点纬度值")
+ private BigDecimal sendOrderLat;
+
+ @ApiModelProperty("客服上传做项目原始单文件ID")
+ private String fileId;
+
+ @ApiModelProperty("预计时间")
+ private LocalDateTime estimateTime;
+
+ @ApiModelProperty("要求时间")
+ private LocalDateTime requireTime;
+
+ @ApiModelProperty("关联报告单生成的批次码")
+ private String batchCode;
+
+
+}
diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java
index 9720e65b..8d0776cb 100644
--- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java
+++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java
@@ -7,20 +7,20 @@ import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
/**
*
- *
+ * 地图任务表
*
*
* @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
*/
-@Getter
-@Setter
+@Data
@Accessors(chain = true)
@TableName("common_map_task")
@ApiModel(value = "MapTask对象", description = "")
@@ -76,7 +76,7 @@ public class MapTask extends CommonEntity {
@ApiModelProperty("关联报告单生成的批次码")
private String batchCode;
- @ApiModelProperty("地图主线物流ID")
+ @ApiModelProperty("地图主线物流ID")
private String mapLogisticId;
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 b7c50c65..48ee0451 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
@@ -7,10 +7,10 @@ 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.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
@@ -21,9 +21,9 @@ import java.util.Arrays;
*
*
* @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
*/
-@RestController
+@Controller
@RequestMapping(AppConstants.APP_COMMON + "/mapHandoverPreset")
@RequiredArgsConstructor
public class MapHandoverPresetController {
@@ -32,14 +32,14 @@ public class MapHandoverPresetController {
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());
+ .like(StrUtil.isNotBlank(mapHandoverPreset.getName()), MapHandoverPreset::getName, mapHandoverPreset.getName())
+ .eq(StrUtil.isNotBlank(mapHandoverPreset.getMapLogisticId()), MapHandoverPreset::getMapLogisticId, mapHandoverPreset.getMapLogisticId());
}
@GetMapping("/list")
public R list(Page page, MapHandoverPreset mapHandoverPreset) {
- IPage iPage = iMapHandoverPresetService.page(page, getQueryWrapper(mapHandoverPreset));
- return R.ok(iPage.getRecords(), iPage.getTotal());
+ IPage result = iMapHandoverPresetService.page(page, getQueryWrapper(mapHandoverPreset));
+ return R.ok(result.getRecords(), result.getTotal());
}
@GetMapping("/{id:\\w+}")
@@ -48,5 +48,23 @@ public class MapHandoverPresetController {
return R.ok(mapHandoverPreset);
}
+ @PostMapping("/save")
+ public R save(@RequestBody MapHandoverPreset mapHandoverPreset) {
+ iMapHandoverPresetService.save(mapHandoverPreset);
+ return R.ok();
+ }
+
+ @PutMapping("/update")
+ public R update(@RequestBody MapHandoverPreset mapHandoverPreset) {
+ iMapHandoverPresetService.updateById(mapHandoverPreset);
+ return R.ok();
+ }
+
+ @DeleteMapping("/remove/{ids:[\\w,]+}")
+ public R remove(@PathVariable String[] ids) {
+ iMapHandoverPresetService.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/MapLogisticPointController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticPointController.java
index ce361a2c..a77ee619 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
@@ -3,15 +3,17 @@ 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.dto.MapHandoverPresetDto;
import com.cloud.kicc.commonbiz.api.entity.MapLogisticPoint;
import com.cloud.kicc.commonbiz.service.IMapLogisticPointService;
import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
+import java.util.Arrays;
/**
*
@@ -19,9 +21,9 @@ import java.util.List;
*
*
* @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
*/
-@RestController
+@Controller
@RequestMapping(AppConstants.APP_COMMON + "/mapLogisticPoint")
@RequiredArgsConstructor
public class MapLogisticPointController {
@@ -30,13 +32,14 @@ public class MapLogisticPointController {
private LambdaQueryWrapper getQueryWrapper(MapLogisticPoint mapLogisticPoint) {
return new LambdaQueryWrapper()
- .eq(StrUtil.isNotBlank(mapLogisticPoint.getMapLogisticId()), MapLogisticPoint::getMapLogisticId, mapLogisticPoint.getMapLogisticId());
+ .eq(StrUtil.isNotBlank(mapLogisticPoint.getMapLogisticId()), MapLogisticPoint::getMapLogisticId, mapLogisticPoint.getMapLogisticId())
+ .eq(StrUtil.isNotBlank(mapLogisticPoint.getTaskId()), MapLogisticPoint::getTaskId, mapLogisticPoint.getTaskId());
}
@GetMapping("/list")
- public R list(MapLogisticPoint mapLogisticPoint) {
- List list = iMapLogisticPointService.list(getQueryWrapper(mapLogisticPoint));
- return R.ok(list, list.size());
+ public R list(Page page, MapLogisticPoint mapLogisticPoint) {
+ IPage result = iMapLogisticPointService.page(page, getQueryWrapper(mapLogisticPoint));
+ return R.ok(result.getRecords(), result.getTotal());
}
@GetMapping("/{id:\\w+}")
@@ -46,8 +49,20 @@ public class MapLogisticPointController {
}
@PostMapping("/save")
- public R save(@RequestBody MapHandoverPresetDto mapHandoverPresetDto) {
- iMapLogisticPointService.insertLogisticPoints(mapHandoverPresetDto.getMapLogisticId(), mapHandoverPresetDto.getMapLogisticPoints());
+ public R save(@RequestBody MapLogisticPoint mapLogisticPoint) {
+ iMapLogisticPointService.save(mapLogisticPoint);
+ return R.ok();
+ }
+
+ @PutMapping("/update")
+ public R update(@RequestBody MapLogisticPoint mapLogisticPoint) {
+ iMapLogisticPointService.updateById(mapLogisticPoint);
+ return R.ok();
+ }
+
+ @DeleteMapping("/remove/{ids:[\\w,]+}")
+ public R remove(@PathVariable String[] ids) {
+ iMapLogisticPointService.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/MapManageController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapManageController.java
new file mode 100644
index 00000000..a6a897bb
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapManageController.java
@@ -0,0 +1,70 @@
+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.MapManage;
+import com.cloud.kicc.commonbiz.service.IMapManageService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ *
+ * 地图核心主任务表 前端控制器
+ *
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-08-15
+ */
+@Controller
+@RequestMapping(AppConstants.APP_COMMON + "/mapManage")
+@RequiredArgsConstructor
+public class MapManageController {
+
+ private final IMapManageService iMapManageService;
+
+ private LambdaQueryWrapper getQueryWrapper(MapManage mapManage) {
+ return new LambdaQueryWrapper()
+ .like(StrUtil.isNotBlank(mapManage.getName()), MapManage::getName, mapManage.getName())
+ .eq(StrUtil.isNotBlank(mapManage.getCourierUserName()), MapManage::getCourierUserName, mapManage.getCourierUserName());
+ }
+
+ @GetMapping("/list")
+ public R list(Page page, MapManage mapManage) {
+ IPage result = iMapManageService.page(page, getQueryWrapper(mapManage));
+ return R.ok(result.getRecords(), result.getTotal());
+ }
+
+ @GetMapping("/{id:\\w+}")
+ public R getById(@PathVariable("id") String id) {
+ MapManage mapManage = iMapManageService.getById(id);
+ return R.ok(mapManage);
+ }
+
+ @PostMapping("/save")
+ public R save(@RequestBody MapManage mapManage) {
+ iMapManageService.save(mapManage);
+ return R.ok();
+ }
+
+ @PutMapping("/update")
+ public R update(@RequestBody MapManage mapManage) {
+ iMapManageService.updateById(mapManage);
+ return R.ok();
+ }
+
+ @DeleteMapping("/remove/{ids:[\\w,]+}")
+ public R remove(@PathVariable String[] ids) {
+ iMapManageService.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/MapTaskController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskController.java
index 846d9b2b..99206ef5 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
@@ -10,10 +10,10 @@ 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.web.bind.annotation.RestController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
/**
*
@@ -21,9 +21,9 @@ import org.springframework.web.bind.annotation.RestController;
*
*
* @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
*/
-@RestController
+@Controller
@RequestMapping(AppConstants.APP_COMMON + "/mapTask")
@RequiredArgsConstructor
public class MapTaskController {
@@ -32,23 +32,39 @@ public class MapTaskController {
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());
+ .like(StrUtil.isNotBlank(mapTask.getName()), MapTask::getName, mapTask.getName())
+ .eq(StrUtil.isNotBlank(mapTask.getBatchCode()), MapTask::getBatchCode, mapTask.getBatchCode());
}
@GetMapping("/list")
public R list(Page page, MapTask mapTask) {
- IPage iPage = iMapTaskService.page(page, getQueryWrapper(mapTask));
- return R.ok(iPage.getRecords(), iPage.getTotal());
+ IPage result = iMapTaskService.page(page, getQueryWrapper(mapTask));
+ return R.ok(result.getRecords(), result.getTotal());
}
@GetMapping("/{id:\\w+}")
public R getById(@PathVariable("id") String id) {
- MapTask mapTask = iMapTaskService.getById(id);
+ MapTask mapTask = iMapTaskService.getById(id);
return R.ok(mapTask);
}
+ @PostMapping("/save")
+ public R save(@RequestBody MapTask mapTask) {
+ iMapTaskService.save(mapTask);
+ return R.ok();
+ }
+
+ @PutMapping("/update")
+ public R update(@RequestBody MapTask mapTask) {
+ iMapTaskService.updateById(mapTask);
+ return R.ok();
+ }
+
+ @DeleteMapping("/remove/{ids:[\\w,]+}")
+ public R remove(@PathVariable String[] ids) {
+ iMapTaskService.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/mapper/MapHandoverPresetMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapHandoverPresetMapper.java
index 786b3113..064a7832 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapHandoverPresetMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapHandoverPresetMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*
*
* @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
*/
public interface MapHandoverPresetMapper extends BaseMapper {
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 984a6fc5..7f2177ca 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
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*
*
* @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
*/
public interface MapLogisticPointMapper extends BaseMapper {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapManageMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapManageMapper.java
new file mode 100644
index 00000000..f422b6cc
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapManageMapper.java
@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.mapper;
+
+import com.cloud.kicc.commonbiz.api.entity.MapManage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * 地图核心主任务表 Mapper 接口
+ *
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-08-15
+ */
+public interface MapManageMapper extends BaseMapper {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapTaskMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapTaskMapper.java
index ddde6c49..d1c7b43b 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapTaskMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapTaskMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*
*
* @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
*/
public interface MapTaskMapper extends BaseMapper {
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 d18dfb61..ca63662e 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,9 +1,7 @@
package com.cloud.kicc.commonbiz.service;
-import com.baomidou.mybatisplus.extension.service.IService;
import com.cloud.kicc.commonbiz.api.entity.MapHandoverPreset;
-
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
*
@@ -11,17 +9,8 @@ import java.util.List;
*
*
* @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
*/
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 1c0dda8a..085eb998 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,9 +2,6 @@ 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;
/**
*
@@ -12,16 +9,8 @@ import java.util.List;
*
*
* @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
*/
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/IMapManageService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapManageService.java
new file mode 100644
index 00000000..a1665a45
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapManageService.java
@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.service;
+
+import com.cloud.kicc.commonbiz.api.entity.MapManage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 地图核心主任务表 服务类
+ *
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-08-15
+ */
+public interface IMapManageService extends IService {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapTaskService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapTaskService.java
index 18422552..4e18ef12 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapTaskService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapTaskService.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
*
*
* @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
*/
public interface IMapTaskService extends IService {
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 4c7f6683..683d9b4b 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,30 +1,20 @@
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;
-
/**
*
* 服务实现类
*
*
* @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
*/
@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 ec74d3dc..7635f05c 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,14 +1,10 @@
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;
/**
*
@@ -16,16 +12,9 @@ import java.util.List;
*
*
* @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
*/
@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);
- }
-
}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapManageServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapManageServiceImpl.java
new file mode 100644
index 00000000..1463b549
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapManageServiceImpl.java
@@ -0,0 +1,20 @@
+package com.cloud.kicc.commonbiz.service.impl;
+
+import com.cloud.kicc.commonbiz.api.entity.MapManage;
+import com.cloud.kicc.commonbiz.mapper.MapManageMapper;
+import com.cloud.kicc.commonbiz.service.IMapManageService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 地图核心主任务表 服务实现类
+ *
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-08-15
+ */
+@Service
+public class MapManageServiceImpl extends ServiceImpl implements IMapManageService {
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapTaskServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapTaskServiceImpl.java
index 9ad6ebb2..2b71a159 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapTaskServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapTaskServiceImpl.java
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
*
*
* @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
*/
@Service
public class MapTaskServiceImpl extends ServiceImpl implements IMapTaskService {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapManageMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapManageMapper.xml
new file mode 100644
index 00000000..b9deadae
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapManageMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/test/SimpleCrudGeneratorTest.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/test/SimpleCrudGeneratorTest.java
index 59cb8300..e44d60ef 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/test/SimpleCrudGeneratorTest.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/test/SimpleCrudGeneratorTest.java
@@ -18,19 +18,19 @@ public class SimpleCrudGeneratorTest {
/** 代码生成全局配置 */
interface Config {
- String url = "jdbc:mysql://192.168.3.8:8052/kicc?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true";
+ String url = "jdbc:mysql://127.0.0.1:3306/kicc?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true";
String username = "root";
- String password = "kanglai@2022";
+ String password = "root";
String author = "entfrm开发团队-王翔";
- String rootOutputDir = "/Users/wangxiang/IdeaProjects/kicc/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java";
+ String rootOutputDir = "/Users/wuyanzu/IdeaProjects/org/kicc/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java";
- String entityOutputDir = "/Users/wangxiang/IdeaProjects/kicc/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity";
+ String entityOutputDir = "/Users/wuyanzu/IdeaProjects/org/kicc/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity";
- String mapperXmlOutputDir = "/Users/wangxiang/IdeaProjects/kicc/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper";
+ String mapperXmlOutputDir = "/Users/wuyanzu/IdeaProjects/org/kicc/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper";
String packageParent = "com.cloud.kicc.commonbiz";