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 | 223 +++++++++++++++++++++++++++----------------------------
1 files changed, 110 insertions(+), 113 deletions(-)
diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index 4b8d053..1c01911 100644
--- a/src/main/java/com/moral/entity/Device.java
+++ b/src/main/java/com/moral/entity/Device.java
@@ -1,125 +1,122 @@
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 {
- private Integer id;
+ /**
+ * 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
+ * @mbggenerated Wed Nov 29 16:17:59 CST 2017
+ */
+ private String name;
+ /**
+ * This field was generated by MyBatis Generator. This field corresponds to the database column device.address
+ * @mbggenerated Wed Nov 29 16:17:59 CST 2017
+ */
+ private String address;
+ /**
+ * 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 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 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
+ */
+ private String mac;
+ /**
+ * This field was generated by MyBatis Generator. This field corresponds to the database column device.operate_user_id
+ * @mbggenerated Wed Nov 29 16:17:59 CST 2017
+ */
+ private Integer operateUserId;
+ /**
+ * This field was generated by MyBatis Generator. This field corresponds to the database column device.state
+ * @mbggenerated Wed Nov 29 16:17:59 CST 2017
+ */
+ private String state;
+ /**
+ * This field was generated by MyBatis Generator. This field corresponds to the database column device.create_time
+ * @mbggenerated Wed Nov 29 16:17:59 CST 2017
+ */
+ private Date createTime;
+ /**
+ * This field was generated by MyBatis Generator. This field corresponds to the database column device.install_time
+ * @mbggenerated Wed Nov 29 16:17:59 CST 2017
+ */
+ private Date installTime;
+ /**
+ * This field was generated by MyBatis Generator. This field corresponds to the database column device.monitor_point_id
+ * @mbggenerated Wed Nov 29 16:17:59 CST 2017
+ */
+ private Integer monitorPointId;
+ /**
+ * This field was generated by MyBatis Generator. This field corresponds to the database column device.device_version_id
+ * @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;
+ }
- private String name;
+ /**
+ * Gets the device name.
+ *
+ * @return the device name
+ */
+ public String getDevice_name() {
+ return name;
+ }
- private String address;
- private Float longitude;
- private Float latitude;
-
- private String mac;
-
- private String state;
-
- private Integer operateUserId;
-
- private Date createTime;
-
- private Date installTime;
-
- private Integer monitorPointId;
-
- private Integer deviceVersionId;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getAddress() {
- return address;
- }
-
- public void setAddress(String address) {
- this.address = address;
- }
-
- public Float getLongitude() {
- return longitude;
- }
-
- public void setLongitude(Float longitude) {
- this.longitude = longitude;
- }
-
- public Float getLatitude() {
- return latitude;
- }
-
- public void setLatitude(Float latitude) {
- this.latitude = latitude;
- }
-
- public String getMac() {
- return mac;
- }
-
- public void setMac(String mac) {
- this.mac = mac;
- }
-
- public String getState() {
+ /**
+ * Gets the status.
+ *
+ * @return the status
+ */
+ public String getState() {
return state;
}
-
- public void setState(String state) {
- this.state = state;
- }
-
- public Integer getOperateUserId() {
- return operateUserId;
- }
-
- public void setOperateUserId(Integer operateUserId) {
- this.operateUserId = operateUserId;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public Date getInstallTime() {
- return installTime;
- }
-
- public void setInstallTime(Date installTime) {
- this.installTime = installTime;
- }
-
- public Integer getMonitorPointId() {
- return monitorPointId;
- }
-
- public void setMonitorPointId(Integer monitorPointId) {
- this.monitorPointId = monitorPointId;
- }
-
- public Integer getDeviceVersionId() {
- return deviceVersionId;
- }
-
- public void setDeviceVersionId(Integer deviceVersionId) {
- this.deviceVersionId = deviceVersionId;
- }
+ @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