From 51527a6e817a6ba73b29b07e94a7e879a86f8eaf Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 06 三月 2024 16:29:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java
index b9771d8..7afe3fc 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java
@@ -4,10 +4,7 @@
import com.ruoyi.system.api.domain.dto.MgtBaseBathDto;
import com.ruoyi.system.api.domain.dto.MgtClassNumDto;
import com.ruoyi.system.api.domain.dto.MgtUserIdByDept;
-import com.ruoyi.system.api.domain.poji.config.Activeness;
-import com.ruoyi.system.api.domain.poji.config.DelayTask;
-import com.ruoyi.system.api.domain.poji.config.SysClassification;
-import com.ruoyi.system.api.domain.poji.config.SysTag;
+import com.ruoyi.system.api.domain.poji.config.*;
import com.ruoyi.system.api.domain.poji.sys.SysStaff;
import com.ruoyi.system.api.domain.vo.AppOtherConfigGetVo;
import com.ruoyi.system.api.domain.vo.MgtSysSimpleUserVo;
@@ -55,6 +52,9 @@
@Resource
private SysStaffService sysStaffService;
+
+ @Resource
+ private FileRecordService fileRecordService;
/**
@@ -237,4 +237,18 @@
List<SysStaff> sysStaffList = sysStaffService.listSysStaffByIds(userIdList);
return R.ok(sysStaffList);
}
+
+ /**
+ * @description 创建文件上传记录
+ * @author jqs
+ * @date 2023/9/11 11:56
+ * @param fileRecord
+ * @return R
+ */
+ @PostMapping("/createFileRecord")
+ public R createFileRecord(@RequestBody FileRecord fileRecord)
+ {
+ fileRecordService.createFileRecord(fileRecord);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1