+ * 地图核心主任务表 + *
+ * + * @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 @@+ * 地图核心主任务表 前端控制器 + *
+ * + * @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+ * Mapper 接口 + *
+ * + * @author entfrm开发团队-王翔 + * @since 2022-07-22 + */ +public interface MapHandoverPresetMapper extends BaseMapper+ * 地图核心主任务表 Mapper 接口 + *
+ * + * @author entfrm开发团队-王翔 + * @since 2022-07-22 + */ +public interface MapLogisticPointMapper extends BaseMapper+ * 地图核心主任务表 Mapper 接口 + *
+ * + * @author entfrm开发团队-王翔 + * @since 2022-07-22 + */ +public interface MapMapper extends BaseMapper