diff --git a/dk-api/api-business/src/main/java/org/dromara/business/api/RemoteBusinessTaskService.java b/dk-api/api-business/src/main/java/org/dromara/business/api/RemoteBusinessTaskService.java new file mode 100644 index 0000000..c0780ec --- /dev/null +++ b/dk-api/api-business/src/main/java/org/dromara/business/api/RemoteBusinessTaskService.java @@ -0,0 +1,17 @@ +package org.dromara.business.api; + +/** + * @auther yq + * @data 2025/3/18 + */ +public interface RemoteBusinessTaskService { + + + /** + * 更新预约工单状态 + * @param fileId 航线id + * @param jobId 飞行记录id + * @param isJobStatus 飞行状态 + */ + void updateTaskStatus(String fileId, String jobId,Boolean isJobStatus); +} diff --git a/dk-common/common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java b/dk-common/common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java index f55260e..77ac95f 100644 --- a/dk-common/common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java +++ b/dk-common/common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java @@ -89,7 +89,7 @@ public class PlusDataPermissionHandler { // 获取数据权限配置 DataPermission dataPermission = getDataPermission(mappedStatementId); // 获取当前登录用户信息 - LoginUser currentUser = DataPermissionHelper.getVariable("user"); + LoginUser currentUser = LoginHelper.getLoginUser(); if (ObjectUtil.isNull(currentUser)) { currentUser = LoginHelper.getLoginUser(); DataPermissionHelper.setVariable("user", currentUser); diff --git a/dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessTaskServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessTaskServiceImpl.java new file mode 100644 index 0000000..724abc3 --- /dev/null +++ b/dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessTaskServiceImpl.java @@ -0,0 +1,24 @@ +package org.dromara.business.dubbo; + +import lombok.RequiredArgsConstructor; +import org.apache.dubbo.config.annotation.DubboService; +import org.dromara.business.api.RemoteBusinessTaskService; +import org.dromara.business.service.IBusinessTaskService; +import org.springframework.stereotype.Service; + +/** + * @auther yq + * @data 2025/3/18 + */ +@RequiredArgsConstructor +@Service +@DubboService +public class RemoteBusinessTaskServiceImpl implements RemoteBusinessTaskService { + private final IBusinessTaskService businessTaskService; + + + @Override + public void updateTaskStatus(String fileId, String jobId, Boolean isJobStatus) { + + } +} diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java index d671a22..a592d9a 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java @@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.common.mybatis.helper.DataPermissionHelper; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.api.model.LoginUser; import org.springframework.stereotype.Service; @@ -95,7 +96,7 @@ public class BusinessTaskServiceImpl implements IBusinessTaskService { public Boolean insertByBo(BusinessTaskBo bo) { System.out.println("数据"+bo.getPolygonRegion()); // 获取当前登录用户信息 - LoginUser currentUser = DataPermissionHelper.getVariable("user"); + LoginUser currentUser = LoginHelper.getLoginUser(); bo.setCreateBy(currentUser.getUserId()); bo.setNickName(currentUser.getNickname()); bo.setCreateDept(currentUser.getDeptId()); @@ -103,9 +104,7 @@ public class BusinessTaskServiceImpl implements IBusinessTaskService { bo.setTenantId(currentUser.getTenantId()); bo.setStatus("0"); bo.setCreateTime(new Date()); - String jsonString = JSON.toJSONString(bo.getPolygonRegion()); BusinessTask add = MapstructUtils.convert(bo, BusinessTask.class); - add.setPolygonRegion(jsonString); if(StrUtil.isNotBlank(bo.getExpectTime())){ add.setExpectTime(Convert.toDate(bo.getExpectTime())); }