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 getById(@RequestParam Long id, @RequestParam int streamType) { - return R.data(stationVideoTypeService.getById(id, streamType)); + public R 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 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