From e57e32fc43da31917912eebb4e47d4e50df1a9e9 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期四, 05 八月 2021 22:56:15 +0800
Subject: [PATCH] 完善格式化功能

---
 java110-bean/src/main/java/com/java110/vo/api/machine/ApiMachineDataVo.java |   51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 50 insertions(+), 1 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/vo/api/machine/ApiMachineDataVo.java b/java110-bean/src/main/java/com/java110/vo/api/machine/ApiMachineDataVo.java
old mode 100644
new mode 100755
index 0ff7c04..d34c44d
--- a/java110-bean/src/main/java/com/java110/vo/api/machine/ApiMachineDataVo.java
+++ b/java110-bean/src/main/java/com/java110/vo/api/machine/ApiMachineDataVo.java
@@ -1,7 +1,9 @@
 package com.java110.vo.api.machine;
 
+import com.java110.dto.machine.MachineAttrDto;
+
 import java.io.Serializable;
-import java.util.Date;
+import java.util.List;
 
 public class ApiMachineDataVo implements Serializable {
 
@@ -27,6 +29,13 @@
     private String roomId;
     private String roomNum;
     private String locationObjName;
+    private String direction;
+    private String directionName;
+    private List<MachineAttrDto> machineAttrs;
+
+
+    private String createTime;
+    private String heartbeatTime;
 
     public String getMachineId() {
         return machineId;
@@ -187,4 +196,44 @@
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getDirection() {
+        return direction;
+    }
+
+    public void setDirection(String direction) {
+        this.direction = direction;
+    }
+
+    public String getDirectionName() {
+        return directionName;
+    }
+
+    public void setDirectionName(String directionName) {
+        this.directionName = directionName;
+    }
+
+    public List<MachineAttrDto> getMachineAttrs() {
+        return machineAttrs;
+    }
+
+    public void setMachineAttrs(List<MachineAttrDto> machineAttrs) {
+        this.machineAttrs = machineAttrs;
+    }
+
+    public String getHeartbeatTime() {
+        return heartbeatTime;
+    }
+
+    public void setHeartbeatTime(String heartbeatTime) {
+        this.heartbeatTime = heartbeatTime;
+    }
 }

--
Gitblit v1.8.0