#update

maibu-common/src/main/java/com/maibu/core/business/Device.java

@@ -1,9 +1,6 @@
 package com.maibu.core.business;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.maibu.annotation.Excel;
@@ -71,13 +68,6 @@ public class Device extends BaseDO {
     private String productName;
 
 
-    /**
-     * 租户ID
-     */
-    @ApiModelProperty("租户ID")
-    @Excel(name = "租户ID")
-    private Long tenantId;
-
     /**
      * 租户名称
      */
@@ -100,11 +90,6 @@ public class Device extends BaseDO {
     @Excel(name = "HTTP推送固件版本")
     private BigDecimal wirelessVersion;
 
-    /**
-     * 设备类型（1-直连设备、2-网关设备、3-监控设备）
-     */
-    @ApiModelProperty("设备类型（1-直连设备、2-网关设备、3-监控设备 4-网关子设备）")
-    private Integer deviceType;
 
     /**
      * 设备状态（1-未激活，2-禁用，3-在线，4-离线）
@@ -204,22 +189,7 @@ public class Device extends BaseDO {
     @ApiModelProperty("设备摘要")
     private String summary;
 
-    /**
-     * 分组ID，用于分组查询
-     **/
-    @ApiModelProperty("分组ID，用于分组查询")
-    private Long groupId;
 
-    /**
-     * 是否设备所有者，用于查询
-     **/
-    @ApiModelProperty("是否设备所有者，用于查询")
-    private Integer isOwner;
-    /**
-     * 子设备数量
-     */
-    @ApiModelProperty("子设备数量")
-    private Integer subDeviceCount;
     /**
      * 是否是模拟设备
      */
@@ -230,32 +200,21 @@ public class Device extends BaseDO {
      */
     @ApiModelProperty("子设备地址")
     private Integer slaveId;
+
+
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Long siteId;
+
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Long orgId;
     /**
-     * 设备传输协议
+     * 租户ID
      */
-    @ApiModelProperty("设备传输协议")
-    private String transport;
-//
-//    @Transient
-//    @ApiModelProperty("机构id")
-//    private Long deptId;
+    @ApiModelProperty("租户ID")
+    @Excel(name = "租户ID")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Long tenantId;
 
-    @Transient
-    @ApiModelProperty("是否显示下级")
-    private Boolean showChild;
-
-    private List<Device> subDeviceList;
-
-
-    private Long orgId; //组织id
-
-    private Long siteId; //场站id
-
-
-    /**
-     * 协议
-     */
-    private String protocolCode;
 
     @TableField(exist = false)
     private DeviceRunningStatusHistory lastRunningStatus;

maibu-common/src/main/java/com/maibu/core/business/dto/DeviceBindDTO.java

@@ -0,0 +1,33 @@
+package com.maibu.core.business.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DeviceBindDTO {
+;
+    /**
+     * 设备id
+     */
+    private List<String> deviceIds;
+
+    /**
+     * 用户名
+     */
+    private Long userId;
+
+    /**
+     * 用户名
+     */
+    private Long orgId;
+
+    /**
+     * 用户名
+     */
+    private Long siteId;
+
+
+    private Integer type; //1清除人 2清除场站 3清除组织
+
+}

maibu-common/src/main/java/com/maibu/core/business/uav/IotUAVDevice.java

@@ -0,0 +1,40 @@
+package com.maibu.core.business.uav;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.maibu.core.domain.BaseDO;
+import com.maibu.core.domain.TenantBaseDO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("iot_uav_device")
+public class IotUAVDevice extends BaseDO {
+
+	@TableId(type = IdType.AUTO)
+	private Long id;
+
+	private String sn;
+
+	private String droneSn;
+
+	private String name;
+
+	private Integer olineStatus = 1; // 外部查询所有 没有的直接更新成未在线
+
+	private Integer syncStatus;
+
+	private LocalDateTime  lastSyncTime;
+
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private Long siteId;
+
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private Long orgId;
+
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private Long tenantId; //配置可以设置null 不自动过滤
+
+}