diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java index f0c1a71..92ab91d 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java @@ -413,4 +413,11 @@ public class EmInfoController extends BladeController { public R> getEmTreeByDeptAndParentCode(@ApiParam("机构ID") Long deptId, @ApiParam("父级设备编号") String parentCode) { return R.data(em_infoService.getEmTreeByDeptAndParentCode(deptId,parentCode)); } + + @GetMapping("/hkVideoDevices") + @ApiOperationSupport(order = 12) + @ApiOperation(value = "海康视频设备获取") + public R> hkVideoDevices() { + return R.data(em_infoService.hkVideoDevices()); + } } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmInfoService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmInfoService.java index 5decdcc..8562541 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmInfoService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmInfoService.java @@ -89,4 +89,6 @@ public interface IEmInfoService extends BaseService { List getEmTreeByDeptAndParentCode(Long deptId, String parentCode); List getVideoDeviceByEmCode(EmInfoEntity emInfo); + + List hkVideoDevices(); } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java index 5b9ecef..cadc489 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java @@ -900,4 +900,15 @@ public class EmInfoServiceImpl extends BaseServiceImpl hkVideoDevices() { + return this.list(Wrappers.lambdaQuery() + .eq(EmInfoEntity::getEmType,4)); + } + }