From 8fe0de9a140899e65bbd72575336482169dc42d7 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Sat, 23 Jul 2022 09:33:33 +0800
Subject: [PATCH] =?UTF-8?q?:rocket:=20=E5=85=A8=E5=B1=80=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
kicc-common/kicc-common-bom/pom.xml | 2 ++
kicc-common/kicc-common-data/pom.xml | 10 ++++++++++
.../api/entity/{Map.java => LogisticMap.java} | 2 +-
.../kicc/commonbiz/api/entity/MapHandoverPreset.java | 2 +-
.../kicc/commonbiz/api/entity/MapLogisticPoint.java | 2 +-
.../com/cloud/kicc/commonbiz/api/entity/MapTask.java | 2 +-
.../kicc-platform-biz/kicc-common-biz/pom.xml | 10 ----------
.../{MapController.java => LogisticMapController.java} | 7 +++++--
.../controller/MapHandoverPresetController.java | 2 +-
.../controller/MapLogisticPointController.java | 2 +-
.../kicc/commonbiz/controller/MapTaskController.java | 2 +-
.../mapper/{MapMapper.java => LogisticMapMapper.java} | 4 ++--
.../kicc/commonbiz/mapper/MapHandoverPresetMapper.java | 2 +-
.../kicc/commonbiz/mapper/MapLogisticPointMapper.java | 2 +-
.../com/cloud/kicc/commonbiz/mapper/MapTaskMapper.java | 2 +-
.../{IMapService.java => ILogisticMapService.java} | 4 ++--
.../commonbiz/service/IMapHandoverPresetService.java | 2 +-
.../commonbiz/service/IMapLogisticPointService.java | 2 +-
.../cloud/kicc/commonbiz/service/IMapTaskService.java | 2 +-
...MapServiceImpl.java => LogisticMapServiceImpl.java} | 8 ++++----
.../service/impl/MapHandoverPresetServiceImpl.java | 2 +-
.../service/impl/MapLogisticPointServiceImpl.java | 2 +-
.../commonbiz/service/impl/MapTaskServiceImpl.java | 2 +-
.../mapper/{MapMapper.xml => LogisticMapMapper.xml} | 2 +-
24 files changed, 42 insertions(+), 37 deletions(-)
rename kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/{Map.java => LogisticMap.java} (97%)
rename kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/{MapController.java => LogisticMapController.java} (72%)
rename kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/{MapMapper.java => LogisticMapMapper.java} (64%)
rename kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/{IMapService.java => ILogisticMapService.java} (64%)
rename kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/{MapServiceImpl.java => LogisticMapServiceImpl.java} (50%)
rename kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/{MapMapper.xml => LogisticMapMapper.xml} (68%)
diff --git a/kicc-common/kicc-common-bom/pom.xml b/kicc-common/kicc-common-bom/pom.xml
index 1e0b0ca0..ea3623c5 100644
--- a/kicc-common/kicc-common-bom/pom.xml
+++ b/kicc-common/kicc-common-bom/pom.xml
@@ -171,12 +171,14 @@
com.baomidou
mybatis-plus-generator
${mybatis-plus.version}
+ provided
org.apache.velocity
velocity-engine-core
${velocity.version}
+ provided
diff --git a/kicc-common/kicc-common-data/pom.xml b/kicc-common/kicc-common-data/pom.xml
index b2ae2ee8..3a802a51 100644
--- a/kicc-common/kicc-common-data/pom.xml
+++ b/kicc-common/kicc-common-data/pom.xml
@@ -36,6 +36,16 @@
com.baomidou
mybatis-plus-boot-starter
+
+
+ com.baomidou
+ mybatis-plus-generator
+
+
+
+ org.apache.velocity
+ velocity-engine-core
+
mysql
diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Map.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/LogisticMap.java
similarity index 97%
rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Map.java
rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/LogisticMap.java
index a1231b2c..99b9bbfa 100644
--- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Map.java
+++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/LogisticMap.java
@@ -24,7 +24,7 @@ import lombok.experimental.Accessors;
@Accessors(chain = true)
@TableName("common_map")
@ApiModel(value = "Map对象", description = "地图核心主任务表")
-public class Map extends CommonEntity {
+public class LogisticMap extends CommonEntity {
private static final long serialVersionUID = 1L;
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 488eb67b..17d350fb 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
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
*
*
* @author entfrm开发团队-王翔
- * @since 2022-07-22
+ * @since 2022-07-23
*/
@Getter
@Setter
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 a49b323c..2384cd8f 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
@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
*
*
* @author entfrm开发团队-王翔
- * @since 2022-07-22
+ * @since 2022-07-23
*/
@Getter
@Setter
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 ebbc4286..9720e65b 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
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
*
*
* @author entfrm开发团队-王翔
- * @since 2022-07-22
+ * @since 2022-07-23
*/
@Getter
@Setter
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/pom.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/pom.xml
index 99c2b621..ccb3c476 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/pom.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/pom.xml
@@ -66,16 +66,6 @@
qpid-jms-client
0.50.0
-
-
- com.baomidou
- mybatis-plus-generator
-
-
-
- org.apache.velocity
- velocity-engine-core
-
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/LogisticMapController.java
similarity index 72%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapController.java
rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/LogisticMapController.java
index a3f0c651..19f5db1c 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/LogisticMapController.java
@@ -4,6 +4,7 @@ package com.cloud.kicc.commonbiz.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
/**
*
@@ -13,9 +14,11 @@ import org.springframework.stereotype.Controller;
* @author entfrm开发团队-王翔
* @since 2022-07-22
*/
-@Controller
+@RestController
@RequestMapping("/map")
-public class MapController {
+public class LogisticMapController {
+
+
}
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 204699f6..b43d943c 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
@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
*
*
* @author entfrm开发团队-王翔
- * @since 2022-07-22
+ * @since 2022-07-23
*/
@Controller
@RequestMapping("/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 e523f499..37b1222d 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
@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
*
*
* @author entfrm开发团队-王翔
- * @since 2022-07-22
+ * @since 2022-07-23
*/
@Controller
@RequestMapping("/mapLogisticPoint")
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 c5da7272..581dbbb4 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
@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
*
*
* @author entfrm开发团队-王翔
- * @since 2022-07-22
+ * @since 2022-07-23
*/
@Controller
@RequestMapping("/mapTask")
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/LogisticMapMapper.java
similarity index 64%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/LogisticMapMapper.java
index a74b51b3..9e2918c7 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/LogisticMapMapper.java
@@ -1,6 +1,6 @@
package com.cloud.kicc.commonbiz.mapper;
-import com.cloud.kicc.commonbiz.api.entity.Map;
+import com.cloud.kicc.commonbiz.api.entity.LogisticMap;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author entfrm开发团队-王翔
* @since 2022-07-22
*/
-public interface MapMapper extends BaseMapper