From 28b763fb2d64fdf174ae7ee1b19b1a53caf4d803 Mon Sep 17 00:00:00 2001
From: ybb <2532447764@qq.com>
Date: Tue, 12 Aug 2025 11:34:45 +0800
Subject: [PATCH] =?UTF-8?q?8=E6=9C=8812=EF=BC=8C=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E4=BA=86=E8=83=BD=E5=A4=9F=E6=8C=89=E5=90=8D=E7=A7=B0=E7=9A=84?=
 =?UTF-8?q?=E6=8B=BC=E9=9F=B3=E6=8E=92=E5=BA=8F=EF=BC=8C=E5=92=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F=E7=AD=89=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../znpt/mapper/BusinessDataFileMapper.java   | 16 +++++--
 .../znpt/service/BusinessDataFileService.java |  4 +-
 .../impl/BusinessDataFileServiceImpl.java     | 41 +++++++++++-----
 .../mapper/BusinessDataFileMapper.xml         | 48 +++++++++++++++++++
 .../BusinessDataFileController.java           | 29 +++++++----
 5 files changed, 113 insertions(+), 25 deletions(-)

diff --git a/core/src/main/java/com/dite/znpt/mapper/BusinessDataFileMapper.java b/core/src/main/java/com/dite/znpt/mapper/BusinessDataFileMapper.java
index 02d682b..0fa1dd8 100644
--- a/core/src/main/java/com/dite/znpt/mapper/BusinessDataFileMapper.java
+++ b/core/src/main/java/com/dite/znpt/mapper/BusinessDataFileMapper.java
@@ -17,13 +17,23 @@ public interface BusinessDataFileMapper {
     // 新增文件预览方法
 
 
-    public List<BusinessDataFileEntity> List(@Param("folderId") Long folderId, @Param("fileName") String fileName);
-    void delete(@Param("fileId") Long fileId,@Param("folderId") Long folderId);
+//    public List<BusinessDataFileEntity> List(@Param("folderId") Long folderId, @Param("fileName") String fileName);
+
+    public List<BusinessDataFileEntity> List(
+            @Param("folderId") Long folderId,
+            @Param("fileName") String fileName,
+            @Param("sortField") String sortField,
+            @Param("sortOrder") String sortOrder);
+    void delete(@Param("fileId") Long fileId,
+                @Param("folderId") Long folderId);
 
     void add(BusinessDataFileEntity businessDataFileEntity);
 
     String getPath(Long fileId);
 
     // 在接口中添加重命名方法
-    void reName(@Param("fileId") Long fileId, @Param("newFileName") String newFileName, @Param("newFilePath") String newFilePath);
+    void reName(@Param("fileId") Long fileId,
+                @Param("newFileName") String newFileName,
+                @Param("newFilePath") String newFilePath);
+
 }
