场站地图数据接口更新

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

@@ -3,9 +3,11 @@ package com.yeejoin.amos.boot.module.jxiop.api.dto;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.ws.rs.DefaultValue;
 import java.util.List;
 
 /**
@@ -29,13 +31,13 @@ public class StationInfoDto  {
 
 
     @ApiModelProperty(value = "设备管控指标")
-    private String deviceControlIndicators;
+    private String deviceControlIndicators = "0";
 
     @ApiModelProperty(value = "人员管控指标")
-    private String personControlIndicators;
+    private String personControlIndicators = "0";
 
     @ApiModelProperty(value = "任务管控指标")
-    private String taskControlIndicators;
+    private String taskControlIndicators = "0";
 
     @ApiModelProperty(value = "经度")
     private String longitude;

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

@@ -38,7 +38,7 @@ public interface StationBasicMapper extends BaseMapper<StationBasic> {
                                                   @Param("orgCode")String orgCode);
 
     //获取场站列表信息
-    List<StationInfoDto> getStationList(@Param("orgCode")String orgCode);
+    List<StationInfoDto> getStationList(@Param("areaCode")String areaCode);
 
 
 }

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

@@ -114,11 +114,9 @@
         left join station_coordinate
         on station_basic.sequence_nbr = station_coordinate.station_id
         WHERE station_coordinate.is_main_coordinate = 0  LIMIT 1
-        <where>
-            <if test="orgCode != null and orgCode != ''">
-                AND station_basic.project_org_code like concat('%',#{orgCode},'%')
-            </if>
-        </where>
+        <if test="areaCode != null and areaCode != ''">
+            AND station_basic.area_code like concat('%',#{areaCode},'%')
+        </if>
     </select>
 
 

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

@@ -161,7 +161,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 = "orgCode",required = false)String orgCode) {
-		return ResponseHelper.buildResponse(stationBasicServiceImpl.getStationList(orgCode));
+	public ResponseModel<List<StationInfoDto>> getStationList( @RequestParam(value = "areaCode",required = false)String areaCode) {
+		return ResponseHelper.buildResponse(stationBasicServiceImpl.getStationList(areaCode));
 	}
 }

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

@@ -248,8 +248,8 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
 
     }
 
-    public List<StationInfoDto> getStationList(String orgCode){
-        return stationBasicMapper.getStationList(orgCode);
+    public List<StationInfoDto> getStationList(String areaCode){
+        return stationBasicMapper.getStationList(areaCode);
     }
 
 }
\ No newline at end of file