|
@@ -124,6 +124,10 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
|
|
|
private int waitTime;
|
|
|
@Value("${http.host.4dkankanMini}")
|
|
|
private String fkankanMiniHost;
|
|
|
+ @Value("${http.api-v4.getDataSyncByCameraId}")
|
|
|
+ private String URL_GET_DATASYNC_BY_CAMERAID;
|
|
|
+ @Value("${http.api-v4.getSceneProByNum}")
|
|
|
+ private String URL_GET_SCENEPRO_BY_NUM;
|
|
|
|
|
|
@Autowired
|
|
|
private ISceneEditControlsService sceneEditControlsService;
|
|
@@ -368,7 +372,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
|
|
|
public SceneInfoVO getSceneInfo(@Var SceneInfoParamVO param) throws Exception{
|
|
|
SceneInfoReqType sceneInfoReqType = SceneInfoReqType.get(param.getReqType());
|
|
|
// TODO: 2022/5/19 请求v3的接口,获取场景的状态 待v3停机后要换成v4d的逻辑-------------------------start
|
|
|
- String url = fkankanMiniHost + "/api-v4/getSceneProByNum?num=" + param.getNum();
|
|
|
+ String url = fkankanMiniHost + URL_GET_SCENEPRO_BY_NUM + param.getNum();
|
|
|
Result<SceneProV3> result = fdkankanMiniClient
|
|
|
.getSceneProByNum(url, new FdkkMiniReqSuccessCallback(),
|
|
|
new FdkkMiniReqErrorCallback());
|
|
@@ -475,7 +479,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
|
|
|
if(Objects.isNull(cameraId)){
|
|
|
return;
|
|
|
}
|
|
|
- String url = fkankanMiniHost + "/api-v4/getDataSyncByCameraId?cameraId=" + cameraId;
|
|
|
+ String url = fkankanMiniHost + URL_GET_DATASYNC_BY_CAMERAID + cameraId;
|
|
|
Result<String> dataSyncResult = fdkankanMiniClient
|
|
|
.getDataSyncType(url, new FdkkMiniReqSuccessCallback(), new FdkkMiniReqErrorCallback());
|
|
|
sceneInfoVO.setDataSync(dataSyncResult.getMsg());
|