修改导出功能

device-manager-ui/admin/src/views/platform/dialogshow.vue

@@ -5,8 +5,10 @@
             <el-row>
                             <Field :span="20" label="平台名称" prop="platformName" v-model="form.platformName" placeholder="请输入平台名称，名称唯一"/>
                             <Field :span="20" label="平台编码" prop="platformSn" v-model="form.platformSn"  placeholder="请输入平台编码，编码唯一"/>
-                            <Field :span="20" label="发送地址" prop="sendUrl" v-model="form.sendUrl" type="textarea" placeholder="请输入发送httpurl地址"/>
-                            <Field :span="20" label="发送消息类型" prop="sendMsgType" v-model="form.sendMsgType" type="radio" :enumData="dict.sendMsgType" placeholder="请选择发送第三方平台消息类型"/>
+                            <Field :span="20" label="发送地址" prop="sendUrl" v-model="form.sendUrl"  placeholder="请输入发送httpurl地址"/>
+                           <Field :span="20" label="首页地址" prop="homeUrl" v-model="form.homeUrl"  placeholder="请输入首页地址"/>
+                           
+                            <!-- <Field :span="20" label="发送消息类型" prop="sendMsgType" v-model="form.sendMsgType" type="radio" :enumData="dict.sendMsgType" placeholder="请选择发送第三方平台消息类型"/> -->
                              <Field :span="20" label="是否发送消息" prop="sendSwitch" v-model="form.sendSwitch" type="radio" :enumData="dict.sendSwitch" placeholder="请选择是否启用发送消息"/>
                             <Field :span="20" label="备注" prop="platformRemark" v-model="form.platformRemark" type="textarea" placeholder="请输入备注"/>
 

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

@@ -25,6 +25,7 @@ public class DeviceEntity extends DeviceVo {
     /**
      * 设备编码
      */
+    @Excel(name = "设备编码")
     private String deviceCode;
     /**
      * 站点Id，来源基础服务平台
@@ -33,10 +34,12 @@ public class DeviceEntity extends DeviceVo {
     /**
      * 站点编号，来源基础服务平台
      */
+    @Excel(name = "站点编码")
     private String siteCode;
     /**
      * 站点名称
      */
+    @Excel(name = "站点名称")
     private String siteName;
     /**
      * 设备的MAC地址
@@ -65,11 +68,11 @@ public class DeviceEntity extends DeviceVo {
     /**
      * 设备生产厂商名称
      */
-    @Excel(name = "设备生产厂商名称")
     private String deviceFirmname;
     /**
      * 设备访问ip
      */
+    @Excel(name = "设备访问ip")
     private String ip;
     /**
      * 中心设备编码
@@ -78,6 +81,7 @@ public class DeviceEntity extends DeviceVo {
     /**
      * 端口
      */
+    @Excel(name = "设备访问端口")
     private String port;
     /**
      * 在线状态 (0.离线，1.在线)
@@ -94,6 +98,7 @@ public class DeviceEntity extends DeviceVo {
     /**
      * 备注
      */
+    @Excel(name = "备注")
     private String deviceRemark;
     /**
      * 最近上线时间

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

 package com.mortals.xhx.module.device.model.vo;
+import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.device.model.DeviceEntity;
 import lombok.Data;
@@ -19,17 +20,19 @@ public class DeviceVo extends BaseEntityLong {
      */
     private String token;
 
-    private String menuUrl;
-
     /**
-     * 登录时间
+     * 平台编码
      */
-    private Long loginTime;
+    @Excel(name = "平台编码",combo = {"排号系统"}, readConverterExp = "phxt=排号系统")
+    private String platformCode;
 
     /**
-     * 过期时间
+     * 产品编码
      */
-    private Long expireTime;
+    @Excel(name = "产品编码",combo = {"排队机", "窗口屏", "呼叫器", "集中显示屏", "导视机", "评级器", "自助服务终端", "填单机", "样表机"}
+    , readConverterExp = "pdj=排队机,ckp=窗口屏,hjq=呼叫器,jzxsp=集中显示屏,dsj=导视机,pjq=评级器,zzfwzd=自助服务终端,tdj=填单机,ybj=样表机")
+    private String productCode;
+
 
     /**
      * 是否通知第三方

device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java

@@ -219,8 +219,6 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
                 //新增设备通知第三方平台
                 sendThirdParty(deviceEntity, productEntity, platformEntity, DeviceStatusEnum.DEL);
             }
-
-
         });
         super.removeBefore(ids, context);
     }

device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http

@@ -98,8 +98,7 @@ Content-Type: application/json
   "siteName": "测试站点",
   "platformCode": "phxt",
   "productCode": "pdj",
-  "deviceRemark": "车是是是打发斯蒂芬",
-  "homeUrl": "http://www.baidu.com"
+  "deviceRemark": "车是是是打发斯蒂芬"
 }