Commit 24b24622 authored by chenzhao's avatar chenzhao

需求变动 执勤动态 视频列表改为可配置

parent 8b4e795a
...@@ -182,6 +182,12 @@ public class CommandController extends BaseController { ...@@ -182,6 +182,12 @@ public class CommandController extends BaseController {
@Autowired @Autowired
private EmqKeeper emqKeeper; private EmqKeeper emqKeeper;
@Value("${video.buildingId}")
private String videoBuildingId;
@Value("${video.bizOrgCode}")
private String videoBizCode;
@Autowired @Autowired
AirportStandMapper airportStandMapper; AirportStandMapper airportStandMapper;
private static final String JW = "mechinePosition,seat"; private static final String JW = "mechinePosition,seat";
...@@ -460,7 +466,7 @@ public class CommandController extends BaseController { ...@@ -460,7 +466,7 @@ public class CommandController extends BaseController {
} }
ResponseModel<Page<Map<String, Object>>> data = null; ResponseModel<Page<Map<String, Object>>> data = null;
if (ValidationUtil.isEmpty(par.getLatitude() ) ){ if (ValidationUtil.isEmpty(par.getLatitude() ) ){
data = equipFeignClient.getVideopagList( String.valueOf((pageNum - 1) * pageSize), pageSize.toString(),par.getBuildingId(),par.getCode(),par.getEquipmentName(),par.getBizOrgCode(),par.getType()); data = equipFeignClient.getVideopagList( String.valueOf((pageNum - 1) * pageSize), pageSize.toString(),videoBuildingId,par.getCode(),par.getEquipmentName(),videoBizCode,par.getType());
}else { }else {
data = equipFeignClient.pageVideoByAlertType( pageNum, pageSize, par); data = equipFeignClient.pageVideoByAlertType( pageNum, pageSize, par);
} }
......
...@@ -150,5 +150,9 @@ speech-config.app-key=FC84bGUpbNFrexoL ...@@ -150,5 +150,9 @@ speech-config.app-key=FC84bGUpbNFrexoL
##代码中有部分逻辑冲突需要处理 为区分机场和电力逻辑 增加开关 若为true 则为机场逻辑 为false 则为电力逻辑 ##代码中有部分逻辑冲突需要处理 为区分机场和电力逻辑 增加开关 若为true 则为机场逻辑 为false 则为电力逻辑
logic=true logic=true
##执勤动态 视频来源建筑id
video.buildingId=1522051112935387138
##执勤动态 视频来源单位code
video.bizOrgCode=FFjKkkvVaUo7
feign.okhttp.enabled=true feign.okhttp.enabled=true
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment