Browse Source

feat:雨刮和框选3D定位

yanyuan
wangguangyuan 3 weeks ago
parent
commit
b88c984f1c
4 changed files with 15 additions and 0 deletions
  1. +1
    -0
      inspect-ivs/src/main/java/com/inspect/ivs/constant/IvsConst.java
  2. +6
    -0
      inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsControlController.java
  3. +1
    -0
      inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/contants/AccessApiConstant.java
  4. +7
    -0
      inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/VideoController.java

+ 1
- 0
inspect-ivs/src/main/java/com/inspect/ivs/constant/IvsConst.java View File

@ -6,6 +6,7 @@ public class IvsConst {
public static final String URI_MODIFY_PASSWORD = "/users/userPassword/v1.0"; public static final String URI_MODIFY_PASSWORD = "/users/userPassword/v1.0";
public static final String URI_KEEP_ALIVE = "/common/keepAlive"; public static final String URI_KEEP_ALIVE = "/common/keepAlive";
public static final String URI_PTZ_CONTROL = "/device/ptzcontrol"; public static final String URI_PTZ_CONTROL = "/device/ptzcontrol";
public static final String URI_POSITION_3D = "/device/position3d";
public static final String URI_DEVICE_LIST = "/device/deviceList/v1.0"; public static final String URI_DEVICE_LIST = "/device/deviceList/v1.0";
public static final String URI_PRESET_SET = "/ptz/presetposition/v1.0"; public static final String URI_PRESET_SET = "/ptz/presetposition/v1.0";
public static final String URI_START_REAL_PLAY = "/device/startrealplaybyipex"; public static final String URI_START_REAL_PLAY = "/device/startrealplaybyipex";


+ 6
- 0
inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsControlController.java View File

@ -170,6 +170,12 @@ public class IvsControlController {
return this.hlsPlaybackComponent.post(IvsConst.URI_PTZ_CONTROL, request); return this.hlsPlaybackComponent.post(IvsConst.URI_PTZ_CONTROL, request);
} }
@PostMapping({"position3d"})
public ResponseEntity<JSONObject> position3d(@RequestBody JSONObject request) {
log.debug("[IVS] position3d page param:{}", request);
return this.hlsPlaybackComponent.post(IvsConst.URI_POSITION_3D, request);
}
@GetMapping({"presetList/{deviceCode}/{domainCode}"}) @GetMapping({"presetList/{deviceCode}/{domainCode}"})
public ResponseEntity<JSONObject> presetListPage(@PathVariable String deviceCode, @PathVariable String domainCode) { public ResponseEntity<JSONObject> presetListPage(@PathVariable String deviceCode, @PathVariable String domainCode) {
log.debug("[IVS] preset list page deviceCode:{}, domainCode:{}", deviceCode, domainCode); log.debug("[IVS] preset list page deviceCode:{}, domainCode:{}", deviceCode, domainCode);


+ 1
- 0
inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/contants/AccessApiConstant.java View File

@ -24,6 +24,7 @@ public class AccessApiConstant {
public static final String LIVE_STOP = "/api/v1/stream/live/stop"; public static final String LIVE_STOP = "/api/v1/stream/live/stop";
public static final String LIVE_STATUS = "/api/v1/stream/live/status"; public static final String LIVE_STATUS = "/api/v1/stream/live/status";
public static final String PTZ_CONTROL_PAGE = "/api/v1/control/ptzControl"; public static final String PTZ_CONTROL_PAGE = "/api/v1/control/ptzControl";
public static final String POSITION_3D_PAGE = "/api/v1/control/position3d";
public static final String PRESET_LIST_PAGE = "/api/v1/control/presetList/%s/%s"; public static final String PRESET_LIST_PAGE = "/api/v1/control/presetList/%s/%s";
public static final String PRESET_CREATE = "/api/v1/control/presetCreate"; public static final String PRESET_CREATE = "/api/v1/control/presetCreate";
public static final String SNAPSHOT_TASK = "/api/v1/device/platformSnapshot/%s/%s"; public static final String SNAPSHOT_TASK = "/api/v1/device/platformSnapshot/%s/%s";


+ 7
- 0
inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/VideoController.java View File

@ -95,6 +95,13 @@ public class VideoController extends BaseController {
return parsePageResult(result); return parsePageResult(result);
} }
@PostMapping({"/position3d"})
public AjaxResult position3d(@RequestBody JSONObject request) throws Exception {
log.info("[VIDEO] position3d param:{}", request);
String result = HttpClientUtils.postJson(this.deviceUrl + AccessApiConstant.POSITION_3D_PAGE, request.toJSONString(), "");
return parsePageResult(result);
}
@GetMapping({"/realtime/status"}) @GetMapping({"/realtime/status"})
public AjaxResult realtimeStatus(@RequestParam("cameraCode") String cameraCode) throws Exception { public AjaxResult realtimeStatus(@RequestParam("cameraCode") String cameraCode) throws Exception {
log.info("[VIDEO] realtime status cameraCode:{}", cameraCode); log.info("[VIDEO] realtime status cameraCode:{}", cameraCode);


Loading…
Cancel
Save