🚀 添加代码生成器,简化crud模块

kicc-common/kicc-common-bom/pom.xml

@@ -31,6 +31,7 @@
 		<captcha.version>2.2.1</captcha.version>
 		<oss.version>1.0.3</oss.version>
 		<excel.version>1.1.1</excel.version>
+		<velocity.version>2.3</velocity.version>
 	</properties>
 
 	<!-- 定义全局jar版本,模块使用需要再次引入但不用写版本号-->
@@ -165,6 +166,18 @@
 				<artifactId>mybatis-plus-boot-starter</artifactId>
 				<version>${mybatis-plus.version}</version>
 			</dependency>
+			<!--mybatis-generator-->
+			<dependency>
+				<groupId>com.baomidou</groupId>
+				<artifactId>mybatis-plus-generator</artifactId>
+				<version>${mybatis-plus.version}</version>
+			</dependency>
+			<!--velocity模板引擎生成简单crud代码-->
+			<dependency>
+				<groupId>org.apache.velocity</groupId>
+				<artifactId>velocity-engine-core</artifactId>
+				<version>${velocity.version}</version>
+			</dependency>
 			<!--web 模块-->
 			<dependency>
 				<groupId>org.springframework.boot</groupId>

kicc-common/kicc-common-data/pom.xml

@@ -31,7 +31,7 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-redis</artifactId>
 		</dependency>
-		<!--mybatis-->
+		<!--mybatis-plus-->
 		<dependency>
 			<groupId>com.baomidou</groupId>
 			<artifactId>mybatis-plus-boot-starter</artifactId>

kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Map.java

@@ -0,0 +1,74 @@
+package com.cloud.kicc.commonbiz.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.cloud.kicc.common.data.entity.CommonEntity;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 地图核心主任务表
+ * </p>
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-07-22
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("common_map")
+@ApiModel(value = "Map对象", description = "地图核心主任务表")
+public class Map 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;
+
+
+}

kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapHandoverPreset.java

@@ -0,0 +1,83 @@
+package com.cloud.kicc.commonbiz.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.cloud.kicc.common.data.entity.CommonEntity;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-07-22
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("common_map_handover_preset")
+@ApiModel(value = "MapHandoverPreset对象", description = "")
+public class MapHandoverPreset extends CommonEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键id")
+    private String id;
+
+    @ApiModelProperty("预设点任务名称")
+    private String name;
+
+    @ApiModelProperty("起始预设点id")
+    private String orginPresetId;
+
+    @ApiModelProperty("起始预设点地址名称")
+    private String orginPresetName;
+
+    @ApiModelProperty("起始预设点经度值")
+    private BigDecimal orginPresetLng;
+
+    @ApiModelProperty("起始预设点纬度值")
+    private BigDecimal orginPresetLat;
+
+    @ApiModelProperty("终点预设点地址id")
+    private String destinationPresetId;
+
+    @ApiModelProperty("终点预设点地址名称")
+    private String destinationPresetName;
+
+    @ApiModelProperty("终点预设点经度值")
+    private BigDecimal destinationPresetLng;
+
+    @ApiModelProperty("终点预设点纬度值")
+    private BigDecimal destinationPresetLat;
+
+    @ApiModelProperty("收样员ID")
+    private String courierUserId;
+
+    @ApiModelProperty("文件id")
+    private String fileId;
+
+    @ApiModelProperty("预计时间")
+    private LocalDateTime estimateTime;
+
+    @ApiModelProperty("要求时间")
+    private LocalDateTime requireTime;
+
+    @ApiModelProperty("关联报告单生成的批次码")
+    private String batchCode;
+
+    @ApiModelProperty("
地图主线物流ID")
+    private String mapLogisticId;
+
+    @ApiModelProperty("地图任务ID")
+    private String taskId;
+
+
+}

kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogisticPoint.java

