From 62ed52cadda686a75dcc3dc7d2ce4fe8a0378060 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Mon, 29 Aug 2022 02:47:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=90=8E=E7=AB=AF=E5=9C=B0?=
=?UTF-8?q?=E5=9B=BE=E8=AE=BE=E8=AE=A1=E5=99=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../commonbiz/api/entity/MapLogistic.java | 4 +-
.../api/entity/MapLogisticPoint.java | 19 +++--
.../kicc/commonbiz/api/entity/MapManage.java | 72 -------------------
.../kicc/commonbiz/api/entity/MapTask.java | 36 +++++-----
.../MapLogisticPointController.java | 55 ++------------
.../controller/MapManageController.java | 70 ------------------
.../controller/MapTaskController.java | 55 ++------------
.../controller/MapTaskPresetController.java | 2 +-
.../mapper/MapLogisticPointMapper.java | 2 +-
.../commonbiz/mapper/MapManageMapper.java | 16 -----
.../kicc/commonbiz/mapper/MapTaskMapper.java | 2 +-
.../service/IMapLogisticPointService.java | 2 +-
.../commonbiz/service/IMapManageService.java | 16 -----
.../commonbiz/service/IMapTaskService.java | 2 +-
.../impl/MapLogisticPointServiceImpl.java | 2 +-
.../service/impl/MapManageServiceImpl.java | 20 ------
.../service/impl/MapTaskServiceImpl.java | 2 +-
.../main/resources/mapper/MapManageMapper.xml | 5 --
.../main/test/SimpleCrudGeneratorTest.java | 11 +--
kicc-ui | 2 +-
20 files changed, 59 insertions(+), 336 deletions(-)
delete mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapManage.java
delete mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapManageController.java
delete mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapManageMapper.java
delete mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapManageService.java
delete mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapManageServiceImpl.java
delete 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/MapLogistic.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java
index 5f13a5c0..be4739fd 100644
--- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java
+++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java
@@ -22,7 +22,7 @@ import lombok.experimental.Accessors;
*/
@Data
@Accessors(chain = true)
-@TableName(value = "common_map", excludeProperty = { "delFlag" })
+@TableName(value = "common_map_logistic", excludeProperty = { "delFlag" })
@ApiModel(value = "Map对象", description = "地图核心主任务表")
public class MapLogistic extends CommonEntity {
@@ -43,7 +43,7 @@ public class MapLogistic extends CommonEntity {
@ApiModelProperty("收样员起点经度值")
private BigDecimal courierLng;
- @ApiModelProperty("收样员起点纬度值")
+ @ApiModelProperty("收样员起点纬度值 ")
private BigDecimal courierLat;
@ApiModelProperty("发单下级医院ID")
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 07e5302a..9ed059f4 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
@@ -13,11 +13,11 @@ import lombok.experimental.Accessors;
/**
*
- * 地图地图标记点表
+ * 地图核心主任务表
*
*
* @author entfrm开发团队-王翔
- * @since 2022-08-15
+ * @since 2022-08-29
*/
@Data
@Accessors(chain = true)
@@ -30,23 +30,32 @@ public class MapLogisticPoint extends CommonEntity {
@ApiModelProperty("主键id")
private String id;
+ @ApiModelProperty("标记点医院ID(医检与医院)")
+ private String hospitalId;
+
+ @ApiModelProperty("标记点医院名称(医检与医院)")
+ private String hospitalName;
+
@ApiModelProperty("经度值")
private BigDecimal lng;
@ApiModelProperty("纬度值")
private BigDecimal lat;
- @ApiModelProperty("收样员名称")
+ @ApiModelProperty("标记点排序")
private Integer sort;
+ @ApiModelProperty("区分是医院还是医检标记点,0医院,1医检")
+ private String type;
+
@ApiModelProperty("关联报告单生成的批次码")
private String batchCode;
- @ApiModelProperty("地图主线物流ID")
+ @ApiModelProperty("地图主线物流ID")
private String mapLogisticId;
@ApiModelProperty("地图任务ID")
- private String taskId;
+ private String mapTaskId;
}
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
deleted file mode 100644
index c3956401..00000000
--- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapManage.java
+++ /dev/null
@@ -1,72 +0,0 @@
-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 8d0776cb..2fe46a54 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
@@ -14,11 +14,11 @@ import lombok.experimental.Accessors;
/**
*
- * 地图任务表
+ *
*
*
* @author entfrm开发团队-王翔
- * @since 2022-08-15
+ * @since 2022-08-29
*/
@Data
@Accessors(chain = true)
@@ -37,29 +37,29 @@ public class MapTask extends CommonEntity {
@ApiModelProperty("任务类型,1是普通任务,2是交接任务")
private String taskType;
- @ApiModelProperty("下级医院id")
- private String smallHospitalId;
+ @ApiModelProperty("医院id")
+ private String hospitalId;
- @ApiModelProperty("下级医院名称")
- private String smallHospitalName;
+ @ApiModelProperty("医院名称")
+ private String hospitalName;
- @ApiModelProperty("下级医院经度值")
- private BigDecimal smallLng;
+ @ApiModelProperty("医院经度值")
+ private BigDecimal hospitalLng;
- @ApiModelProperty("下级医院纬度值")
- private BigDecimal smallLat;
+ @ApiModelProperty("医院纬度值")
+ private BigDecimal hospitalLat;
- @ApiModelProperty("上级医院id")
- private String largeHospitalId;
+ @ApiModelProperty("医检医院id")
+ private String orgId;
- @ApiModelProperty("上级医院名称")
- private String largeHospitalName;
+ @ApiModelProperty("医检医院名称")
+ private String orgName;
- @ApiModelProperty("上级医院经度值")
- private BigDecimal largeLng;
+ @ApiModelProperty("医检医院经度值")
+ private BigDecimal orgLng;
- @ApiModelProperty("上级医院纬度值")
- private BigDecimal largeLat;
+ @ApiModelProperty("医检医院纬度值")
+ private BigDecimal orgLat;
@ApiModelProperty("收样员ID")
private String courierUserId;
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 a77ee619..f9aaf4e5 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,19 +1,12 @@
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.MapLogisticPoint;
-import com.cloud.kicc.commonbiz.service.IMapLogisticPointService;
import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
-import java.util.Arrays;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
/**
*
@@ -21,50 +14,12 @@ import java.util.Arrays;
*
*
* @author entfrm开发团队-王翔
- * @since 2022-08-15
+ * @since 2022-08-29
*/
-@Controller
+@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())
- .eq(StrUtil.isNotBlank(mapLogisticPoint.getTaskId()), MapLogisticPoint::getTaskId, mapLogisticPoint.getTaskId());
- }
-
- @GetMapping("/list")
- public R list(Page page, MapLogisticPoint mapLogisticPoint) {
- IPage result = iMapLogisticPointService.page(page, getQueryWrapper(mapLogisticPoint));
- return R.ok(result.getRecords(), result.getTotal());
- }
-
- @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 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
deleted file mode 100644
index a6a897bb..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapManageController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-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 99206ef5..314c5819 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,19 +1,12 @@
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.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
-import java.util.Arrays;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
/**
*
@@ -21,50 +14,12 @@ import java.util.Arrays;
*
*
* @author entfrm开发团队-王翔
- * @since 2022-08-15
+ * @since 2022-08-29
*/
-@Controller
+@RestController
@RequestMapping(AppConstants.APP_COMMON + "/mapTask")
@RequiredArgsConstructor
public class MapTaskController {
- private final IMapTaskService iMapTaskService;
-
- private LambdaQueryWrapper getQueryWrapper(MapTask mapTask) {
- return new LambdaQueryWrapper()
- .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 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);
- 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/controller/MapTaskPresetController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskPresetController.java
index 87621e5f..29431294 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskPresetController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskPresetController.java
@@ -23,7 +23,7 @@ import java.util.Arrays;
* @author entfrm开发团队-王翔
* @since 2022-08-15
*/
-@Controller
+@RestController
@RequestMapping(AppConstants.APP_COMMON + "/mapTaskPreset")
@RequiredArgsConstructor
public class MapTaskPresetController {
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 7f2177ca..bca9a95f 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-08-15
+ * @since 2022-08-29
*/
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
deleted file mode 100644
index f422b6cc..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapManageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-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 d1c7b43b..df6a4ee0 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-08-15
+ * @since 2022-08-29
*/
public interface MapTaskMapper extends BaseMapper {
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 085eb998..cafe4850 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
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
*
*
* @author entfrm开发团队-王翔
- * @since 2022-08-15
+ * @since 2022-08-29
*/
public interface IMapLogisticPointService extends IService {
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
deleted file mode 100644
index a1665a45..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapManageService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-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 4e18ef12..5f8aa9e3 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-08-15
+ * @since 2022-08-29
*/
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/MapLogisticPointServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticPointServiceImpl.java
index 7635f05c..5f32eacd 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
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
*
*
* @author entfrm开发团队-王翔
- * @since 2022-08-15
+ * @since 2022-08-29
*/
@Service
public class MapLogisticPointServiceImpl extends ServiceImpl implements IMapLogisticPointService {
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
deleted file mode 100644
index 1463b549..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapManageServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-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 2b71a159..dda1b476 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-08-15
+ * @since 2022-08-29
*/
@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
deleted file mode 100644
index b9deadae..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapManageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
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 e44d60ef..e6072e4f 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
@@ -26,11 +26,14 @@ public class SimpleCrudGeneratorTest {
String author = "entfrm开发团队-王翔";
- String rootOutputDir = "/Users/wuyanzu/IdeaProjects/org/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 rootOutputDir = "D:/IdeaProjects/kicc/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java";
- 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 entityOutputDir = "/Users/wuyanzu/IdeaProjects/org/kicc/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity";
+ String entityOutputDir = "D:/IdeaProjects/kicc/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity";
- String mapperXmlOutputDir = "/Users/wuyanzu/IdeaProjects/org/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 mapperXmlOutputDir = "D:/IdeaProjects/kicc/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper";
String packageParent = "com.cloud.kicc.commonbiz";
@@ -44,7 +47,7 @@ public class SimpleCrudGeneratorTest {
String packageController = "controller";
- String[] includeTable = { "common_map", "common_map_handover_preset", "common_map_logistic_point", "common_map_task" };
+ String[] includeTable = { "common_map_logistic", "common_map_handover_preset", "common_map_logistic_point", "common_map_task" };
String[] filterEntityTablePrefix = { "common_" };
diff --git a/kicc-ui b/kicc-ui
index 6637cc1a..cc89475c 160000
--- a/kicc-ui
+++ b/kicc-ui
@@ -1 +1 @@
-Subproject commit 6637cc1a0d16bbf058f56bfa8e05dc30b5f3f699
+Subproject commit cc89475ce363a510dc74affbf0fc5f46c5867f5d