LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 22年七月工作

Browse Source
This commit is contained in:
lijiarao
2022-07-11 13:53:25 +08:00
parent 9b76c84986 32f33837d0
commit 6e247f9907
26 changed files with 609 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+26 -26
View File
@@ -560,13 +560,13 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
}
ossFileService.updateById(ossFile);
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (loginUser.getIsCompanyUser()) {
Integer integer = ossFileService.searchDownloadTimes(ossFile.getId(), loginUser.getId());
if (integer >= 5) {
throw new JeroBootException("超出下载次数限制");
}
}
//LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//if (loginUser.getIsCompanyUser()) {
// Integer integer = ossFileService.searchDownloadTimes(ossFile.getId(), loginUser.getId());
// if (integer >= 5) {
// throw new JeroBootException("超出下载次数限制");
// }
//}
response.addHeader("Content-Disposition", "attachment;fileName=" + new String(fileName.getBytes("UTF-8"),"iso-8859-1"));
response.setContentType("application/force-download");// 设置强制下载不打开
if (type == null) {
@@ -585,25 +585,25 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
}
response.flushBuffer();
//统计下载和预览次数
if ("download".equals(type)) {
Integer downloadNumber = ossFile.getDownloadNumber();
if (downloadNumber == null) {
ossFile.setDownloadNumber(1);
} else {
ossFile.setDownloadNumber(downloadNumber + 1);
}
ossFileService.updateAndPush(ossFile);
//增加下载次数
ossFileService.saveDownloadTimes(ossFile.getId(), loginUser.getId());
} else {
Integer viewNumber = ossFile.getViewNumber();
if (viewNumber == null) {
ossFile.setViewNumber(1);
} else {
ossFile.setViewNumber(viewNumber + 1);
}
ossFileService.updateAndPush(ossFile);
}
//if ("download".equals(type)) {
// Integer downloadNumber = ossFile.getDownloadNumber();
// if (downloadNumber == null) {
// ossFile.setDownloadNumber(1);
// } else {
// ossFile.setDownloadNumber(downloadNumber + 1);
// }
// ossFileService.updateAndPush(ossFile);
// //增加下载次数
// ossFileService.saveDownloadTimes(ossFile.getId(), loginUser.getId());
//} else {
// Integer viewNumber = ossFile.getViewNumber();
// if (viewNumber == null) {
// ossFile.setViewNumber(1);
// } else {
// ossFile.setViewNumber(viewNumber + 1);
// }
// ossFileService.updateAndPush(ossFile);
//}
} catch (IOException e) {
log.error("预览文件失败" + e.getMessage());
response.setStatus(404);