From 84926f496db56828a158fa530bb9735a8f92d063 Mon Sep 17 00:00:00 2001
From: sh <sh@zkr.com>
Date: Fri, 26 Jun 2026 19:13:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/cms/mapper/FileJobUploadMapper.java |  3 +
 .../cms/service/IFileJobUploadService.java    | 10 ---
 .../impl/FileJobUploadServiceImpl.java        | 71 ++-----------------
 .../mapper/app/FileJobUploadMapper.xml        |  8 ++-
 .../core/domain/entity/FileJobUpload.java     |  5 ++
 5 files changed, 22 insertions(+), 75 deletions(-)

diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/FileJobUploadMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/FileJobUploadMapper.java
index c384f8c..a4705c6 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/FileJobUploadMapper.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/FileJobUploadMapper.java
@@ -2,6 +2,7 @@ package com.ruoyi.cms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.common.core.domain.entity.FileJobUpload;
+import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -26,4 +27,6 @@ public interface FileJobUploadMapper extends BaseMapper<FileJobUpload>
     public List<FileJobUpload> selectFileListByBussinessIds(@Param("longs") List<Long> longs);
 
     public int updateIds(@Param("longs") List<Long> longs,@Param("newBussinessid") Long bussinessid);
+
+    Integer selectMaxSortNum();
 }
diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IFileJobUploadService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IFileJobUploadService.java
index 1cff8f0..e3260c8 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IFileJobUploadService.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IFileJobUploadService.java
@@ -39,14 +39,6 @@ public interface IFileJobUploadService
      */
     public int insertFile(FileJobUpload file);
 
-    /**
-     * 修改文件
-     * 
-     * @param file 文件
-     * @return 结果
-     */
-    public int updateFile(FileJobUpload file);
-
     /**
      * 批量删除文件
      * 
@@ -56,6 +48,4 @@ public interface IFileJobUploadService
     public int deleteFileByIds(Long[] ids);
 
     AjaxResult upload(MultipartFile file,HttpServletRequest request);
-
-    AjaxResult uploadFile(MultipartFile file, HttpServletRequest request);
 }
diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FileJobUploadServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FileJobUploadServiceImpl.java
index f9842c0..3cf64d0 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FileJobUploadServiceImpl.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FileJobUploadServiceImpl.java
@@ -69,18 +69,6 @@ public class FileJobUploadServiceImpl extends ServiceImpl<FileJobUploadMapper, F
         return fileJobUploadMapper.insert(file);
     }
 
-    /**
-     * 修改文件
-     *
-     * @param file 文件
-     * @return 结果
-     */
-    @Override
-    public int updateFile(FileJobUpload file)
-    {
-        return fileJobUploadMapper.updateById(file);
-    }
-
     /**
      * 批量删除文件
      *
@@ -124,8 +112,13 @@ public class FileJobUploadServiceImpl extends ServiceImpl<FileJobUploadMapper, F
             destFile.setWritable(false); // 禁止写入
             destFile.setExecutable(false);
 
+            FileJobUpload fileJobUpload=new FileJobUpload();
+            fileJobUpload.setFileName(fileName);
+            fileJobUpload.setFileUrl(StringUtil.getVedioFilePath(request)+fileName);
+            Integer sortNum=fileJobUploadMapper.selectMaxSortNum();
+            fileJobUpload.setSortNum(sortNum);
             // 保存文件信息到数据库
-            saveFileInfo(StringUtil.getVedioFilePath(request)+fileName);
+            saveFileInfo(fileJobUpload);
 
             return AjaxResult.success(StringUtil.PATH_PROXY_50+fileName);
         } catch (IOException e) {
@@ -134,58 +127,8 @@ public class FileJobUploadServiceImpl extends ServiceImpl<FileJobUploadMapper, F
         }
     }
 
-    /**
-     * 添加返回bussinessid的接口，新增时使用
-     * @param file
-     * @return
-     */
-    @Override
-    public AjaxResult uploadFile(MultipartFile file, HttpServletRequest request) {
-        if (file.isEmpty()) {
-            return AjaxResult.error("文件为空，请选择文件上传");
-        }
-
-        try {
-            // 创建上传目录
-            java.io.File dir = new java.io.File(uploadDir).getCanonicalFile();
-            if (!dir.exists()) {
-                dir.mkdirs();
-            }
-
-            // 生成唯一的文件名
-            String fileName = UUID.randomUUID().toString() + "_" + file.getOriginalFilename();
-
-            Path basePath = Paths.get(getCanonicalPath(uploadDir)).normalize();
-            Path filePath = basePath.resolve(fileName).normalize();
-
-            if (!filePath.startsWith(basePath)) {
-                throw new SecurityException("非法路径，禁止访问");
-            }
-
-            // 保存文件到服务器
-            Files.copy(file.getInputStream(), filePath);
-
-            java.io.File destFile = filePath.toFile();
-            destFile.setReadable(true, false); // 所有用户可读
-            destFile.setWritable(false); // 禁止写入
-            destFile.setExecutable(false);
-
-            // 保存文件信息到数据库
-            FileJobUpload svFile=saveFileInfo(fileName);
-            AjaxResult ajaxResult=AjaxResult.success();
-            ajaxResult.put("filePath", StringUtil.getFilePath(request)+fileName);
-            ajaxResult.put("id",String.valueOf(svFile.getId()));
-            return ajaxResult;
-        } catch (IOException e) {
-            e.printStackTrace();
-            return AjaxResult.error("文件上传失败");
-        }
-    }
-
-    private FileJobUpload saveFileInfo(String fileName) {
+    private FileJobUpload saveFileInfo(FileJobUpload file) {
         // 这里假设你已经有了一个FileService来处理数据库操作
-        FileJobUpload file = new FileJobUpload();
-        file.setFileUrl(fileName);
         this.save(file);
         return file;
     }
diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/FileJobUploadMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/FileJobUploadMapper.xml
index a432f26..95431c1 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/FileJobUploadMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/FileJobUploadMapper.xml
@@ -13,10 +13,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="fileName"    column="file_name"    />
+        <result property="sortNum"    column="sort_num"    />
     </resultMap>
 
     <sql id="selectFileVo">
-        select id, file_url, bussinessid, del_flag, create_by, create_time, update_by, update_time from file_job_upload
+        select id, file_url, bussinessid, del_flag, create_by, create_time, update_by, update_time,file_name,sort_num from file_job_upload
     </sql>
 
     <select id="selectFileList" parameterType="FileJobUpload" resultMap="FileResult">
@@ -85,4 +87,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </update>
 
+    <select id="selectMaxSortNum" resultType="java.lang.Integer">
+        SELECT COALESCE(MAX(sort_num), 0) + 1 AS sort_num FROM file_job_upload WHERE del_flag='0'
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/FileJobUpload.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/FileJobUpload.java
index 572aea9..b7421b4 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/FileJobUpload.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/FileJobUpload.java
@@ -35,4 +35,9 @@ public class FileJobUpload extends BaseEntity
     @ApiModelProperty("业务id")
     private Long bussinessid;
 
+    @ApiModelProperty("文件名称")
+    private String fileName;
+
+    @ApiModelProperty("文件顺序")
+    private Integer sortNum;
 }