地图相关接口开发

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

+package com.yeejoin.amos.boot.module.jxiop.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-06-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="IndicatorDto", description="")
+public class IndicatorDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    private String name;
+
+    private String value;
+
+    private String type;
+
+    private String color;
+
+}

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

+package com.yeejoin.amos.boot.module.jxiop.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 地图图例
+ *
+ * @author system_generator
+ * @date 2023-06-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="MapLegendDto", description="地图图例")
+public class MapLegendDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "图例名称")
+    private String name;
+
+    @ApiModelProperty(value = "图例地址")
+    private String type;
+
+    @ApiModelProperty(value = "图例lurl")
+    private String url;
+
+    @ApiModelProperty(value = "图例颜色")
+    private String color;
+
+}

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

+package com.yeejoin.amos.boot.module.jxiop.api.dto;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.CameraInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.ArrayList;
+import java.util.Date;
+
+/**
+ * 地图片区
+ *
+ * @author system_generator
+ * @date 2023-06-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "MapRegionDto", description = "地图片区")
+public class MapRegionDto extends BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "片区名称")
+    private String name;
+
+    @ApiModelProperty(value = "省份，中间用英文逗号隔开")
+    private ArrayList<String> province;
+
+    @ApiModelProperty(value = "片区文字显示的省份")
+    private String modelName;
+
+    @ApiModelProperty(value = "偏移量")
+    private ArrayList<Integer> titlePos;
+
+    @ApiModelProperty(value = "片区中心点")
+    private CameraInfo cameraInfo;
+}

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

+package com.yeejoin.amos.boot.module.jxiop.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-06-08
+ */
+@Data
+@ApiModel(value="RegionDto", description="")
+public class RegionDto   {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键")
+    @TableId("SEQUENCE_NBR")
+    private Long sequenceNbr;
+
+    @ApiModelProperty(value = "上级ID")
+    @TableField("PARENT_ID")
+    private Long parentId;
+
+    @ApiModelProperty(value = "等级")
+    @TableField("LEVEL")
+    private String level;
+
+    @ApiModelProperty(value = "上级编码")
+    @TableField("PARENT_REGION_CODE")
+    private Integer parentRegionCode;
+
+    @ApiModelProperty(value = "行政区划编码")
+    @TableField("REGION_CODE")
+    private Integer regionCode;
+
+    @ApiModelProperty(value = "行政区划名称")
+    @TableField("REGION_NAME")
+    private String regionName;
+
+    @ApiModelProperty(value = "经度")
+    @TableField("LONGITUDE")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    @TableField("LATITUDE")
+    private String latitude;
+
+    @TableField("REC_DATE")
+    private Date recDate;
+
+    @TableField("REC_USER_ID")
+    private String recUserId;
+
+    @TableField("AGENCY_CODE")
+    private String agencyCode;
+
+}

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

@@ -84,6 +84,9 @@ public class StationBasicDto extends BaseDto {
     @ApiModelProperty(value = "岗位")
     private String postName;
 
+    @ApiModelProperty(value = "三维跳转路径")
+    private String jumpPath;
+
     @ApiModelProperty(value = "平台关联场站id")
     private String platformStationId;
     private List<StationCoordinateDto> stationCoordinate;

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

 package com.yeejoin.amos.boot.module.jxiop.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.Indicator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
@@ -8,6 +9,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import javax.ws.rs.DefaultValue;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -17,7 +19,7 @@ import java.util.List;
  * @date 2023-04-20
  */
 @Data
-@ApiModel(value = "StationBasicDto", description = "场站基础信息表")
+@ApiModel(value = "StationInfoDto", description = "场站基础信息表")
 public class StationInfoDto  {
 
     private static final long serialVersionUID = 1L;
@@ -26,24 +28,22 @@ public class StationInfoDto  {
     @ApiModelProperty(value = "场站名称")
     private String stationName;
 
-    @ApiModelProperty(value = "场站类型")
-    private String stationType;
 
+    @ApiModelProperty(value = "场站类型")
+    private String type;
 
-    @ApiModelProperty(value = "设备管控指标")
-    private String deviceControlIndicators = "0";
+    @ApiModelProperty(value = "url")
+    private String url;
 
-    @ApiModelProperty(value = "人员管控指标")
-    private String personControlIndicators = "0";
+    @ApiModelProperty(value = "三维跳转路径")
+    private String jumpPath;
 
-    @ApiModelProperty(value = "任务管控指标")
-    private String taskControlIndicators = "0";
+    @ApiModelProperty(value = "图钉所属区域")
+    private String region;
 
-    @ApiModelProperty(value = "经度")
-    private String longitude;
+    @ApiModelProperty(value = "数据偏移量")
+    private ArrayList<Double> titlePos;
 
-    @ApiModelProperty(value = "纬度")
-    private String laitude;
-    @ApiModelProperty(value = "所属片区code")
-    private String areaCode;
+    @ApiModelProperty(value = "卡片数据")
+    private List<Indicator> indicatorData ;
 }

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

+package com.yeejoin.amos.boot.module.jxiop.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class StationRecordInfo {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "场站名称")
+    private String stationName;
+
+    @ApiModelProperty(value = "场站类型")
+    private String stationType;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String laitude;
+
+    @ApiModelProperty(value = "所属片区code")
+    private String areaCode;
+
+    @ApiModelProperty(value = "三维跳转路径")
+    private String jumpPath;
+
+    @ApiModelProperty(value = "所属地区")
+    private String belongArea;
+}

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

+package com.yeejoin.amos.boot.module.jxiop.api.entity;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+
+@Data
+public class CameraInfo {
+    private static final long serialVersionUID = 1L;
+    private ArrayList<Integer> position;
+    private ArrayList<Integer>target;
+}

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

+package com.yeejoin.amos.boot.module.jxiop.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-06-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("indicator")
+public class Indicator extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	@TableField("name")
+    private String name;
+
+    /**
+     * 
+     */
+	@TableField("value")
+    private String value;
+
+    /**
+     * 
+     */
+	@TableField("type")
+    private String type;
+
+    /**
+     * 
+     */
+	@TableField("color")
+    private String color;
+
+}

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

