cuizhibin
/
znpt-backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

development #3

Merged
cuizhibin merged 41 commits from development into master 2025-08-14 20:04:45 +08:00
Conversation 0 Commits 41 Files Changed 64 +113 -25
5 changed files with 113 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 28b763fb2d - Show all commits

16
core/src/main/java/com/dite/znpt/mapper/BusinessDataFileMapper.java
View File

@ -17,13 +17,23 @@ public interface BusinessDataFileMapper {
// 新增文件预览方法 // 新增文件预览方法
public List<BusinessDataFileEntity> List(@Param("folderId") Long folderId, @Param("fileName") String fileName); // 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,
@Param("sortField") String sortField,
@Param("sortOrder") String sortOrder);
void delete(@Param("fileId") Long fileId,
@Param("folderId") Long folderId);
void add(BusinessDataFileEntity businessDataFileEntity); void add(BusinessDataFileEntity businessDataFileEntity);
String getPath(Long fileId); 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);
} }

4
core/src/main/java/com/dite/znpt/service/BusinessDataFileService.java
View File

@ -14,8 +14,10 @@ import javax.servlet.http.HttpServletResponse;
@Service @Service
public interface BusinessDataFileService { public interface BusinessDataFileService {
// @ApiOperation("分页查询文件")
// PageBean pageSelect(Integer page, Integer pageSize, Long folderId, String fileName);
@ApiOperation("分页查询文件") @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("删除文件") @ApiOperation("删除文件")
Result delete(@RequestParam(value = "fileId", required = false) Long fileId,@RequestParam(value = "foldelId", required = false) Long folderId); Result delete(@RequestParam(value = "fileId", required = false) Long fileId,@RequestParam(value = "foldelId", required = false) Long folderId);

27
core/src/main/java/com/dite/znpt/service/impl/BusinessDataFileServiceImpl.java
View File

@ -52,11 +52,29 @@ public class BusinessDataFileServiceImpl implements BusinessDataFileService {
private BusinessDataService businessDataService; 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, 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("分页查询文件") @ApiOperation("分页查询文件")
@Override @Override
public PageBean pageSelect(Integer page, Integer pageSize, Long folderId, String fileName) { public PageBean pageSelect(Integer page, Integer pageSize, Long folderId, String fileName, String sortField, String sortOrder) {
PageHelper.startPage(page, pageSize); PageHelper.startPage(page, pageSize);
List<BusinessDataFileEntity> list = businessDataFileMapper.List(folderId, fileName); List<BusinessDataFileEntity> list = businessDataFileMapper.List(folderId, fileName, sortField, sortOrder);
Page<BusinessDataFileEntity> p = (Page<BusinessDataFileEntity>) list; Page<BusinessDataFileEntity> p = (Page<BusinessDataFileEntity>) list;
PageBean pageBean = new PageBean(p.getTotal(), p.getResult()); PageBean pageBean = new PageBean(p.getTotal(), p.getResult());
return pageBean; return pageBean;
@ -228,7 +246,7 @@ public class BusinessDataFileServiceImpl implements BusinessDataFileService {
byte[] bytes = file.getBytes(); byte[] bytes = file.getBytes();
String uploadDir = businessDataService.getPath(folderId); String uploadDir = businessDataService.getPath(folderId);
File uploadedFile = new File(uploadDir + "\\" + file.getOriginalFilename()); File uploadedFile = new File(uploadDir + "/" + file.getOriginalFilename());
if (uploadedFile.exists()) { if (uploadedFile.exists()) {
return Result.error("文件已存在"); return Result.error("文件已存在");
} }
@ -238,12 +256,11 @@ public class BusinessDataFileServiceImpl implements BusinessDataFileService {
BusinessDataFileEntity fileEntity = new BusinessDataFileEntity(); BusinessDataFileEntity fileEntity = new BusinessDataFileEntity();
fileEntity.setFolderId(folderId); fileEntity.setFolderId(folderId);
fileEntity.setFileName(file.getOriginalFilename()); fileEntity.setFileName(file.getOriginalFilename());
fileEntity.setFilePath(uploadDir + "\\" + file.getOriginalFilename()); fileEntity.setFilePath(uploadDir + "/" + file.getOriginalFilename());
fileEntity.setFileType(file.getContentType()); fileEntity.setFileType(file.getContentType());
fileEntity.setFileSize(file.getSize()/1024); fileEntity.setFileSize(file.getSize()/1024);
fileEntity.setUploadTime(new Date()); fileEntity.setUploadTime(new Date());
fileEntity.setUploaderId(loginIdAsLong); fileEntity.setUploaderId(loginIdAsLong);
System.out.println(uploadDir + "\\" + file.getOriginalFilename());
add(fileEntity); add(fileEntity);
return Result.okM("上传成功"); return Result.okM("上传成功");

48
core/src/main/resources/mapper/BusinessDataFileMapper.xml
View File

@ -1,6 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!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"> <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 id="List" resultType="com.dite.znpt.domain.entity.BusinessDataFileEntity">
select * from business_data_part_file select * from business_data_part_file
<where> <where>
@ -11,6 +41,24 @@
and file_name like concat('%', #{fileName}, '%') and file_name like concat('%', #{fileName}, '%')
</if> </if>
</where> </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> </select>
<delete id="delete" parameterType="com.dite.znpt.domain.entity.BusinessDataFileEntity" > <delete id="delete" parameterType="com.dite.znpt.domain.entity.BusinessDataFileEntity" >
delete from business_data_part_file delete from business_data_part_file

15
web/src/main/java/com/dite/znpt/web/controller/BusinessDataFileController.java
View File

@ -43,13 +43,24 @@ public class BusinessDataFileController {
@Resource @Resource
private BusinessDataFileMapper businessDataFileMapper; 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") @ApiOperation(value = "分页查询文件", httpMethod = "GET")
@GetMapping("/list") @GetMapping("/list")
public Result pageSelect(@RequestParam(defaultValue = "1") Integer page, public Result pageSelect(@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer pageSize, @RequestParam(defaultValue = "10") Integer pageSize,
@RequestParam(defaultValue = "0") Long folderId, @RequestParam(defaultValue = "0") Long folderId,
@RequestParam(required = false) String fileName) { @RequestParam(required = false) String fileName,
PageBean pageBean = businessDataFileService.pageSelect(page, pageSize, folderId, 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); return Result.ok(pageBean);
} }