From 7af2728ff25676609d38cdf29c148f919341b613 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Fri, 26 Aug 2022 16:36:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E5=AD=90=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/dto/MapHandoverPresetDto.java | 23 ------ ...HandoverPreset.java => MapTaskPreset.java} | 12 ++-- .../MapHandoverPresetController.java | 70 ------------------- .../controller/MapTaskPresetController.java | 70 +++++++++++++++++++ ...etMapper.java => MapTaskPresetMapper.java} | 4 +- ...ervice.java => IMapTaskPresetService.java} | 4 +- .../impl/MapHandoverPresetServiceImpl.java | 20 ------ .../impl/MapTaskPresetServiceImpl.java | 20 ++++++ ...esetMapper.xml => MapTaskPresetMapper.xml} | 2 +- 9 files changed, 100 insertions(+), 125 deletions(-) delete mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/dto/MapHandoverPresetDto.java rename kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/{MapHandoverPreset.java => MapTaskPreset.java} (87%) delete mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapHandoverPresetController.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskPresetController.java rename kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/{MapHandoverPresetMapper.java => MapTaskPresetMapper.java} (58%) rename kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/{IMapHandoverPresetService.java => IMapTaskPresetService.java} (58%) delete mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapHandoverPresetServiceImpl.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapTaskPresetServiceImpl.java rename kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/{MapHandoverPresetMapper.xml => MapTaskPresetMapper.xml} (67%) diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/dto/MapHandoverPresetDto.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/dto/MapHandoverPresetDto.java deleted file mode 100644 index e0b129dd..00000000 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/dto/MapHandoverPresetDto.java +++ /dev/null @@ -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; - -/** - *

- * 地图标记点Dto - *

- * - * @Author: entfrm开发团队-王翔 - * @since: 2022/7/23 - */ -@Data -public class MapHandoverPresetDto { - - private String mapLogisticId; - - private List mapLogisticPoints; - -} 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/MapTaskPreset.java similarity index 87% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapHandoverPreset.java rename to kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTaskPreset.java index a0a870a6..73bed16d 100644 --- 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/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") -@ApiModel(value = "MapHandoverPreset对象", description = "") -public class MapHandoverPreset extends CommonEntity { +@TableName("common_map_task_preset") +@ApiModel(value = "MapHandoverPreset对象") +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") 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 deleted file mode 100644 index 48ee0451..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapHandoverPresetController.java +++ /dev/null @@ -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; - -/** - *

- * 前端控制器 - *

- * - * @author entfrm开发团队-王翔 - * @since 2022-08-15 - */ -@Controller -@RequestMapping(AppConstants.APP_COMMON + "/mapHandoverPreset") -@RequiredArgsConstructor -public class MapHandoverPresetController { - - private final IMapHandoverPresetService iMapHandoverPresetService; - - private LambdaQueryWrapper getQueryWrapper(MapHandoverPreset mapHandoverPreset) { - return new LambdaQueryWrapper() - .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 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(); - } - -} - diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskPresetController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskPresetController.java new file mode 100644 index 00000000..87621e5f --- /dev/null +++ b/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; + +/** + *

+ * 前端控制器 + *

+ * + * @author entfrm开发团队-王翔 + * @since 2022-08-15 + */ +@Controller +@RequestMapping(AppConstants.APP_COMMON + "/mapTaskPreset") +@RequiredArgsConstructor +public class MapTaskPresetController { + + private final IMapTaskPresetService iMapTaskPresetService; + + private LambdaQueryWrapper getQueryWrapper(MapTaskPreset mapTaskPreset) { + return new LambdaQueryWrapper() + .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 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(); + } + +} + 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/MapTaskPresetMapper.java similarity index 58% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapHandoverPresetMapper.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/MapTaskPresetMapper.java index 064a7832..d533ef3f 100644 --- 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/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 { +public interface MapTaskPresetMapper 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/IMapTaskPresetService.java similarity index 58% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapHandoverPresetService.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapTaskPresetService.java index ca63662e..d5ab0926 100644 --- 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/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 { +public interface IMapTaskPresetService 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 deleted file mode 100644 index 683d9b4b..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapHandoverPresetServiceImpl.java +++ /dev/null @@ -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; - -/** - *

- * 服务实现类 - *

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

+ * 服务实现类 + *

+ * + * @author entfrm开发团队-王翔 + * @since 2022-08-15 + */ +@Service +public class MapTaskPresetServiceImpl extends ServiceImpl implements IMapTaskPresetService { + +} 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/MapTaskPresetMapper.xml similarity index 67% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapHandoverPresetMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/MapTaskPresetMapper.xml index e2f36eb6..47275fcc 100644 --- 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/MapTaskPresetMapper.xml @@ -1,5 +1,5 @@ - +