From aeb840340f1d8782abec8dbdbc5ecc2d5c3dca18 Mon Sep 17 00:00:00 2001
From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com>
Date: Mon, 8 May 2023 17:12:18 +0800
Subject: [PATCH] 2023-05-08 17:12:11

---
 .../main/java/com/psdc/entity/PsdcDevice.java | 88 +++++--------------
 .../main/java/com/psdc/entity/PsdcScene.java  | 25 ++++++
 2 files changed, 49 insertions(+), 64 deletions(-)
 create mode 100644 psdc-business/src/main/java/com/psdc/entity/PsdcScene.java

diff --git a/psdc-business/src/main/java/com/psdc/entity/PsdcDevice.java b/psdc-business/src/main/java/com/psdc/entity/PsdcDevice.java
index 1a4709a..47f3a34 100644
--- a/psdc-business/src/main/java/com/psdc/entity/PsdcDevice.java
+++ b/psdc-business/src/main/java/com/psdc/entity/PsdcDevice.java
@@ -4,74 +4,34 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
+import java.util.Date;
 
+
+/**
+ * @author : stone
+ * @date : 2023-4-23
+ */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-/**
- * 设备信息表
- *
- * @author stone
- */
-public class PsdcDevice implements Serializable {
+public class PsdcDevice {
+
+  private long deviceId;
+  private long userId;
+  private long deviceType;
+  private String deviceSn;
+  private String deviceName;
+  private String hardVersion;
+  private String softVersion;
+  private String deviceAddress;
+  private String startTime;
+  private long deviceStatus;
+  private long deviceRunstatus;
+  private String photoUrl;
+  private String createBy;
+  private Date createTime;
+  private String updateBy;
+  private Date updateTime;
 
-    private static final long serialVersionUID = 1L;
 
-    /**
-     * 设备id
-     */
-    private Integer deviceId;
-    /**
-     * 用户id
-     */
-    private Integer userId;
-    /**
-     * 设备类型：1-监测设备，2-运行设备
-     */
-    private Integer deviceType;
-    /**
-     * 设备sn
-     */
-    private String deviceSn;
-    /**
-     * 设备名称
-     */
-    private String deviceName;
-    /**
-     * 硬件版本
-     */
-    private String hardVersion;
-    /**
-     * 软件版本
-     */
-    private String softVersion;
-    /** 安装地址 */
-    private String deviceAddress ;
-    /** 启用时间 */
-    private String startTime ;
-    /**
-     * 设备状态：1-未激活，2-禁用，3-在线，4-离线
-     */
-    private Integer deviceStatus;
-    /**
-     * 图片地址
-     */
-    private String photoUrl;
-    /**
-     * 创建者
-     */
-    private String createBy;
-    /**
-     * 创建时间
-     */
-    private String createTime;
-    /**
-     * 修改者
-     */
-    private String updateBy;
-    /**
-     * 修改时间
-     */
-    private String updateTime;
 }
diff --git a/psdc-business/src/main/java/com/psdc/entity/PsdcScene.java b/psdc-business/src/main/java/com/psdc/entity/PsdcScene.java
new file mode 100644
index 0000000..416618e
--- /dev/null
+++ b/psdc-business/src/main/java/com/psdc/entity/PsdcScene.java
@@ -0,0 +1,25 @@
+package com.psdc.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * @author : stone
+ * @date : 2023-4-23
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PsdcScene {
+
+  private long scene;
+  private String sceneName;
+  private long deviceId;
+  private String deviceSn;
+  private String sceneKey;
+  private String sceneValue;
+
+
+}