From f88b104efdd3f74117e565d2b113a39d7d8d900a Mon Sep 17 00:00:00 2001 From: zhaoxianglong Date: Wed, 14 Aug 2024 17:38:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=BE=E5=A4=87=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=20=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=EF=BC=88=E7=BB=8F=E7=BA=AC=E5=BA=A6=E5=AD=97=E6=AE=B5=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/zc/business/domain/DcDevice.java | 8 +++++--- .../src/main/resources/mapper/business/DcDeviceMapper.xml | 3 +-- 2 files changed, 6 insertions(+), 5 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 8d45cdd3..c34c031e 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 @@ -105,12 +105,14 @@ public class DcDevice { @ApiModelProperty("子类型") @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) + @ApiModelProperty("经度") + @Excel(name = "经度") private String longitude; + @ApiModelProperty("维度") + @Excel(name = "维度") + private String latitude; @TableField(exist = false) private String sumAll; - @TableField(exist = false) - private String latitude; //设备厂商 @TableField(exist = false) private String manufacturer; diff --git a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml index 722e32ac..1e703994 100644 --- a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml @@ -76,9 +76,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select t1.id, t1.iot_device_id, t1.group_id, t1.product_id, t1.stake_mark, t1.direction, t1.device_name, t1.device_code, t1.device_type, t1.installation_Date,t1.production_date,t1.durable_years,t1.installation_site,t1.use_state,t1.device_state,t1.other_config,t1.remark, t1.create_time,t1.update_time,t1.facilities_type,t1.device_ip,t1.stake_mark_range,t1.network_segment,t1.device_img,t1.child_type, - t1.facilities_type,t2.longitude,t2.latitude,t3.manufacturer + t1.facilities_type,t1.longitude,t1.latitude,t3.manufacturer from dc_device t1 - left join dc_stake_mark t2 on t1.stake_mark = t2.stake_mark and t1.direction = t2.direction left join dc_product t3 on t3.id = t1.product_id and t1.id = #{id}