设备列表导出优化

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

@@ -184,6 +184,7 @@ export default {
     /** 导出Excel */
     doExport() {
       this.isExport = true;
+      console.log("ids", this.selection)
       this.$download(
         "/device/exportExcel",
         {
@@ -210,6 +211,8 @@ export default {
     },
     /** 重写编辑方法 */
     toEdit(row) {
+      row.siteName = this.siteName;
+      row.siteCode = this.siteCode;
       this.$refs.drawerform.edit(row);
     },
     /** 重写查看方法 */

device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceEntity.java

@@ -27,11 +27,12 @@ public class DeviceEntity extends DeviceVo {
     /**
      * 设备编码,SN码等，默认为MAC地址
      */
-    @Excel(name = "设备编码,SN码等，默认为MAC地址")
+    @Excel(name = "设备编码")
     private String deviceCode;
     /**
      * 设备的MAC地址
      */
+    @Excel(name = "Mac地址",type = Excel.Type.EXPORT)
     private String deviceMac;
     /**
      * 站点Id，来源基础服务平台

device-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceVo.java

@@ -31,7 +31,7 @@ public class DeviceVo extends BaseEntityLong {
     /**
      * 产品编码
      */
-    @Excel(name = "产品",cacheDict = "productDict")
+    @Excel(name = "产品类型",cacheDict = "productDict" ,type = Excel.Type.IMPORT)
     private String productCode;
 
 
@@ -47,4 +47,9 @@ public class DeviceVo extends BaseEntityLong {
     @JSONField(deserialize = false,serialize = false)
     @JsonIgnore
     private PictureData picObj;
+
+    /** 主键ID，主键，自增长列表 */
+    private List <Long> idList;
+
+
 }
\ No newline at end of file