🧬编写地图模块api

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

@@ -7,20 +7,20 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 
+ * 地图交接预设点表
  * </p>
  *
  * @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
  */
-@Getter
-@Setter
+@Data
 @Accessors(chain = true)
 @TableName("common_map_handover_preset")
 @ApiModel(value = "MapHandoverPreset对象", description = "")

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

@@ -6,20 +6,20 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 地图核心主任务表
+ * 地图地图标记点表
  * </p>
  *
  * @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
  */
-@Getter
-@Setter
+@Data
 @Accessors(chain = true)
 @TableName("common_map_logistic_point")
 @ApiModel(value = "MapLogisticPoint对象", description = "地图核心主任务表")

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

@@ -0,0 +1,72 @@
+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;
+
+/**
+ * <p>
+ * 地图核心主任务表
+ * </p>
+ *
+ * @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;
+
+
+}

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

@@ -7,20 +7,20 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 
+ * 地图任务表
  * </p>
  *
  * @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
  */
-@Getter
-@Setter
+@Data
 @Accessors(chain = true)
 @TableName("common_map_task")
 @ApiModel(value = "MapTask对象", description = "")
@@ -76,7 +76,7 @@ public class MapTask extends CommonEntity {
     @ApiModelProperty("关联报告单生成的批次码")
     private String batchCode;
 
-    @ApiModelProperty("
地图主线物流ID")
+    @ApiModelProperty("地图主线物流ID")
     private String mapLogisticId;
 
 

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

@@ -7,10 +7,10 @@ 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.LogisticMap;
 import com.cloud.kicc.commonbiz.api.entity.MapHandoverPreset;
 import com.cloud.kicc.commonbiz.service.IMapHandoverPresetService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
@@ -21,9 +21,9 @@ import java.util.Arrays;
  * </p>
  *
  * @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
  */
-@RestController
+@Controller
 @RequestMapping(AppConstants.APP_COMMON + "/mapHandoverPreset")
 @RequiredArgsConstructor
 public class MapHandoverPresetController {
@@ -32,14 +32,14 @@ public class MapHandoverPresetController {
 
     private LambdaQueryWrapper<MapHandoverPreset> getQueryWrapper(MapHandoverPreset mapHandoverPreset) {
         return new LambdaQueryWrapper<MapHandoverPreset>()
-                .eq(StrUtil.isNotBlank(mapHandoverPreset.getMapLogisticId()), MapHandoverPreset::getMapLogisticId, mapHandoverPreset.getMapLogisticId())
-                .eq(StrUtil.isNotBlank(mapHandoverPreset.getCourierUserId()), MapHandoverPreset::getCourierUserId, mapHandoverPreset.getCourierUserId());
+                .like(StrUtil.isNotBlank(mapHandoverPreset.getName()), MapHandoverPreset::getName, mapHandoverPreset.getName())
+                .eq(StrUtil.isNotBlank(mapHandoverPreset.getMapLogisticId()), MapHandoverPreset::getMapLogisticId, mapHandoverPreset.getMapLogisticId());
     }
 
     @GetMapping("/list")
     public R list(Page page, MapHandoverPreset mapHandoverPreset) {
-        IPage<LogisticMap> iPage = iMapHandoverPresetService.page(page, getQueryWrapper(mapHandoverPreset));
-        return R.ok(iPage.getRecords(), iPage.getTotal());
+        IPage<MapHandoverPreset> result = iMapHandoverPresetService.page(page, getQueryWrapper(mapHandoverPreset));
+        return R.ok(result.getRecords(), result.getTotal());
     }
 
     @GetMapping("/{id:\\w+}")
@@ -48,5 +48,23 @@ public class MapHandoverPresetController {
         return R.ok(mapHandoverPreset);
     }
 
+    @PostMapping("/save")
+    public R save(@RequestBody MapHandoverPreset mapHandoverPreset) {
+        iMapHandoverPresetService.save(mapHandoverPreset);
+        return R.ok();
+    }
+
+    @PutMapping("/update")
+    public R update(@RequestBody MapHandoverPreset mapHandoverPreset) {
+        iMapHandoverPresetService.updateById(mapHandoverPreset);
+        return R.ok();
+    }
+
+    @DeleteMapping("/remove/{ids:[\\w,]+}")
+    public R remove(@PathVariable String[] ids) {
+        iMapHandoverPresetService.removeByIds(Arrays.asList(ids));
+        return R.ok();
+    }
+
 }
 

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

@@ -3,15 +3,17 @@ 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.dto.MapHandoverPresetDto;
 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 java.util.List;
+import java.util.Arrays;
 
 /**
  * <p>
@@ -19,9 +21,9 @@ import java.util.List;
  * </p>
  *
  * @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
  */
-@RestController
+@Controller
 @RequestMapping(AppConstants.APP_COMMON + "/mapLogisticPoint")
 @RequiredArgsConstructor
 public class MapLogisticPointController {
@@ -30,13 +32,14 @@ public class MapLogisticPointController {
 
     private LambdaQueryWrapper<MapLogisticPoint> getQueryWrapper(MapLogisticPoint mapLogisticPoint) {
         return new LambdaQueryWrapper<MapLogisticPoint>()
-                .eq(StrUtil.isNotBlank(mapLogisticPoint.getMapLogisticId()), MapLogisticPoint::getMapLogisticId, mapLogisticPoint.getMapLogisticId());
+                .eq(StrUtil.isNotBlank(mapLogisticPoint.getMapLogisticId()), MapLogisticPoint::getMapLogisticId, mapLogisticPoint.getMapLogisticId())
+                .eq(StrUtil.isNotBlank(mapLogisticPoint.getTaskId()), MapLogisticPoint::getTaskId, mapLogisticPoint.getTaskId());
     }
 
     @GetMapping("/list")
-    public R list(MapLogisticPoint mapLogisticPoint) {
-        List<MapLogisticPoint> list = iMapLogisticPointService.list(getQueryWrapper(mapLogisticPoint));
-        return R.ok(list, list.size());
+    public R list(Page page, MapLogisticPoint mapLogisticPoint) {
+        IPage<MapLogisticPoint> result = iMapLogisticPointService.page(page, getQueryWrapper(mapLogisticPoint));
+        return R.ok(result.getRecords(), result.getTotal());
     }
 
     @GetMapping("/{id:\\w+}")
@@ -46,8 +49,20 @@ public class MapLogisticPointController {
     }
 
     @PostMapping("/save")
-    public R save(@RequestBody MapHandoverPresetDto mapHandoverPresetDto) {
-        iMapLogisticPointService.insertLogisticPoints(mapHandoverPresetDto.getMapLogisticId(), mapHandoverPresetDto.getMapLogisticPoints());
+    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();
     }
 

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

@@ -0,0 +1,70 @@
+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;
+
+/**
+ * <p>
+ * 地图核心主任务表 前端控制器
+ * </p>
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-08-15
+ */
+@Controller
+@RequestMapping(AppConstants.APP_COMMON + "/mapManage")
+@RequiredArgsConstructor
+public class MapManageController {
+
+    private final IMapManageService iMapManageService;
+
+    private LambdaQueryWrapper<MapManage> getQueryWrapper(MapManage mapManage) {
+        return new LambdaQueryWrapper<MapManage>()
+                .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<MapManage> 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();
+    }
+
+}
+

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

@@ -10,10 +10,10 @@ 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.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
 
 /**
  * <p>
@@ -21,9 +21,9 @@ import org.springframework.web.bind.annotation.RestController;
  * </p>
  *
  * @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
  */
-@RestController
+@Controller
 @RequestMapping(AppConstants.APP_COMMON + "/mapTask")
 @RequiredArgsConstructor
 public class MapTaskController {
@@ -32,23 +32,39 @@ public class MapTaskController {
 
     private LambdaQueryWrapper<MapTask> getQueryWrapper(MapTask mapTask) {
         return new LambdaQueryWrapper<MapTask>()
-                .eq(StrUtil.isNotBlank(mapTask.getMapLogisticId()), MapTask::getMapLogisticId, mapTask.getMapLogisticId())
-                .eq(StrUtil.isNotBlank(mapTask.getBatchCode()), MapTask::getBatchCode, mapTask.getBatchCode())
-                .eq(StrUtil.isNotBlank(mapTask.getTaskType()), MapTask::getTaskType, mapTask.getTaskType());
+                .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<MapTask> iPage = iMapTaskService.page(page, getQueryWrapper(mapTask));
-        return R.ok(iPage.getRecords(), iPage.getTotal());
+        IPage<MapTask> 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);
+        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();
+    }
 
 }
 

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
  */
 public interface MapHandoverPresetMapper extends BaseMapper<MapHandoverPreset> {
 

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;
  * </p>
  *
  * @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
  */
 public interface MapLogisticPointMapper extends BaseMapper<MapLogisticPoint> {
 

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

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

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;
  * </p>
  *
  * @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
  */
 public interface MapTaskMapper extends BaseMapper<MapTask> {
 

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

@@ -1,9 +1,7 @@
 package com.cloud.kicc.commonbiz.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.cloud.kicc.commonbiz.api.entity.MapHandoverPreset;
-
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -11,17 +9,8 @@ import java.util.List;
  * </p>
  *
  * @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
  */
 public interface IMapHandoverPresetService extends IService<MapHandoverPreset> {
 
-    /**
-     * 新增物流标记点
-     * @param taskId 任务ID
-     * @param mapHandoverPresets 交接点任务数据
-     * @return boolean
-     */
-    boolean insertLogisticPoints(String taskId, List<MapHandoverPreset> mapHandoverPresets);
-
-
 }

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

@@ -2,9 +2,6 @@ package com.cloud.kicc.commonbiz.service;
 
 import com.cloud.kicc.commonbiz.api.entity.MapLogisticPoint;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
 
 /**
  * <p>
@@ -12,16 +9,8 @@ import java.util.List;
  * </p>
  *
  * @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
  */
 public interface IMapLogisticPointService extends IService<MapLogisticPoint> {
 
-    /**
-     * 新增物流标记点
-     * @param mapLogisticId 主线地图ID
-     * @param mapLogisticPoints 标记点数据
-     * @return boolean
-     */
-    boolean insertLogisticPoints(String mapLogisticId, List<MapLogisticPoint> mapLogisticPoints);
-
 }

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

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

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;
  * </p>
  *
  * @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
  */
 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

@@ -1,30 +1,20 @@
 package com.cloud.kicc.commonbiz.service.impl;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cloud.kicc.commonbiz.api.entity.MapHandoverPreset;
-import com.cloud.kicc.commonbiz.api.entity.MapLogisticPoint;
 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;
 
-import java.util.List;
-
 /**
  * <p>
  *  服务实现类
  * </p>
  *
  * @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
  */
 @Service
 public class MapHandoverPresetServiceImpl extends ServiceImpl<MapHandoverPresetMapper, MapHandoverPreset> implements IMapHandoverPresetService {
 
-    @Override
-    public boolean insertLogisticPoints(String taskId, List<MapHandoverPreset> mapHandoverPresets) {
-        remove(Wrappers.<MapHandoverPreset>update().lambda().eq(MapHandoverPreset::getTaskId, taskId));
-        return saveBatch(mapHandoverPresets);
-    }
-
 }

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

@@ -1,14 +1,10 @@
 package com.cloud.kicc.commonbiz.service.impl;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
 
 /**
  * <p>
@@ -16,16 +12,9 @@ import java.util.List;
  * </p>
  *
  * @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
  */
 @Service
-@Transactional(rollbackFor = Exception.class)
 public class MapLogisticPointServiceImpl extends ServiceImpl<MapLogisticPointMapper, MapLogisticPoint> implements IMapLogisticPointService {
 
-    @Override
-    public boolean insertLogisticPoints(String mapLogisticId, List<MapLogisticPoint> mapLogisticPoints) {
-        remove(Wrappers.<MapLogisticPoint>update().lambda().eq(MapLogisticPoint::getMapLogisticId, mapLogisticId));
-        return saveBatch(mapLogisticPoints);
-    }
-
 }

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

@@ -0,0 +1,20 @@
+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;
+
+/**
+ * <p>
+ * 地图核心主任务表 服务实现类
+ * </p>
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-08-15
+ */
+@Service
+public class MapManageServiceImpl extends ServiceImpl<MapManageMapper, MapManage> implements IMapManageService {
+
+}

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;
  * </p>
  *
  * @author entfrm开发团队-王翔
- * @since 2022-07-23
+ * @since 2022-08-15
  */
 @Service
 public class MapTaskServiceImpl extends ServiceImpl<MapTaskMapper, MapTask> implements IMapTaskService {

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapManageMapper.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.MapManageMapper">
+
+</mapper>

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

@@ -18,19 +18,19 @@ 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 url = "jdbc:mysql://127.0.0.1:3306/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 password = "root";
 
         String author = "entfrm开发团队-王翔";
 
-        String rootOutputDir = "/Users/wangxiang/IdeaProjects/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 entityOutputDir = "/Users/wangxiang/IdeaProjects/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 mapperXmlOutputDir = "/Users/wangxiang/IdeaProjects/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 packageParent = "com.cloud.kicc.commonbiz";