From 3993fe0353d3747ba29ce716484ae42e6c4c9828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 1 Nov 2024 08:30:22 +0800
Subject: [PATCH] 'commit'

---
 .../resource/Res/Controller/ResourceController.java       | 8 ++++----
 .../com/dsideal/resource/Res/Model/ResourceModel.java     | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dsRes/src/main/java/com/dsideal/resource/Res/Controller/ResourceController.java b/dsRes/src/main/java/com/dsideal/resource/Res/Controller/ResourceController.java
index e4b66fa8..01094715 100644
--- a/dsRes/src/main/java/com/dsideal/resource/Res/Controller/ResourceController.java
+++ b/dsRes/src/main/java/com/dsideal/resource/Res/Controller/ResourceController.java
@@ -85,7 +85,7 @@ public class ResourceController extends Controller {
      * @param resource_title    资源名称
      * @param resource_size_int 资源大小
      * @param extension         扩展名
-     * @param file_id           对应文件的id号，是一个guid
+     * @param file_name         文件名，不带prefix
      * @param file_md5          文件的md5值
      * @param scheme_id         结构id
      * @param structure_id      结构id
@@ -94,9 +94,9 @@ public class ResourceController extends Controller {
      */
     @Before({POST.class})
     @JwtCheckInterface({})
-    @EmptyInterface({"resource_title", "file_id", "file_md5"})
+    @EmptyInterface({"resource_title", "file_name", "file_md5"})
     @IsNumericInterface({"resource_size_int", "scheme_id", "structure_id", "stage_id", "subject_id"})
-    public void addResourceBase(String resource_title, long resource_size_int, String extension, String file_id, String file_md5,
+    public void addResourceBase(String resource_title, long resource_size_int, String extension, String file_name, String file_md5,
                                 int stage_id, int scheme_id, int structure_id, int subject_id) {
         //根据扩展名，获取缩略图名称
         String thumb_name = rm.getThumbByExt(extension);
@@ -106,7 +106,7 @@ public class ResourceController extends Controller {
         String person_name = bm.getPersonById(person_id).getStr("person_name");
         int down_count = 0;//下载次数
         rm.addResourceBase(resource_title, resource_size, resource_size_int, person_name, person_id, extension,
-                file_id, file_md5, thumb_name, scheme_id, structure_id, down_count, stage_id, subject_id);
+                file_name, file_md5, thumb_name, scheme_id, structure_id, down_count, stage_id, subject_id);
         renderJson(RetKit.renderSuccess("操作成功"));
     }
 
diff --git a/dsRes/src/main/java/com/dsideal/resource/Res/Model/ResourceModel.java b/dsRes/src/main/java/com/dsideal/resource/Res/Model/ResourceModel.java
index 4d9bf714..6525eb8f 100644
--- a/dsRes/src/main/java/com/dsideal/resource/Res/Model/ResourceModel.java
+++ b/dsRes/src/main/java/com/dsideal/resource/Res/Model/ResourceModel.java
@@ -22,7 +22,7 @@ public class ResourceModel {
      * @param person_name       上传人姓名
      * @param person_id         上传人员id
      * @param extension         扩展名
-     * @param file_id           对应文件的id号，是一个guid
+     * @param file_name         文件名称
      * @param file_md5          文件的md5值
      * @param thumb_name        缩略图
      * @param scheme_id         结构id
@@ -32,7 +32,7 @@ public class ResourceModel {
      * @param subject_id        科目id
      */
     public void addResourceBase(String resource_title, String resource_size, long resource_size_int,
-                                String person_name, String person_id, String extension, String file_id, String file_md5, String thumb_name, int scheme_id, int structure_id, int down_count, int stage_id, int subject_id) {
+                                String person_name, String person_id, String extension, String file_name, String file_md5, String thumb_name, int scheme_id, int structure_id, int down_count, int stage_id, int subject_id) {
         Record record = new Record();
         record.set("resource_title", resource_title);
         record.set("resource_size", resource_size);
@@ -40,7 +40,7 @@ public class ResourceModel {
         record.set("person_name", person_name);
         record.set("person_id", person_id);
         record.set("extension", extension);
-        record.set("file_id", file_id);
+        record.set("file_name", file_name);
         record.set("file_md5", file_md5);
         record.set("thumb_name", thumb_name);
         record.set("scheme_id", scheme_id);