diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/ControlServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/ControlServiceImpl.java index fc7531e..c75887f 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/ControlServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/control/service/impl/ControlServiceImpl.java @@ -2,6 +2,7 @@ package org.dromara.sample.control.service.impl; import cn.hutool.core.date.DateUtil; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.sdk.cloudapi.wayline.OutOfControlActionEnum; import org.dromara.common.sdk.cloudapi.wayline.TaskTypeEnum; import org.dromara.common.sdk.cloudapi.wayline.WaylineJobTypeEnum; @@ -35,6 +36,7 @@ import org.dromara.sample.wayline.mapper.IWaylineJobMapper; import org.dromara.sample.wayline.model.entity.WaylineJobEntity; import org.dromara.sample.wayline.model.enums.WaylineJobStatusEnum; import org.dromara.sample.wayline.service.IWaylineJobService; +import org.dromara.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @@ -177,6 +179,7 @@ public class ControlServiceImpl implements IControlService { @Override public HttpResultResponse takeoffToPoint(String sn, TakeoffToPointParam param) { + LoginUser loginUser = LoginHelper.getLoginUser(); checkTakeoffCondition(sn); Optional dockOpt = deviceRedisService.getDeviceOnline(sn); param.setFlightId(UUID.randomUUID().toString()); @@ -188,7 +191,7 @@ public class ControlServiceImpl implements IControlService { waylineJobEntity.setWorkspaceId(dockOpt.get().getWorkspaceId()); waylineJobEntity.setTaskType(TaskTypeEnum.IMMEDIATE.getType()); waylineJobEntity.setWaylineType(WaylineTypeEnum.WAYPOINT.getValue()); - waylineJobEntity.setUsername("admin"); + waylineJobEntity.setUsername(loginUser.getUsername()); waylineJobEntity.setExecuteTime(new Date()); waylineJobEntity.setBeginTime(new Date()); waylineJobEntity.setStatus(WaylineJobStatusEnum.PENDING.getVal());