Commit b2ff1e36 by chenjunxiong

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	jeecg-boot-parent/jeecg-boot-module-hikvision/src/test/java/HikvisionSdkTest.java
parents 9e19ed35 d56bef43
package org.jeecg.pm.hikvision.sdk.entity.body.eps;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.pm.hikvision.sdk.entity.body.HikvisionBodyModel;
import org.jeecg.pm.hikvision.sdk.json.serialize.ListJoinWithCommaSerialize;
import java.util.List;
/**
* @author: JJww
* @Date:2022/3/23
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
public class HikvisionSubscribeEventsFromMQEx extends HikvisionBodyModel {
/**
* 事件类型集
*/
@JsonSerialize(using = ListJoinWithCommaSerialize.class)
private List<String> eventTypes;
/**
* 事件类型集与子系统编码不能同时为空。
* 如果同时传入两个参数,必须子系统必须匹配。
* 如果只传入子系统编码不传入事件类型集,则代表取消订阅该子系统的所有事件
*/
private String subSystemUui;
}
package org.jeecg.pm.hikvision.sdk.request.eps;
import com.chanjx.utils.HttpMethod;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.apache.http.entity.ContentType;
import org.jeecg.pm.hikvision.sdk.entity.body.HikvisionBodyModel;
import org.jeecg.pm.hikvision.sdk.entity.body.eps.HikvisionSubscribeEventsFromMQEx;
import org.jeecg.pm.hikvision.sdk.request.HikvisionAbstractRequest;
import org.jeecg.pm.hikvision.sdk.response.eps.HikvisionSubscribeEventsFromMQExResponse;
import org.jeecg.pm.hikvision.sdk.result.eps.HikvisionSubscribeEventsFromMQExResult;
/**
* @author: JJww
* @Date:2022/3/23
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
public class HikvisionSubscribeEventsFromMQExRequest extends HikvisionAbstractRequest<HikvisionSubscribeEventsFromMQExResponse, HikvisionSubscribeEventsFromMQExResult> {
private HikvisionSubscribeEventsFromMQEx hikvisionGetSubscribeEventsFromMQEx;
public HikvisionSubscribeEventsFromMQExRequest(HikvisionSubscribeEventsFromMQEx hikvisionGetSubscribeEventsFromMQEx) {
this.hikvisionGetSubscribeEventsFromMQEx = hikvisionGetSubscribeEventsFromMQEx;
}
@Override
public ContentType getContentType() {
return ContentType.APPLICATION_JSON;
}
@Override
public Class<HikvisionSubscribeEventsFromMQExResponse> getResponseClazz() {
return HikvisionSubscribeEventsFromMQExResponse.class;
}
@Override
public Class<HikvisionSubscribeEventsFromMQExResult> getResultClazz() {
return HikvisionSubscribeEventsFromMQExResult.class;
}
@Override
public HttpMethod getHttpMethod() {
return HttpMethod.POST;
}
@Override
public String getReqPath() {
return "/openapi/service/eps/subscribeEventsFromMQEx";
}
@Override
public HikvisionBodyModel getModel() {
return hikvisionGetSubscribeEventsFromMQEx;
}
@Override
public void setModel(HikvisionBodyModel model) {
this.hikvisionGetSubscribeEventsFromMQEx = (HikvisionSubscribeEventsFromMQEx) model;
}
}
package org.jeecg.pm.hikvision.sdk.response.eps;
import org.jeecg.pm.hikvision.sdk.request.eps.HikvisionSubscribeEventsFromMQExRequest;
import org.jeecg.pm.hikvision.sdk.response.HikvisionAbstractResponse;
import org.jeecg.pm.hikvision.sdk.result.eps.HikvisionSubscribeEventsFromMQExResult;
import org.jeecg.pm.hikvision.sdk.result.vss.res.HikvisionGetCamerasExResult;
/**
* @author: JJww
* @Date:2022/3/23
*/
public class HikvisionSubscribeEventsFromMQExResponse extends HikvisionAbstractResponse<HikvisionSubscribeEventsFromMQExResult> {
public HikvisionSubscribeEventsFromMQExResponse() {
super(HikvisionSubscribeEventsFromMQExResult.class,false);
}
}
package org.jeecg.pm.hikvision.sdk.result.eps;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.pm.hikvision.sdk.result.HikvisionBaseResult;
import java.io.Serializable;
/**
* @author: JJww
* @Date:2022/3/23
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
public class HikvisionSubscribeEventsFromMQExResult extends HikvisionBaseResult {
/**
* 返回数据
*/
private MQInfo data;
@Slf4j
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public static class MQInfo implements Serializable {
/**
* MQ 的地址和端口
*/
private String mqURL;
/**
* 订阅名称
*/
private String destination;
}
}
import org.jeecg.pm.hikvision.sdk.client.HikvisionBaseClient; import org.jeecg.pm.hikvision.sdk.client.HikvisionBaseClient;
import org.jeecg.pm.hikvision.sdk.client.HikvisionClient; import org.jeecg.pm.hikvision.sdk.client.HikvisionClient;
import org.jeecg.pm.hikvision.sdk.entity.body.vss.playback.HikvisionGetPlaybackParamByPlanUuid; import org.jeecg.pm.hikvision.sdk.entity.body.eps.HikvisionSubscribeEventsFromMQEx;
import org.jeecg.pm.hikvision.sdk.entity.body.vss.playback.HikvisionGetRecordPlansByCameraUuids;
import org.jeecg.pm.hikvision.sdk.entity.body.vss.preview.HikvisiongetPreviewParamByCameraUuid; import org.jeecg.pm.hikvision.sdk.entity.body.vss.preview.HikvisiongetPreviewParamByCameraUuid;
import org.jeecg.pm.hikvision.sdk.entity.body.vss.res.HikvisionGetCamerasEx; import org.jeecg.pm.hikvision.sdk.entity.body.vss.res.HikvisionGetCamerasEx;
import org.jeecg.pm.hikvision.sdk.entity.body.vss.res.HikvisionGetEncoders; import org.jeecg.pm.hikvision.sdk.entity.body.vss.res.HikvisionGetEncoders;
...@@ -9,11 +8,13 @@ import org.jeecg.pm.hikvision.sdk.request.base.netzone.HikvisionGetNetZonesReque ...@@ -9,11 +8,13 @@ import org.jeecg.pm.hikvision.sdk.request.base.netzone.HikvisionGetNetZonesReque
import org.jeecg.pm.hikvision.sdk.request.base.user.HikvisionGetDefaultUserUuidRequest; import org.jeecg.pm.hikvision.sdk.request.base.user.HikvisionGetDefaultUserUuidRequest;
import org.jeecg.pm.hikvision.sdk.request.vss.playback.HikvisionGetPlaybackParamByPlanUuidRequest; import org.jeecg.pm.hikvision.sdk.request.vss.playback.HikvisionGetPlaybackParamByPlanUuidRequest;
import org.jeecg.pm.hikvision.sdk.request.vss.playback.HikvisionGetRecordPlansByCameraUuidsRequest; import org.jeecg.pm.hikvision.sdk.request.vss.playback.HikvisionGetRecordPlansByCameraUuidsRequest;
import org.jeecg.pm.hikvision.sdk.request.eps.HikvisionSubscribeEventsFromMQExRequest;
import org.jeecg.pm.hikvision.sdk.request.vss.preview.HikvisionPreviewParamByCameraUuidRequest; import org.jeecg.pm.hikvision.sdk.request.vss.preview.HikvisionPreviewParamByCameraUuidRequest;
import org.jeecg.pm.hikvision.sdk.request.vss.res.HikvisionGetCamerasExRequest; import org.jeecg.pm.hikvision.sdk.request.vss.res.HikvisionGetCamerasExRequest;
import org.jeecg.pm.hikvision.sdk.request.vss.res.HikvisionGetEncodersRequest; import org.jeecg.pm.hikvision.sdk.request.vss.res.HikvisionGetEncodersRequest;
import org.jeecg.pm.hikvision.sdk.response.base.netzone.HikvisionGetNetZonesResponse; import org.jeecg.pm.hikvision.sdk.response.base.netzone.HikvisionGetNetZonesResponse;
import org.jeecg.pm.hikvision.sdk.response.base.user.HikvisionGetDefaultUserUuidResponse; import org.jeecg.pm.hikvision.sdk.response.base.user.HikvisionGetDefaultUserUuidResponse;
import org.jeecg.pm.hikvision.sdk.response.eps.HikvisionSubscribeEventsFromMQExResponse;
import org.jeecg.pm.hikvision.sdk.response.vss.playback.HikvisionGetPlaybackParamByPlanUuidResponse; import org.jeecg.pm.hikvision.sdk.response.vss.playback.HikvisionGetPlaybackParamByPlanUuidResponse;
import org.jeecg.pm.hikvision.sdk.response.vss.playback.HikvisionGetRecordPlansByCameraUuidsResponse; import org.jeecg.pm.hikvision.sdk.response.vss.playback.HikvisionGetRecordPlansByCameraUuidsResponse;
import org.jeecg.pm.hikvision.sdk.response.vss.preview.HikvisionPreviewParamByCameraUuidResponse; import org.jeecg.pm.hikvision.sdk.response.vss.preview.HikvisionPreviewParamByCameraUuidResponse;
...@@ -24,6 +25,8 @@ import org.jeecg.pm.hikvision.sdk.result.vss.playback.HikvisionGetRecordPlansByC ...@@ -24,6 +25,8 @@ import org.jeecg.pm.hikvision.sdk.result.vss.playback.HikvisionGetRecordPlansByC
import org.jeecg.pm.hikvision.sdk.result.vss.res.HikvisionGetCamerasExResult; import org.jeecg.pm.hikvision.sdk.result.vss.res.HikvisionGetCamerasExResult;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.Arrays;
import java.util.List; import java.util.List;
/** /**
...@@ -68,6 +71,13 @@ public class HikvisionSdkTest { ...@@ -68,6 +71,13 @@ public class HikvisionSdkTest {
} }
@Test @Test
void subscribeEventsFromMQEx(){
HikvisionSubscribeEventsFromMQEx hikvisionSubscribeEventsFromMQEx = new HikvisionSubscribeEventsFromMQEx().setEventTypes(Arrays.asList("131331"));
final HikvisionSubscribeEventsFromMQExResponse response = CLIENT.execute(new HikvisionSubscribeEventsFromMQExRequest(hikvisionSubscribeEventsFromMQEx));
System.out.println(response);
}
@Test
void previewParamByCameraUuid() { void previewParamByCameraUuid() {
final HikvisionGetCamerasEx camerasEx = new HikvisionGetCamerasEx(1, 10); final HikvisionGetCamerasEx camerasEx = new HikvisionGetCamerasEx(1, 10);
final HikvisionGetCamerasExResponse camerasExResponse = CLIENT.execute(new HikvisionGetCamerasExRequest(camerasEx)); final HikvisionGetCamerasExResponse camerasExResponse = CLIENT.execute(new HikvisionGetCamerasExRequest(camerasEx));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment