From bdeae2dd1836892ac81acb0df024d41f575c250c Mon Sep 17 00:00:00 2001 From: yuance <182865460@qq.com> Date: Thu, 21 May 2026 16:44:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E6=96=87=E6=A1=A3=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E6=96=87=E6=A1=A3=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/controller/AiCloudDocController.java | 27 +++++++++++++++++++ .../com/gxwebsoft/ai/entity/AiCloudDoc.java | 17 +++++++----- .../service/impl/AiCloudDocServiceImpl.java | 20 ++++++++++++++ .../oa/service/impl/OaCompanyServiceImpl.java | 14 +++++++++- 4 files changed, 70 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/gxwebsoft/ai/controller/AiCloudDocController.java b/src/main/java/com/gxwebsoft/ai/controller/AiCloudDocController.java index 6d114d0..2376b81 100644 --- a/src/main/java/com/gxwebsoft/ai/controller/AiCloudDocController.java +++ b/src/main/java/com/gxwebsoft/ai/controller/AiCloudDocController.java @@ -23,6 +23,8 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; + +import java.util.ArrayList; import java.util.List; /** @@ -51,6 +53,9 @@ public class AiCloudDocController extends BaseController { @Operation(summary = "查询全部AI云文档目录表") @GetMapping() public ApiResult> list(AiCloudDocParam param) { + if(param.getCompanyId()==null && param.getProjectId()==null) { + return success(new ArrayList()); + } // 使用关联查询 return success(aiCloudDocService.listRel(param)); } @@ -86,6 +91,16 @@ public class AiCloudDocController extends BaseController { aiCloudDoc.setCategoryId(aiCloudDocParent.getCategoryId()); aiCloudDoc.setCompanyId(aiCloudDocParent.getCompanyId()); } + // 设置 docType + if (aiCloudDoc.getProjectId() != null && aiCloudDoc.getProjectId() != 0) { + aiCloudDoc.setDocType(1); + } else if (aiCloudDoc.getProjectId() != null && aiCloudDoc.getProjectId() == 0 && aiCloudDoc.getCompanyId() != null && aiCloudDoc.getCompanyId() != 0) { + aiCloudDoc.setDocType(2); + } else if (aiCloudDoc.getProjectId() != null && aiCloudDoc.getProjectId() == 0 && aiCloudDoc.getCompanyId() != null && aiCloudDoc.getCompanyId() == 0) { + aiCloudDoc.setDocType(3); + } else { + aiCloudDoc.setDocType(0); + } if (aiCloudDocService.save(aiCloudDoc)) { return success("添加成功"); } @@ -119,6 +134,18 @@ public class AiCloudDocController extends BaseController { @Operation(summary = "批量添加AI云文档目录表") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) { + for (AiCloudDoc aiCloudDoc : list) { + // 设置 docType + if (aiCloudDoc.getProjectId() != null && aiCloudDoc.getProjectId() != 0) { + aiCloudDoc.setDocType(1); + } else if (aiCloudDoc.getProjectId() != null && aiCloudDoc.getProjectId() == 0 && aiCloudDoc.getCompanyId() != null && aiCloudDoc.getCompanyId() != 0) { + aiCloudDoc.setDocType(2); + } else if (aiCloudDoc.getProjectId() != null && aiCloudDoc.getProjectId() == 0 && aiCloudDoc.getCompanyId() != null && aiCloudDoc.getCompanyId() == 0) { + aiCloudDoc.setDocType(3); + } else { + aiCloudDoc.setDocType(0); + } + } if (aiCloudDocService.saveBatch(list)) { return success("添加成功"); } diff --git a/src/main/java/com/gxwebsoft/ai/entity/AiCloudDoc.java b/src/main/java/com/gxwebsoft/ai/entity/AiCloudDoc.java index 8a9c959..1ac13d7 100644 --- a/src/main/java/com/gxwebsoft/ai/entity/AiCloudDoc.java +++ b/src/main/java/com/gxwebsoft/ai/entity/AiCloudDoc.java @@ -24,21 +24,24 @@ public class AiCloudDoc implements Serializable { @TableId(value = "id", type = IdType.AUTO) private Integer id; - @Schema(description = "云目录ID") - private String categoryId; - - @Schema(description = "项目ID") - private Integer projectId; + @Schema(description = "上级目录ID") + private Integer parentId; @Schema(description = "单位ID") private Integer companyId; - @Schema(description = "上级目录ID") - private Integer parentId; + @Schema(description = "项目ID") + private Integer projectId; + + @Schema(description = "文档类型: 0=未分类, 1=项目目录, 2=公司目录, 3=公共目录") + private Integer docType; @Schema(description = "目录名称") private String name; + @Schema(description = "云目录ID") + private String categoryId; + @Schema(description = "排序(数字越小越靠前)") private Integer sortNumber; diff --git a/src/main/java/com/gxwebsoft/ai/service/impl/AiCloudDocServiceImpl.java b/src/main/java/com/gxwebsoft/ai/service/impl/AiCloudDocServiceImpl.java index 02597ab..25c4442 100644 --- a/src/main/java/com/gxwebsoft/ai/service/impl/AiCloudDocServiceImpl.java +++ b/src/main/java/com/gxwebsoft/ai/service/impl/AiCloudDocServiceImpl.java @@ -165,6 +165,16 @@ public class AiCloudDocServiceImpl extends ServiceImpl