diff --git a/kicc-common/kicc-common-bom/pom.xml b/kicc-common/kicc-common-bom/pom.xml index 54387644..1e0b0ca0 100644 --- a/kicc-common/kicc-common-bom/pom.xml +++ b/kicc-common/kicc-common-bom/pom.xml @@ -31,6 +31,7 @@ 2.2.1 1.0.3 1.1.1 + 2.3 @@ -165,6 +166,18 @@ mybatis-plus-boot-starter ${mybatis-plus.version} + + + com.baomidou + mybatis-plus-generator + ${mybatis-plus.version} + + + + org.apache.velocity + velocity-engine-core + ${velocity.version} + org.springframework.boot diff --git a/kicc-common/kicc-common-data/pom.xml b/kicc-common/kicc-common-data/pom.xml index f880f8b4..b2ae2ee8 100644 --- a/kicc-common/kicc-common-data/pom.xml +++ b/kicc-common/kicc-common-data/pom.xml @@ -31,7 +31,7 @@ org.springframework.boot spring-boot-starter-data-redis - + com.baomidou mybatis-plus-boot-starter 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/Map.java new file mode 100644 index 00000000..a1231b2c --- /dev/null +++ b/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; + +/** + *

+ * 地图核心主任务表 + *

+ * + * @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; + + +} 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 new file mode 100644 index 00000000..488eb67b --- /dev/null +++ b/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; + +/** + *

+ * + *

+ * + * @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; + + +} 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 new file mode 100644 index 00000000..a49b323c --- /dev/null +++ b/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; + +/** + *

+ * 地图核心主任务表 + *

+ * + * @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; + + +} 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 4bc0189b..ebbc4286 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 @@ -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 lombok.EqualsAndHashCode; +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; + /** - *

- * 地图任务 - *

+ *

+ * + *

* - * @Author: entfrm开发团队-王翔 - * @Date: 2022/6/6 + * @author entfrm开发团队-王翔 + * @since 2022-07-22 */ -@Data -@EqualsAndHashCode(callSuper = false) +@Getter +@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; + } 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 6b9d69b3..99c2b621 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/pom.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/pom.xml @@ -66,7 +66,16 @@ 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/MapController.java new file mode 100644 index 00000000..a3f0c651 --- /dev/null +++ b/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; + +/** + *

+ * 地图核心主任务表 前端控制器 + *

+ * + * @author entfrm开发团队-王翔 + * @since 2022-07-22 + */ +@Controller +@RequestMapping("/map") +public class MapController { + +} + 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 new file mode 100644 index 00000000..204699f6 --- /dev/null +++ b/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; + +/** + *

+ * 前端控制器 + *

+ * + * @author entfrm开发团队-王翔 + * @since 2022-07-22 + */ +@Controller +@RequestMapping("/mapHandoverPreset") +public class MapHandoverPresetController { + +} + 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 new file mode 100644 index 00000000..e523f499 --- /dev/null +++ b/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; + +/** + *

+ * 地图核心主任务表 前端控制器 + *

+ * + * @author entfrm开发团队-王翔 + * @since 2022-07-22 + */ +@Controller +@RequestMapping("/mapLogisticPoint") +public class MapLogisticPointController { + +} + 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 10ecf1d8..c5da7272 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,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; /** - *

- * 地图任务信息 - *

+ *

+ * 前端控制器 + *

* - * @Author: entfrm开发团队-王翔 - * @Date: 2022/6/6 + * @author entfrm开发团队-王翔 + * @since 2022-07-22 */ -@RestController -@RequiredArgsConstructor -@RequestMapping(AppConstants.APP_COMMON + "/mapTask") +@Controller +@RequestMapping("/mapTask") public class MapTaskController { - private final MapTaskService mapTaskService; - - @GetMapping("/list/{takeSpecimenId}") - public R list(@PathVariable String takeSpecimenId) { - List list = mapTaskService.list(Wrappers.lambdaQuery().eq(MapTask::getTakeSpecimenId, takeSpecimenId)); - return R.ok(list); - } - - @SysLog("用户修改") - @PutMapping("/update") - @PreAuthorize("@pms.hasPermission('user_edit')") - public R update(@RequestBody List mapTasks) { - mapTaskService.batchUpdate(mapTasks); - 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 new file mode 100644 index 00000000..e3eb74b9 --- /dev/null +++ b/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; + +/** + *

+ * Mapper 接口 + *

+ * + * @author entfrm开发团队-王翔 + * @since 2022-07-22 + */ +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 new file mode 100644 index 00000000..7b3c6812 --- /dev/null +++ b/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; + +/** + *

+ * 地图核心主任务表 Mapper 接口 + *

+ * + * @author entfrm开发团队-王翔 + * @since 2022-07-22 + */ +public interface MapLogisticPointMapper extends BaseMapper { + +} 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/MapMapper.java new file mode 100644 index 00000000..a74b51b3 --- /dev/null +++ b/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; + +/** + *

+ * 地图核心主任务表 Mapper 接口 + *

+ * + * @author entfrm开发团队-王翔 + * @since 2022-07-22 + */ +public interface MapMapper 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 4eea9d3d..37a64b0e 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 @@ -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; /** - *

- * 地图任务 - *

+ *

+ * Mapper 接口 + *

* - * @Author: entfrm开发团队-王翔 - * @Date: 2022/6/6 + * @author entfrm开发团队-王翔 + * @since 2022-07-22 */ 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 new file mode 100644 index 00000000..a408364d --- /dev/null +++ b/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; + +/** + *

+ * 服务类 + *

+ * + * @author entfrm开发团队-王翔 + * @since 2022-07-22 + */ +public interface IMapHandoverPresetService extends IService { + +} 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 new file mode 100644 index 00000000..b77dded0 --- /dev/null +++ b/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; + +/** + *

+ * 地图核心主任务表 服务类 + *

+ * + * @author entfrm开发团队-王翔 + * @since 2022-07-22 + */ +public interface IMapLogisticPointService extends IService { + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapService.java new file mode 100644 index 00000000..44a7c212 --- /dev/null +++ b/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; + +/** + *

+ * 地图核心主任务表 服务类 + *

+ * + * @author entfrm开发团队-王翔 + * @since 2022-07-22 + */ +public interface IMapService 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 new file mode 100644 index 00000000..2a5dfaed --- /dev/null +++ b/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; + +/** + *

+ * 服务类 + *

+ * + * @author entfrm开发团队-王翔 + * @since 2022-07-22 + */ +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 new file mode 100644 index 00000000..9e481baf --- /dev/null +++ b/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; + +/** + *

+ * 服务实现类 + *

+ * + * @author entfrm开发团队-王翔 + * @since 2022-07-22 + */ +@Service +public class MapHandoverPresetServiceImpl extends ServiceImpl implements IMapHandoverPresetService { + +} 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 new file mode 100644 index 00000000..bd2757f7 --- /dev/null +++ b/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; + +/** + *

+ * 地图核心主任务表 服务实现类 + *

+ * + * @author entfrm开发团队-王翔 + * @since 2022-07-22 + */ +@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/MapServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapServiceImpl.java new file mode 100644 index 00000000..9f1e797c --- /dev/null +++ b/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; + +/** + *

+ * 地图核心主任务表 服务实现类 + *

+ * + * @author entfrm开发团队-王翔 + * @since 2022-07-22 + */ +@Service +public class MapServiceImpl extends ServiceImpl implements IMapService { + +} 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 3d50d189..135acf0f 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 @@ -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 lombok.RequiredArgsConstructor; +import com.cloud.kicc.commonbiz.service.IMapTaskService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; /** - *

- * 地图任务 - *

+ *

+ * 服务实现类 + *

* - * @Author: entfrm开发团队-王翔 - * @Date: 2022/6/6 + * @author entfrm开发团队-王翔 + * @since 2022-07-22 */ @Service -@RequiredArgsConstructor -public class MapTaskServiceImpl extends ServiceImpl implements MapTaskService { - - @Transactional(noRollbackFor = Exception.class) - @Override - public void batchUpdate(List mapTasks) { - mapTasks.forEach(mapTask -> { - - }); - } +public class MapTaskServiceImpl extends ServiceImpl implements IMapTaskService { } diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapHandoverPresetMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapHandoverPresetMapper.xml new file mode 100644 index 00000000..e2f36eb6 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapHandoverPresetMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapLogisticPointMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapLogisticPointMapper.xml new file mode 100644 index 00000000..cafafb32 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapLogisticPointMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapMapper.xml new file mode 100644 index 00000000..adab6b8a --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapTaskMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapTaskMapper.xml index cc9db036..b7f30127 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapTaskMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapTaskMapper.xml @@ -1,24 +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 new file mode 100644 index 00000000..59cb8300 --- /dev/null +++ b/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; + +/** + *

+ * mysql crud代码自动生成 + *

+ * + * @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 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(); + } + + +}