diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/DocAiController.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/DocAiController.java index 86a8c46..3f6b891 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/DocAiController.java +++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/DocAiController.java @@ -1,16 +1,35 @@ package org.dromara.productManagement.controller; +import cn.dev33.satoken.annotation.SaIgnore; +import cn.dev33.satoken.secure.BCrypt; +import cn.dev33.satoken.stp.SaLoginModel; +import cn.dev33.satoken.stp.StpUtil; +import cn.dev33.satoken.util.SaResult; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.domain.model.PasswordLoginBody; +import org.dromara.common.core.enums.LoginType; +import org.dromara.common.core.enums.UserStatus; +import org.dromara.common.core.exception.user.UserException; +import org.dromara.common.core.utils.ValidatorUtils; +import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.productManagement.service.IDocAiService; +import org.dromara.system.domain.SysUser; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.mapper.SysUserMapper; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; +import java.util.HashMap; /** * DocAiController类,处理与文档AI相关的HTTP请求。 @@ -22,8 +41,7 @@ import java.io.IOException; public class DocAiController { private final IDocAiService docAiService; - - + private final SysUserMapper userMapper; /** * SSE调用接口 * @param originalFilename 原始文件名 @@ -130,4 +148,6 @@ public class DocAiController { public R uploadFile(@RequestPart(name = "fileInfo") MultipartFile file, @RequestPart(name = "originalFilename") String originalFilename) throws IOException, InterruptedException { return docAiService.uploadFile(file, originalFilename); } + + } diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/enums/TaskEnum.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/enums/TaskEnum.java index 7250a67..6e6f7b7 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/enums/TaskEnum.java +++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/enums/TaskEnum.java @@ -54,7 +54,7 @@ public class TaskEnum { // 合同审核子任务枚举 public enum ContractTask { - CONTRACT_REVIEW("contractReview", "合同审核"); + CONTRACT_REVIEW("contractualReview", "合同审核"); private final String value; private final String label; diff --git a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/DocumentTasksServiceImpl.java b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/DocumentTasksServiceImpl.java index 339acb9..5ba9a33 100644 --- a/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/DocumentTasksServiceImpl.java +++ b/zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/DocumentTasksServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.productManagement.service.impl; +import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.io.FileUtil; import lombok.Data; @@ -82,6 +83,13 @@ public class DocumentTasksServiceImpl extends BaseTaskService implements IDocume //==5 查询所有 //默认查询方案审核类型的 lqw.eq(DocumentTasks::getTaskType, TaskEnum.TaskType.SCHEME_REVIEW.getValue()); + }else{ + //根据角色查询类型 +// if(StpUtil.hasRole("documentReview")){ +// lqw.eq(DocumentTasks::getTaskType, TaskEnum.TaskType.SCHEME_REVIEW.getValue()); +// }else if(StpUtil.hasRole("documentCheck")){ +// +// } } Page documentTaskGroupPage = baseMapper.selectDocumentTaskGroups(pageQuery.build(), lqw); documentTaskGroupPage.getRecords().forEach(vo -> {