@@ -0,0 +1,52 @@
+package com.cloud.kicc.commonbiz.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.cloud.kicc.common.data.entity.CommonEntity;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 地图核心主任务表
+ * </p>
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-07-22
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("common_map_logistic_point")
+@ApiModel(value = "MapLogisticPoint对象", description = "地图核心主任务表")
+public class MapLogisticPoint extends CommonEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键id")
+    private String id;
+
+    @ApiModelProperty("经度值")
+    private BigDecimal lng;
+
+    @ApiModelProperty("纬度值")
+    private BigDecimal lat;
+
+    @ApiModelProperty("收样员名称")
+    private Integer sort;
+
+    @ApiModelProperty("关联报告单生成的批次码")
+    private String batchCode;
+
+    @ApiModelProperty("
地图主线物流ID")
+    private String mapLogisticId;
+
+    @ApiModelProperty("地图任务ID")
+    private String taskId;
+
+
+}

kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java

@@ -1,36 +1,83 @@
 package com.cloud.kicc.commonbiz.api.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.cloud.kicc.common.data.entity.CommonEntity;
-import lombok.Data;
+import java.io.Serializable;
-import lombok.EqualsAndHashCode;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.experimental.Accessors;
+
 /**
- *<p>
+ * <p>
- * 地图任务
+ * 
- *</p>
+ * </p>
  *
- * @Author: entfrm开发团队-王翔
+ * @author entfrm开发团队-王翔
- * @Date: 2022/6/6
+ * @since 2022-07-22
  */
-@Data
+@Getter
-@EqualsAndHashCode(callSuper = false)
+@Setter
 @Accessors(chain = true)
