From cb403584764c2e2a81ac50390032a57ceebf63c1 Mon Sep 17 00:00:00 2001
From: zhaoxianglong <you@example.com>
Date: Thu, 30 May 2024 20:01:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AF=BC=E5=87=BA=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=88=97=E8=A1=A8BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zc/business/domain/DcDevice.java    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/domain/DcDevice.java b/zc-business/src/main/java/com/zc/business/domain/DcDevice.java
index 0bd60eb7..4ef85d4c 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcDevice.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcDevice.java
@@ -35,8 +35,8 @@ public class DcDevice {
     @ApiModelProperty("物联设备ID")
     @Excel(name = "物联设备ID")
     private String iotDeviceId;
-    @ApiModelProperty("组ID")
-    @Excel(name = "组ID")
+    @ApiModelProperty("所属机构")
+    //@Excel(name = "所属机构")
     private Long groupId;
     @ApiModelProperty("产品ID")
     @Excel(name = "产品ID")
@@ -45,7 +45,7 @@ public class DcDevice {
     @Excel(name = "桩号")
     private String stakeMark;
     @ApiModelProperty("方向1-上行(菏泽方向),2-中,3-下行(济南方向)")
-    @Excel(name = "方向")
+    @Excel(name = "方向", readConverterExp = "1=菏泽方向,3=济南方向")
     private String direction;
     @ApiModelProperty("设备名称")
     @Excel(name = "设备名称")
@@ -54,7 +54,7 @@ public class DcDevice {
     @Excel(name = "设备编号")
     private String deviceCode;
     @ApiModelProperty("设备类型")
-    @Excel(name = "设备类型")
+    @Excel(name = "设备类型", readConverterExp = "1=摄像机,2=可变信息标志,3=气象监测器,4=出口诱导灯,5=路段语音广播,6=护栏碰撞,7=毫米波雷达,8=合流区预警,9=智慧锥桶,10=激光疲劳唤醒,11=一类交通量调查站,12=行车诱导,13=智能设备箱,14=光线在线监测,15=太阳能板,16=远端机")
     private String deviceType;
     @ApiModelProperty("所属网段")
     @Excel(name = "所属网段")
@@ -75,10 +75,10 @@ public class DcDevice {
     @Excel(name = "安装位置")
     private String installationSite;
     @ApiModelProperty("设备状态")
-    @Excel(name = "设备状态")
+    @Excel(name = "设备状态", readConverterExp = "0=异常,1=正常")
     private String deviceState;
     @ApiModelProperty("使用状态")
-    @Excel(name = "使用状态")
+    @Excel(name = "使用状态", readConverterExp = "0=使用中,1=未使用")
     private Integer useState;
     @ApiModelProperty("其他配置")
     @Excel(name = "其他配置")
@@ -87,7 +87,7 @@ public class DcDevice {
     @Excel(name = "备注")
     private String remark;
     @ApiModelProperty("设施归属类型（0:默认1: 道路沿线2:桥梁3: 隧道4:收费广场5: 收费站6: 服务区等")
-    @Excel(name = "设施归属类型")
+    @Excel(name = "设施归属类型", readConverterExp = "0=默认,1=道路沿线,2=桥梁,3=隧道,4=收费广场,5=收费站,6=服务区")
     private String facilitiesType;
     @ApiModelProperty("设备ip")
     @Excel(name = "设备ip")
@@ -102,7 +102,7 @@ public class DcDevice {
     @Excel(name = "修改时间")
     private Date updateTime;
     @ApiModelProperty("子类型")
-    @Excel(name = "子类型")
+    @Excel(name = "子类型", readConverterExp = "1-1=高清网络枪型固定摄像机,1-2=高清网络球形摄像机,1-3=桥下高清网络球形摄像机,1-4=360°全景摄像机,1-5=180°全景摄像机,2-1=门架式可变信息标志,2-2=站前可变信息标志,2-3=雨棚可变信息标志,2-4=站前悬臂式可变信息标")
     private String childType;
     @TableField(exist = false)
     private String longitude;