diff --git a/core/src/main/java/com/dite/znpt/service/BusinessDataFileService.java b/core/src/main/java/com/dite/znpt/service/BusinessDataFileService.java
index 9eafc83..b4af5dc 100644
--- a/core/src/main/java/com/dite/znpt/service/BusinessDataFileService.java
+++ b/core/src/main/java/com/dite/znpt/service/BusinessDataFileService.java
@@ -14,8 +14,10 @@ import javax.servlet.http.HttpServletResponse;
 @Service
 public interface BusinessDataFileService {
 
+//    @ApiOperation("分页查询文件")
+//    PageBean pageSelect(Integer page, Integer pageSize, Long folderId, String fileName);
     @ApiOperation("分页查询文件")
-    PageBean pageSelect(Integer page, Integer pageSize, Long folderId, String fileName);
+    PageBean pageSelect(Integer page, Integer pageSize, Long folderId, String fileName, String sortField, String sortOrder);
 
     @ApiOperation("删除文件")
     Result delete(@RequestParam(value = "fileId", required = false) Long fileId,@RequestParam(value = "foldelId", required = false) Long folderId);
diff --git a/core/src/main/java/com/dite/znpt/service/impl/BusinessDataFileServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/BusinessDataFileServiceImpl.java
index 660f034..6cfe2f6 100644
--- a/core/src/main/java/com/dite/znpt/service/impl/BusinessDataFileServiceImpl.java
+++ b/core/src/main/java/com/dite/znpt/service/impl/BusinessDataFileServiceImpl.java
@@ -52,15 +52,33 @@ public class BusinessDataFileServiceImpl implements BusinessDataFileService {
     private BusinessDataService businessDataService;
 
 
-    @ApiOperation("分页查询文件")
-    @Override
-    public PageBean pageSelect(Integer page, Integer pageSize, Long folderId, String fileName) {
-        PageHelper.startPage(page, pageSize);
-        List<BusinessDataFileEntity> list = businessDataFileMapper.List(folderId, fileName);
-        Page<BusinessDataFileEntity> p = (Page<BusinessDataFileEntity>) list;
-        PageBean pageBean = new PageBean(p.getTotal(), p.getResult());
-        return pageBean;
-    }
+//    @ApiOperation("分页查询文件")
+//    @Override
+//    public PageBean pageSelect(Integer page, Integer pageSize, Long folderId, String fileName) {
+//        PageHelper.startPage(page, pageSize);
+//        List<BusinessDataFileEntity> list = businessDataFileMapper.List(folderId, fileName);
+//        Page<BusinessDataFileEntity> p = (Page<BusinessDataFileEntity>) list;
+//        PageBean pageBean = new PageBean(p.getTotal(), p.getResult());
+//        return pageBean;
+//    }
+//        @ApiOperation("分页查询文件")
+//        @Override
+//        public PageBean pageSelect(Integer page, Integer pageSize, Long folderId, String fileName, String sortField, String sortOrder) {
+//            PageHelper.startPage(page, pageSize);
+//            List<BusinessDataFileEntity> list = businessDataFileMapper.List(folderId, fileName, sortField, sortOrder);
+//            Page<BusinessDataFileEntity> p = (Page<BusinessDataFileEntity>) list;
+//            PageBean pageBean = new PageBean(p.getTotal(), p.getResult());
+//            return pageBean;
+//        }
+        @ApiOperation("分页查询文件")
+        @Override
+        public PageBean pageSelect(Integer page, Integer pageSize, Long folderId, String fileName, String sortField, String sortOrder) {
+            PageHelper.startPage(page, pageSize);
+            List<BusinessDataFileEntity> list = businessDataFileMapper.List(folderId, fileName, sortField, sortOrder);
+            Page<BusinessDataFileEntity> p = (Page<BusinessDataFileEntity>) list;
+            PageBean pageBean = new PageBean(p.getTotal(), p.getResult());
+            return pageBean;
+        }
     @ApiOperation("删除文件")
     public Result delete(Long fileId, Long folderId)  {
         //删除数据库数据
@@ -228,7 +246,7 @@ public class BusinessDataFileServiceImpl implements BusinessDataFileService {
             byte[] bytes = file.getBytes();
             String uploadDir = businessDataService.getPath(folderId);
 
-            File uploadedFile = new File(uploadDir + "\\" + file.getOriginalFilename());
+            File uploadedFile = new File(uploadDir + "/" + file.getOriginalFilename());
             if (uploadedFile.exists()) {
                 return Result.error("文件已存在");
             }
@@ -238,12 +256,11 @@ public class BusinessDataFileServiceImpl implements BusinessDataFileService {
             BusinessDataFileEntity fileEntity = new BusinessDataFileEntity();
             fileEntity.setFolderId(folderId);
             fileEntity.setFileName(file.getOriginalFilename());
-            fileEntity.setFilePath(uploadDir + "\\" + file.getOriginalFilename());
+            fileEntity.setFilePath(uploadDir + "/" + file.getOriginalFilename());
             fileEntity.setFileType(file.getContentType());
             fileEntity.setFileSize(file.getSize()/1024);
             fileEntity.setUploadTime(new Date());
             fileEntity.setUploaderId(loginIdAsLong);
-            System.out.println(uploadDir + "\\" + file.getOriginalFilename());
             add(fileEntity);
 
             return Result.okM("上传成功");
diff --git a/core/src/main/resources/mapper/BusinessDataFileMapper.xml b/core/src/main/resources/mapper/BusinessDataFileMapper.xml
index 3a129f4..c8216b4 100644
--- a/core/src/main/resources/mapper/BusinessDataFileMapper.xml
+++ b/core/src/main/resources/mapper/BusinessDataFileMapper.xml
@@ -1,6 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dite.znpt.mapper.BusinessDataFileMapper">
+<!--    <select id="List" resultType="com.dite.znpt.domain.entity.BusinessDataFileEntity">-->
+<!--        select * from business_data_part_file-->
+<!--        <where>-->
+<!--            <if test="folderId != null">-->
+<!--                and folder_id = #{folderId}-->
+<!--            </if>-->
+<!--            <if test="fileName != null and fileName != ''">-->
+<!--                and file_name like concat('%', #{fileName}, '%')-->
+<!--            </if>-->
+<!--        </where>-->
+<!--    </select>-->
+<!--    <select id="List" resultType="com.dite.znpt.domain.entity.BusinessDataFileEntity">-->
+<!--        select * from business_data_part_file-->
+<!--        <where>-->
+<!--            <if test="folderId != null">-->
+<!--                and folder_id = #{folderId}-->
+<!--            </if>-->
+<!--            <if test="fileName != null and fileName != ''">-->
+<!--                and file_name like concat('%', #{fileName}, '%')-->
+<!--            </if>-->
+<!--        </where>-->
+<!--        <choose>-->
+<!--            <when test="sortField != null and sortField != '' and sortOrder != null and sortOrder != ''">-->
+<!--                order by ${sortField} ${sortOrder}-->
+<!--            </when>-->
+<!--            <otherwise>-->
+<!--                order by upload_time desc-->
+<!--            </otherwise>-->
+<!--        </choose>-->
+<!--    </select>-->
     <select id="List" resultType="com.dite.znpt.domain.entity.BusinessDataFileEntity">
         select * from business_data_part_file
         <where>
@@ -11,6 +41,24 @@
                 and file_name like concat('%', #{fileName}, '%')
             </if>
         </where>
+        <choose>
+            <when test="sortField != null and sortField != '' and sortOrder != null and sortOrder != ''">
+                <choose>
+                    <when test="sortField == 'file_name'">
+                        order by convert(file_name using gbk) ${sortOrder}
+                    </when>
+                    <when test="sortField == 'file_type'">
+                        order by convert(file_type using gbk) ${sortOrder}
+                    </when>
+                    <otherwise>
+                        order by ${sortField} ${sortOrder}
+                    </otherwise>
+                </choose>
+            </when>
+            <otherwise>
+                order by upload_time desc
+            </otherwise>
+        </choose>
     </select>
     <delete id="delete"  parameterType="com.dite.znpt.domain.entity.BusinessDataFileEntity" >
         delete from business_data_part_file
diff --git a/web/src/main/java/com/dite/znpt/web/controller/BusinessDataFileController.java b/web/src/main/java/com/dite/znpt/web/controller/BusinessDataFileController.java
index f838342..a8b3451 100644
--- a/web/src/main/java/com/dite/znpt/web/controller/BusinessDataFileController.java
+++ b/web/src/main/java/com/dite/znpt/web/controller/BusinessDataFileController.java
@@ -43,15 +43,26 @@ public class BusinessDataFileController {
     @Resource
     private BusinessDataFileMapper businessDataFileMapper;
 
-    @ApiOperation(value = "分页查询文件", httpMethod = "GET")
-    @GetMapping("/list")
-    public Result pageSelect(@RequestParam(defaultValue = "1") Integer page,
-            @RequestParam(defaultValue = "10") Integer pageSize,
-            @RequestParam(defaultValue = "0") Long folderId,
-            @RequestParam(required = false) String fileName) {
-        PageBean pageBean = businessDataFileService.pageSelect(page, pageSize, folderId, fileName);
-        return Result.ok(pageBean);
-    }
+//    @ApiOperation(value = "分页查询文件", httpMethod = "GET")
+//    @GetMapping("/list")
+//    public Result pageSelect(@RequestParam(defaultValue = "1") Integer page,
+//            @RequestParam(defaultValue = "10") Integer pageSize,
+//            @RequestParam(defaultValue = "0") Long folderId,
+//            @RequestParam(required = false) String fileName) {
+//        PageBean pageBean = businessDataFileService.pageSelect(page, pageSize, folderId, fileName);
+//        return Result.ok(pageBean);
+//    }
+        @ApiOperation(value = "分页查询文件", httpMethod = "GET")
+        @GetMapping("/list")
+        public Result pageSelect(@RequestParam(defaultValue = "1") Integer page,
+                                 @RequestParam(defaultValue = "10") Integer pageSize,
+                                 @RequestParam(defaultValue = "0") Long folderId,
+                                 @RequestParam(required = false) String fileName,
+                                 @RequestParam(required = false) String sortField,
+                                 @RequestParam(required = false) String sortOrder) {
+            PageBean pageBean = businessDataFileService.pageSelect(page, pageSize, folderId, fileName, sortField, sortOrder);
+            return Result.ok(pageBean);
+        }
 
     @ApiOperation(value = "增加文件")
     @PostMapping("/add")