Merge remote-tracking branch 'origin/master'

linwei

2026-01-28 016caee2dd92a8c352834c382fd340b39fddc9ab

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceTrackController.java

@@ -39,6 +39,7 @@
import org.sxkj.fw.device.entity.FwDeviceTrackEntity;
import org.sxkj.fw.device.excel.FwDeviceTrackExcel;
import org.sxkj.fw.device.param.FwDeviceTrackPageParam;
import org.sxkj.fw.device.service.IFwDeviceService;
import org.sxkj.fw.device.service.IFwDeviceTrackService;
import org.sxkj.fw.device.vo.FwDeviceTrackVO;
import org.sxkj.fw.device.wrapper.FwDeviceTrackWrapper;
@@ -62,6 +63,7 @@
public class FwDeviceTrackController extends BladeController {

   private final IFwDeviceTrackService fwDeviceTrackService;
   private final IFwDeviceService fwDeviceService;

   /**
    * 设备跟踪流转表 详情
@@ -102,7 +104,12 @@
         return R.fail("设备ID不能为空");
      }

      return R.status(fwDeviceTrackService.saveOrUpdate(FwDeviceTrackWrapper.build().entityDTO(fwDeviceTrack)));
      boolean saved = fwDeviceTrackService.saveOrUpdate(FwDeviceTrackWrapper.build().entityDTO(fwDeviceTrack));
      if (!saved) {
         return R.status(false);
      }

      return R.status(fwDeviceService.updateTrackStatusByDeviceId(fwDeviceTrack.getDeviceId(), 1));
   }

   /**