zcloud_gbs
/
zcloud_gbs_iotalarm
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化传感器设备数据模型和映射配置

main
zhangyue 2026-04-30 09:52:01 +08:00
parent 800da5d77d
commit cb1864d491
5 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web-app/src/main/java/com/zcloud/service/AlarmRecordServiceImpl.java
View File

@ -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;

7
web-client/src/main/java/com/zcloud/dto/SensorDeviceAddCmd.java
View File

@ -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;

16
web-infrastructure/src/main/java/com/zcloud/persistence/dataobject/RegionSensorRelDO.java
View File

@ -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;
}

2
web-infrastructure/src/main/resources/mapper/DeviceRegionMapper.xml
View File

@ -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,

5
web-infrastructure/src/main/resources/mapper/RegionSensorRelMapper.xml
View File

@ -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