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 public List selectFileListByBussinessIds(@Param("longs") List longs); public int updateIds(@Param("longs") List 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 + + - 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 + SELECT COALESCE(MAX(sort_num), 0) + 1 AS sort_num FROM file_job_upload WHERE del_flag='0' + + \ 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; }