From baa493a7e684bcceefd37863862ae2b5ff629c1f Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 21 Jan 2026 14:57:23 +0800
Subject: [PATCH] update-无人机设备

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdManageDeviceEntity.java |  178 +++++-----------------------------------------------------
 1 files changed, 17 insertions(+), 161 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdManageDeviceEntity.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdManageDeviceEntity.java
index d39ca20..0092d8e 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdManageDeviceEntity.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdManageDeviceEntity.java
@@ -34,44 +34,34 @@
  */
 @Data
 @TableName("ja_gd_manage_device")
-@ApiModel(value = "GdManageDevice对象", description = "设备信息")
+@ApiModel(value = "设备信息", description = "设备信息")
 @EqualsAndHashCode(callSuper = true)
 public class GdManageDeviceEntity extends BaseEntity {
 
 	/**
-	 * dock, drone, remote control
+	 * 设备编码
 	 */
-	@ApiModelProperty(value = "dock, drone, remote control")
+	@ApiModelProperty(value = "设备编码")
 	private String deviceSn;
 	/**
-	 * model of the device. This parameter corresponds to the device name in the device dictionary table.
+	 * 设备型号
 	 */
-	@ApiModelProperty(value = "model of the device. This parameter corresponds to the device name in the device dictionary table.")
+	@ApiModelProperty(value = "设备型号")
 	private String deviceName;
 	/**
-	 * custom name of the device
+	 * 设备昵称
 	 */
-	@ApiModelProperty(value = "custom name of the device")
+	@ApiModelProperty(value = "设备昵称")
 	private String nickname;
 	/**
-	 * The workspace to which the current device belongs.如果为时间戳则表明该机场已被解绑
+	 * 设备类型(0机场,1无人机)
 	 */
-	@ApiModelProperty(value = "The workspace to which the current device belongs.如果为时间戳则表明该机场已被解绑")
-	private String workspaceId;
-	/**
-	 * This parameter corresponds to the device type in the device dictionary table.
-	 */
-	@ApiModelProperty(value = "This parameter corresponds to the device type in the device dictionary table.")
+	@ApiModelProperty(value = "设备类型(0机场,1无人机)")
 	private Integer deviceType;
-	/**
-	 * This parameter corresponds to the sub type in the device dictionary table.
-	 */
-	@ApiModelProperty(value = "This parameter corresponds to the sub type in the device dictionary table.")
-	private Integer subType;
 	/**
 	 * 设备负载(红外,喇叭,闪光灯)
 	 */
-	@ApiModelProperty(value = "设备负载(红外,喇叭,闪光灯)")
+	@ApiModelProperty(value = "设备负载(红外,喇叭,闪光灯)")
 	private String devicePayload;
 	/**
 	 * 当前经度
@@ -84,130 +74,25 @@
 	@ApiModelProperty(value = "当前纬度")
 	private Double latitude;
 	/**
-	 * The account used when the device was bound.
+	 * 固件版本
 	 */
-	@ApiModelProperty(value = "The account used when the device was bound.")
-	private String userId;
-	/**
-	 * This parameter corresponds to the domain in the device dictionary table.
-	 */
-	@ApiModelProperty(value = "This parameter corresponds to the domain in the device dictionary table.")
-	private Integer domain;
-	/**
-	 * firmware version of the device
-	 */
-	@ApiModelProperty(value = "firmware version of the device")
+	@ApiModelProperty(value = "固件版本")
 	private String firmwareVersion;
 	/**
-	 * 1:一致;0:不一致;固件版本是否一致。
+	 * 子设备(一般用途是机场下面的无人机)
 	 */
-	@ApiModelProperty(value = "1:一致;0:不一致;固件版本是否一致。")
-	private Boolean compatibleStatus;
-	/**
-	 * version of the protocol. This field is currently not useful.
-	 */
-	@ApiModelProperty(value = "version of the protocol. This field is currently not useful.")
-	private String version;
-	/**
-	 * Control of the drone, A control or B control.
-	 */
-	@ApiModelProperty(value = "Control of the drone, A control or B control.")
-	private String deviceIndex;
-	/**
-	 * The device controlled by the gateway.
-	 */
-	@ApiModelProperty(value = "The device controlled by the gateway.")
+	@ApiModelProperty(value = "子设备(一般用途是机场下面的无人机)")
 	private String childSn;
 	/**
-	 * The time when the device is bound to the workspace.
+	 * 设备状态:{0:"在线",1:"离线"}
 	 */
-	@ApiModelProperty(value = "The time when the device is bound to the workspace.")
-	private Long boundTime;
-	/**
-	 * The status when the device is bound to the workspace. 1: bound; 0: not bound;
-	 */
-	@ApiModelProperty(value = "The status when the device is bound to the workspace. 1: bound; 0: not bound;")
-	private Boolean boundStatus;
-	/**
-	 * The time of the last device login.
-	 */
-	@ApiModelProperty(value = "The time of the last device login.")
-	private Long loginTime;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private String deviceDesc;
-	/**
-	 * The icon displayed on the remote control.
-	 */
-	@ApiModelProperty(value = "The icon displayed on the remote control.")
-	private String urlNormal;
-	/**
-	 * The icon displayed on the remote control when it is selected.
-	 */
-	@ApiModelProperty(value = "The icon displayed on the remote control when it is selected.")
-	private String urlSelect;
-	/**
-	 * 保护区ID
-	 */
-	@ApiModelProperty(value = "保护区ID")
-	private String reserveId;
-	/**
-	 * 相机名称
-	 */
-	@ApiModelProperty(value = "相机名称")
-	private String creamaName;
-	/**
-	 * 机巢编号
-	 */
-	@ApiModelProperty(value = "机巢编号")
-	private String machineNestSn;
-	/**
-	 * 飞机操控密码
-	 */
-	@ApiModelProperty(value = "飞机操控密码")
-	private String operatePassword;
-	/**
-	 * 设备状态:{"0":"空闲中","1":"现场调试","2":"远程调试","3":"固件升级中","4":"作业中","5":"待标定"}
-	 */
-	@ApiModelProperty(value = "设备状态:{0:空闲中,1:现场调试,2:远程调试,3:固件升级中,4:作业中,5:待标定}")
+	@ApiModelProperty(value = "设备状态:{0:\"在线\",1:\"离线\"}")
 	private Long modeCode;
-	/**
-	 * 是否可移动,0=不可移动,1=可移动
-	 */
-	@ApiModelProperty(value = "是否可移动,0=不可移动,1=可移动")
-	private Byte movable;
 	/**
 	 * 保险过期时间
 	 */
 	@ApiModelProperty(value = "保险过期时间")
 	private Date insureExpiredTime;
-	/**
-	 * 流量剩余类型:0充足,1=流量到期,2=不足
-	 */
-	@ApiModelProperty(value = "流量剩余类型:0充足,1=流量到期,2=不足")
-	private Byte flowType;
-	/**
-	 * 维保开始时间
-	 */
-	@ApiModelProperty(value = "维保开始时间")
-	private Date maintenanceStart;
-	/**
-	 * 维保结束时间
-	 */
-	@ApiModelProperty(value = "维保结束时间")
-	private Date maintenanceEnd;
-	/**
-	 * 保险开始时间
-	 */
-	@ApiModelProperty(value = "保险开始时间")
-	private Date insureStartTime;
-	/**
-	 * 设备eid编号
-	 */
-	@ApiModelProperty(value = "设备eid编号")
-	private String eid;
 	/**
 	 * 剩余流量(单位:GB)
 	 */
@@ -218,35 +103,6 @@
 	 */
 	@ApiModelProperty(value = "流量到期时间")
 	private Date trafficExpireTime;
-	/**
-	 * 内部隐藏标识(0-正常,1-下线)
-	 */
-	@ApiModelProperty(value = "内部隐藏标识(0-正常,1-下线)")
-	private Boolean hiddenFlag;
-	/**
-	 * 部署模式:0-统一部署,1-独立部署
-	 */
-	@ApiModelProperty(value = "部署模式:0-统一部署,1-独立部署")
-	private Boolean deploymentMode;
-	/**
-	 * 绑定机构id
-	 */
-	@ApiModelProperty(value = "绑定机构id")
-	private Long deptId;
-	/**
-	 * 行政区域编号
-	 */
-	@ApiModelProperty(value = "行政区域编号")
-	private String areaCode;
-	/**
-	 * 4G流量数据
-	 */
-	@ApiModelProperty(value = "4G流量数据")
-	private String trafficData;
-	/**
-	 * DEM数据状态:0-未初始化,1-初始化中,2-初始化成功,3-初始化失败
-	 */
-	@ApiModelProperty(value = "DEM数据状态:0-未初始化,1-初始化中,2-初始化成功,3-初始化失败")
-	private Integer demStatus;
+
 
 }

--
Gitblit v1.9.3