From e927692eea6f98d957228c606cfe09302c8d2039 Mon Sep 17 00:00:00 2001
From: luyie <yangpujun@163.com>
Date: Tue, 15 Sep 2026 19:48:09 +0800
Subject: [PATCH] =?UTF-8?q?add:=E8=A7=86=E9=A2=91=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=8E=82=E5=95=86=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?;getById=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9Eexpand=E6=89=A9?=
 =?UTF-8?q?=E5=B1=95=E5=8F=82=E6=95=B0=E9=80=8F=E4=BC=A0=E8=87=B3=E6=B5=B7?=
 =?UTF-8?q?=E5=BA=B7=E9=A2=84=E8=A7=88=E5=9C=B0=E5=9D=80=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzims/operational/station/entity/StationVideoTypeEntity.java | 2 ++
 .../station/controller/StationVideoTypeController.java           | 5 +++--
 .../operational/station/service/IStationVideoTypeService.java    | 2 +-
 .../station/service/impl/StationVideoTypeServiceImpl.java        | 9 +++++----
 .../hnac/hzims/operational/station/utils/ArtemisPostUtils.java   | 6 ++++--
 hzims-service/operational/src/main/resources/db/2.0.13.sql       | 1 +
 6 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 hzims-service/operational/src/main/resources/db/2.0.13.sql

diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationVideoTypeEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationVideoTypeEntity.java
index 19f0355..c9d45ea 100644
--- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationVideoTypeEntity.java
+++ b/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;
 }
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoTypeController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoTypeController.java
index 229ed89..a5247d7 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoTypeController.java
+++ b/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
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationVideoTypeService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationVideoTypeService.java
index 5a44893..d31cf93 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationVideoTypeService.java
+++ b/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();
 
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationVideoTypeServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationVideoTypeServiceImpl.java
index 1deb3d1..b3d81cc 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationVideoTypeServiceImpl.java
+++ b/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);
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/utils/ArtemisPostUtils.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/utils/ArtemisPostUtils.java
index 8452a1c..6b07d82 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/utils/ArtemisPostUtils.java
+++ b/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();
 
         /**
diff --git a/hzims-service/operational/src/main/resources/db/2.0.13.sql b/hzims-service/operational/src/main/resources/db/2.0.13.sql
new file mode 100644
index 0000000..962fb12
--- /dev/null
+++ b/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 '厂商';