-@TableName(value = "common_map_task", excludeProperty = { "remarks", "delFlag" })
+@TableName("common_map_task")
+@ApiModel(value = "MapTask对象", description = "")
 public class MapTask extends CommonEntity {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId
+    @ApiModelProperty("主键id")
     private String id;
 
+    @ApiModelProperty("附属子任务名称")
     private String name;
 
+    @ApiModelProperty("任务类型,1是普通任务,2是交接任务")
+    private String taskType;
+
+    @ApiModelProperty("下级医院id")
     private String smallHospitalId;
 
+    @ApiModelProperty("下级医院名称")
+    private String smallHospitalName;
+
+    @ApiModelProperty("下级医院经度值")
+    private BigDecimal smallLng;
+
+    @ApiModelProperty("下级医院纬度值")
+    private BigDecimal smallLat;
+
+    @ApiModelProperty("上级医院id")
     private String largeHospitalId;
 
-    private String takeSpecimenId;
+    @ApiModelProperty("上级医院名称")
+    private String largeHospitalName;
+
+    @ApiModelProperty("上级医院经度值")
+    private BigDecimal largeLng;
+
+    @ApiModelProperty("上级医院纬度值")
+    private BigDecimal largeLat;
+
+    @ApiModelProperty("收样员ID")
+    private String courierUserId;
+
+    @ApiModelProperty("文件id")
+    private String fileId;
+
+    @ApiModelProperty("预计时间")
+    private LocalDateTime estimateTime;
+
+    @ApiModelProperty("要求时间")
+    private LocalDateTime requireTime;
+
+    @ApiModelProperty("关联报告单生成的批次码")
+    private String batchCode;
+
+    @ApiModelProperty("
地图主线物流ID")
+    private String mapLogisticId;
+
 
 }

kicc-platform/kicc-platform-biz/kicc-common-biz/pom.xml

@@ -66,7 +66,16 @@
 			<artifactId>qpid-jms-client</artifactId>
 			<version>0.50.0</version>
 		</dependency>
-
+		<!--mybatis-generator-->
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-generator</artifactId>
+		</dependency>
+		<!--velocity模板引擎生成简单crud代码-->
+		<dependency>
+			<groupId>org.apache.velocity</groupId>
+			<artifactId>velocity-engine-core</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

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

@@ -0,0 +1,21 @@
+package com.cloud.kicc.commonbiz.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 地图核心主任务表 前端控制器
+ * </p>
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-07-22
+ */
+@Controller
+@RequestMapping("/map")
+public class MapController {
+
+}
+

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

@@ -0,0 +1,21 @@
+package com.cloud.kicc.commonbiz.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-07-22
+ */
+@Controller
+@RequestMapping("/mapHandoverPreset")
+public class MapHandoverPresetController {
+
+}
+

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

@@ -0,0 +1,21 @@
+package com.cloud.kicc.commonbiz.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 地图核心主任务表 前端控制器
+ * </p>
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-07-22
+ */
+@Controller
+@RequestMapping("/mapLogisticPoint")
+public class MapLogisticPointController {
+
+}
+

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

@@ -1,44 +1,21 @@
 package com.cloud.kicc.commonbiz.controller;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.cloud.kicc.common.core.api.R;
-import com.cloud.kicc.common.core.constant.AppConstants;
-import com.cloud.kicc.common.log.annotation.SysLog;
-import com.cloud.kicc.commonbiz.api.entity.MapTask;
-import com.cloud.kicc.commonbiz.service.MapTaskService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
 
 /**
- *<p>
+ * <p>
- * 地图任务信息
+ *  前端控制器
- *</p>
+ * </p>
  *
- * @Author: entfrm开发团队-王翔
+ * @author entfrm开发团队-王翔
- * @Date: 2022/6/6
+ * @since 2022-07-22
  */
-@RestController
+@Controller
-@RequiredArgsConstructor
+@RequestMapping("/mapTask")
-@RequestMapping(AppConstants.APP_COMMON + "/mapTask")
 public class MapTaskController {
 
-    private final MapTaskService mapTaskService;
-
-    @GetMapping("/list/{takeSpecimenId}")
-    public R list(@PathVariable String takeSpecimenId) {
-        List<MapTask> list = mapTaskService.list(Wrappers.<MapTask>lambdaQuery().eq(MapTask::getTakeSpecimenId, takeSpecimenId));
-        return R.ok(list);
-    }
-
-    @SysLog("用户修改")
-    @PutMapping("/update")
-    @PreAuthorize("@pms.hasPermission('user_edit')")
-    public R update(@RequestBody List<MapTask> mapTasks) {
-        mapTaskService.batchUpdate(mapTasks);
-        return R.ok();
-    }
-
 }
+

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapHandoverPresetMapper.java

@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.mapper;
+
+import com.cloud.kicc.commonbiz.api.entity.MapHandoverPreset;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-07-22
+ */
+public interface MapHandoverPresetMapper extends BaseMapper<MapHandoverPreset> {
+
+}

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapLogisticPointMapper.java

@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.mapper;
+
+import com.cloud.kicc.commonbiz.api.entity.MapLogisticPoint;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 地图核心主任务表 Mapper 接口
+ * </p>
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-07-22
+ */
+public interface MapLogisticPointMapper extends BaseMapper<MapLogisticPoint> {
+
+}

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapMapper.java

@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.mapper;
+
+import com.cloud.kicc.commonbiz.api.entity.Map;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 地图核心主任务表 Mapper 接口
+ * </p>
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-07-22
+ */
+public interface MapMapper extends BaseMapper<Map> {
+
+}

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapTaskMapper.java

@@ -1,15 +1,15 @@
 package com.cloud.kicc.commonbiz.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cloud.kicc.commonbiz.api.entity.MapTask;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
- *<p>
+ * <p>
- * 地图任务
+ *  Mapper 接口
- *</p>
+ * </p>
  *
- * @Author: entfrm开发团队-王翔
+ * @author entfrm开发团队-王翔
- * @Date: 2022/6/6
+ * @since 2022-07-22
  */
 public interface MapTaskMapper extends BaseMapper<MapTask> {
 

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

@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.service;
+
+import com.cloud.kicc.commonbiz.api.entity.MapHandoverPreset;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-07-22
+ */
+public interface IMapHandoverPresetService extends IService<MapHandoverPreset> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.service;
+
+import com.cloud.kicc.commonbiz.api.entity.MapLogisticPoint;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 地图核心主任务表 服务类
+ * </p>
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-07-22
+ */
+public interface IMapLogisticPointService extends IService<MapLogisticPoint> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.service;
+
+import com.cloud.kicc.commonbiz.api.entity.Map;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 地图核心主任务表 服务类
+ * </p>
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-07-22
+ */
+public interface IMapService extends IService<Map> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.cloud.kicc.commonbiz.service;
+
+import com.cloud.kicc.commonbiz.api.entity.MapTask;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-07-22
+ */
+public interface IMapTaskService extends IService<MapTask> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.cloud.kicc.commonbiz.service.impl;
+
+import com.cloud.kicc.commonbiz.api.entity.MapHandoverPreset;
+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;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-07-22
+ */
+@Service
+public class MapHandoverPresetServiceImpl extends ServiceImpl<MapHandoverPresetMapper, MapHandoverPreset> implements IMapHandoverPresetService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.cloud.kicc.commonbiz.service.impl;
+
+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;
+
+/**
+ * <p>
+ * 地图核心主任务表 服务实现类
+ * </p>
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-07-22
+ */
+@Service
+public class MapLogisticPointServiceImpl extends ServiceImpl<MapLogisticPointMapper, MapLogisticPoint> implements IMapLogisticPointService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.cloud.kicc.commonbiz.service.impl;
+
+import com.cloud.kicc.commonbiz.api.entity.Map;
+import com.cloud.kicc.commonbiz.mapper.MapMapper;
+import com.cloud.kicc.commonbiz.service.IMapService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 地图核心主任务表 服务实现类
+ * </p>
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-07-22
+ */
+@Service
+public class MapServiceImpl extends ServiceImpl<MapMapper, Map> implements IMapService {
+
+}

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

@@ -1,33 +1,20 @@
 package com.cloud.kicc.commonbiz.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cloud.kicc.commonbiz.api.entity.MapTask;
 import com.cloud.kicc.commonbiz.mapper.MapTaskMapper;
-import com.cloud.kicc.commonbiz.service.MapTaskService;
+import com.cloud.kicc.commonbiz.service.IMapTaskService;
-import lombok.RequiredArgsConstructor;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
 
 /**
- *<p>
+ * <p>
- * 地图任务
+ *  服务实现类
- *</p>
+ * </p>
  *
- * @Author: entfrm开发团队-王翔
+ * @author entfrm开发团队-王翔
- * @Date: 2022/6/6
+ * @since 2022-07-22
  */
 @Service
-@RequiredArgsConstructor
+public class MapTaskServiceImpl extends ServiceImpl<MapTaskMapper, MapTask> implements IMapTaskService {
-public class MapTaskServiceImpl extends ServiceImpl<MapTaskMapper, MapTask> implements MapTaskService {
-
-    @Transactional(noRollbackFor = Exception.class)
-    @Override
-    public void batchUpdate(List<MapTask> mapTasks) {
-        mapTasks.forEach(mapTask -> {
-
-        });
-    }
 
 }

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapHandoverPresetMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cloud.kicc.commonbiz.mapper.MapHandoverPresetMapper">
+
+</mapper>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapLogisticPointMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cloud.kicc.commonbiz.mapper.MapLogisticPointMapper">
+
+</mapper>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cloud.kicc.commonbiz.mapper.MapMapper">
+
+</mapper>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapTaskMapper.xml

@@ -1,24 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cloud.kicc.system.mapper.DeptMapper">
+<mapper namespace="com.cloud.kicc.commonbiz.mapper.MapTaskMapper">
-
-    <resultMap type="Dept" id="DeptResult">
-        <id property="deptId" column="dept_id"/>
-        <result property="code" column="code"/>
-        <result property="name" column="name"/>
-        <result property="parentId" column="parent_id"/>
-        <result property="sort" column="sort"/>
-        <result property="contacts" column="contacts"/>
-        <result property="phone" column="phone"/>
-        <result property="email" column="email"/>
-        <result property="status" column="status"/>
-        <result property="createById" column="create_by_id"/>
-        <result property="createByName" column="create_by_name"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateById" column="update_by_id"/>
-        <result property="updateByName" column="update_by_name"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag"/>
-    </resultMap>
 
 </mapper>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/test/SimpleCrudGeneratorTest.java

@@ -0,0 +1,101 @@
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.cloud.kicc.common.data.entity.CommonEntity;
+import org.junit.jupiter.api.Test;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ *<p>
+ * mysql crud代码自动生成
+ *</p>
+ *
+ * @Author: entfrm开发团队-王翔
+ * @Date: 2022/7/22
+ */
+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 username = "root";
+
+        String password = "kanglai@2022";
+
+        String author = "entfrm开发团队-王翔";
+
+        String rootOutputDir = "/Users/wangxiang/IdeaProjects/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 mapperXmlOutputDir = "/Users/wangxiang/IdeaProjects/kicc/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper";
+
+        String packageParent = "com.cloud.kicc.commonbiz";
+
+        String packageService = "service";
+
+        String packageEntity = "api.entity";
+
+        String packageServiceImpl = "service.impl";
+
+        String packageMapper = "mapper";
+
+        String packageController = "controller";
+
+        String[] includeTable = { "common_map", "common_map_handover_preset", "common_map_logistic_point", "common_map_task" };
+
+        String[] filterEntityTablePrefix = { "common_" };
+
+        String[] superEntityColumns = { "createById", "createByName", "createTime", "updateById","updateByName", "updateTime", "remarks", "delFlag" };
+
+        String[] ignoreColumns = { "tenant_id" };
+
+    }
+
+    @Test
+    /** 运行代码生成 */
+    public void CrudSimpleGenerator() {
+
+        AutoGenerator generator = new AutoGenerator(new DataSourceConfig.Builder(Config.url, Config.username, Config.password).build());
+        // 全局配置 参考:https://github.com/baomidou/generator#%E5%85%A8%E5%B1%80%E9%85%8D%E7%BD%AEglobalconfig
+        generator.global(new GlobalConfig.Builder()
+                .author(Config.author)
+                .enableSwagger()
+                .fileOverride()
+                .outputDir(Config.rootOutputDir)
+                .build()
+        );
+        // 包路径配置 参考:https://github.com/baomidou/generator#%E5%8C%85%E9%85%8D%E7%BD%AEpackageconfig
+        Map<OutputFile, String> pathInfos = new ConcurrentHashMap();
+        pathInfos.put(OutputFile.entity, Config.entityOutputDir);
+        pathInfos.put(OutputFile.mapperXml, Config.mapperXmlOutputDir);
+        generator.packageInfo(new PackageConfig.Builder()
+                .parent(Config.packageParent)
+                .service(Config.packageService)
+                .entity(Config.packageEntity)
+                .serviceImpl(Config.packageServiceImpl)
+                .mapper(Config.packageMapper)
+                .controller(Config.packageController)
+                .pathInfo(pathInfos)
+                .build()
+        );
+        // 策略配置 参考:https://github.com/baomidou/generator#%E7%AD%96%E7%95%A5%E9%85%8D%E7%BD%AEstrategyconfig
+        generator.strategy(new StrategyConfig.Builder()
+                .addInclude(Config.includeTable)
+                .addTablePrefix(Config.filterEntityTablePrefix)
+                .entityBuilder()
+                .enableChainModel()
+                .enableLombok()
+                .enableRemoveIsPrefix()
+                .superClass(CommonEntity.class)
+                .addSuperEntityColumns(Config.superEntityColumns)
+                .addIgnoreColumns(Config.ignoreColumns)
+                .build()
+        );
+        generator.execute();
+    }
+
+
+}