add:视频配置表新增厂商字段;getById接口新增expand扩展参数透传至海康预览地址请求

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationVideoTypeEntity.java

@@ -76,4 +76,6 @@ public class StationVideoTypeEntity extends TenantEntity {
 	private Integer videoOwerType;
 	@ApiModelProperty("拼音")
 	private String pingyin;
+	@ApiModelProperty("厂商")
+	private String manufacturer;
 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoTypeController.java

@@ -159,8 +159,9 @@ public class StationVideoTypeController extends BladeController {
     @RequestMapping(value = "/getById", method = {RequestMethod.GET, RequestMethod.POST})
     @ApiOperationSupport(order = 60)
     @ApiOperation(value = "获取视频监测对象", notes = "获取视频监测对象")
-    public R<StationVideoTypeEntity> getById(@RequestParam Long id, @RequestParam int streamType) {
-        return R.data(stationVideoTypeService.getById(id, streamType));
+    public R<StationVideoTypeEntity> getById(@RequestParam Long id, @RequestParam int streamType,
+                                             @ApiParam(value = "扩展参数") @RequestParam(required = false) String expand) {
+        return R.data(stationVideoTypeService.getById(id, streamType, expand));
     }
 
     @ApiLog

hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationVideoTypeService.java

@@ -25,7 +25,7 @@ public interface IStationVideoTypeService extends BaseService<StationVideoTypeEn
 
 	List<VideoMonitorVO> getVideoMonitor(String type);
 
-	StationVideoTypeEntity getById(Long id,int streamType);
+	StationVideoTypeEntity getById(Long id,int streamType,String expand);
 
 	String getHikVideo();
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationVideoTypeServiceImpl.java

@@ -76,7 +76,7 @@ public class StationVideoTypeServiceImpl extends BaseServiceImpl<StationVideoTyp
                     stationVideoTypeEntity.setLiveSourceAddress(ArtemisPostUtils.getCameraPreviewURL(stationVideoTypeEntity.getVideoHost(),
                             stationVideoTypeEntity.getAppKey(), stationVideoTypeEntity.getAppSecret()
                             , stationVideoTypeEntity.getPointCode(), DictCache.getValue(StationConstants.STATION_VIDEO_TYPE_CODE,
-                                    stationVideoTypeEntity.getType()), 0));
+                                    stationVideoTypeEntity.getType()), 0, null));
                     ids.add(stationVideoTypeEntity.getId());
                 } catch (Exception e) {
                     stationVideoTypeEntity.setLiveSourceAddress(null);
@@ -158,7 +158,7 @@ public class StationVideoTypeServiceImpl extends BaseServiceImpl<StationVideoTyp
                     String address = null;
                     try {
                         address = ArtemisPostUtils.getCameraPreviewURL(
-                                entity.getVideoHost(), entity.getAppKey(), entity.getAppSecret(), entity.getPointCode(), type, 0
+                                entity.getVideoHost(), entity.getAppKey(), entity.getAppSecret(), entity.getPointCode(), type, 0, null
                         );
                         entity.setLiveSourceAddress(address);
                     } catch (Exception e) {
@@ -185,7 +185,7 @@ public class StationVideoTypeServiceImpl extends BaseServiceImpl<StationVideoTyp
                         entity.getAppKey(),
                         entity.getAppSecret(),
                         entity.getPointCode(),
-                        DictCache.getValue(StationConstants.STATION_VIDEO_TYPE_CODE, entity.getType()), 0
+                        DictCache.getValue(StationConstants.STATION_VIDEO_TYPE_CODE, entity.getType()), 0, null
                 );
                 entity.setLiveSourceAddress(address);
             } catch (Exception e) {
@@ -275,7 +275,7 @@ public class StationVideoTypeServiceImpl extends BaseServiceImpl<StationVideoTyp
     }
 
     @Override
-    public StationVideoTypeEntity getById(Long id, int streamType) {
+    public StationVideoTypeEntity getById(Long id, int streamType, String expand) {
         StationVideoTypeEntity stationVideoTypeEntity = this.getById(id);
         if (ObjectUtil.isNotEmpty(stationVideoTypeEntity.getIsHikvideo()) && stationVideoTypeEntity.getIsHikvideo() == 1) {
             try {
@@ -287,6 +287,7 @@ public class StationVideoTypeServiceImpl extends BaseServiceImpl<StationVideoTyp
                         , stationVideoTypeEntity.getPointCode()
                         , DictCache.getValue(StationConstants.STATION_VIDEO_TYPE_CODE, stationVideoTypeEntity.getType())
                         , streamType
+                        , expand
                 ));
             } catch (Exception e) {
                 stationVideoTypeEntity.setLiveSourceAddress(null);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/utils/ArtemisPostUtils.java

@@ -20,7 +20,7 @@ public class ArtemisPostUtils {
     public static String APP_KEY = "29939497";
     public static String APP_SECRET = "vRIMl4bNXQTy2TBKE9JZ";
 
-    public static String getCameraPreviewURL(String host, String appKey, String appSecret, String cameraIndexCode, String addressType, int streamType) {
+    public static String getCameraPreviewURL(String host, String appKey, String appSecret, String cameraIndexCode, String addressType, int streamType, String expand) {
 
         /*ArtemisConfig.host ="175.6.40.71:443"; // 代理API网关nginx服务器ip端口
         ArtemisConfig.appKey ="20628492";  // 秘钥appkey
@@ -59,7 +59,9 @@ public class ArtemisPostUtils {
         jsonBody.put("streamType", streamType); //0:主码流 1:子码流 2:第三码流  https://open.hikvision.com/docs/8530061f19534a9993e2afeb70e7c96a
         jsonBody.put("protocol", addressType);
         //jsonBody.put("transmode", 1);
-        //jsonBody.put("expand", "streamform=gb28181");
+        if (StringUtil.isNotBlank(expand)) {
+            jsonBody.put("expand", expand);
+        }
         String body = jsonBody.toJSONString();
 
         /**

hzims-service/operational/src/main/resources/db/2.0.13.sql

@@ -0,0 +1 @@
+alter table hzims_station_video_type add manufacturer varchar(255) null comment '厂商';