From c87a408e46231baf27f3fb28dc4b1ebe2a61772c Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Thu, 1 Sep 2022 16:53:37 +0800 Subject: [PATCH] =?UTF-8?q?:rocket:=20=E5=9C=B0=E5=9B=BE=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E8=B0=83=E6=95=B4=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commonbiz/api/entity/MapLogistic.java | 14 ++++- .../api/entity/MapLogisticPoint.java | 7 ++- .../kicc/commonbiz/api/entity/MapTask.java | 20 +++++--- .../commonbiz/api/entity/MapTaskPreset.java | 7 ++- .../controller/MapLogisticController.java | 26 +++++----- .../service/IMapLogisticService.java | 8 ++- .../service/impl/MapLogisticServiceImpl.java | 51 ++++++++++++++++++- kicc-ui | 2 +- 8 files changed, 110 insertions(+), 25 deletions(-) diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java index 816c0f10..7675cd21 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java @@ -1,11 +1,15 @@ package com.cloud.kicc.commonbiz.api.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.Version; import com.cloud.kicc.common.data.entity.CommonEntity; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,7 +27,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@TableName(value = "common_map_logistic", excludeProperty = { "delFlag" }) +@TableName(value = "common_map_logistic", excludeProperty = { "delFlag", "remarks" }) @ApiModel(value = "Map对象", description = "地图核心主任务表") public class MapLogistic extends CommonEntity { @@ -75,4 +79,12 @@ public class MapLogistic extends CommonEntity { @ApiModelProperty("版本控制") private Integer version; + @TableField(exist = false) + @ApiModelProperty("任务列表") + private List mapTask; + + @TableField(exist = false) + @ApiModelProperty("地图标记点列表") + private List mapLogisticPoint; + } 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 index 50668c13..98d3d966 100644 --- 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 @@ -1,5 +1,6 @@ package com.cloud.kicc.commonbiz.api.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.Version; import com.cloud.kicc.common.data.entity.CommonEntity; @@ -22,7 +23,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@TableName(value = "common_map_logistic_point", excludeProperty = { "delFlag" }) +@TableName(value = "common_map_logistic_point", excludeProperty = { "delFlag", "remarks" }) @ApiModel(value = "MapLogisticPoint对象", description = "地图核心主任务表") public class MapLogisticPoint extends CommonEntity { @@ -58,6 +59,10 @@ public class MapLogisticPoint extends CommonEntity { @ApiModelProperty("地图任务ID") private String mapTaskId; + @TableField(exist = false) + @ApiModelProperty("表格操作key") + private String key; + @Version @ApiModelProperty("版本控制") private Integer version; 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 26396302..785df845 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,18 +1,18 @@ package com.cloud.kicc.commonbiz.api.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.Version; 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; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + /** *

* @@ -23,7 +23,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@TableName(value = "common_map_task", excludeProperty = { "delFlag" }) +@TableName(value = "common_map_task", excludeProperty = { "delFlag", "remarks" }) @ApiModel(value = "MapTask对象") public class MapTask extends CommonEntity { @@ -84,4 +84,12 @@ public class MapTask extends CommonEntity { @ApiModelProperty("版本控制") private Integer version; + @TableField(exist = false) + @ApiModelProperty("表格操作key") + private String key; + + @TableField(exist = false) + @ApiModelProperty("地图交接预设任务列表") + private List mapTaskPreset; + } diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTaskPreset.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTaskPreset.java index 13a35507..df9a4889 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTaskPreset.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTaskPreset.java @@ -1,5 +1,6 @@ package com.cloud.kicc.commonbiz.api.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.Version; import com.cloud.kicc.common.data.entity.CommonEntity; @@ -21,7 +22,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@TableName(value = "common_map_task_preset", excludeProperty = { "delFlag" }) +@TableName(value = "common_map_task_preset", excludeProperty = { "delFlag", "remarks" }) @ApiModel(value = "MapHandoverPreset对象") public class MapTaskPreset extends CommonEntity { @@ -78,6 +79,10 @@ public class MapTaskPreset extends CommonEntity { @ApiModelProperty("地图任务ID") private String mapTaskId; + @TableField(exist = false) + @ApiModelProperty("表格操作key") + private String key; + @Version @ApiModelProperty("版本控制") private Integer version; diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticController.java index 12e723dc..7e6c3fab 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticController.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticController.java @@ -41,39 +41,39 @@ public class MapLogisticController { } @GetMapping("/list") - @ApiOperation(value = "分页查询", notes = "分页查询") + @ApiOperation(value = "分页查询") public R list(Page page, MapLogistic mapLogistic) { IPage iPage = iMapLogisticService.page(page, getQueryWrapper(mapLogistic)); return R.ok(iPage.getRecords(), iPage.getTotal()); } @GetMapping("/{id:\\w+}") - @ApiOperation(value = "根据id获取", notes = "根据id获取") + @ApiOperation(value = "根据id获取") public R getById(@PathVariable("id") String id) { MapLogistic mapLogistic = iMapLogisticService.getById(id); return R.ok(mapLogistic); } - @PostMapping("/save") - @ApiOperation(value = "保存", notes = "保存") + @PostMapping("/saveOrUpdate") + @ApiOperation(value = "保存与修改") public R save(@RequestBody MapLogistic mapLogistic) { - iMapLogisticService.save(mapLogistic); - return R.ok(); - } - - @PutMapping("/update") - @ApiOperation(value = "修改", notes = "修改") - public R update(@RequestBody MapLogistic mapLogistic) { - iMapLogisticService.updateById(mapLogistic); + iMapLogisticService.mapSaveOrUpdate(mapLogistic); return R.ok(); } @DeleteMapping("/remove/{ids:[\\w,]+}") - @ApiOperation(value = "删除", notes = "删除") + @ApiOperation(value = "删除") public R remove(@PathVariable String[] ids) { iMapLogisticService.removeByIds(Arrays.asList(ids)); return R.ok(); } + @PostMapping("/uploadGps") + @ApiOperation(value = "安卓定时上传GPS定位") + public R uploadGps(MapLogistic mapLogistic) { + System.out.println("当前安卓GPS定位为: 经度值:"+ mapLogistic.getCourierLng() + "||纬度值:" + mapLogistic.getCourierLat() + "||收样员id:" +mapLogistic.getCourierUserId()+ "||收样员名称:" +mapLogistic.getCourierUserName()); + return R.ok("当前安卓GPS定位为: 经度值:"+ mapLogistic.getCourierLng() + "||纬度值:" + mapLogistic.getCourierLat() + "||收样员id:" +mapLogistic.getCourierUserId()+ "||收样员名称:" +mapLogistic.getCourierUserName()); + } + } diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapLogisticService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapLogisticService.java index 37d9df1a..d72260eb 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapLogisticService.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IMapLogisticService.java @@ -1,7 +1,7 @@ package com.cloud.kicc.commonbiz.service; -import com.cloud.kicc.commonbiz.api.entity.MapLogistic; import com.baomidou.mybatisplus.extension.service.IService; +import com.cloud.kicc.commonbiz.api.entity.MapLogistic; /** *

@@ -13,4 +13,10 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IMapLogisticService extends IService { + /** + * 地图保存与修改 + * @param mapLogistic 地图物流实体 + */ + boolean mapSaveOrUpdate(MapLogistic mapLogistic); + } diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticServiceImpl.java index f20359a4..6729fff6 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticServiceImpl.java @@ -1,10 +1,23 @@ package com.cloud.kicc.commonbiz.service.impl; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.cloud.kicc.commonbiz.api.entity.MapLogistic; +import com.cloud.kicc.commonbiz.api.entity.MapLogisticPoint; +import com.cloud.kicc.commonbiz.api.entity.MapTask; +import com.cloud.kicc.commonbiz.api.entity.MapTaskPreset; import com.cloud.kicc.commonbiz.mapper.MapLogisticMapper; +import com.cloud.kicc.commonbiz.service.IMapLogisticPointService; import com.cloud.kicc.commonbiz.service.IMapLogisticService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.cloud.kicc.commonbiz.service.IMapTaskPresetService; +import com.cloud.kicc.commonbiz.service.IMapTaskService; +import lombok.RequiredArgsConstructor; +import org.apache.poi.ss.formula.functions.T; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Optional; /** *

@@ -15,6 +28,42 @@ import org.springframework.stereotype.Service; * @since 2022-07-22 */ @Service +@RequiredArgsConstructor +@Transactional(rollbackFor = Exception.class) public class MapLogisticServiceImpl extends ServiceImpl implements IMapLogisticService { + private final IMapTaskService iMapTaskService; + private final IMapTaskPresetService iMapTaskPresetService; + private final IMapLogisticPointService iMapLogisticPointService; + + @Override + public boolean mapSaveOrUpdate(MapLogistic mapLogistic) { + // 保存不做过多的处理,直接先删后加,由于前端未做操作记录池功能,不能实现表格数据的增删改 + super.removeById(mapLogistic); + iMapTaskService.remove(Wrappers.lambdaUpdate().eq(MapTask::getMapLogisticId, mapLogistic.getId())); + iMapTaskPresetService.remove(Wrappers.lambdaUpdate().eq(MapTaskPreset::getMapLogisticId, mapLogistic.getId())); + iMapLogisticPointService.remove(Wrappers.lambdaUpdate().eq(MapLogisticPoint::getMapLogisticId, mapLogistic.getId())); + super.save(mapLogistic); + mapLogistic.getMapTask().forEach(mapTask -> { + mapTask.setMapLogisticId(mapLogistic.getId()); + iMapTaskService.save(mapTask); + // 匹配查找跟地图任务关联的地图标记点数据 + MapLogisticPoint mapLogisticPoint = mapLogistic.getMapLogisticPoint().stream() + .filter(item -> item.getKey().equals("1")).findFirst().get(); + if (ObjectUtil.isNotEmpty(mapLogisticPoint)){ + mapLogisticPoint.setMapLogisticId(mapLogistic.getId()); + mapLogisticPoint.setMapTaskId(mapTask.getId()); + iMapLogisticPointService.save(mapLogisticPoint); + } + if (ObjectUtil.isNotEmpty(mapTask.getMapTaskPreset())) { + mapTask.getMapTaskPreset().forEach(mapTaskPreset -> { + mapTaskPreset.setMapLogisticId(mapLogistic.getId()); + mapTaskPreset.setMapTaskId(mapTask.getId()); + iMapTaskPresetService.save(mapTaskPreset); + }); + } + }); + return false; + } + } diff --git a/kicc-ui b/kicc-ui index 5fa79c38..32a0d7d4 160000 --- a/kicc-ui +++ b/kicc-ui @@ -1 +1 @@ -Subproject commit 5fa79c38d6ca11bd579be32702f769274bd4be88 +Subproject commit 32a0d7d4b1b235e4a49f07268ee3e303595d0cfd