🚀 地图设计器调整完毕

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> mapTask;
+
+    @TableField(exist = false)
+    @ApiModelProperty("地图标记点列表")
+    private List<MapLogisticPoint> mapLogisticPoint;
+
 }

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;

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;
+
 /**
  * <p>
  *
@@ -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> mapTaskPreset;
+
 }

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;

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<MapLogistic> 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")
+    @PostMapping("/saveOrUpdate")
-    @ApiOperation(value = "保存", notes = "保存")
+    @ApiOperation(value = "保存与修改")
     public R save(@RequestBody MapLogistic mapLogistic) {
-        iMapLogisticService.save(mapLogistic);
+        iMapLogisticService.mapSaveOrUpdate(mapLogistic);
-        return R.ok();
-    }
-
-    @PutMapping("/update")
-    @ApiOperation(value = "修改", notes = "修改")
-    public R update(@RequestBody MapLogistic mapLogistic) {
-        iMapLogisticService.updateById(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());
+    }
+
 }
 

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;
 
 /**
  * <p>
@@ -13,4 +13,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IMapLogisticService extends IService<MapLogistic> {
 
+    /**
+     * 地图保存与修改
+     * @param mapLogistic 地图物流实体
+     */
+    boolean mapSaveOrUpdate(MapLogistic mapLogistic);
+
 }

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;
 
 /**
  * <p>
@@ -15,6 +28,42 @@ import org.springframework.stereotype.Service;
  * @since 2022-07-22
  */
 @Service
+@RequiredArgsConstructor
+@Transactional(rollbackFor = Exception.class)
 public class MapLogisticServiceImpl extends ServiceImpl<MapLogisticMapper, MapLogistic> 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.<MapTask>lambdaUpdate().eq(MapTask::getMapLogisticId, mapLogistic.getId()));
+        iMapTaskPresetService.remove(Wrappers.<MapTaskPreset>lambdaUpdate().eq(MapTaskPreset::getMapLogisticId, mapLogistic.getId()));
+        iMapLogisticPointService.remove(Wrappers.<MapLogisticPoint>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;
+    }
+
 }

kicc-ui

@@ -1 +1 @@
-Subproject commit 5fa79c38d6ca11bd579be32702f769274bd4be88
+Subproject commit 32a0d7d4b1b235e4a49f07268ee3e303595d0cfd