Browse Source

🚀 地图设计器调整完毕

master
wangxiang 3 years ago
parent
commit
ed5d77b042
  1. 8
      kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Hospital.java
  2. 19
      kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java
  3. 8
      kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogisticPoint.java
  4. 9
      kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java
  5. 13
      kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTaskPreset.java
  6. 8
      kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Org.java
  7. 3
      kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/User.java
  8. 7
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticController.java

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

@ -8,8 +8,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.math.BigDecimal;
/** /**
*<p> *<p>
* 医院管理实体 * 医院管理实体
@ -47,11 +45,11 @@ public class Hospital extends CommonEntity {
private String status; private String status;
private BigDecimal mapOrientation; private Double mapOrientation;
private BigDecimal mapLng; private Double mapLng;
private BigDecimal mapLat; private Double mapLat;
private String mapNotify; private String mapNotify;

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

@ -4,19 +4,14 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version; import com.baomidou.mybatisplus.annotation.Version;
import com.cloud.kicc.common.data.entity.CommonEntity; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.time.LocalDateTime;
import java.util.List;
/** /**
* <p> * <p>
* 地图核心主任务表 * 地图核心主任务表
@ -46,10 +41,10 @@ public class MapLogistic extends CommonEntity {
private String courierUserName; private String courierUserName;
@ApiModelProperty("收样员起点经度值") @ApiModelProperty("收样员起点经度值")
private BigDecimal courierLng; private Double courierLng;
@ApiModelProperty("收样员起点纬度值") @ApiModelProperty("收样员起点纬度值")
private BigDecimal courierLat; private Double courierLat;
@ApiModelProperty("发单下级医院ID") @ApiModelProperty("发单下级医院ID")
private String sendOrderId; private String sendOrderId;
@ -58,10 +53,10 @@ public class MapLogistic extends CommonEntity {
private String sendOrderName; private String sendOrderName;
@ApiModelProperty("发单起点经度值") @ApiModelProperty("发单起点经度值")
private BigDecimal sendOrderLng; private Double sendOrderLng;
@ApiModelProperty("发单起点纬度值") @ApiModelProperty("发单起点纬度值")
private BigDecimal sendOrderLat; private Double sendOrderLat;
@ApiModelProperty("客服上传做项目原始单文件ID") @ApiModelProperty("客服上传做项目原始单文件ID")
private String fileId; private String fileId;

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

@ -4,13 +4,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version; import com.baomidou.mybatisplus.annotation.Version;
import com.cloud.kicc.common.data.entity.CommonEntity; import com.cloud.kicc.common.data.entity.CommonEntity;
import java.io.Serializable;
import java.math.BigDecimal;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
/** /**
@ -39,10 +35,10 @@ public class MapLogisticPoint extends CommonEntity {
private String hospitalName; private String hospitalName;
@ApiModelProperty("经度值") @ApiModelProperty("经度值")
private BigDecimal lng; private Double lng;
@ApiModelProperty("纬度值") @ApiModelProperty("纬度值")
private BigDecimal lat; private Double lat;
@ApiModelProperty("标记点排序") @ApiModelProperty("标记点排序")
private Integer sort; private Integer sort;

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

@ -9,7 +9,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@ -45,10 +44,10 @@ public class MapTask extends CommonEntity {
private String hospitalName; private String hospitalName;
@ApiModelProperty("医院经度值") @ApiModelProperty("医院经度值")
private BigDecimal hospitalLng; private Double hospitalLng;
@ApiModelProperty("医院纬度值") @ApiModelProperty("医院纬度值")
private BigDecimal hospitalLat; private Double hospitalLat;
@ApiModelProperty("医检医院id") @ApiModelProperty("医检医院id")
private String orgId; private String orgId;
@ -57,10 +56,10 @@ public class MapTask extends CommonEntity {
private String orgName; private String orgName;
@ApiModelProperty("医检医院经度值") @ApiModelProperty("医检医院经度值")
private BigDecimal orgLng; private Double orgLng;
@ApiModelProperty("医检医院纬度值") @ApiModelProperty("医检医院纬度值")
private BigDecimal orgLat; private Double orgLat;
@ApiModelProperty("收样员ID") @ApiModelProperty("收样员ID")
private String courierUserId; private String courierUserId;

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

@ -4,14 +4,13 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version; import com.baomidou.mybatisplus.annotation.Version;
import com.cloud.kicc.common.data.entity.CommonEntity; import com.cloud.kicc.common.data.entity.CommonEntity;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 地图交接预设点表 * 地图交接预设点表
@ -41,10 +40,10 @@ public class MapTaskPreset extends CommonEntity {
private String orginPresetName; private String orginPresetName;
@ApiModelProperty("起始预设点经度值") @ApiModelProperty("起始预设点经度值")
private BigDecimal orginPresetLng; private Double orginPresetLng;
@ApiModelProperty("起始预设点纬度值") @ApiModelProperty("起始预设点纬度值")
private BigDecimal orginPresetLat; private Double orginPresetLat;
@ApiModelProperty("终点预设点地址id") @ApiModelProperty("终点预设点地址id")
private String destinationPresetId; private String destinationPresetId;
@ -53,10 +52,10 @@ public class MapTaskPreset extends CommonEntity {
private String destinationPresetName; private String destinationPresetName;
@ApiModelProperty("终点预设点经度值") @ApiModelProperty("终点预设点经度值")
private BigDecimal destinationPresetLng; private Double destinationPresetLng;
@ApiModelProperty("终点预设点纬度值") @ApiModelProperty("终点预设点纬度值")
private BigDecimal destinationPresetLat; private Double destinationPresetLat;
@ApiModelProperty("收样员ID") @ApiModelProperty("收样员ID")
private String courierUserId; private String courierUserId;

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

@ -7,8 +7,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.math.BigDecimal;
/** /**
*<p> *<p>
* 上级医检机构实体 * 上级医检机构实体
@ -42,10 +40,10 @@ public class Org extends CommonEntity {
private String status; private String status;
private BigDecimal mapOrientation; private Double mapOrientation;
private BigDecimal mapLng; private Double mapLng;
private BigDecimal mapLat; private Double mapLat;
} }

3
kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/User.java

@ -9,7 +9,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
/** /**
@ -103,7 +102,7 @@ public class User extends CommonEntity {
/** /**
* 地图标记点位置图片旋转值 * 地图标记点位置图片旋转值
*/ */
private BigDecimal mapOrientation; private Double mapOrientation;
/** /**
* 地图设计器默认中心点位置 * 地图设计器默认中心点位置

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

@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* <p> * <p>
@ -104,9 +105,9 @@ public class MapLogisticController {
@PostMapping("/uploadGps") @PostMapping("/uploadGps")
@ApiOperation(value = "安卓定时上传GPS定位") @ApiOperation(value = "安卓定时上传GPS定位")
public R uploadGps(MapLogistic mapLogistic) { public R uploadGps(@RequestBody Map<String, Object> mapLogistic) {
System.out.println("当前安卓GPS定位为: 经度值:"+ mapLogistic.getCourierLng() + "||纬度值:" + mapLogistic.getCourierLat() + "||收样员id:" +mapLogistic.getCourierUserId()+ "||收样员名称:" +mapLogistic.getCourierUserName()); System.out.println("当前安卓GPS定位为: 经度值:"+ mapLogistic.get("courierLng") + "||纬度值:" + mapLogistic.get("courierLat") + "||收样员id:" + mapLogistic.get("courierUserId") + "||收样员名称:" + mapLogistic.get("courierUserName"));
return R.ok("当前安卓GPS定位为: 经度值:"+ mapLogistic.getCourierLng() + "||纬度值:" + mapLogistic.getCourierLat() + "||收样员id:" +mapLogistic.getCourierUserId()+ "||收样员名称:" +mapLogistic.getCourierUserName()); return R.ok("当前安卓GPS定位为: 经度值:"+ mapLogistic.get("courierLng") + "||纬度值:" + mapLogistic.get("courierLat") + "||收样员id:" + mapLogistic.get("courierUserId") + "||收样员名称:" + mapLogistic.get("courierUserName"));
} }
} }

Loading…
Cancel
Save