drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneAlarmRecordEntity.java
@@ -164,5 +164,11 @@ @TableField("area_name") @ApiModelProperty(value = "区域名称") private String areaName; /** * 设备编号 */ @TableField("device_sn") @ApiModelProperty(value = "设备编号") private String deviceSn; } drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml
@@ -34,7 +34,11 @@ <select id="selectFwDroneAlarmRecordPage" resultType="org.sxkj.fw.record.vo.FwDroneAlarmRecordVO"> select dar.*,d.device_name,d.device_model from select dar.*, d.device_name, d.status deviceStatus from ja_fw_drone_alarm_record dar left join ja_fw_device d on dar.device_id = d.id <where> drone-service/drone-fw/src/main/java/org/sxkj/fw/record/vo/FwDroneAlarmRecordVO.java
@@ -132,11 +132,21 @@ */ @ApiModelProperty(value = "设备类型(1.便捷侦测箱/2.反制枪/3.察打一体)") private String deviceType; /** * 设备名称 */ @ApiModelProperty(value = "设备名称") private String deviceName; @ApiModelProperty(value = "设备型号") private String deviceModel; /** * 设备编号 */ @ApiModelProperty(value = "设备编号") private String deviceSn; /** * 设备状态 */ @ApiModelProperty(value = "设备状态(0:在线/1:离线/2:故障/3:报废)") private String deviceStatus; }