From e34d88ad7d3d950da12f032e6932ba14f868db72 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 21 Aug 2019 10:22:50 +0800
Subject: [PATCH] 修改大屏无人机地图弹窗显示不全问题，设置可拖动
---
src/main/java/com/moral/entity/Device.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index 83a0858..1c01911 100644
--- a/src/main/java/com/moral/entity/Device.java
+++ b/src/main/java/com/moral/entity/Device.java
@@ -1,14 +1,26 @@
package com.moral.entity;
import java.util.Date;
+import java.util.List;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Transient;
import lombok.Data;
+
+/**
+ * Instantiates a new device.
+ */
@Data
-public class Device {/**
+public class Device {
+ /**
* This field was generated by MyBatis Generator. This field corresponds to the database column device.id
* @mbggenerated Wed Nov 29 16:17:59 CST 2017
*/
+ @Id
+ @GeneratedValue(generator = "JDBC")
private Integer id;
/**
* This field was generated by MyBatis Generator. This field corresponds to the database column device.name
@@ -24,12 +36,12 @@
* This field was generated by MyBatis Generator. This field corresponds to the database column device.longitude
* @mbggenerated Wed Nov 29 16:17:59 CST 2017
*/
- private Float longitude;
+ private Double longitude;
/**
* This field was generated by MyBatis Generator. This field corresponds to the database column device.latitude
* @mbggenerated Wed Nov 29 16:17:59 CST 2017
*/
- private Float latitude;
+ private Double latitude;
/**
* This field was generated by MyBatis Generator. This field corresponds to the database column device.mac
* @mbggenerated Wed Nov 29 16:17:59 CST 2017
@@ -65,4 +77,46 @@
* @mbggenerated Wed Nov 29 16:17:59 CST 2017
*/
private Integer deviceVersionId;
+ private String isDelete;
+ private Integer professionId;
+ /**
+ * Sets the uid.
+ *
+ * @param uid the new uid
+ */
+ public void setUid(Integer uid) {
+ this.operateUserId = uid;
+ }
+
+ /**
+ * Gets the device name.
+ *
+ * @return the device name
+ */
+ public String getDevice_name() {
+ return name;
+ }
+
+
+
+ /**
+ * Gets the status.
+ *
+ * @return the status
+ */
+ public String getState() {
+ return state;
+ }
+ @Transient
+ private OperateUser operateUser;
+ @Transient
+ private DeviceVersion deviceVersion;
+ @Transient
+ private MonitorPoint monitorPoint;
+ @Transient
+ private List<Integer> organizationIds;
+ @Transient
+ private Profession profession;
+ @Transient
+ private DeviceProperty deviceProperty;
}
\ No newline at end of file
--
Gitblit v1.8.0