Prechádzať zdrojové kódy

添加了获取各个分组的模板列表接口,将repo文件中的group类型改成varchar类型

李英俊ya 1 mesiac pred
rodič
commit
471472df79

+ 47 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysCompanyTemplateController.java

@@ -1,7 +1,14 @@
 package com.ruoyi.web.controller.system;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.system.domain.SysRepo;
+import com.ruoyi.system.service.impl.SysDictTypeServiceImpl;
+import com.ruoyi.system.service.impl.SysRepoServiceImpl;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,6 +40,10 @@ public class SysCompanyTemplateController extends BaseController
 {
     @Autowired
     private ISysCompanyTemplateService sysCompanyTemplateService;
+    @Autowired
+    private SysDictTypeServiceImpl sysDictTypeServiceImpl;
+    @Autowired
+    private SysRepoServiceImpl sysRepoServiceImpl;
 
     /**
      * 查询企业模板列表
@@ -59,6 +70,42 @@ public class SysCompanyTemplateController extends BaseController
         util.exportExcel(response, list, "企业配置数据");
     }
 
+    /**
+     * 获取企业模板列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:template:getTemplate')")
+    @Log(title = "获取模板列表", businessType = BusinessType.EXPORT)
+    @GetMapping("/getTemplate")
+    public AjaxResult getTemplate(String type)
+    {
+        Map map = new HashMap<>();
+        SysRepo sysRepo = new SysRepo();
+        List<SysDictData> list = sysDictTypeServiceImpl.selectDictDataByType(type);
+        if(list == null){
+            return AjaxResult.warn("未找到该类型");
+        }else{
+            for(SysDictData sysDictData:list){
+                sysRepo.setGroupId(sysDictData.getDictValue());
+                map.put(sysDictData.getDictLabel(),sysRepoServiceImpl.selectSysRepoList(sysRepo));
+            }
+            return AjaxResult.success(map);
+        }
+    }
+
+//    /**
+//     * 获取企业模板列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:template:getTemplatefile')")
+//    @Log(title = "获取模板文件", businessType = BusinessType.EXPORT)
+//    @GetMapping("/getTemplateFiles")
+//    public AjaxResult getTemplate(SysCompanyTemplate sysCompanyTemplate)
+//    {
+//        if (sysCompanyTemplate.getTemplate() == null){
+//            return error("该公司未配置模板");
+//        }
+//        return success();
+//    }
+
     /**
      * 获取企业模板详细信息
      */

+ 4 - 4
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRepo.java

@@ -39,8 +39,8 @@ public class SysRepo extends BaseEntity
     @Excel(name = "文件名")
     private String fileName;
 
-    /** 等级(一级只能是目录类型) */
-    private Long groupId;
+    /** 文件组别 */
+    private String groupId;
 
     /** 描述 */
     @Excel(name = "版本")
@@ -103,12 +103,12 @@ public class SysRepo extends BaseEntity
         return fileName;
     }
 
-    public void setGroupId(Long groupId)
+    public void setGroupId(String groupId)
     {
         this.groupId = groupId;
     }
 
-    public Long getGroupId()
+    public String getGroupId()
     {
         return groupId;
     }

+ 5 - 4
sql/sys_repo.sql

@@ -11,7 +11,7 @@
  Target Server Version : 50741
  File Encoding         : 65001
 
- Date: 20/05/2025 10:08:28
+ Date: 21/05/2025 15:50:49
 */
 
 SET NAMES utf8mb4;
@@ -23,7 +23,7 @@ SET FOREIGN_KEY_CHECKS = 0;
 DROP TABLE IF EXISTS `sys_repo`;
 CREATE TABLE `sys_repo`  (
   `repo_Id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `repo_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称',
+  `repo_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '名称',
   `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
   `update_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '更新人',
   `repo_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '文件类型(docx、xls等)',
@@ -31,11 +31,12 @@ CREATE TABLE `sys_repo`  (
   `create_Time` datetime(0) DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   `update_Time` datetime(0) DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更改时间',
   `file_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '文件名',
-  `group_id` bigint(20) DEFAULT NULL COMMENT '文件组别',
+  `group_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '文件组别',
   `version` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '文件版本',
   `is_delete` tinyint(4) DEFAULT 0 COMMENT '是否删除',
   `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '文件地址',
+  `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '备注',
   PRIMARY KEY (`repo_Id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '仓库文件表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '仓库文件表' ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;