From 4baba222245f99b5c7a8a8bcfb76d832bc86df1c Mon Sep 17 00:00:00 2001
From: shikong <919411476@qq.com>
Date: Tue, 9 Jan 2024 22:24:48 +0800
Subject: [PATCH 1/3] DeviceControlRequestDTO

---
 .../control/DeviceControlRequestDTO.java      | 77 +++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 gb28181-sip/src/main/java/cn/skcks/docking/gb28181/sip/manscdp/control/DeviceControlRequestDTO.java

diff --git a/gb28181-sip/src/main/java/cn/skcks/docking/gb28181/sip/manscdp/control/DeviceControlRequestDTO.java b/gb28181-sip/src/main/java/cn/skcks/docking/gb28181/sip/manscdp/control/DeviceControlRequestDTO.java
new file mode 100644
index 0000000..28108df
--- /dev/null
+++ b/gb28181-sip/src/main/java/cn/skcks/docking/gb28181/sip/manscdp/control/DeviceControlRequestDTO.java
@@ -0,0 +1,77 @@
+package cn.skcks.docking.gb28181.sip.manscdp.control;
+
+import cn.skcks.docking.gb28181.constant.CmdType;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@JacksonXmlRootElement(localName = "Control")
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class DeviceControlRequestDTO {
+    @Builder.Default
+    private String cmdType = CmdType.DEVICE_CONTROL;
+
+    @JacksonXmlProperty(localName = "SN")
+    private String sn;
+
+    /**
+     * 目标设备的设备编码(必选)
+     */
+    @JacksonXmlProperty(localName = "DeviceID")
+    private String deviceId;
+
+    /**
+     * 录像控制命令
+     */
+    private String recordCmd;
+
+    /**
+     * 云台控制命令
+     */
+    @JacksonXmlProperty(localName = "PTZCmd")
+    private String ptzCmd;
+
+    /**
+     * 远程启动
+     */
+    private String teleBoot;
+
+    /**
+     * 布防撤防
+     */
+    private String guardCmd;
+
+    /**
+     * 告警控制
+     */
+    private String alarmCmd;
+
+    /**
+     * 强制关键帧
+     */
+    @JacksonXmlProperty(localName = "IFameCmd")
+    private String iFameCmd;
+
+    /**
+     * 拉框放大
+     */
+    private String dragZoomIn;
+
+    /**
+     * 拉框缩小
+     */
+    private String dragZoomOut;
+
+    /**
+     * 看守位
+     */
+    private String homePosition;
+}

From 648821525b222a46237c7ded5de2b4ac0f787f26 Mon Sep 17 00:00:00 2001
From: shikong <919411476@qq.com>
Date: Thu, 11 Jan 2024 09:11:53 +0800
Subject: [PATCH 2/3] =?UTF-8?q?manscdp=20RecordInfo=20=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=20=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/RecordInfoRequestDTO.java         | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/gb28181-sip/src/main/java/cn/skcks/docking/gb28181/sip/manscdp/recordinfo/request/RecordInfoRequestDTO.java b/gb28181-sip/src/main/java/cn/skcks/docking/gb28181/sip/manscdp/recordinfo/request/RecordInfoRequestDTO.java
index e807a06..aa100c9 100644
--- a/gb28181-sip/src/main/java/cn/skcks/docking/gb28181/sip/manscdp/recordinfo/request/RecordInfoRequestDTO.java
+++ b/gb28181-sip/src/main/java/cn/skcks/docking/gb28181/sip/manscdp/recordinfo/request/RecordInfoRequestDTO.java
@@ -19,7 +19,7 @@ import java.util.Date;
 @Builder
 public class RecordInfoRequestDTO {
     /**
-     * 命令类型:设备信息查询(必选)
+     * 命令类型:设备录像查询(必选)
      */
     @Builder.Default
     private String cmdType = CmdType.RECORD_INFO;
@@ -42,9 +42,26 @@ public class RecordInfoRequestDTO {
     @JsonFormat(pattern = GB28181Constant.DATETIME_FORMAT, timezone = GB28181Constant.TIME_ZONE)
     private Date endTime;
 
+    private String filePath;
+
+    private String address;
+
     @Builder.Default
     private Integer Secrecy = 0;
 
     @Builder.Default
     private String type = "all";
+
+    @JacksonXmlProperty(localName = "RecorderID")
+    private String recorderId;
+
+    /**
+     * 录像模糊查询属性(可选) 缺省为 0; <p/>
+     * 0: 不进行模糊查询,此时根据SIP消息中To头域
+     * URI 中的ID值确定查询录像位置,若 ID 值为本域系统 ID 则进行中心历史记录检索
+     * 若为前端设备 ID 则进行前端设备历史记录检索; <p/>
+     *
+     * 1: 进行模糊查询,此时设备所在域应同时进行中心检索和前端检索并将结果统一返回
+     */
+    private Integer IndistinctQuery;
 }

From b712ec2421d7af41246e06821b7eb58b9d431690 Mon Sep 17 00:00:00 2001
From: shikong <919411476@qq.com>
Date: Thu, 11 Jan 2024 09:39:54 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 579ad7e..dc75401 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,6 @@ docker run --name gb28181 --rm \
 
 ### 打包到本地私仓
 ```shell
-mvn deploy -s settings.xml -DaltDeploymentRepository=amleixun-mvn-reop::default::file:H:/Repository/skcks.cn/gb28181-docking-platform-mvn-repo
+mvn deploy -s settings.xml -DaltDeploymentRepository=local-repo::default::file:H:/Repository/skcks.cn/gb28181-docking-platform-mvn-repo
 ```
 git push 推送即可