场站增加数据库偏移量字段

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/StationRecordInfo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.util.List;
 
+
 @Data
 public class StationRecordInfo {
 
@@ -40,4 +41,6 @@ public class StationRecordInfo {
     @ApiModelProperty(value = "风险等级")
     private String riskLevel;
 
+    @ApiModelProperty(value = "场站坐标偏移量")
+    private String titlePos;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/StationBasic.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jxiop.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.StationCoordinateDto;
 import io.swagger.annotations.ApiModelProperty;
@@ -20,7 +21,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("station_basic")
+@TableName(value = "station_basic",autoResultMap = true)
 public class StationBasic extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -139,8 +140,6 @@ public class StationBasic extends BaseEntity {
 
     @TableField(exist =false)
     private List<StationCoordinate> stationCoordinate;
-
-
     //新增 场站第三方编号
     @TableField("station_number")
     private String stationNumber;
@@ -150,6 +149,7 @@ public class StationBasic extends BaseEntity {
     //升压站网管
     @TableField("booster_gateway_id")
     private String boosterGatewayId;
-
-
+    //地图偏移量
+    @TableField(value = "title_pos",typeHandler = FastjsonTypeHandler.class)
+    private List<Double> titlePos;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml

@@ -114,6 +114,7 @@
         station_basic.station_flag stationFlag,
         station_basic.area_code areaCode,
         station_basic.jump_path,
+        station_basic.title_pos titlePos,
         station_basic.risk_level riskLevel,
         station_basic.belong_area belongArea,
         station_coordinate.longitude,

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/StationBasicServiceImpl.java

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.StationCoordinateDto;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.StationInfoDto;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.StationRecordInfo;
@@ -320,8 +322,13 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio
             if (stationRecordInfo.getBelongArea() != null) {
                 stationInfoDto.setRegion(this.getProviceName(stationRecordInfo.getBelongArea()));
             }
-            ArrayList<Double> arrayList = MapUtils.geoTo3d(Double.valueOf(stationRecordInfo.getLongitude()), Double.valueOf(stationRecordInfo.getLaitude()));
-            stationInfoDto.setTitlePos(arrayList);
+//            ArrayList<Double> arrayList = MapUtils.geoTo3d(Double.valueOf(stationRecordInfo.getLongitude()), Double.valueOf(stationRecordInfo.getLaitude()));
+            String []original = stationRecordInfo.getTitlePos().replace("[","").replace("]","").split(",");
+            ArrayList<Double> doubleList = new ArrayList<>();
+            for (String s : original) {
+                doubleList.add(Double.parseDouble(s));
+            }
+            stationInfoDto.setTitlePos(doubleList);
             stationInfoDto.setIndicatorData(indicatorList);
             stationInfoDto.setRiskLevel(stationRecordInfo.getRiskLevel());
             stationInfoDtoList.add(stationInfoDto);