diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java index 213dbf5..5161d0d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java @@ -4,7 +4,7 @@ import java.util.function.Function; -public interface IHikConvert { +public interface IHikConvert { /** * 转换具体实体类 * @@ -12,5 +12,5 @@ * @param 结果集 * @return */ - public R convertBizDTO(Function convert); + public R convertBizDTO(Function convert); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java index 213dbf5..5161d0d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java @@ -4,7 +4,7 @@ import java.util.function.Function; -public interface IHikConvert { +public interface IHikConvert { /** * 转换具体实体类 * @@ -12,5 +12,5 @@ * @param 结果集 * @return */ - public R convertBizDTO(Function convert); + public R convertBizDTO(Function convert); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/resquest/HikAreaRequestPageDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/resquest/HikAreaRequestPageDTO.java new file mode 100644 index 0000000..8952f58 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/resquest/HikAreaRequestPageDTO.java @@ -0,0 +1,43 @@ +package com.casic.missiles.modular.hik.api.resquest; + +import lombok.Data; + +import java.util.List; + +/** + * 海康分页请求DTO + */ +@Data +public class HikAreaRequestPageDTO { + + /** + * 当前页码1 + */ + private Integer pageNo = 0; + + /** + * 分页大小 + */ + private Integer pageSize = 10; + + /** + * 资源类型 + */ + private String resourceType; + + /** + * 父编号集合; + * 父编号个数 + * <=1000个； + * 单个长度<=64Byte； + */ + private List parentIndexCodes; + + /** + * 是否包含下级区域 + * true: 搜索parentIndexCodes的所有子、孙区域； + * false: 只搜索parentIndexCodes的直接子区域； + */ + private boolean isSubRegion; + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java index 213dbf5..5161d0d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java @@ -4,7 +4,7 @@ import java.util.function.Function; -public interface IHikConvert { +public interface IHikConvert { /** * 转换具体实体类 * @@ -12,5 +12,5 @@ * @param 结果集 * @return */ - public R convertBizDTO(Function convert); + public R convertBizDTO(Function convert); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/resquest/HikAreaRequestPageDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/resquest/HikAreaRequestPageDTO.java new file mode 100644 index 0000000..8952f58 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/resquest/HikAreaRequestPageDTO.java @@ -0,0 +1,43 @@ +package com.casic.missiles.modular.hik.api.resquest; + +import lombok.Data; + +import java.util.List; + +/** + * 海康分页请求DTO + */ +@Data +public class HikAreaRequestPageDTO { + + /** + * 当前页码1 + */ + private Integer pageNo = 0; + + /** + * 分页大小 + */ + private Integer pageSize = 10; + + /** + * 资源类型 + */ + private String resourceType; + + /** + * 父编号集合; + * 父编号个数 + * <=1000个； + * 单个长度<=64Byte； + */ + private List parentIndexCodes; + + /** + * 是否包含下级区域 + * true: 搜索parentIndexCodes的所有子、孙区域； + * false: 只搜索parentIndexCodes的直接子区域； + */ + private boolean isSubRegion; + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikAreaDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikAreaDTO.java new file mode 100644 index 0000000..ce5c198 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikAreaDTO.java @@ -0,0 +1,83 @@ +package com.casic.missiles.modular.hik.dto; + +import com.casic.missiles.modular.hik.api.IHikConvert; +import lombok.Data; + +import java.util.Date; +import java.util.function.Function; + +/** + * 海康监控点实体信息 + */ +@Data +public class HikAreaDTO implements IHikConvert { + /** + * 区域编号 + */ + private String indexCode; + + /** + * 区域名称 + */ + private String name; + + /** + * 区域完整路径，含本节点，@进行分割，上级节点在前 + */ + private String regionPath; + + /** + * 父区域唯一标识码 + */ + private String parentIndexCode; + + /** + * 用于标识区域节点是否有权限操作，true：有权限 false：无权限 + */ + private boolean available; + + /** + * true:是叶子节点，表示该区域下面未挂区域 false:不是叶子节点，表示该区域下面挂有区域 + */ + private boolean leaf; + + /** + * 级联平台标识，多个级联编号以@分隔，本级区域默认值“0” + */ + private String cascadeCode; + + /** + * 区域标识 + */ + private int cascadeType; + + /** + * 区域类型 + */ + private int catalogType; + + /** + * 外码(如：国际码) + */ + private String externalIndexCode; + + /** + * 同级区域顺序 + */ + private int sort; + + /** + * 创建时间，要求遵守ISO8601标准，如2018-07-26T21:30:08.322+08:00 + */ + private Date createTime; + + /** + * 更新时间，要求遵守ISO8601标准，如2018-07-26T21:30:08.322+08:00 + */ + private Date updateTime; + + @Override + public R convertBizDTO(Function convert) { + return convert.apply(this); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java index 213dbf5..5161d0d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java @@ -4,7 +4,7 @@ import java.util.function.Function; -public interface IHikConvert { +public interface IHikConvert { /** * 转换具体实体类 * @@ -12,5 +12,5 @@ * @param 结果集 * @return */ - public R convertBizDTO(Function convert); + public R convertBizDTO(Function convert); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/resquest/HikAreaRequestPageDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/resquest/HikAreaRequestPageDTO.java new file mode 100644 index 0000000..8952f58 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/resquest/HikAreaRequestPageDTO.java @@ -0,0 +1,43 @@ +package com.casic.missiles.modular.hik.api.resquest; + +import lombok.Data; + +import java.util.List; + +/** + * 海康分页请求DTO + */ +@Data +public class HikAreaRequestPageDTO { + + /** + * 当前页码1 + */ + private Integer pageNo = 0; + + /** + * 分页大小 + */ + private Integer pageSize = 10; + + /** + * 资源类型 + */ + private String resourceType; + + /** + * 父编号集合; + * 父编号个数 + * <=1000个； + * 单个长度<=64Byte； + */ + private List parentIndexCodes; + + /** + * 是否包含下级区域 + * true: 搜索parentIndexCodes的所有子、孙区域； + * false: 只搜索parentIndexCodes的直接子区域； + */ + private boolean isSubRegion; + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikAreaDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikAreaDTO.java new file mode 100644 index 0000000..ce5c198 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikAreaDTO.java @@ -0,0 +1,83 @@ +package com.casic.missiles.modular.hik.dto; + +import com.casic.missiles.modular.hik.api.IHikConvert; +import lombok.Data; + +import java.util.Date; +import java.util.function.Function; + +/** + * 海康监控点实体信息 + */ +@Data +public class HikAreaDTO implements IHikConvert { + /** + * 区域编号 + */ + private String indexCode; + + /** + * 区域名称 + */ + private String name; + + /** + * 区域完整路径，含本节点，@进行分割，上级节点在前 + */ + private String regionPath; + + /** + * 父区域唯一标识码 + */ + private String parentIndexCode; + + /** + * 用于标识区域节点是否有权限操作，true：有权限 false：无权限 + */ + private boolean available; + + /** + * true:是叶子节点，表示该区域下面未挂区域 false:不是叶子节点，表示该区域下面挂有区域 + */ + private boolean leaf; + + /** + * 级联平台标识，多个级联编号以@分隔，本级区域默认值“0” + */ + private String cascadeCode; + + /** + * 区域标识 + */ + private int cascadeType; + + /** + * 区域类型 + */ + private int catalogType; + + /** + * 外码(如：国际码) + */ + private String externalIndexCode; + + /** + * 同级区域顺序 + */ + private int sort; + + /** + * 创建时间，要求遵守ISO8601标准，如2018-07-26T21:30:08.322+08:00 + */ + private Date createTime; + + /** + * 更新时间，要求遵守ISO8601标准，如2018-07-26T21:30:08.322+08:00 + */ + private Date updateTime; + + @Override + public R convertBizDTO(Function convert) { + return convert.apply(this); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikCameraDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikCameraDTO.java index 2246345..781d839 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikCameraDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikCameraDTO.java @@ -10,7 +10,7 @@ * 海康监控点实体信息 */ @Data -public class HikCameraDTO implements IHikConvert { +public class HikCameraDTO implements IHikConvert { /** * 唯一编码。 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java index 213dbf5..5161d0d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java @@ -4,7 +4,7 @@ import java.util.function.Function; -public interface IHikConvert { +public interface IHikConvert { /** * 转换具体实体类 * @@ -12,5 +12,5 @@ * @param 结果集 * @return */ - public R convertBizDTO(Function convert); + public R convertBizDTO(Function convert); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/resquest/HikAreaRequestPageDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/resquest/HikAreaRequestPageDTO.java new file mode 100644 index 0000000..8952f58 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/resquest/HikAreaRequestPageDTO.java @@ -0,0 +1,43 @@ +package com.casic.missiles.modular.hik.api.resquest; + +import lombok.Data; + +import java.util.List; + +/** + * 海康分页请求DTO + */ +@Data +public class HikAreaRequestPageDTO { + + /** + * 当前页码1 + */ + private Integer pageNo = 0; + + /** + * 分页大小 + */ + private Integer pageSize = 10; + + /** + * 资源类型 + */ + private String resourceType; + + /** + * 父编号集合; + * 父编号个数 + * <=1000个； + * 单个长度<=64Byte； + */ + private List parentIndexCodes; + + /** + * 是否包含下级区域 + * true: 搜索parentIndexCodes的所有子、孙区域； + * false: 只搜索parentIndexCodes的直接子区域； + */ + private boolean isSubRegion; + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikAreaDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikAreaDTO.java new file mode 100644 index 0000000..ce5c198 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikAreaDTO.java @@ -0,0 +1,83 @@ +package com.casic.missiles.modular.hik.dto; + +import com.casic.missiles.modular.hik.api.IHikConvert; +import lombok.Data; + +import java.util.Date; +import java.util.function.Function; + +/** + * 海康监控点实体信息 + */ +@Data +public class HikAreaDTO implements IHikConvert { + /** + * 区域编号 + */ + private String indexCode; + + /** + * 区域名称 + */ + private String name; + + /** + * 区域完整路径，含本节点，@进行分割，上级节点在前 + */ + private String regionPath; + + /** + * 父区域唯一标识码 + */ + private String parentIndexCode; + + /** + * 用于标识区域节点是否有权限操作，true：有权限 false：无权限 + */ + private boolean available; + + /** + * true:是叶子节点，表示该区域下面未挂区域 false:不是叶子节点，表示该区域下面挂有区域 + */ + private boolean leaf; + + /** + * 级联平台标识，多个级联编号以@分隔，本级区域默认值“0” + */ + private String cascadeCode; + + /** + * 区域标识 + */ + private int cascadeType; + + /** + * 区域类型 + */ + private int catalogType; + + /** + * 外码(如：国际码) + */ + private String externalIndexCode; + + /** + * 同级区域顺序 + */ + private int sort; + + /** + * 创建时间，要求遵守ISO8601标准，如2018-07-26T21:30:08.322+08:00 + */ + private Date createTime; + + /** + * 更新时间，要求遵守ISO8601标准，如2018-07-26T21:30:08.322+08:00 + */ + private Date updateTime; + + @Override + public R convertBizDTO(Function convert) { + return convert.apply(this); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikCameraDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikCameraDTO.java index 2246345..781d839 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikCameraDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikCameraDTO.java @@ -10,7 +10,7 @@ * 海康监控点实体信息 */ @Data -public class HikCameraDTO implements IHikConvert { +public class HikCameraDTO implements IHikConvert { /** * 唯一编码。 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceTypeEnums.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceTypeEnums.java index 58e3fb1..de31442 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceTypeEnums.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceTypeEnums.java @@ -5,7 +5,7 @@ */ public enum ResourceTypeEnums { camera("camera", "监控点", ResourceUrlEnum.RESOURCES_BY_PARAMS), - region("region", "区域", ResourceUrlEnum.RESOURCES_BY_PARAMS); + region("region", "区域", ResourceUrlEnum.REGION_SEARCH); private String type; private String name; private ResourceUrlEnum resourceUrlEnum; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java index 213dbf5..5161d0d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java @@ -4,7 +4,7 @@ import java.util.function.Function; -public interface IHikConvert { +public interface IHikConvert { /** * 转换具体实体类 * @@ -12,5 +12,5 @@ * @param 结果集 * @return */ - public R convertBizDTO(Function convert); + public R convertBizDTO(Function convert); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/resquest/HikAreaRequestPageDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/resquest/HikAreaRequestPageDTO.java new file mode 100644 index 0000000..8952f58 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/resquest/HikAreaRequestPageDTO.java @@ -0,0 +1,43 @@ +package com.casic.missiles.modular.hik.api.resquest; + +import lombok.Data; + +import java.util.List; + +/** + * 海康分页请求DTO + */ +@Data +public class HikAreaRequestPageDTO { + + /** + * 当前页码1 + */ + private Integer pageNo = 0; + + /** + * 分页大小 + */ + private Integer pageSize = 10; + + /** + * 资源类型 + */ + private String resourceType; + + /** + * 父编号集合; + * 父编号个数 + * <=1000个； + * 单个长度<=64Byte； + */ + private List parentIndexCodes; + + /** + * 是否包含下级区域 + * true: 搜索parentIndexCodes的所有子、孙区域； + * false: 只搜索parentIndexCodes的直接子区域； + */ + private boolean isSubRegion; + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikAreaDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikAreaDTO.java new file mode 100644 index 0000000..ce5c198 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikAreaDTO.java @@ -0,0 +1,83 @@ +package com.casic.missiles.modular.hik.dto; + +import com.casic.missiles.modular.hik.api.IHikConvert; +import lombok.Data; + +import java.util.Date; +import java.util.function.Function; + +/** + * 海康监控点实体信息 + */ +@Data +public class HikAreaDTO implements IHikConvert { + /** + * 区域编号 + */ + private String indexCode; + + /** + * 区域名称 + */ + private String name; + + /** + * 区域完整路径，含本节点，@进行分割，上级节点在前 + */ + private String regionPath; + + /** + * 父区域唯一标识码 + */ + private String parentIndexCode; + + /** + * 用于标识区域节点是否有权限操作，true：有权限 false：无权限 + */ + private boolean available; + + /** + * true:是叶子节点，表示该区域下面未挂区域 false:不是叶子节点，表示该区域下面挂有区域 + */ + private boolean leaf; + + /** + * 级联平台标识，多个级联编号以@分隔，本级区域默认值“0” + */ + private String cascadeCode; + + /** + * 区域标识 + */ + private int cascadeType; + + /** + * 区域类型 + */ + private int catalogType; + + /** + * 外码(如：国际码) + */ + private String externalIndexCode; + + /** + * 同级区域顺序 + */ + private int sort; + + /** + * 创建时间，要求遵守ISO8601标准，如2018-07-26T21:30:08.322+08:00 + */ + private Date createTime; + + /** + * 更新时间，要求遵守ISO8601标准，如2018-07-26T21:30:08.322+08:00 + */ + private Date updateTime; + + @Override + public R convertBizDTO(Function convert) { + return convert.apply(this); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikCameraDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikCameraDTO.java index 2246345..781d839 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikCameraDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikCameraDTO.java @@ -10,7 +10,7 @@ * 海康监控点实体信息 */ @Data -public class HikCameraDTO implements IHikConvert { +public class HikCameraDTO implements IHikConvert { /** * 唯一编码。 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceTypeEnums.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceTypeEnums.java index 58e3fb1..de31442 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceTypeEnums.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceTypeEnums.java @@ -5,7 +5,7 @@ */ public enum ResourceTypeEnums { camera("camera", "监控点", ResourceUrlEnum.RESOURCES_BY_PARAMS), - region("region", "区域", ResourceUrlEnum.RESOURCES_BY_PARAMS); + region("region", "区域", ResourceUrlEnum.REGION_SEARCH); private String type; private String name; private ResourceUrlEnum resourceUrlEnum; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceUrlEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceUrlEnum.java index 5d3e254..254ba7d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceUrlEnum.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceUrlEnum.java @@ -9,7 +9,7 @@ RESOURCES_BY_PARAMS("/api/irds/v2/resource/resourcesByParams", "查询资源列表v2"), PREVIEW_URLS("/api/video/v2/cameras/previewURLs", "获取监控点预览取流URLv2"), DEVICE_SEARCH("/api/resource/v2/encodeDevice/search", "查询编码设备列表v2"), - + REGION_SEARCH("/api/irds/v2/region/nodesByParams", "查询区域列表v2"), TALK_URLS("/api/video/v1/cameras/talkURLs", "查询对讲URL"); private String url; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java index 213dbf5..5161d0d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java @@ -4,7 +4,7 @@ import java.util.function.Function; -public interface IHikConvert { +public interface IHikConvert { /** * 转换具体实体类 * @@ -12,5 +12,5 @@ * @param 结果集 * @return */ - public R convertBizDTO(Function convert); + public R convertBizDTO(Function convert); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/resquest/HikAreaRequestPageDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/resquest/HikAreaRequestPageDTO.java new file mode 100644 index 0000000..8952f58 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/resquest/HikAreaRequestPageDTO.java @@ -0,0 +1,43 @@ +package com.casic.missiles.modular.hik.api.resquest; + +import lombok.Data; + +import java.util.List; + +/** + * 海康分页请求DTO + */ +@Data +public class HikAreaRequestPageDTO { + + /** + * 当前页码1 + */ + private Integer pageNo = 0; + + /** + * 分页大小 + */ + private Integer pageSize = 10; + + /** + * 资源类型 + */ + private String resourceType; + + /** + * 父编号集合; + * 父编号个数 + * <=1000个； + * 单个长度<=64Byte； + */ + private List parentIndexCodes; + + /** + * 是否包含下级区域 + * true: 搜索parentIndexCodes的所有子、孙区域； + * false: 只搜索parentIndexCodes的直接子区域； + */ + private boolean isSubRegion; + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikAreaDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikAreaDTO.java new file mode 100644 index 0000000..ce5c198 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikAreaDTO.java @@ -0,0 +1,83 @@ +package com.casic.missiles.modular.hik.dto; + +import com.casic.missiles.modular.hik.api.IHikConvert; +import lombok.Data; + +import java.util.Date; +import java.util.function.Function; + +/** + * 海康监控点实体信息 + */ +@Data +public class HikAreaDTO implements IHikConvert { + /** + * 区域编号 + */ + private String indexCode; + + /** + * 区域名称 + */ + private String name; + + /** + * 区域完整路径，含本节点，@进行分割，上级节点在前 + */ + private String regionPath; + + /** + * 父区域唯一标识码 + */ + private String parentIndexCode; + + /** + * 用于标识区域节点是否有权限操作，true：有权限 false：无权限 + */ + private boolean available; + + /** + * true:是叶子节点，表示该区域下面未挂区域 false:不是叶子节点，表示该区域下面挂有区域 + */ + private boolean leaf; + + /** + * 级联平台标识，多个级联编号以@分隔，本级区域默认值“0” + */ + private String cascadeCode; + + /** + * 区域标识 + */ + private int cascadeType; + + /** + * 区域类型 + */ + private int catalogType; + + /** + * 外码(如：国际码) + */ + private String externalIndexCode; + + /** + * 同级区域顺序 + */ + private int sort; + + /** + * 创建时间，要求遵守ISO8601标准，如2018-07-26T21:30:08.322+08:00 + */ + private Date createTime; + + /** + * 更新时间，要求遵守ISO8601标准，如2018-07-26T21:30:08.322+08:00 + */ + private Date updateTime; + + @Override + public R convertBizDTO(Function convert) { + return convert.apply(this); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikCameraDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikCameraDTO.java index 2246345..781d839 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikCameraDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikCameraDTO.java @@ -10,7 +10,7 @@ * 海康监控点实体信息 */ @Data -public class HikCameraDTO implements IHikConvert { +public class HikCameraDTO implements IHikConvert { /** * 唯一编码。 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceTypeEnums.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceTypeEnums.java index 58e3fb1..de31442 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceTypeEnums.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceTypeEnums.java @@ -5,7 +5,7 @@ */ public enum ResourceTypeEnums { camera("camera", "监控点", ResourceUrlEnum.RESOURCES_BY_PARAMS), - region("region", "区域", ResourceUrlEnum.RESOURCES_BY_PARAMS); + region("region", "区域", ResourceUrlEnum.REGION_SEARCH); private String type; private String name; private ResourceUrlEnum resourceUrlEnum; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceUrlEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceUrlEnum.java index 5d3e254..254ba7d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceUrlEnum.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceUrlEnum.java @@ -9,7 +9,7 @@ RESOURCES_BY_PARAMS("/api/irds/v2/resource/resourcesByParams", "查询资源列表v2"), PREVIEW_URLS("/api/video/v2/cameras/previewURLs", "获取监控点预览取流URLv2"), DEVICE_SEARCH("/api/resource/v2/encodeDevice/search", "查询编码设备列表v2"), - + REGION_SEARCH("/api/irds/v2/region/nodesByParams", "查询区域列表v2"), TALK_URLS("/api/video/v1/cameras/talkURLs", "查询对讲URL"); private String url; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/IHikService.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/IHikService.java index f64d4f1..444472f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/IHikService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/IHikService.java @@ -2,6 +2,8 @@ import com.alibaba.fastjson.JSONObject; import com.casic.missiles.modular.hik.api.resquest.HikRequestPageDTO; +import com.casic.missiles.modular.hik.dto.HikAreaDTO; +import com.casic.missiles.modular.hik.dto.HikCameraDTO; import com.casic.missiles.modular.hik.enums.ResourceTypeEnums; import com.casic.missiles.modular.hik.enums.RouteApiEnums; @@ -17,11 +19,17 @@ * * @param requestPageDTO 请求体 * @param typeEnums 资源枚举类型 - * @param 结果集 * @return */ - List searchDeviceByParams(HikRequestPageDTO requestPageDTO, ResourceTypeEnums typeEnums); + List searchDeviceByParams(HikRequestPageDTO requestPageDTO, ResourceTypeEnums typeEnums); + /** + * 海康区域资源读取 + * + * @param typeEnums 资源枚举类型 + * @return + */ + List searchAllArea(HikRequestPageDTO requestPageDTO, ResourceTypeEnums typeEnums); /** * 海康代理接口访问 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java index 213dbf5..5161d0d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/IHikConvert.java @@ -4,7 +4,7 @@ import java.util.function.Function; -public interface IHikConvert { +public interface IHikConvert { /** * 转换具体实体类 * @@ -12,5 +12,5 @@ * @param 结果集 * @return */ - public R convertBizDTO(Function convert); + public R convertBizDTO(Function convert); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/api/resquest/HikAreaRequestPageDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/resquest/HikAreaRequestPageDTO.java new file mode 100644 index 0000000..8952f58 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/api/resquest/HikAreaRequestPageDTO.java @@ -0,0 +1,43 @@ +package com.casic.missiles.modular.hik.api.resquest; + +import lombok.Data; + +import java.util.List; + +/** + * 海康分页请求DTO + */ +@Data +public class HikAreaRequestPageDTO { + + /** + * 当前页码1 + */ + private Integer pageNo = 0; + + /** + * 分页大小 + */ + private Integer pageSize = 10; + + /** + * 资源类型 + */ + private String resourceType; + + /** + * 父编号集合; + * 父编号个数 + * <=1000个； + * 单个长度<=64Byte； + */ + private List parentIndexCodes; + + /** + * 是否包含下级区域 + * true: 搜索parentIndexCodes的所有子、孙区域； + * false: 只搜索parentIndexCodes的直接子区域； + */ + private boolean isSubRegion; + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikAreaDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikAreaDTO.java new file mode 100644 index 0000000..ce5c198 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikAreaDTO.java @@ -0,0 +1,83 @@ +package com.casic.missiles.modular.hik.dto; + +import com.casic.missiles.modular.hik.api.IHikConvert; +import lombok.Data; + +import java.util.Date; +import java.util.function.Function; + +/** + * 海康监控点实体信息 + */ +@Data +public class HikAreaDTO implements IHikConvert { + /** + * 区域编号 + */ + private String indexCode; + + /** + * 区域名称 + */ + private String name; + + /** + * 区域完整路径，含本节点，@进行分割，上级节点在前 + */ + private String regionPath; + + /** + * 父区域唯一标识码 + */ + private String parentIndexCode; + + /** + * 用于标识区域节点是否有权限操作，true：有权限 false：无权限 + */ + private boolean available; + + /** + * true:是叶子节点，表示该区域下面未挂区域 false:不是叶子节点，表示该区域下面挂有区域 + */ + private boolean leaf; + + /** + * 级联平台标识，多个级联编号以@分隔，本级区域默认值“0” + */ + private String cascadeCode; + + /** + * 区域标识 + */ + private int cascadeType; + + /** + * 区域类型 + */ + private int catalogType; + + /** + * 外码(如：国际码) + */ + private String externalIndexCode; + + /** + * 同级区域顺序 + */ + private int sort; + + /** + * 创建时间，要求遵守ISO8601标准，如2018-07-26T21:30:08.322+08:00 + */ + private Date createTime; + + /** + * 更新时间，要求遵守ISO8601标准，如2018-07-26T21:30:08.322+08:00 + */ + private Date updateTime; + + @Override + public R convertBizDTO(Function convert) { + return convert.apply(this); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikCameraDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikCameraDTO.java index 2246345..781d839 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikCameraDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/dto/HikCameraDTO.java @@ -10,7 +10,7 @@ * 海康监控点实体信息 */ @Data -public class HikCameraDTO implements IHikConvert { +public class HikCameraDTO implements IHikConvert { /** * 唯一编码。 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceTypeEnums.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceTypeEnums.java index 58e3fb1..de31442 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceTypeEnums.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceTypeEnums.java @@ -5,7 +5,7 @@ */ public enum ResourceTypeEnums { camera("camera", "监控点", ResourceUrlEnum.RESOURCES_BY_PARAMS), - region("region", "区域", ResourceUrlEnum.RESOURCES_BY_PARAMS); + region("region", "区域", ResourceUrlEnum.REGION_SEARCH); private String type; private String name; private ResourceUrlEnum resourceUrlEnum; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceUrlEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceUrlEnum.java index 5d3e254..254ba7d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceUrlEnum.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/enums/ResourceUrlEnum.java @@ -9,7 +9,7 @@ RESOURCES_BY_PARAMS("/api/irds/v2/resource/resourcesByParams", "查询资源列表v2"), PREVIEW_URLS("/api/video/v2/cameras/previewURLs", "获取监控点预览取流URLv2"), DEVICE_SEARCH("/api/resource/v2/encodeDevice/search", "查询编码设备列表v2"), - + REGION_SEARCH("/api/irds/v2/region/nodesByParams", "查询区域列表v2"), TALK_URLS("/api/video/v1/cameras/talkURLs", "查询对讲URL"); private String url; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/IHikService.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/IHikService.java index f64d4f1..444472f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/IHikService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/IHikService.java @@ -2,6 +2,8 @@ import com.alibaba.fastjson.JSONObject; import com.casic.missiles.modular.hik.api.resquest.HikRequestPageDTO; +import com.casic.missiles.modular.hik.dto.HikAreaDTO; +import com.casic.missiles.modular.hik.dto.HikCameraDTO; import com.casic.missiles.modular.hik.enums.ResourceTypeEnums; import com.casic.missiles.modular.hik.enums.RouteApiEnums; @@ -17,11 +19,17 @@ * * @param requestPageDTO 请求体 * @param typeEnums 资源枚举类型 - * @param 结果集 * @return */ - List searchDeviceByParams(HikRequestPageDTO requestPageDTO, ResourceTypeEnums typeEnums); + List searchDeviceByParams(HikRequestPageDTO requestPageDTO, ResourceTypeEnums typeEnums); + /** + * 海康区域资源读取 + * + * @param typeEnums 资源枚举类型 + * @return + */ + List searchAllArea(HikRequestPageDTO requestPageDTO, ResourceTypeEnums typeEnums); /** * 海康代理接口访问 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/HikServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/HikServiceImpl.java index 3110264..a684366 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/HikServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/HikServiceImpl.java @@ -7,6 +7,8 @@ import com.casic.missiles.modular.hik.api.response.HikResponseDTO; import com.casic.missiles.modular.hik.api.response.HikResponseListDTO; import com.casic.missiles.modular.hik.api.resquest.HikRequestPageDTO; +import com.casic.missiles.modular.hik.dto.HikAreaDTO; +import com.casic.missiles.modular.hik.dto.HikCameraDTO; import com.casic.missiles.modular.hik.enums.ResourceTypeEnums; import com.casic.missiles.modular.hik.enums.RouteApiEnums; import com.casic.missiles.modular.hik.service.IHikService; @@ -22,18 +24,35 @@ @Component public class HikServiceImpl implements IHikService { @Override - public List searchDeviceByParams(HikRequestPageDTO requestPageDTO, ResourceTypeEnums typeEnums) { + public List searchDeviceByParams(HikRequestPageDTO requestPageDTO, ResourceTypeEnums typeEnums) { + if (StrUtil.isEmpty(requestPageDTO.getResourceType())) { requestPageDTO.setResourceType(typeEnums.getType()); } + String result = HikUtil.hikApi(typeEnums.getResourceUrlEnum().getUrl(), JSON.toJSONString(requestPageDTO)); if (StrUtil.isNotEmpty(result)) { - HikResponseDTO> response = JSON.parseObject(result, new TypeReference>>() { + HikResponseDTO> response = JSON.parseObject(result, new TypeReference>>() { }); return response.getData().getList(); } else { log.error("读取ISC数据失败:{}", requestPageDTO); } + + return new ArrayList<>(); + } + + @Override + public List searchAllArea(HikRequestPageDTO requestPageDTO, ResourceTypeEnums typeEnums) { + + String result = HikUtil.hikApi(typeEnums.getResourceUrlEnum().getUrl(), JSON.toJSONString(requestPageDTO)); + if (StrUtil.isNotEmpty(result)) { + HikResponseDTO> response = JSON.parseObject(result, new TypeReference>>(){}); + return response.getData().getList(); + } else { + log.error("读取ISC数据失败:{}", requestPageDTO); + } + return new ArrayList<>(); }