优化扩展设备功能

WebService/src/main/resources/components/machinePackage/machine-manage/machineManage.html

@@ -74,13 +74,12 @@
                             <th class="text-center">版本号</th>
                             <th class="text-center">设备名称</th>
                             <th class="text-center">设备类型</th>
+                            <th class="text-center">设备位置</th>
+                            <th class="text-center">状态</th>
                             <th class="text-center">设备IP</th>
                             <th class="text-center">设备MAC</th>
-                            <th class="text-center">设备位置</th>
-
                             <th class="text-center">操作</th>
 
-
                         </tr>
                         </thead>
                         <tbody>
@@ -90,9 +89,10 @@
                             <td class="text-center">{{machine.machineVersion}}</td>
                             <td class="text-center">{{machine.machineName}}</td>
                             <td class="text-center">{{machine.machineTypeCdName}}</td>
+                            <td class="text-center">{{machine.locationObjName}}</td>
+                            <td class="text-center">{{machine.stateName}}</td>
                             <td class="text-center">{{machine.machineIp}}</td>
                             <td class="text-center">{{machine.machineMac}}</td>
-                            <td class="text-center">{{machine.machineMac}}</td>
                             <td class="text-center">
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs" v-on:click="_openEditMachineModel(machine)">修改</button>

java110-bean/src/main/java/com/java110/dto/hardwareAdapation/MachineDto.java

@@ -29,6 +29,14 @@ public class MachineDto extends PageDto implements Serializable {
     private String locationTypeCd;
     private String locationObjId;
     private String state;
+    private String floorId;
+    private String floorNum;
+    private String unitId;
+    private String unitNum;
+    private String roomId;
+    private String roomNum;
+    private String locationObjName;
+
 
 
     private Date createTime;
@@ -165,4 +173,60 @@ public class MachineDto extends PageDto implements Serializable {
     public void setState(String state) {
         this.state = state;
     }
+
+    public String getFloorId() {
+        return floorId;
+    }
+
+    public void setFloorId(String floorId) {
+        this.floorId = floorId;
+    }
+
+    public String getFloorNum() {
+        return floorNum;
+    }
+
+    public void setFloorNum(String floorNum) {
+        this.floorNum = floorNum;
+    }
+
+    public String getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(String unitId) {
+        this.unitId = unitId;
+    }
+
+    public String getUnitNum() {
+        return unitNum;
+    }
+
+    public void setUnitNum(String unitNum) {
+        this.unitNum = unitNum;
+    }
+
+    public String getRoomId() {
+        return roomId;
+    }
+
+    public void setRoomId(String roomId) {
+        this.roomId = roomId;
+    }
+
+    public String getRoomNum() {
+        return roomNum;
+    }
+
+    public void setRoomNum(String roomNum) {
+        this.roomNum = roomNum;
+    }
+
+    public String getLocationObjName() {
+        return locationObjName;
+    }
+
+    public void setLocationObjName(String locationObjName) {
+        this.locationObjName = locationObjName;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/machine/ApiMachineDataVo.java

@@ -18,6 +18,15 @@ public class ApiMachineDataVo implements Serializable {
     private String locationObjId;
     private String state;
 
+
+    private String floorId;
+    private String floorNum;
+    private String unitId;
+    private String unitNum;
+    private String roomId;
+    private String roomNum;
+    private String locationObjName;
+
     public String getMachineId() {
         return machineId;
     }
@@ -113,4 +122,60 @@ public class ApiMachineDataVo implements Serializable {
     public void setState(String state) {
         this.state = state;
     }
+
+    public String getFloorId() {
+        return floorId;
+    }
+
+    public void setFloorId(String floorId) {
+        this.floorId = floorId;
+    }
+
+    public String getFloorNum() {
+        return floorNum;
+    }
+
+    public void setFloorNum(String floorNum) {
+        this.floorNum = floorNum;
+    }
+
+    public String getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(String unitId) {
+        this.unitId = unitId;
+    }
+
+    public String getUnitNum() {
+        return unitNum;
+    }
+
+    public void setUnitNum(String unitNum) {
+        this.unitNum = unitNum;
+    }
+
+    public String getRoomId() {
+        return roomId;
+    }
+
+    public void setRoomId(String roomId) {
+        this.roomId = roomId;
+    }
+
+    public String getRoomNum() {
+        return roomNum;
+    }
+
+    public void setRoomNum(String roomNum) {
+        this.roomNum = roomNum;
+    }
+
+    public String getLocationObjName() {
+        return locationObjName;
+    }
+
+    public void setLocationObjName(String locationObjName) {
+        this.locationObjName = locationObjName;
+    }
 }