1.大屏中间地图接口返回新增platformStationId字段。

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

@@ -39,4 +39,7 @@ public class MapRegionDto extends BaseDto {
 
     @ApiModelProperty(value = "片区中心点")
     private CameraInfo cameraInfo;
+
+    @ApiModelProperty(value = "片区code")
+    private CameraInfo areaCode;
 }

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

@@ -27,6 +27,9 @@ public class StationInfoDto  {
     @ApiModelProperty(value ="场站id")
     private Long stationId;
 
+    @ApiModelProperty(value ="平台id")
+    private String platformStationId;
+
     @ApiModelProperty(value = "场站名称")
     private String stationName;
 

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

@@ -13,6 +13,9 @@ public class StationRecordInfo {
     @ApiModelProperty(value = "场站id")
     private Long stationId;
 
+    @ApiModelProperty(value = "平台id")
+    private String platformStationId;
+
     @ApiModelProperty(value = "场站名称")
     private String stationName;
 

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

@@ -17,7 +17,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("indicator")
+@TableName("map_indicator")
 public class Indicator extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

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

@@ -54,4 +54,10 @@ public class MapRegion extends BaseEntity {
      */
     @TableField(value = "cameraInfo", typeHandler = FastjsonTypeHandler.class)
     private CameraInfo cameraInfo;
+    /**
+     * 片区文字显示的省份
+     */
+    @TableField("area_code")
+    private String areaCode;
+
 }

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

@@ -17,7 +17,7 @@ import java.util.Date;
  */
 @Data
 @Accessors(chain = true)
-@TableName(value = "monitor_fan_indicator" ,autoResultMap = true)
+@TableName(value = "monitor_fan_indicator_copy3" ,autoResultMap = true)
 public class MonitorFanIndicator extends BaseEntity {
 
 

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

@@ -108,6 +108,7 @@
     <select id="getStationList" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.StationRecordInfo">
         select
         station_basic.sequence_nbr stationId,
+        station_basic.platform_station_id platformStationId,
         station_basic.station_name stationName ,
         station_basic.station_type stationType,
         station_basic.station_flag stationFlag,

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

@@ -172,7 +172,7 @@ public class StationBasicController extends BaseController {
      *
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @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,@RequestParam(value = "type", required = false,defaultValue = "qj") String type) {

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

@@ -311,6 +311,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio
         list.forEach(stationRecordInfo -> {
             StationInfoDto stationInfoDto = new StationInfoDto();
             stationInfoDto.setStationId(stationRecordInfo.getStationId());
+            stationInfoDto.setPlatformStationId(stationRecordInfo.getPlatformStationId());
             stationInfoDto.setStationName(stationRecordInfo.getStationName());
             stationInfoDto.setType(stationRecordInfo.getStationType());
             //url 暂时写死