From cb1864d4912067de444237fd3438bca3818a721d Mon Sep 17 00:00:00 2001 From: zhangyue Date: Thu, 30 Apr 2026 09:52:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=A0=E6=84=9F=E5=99=A8?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9E=8B=E5=92=8C?= =?UTF-8?q?=E6=98=A0=E5=B0=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/service/AlarmRecordServiceImpl.java | 2 -- .../java/com/zcloud/dto/SensorDeviceAddCmd.java | 7 ++++--- .../dataobject/RegionSensorRelDO.java | 16 ++++++++++------ .../main/resources/mapper/DeviceRegionMapper.xml | 2 +- .../resources/mapper/RegionSensorRelMapper.xml | 5 ++++- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/service/AlarmRecordServiceImpl.java b/web-app/src/main/java/com/zcloud/service/AlarmRecordServiceImpl.java index 25e2024..0095137 100644 --- a/web-app/src/main/java/com/zcloud/service/AlarmRecordServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/service/AlarmRecordServiceImpl.java @@ -2,7 +2,6 @@ package com.zcloud.service; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; -import com.alibaba.druid.sql.visitor.functions.If; import com.zcloud.api.AlarmRecordServiceI; import com.zcloud.command.query.AlarmRecordQueryExe; import com.zcloud.command.query.AppAlarmDisposeQueryExe; @@ -10,7 +9,6 @@ import com.zcloud.command.query.AppAlarmRecordQueryExe; import com.zcloud.dto.AlarmRecordPageQry; import com.zcloud.dto.AlarmRecordSensorPageQry; import com.zcloud.dto.AppAlarmDisposePageQry; -import com.zcloud.dto.AppAlarmRecordPageQry; import com.zcloud.dto.clientobject.AlarmRecordCO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/web-client/src/main/java/com/zcloud/dto/SensorDeviceAddCmd.java b/web-client/src/main/java/com/zcloud/dto/SensorDeviceAddCmd.java index b47428b..1dc9192 100644 --- a/web-client/src/main/java/com/zcloud/dto/SensorDeviceAddCmd.java +++ b/web-client/src/main/java/com/zcloud/dto/SensorDeviceAddCmd.java @@ -9,6 +9,7 @@ import lombok.NoArgsConstructor; import lombok.AllArgsConstructor; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.time.LocalDate; import java.time.LocalDateTime; @@ -48,9 +49,9 @@ public class SensorDeviceAddCmd extends Command { @NotEmpty(message = "传感器状态名称不能为空") private String sensorStatusName; - @ApiModelProperty(value = "传感器状态名称", name = "sensorStatusName") - @NotEmpty(message = "传感器状态名称不能为空") - private String thresholdFlag; + @ApiModelProperty(value = "是通过系统设定报警 1-是 0-否'", name = "sensorStatusName") + @NotNull(message = "是通过系统设定报警 1-是 0-否'") + private Integer thresholdFlag; @ApiModelProperty(value = "安装位置", name = "installPosition") private String installPosition; diff --git a/web-infrastructure/src/main/java/com/zcloud/persistence/dataobject/RegionSensorRelDO.java b/web-infrastructure/src/main/java/com/zcloud/persistence/dataobject/RegionSensorRelDO.java index f01c63e..85bd577 100644 --- a/web-infrastructure/src/main/java/com/zcloud/persistence/dataobject/RegionSensorRelDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/persistence/dataobject/RegionSensorRelDO.java @@ -27,12 +27,6 @@ public class RegionSensorRelDO extends BaseDO { @ApiModelProperty(value = "传感器设备ID") private String sensorDeviceId; -// asd.sensor_device_name AS sensor_name, -// asd.sensor_device_code AS sensor_code, -// asd.sensor_attr AS sensor_attr, -// ast.type_name AS sensor_type_name, -// asd.sensor_status_name as sensor_status_name, -// case when asd.longitude is not null then '是' else '否' end as location_flag @ApiModelProperty(value = "传感器名称") @TableField(exist = false) @@ -56,5 +50,15 @@ public class RegionSensorRelDO extends BaseDO { @TableField(exist = false) private String locationFlag; + @ApiModelProperty(value = "纬度") + @TableField(exist = false) + private String latitude; + @ApiModelProperty(value = "经度") + @TableField(exist = false) + private String longitude; + @ApiModelProperty(value = "传感器类型ID") + @TableField(exist = false) + private String sensorTypeId; + } diff --git a/web-infrastructure/src/main/resources/mapper/DeviceRegionMapper.xml b/web-infrastructure/src/main/resources/mapper/DeviceRegionMapper.xml index 6458a34..7b496ee 100644 --- a/web-infrastructure/src/main/resources/mapper/DeviceRegionMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/DeviceRegionMapper.xml @@ -8,7 +8,7 @@ SELECT rc.id, rc.region_config_id AS regionConfigId, - fr.id AS fireRegionId, + fr.fire_region_id AS fireRegionId, fr.fire_region_name AS fireRegionName, fr.fire_region_code AS fireRegionCode, fr.department_id AS departmentId, diff --git a/web-infrastructure/src/main/resources/mapper/RegionSensorRelMapper.xml b/web-infrastructure/src/main/resources/mapper/RegionSensorRelMapper.xml index e75d39f..0c3b349 100644 --- a/web-infrastructure/src/main/resources/mapper/RegionSensorRelMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/RegionSensorRelMapper.xml @@ -14,7 +14,10 @@ case asd.sensor_attr when 'NUMBER' then '数值类' when 'SWITCH' then '开关类' else '未知' end as sensor_attr_name, ast.type_name AS sensor_type_name, asd.sensor_status_name as sensor_status_name, - case when asd.longitude is not null then '是' else '否' end as location_flag + case when asd.longitude is not null then '是' else '否' end as location_flag, + asd.longitude AS longitude, + asd.latitude AS latitude, + asd.sensor_type_id from iot_alarm_region_sensor_rel arsr left join iot_alarm_sensor_device asd on asd.sensor_device_id = arsr.sensor_device_id left join iot_alarm_sensor_type ast on ast.sensor_type_id = asd.sensor_type_id