更新sit 客户的aip域名

README.md

@@ -13,6 +13,8 @@ doc: http://8.135.106.227:8004/doc.html
 # pro
 2021-04-29
     已部署到客服服务器
+    
+    INSERT INTO `tb_scene` VALUES (3, '2021-05-20 17:48:30', 0, '2021-05-20 17:48:30', '0', 'qPgZvYEKE', '/data/qPgZvYEKE', 0);
         
 
             

gis_application/src/main/resources/application-dev.properties

@@ -75,7 +75,8 @@ swagger.description=${swagger.title}
 swagger.version=1.0
 
 # \u4E00\u952E\u667A\u6167api\u6587\u6863, \u63A5\u53E3\u8C03\u7528\u9700\u8981\u5E26\u4E0AapiKey\u3001sign
-iot.domain=http://1clintel.cn:9081
+#iot.domain=http://1clintel.cn:9081
+iot.domain=http://develop.1clintel.cn:9083
 iot.apiKey=gyVI8WoXfHuQcuWd
 iot.sign=cYM6a5PNIOE3PFxL
 

gis_application/src/main/resources/application-pro.properties

@@ -81,7 +81,7 @@ swagger.version=1.0
 
 
 # \u4E00\u952E\u667A\u6167api\u6587\u6863, \u63A5\u53E3\u8C03\u7528\u9700\u8981\u5E26\u4E0AapiKey\u3001sign
-iot.domain=http://1clintel.cn:9081
+iot.domain=http://1clintel.cn:9083
 iot.apiKey=gyVI8WoXfHuQcuWd
 iot.sign=cYM6a5PNIOE3PFxL
 

gis_application/src/main/resources/application-sit.properties

@@ -81,7 +81,12 @@ swagger.version=1.0
 
 
 # \u4E00\u952E\u667A\u6167api\u6587\u6863, \u63A5\u53E3\u8C03\u7528\u9700\u8981\u5E26\u4E0AapiKey\u3001sign
-iot.domain=http://1clintel.cn:9081
+#iot.domain=http://1clintel.cn:9081
+#iot.apiKey=gyVI8WoXfHuQcuWd
+#iot.sign=cYM6a5PNIOE3PFxL
+
+#iot.domain=http://1clintel.cn:9083
+iot.domain=http://develop.1clintel.cn:9083
 iot.apiKey=gyVI8WoXfHuQcuWd
 iot.sign=cYM6a5PNIOE3PFxL
 

gis_domain/src/main/java/com/gis/domain/dto/CameraDto.java

@@ -0,0 +1,27 @@
+package com.gis.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * Created by Owen on 2019/10/28 0028 12:24
+ *
+ *
+ */
+@Data
+public class CameraDto  {
+
+
+    @ApiModelProperty(value = "通道号(来着设备列表code属性)", required = true)
+    private String channelId;
+
+    @ApiModelProperty(value = "时间，按月份查询(yyyy-MM)，按照天查询(yyyy-MM-dd)", required = true)
+    private String time;
+
+    @ApiModelProperty(value = "类型(按月份查询-month,按天查询-day)", required = true)
+    private String type;
+
+
+
+}

gis_domain/src/main/java/com/gis/domain/dto/CameraPlayBack.java

@@ -0,0 +1,21 @@
+package com.gis.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by owen on 2021/5/17 0017 15:09
+ */
+@Data
+public class CameraPlayBack {
+
+    @ApiModelProperty(value = "通道号(来着设备列表code属性)", required = true)
+    private String channelId;
+
+    @ApiModelProperty(value = "开始时间", name = "startTime", required = true)
+    private String startTime;
+
+
+    @ApiModelProperty(value = "结束时间", name = "endTime", required = true)
+    private String endTime;
+}

gis_service/src/main/java/com/gis/service/DeviceService.java

@@ -2,6 +2,8 @@ package com.gis.service;
 
 
 import com.gis.common.util.Result;
+import com.gis.domain.dto.CameraDto;
+import com.gis.domain.dto.CameraPlayBack;
 import com.gis.domain.dto.DevicePageDto;
 
 
@@ -23,4 +25,8 @@ public interface DeviceService  {
     Result getType();
 
     Result getLive(String deviceCode);
+
+    Result queryVideoList(CameraDto param);
+
+    Result playBack(CameraPlayBack param);
 }

gis_service/src/main/java/com/gis/service/impl/DeviceServiceImpl.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.gis.common.constant.ConfigConstant;
 import com.gis.common.util.HttpUtils;
 import com.gis.common.util.Result;
+import com.gis.domain.dto.CameraDto;
+import com.gis.domain.dto.CameraPlayBack;
 import com.gis.domain.dto.DevicePageDto;
 import com.gis.domain.dto.PageDto;
 import com.gis.service.DeviceService;
@@ -88,6 +90,26 @@ public class DeviceServiceImpl  implements DeviceService {
         return doGet(api, query);
     }
 
+    @Override
+    public Result queryVideoList(CameraDto param) {
+        String api = "/api/server/v1/camera/queryVideoList";
+        HashMap<String, String> query = new HashMap<>();
+        query.put("channelId", param.getChannelId());
+        query.put("time", param.getTime());
+        query.put("type", param.getType());
+        return doPost(api, query, null);
+    }
+
+    @Override
+    public Result playBack(CameraPlayBack param) {
+        String api = "/api/server/v1/camera/playBack";
+        HashMap<String, String> query = new HashMap<>();
+        query.put("channelId", param.getChannelId());
+        query.put("startTime", param.getStartTime());
+        query.put("endTime", param.getEndTime());
+        return doPost(api, query, null);
+    }
+
 
     private PageDto reSet(PageDto param){
         Integer pageNum = param.getPageNum();

gis_web/src/main/java/com/gis/web/controller/DeviceController.java

@@ -2,6 +2,8 @@ package com.gis.web.controller;
 
 
 import com.gis.common.util.Result;
+import com.gis.domain.dto.CameraDto;
+import com.gis.domain.dto.CameraPlayBack;
 import com.gis.domain.dto.DevicePageDto;
 import com.gis.service.DeviceService;
 import io.swagger.annotations.Api;
@@ -10,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 
 
 /**
@@ -76,11 +79,25 @@ public class DeviceController extends BaseController {
     }
 
 
-    @ApiOperation(value = "获取设备视频流")
+    @ApiOperation(value = "摄像机直播地址接口")
     @GetMapping("getLive/{deviceCode}")
     public Result getLive(@PathVariable String deviceCode) {
         return deviceService.getLive(deviceCode);
     }
 
 
+    @ApiOperation(value = "摄像机回放视频日历列表接口")
+    @PostMapping("camera/queryVideoList")
+    public Result queryVideoList(@Valid @RequestBody CameraDto param) {
+        return deviceService.queryVideoList(param);
+    }
+
+
+    @ApiOperation(value = "摄像机视频回放接口")
+    @PostMapping("camera/playBack")
+    public Result playBack(@Valid @RequestBody CameraPlayBack param) {
+        return deviceService.playBack(param);
+    }
+
+
 }