build(hikvision-sdk):

优化request抽象类减少开发代码量
抓图 - 手动抓图

jeecg-boot-parent/jeecg-boot-module-hikvision/src/main/java/org/jeecg/pm/hikvision/sdk/client/HikvisionBaseClient.java

@@ -81,18 +81,18 @@ public class HikvisionBaseClient extends HikvisionAbstractClient {
 
     public <T extends HikvisionAbstractResponse<R>, R extends HikvisionBaseResult> HttpResponse doHttpClient
             (HikvisionAbstractRequest<T, R> request) throws URISyntaxException, JsonProcessingException {
-        request.getModel()
+        request.getBodyModel()
                 .setAppKey(appKey)
                 .setTime(Instant.now().toEpochMilli());
         if (!(request instanceof HikvisionGetDefaultUserUuidRequest)) {
-            request.getModel().setOpUserUuid(opUserUuid);
+            request.getBodyModel().setOpUserUuid(opUserUuid);
         }
         final URIBuilder uriBuilder = new URIBuilder(
                 new URI((protocol + joiner + host + request.getReqPath())));
         uriBuilder.setCharset(StandardCharsets.UTF_8);
         uriBuilder.addParameter("token", createToken(request));
-        if (request.getQuery() != null) {
-            final Map<String, String> queryMap = JsonUtils.obj2MapSS(request.getQuery());
+        if (request.getQueryModel() != null) {
+            final Map<String, String> queryMap = JsonUtils.obj2MapSS(request.getQueryModel());
             if (MapUtils.isNotEmpty(queryMap)) {
                 queryMap.forEach(uriBuilder::addParameter);
             }
@@ -105,7 +105,7 @@ public class HikvisionBaseClient extends HikvisionAbstractClient {
             case POST:
                 req = new HttpPost(uriBuilder.build());
                 HttpClientUtils.setRowBody(
-                        JsonUtils.obj2JsonNonNull(request.getModel()),
+                        JsonUtils.obj2JsonNonNull(request.getBodyModel()),
                         (HttpEntityEnclosingRequestBase) req,
                         request.getContentType());
                 break;
@@ -120,7 +120,7 @@ public class HikvisionBaseClient extends HikvisionAbstractClient {
             (HikvisionAbstractRequest<T, R> request) throws JsonProcessingException {
         final String tokenSource =
                 request.getReqPath()
-                        + JsonUtils.obj2JsonNonNull(request.getModel())
+                        + JsonUtils.obj2JsonNonNull(request.getBodyModel())
                         + this.secret;
         return DigestUtils.md5Hex(tokenSource).toUpperCase();
     }

jeecg-boot-parent/jeecg-boot-module-hikvision/src/main/java/org/jeecg/pm/hikvision/sdk/entity/Constant.java

@@ -111,6 +111,35 @@ public abstract class Constant implements Serializable {
             // CVR 存储
             3,
             // CVM 存储
-            4
-    );
+            4);
+
+    public static final List<Integer> PIC_QUALITY_LIST = Arrays.asList(
+            // 最好
+            0,
+            // 较好
+            1,
+            // 一般
+            2);
+
+    public static final List<Integer> PIC_SIZE_LIST = Arrays.asList(
+            // DCIF
+            0,
+            // CIP
+            1,
+            // QCIF
+            2,
+            // 4CIF
+            3,
+            // 2CIF
+            4,
+            // VGA(640*480)
+            16,
+            // UXGA(1600*1200)
+            17,
+            // SVGA(800*600)
+            18,
+            // HD720p(1280*720)
+            19,
+            // 当前监控点的分辨率大小
+            0xff);
 }

jeecg-boot-parent/jeecg-boot-module-hikvision/src/main/java/org/jeecg/pm/hikvision/sdk/entity/body/vss/picture/HikvisionBlgCapturePic.java

+package org.jeecg.pm.hikvision.sdk.entity.body.vss.picture;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.pm.hikvision.sdk.entity.body.HikvisionBodyModel;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 陈俊雄
+ * @since 2022/3/24
+ */
+@Slf4j
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class HikvisionBlgCapturePic extends HikvisionBodyModel {
+
+    /**
+     * 监控点 UUID
+     */
+    private String camerasUuid;
+
+    /**
+     * 图片质量
+     * @see org.jeecg.pm.hikvision.sdk.entity.Constant#PIC_QUALITY_LIST
+     */
+    private Integer picQuality;
+
+    /**
+     * 图片大小
+     * @see org.jeecg.pm.hikvision.sdk.entity.Constant#PIC_SIZE_LIST
+     */
+    private Integer picSize;
+}

jeecg-boot-parent/jeecg-boot-module-hikvision/src/main/java/org/jeecg/pm/hikvision/sdk/request/HikvisionAbstractRequest.java

@@ -13,28 +13,54 @@ import java.util.Map;
  */
 public abstract class HikvisionAbstractRequest<T extends HikvisionResponse<R>, R extends HikvisionBaseResult> implements HikvisionRequest<T, R> {
 
+    /**
+     * http body
+     */
+    private HikvisionBodyModel bodyModel;
+
+    /**
+     * http query
+     */
+    private HikvisionQueryModel queryModel;
+
+    public HikvisionAbstractRequest() {
+    }
+
+    public HikvisionAbstractRequest(HikvisionBodyModel bodyModel) {
+        this.bodyModel = bodyModel;
+    }
+
+    public HikvisionAbstractRequest(HikvisionQueryModel queryModel) {
+        this.queryModel = queryModel;
+    }
+
+    public HikvisionAbstractRequest(HikvisionBodyModel bodyModel, HikvisionQueryModel queryModel) {
+        this.bodyModel = bodyModel;
+        this.queryModel = queryModel;
+    }
+
     @Override
     public Map<String, String> getHeaders() {
         return null;
     }
 
     @Override
-    public HikvisionBodyModel getModel() {
-        return null;
+    public HikvisionBodyModel getBodyModel() {
+        return bodyModel;
     }
 
     @Override
-    public void setModel(HikvisionBodyModel model) {
-
+    public void setBodyModel(HikvisionBodyModel bodyModel) {
+        this.bodyModel = bodyModel;
     }
 
     @Override
-    public HikvisionQueryModel getQuery() {
-        return null;
+    public HikvisionQueryModel getQueryModel() {
+        return queryModel;
     }
 
     @Override
-    public void setQuery(HikvisionQueryModel query) {
-
+    public void setQueryModel(HikvisionQueryModel queryModel) {
+        this.queryModel = queryModel;
     }
 }

jeecg-boot-parent/jeecg-boot-module-hikvision/src/main/java/org/jeecg/pm/hikvision/sdk/request/HikvisionRequest.java

@@ -42,28 +42,28 @@ public interface HikvisionRequest<T extends HikvisionResponse<R>, R extends Hikv
      *
      * @return model
      */
-    HikvisionBodyModel getModel();
+    HikvisionBodyModel getBodyModel();
 
     /**
      * 设置业务实体，如需使用此方法
      *
      * @param model WangsuModel
      */
-    void setModel(HikvisionBodyModel model);
+    void setBodyModel(HikvisionBodyModel bodyModel);
 
     /**
      * 获取 URI 查询参数
      *
      * @return URI 查询参数
      */
-    HikvisionQueryModel getQuery();
+    HikvisionQueryModel getQueryModel();
 
     /**
      * 设置 URI 查询参数
      *
-     * @param query query
+     * @param queryModel query
      */
-    void setQuery(HikvisionQueryModel query);
+    void setQueryModel(HikvisionQueryModel queryModel);
 
 
     /**

jeecg-boot-parent/jeecg-boot-module-hikvision/src/main/java/org/jeecg/pm/hikvision/sdk/request/base/netzone/HikvisionGetNetZonesRequest.java

@@ -5,7 +5,6 @@ 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.base.netzone.HikvisionGetNetZones;
 import org.jeecg.pm.hikvision.sdk.request.HikvisionAbstractRequest;
 import org.jeecg.pm.hikvision.sdk.response.base.netzone.HikvisionGetNetZonesResponse;
@@ -20,7 +19,9 @@ import org.jeecg.pm.hikvision.sdk.result.base.netzone.HikvisionGetNetZonesResult
 @Accessors(chain = true)
 public class HikvisionGetNetZonesRequest extends HikvisionAbstractRequest<HikvisionGetNetZonesResponse, HikvisionGetNetZonesResult> {
 
-    private final HikvisionGetNetZones hikvisionGetNetZones = new HikvisionGetNetZones();
+    public HikvisionGetNetZonesRequest() {
+        super(new HikvisionGetNetZones());
+    }
 
     @Override
     public ContentType getContentType() {
@@ -47,8 +48,4 @@ public class HikvisionGetNetZonesRequest extends HikvisionAbstractRequest<Hikvis
         return "/openapi/service/base/netZone/getNetZones";
     }
 
-    @Override
-    public HikvisionBodyModel getModel() {
-        return hikvisionGetNetZones;
-    }
 }

jeecg-boot-parent/jeecg-boot-module-hikvision/src/main/java/org/jeecg/pm/hikvision/sdk/request/base/res/HikvisionGetPlatSubsytemRequest.java

@@ -5,7 +5,6 @@ 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.base.res.HikvisionGetPlatSubsytem;
 import org.jeecg.pm.hikvision.sdk.request.HikvisionAbstractRequest;
 import org.jeecg.pm.hikvision.sdk.response.base.res.HikvisionGetPlatSubsytemResponse;
@@ -20,10 +19,8 @@ import org.jeecg.pm.hikvision.sdk.result.base.res.HikvisionGetPlatSubsytemResult
 @Accessors(chain = true)
 public class HikvisionGetPlatSubsytemRequest extends HikvisionAbstractRequest<HikvisionGetPlatSubsytemResponse, HikvisionGetPlatSubsytemResult> {
 
-    private HikvisionGetPlatSubsytem hikvisionGetPlatSubsytem;
-
     public HikvisionGetPlatSubsytemRequest(HikvisionGetPlatSubsytem hikvisionGetPlatSubsytem) {
-        this.hikvisionGetPlatSubsytem = hikvisionGetPlatSubsytem;
+        super(hikvisionGetPlatSubsytem);
     }
 
     @Override
@@ -51,13 +48,4 @@ public class HikvisionGetPlatSubsytemRequest extends HikvisionAbstractRequest<Hi
         return "/openapi/service/base/res/getPlatSubsytem";
     }
 
-    @Override
-    public HikvisionBodyModel getModel() {
-        return hikvisionGetPlatSubsytem;
-    }
-
-    @Override
-    public void setModel(HikvisionBodyModel model) {
-        this.hikvisionGetPlatSubsytem = (HikvisionGetPlatSubsytem) model;
-    }
 }

jeecg-boot-parent/jeecg-boot-module-hikvision/src/main/java/org/jeecg/pm/hikvision/sdk/request/base/user/HikvisionGetDefaultUserUuidRequest.java

@@ -5,7 +5,6 @@ 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.base.user.HikvisionGetDefaultUserUuidQuery;
 import org.jeecg.pm.hikvision.sdk.request.HikvisionAbstractRequest;
 import org.jeecg.pm.hikvision.sdk.response.base.user.HikvisionGetDefaultUserUuidResponse;
@@ -20,7 +19,9 @@ import org.jeecg.pm.hikvision.sdk.result.base.user.HikvisionGetDefaultUserUuidBa
 @Accessors(chain = true)
 public class HikvisionGetDefaultUserUuidRequest extends HikvisionAbstractRequest<HikvisionGetDefaultUserUuidResponse, HikvisionGetDefaultUserUuidBaseResult> {
 
-    private final HikvisionGetDefaultUserUuidQuery hikvisionGetDefaultUserUuidQuery = new HikvisionGetDefaultUserUuidQuery();
+    public HikvisionGetDefaultUserUuidRequest() {
+        super(new HikvisionGetDefaultUserUuidQuery());
+    }
 
     @Override
     public ContentType getContentType() {
@@ -47,8 +48,4 @@ public class HikvisionGetDefaultUserUuidRequest extends HikvisionAbstractRequest
         return "/openapi/service/base/user/getDefaultUserUuid";
     }
 
-    @Override
-    public HikvisionBodyModel getModel() {
-        return hikvisionGetDefaultUserUuidQuery;
-    }
 }

jeecg-boot-parent/jeecg-boot-module-hikvision/src/main/java/org/jeecg/pm/hikvision/sdk/request/eps/HikvisionGetEventTypesRequest.java

@@ -5,7 +5,6 @@ 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.HikvisionGetEventTypes;
 import org.jeecg.pm.hikvision.sdk.request.HikvisionAbstractRequest;
 import org.jeecg.pm.hikvision.sdk.response.eps.HikvisionGetEventTypesRespsonse;
@@ -20,10 +19,8 @@ import org.jeecg.pm.hikvision.sdk.result.eps.HikvisionGetEventTypesResult;
 @Accessors(chain = true)
 public class HikvisionGetEventTypesRequest extends HikvisionAbstractRequest<HikvisionGetEventTypesRespsonse, HikvisionGetEventTypesResult> {
 
-    private HikvisionGetEventTypes hikvisionGetEventTypes;
-
     public HikvisionGetEventTypesRequest(HikvisionGetEventTypes hikvisionGetEventTypes) {
-        this.hikvisionGetEventTypes = hikvisionGetEventTypes;
+        super(hikvisionGetEventTypes);
     }
 
     @Override
@@ -51,13 +48,4 @@ public class HikvisionGetEventTypesRequest extends HikvisionAbstractRequest<Hikv
         return "/openapi/service/eps/getEventTypes";
     }
 
-    @Override
-    public HikvisionBodyModel getModel() {
-        return hikvisionGetEventTypes;
-    }
-
-    @Override
-    public void setModel(HikvisionBodyModel model) {
-        this.hikvisionGetEventTypes = (HikvisionGetEventTypes) model;
-    }
 }

jeecg-boot-parent/jeecg-boot-module-hikvision/src/main/java/org/jeecg/pm/hikvision/sdk/request/eps/HikvisionSubscribeEventsFromMQExRequest.java

@@ -5,7 +5,6 @@ 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;
@@ -20,10 +19,8 @@ import org.jeecg.pm.hikvision.sdk.result.eps.HikvisionSubscribeEventsFromMQExRes
 @Accessors(chain = true)
 public class HikvisionSubscribeEventsFromMQExRequest extends HikvisionAbstractRequest<HikvisionSubscribeEventsFromMQExResponse, HikvisionSubscribeEventsFromMQExResult> {
 
-    private HikvisionSubscribeEventsFromMQEx hikvisionGetSubscribeEventsFromMQEx;
-
     public HikvisionSubscribeEventsFromMQExRequest(HikvisionSubscribeEventsFromMQEx hikvisionGetSubscribeEventsFromMQEx) {
-        this.hikvisionGetSubscribeEventsFromMQEx = hikvisionGetSubscribeEventsFromMQEx;
+        super(hikvisionGetSubscribeEventsFromMQEx);
     }
 
     @Override
@@ -51,13 +48,4 @@ public class HikvisionSubscribeEventsFromMQExRequest extends HikvisionAbstractRe
         return "/openapi/service/eps/subscribeEventsFromMQEx";
     }
 
-    @Override
-    public HikvisionBodyModel getModel() {
-        return hikvisionGetSubscribeEventsFromMQEx;
-    }
-
-    @Override
-    public void setModel(HikvisionBodyModel model) {
-        this.hikvisionGetSubscribeEventsFromMQEx = (HikvisionSubscribeEventsFromMQEx) model;
-    }
 }

jeecg-boot-parent/jeecg-boot-module-hikvision/src/main/java/org/jeecg/pm/hikvision/sdk/request/vss/picture/HikvisionBlgCapturePicRequest.java

+package org.jeecg.pm.hikvision.sdk.request.vss.picture;
+
+import com.chanjx.utils.HttpMethod;
+import org.apache.http.entity.ContentType;
+import org.jeecg.pm.hikvision.sdk.entity.body.vss.picture.HikvisionBlgCapturePic;
+import org.jeecg.pm.hikvision.sdk.request.HikvisionAbstractRequest;
+import org.jeecg.pm.hikvision.sdk.response.vss.picture.HikvisionBlgCapturePicResponse;
+import org.jeecg.pm.hikvision.sdk.result.vss.picture.HikvisionBlgCapturePicResult;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 陈俊雄
+ * @since 2022/3/24
+ */
+public class HikvisionBlgCapturePicRequest extends HikvisionAbstractRequest<HikvisionBlgCapturePicResponse, HikvisionBlgCapturePicResult> {
+
+    public HikvisionBlgCapturePicRequest(HikvisionBlgCapturePic hikvisionBlgCapturePic) {
+        super(hikvisionBlgCapturePic);
+    }
+
+    @Override
+    public ContentType getContentType() {
+        return ContentType.APPLICATION_JSON;
+    }
+
+    @Override
+    public Class<HikvisionBlgCapturePicResponse> getResponseClazz() {
+        return HikvisionBlgCapturePicResponse.class;
+    }
+
+    @Override
+    public Class<HikvisionBlgCapturePicResult> getResultClazz() {
+        return HikvisionBlgCapturePicResult.class;
+    }
+
+    @Override
+    public HttpMethod getHttpMethod() {
+        return HttpMethod.POST;
+    }
+
+    @Override
+    public String getReqPath() {
+        return "/openapi/service/vss/picture/blgCapturePic";
+    }
+}

jeecg-boot-parent/jeecg-boot-module-hikvision/src/main/java/org/jeecg/pm/hikvision/sdk/request/vss/playback/HikvisionGetPlaybackParamByPlanUuidRequest.java

@@ -2,7 +2,6 @@ package org.jeecg.pm.hikvision.sdk.request.vss.playback;
 
 import com.chanjx.utils.HttpMethod;
 import org.apache.http.entity.ContentType;
-import org.jeecg.pm.hikvision.sdk.entity.body.HikvisionBodyModel;
 import org.jeecg.pm.hikvision.sdk.entity.body.vss.playback.HikvisionGetPlaybackParamByPlanUuid;
 import org.jeecg.pm.hikvision.sdk.request.HikvisionAbstractRequest;
 import org.jeecg.pm.hikvision.sdk.response.vss.playback.HikvisionGetPlaybackParamByPlanUuidResponse;
@@ -18,10 +17,8 @@ import org.jeecg.pm.hikvision.sdk.result.vss.playback.HikvisionGetPlaybackParamB
  */
 public class HikvisionGetPlaybackParamByPlanUuidRequest extends HikvisionAbstractRequest<HikvisionGetPlaybackParamByPlanUuidResponse, HikvisionGetPlaybackParamByPlanUuidResult> {
 
-    private HikvisionGetPlaybackParamByPlanUuid hikvisionGetPlaybackParamByPlanUuid;
-
     public HikvisionGetPlaybackParamByPlanUuidRequest(HikvisionGetPlaybackParamByPlanUuid hikvisionGetPlaybackParamByPlanUuid) {
-        this.hikvisionGetPlaybackParamByPlanUuid = hikvisionGetPlaybackParamByPlanUuid;
+        super(hikvisionGetPlaybackParamByPlanUuid);
     }
 
     @Override
@@ -49,13 +46,4 @@ public class HikvisionGetPlaybackParamByPlanUuidRequest extends HikvisionAbstrac
         return "/openapi/service/vss/playback/getPlaybackParamByPlanUuid";
     }
 
-    @Override
-    public HikvisionBodyModel getModel() {
-        return hikvisionGetPlaybackParamByPlanUuid;
-    }
-
-    @Override
-    public void setModel(HikvisionBodyModel model) {
-        this.hikvisionGetPlaybackParamByPlanUuid = (HikvisionGetPlaybackParamByPlanUuid) model;
-    }
 }

jeecg-boot-parent/jeecg-boot-module-hikvision/src/main/java/org/jeecg/pm/hikvision/sdk/request/vss/playback/HikvisionGetRecordPlansByCameraUuidsRequest.java

@@ -2,7 +2,6 @@ package org.jeecg.pm.hikvision.sdk.request.vss.playback;
 
 import com.chanjx.utils.HttpMethod;
 import org.apache.http.entity.ContentType;
-import org.jeecg.pm.hikvision.sdk.entity.body.HikvisionBodyModel;
 import org.jeecg.pm.hikvision.sdk.entity.body.vss.playback.HikvisionGetRecordPlansByCameraUuids;
 import org.jeecg.pm.hikvision.sdk.request.HikvisionAbstractRequest;
 import org.jeecg.pm.hikvision.sdk.response.vss.playback.HikvisionGetRecordPlansByCameraUuidsResponse;
@@ -18,10 +17,8 @@ import org.jeecg.pm.hikvision.sdk.result.vss.playback.HikvisionGetRecordPlansByC
  */
 public class HikvisionGetRecordPlansByCameraUuidsRequest extends HikvisionAbstractRequest<HikvisionGetRecordPlansByCameraUuidsResponse, HikvisionGetRecordPlansByCameraUuidsResult> {
 
-    private HikvisionGetRecordPlansByCameraUuids hikvisionGetRecordPlansByCameraUuids;
-
     public HikvisionGetRecordPlansByCameraUuidsRequest(HikvisionGetRecordPlansByCameraUuids hikvisionGetRecordPlansByCameraUuids) {
-        this.hikvisionGetRecordPlansByCameraUuids = hikvisionGetRecordPlansByCameraUuids;
+        super(hikvisionGetRecordPlansByCameraUuids);
     }
 
     @Override
@@ -49,13 +46,4 @@ public class HikvisionGetRecordPlansByCameraUuidsRequest extends HikvisionAbstra
         return "/openapi/service/vss/playback/getRecordPlansByCameraUuids";
     }
 
-    @Override
-    public HikvisionBodyModel getModel() {
-        return hikvisionGetRecordPlansByCameraUuids;
-    }
-
-    @Override
-    public void setModel(HikvisionBodyModel model) {
-        this.hikvisionGetRecordPlansByCameraUuids = (HikvisionGetRecordPlansByCameraUuids) model;
-    }
 }

jeecg-boot-parent/jeecg-boot-module-hikvision/src/main/java/org/jeecg/pm/hikvision/sdk/request/vss/preview/HikvisionPreviewParamByCameraUuidRequest.java

@@ -5,7 +5,6 @@ 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.vss.preview.HikvisiongetPreviewParamByCameraUuid;
 import org.jeecg.pm.hikvision.sdk.request.HikvisionAbstractRequest;
 import org.jeecg.pm.hikvision.sdk.response.vss.preview.HikvisionPreviewParamByCameraUuidResponse;
@@ -20,10 +19,8 @@ import org.jeecg.pm.hikvision.sdk.result.vss.preview.HikvisionPreviewParamByCame
 @Accessors(chain = true)
 public class HikvisionPreviewParamByCameraUuidRequest extends HikvisionAbstractRequest<HikvisionPreviewParamByCameraUuidResponse, HikvisionPreviewParamByCameraUuidResult> {
 
-    private HikvisiongetPreviewParamByCameraUuid hikvisiongetPreviewParamByCameraUuid;
-
     public HikvisionPreviewParamByCameraUuidRequest(HikvisiongetPreviewParamByCameraUuid hikvisiongetPreviewParamByCameraUuid) {
-        this.hikvisiongetPreviewParamByCameraUuid = hikvisiongetPreviewParamByCameraUuid;
+        super(hikvisiongetPreviewParamByCameraUuid);
     }
 
     @Override
@@ -50,14 +47,4 @@ public class HikvisionPreviewParamByCameraUuidRequest extends HikvisionAbstractR
     public String getReqPath() {
         return "/openapi/service/vss/preview/getPreviewParamByCameraUuid";
     }
-
-    @Override
-    public HikvisionBodyModel getModel() {
-        return hikvisiongetPreviewParamByCameraUuid;
-    }
-
-    @Override
-    public void setModel(HikvisionBodyModel model) {
-        this.hikvisiongetPreviewParamByCameraUuid = (HikvisiongetPreviewParamByCameraUuid) model;
-    }
 }

jeecg-boot-parent/jeecg-boot-module-hikvision/src/main/java/org/jeecg/pm/hikvision/sdk/request/vss/res/HikvisionGetCamerasExRequest.java

@@ -5,7 +5,6 @@ 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.vss.res.HikvisionGetCamerasEx;
 import org.jeecg.pm.hikvision.sdk.request.HikvisionAbstractRequest;
 import org.jeecg.pm.hikvision.sdk.response.vss.res.HikvisionGetCamerasExResponse;
@@ -20,10 +19,8 @@ import org.jeecg.pm.hikvision.sdk.result.vss.res.HikvisionGetCamerasExResult;
 @Accessors(chain = true)
 public class HikvisionGetCamerasExRequest extends HikvisionAbstractRequest<HikvisionGetCamerasExResponse, HikvisionGetCamerasExResult> {
 
-    private HikvisionGetCamerasEx hikvisionGetCamerasEx;
-
     public HikvisionGetCamerasExRequest(HikvisionGetCamerasEx hikvisionGetCamerasEx) {
-        this.hikvisionGetCamerasEx = hikvisionGetCamerasEx;
+        super(hikvisionGetCamerasEx);
     }
 
     @Override
@@ -50,14 +47,4 @@ public class HikvisionGetCamerasExRequest extends HikvisionAbstractRequest<Hikvi
     public String getReqPath() {
         return "/openapi/service/vss/res/getCamerasEx";
     }
-
-    @Override
-    public HikvisionBodyModel getModel() {
-        return hikvisionGetCamerasEx;
-    }
-
-    @Override
-    public void setModel(HikvisionBodyModel model) {
-        this.hikvisionGetCamerasEx = (HikvisionGetCamerasEx) model;
-    }
 }

jeecg-boot-parent/jeecg-boot-module-hikvision/src/main/java/org/jeecg/pm/hikvision/sdk/request/vss/res/HikvisionGetEncodersRequest.java

@@ -5,7 +5,6 @@ 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.vss.res.HikvisionGetEncoders;
 import org.jeecg.pm.hikvision.sdk.request.HikvisionAbstractRequest;
 import org.jeecg.pm.hikvision.sdk.response.vss.res.HikvisionGetEncodersResponse;
@@ -20,10 +19,8 @@ import org.jeecg.pm.hikvision.sdk.result.vss.res.HikvisionGetEncodersResult;
 @Accessors(chain = true)
 public class HikvisionGetEncodersRequest extends HikvisionAbstractRequest<HikvisionGetEncodersResponse, HikvisionGetEncodersResult> {
 
-    private HikvisionGetEncoders hikvisionGetEncoders;
-
     public HikvisionGetEncodersRequest(HikvisionGetEncoders hikvisionGetEncoders) {
-        this.hikvisionGetEncoders = hikvisionGetEncoders;
+        super(hikvisionGetEncoders);
     }
 
     @Override
@@ -50,14 +47,4 @@ public class HikvisionGetEncodersRequest extends HikvisionAbstractRequest<Hikvis
     public String getReqPath() {
         return "/openapi/service/vss/res/getEncoders";
     }
-
-    @Override
-    public HikvisionBodyModel getModel() {
-        return hikvisionGetEncoders;
-    }
-
-    @Override
-    public void setModel(HikvisionBodyModel model) {
-        this.hikvisionGetEncoders = (HikvisionGetEncoders) model;
-    }
 }

jeecg-boot-parent/jeecg-boot-module-hikvision/src/main/java/org/jeecg/pm/hikvision/sdk/response/vss/picture/HikvisionBlgCapturePicResponse.java

+package org.jeecg.pm.hikvision.sdk.response.vss.picture;
+
+import org.jeecg.pm.hikvision.sdk.response.HikvisionAbstractResponse;
+import org.jeecg.pm.hikvision.sdk.result.vss.picture.HikvisionBlgCapturePicResult;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 陈俊雄
+ * @since 2022/3/24
+ */
+public class HikvisionBlgCapturePicResponse  extends HikvisionAbstractResponse<HikvisionBlgCapturePicResult> {
+
+    public HikvisionBlgCapturePicResponse() {
+        super(HikvisionBlgCapturePicResult.class);
+    }
+
+}

jeecg-boot-parent/jeecg-boot-module-hikvision/src/main/java/org/jeecg/pm/hikvision/sdk/result/vss/picture/HikvisionBlgCapturePicResult.java

+package org.jeecg.pm.hikvision.sdk.result.vss.picture;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.pm.hikvision.sdk.result.HikvisionBaseResult;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 陈俊雄
+ * @since 2022/3/24
+ */
+@Slf4j
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class HikvisionBlgCapturePicResult extends HikvisionBaseResult {
+
+    /**
+     * 图片相对地址
+     */
+    private String data;
+}

jeecg-boot-parent/jeecg-boot-module-hikvision/src/test/java/HikvisionSdkTest.java

@@ -33,7 +33,7 @@ import org.jeecg.pm.hikvision.sdk.result.vss.playback.HikvisionGetRecordPlansByC
 import org.jeecg.pm.hikvision.sdk.result.vss.res.HikvisionGetCamerasExResult;
 import org.junit.jupiter.api.Test;
 
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -79,7 +79,7 @@ public class HikvisionSdkTest {
 
     @Test
     void subscribeEventsFromMQEx() {
-        HikvisionSubscribeEventsFromMQEx hikvisionSubscribeEventsFromMQEx = new HikvisionSubscribeEventsFromMQEx().setEventTypes(Arrays.asList("131331"));
+        HikvisionSubscribeEventsFromMQEx hikvisionSubscribeEventsFromMQEx = new HikvisionSubscribeEventsFromMQEx().setEventTypes(Collections.singletonList("131331"));
         final HikvisionSubscribeEventsFromMQExResponse response = CLIENT.execute(new HikvisionSubscribeEventsFromMQExRequest(hikvisionSubscribeEventsFromMQEx));
         System.out.println(response);
     }