+package com.yeejoin.amos.boot.module.jxiop.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 地图图例
+ *
+ * @author system_generator
+ * @date 2023-06-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("map_legend")
+public class MapLegend extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 图例名称
+     */
+	@TableField("name")
+    private String name;
+
+    /**
+     * 图例地址
+     */
+	@TableField("type")
+    private String type;
+
+    /**
+     * 图例lurl
+     */
+	@TableField("url")
+    private String url;
+
+    /**
+     * 图例颜色
+     */
+	@TableField("color")
+    private String color;
+
+}

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

+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.ArrayList;
+import java.util.Date;
+
+/**
+ * 地图片区
+ *
+ * @author system_generator
+ * @date 2023-06-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName(value = "map_region",autoResultMap = true)
+public class MapRegion extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 片区名称
+     */
+	@TableField("name")
+    private String name;
+
+    /**
+     * 省份，中间用英文逗号隔开
+     */
+	@TableField(value = "province",typeHandler = FastjsonTypeHandler.class)
+    private ArrayList<String> province;
+
+    /**
+     * 片区文字显示的省份
+     */
+	@TableField("modelName")
+    private String modelName;
+
+    /**
+     * 偏移量
+     */
+	@TableField(value = "titlePos",typeHandler = FastjsonTypeHandler.class)
+    private ArrayList<Integer> titlePos;
+
+    /**
+     * 片区中心点
+     */
+    @TableField(value = "cameraInfo", typeHandler = FastjsonTypeHandler.class)
+    private CameraInfo cameraInfo;
+}

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

+package com.yeejoin.amos.boot.module.jxiop.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-06-08
+ */
+@Data
+@Accessors(chain = true)
+@TableName("region")
+public class Region  {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	@TableField("SEQUENCE_NBR")
+    private Long sequenceNbr;
+
+    /**
+     * 上级ID
+     */
+	@TableField("PARENT_ID")
+    private Long parentId;
+
+    /**
+     * 等级
+     */
+	@TableField("LEVEL")
+    private String level;
+
+    /**
+     * 上级编码
+     */
+	@TableField("PARENT_REGION_CODE")
+    private Integer parentRegionCode;
+
+    /**
+     * 行政区划编码
+     */
+	@TableField("REGION_CODE")
+    private Integer regionCode;
+
+    /**
+     * 行政区划名称
+     */
+	@TableField("REGION_NAME")
+    private String regionName;
+
+    /**
+     * 经度
+     */
+	@TableField("LONGITUDE")
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+	@TableField("LATITUDE")
+    private String latitude;
+
+    /**
+     * 
+     */
+	@TableField("REC_DATE")
+    private Date recDate;
+
+    /**
+     * 
+     */
+	@TableField("REC_USER_ID")
+    private String recUserId;
+
+    /**
+     * 
+     */
+	@TableField("AGENCY_CODE")
+    private String agencyCode;
+
+}

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

