历久设备展示

device-manager-ui/admin/src/views/device/drawershow.vue

@@ -113,7 +113,16 @@
         />
 
          <Field
-          label="启用状态 "
+          label="利旧设备"
+          prop="source"
+          v-model="form.source"
+          type="select"
+          :enumData="dict.source"
+          placeholder="请选择状态 "
+        />
+
+        <Field
+          label="启用状态"
           prop="enabled"
           v-model="form.enabled"
           type="select"
@@ -175,6 +184,7 @@ export default {
         "deviceStatus",
         "enabled",
         "deviceFirmId",
+         "source",
       ],
       toDate: ["defectsLiabilityPeriod"],
 
@@ -201,6 +211,8 @@ export default {
       this.reset();
       this.query = { id: row.id };
       this.urls.currUrl = this.pageInfo.editUrl;
+       this.siteName = row.siteName;
+      this.siteCode = row.siteCode;
       this.getData();
       this.pageInfo.type = "edit";
       this.title = "修改设备";
@@ -235,7 +247,7 @@ export default {
       this.open = true;
 
     
-      if (this.pageInfo.type == "add") {
+      if (this.pageInfo.type == "add"||this.pageInfo.type == "edit") {
         this.form.siteName = this.siteName;
         this.form.siteCode = this.siteCode;
       }

device-manager-ui/admin/src/views/device/view.vue

@@ -174,6 +174,15 @@
       >
         {{ util_formatters("enabled", form.enabled) }}
       </el-descriptions-item>
+
+       <el-descriptions-item
+        label="利旧设备 "
+        label-class-name="labelClass"
+        content-class-name="contentClass"
+      >
+        {{ util_formatters("source", form.source) }}
+      </el-descriptions-item>
+
       <el-descriptions-item
         label="设备授权码"
         label-class-name="labelClass"

device-manager/src/main/java/com/mortals/xhx/busiz/req/DeviceReq.java

@@ -53,6 +53,12 @@ public class DeviceReq implements Serializable {
      * 设备编码(暂定mac地址)
      */
     private String deviceCode;
+
+    /**
+     * 设备Mac
+     */
+    private String deviceMac;
+
     /**
      * 所属站点Id
      */

doc/api.md

@@ -311,6 +311,7 @@ data|object|数据对象|-
 ---|---|---|---|---
 deviceName|String|否|设备名称
 deviceCode|String|是|设备编码,默认为MAC地址
+deviceMac|String|否|设备MAC地址，如不填写，默认等于deviceCode
 siteId|Long|是|站点Id
 siteCode|String|否|站点编号
 siteName|String|否|站点名称
@@ -331,6 +332,7 @@ source|Integer|否|设备来源,默认1(0.旧设备，1.新设备)
 {
     "deviceName":"agpla8",
     "deviceCode":"a1-a2",
+    "deviceMac":"a1-a2",
     "siteId":1,
     "siteCode":"510105521000-0001",
     "siteName":"测试站点1",