Merge remote-tracking branch 'origin/master'

rain

2026-01-09 31eda012c6f3388f1c7441951a250b54c046e7ea

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