From 14753bc669a106315717f0f4a70bf2bf5c3e8995 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 13 Apr 2020 15:52:11 +0800
Subject: [PATCH] add大屏报表接口和走航车轨迹接口
---
src/main/java/com/moral/entity/Device.java | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index 6d98dfc..1c01911 100644
--- a/src/main/java/com/moral/entity/Device.java
+++ b/src/main/java/com/moral/entity/Device.java
@@ -3,6 +3,7 @@
import java.util.Date;
import java.util.List;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Transient;
@@ -19,6 +20,7 @@
* @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
@@ -76,6 +78,7 @@
*/
private Integer deviceVersionId;
private String isDelete;
+ private Integer professionId;
/**
* Sets the uid.
*
@@ -85,15 +88,6 @@
this.operateUserId = uid;
}
- /**
- * Sets the device name.
- *
- * @param device_name the new device name
- */
- public void setDevice_name(String device_name) {
- this.name = device_name;
- }
-
/**
* Gets the device name.
*
@@ -117,11 +111,12 @@
private OperateUser operateUser;
@Transient
private DeviceVersion deviceVersion;
- //@Transient
- //private MonitorPoint monitorPoint;
+ @Transient
+ private MonitorPoint monitorPoint;
@Transient
private List<Integer> organizationIds;
-
- @Transient
- private MonitorPoint monitorpointDetail;
+ @Transient
+ private Profession profession;
+ @Transient
+ private DeviceProperty deviceProperty;
}
\ No newline at end of file
--
Gitblit v1.8.0