drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/impl/CockpitServiceImpl.java
@@ -12,6 +12,7 @@ import org.sxkj.fw.device.entity.FwDeviceEntity; import org.sxkj.fw.device.service.IFwDeviceService; import org.sxkj.fw.record.dto.FwDroneAlarmRecordDTO; import org.sxkj.fw.record.entity.FwDroneAlarmRecordEntity; import org.sxkj.fw.record.service.IFwDroneAlarmRecordService; import org.sxkj.fw.record.vo.FwDroneAlarmRecordVO; @@ -48,6 +49,10 @@ @Override public boolean saveOrUpdate(FwEffectEvalEntity fwEffectEvalEntity) { FwDroneAlarmRecordEntity alarmRecordEntity = fwDroneAlarmRecordService.getById(fwEffectEvalEntity.getAlarmRecordId()); FwDeviceEntity device = fwDeviceService.getById(alarmRecordEntity.getDeviceId()); fwEffectEvalEntity.setDeviceId(alarmRecordEntity.getDeviceId()); fwEffectEvalEntity.setCounterEffect("1"); return fwEffectEvalService.saveOrUpdate(fwEffectEvalEntity); }
@@ -43,6 +43,13 @@ */ @ApiModelProperty(value = "告警记录ID（ja_fw_drone_alarm_record.id）") private Long alarmRecordId; /** * 反制方式：信号干扰/诱导驱离/无 */ @ApiModelProperty(value = "反制方式：1.信号干扰/2.诱导驱离/无") private String counterWay; /** * 反制设备ID（ja_fw_device.id） */ drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/entity/FwEffectEvalEntity.java
@@ -44,6 +44,10 @@ @TableField("alarm_record_id") @ApiModelProperty(value = "告警记录ID（ja_fw_drone_alarm_record.id）") private Long alarmRecordId; @TableField("counter_way") @ApiModelProperty(value = "反制方式：1.信号干扰/2.诱导驱离/无") private String counterWay; /** * 反制设备ID（ja_fw_device.id） */ @@ -102,7 +106,7 @@ * 反制效果（success/fail） */ @TableField("counter_effect") @ApiModelProperty(value = "反制效果（success/fail）") @ApiModelProperty(value = "反制效果（1.success/2.fail）") private String counterEffect; /** * 部署经度（冗余） @@ -126,7 +130,7 @@ * 工作模式（机动/固定） */ @TableField("work_mode") @ApiModelProperty(value = "工作模式（机动/固定）") @ApiModelProperty(value = "工作模式（1.机动/2.固定）") private String workMode; /** * 区域编码 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
@@ -124,7 +124,7 @@ -- 雷达设备数量 (SELECT COUNT(*) FROM ja_fw_device WHERE is_deleted = 0 AND device_att = '3') AS radarCount, -- 设备告警 (SELECT COUNT(*) FROM ja_fw_device WHERE is_deleted = 0 AND status = '2') AS deviceAlarmCount; (SELECT COUNT(*) FROM ja_fw_device WHERE is_deleted = 0 AND status in ('1', '2', '3') ) AS deviceAlarmCount; </select> </mapper>