@@ -104,7 +104,6 @@ public class StationBasic extends BaseEntity {
     @TableField("area_name")
     private String areaName;
 
-    @TableField(exist =false)
     private List<Integer> belongArealist;
     /**
      * 业主单位
@@ -134,6 +133,9 @@ public class StationBasic extends BaseEntity {
     @TableField("platform_station_id")
     private String platformStationId;
 
+    @TableField("jumpPath")
+    private String jumpPath;
+
     @TableField(exist =false)
     private List<StationCoordinate> stationCoordinate;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/IndicatorMapper.java

+package com.yeejoin.amos.boot.module.jxiop.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.Indicator;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-06-08
+ */
+public interface IndicatorMapper extends BaseMapper<Indicator> {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/MapLegendMapper.java

+package com.yeejoin.amos.boot.module.jxiop.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.MapLegend;
+
+/**
+ * 地图图例 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-06-08
+ */
+public interface MapLegendMapper extends BaseMapper<MapLegend> {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/MapRegionMapper.java

+package com.yeejoin.amos.boot.module.jxiop.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.MapRegion;
+
+/**
+ * 地图片区 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-06-08
+ */
+public interface MapRegionMapper extends BaseMapper<MapRegion> {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/RegionMapper.java

+package com.yeejoin.amos.boot.module.jxiop.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.Region;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-06-08
+ */
+public interface RegionMapper extends BaseMapper<Region> {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/StationBasicMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.ExStationBasicDto;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.StationBasicDto;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.StationInfoDto;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.StationRecordInfo;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -41,7 +42,7 @@ public interface StationBasicMapper extends BaseMapper<StationBasic> {
     );
 
     //获取场站列表信息
-    List<StationInfoDto> getStationList(@Param("areaCode")String areaCode);
+    List<StationRecordInfo> getStationList(@Param("areaCode")String areaCode);
     int deleteStationCoordinateByStationid (@Param("sequence_nbr") Long sequence_nbr );
     int getStationPersonByStationID (@Param("sequence_nbr") String sequence_nbr );
 

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/service/IIndicatorService.java

+package com.yeejoin.amos.boot.module.jxiop.api.service;
+
+
+import com.yeejoin.amos.boot.module.jxiop.api.dto.IndicatorDto;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.Indicator;
+
+import java.util.List;
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-06-08
+ */
+public interface IIndicatorService {
+
+    List<Indicator> getIndicatorByType(String type);
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/service/IMapLegendService.java

+package com.yeejoin.amos.boot.module.jxiop.api.service;
+
+
+/**
+ * 地图图例接口类
+ *
+ * @author system_generator
+ * @date 2023-06-08
+ */
+public interface IMapLegendService {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/service/IMapRegionService.java

+package com.yeejoin.amos.boot.module.jxiop.api.service;
+
+
+/**
+ * 地图片区接口类
+ *
+ * @author system_generator
+ * @date 2023-06-08
+ */
+public interface IMapRegionService {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/service/IRegionService.java

+package com.yeejoin.amos.boot.module.jxiop.api.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-06-08
+ */
+public interface IRegionService {
+
+}

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jxiop.api.mapper.IndicatorMapper">
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jxiop.api.mapper.MapLegendMapper">
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jxiop.api.mapper.MapRegionMapper">
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jxiop.api.mapper.RegionMapper">
+
+</mapper>

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

@@ -105,12 +105,14 @@
         </where>
         ORDER BY station_basic.rec_date DESC
     </select>
-    <select id="getStationList" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.StationInfoDto">
+    <select id="getStationList" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.StationRecordInfo">
         select
         station_basic.station_name stationName ,
         station_basic.station_type stationType,
         station_basic.station_flag stationFlag,
         station_basic.area_code areaCode,
+        station_basic.jumpPath,
+        station_basic.belong_area belongArea,
         station_coordinate.longitude,
         station_coordinate.laitude ,
         station_coordinate.is_main_coordinate

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IndicatorController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.yeejoin.amos.boot.module.jxiop.api.dto.IndicatorDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IndicatorServiceImpl;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.List;
+
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * @author system_generator
+ * @date 2023-06-08
+ */
+@RestController
+@Api(tags = "图例卡片信息API")
+@RequestMapping(value = "/indicator")
+public class IndicatorController extends BaseController {
+
+    @Autowired
+    IndicatorServiceImpl indicatorServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增图例卡片信息", notes = "新增图例卡片信息")
+    public ResponseModel<IndicatorDto> save(@RequestBody IndicatorDto model) {
+        model = indicatorServiceImpl.createWithModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新图例卡片信息", notes = "根据sequenceNbr更新图例卡片信息")
+    public ResponseModel<IndicatorDto> updateBySequenceNbrIndicator(@RequestBody IndicatorDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(indicatorServiceImpl.updateWithModel(model));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除图例卡片信息", notes = "根据sequenceNbr删除图例卡片信息")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(indicatorServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个图例卡片信息", notes = "根据sequenceNbr查询单个图例卡片信息")
+    public ResponseModel<IndicatorDto> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(indicatorServiceImpl.queryBySeq(sequenceNbr));
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "分页查询图例卡片信息", notes = "分页查询图例卡片信息")
+    public ResponseModel<Page<IndicatorDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
+            (value = "size") int size) {
+        Page<IndicatorDto> page = new Page<IndicatorDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(indicatorServiceImpl.queryForIndicatorPage(page));
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询图例卡片信息", notes = "列表全部数据查询图例卡片信息")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<IndicatorDto>> selectForList() {
+        return ResponseHelper.buildResponse(indicatorServiceImpl.queryForIndicatorList());
+    }
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MapLegendController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.yeejoin.amos.boot.module.jxiop.api.dto.MapLegendDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.MapLegendServiceImpl;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.List;
+
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 地图图例
+ *
+ * @author system_generator
+ * @date 2023-06-08
+ */
+@RestController
+@Api(tags = "地图图例Api")
+@RequestMapping(value = "/map-legend")
+public class MapLegendController extends BaseController {
+
+    @Autowired
+    MapLegendServiceImpl mapLegendServiceImpl;
+
+    /**
+     * 新增地图图例
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增地图图例", notes = "新增地图图例")
+    public ResponseModel<MapLegendDto> save(@RequestBody MapLegendDto model) {
+        model = mapLegendServiceImpl.createWithModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新地图图例", notes = "根据sequenceNbr更新地图图例")
+    public ResponseModel<MapLegendDto> updateBySequenceNbrMapLegend(@RequestBody MapLegendDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(mapLegendServiceImpl.updateWithModel(model));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除地图图例", notes = "根据sequenceNbr删除地图图例")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(mapLegendServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个地图图例", notes = "根据sequenceNbr查询单个地图图例")
+    public ResponseModel<MapLegendDto> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(mapLegendServiceImpl.queryBySeq(sequenceNbr));
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "地图图例分页查询", notes = "地图图例分页查询")
+    public ResponseModel<Page<MapLegendDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
+            (value = "size") int size) {
+        Page<MapLegendDto> page = new Page<MapLegendDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(mapLegendServiceImpl.queryForMapLegendPage(page));
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "地图图例列表全部数据查询", notes = "地图图例列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<MapLegendDto>> selectForList() {
+        return ResponseHelper.buildResponse(mapLegendServiceImpl.queryForMapLegendList());
+    }
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MapRegionController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.yeejoin.amos.boot.module.jxiop.api.dto.MapRegionDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.MapRegionServiceImpl;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.List;
+
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 地图片区
+ *
+ * @author system_generator
+ * @date 2023-06-08
+ */
+@RestController
+@Api(tags = "地图片区Api")
+@RequestMapping(value = "/map-region")
+public class MapRegionController extends BaseController {
+
+    @Autowired
+    MapRegionServiceImpl mapRegionServiceImpl;
+
+    /**
+     * 新增地图片区
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增地图片区", notes = "新增地图片区")
+    public ResponseModel<MapRegionDto> save(@RequestBody MapRegionDto model) {
+        model = mapRegionServiceImpl.createWithModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新地图片区", notes = "根据sequenceNbr更新地图片区")
+    public ResponseModel<MapRegionDto> updateBySequenceNbrMapRegion(@RequestBody MapRegionDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(mapRegionServiceImpl.updateWithModel(model));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除地图片区", notes = "根据sequenceNbr删除地图片区")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(mapRegionServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个地图片区", notes = "根据sequenceNbr查询单个地图片区")
+    public ResponseModel<MapRegionDto> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(mapRegionServiceImpl.queryBySeq(sequenceNbr));
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "地图片区分页查询", notes = "地图片区分页查询")
+    public ResponseModel<Page<MapRegionDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
+            (value = "size") int size) {
+        Page<MapRegionDto> page = new Page<MapRegionDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(mapRegionServiceImpl.queryForMapRegionPage(page));
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "地图片区列表全部数据查询", notes = "地图片区列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<MapRegionDto>> selectForList() {
+        return ResponseHelper.buildResponse(mapRegionServiceImpl.queryForMapRegionList());
+    }
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/StationBasicController.java

@@ -175,7 +175,7 @@ public class StationBasicController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "场站地图数据", notes = "场站地图数据")
     @GetMapping(value = "/listforMap")
-    public ResponseModel<List<StationInfoDto>> getStationList(@RequestParam(value = "areaCode", required = false) String areaCode) {
-        return ResponseHelper.buildResponse(stationBasicServiceImpl.getStationList(areaCode));
+    public ResponseModel<List<StationInfoDto>> getStationList(@RequestParam(value = "areaCode", required = false) String areaCode,@RequestParam(value = "type", required = false) String type) {
+        return ResponseHelper.buildResponse(stationBasicServiceImpl.getStationList(areaCode,type));
     }
 }

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.IndicatorDto;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.Indicator;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.IndicatorMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.service.IIndicatorService;
+
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-06-08
+ */
+@Service
+public class IndicatorServiceImpl extends BaseService<IndicatorDto, Indicator, IndicatorMapper> implements IIndicatorService {
+
+    /**
+     * 分页查询
+     */
+    public Page<IndicatorDto> queryForIndicatorPage(Page<IndicatorDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IndicatorDto> queryForIndicatorList()   {
+        return this.queryForList("" , false);
+    }
+
+
+    @Override
+    public List<Indicator> getIndicatorByType(String type) {
+        QueryWrapper<Indicator> queryWrapper  = new QueryWrapper();
+        queryWrapper.eq("type",type);
+        List<Indicator>  indicatorDtoList  =this.list(queryWrapper);
+        return indicatorDtoList;
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jxiop.api.dto.MapLegendDto;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.MapLegend;
+import com.yeejoin.amos.boot.module.jxiop.api.service.IMapLegendService;
+
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.MapLegendMapper;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 地图图例服务实现类
+ *
+ * @author system_generator
+ * @date 2023-06-08
+ */
+@Service
+public class MapLegendServiceImpl extends BaseService<MapLegendDto, MapLegend, MapLegendMapper> implements IMapLegendService {
+    /**
+     * 分页查询
+     */
+    public Page<MapLegendDto> queryForMapLegendPage(Page<MapLegendDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<MapLegendDto> queryForMapLegendList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.IndicatorDto;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.MapRegionDto;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.MapRegion;
+
+import com.yeejoin.amos.boot.module.jxiop.api.service.IMapRegionService;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.MapRegionMapper;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.List;
+
+/**
+ * 地图片区服务实现类
+ *
+ * @author system_generator
+ * @date 2023-06-08
+ */
+@Service
+public class MapRegionServiceImpl extends BaseService<MapRegionDto, MapRegion, MapRegionMapper> implements IMapRegionService {
+    /**
+     * 分页查询
+     */
+    public Page<MapRegionDto> queryForMapRegionPage(Page<MapRegionDto> page) {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<MapRegionDto> queryForMapRegionList() {
+        List<MapRegionDto>  list = this.queryForList("" , false);
+        return this.queryForList("", false);
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.Region;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.RegionMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.service.IRegionService;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.RegionDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-06-08
+ */
+@Service
+public class RegionServiceImpl extends BaseService<RegionDto,Region,RegionMapper> implements IRegionService {
+    /**
+     * 分页查询
+     */
+    public Page<RegionDto> queryForRegionPage(Page<RegionDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<RegionDto> queryForRegionList()   {
+        return this.queryForList("" , false);
+    }
+
+    public Region getRegionByRegionCode ( String regionCode){
+        return  this.getOne(new QueryWrapper<Region>().eq("REGION_CODE",regionCode));
+    }
+}
\ No newline at end of file

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

@@ -4,12 +4,12 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.entity.PersonAccount;
-import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
-import com.yeejoin.amos.boot.module.jxiop.api.entity.StationCoordinate;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.StationRecordInfo;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.*;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.service.IStationBasicService;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.StationBasicDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.utils.MapUtils;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -31,6 +31,7 @@ import com.yeejoin.amos.feign.systemctl.Systemctl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -40,7 +41,7 @@ import java.util.List;
  * @date 2023-04-20
  */
 @Service
-public class StationBasicServiceImpl extends BaseService<StationBasicDto,StationBasic,StationBasicMapper> implements IStationBasicService {
+public class StationBasicServiceImpl extends BaseService<StationBasicDto, StationBasic, StationBasicMapper> implements IStationBasicService {
 
 
     @Autowired
@@ -50,12 +51,16 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
     PersonBasicServiceImpl personBasicServiceImpl;
     @Autowired
     StationBasicMapper stationBasicMapper;
+    @Autowired
+    IndicatorServiceImpl indicatorServiceImpl;
+    @Autowired
+    RegionServiceImpl regionServiceImpl;
+    private final String CZLX = "CZLX";
 
-    private  final  String CZLX="CZLX";
     /**
      * 分页查询
      */
-    public Page<StationBasicDto> queryForStationBasicPage(Page<StationBasicDto> page)   {
+    public Page<StationBasicDto> queryForStationBasicPage(Page<StationBasicDto> page) {
         return this.queryForPage(page, null, false);
     }
 
@@ -68,11 +73,11 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
                                            String stationName,
                                            String stationType,
                                            String orgCode
-                                           )   {
-        List<StationBasicDto> list=stationBasicMapper.queryPage((page.getCurrent()-1) * page.getSize(),page.getSize(),  stationMasterName,
+    ) {
+        List<StationBasicDto> list = stationBasicMapper.queryPage((page.getCurrent() - 1) * page.getSize(), page.getSize(), stationMasterName,
                 stationName,
-                stationType,orgCode);
-        List<StationBasicDto> listcount=stationBasicMapper.queryPagecount( stationMasterName,
+                stationType, orgCode);
+        List<StationBasicDto> listcount = stationBasicMapper.queryPagecount(stationMasterName,
                 stationName,
                 stationType,
                 orgCode);
@@ -82,40 +87,37 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
     }
 
 
-
-
-
     /**
      * 列表查询 示例
      */
-    public List<StationBasicDto> queryForStationBasicList()   {
-        return this.queryForList("" , false);
+    public List<StationBasicDto> queryForStationBasicList() {
+        return this.queryForList("", false);
     }
 
     @Transactional
-    public void add(StationBasic  stationBasic)   {
+    public void add(StationBasic stationBasic) {
 
         //场站坐标信息
-        List<StationCoordinate>  list=  stationBasic.getStationCoordinate();
-        List<StationCoordinate>  listdate=new ArrayList<>();
-        if(stationBasic.getBelongArealist()!=null){
+        List<StationCoordinate> list = stationBasic.getStationCoordinate();
+        List<StationCoordinate> listdate = new ArrayList<>();
+        if (stationBasic.getBelongArealist() != null) {
             stationBasic.setBelongArea(JSON.toJSONString(stationBasic.getBelongArealist()));
         }
-        CompanyModel companyModel=new CompanyModel();
+        CompanyModel companyModel = new CompanyModel();
         //单位
-        companyModel=personBasicServiceImpl.getCompanyModel(Long.parseLong(stationBasic.getArea()));
+        companyModel = personBasicServiceImpl.getCompanyModel(Long.parseLong(stationBasic.getArea()));
         stationBasic.setAreaName(companyModel.getCompanyName());
         stationBasic.setAreaCode(companyModel.getCompanyCode());
         //获取类型名称
-        String typeName=this.queryByCode(CZLX,stationBasic.getStationType());
+        String typeName = this.queryByCode(CZLX, stationBasic.getStationType());
         stationBasic.setStationTypeName(typeName);
 
         //场站基本信息
         this.save(stationBasic);
-        if(CollectionUtils.isEmpty(list)){
-            StationCoordinate stationCoordinate =  new StationCoordinate();
+        if (CollectionUtils.isEmpty(list)) {
+            StationCoordinate stationCoordinate = new StationCoordinate();
             stationCoordinate.setStationId(stationBasic.getSequenceNbr());
-        }else{
+        } else {
             for (StationCoordinate stationCoordinate : list) {
                 stationCoordinate.setStationId(stationBasic.getSequenceNbr());
                 listdate.add(stationCoordinate);
@@ -123,41 +125,40 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
         }
         stationCoordinateServiceImpl.saveBatch(listdate);
         //平台增加场站
-        CompanyModel companyModeldata=new CompanyModel();
+        CompanyModel companyModeldata = new CompanyModel();
         companyModeldata.setCompanyName(stationBasic.getStationName());
         companyModeldata.setCompanyType("company");
         companyModeldata.setLevel("station");
         companyModeldata.setParentId(Long.valueOf(stationBasic.getArea()));
         companyModeldata.setCompanyCode(stationBasic.getStationCode());
-        companyModeldata= this.addCompanyModel(companyModeldata);
+        companyModeldata = this.addCompanyModel(companyModeldata);
         stationBasic.setProjectOrgCode(companyModeldata.getOrgCode());
         stationBasic.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
         this.update(stationBasic);
     }
 
 
-
-    private CompanyModel addCompanyModel( CompanyModel companyModel) {
-        FeignClientResult<CompanyModel> Model =Privilege.companyClient.create(companyModel);
-        CompanyModel user=new CompanyModel();
+    private CompanyModel addCompanyModel(CompanyModel companyModel) {
+        FeignClientResult<CompanyModel> Model = Privilege.companyClient.create(companyModel);
+        CompanyModel user = new CompanyModel();
 
         if (!ObjectUtils.isEmpty(Model)) {
-            if(Model.getStatus()==200){
+            if (Model.getStatus() == 200) {
                 user = Model.getResult();
-            }else{
+            } else {
                 throw new RuntimeException(Model.getMessage());
             }
         }
         return user;
     }
 
-    private void deleteCompany( String ids) {
-        FeignClientResult Model =Privilege.companyClient.deleteCompany(ids);
+    private void deleteCompany(String ids) {
+        FeignClientResult Model = Privilege.companyClient.deleteCompany(ids);
 
-        CompanyModel user=new CompanyModel();
+        CompanyModel user = new CompanyModel();
 
         if (!ObjectUtils.isEmpty(Model)) {
-            if(Model.getStatus()!=200){
+            if (Model.getStatus() != 200) {
                 throw new RuntimeException(Model.getMessage());
             }
         }
@@ -165,14 +166,14 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
     }
 
 
-    private String queryByCode(String dictCode,String dictDataKey) {
-        FeignClientResult<DictionarieValueModel> Model =Systemctl.dictionarieClient.value(dictCode,dictDataKey);
-        DictionarieValueModel user=new DictionarieValueModel();
+    private String queryByCode(String dictCode, String dictDataKey) {
+        FeignClientResult<DictionarieValueModel> Model = Systemctl.dictionarieClient.value(dictCode, dictDataKey);
+        DictionarieValueModel user = new DictionarieValueModel();
 
         if (!ObjectUtils.isEmpty(Model)) {
-            if(Model.getStatus()==200){
+            if (Model.getStatus() == 200) {
                 user = Model.getResult();
-            }else{
+            } else {
                 throw new RuntimeException(Model.getMessage());
             }
         }
@@ -180,15 +181,14 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
     }
 
 
-
-    private CompanyModel updateCompanyModel( CompanyModel companyModel,Long sequenceNbr) {
-        FeignClientResult<CompanyModel> Model =Privilege.companyClient.update(companyModel,sequenceNbr);
-        CompanyModel user=new CompanyModel();
+    private CompanyModel updateCompanyModel(CompanyModel companyModel, Long sequenceNbr) {
+        FeignClientResult<CompanyModel> Model = Privilege.companyClient.update(companyModel, sequenceNbr);
+        CompanyModel user = new CompanyModel();
 
         if (!ObjectUtils.isEmpty(Model)) {
-            if(Model.getStatus()==200){
+            if (Model.getStatus() == 200) {
                 user = Model.getResult();
-            }else{
+            } else {
                 throw new RuntimeException(Model.getMessage());
             }
         }
@@ -196,24 +196,23 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
     }
 
 
-
     @Transactional
-    public void update(StationBasic  stationBasic)   {
+    public void update(StationBasic stationBasic) {
 
         //场站坐标信息
-        List<StationCoordinate>  list=  stationBasic.getStationCoordinate();
-        List<StationCoordinate>  listdate=new ArrayList<>();
-        if(stationBasic.getBelongArealist()!=null){
+        List<StationCoordinate> list = stationBasic.getStationCoordinate();
+        List<StationCoordinate> listdate = new ArrayList<>();
+        if (stationBasic.getBelongArealist() != null) {
             stationBasic.setBelongArea(JSON.toJSONString(stationBasic.getBelongArealist()));
         }
-        CompanyModel companyModel=new CompanyModel();
+        CompanyModel companyModel = new CompanyModel();
         //单位
-        companyModel=personBasicServiceImpl.getCompanyModel(Long.parseLong(stationBasic.getArea()));
+        companyModel = personBasicServiceImpl.getCompanyModel(Long.parseLong(stationBasic.getArea()));
         stationBasic.setAreaName(companyModel.getCompanyName());
         stationBasic.setAreaCode(companyModel.getCompanyCode());
 
         //获取类型名称
-        String typeName=this.queryByCode(CZLX,stationBasic.getStationType());
+        String typeName = this.queryByCode(CZLX, stationBasic.getStationType());
         stationBasic.setStationTypeName(typeName);
 
         //场站基本信息
@@ -226,55 +225,85 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
         stationCoordinateServiceImpl.saveOrUpdateBatch(listdate);
 
         //平台增加场站
-        CompanyModel companyModeldata=new CompanyModel();
+        CompanyModel companyModeldata = new CompanyModel();
         companyModeldata.setCompanyName(stationBasic.getStationName());
         companyModeldata.setCompanyType("company");
         companyModeldata.setLevel("station");
         companyModeldata.setParentId(Long.valueOf(stationBasic.getArea()));
         companyModeldata.setCompanyCode(stationBasic.getStationCode());
-        companyModeldata= this.updateCompanyModel(companyModeldata,Long.valueOf(stationBasic.getPlatformStationId()));
+        companyModeldata = this.updateCompanyModel(companyModeldata, Long.valueOf(stationBasic.getPlatformStationId()));
         stationBasic.setProjectOrgCode(companyModeldata.getOrgCode());
         stationBasic.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
         stationBasicMapper.updateById(stationBasic);
     }
 
 
-    public  int deleteList(String ids){
+    public int deleteList(String ids) {
         QueryWrapper<StationBasic> wrapper = new QueryWrapper();
-        wrapper.in("sequence_nbr",ids);
-        List<StationBasic>  list=this.list(wrapper);
-        List<String> idscom=new ArrayList<>();
+        wrapper.in("sequence_nbr", ids);
+        List<StationBasic> list = this.list(wrapper);
+        List<String> idscom = new ArrayList<>();
         for (StationBasic personAccount : list) {
             idscom.add(personAccount.getPlatformStationId());
         }
         //删除平台
         int deleteResult = stationBasicMapper.deleteList(ids);
-        this.deleteCompany(String.join(",",idscom));
+        this.deleteCompany(String.join(",", idscom));
         return deleteResult;
     }
 
 
-    public  StationBasic getById(Long sequenceNbr){
+    public StationBasic getById(Long sequenceNbr) {
 
         QueryWrapper<StationBasic> wrapper1 = new QueryWrapper();
-        wrapper1.eq("sequence_nbr",sequenceNbr);
-        StationBasic  stationBasic=this.getOne(wrapper1);
+        wrapper1.eq("sequence_nbr", sequenceNbr);
+        StationBasic stationBasic = this.getOne(wrapper1);
 
-        if(stationBasic.getBelongArea()!=null){
-            stationBasic.setBelongArealist(JSON.parseArray(stationBasic.getBelongArea(),Integer.class));
+        if (stationBasic.getBelongArea() != null) {
+            stationBasic.setBelongArealist(JSON.parseArray(stationBasic.getBelongArea(), Integer.class));
         }
 
         QueryWrapper<StationCoordinate> wrapper = new QueryWrapper();
-        wrapper.eq("station_id",sequenceNbr);
-        List<StationCoordinate>  list=stationCoordinateServiceImpl.list(wrapper);
+        wrapper.eq("station_id", sequenceNbr);
+        List<StationCoordinate> list = stationCoordinateServiceImpl.list(wrapper);
         stationBasic.setStationCoordinate(list);
         return stationBasic;
 
     }
 
-    public List<StationInfoDto> getStationList(String areaCode){
-        return stationBasicMapper.getStationList(areaCode);
+    public List<StationInfoDto> getStationList(String areaCode, String type) {
+        List<StationInfoDto>  stationInfoDtoList = new LinkedList<>();
+        List<Indicator>  indicatorList= indicatorServiceImpl.getIndicatorByType(type);
+        List<StationRecordInfo> list = stationBasicMapper.getStationList(areaCode);
+        if(list.isEmpty()){
+            return stationInfoDtoList;
+        }else{
+            list.forEach(stationRecordInfo ->{
+                StationInfoDto  stationInfoDto =new StationInfoDto();
+                stationInfoDto.setStationName(stationRecordInfo.getStationName());
+                stationInfoDto.setType(stationRecordInfo.getStationType());
+                stationInfoDto.setUrl("https://www.baidu.com");
+                stationInfoDto.setJumpPath(stationRecordInfo.getJumpPath());
+                if(stationRecordInfo.getBelongArea()!=null){
+                    String [] strings = stationRecordInfo.getBelongArea().replace("[","").replace("]","").split(",");
+                    if(strings.length>0){
+                        Region region =regionServiceImpl.getRegionByRegionCode(strings[0]);
+                        stationInfoDto.setRegion(region.getRegionName().replace("省","").replace("市",""));
+                    }
+
+                }
+                ArrayList<Double> arrayList=MapUtils.geoTo3d(Double.valueOf(stationRecordInfo.getLongitude()),Double.valueOf(stationRecordInfo.getLaitude()));
+                stationInfoDto.setTitlePos(arrayList);
+                stationInfoDto.setIndicatorData(indicatorList);
+                stationInfoDtoList.add(stationInfoDto);
+            } );
+        }
+        return stationInfoDtoList;
     }
-    public int getStationPersonByStationID(String id) {return stationBasicMapper.getStationPersonByStationID(id);};
+
+    public int getStationPersonByStationID(String id) {
+        return stationBasicMapper.getStationPersonByStationID(id);
+    }
+
 
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/utils/MapUtils.java

+package com.yeejoin.amos.boot.module.jxiop.biz.utils;
+
+import java.util.ArrayList;
+
+public class MapUtils {
+    private static final double EARTH_RADIUS = 63.781370; // 地球半径
+
+    /**
+     * 将经纬度转换为三维坐标
+     * @param longitude 经度
+     * @param latitude 纬度
+     * @return 三维坐标数组 [x, y, z]
+     */
+    public static ArrayList<Double> geoTo3d(double longitude, double latitude) {
+        ArrayList<Double> arrayList =new ArrayList<>();
+        // 将经纬度转换为弧度
+        double radLng = Math.toRadians(longitude);
+        double radLat = Math.toRadians(latitude);
+
+        // 计算x、y、z坐标值
+        double x = EARTH_RADIUS * Math.cos(radLat) * Math.cos(radLng)+10;
+        double y = EARTH_RADIUS * Math.cos(radLat) * Math.sin(radLng)-3;
+        double z = EARTH_RADIUS * Math.sin(radLat);
+        arrayList.add(x);
+        arrayList.add(y);
+        arrayList.add(z);
+        return arrayList;
+    }
+}