ak/file
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

预览优化

Browse Source
This commit is contained in:
马超 2021-06-18 13:24:52 +08:00
parent a40ea5109c
commit 1addde3ac7
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -11,7 +11,7 @@
<groupId>com.qiwenshare</groupId> <groupId>com.qiwenshare</groupId>
<artifactId>qiwen-file</artifactId> <artifactId>qiwen-file</artifactId>
<version>1.0.2-SNAPSHOT</version> <version>1.0.3-SNAPSHOT</version>
<name>qiwen-file</name> <name>qiwen-file</name>
<description>fileos.qiwenshare.com</description> <description>fileos.qiwenshare.com</description>
<packaging>jar</packaging> <packaging>jar</packaging>

9
src/main/java/com/qiwenshare/file/controller/FiletransferController.java
View File

@ -160,8 +160,10 @@ public class FiletransferController {
@GetMapping("/preview") @GetMapping("/preview")
public void preview(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, PreviewDTO previewDTO){ public void preview(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, PreviewDTO previewDTO){
UserFile userFile = userFileService.getById(previewDTO.getUserFileId()); UserFile userFile = userFileService.getById(previewDTO.getUserFileId());
String token = previewDTO.getToken();
if ("1".equals(previewDTO.getMode())) { if ("undefined".equals(previewDTO.getShareBatchNum()) || StringUtils.isEmpty(previewDTO.getShareBatchNum())) {
String token = previewDTO.getToken();
UserBean sessionUserBean = userService.getUserBeanByToken(token); UserBean sessionUserBean = userService.getUserBeanByToken(token);
if (sessionUserBean == null) { if (sessionUserBean == null) {
return; return;
@ -169,7 +171,8 @@ public class FiletransferController {
if (userFile.getUserId() != sessionUserBean.getUserId()) { if (userFile.getUserId() != sessionUserBean.getUserId()) {
return; return;
} }
} else if ("2".equals(previewDTO.getMode())) { } else {
Map<String, Object> param = new HashMap<>(); Map<String, Object> param = new HashMap<>();
param.put("shareBatchNum", previewDTO.getShareBatchNum()); param.put("shareBatchNum", previewDTO.getShareBatchNum());
List<Share> shareList = shareService.listByMap(param); List<Share> shareList = shareService.listByMap(param);

2
src/main/java/com/qiwenshare/file/dto/file/PreviewDTO.java
View File

@ -8,8 +8,6 @@ import lombok.Data;
public class PreviewDTO { public class PreviewDTO {
private Long userFileId; private Long userFileId;
private String token; private String token;
@Schema(description="预览模式，1-登录，2-分享")
private String mode;
@Schema(description="批次号") @Schema(description="批次号")
private String shareBatchNum; private String shareBatchNum;
@Schema(description="提取码") @Schema(description="提取码")

4
src/main/java/com/qiwenshare/file/vo/share/ShareFileListVO.java
View File

@ -41,8 +41,8 @@ public class ShareFileListVO {
// //
// private String shareTime; // private String shareTime;
// private String endTime; // private String endTime;
// private String extractionCode; private String extractionCode;
// private String shareBatchNum; private String shareBatchNum;
// private Integer shareType;//0公共，1私密，2好友 // private Integer shareType;//0公共，1私密，2好友
// private Integer shareStatus;//0正常，1已失效，2已撤销 // private Integer shareStatus;//0正常，1已失效，2已撤销
} }

1
src/main/resources/mybatis/mapper/ShareFileMapper.xml
View File

@ -17,6 +17,7 @@
<select id="selectShareFileList" resultType="com.qiwenshare.file.vo.share.ShareFileListVO"> <select id="selectShareFileList" resultType="com.qiwenshare.file.vo.share.ShareFileListVO">
select * from sharefile a select * from sharefile a
LEFT JOIN share ON share.shareBatchNum = a.shareBatchNum
left join userfile b on b.userFileId = a.userFileId left join userfile b on b.userFileId = a.userFileId
left join file c on c.fileId = b.fileId left join file c on c.fileId = b.fileId
where a.shareBatchNum = #{shareBatchNum} where a.shareBatchNum = #{shareBatchNum}