修改成子任务

kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/dto/MapHandoverPresetDto.java

@@ -1,23 +0,0 @@
-package com.cloud.kicc.commonbiz.api.dto;
-
-import com.cloud.kicc.commonbiz.api.entity.MapLogisticPoint;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- *<p>
- * 地图标记点Dto
- *</p>
- *
- * @Author: entfrm开发团队-王翔
- * @since: 2022/7/23
- */
-@Data
-public class MapHandoverPresetDto {
-
-    private String mapLogisticId;
-
-    private List<MapLogisticPoint> mapLogisticPoints;
-
-}

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

@@ -2,14 +2,12 @@ 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.Data;
-import lombok.Getter;
-import lombok.Setter;
 import lombok.experimental.Accessors;
 
 /**
@@ -22,9 +20,9 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@TableName("common_map_handover_preset")
+@TableName("common_map_task_preset")
-@ApiModel(value = "MapHandoverPreset对象", description = "")
+@ApiModel(value = "MapHandoverPreset对象")
-public class MapHandoverPreset extends CommonEntity {
+public class MapTaskPreset extends CommonEntity {
 
     private static final long serialVersionUID = 1L;
 
@@ -73,7 +71,7 @@ public class MapHandoverPreset extends CommonEntity {
     @ApiModelProperty("关联报告单生成的批次码")
     private String batchCode;
 
-    @ApiModelProperty("
地图主线物流ID")
+    @ApiModelProperty("地图主线物流ID")
     private String mapLogisticId;
 
     @ApiModelProperty("地图任务ID")

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

@@ -1,70 +0,0 @@
-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.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;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author entfrm开发团队-王翔
- * @since 2022-08-15
- */
-@Controller
-@RequestMapping(AppConstants.APP_COMMON + "/mapHandoverPreset")
-@RequiredArgsConstructor
-public class MapHandoverPresetController {
-
-    private final IMapHandoverPresetService iMapHandoverPresetService;
-
-    private LambdaQueryWrapper<MapHandoverPreset> getQueryWrapper(MapHandoverPreset mapHandoverPreset) {
-        return new LambdaQueryWrapper<MapHandoverPreset>()
-                .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<MapHandoverPreset> result = iMapHandoverPresetService.page(page, getQueryWrapper(mapHandoverPreset));
-        return R.ok(result.getRecords(), result.getTotal());
-    }
-
-    @GetMapping("/{id:\\w+}")
-    public R getById(@PathVariable("id") String id) {
-        MapHandoverPreset mapHandoverPreset = iMapHandoverPresetService.getById(id);
-        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/MapTaskPresetController.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.MapTaskPreset;
+import com.cloud.kicc.commonbiz.service.IMapTaskPresetService;
+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 + "/mapTaskPreset")
+@RequiredArgsConstructor
+public class MapTaskPresetController {
+
+    private final IMapTaskPresetService iMapTaskPresetService;
+
+    private LambdaQueryWrapper<MapTaskPreset> getQueryWrapper(MapTaskPreset mapTaskPreset) {
+        return new LambdaQueryWrapper<MapTaskPreset>()
+                .like(StrUtil.isNotBlank(mapTaskPreset.getName()), MapTaskPreset::getName, mapTaskPreset.getName())
+                .eq(StrUtil.isNotBlank(mapTaskPreset.getMapLogisticId()), MapTaskPreset::getMapLogisticId, mapTaskPreset.getMapLogisticId());
+    }
+
+    @GetMapping("/list")
+    public R list(Page page, MapTaskPreset mapTaskPreset) {
+        IPage<MapTaskPreset> result = iMapTaskPresetService.page(page, getQueryWrapper(mapTaskPreset));
+        return R.ok(result.getRecords(), result.getTotal());
+    }
+
+    @GetMapping("/{id:\\w+}")
+    public R getById(@PathVariable("id") String id) {
+        MapTaskPreset mapTaskPreset = iMapTaskPresetService.getById(id);
+        return R.ok(mapTaskPreset);
+    }
+
+    @PostMapping("/save")
+    public R save(@RequestBody MapTaskPreset mapTaskPreset) {
+        iMapTaskPresetService.save(mapTaskPreset);
+        return R.ok();
+    }
+
+    @PutMapping("/update")
+    public R update(@RequestBody MapTaskPreset mapTaskPreset) {
+        iMapTaskPresetService.updateById(mapTaskPreset);
+        return R.ok();
+    }
+
+    @DeleteMapping("/remove/{ids:[\\w,]+}")
+    public R remove(@PathVariable String[] ids) {
+        iMapTaskPresetService.removeByIds(Arrays.asList(ids));
+        return R.ok();
+    }
+
+}
+

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

@@ -1,6 +1,6 @@
 package com.cloud.kicc.commonbiz.mapper;
 
-import com.cloud.kicc.commonbiz.api.entity.MapHandoverPreset;
+import com.cloud.kicc.commonbiz.api.entity.MapTaskPreset;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author entfrm开发团队-王翔
  * @since 2022-08-15
  */
-public interface MapHandoverPresetMapper extends BaseMapper<MapHandoverPreset> {
+public interface MapTaskPresetMapper extends BaseMapper<MapTaskPreset> {
 
 }

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

@@ -1,6 +1,6 @@
 package com.cloud.kicc.commonbiz.service;
 
-import com.cloud.kicc.commonbiz.api.entity.MapHandoverPreset;
+import com.cloud.kicc.commonbiz.api.entity.MapTaskPreset;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author entfrm开发团队-王翔
  * @since 2022-08-15
  */
-public interface IMapHandoverPresetService extends IService<MapHandoverPreset> {
+public interface IMapTaskPresetService extends IService<MapTaskPreset> {
 
 }

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

@@ -1,20 +0,0 @@
-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-08-15
- */
-@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/MapTaskPresetServiceImpl.java

@@ -0,0 +1,20 @@
+package com.cloud.kicc.commonbiz.service.impl;
+
+import com.cloud.kicc.commonbiz.api.entity.MapTaskPreset;
+import com.cloud.kicc.commonbiz.mapper.MapTaskPresetMapper;
+import com.cloud.kicc.commonbiz.service.IMapTaskPresetService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author entfrm开发团队-王翔
+ * @since 2022-08-15
+ */
+@Service
+public class MapTaskPresetServiceImpl extends ServiceImpl<MapTaskPresetMapper, MapTaskPreset> implements IMapTaskPresetService {
+
+}

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

@@ -1,5 +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 namespace="com.cloud.kicc.commonbiz.mapper.MapTaskPresetMapper">
 
 </mapper>