|
@@ -4,6 +4,7 @@ package com.ozs.web.controller.accountmanagment;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import com.ozs.common.config.BaseConfig;
|
|
|
import com.ozs.common.core.controller.BaseController;
|
|
|
import com.ozs.common.core.domain.AjaxResult;
|
|
|
import com.ozs.common.utils.StringUtils;
|
|
@@ -16,8 +17,10 @@ import com.ozs.service.entity.vo.BaseCameraManagementVo;
|
|
|
import com.ozs.service.service.BaseCameraManagementService;
|
|
|
import com.ozs.service.service.BaseDeviceDynamicManagementService;
|
|
|
import com.ozs.service.service.BaseRailwayManagementService;
|
|
|
+import com.ozs.web.core.config.CaneraConfig;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.cache.annotation.Cacheable;
|
|
|
import org.springframework.http.MediaType;
|
|
|
import org.springframework.util.ObjectUtils;
|
|
@@ -54,6 +57,8 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
BaseCameraManagementService baseCameraManagementService;
|
|
|
@Resource
|
|
|
BaseDeviceDynamicManagementService baseDeviceDynamicManagementService;
|
|
|
+ @Autowired
|
|
|
+ private CaneraConfig caneraConfig;
|
|
|
|
|
|
/**
|
|
|
* 相机台账管理分页
|
|
@@ -202,17 +207,17 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
@ApiOperation("查询录像")
|
|
|
@GetMapping("/api/records/{cameraCode}/{channel}")
|
|
|
public AjaxResult apiRecords(@PathVariable String cameraCode,@PathVariable String channel) {
|
|
|
- String param = "id="+cameraCode+"&channel="+channel;
|
|
|
- String s = HttpUtils.sendGet("http://47.106.159.135:8554/gb28181/api/records", param);
|
|
|
+ String param = "id=" + cameraCode + "&channel=" + channel;
|
|
|
+ String s = HttpUtils.sendGet(caneraConfig.getPath() + "/gb28181/api/records", param);
|
|
|
System.out.println(s);
|
|
|
- return success(HttpUtils.sendGet("http://47.106.159.135:8554/gb28181/api/records", param));
|
|
|
+ return success(HttpUtils.sendGet(caneraConfig.getPath() + "/gb28181/api/records", param));
|
|
|
}
|
|
|
|
|
|
@ApiOperation("播放回放")
|
|
|
@GetMapping("/api/invite/{cameraCode}/{channel}/{startTime}/{endTime}")
|
|
|
public AjaxResult apiInvite(@PathVariable String cameraCode,@PathVariable String channel,@PathVariable String startTime,@PathVariable String endTime) {
|
|
|
String param = "id="+cameraCode+"&channel="+channel+"&startTime="+startTime+"&endTime="+endTime;
|
|
|
- return success(HttpUtils.sendGet("http://47.106.159.135:8554/gb28181/api/invite/", param));
|
|
|
+ return success(HttpUtils.sendGet(caneraConfig.getPath() + "/gb28181/api/invite/", param));
|
|
|
}
|
|
|
|
|
|
|