Explorar el Código

添加马赛克接口

dengsixing hace 3 años
padre
commit
16c1818a16

+ 6 - 2
4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -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());

+ 3 - 1
4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditServiceImpl.java

@@ -90,6 +90,8 @@ public class SceneEditServiceImpl implements ISceneEditService {
     private ISceneEditInfoExtService sceneEditInfoExtService;
     @Autowired
     private FdkankanMiniClient fdkankanMiniClient;
+    @Value("${http.api.isLogin}")
+    private String URL_ISLOGIN;
 
     @Override
     public SceneAuthVO getAuth(BaseSceneParamVO param, String token) throws Exception{
@@ -142,7 +144,7 @@ public class SceneEditServiceImpl implements ISceneEditService {
 //            }
 //        }
         // TODO: 2022/4/25 v3v4共存过渡期结束需要删除,恢复上面注释内容 ------------------------------------------start
-        String url = fkankanMiniHost + "/api/scene/isLogin?num=" + param.getNum();
+        String url = fkankanMiniHost + URL_ISLOGIN + param.getNum();
         Result<Map<String, Object>> isLoginResult = fdkankanMiniClient
             .getIsLogin(url, token, new FdkkMiniReqSuccessCallback(),
                 new FdkkMiniReqErrorCallback());