diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java index 1d6ff50a..354e2e8c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java @@ -450,40 +450,4 @@ public class CommitteeMeetingController extends JeroController createBase64(String contact) { - return Result.OK(QrcodeUtil.create(contact)); - } - - /** - * 新增标协会议 - */ - @ApiOperation(value = "新增标协会议") - @PostMapping(value = "/addStandards") - public Result addStandards(@RequestBody PayMeeting payMeeting, HttpServletRequest request) { - String publicKey = request.getParameter("publicKey"); - String token = request.getParameter("token"); - authenticationUtils.check(token, publicKey); - - payMeetingService.addStandards(payMeeting); - return Result.OK("合并开票成功!"); - } - - /** - * 新增会议文件 - */ - @ApiOperation(value = "新增会议文件", notes = "新增会议文件") - @PostMapping(value = "/addStandardsFile") - public Result addStandardsFile(@RequestBody List ossFileList, HttpServletRequest request) { - String publicKey = request.getParameter("publicKey"); - String token = request.getParameter("token"); - authenticationUtils.check(token, publicKey); - for (OSSFile ossFile : ossFileList) { - iossFileService.saveOrUpdate(ossFile); - } - return Result.OK("新增会议文件成功!"); - } - } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java index 21bf96e3..f60b2186 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java @@ -47,7 +47,7 @@ import java.util.stream.Collectors; * @date: 2021-09-02 * @version: V1.0 */ -@Api(tags = "参会人员信息") +@Api(tags = "参会人员信息-分标委会议") @RestController @RequestMapping("/meeting/committeeMeetingSituation") @Slf4j diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java index 5bff6d44..be80c272 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java @@ -438,52 +438,4 @@ public class InternalMeetingController extends JeroController publishReminder(@RequestBody PublishReminderVO publishReminderVO) { - payMeetingService.publishReminder(publishReminderVO); - return Result.OK(); - } - - @ApiOperation(value = "生成base64") - @GetMapping(value = "/createBase64") - @ApiImplicitParam(name = "contact", value = "内容", required = true, paramType = "query") - public Result createBase64(String contact) { - return Result.OK(QrcodeUtil.create(contact)); - } - - /** - * 新增标协会议 - */ - @ApiOperation(value = "新增标协会议") - @PostMapping(value = "/addStandards") - public Result addStandards(@RequestBody PayMeeting payMeeting, HttpServletRequest request) { - String publicKey = request.getParameter("publicKey"); - String token = request.getParameter("token"); - authenticationUtils.check(token, publicKey); - - payMeetingService.addStandards(payMeeting); - return Result.OK("合并开票成功!"); - } - - /** - * 新增会议文件 - */ - @ApiOperation(value = "新增会议文件", notes = "新增会议文件") - @PostMapping(value = "/addStandardsFile") - public Result addStandardsFile(@RequestBody List ossFileList, HttpServletRequest request) { - String publicKey = request.getParameter("publicKey"); - String token = request.getParameter("token"); - authenticationUtils.check(token, publicKey); - for (OSSFile ossFile : ossFileList) { - iossFileService.saveOrUpdate(ossFile); - } - return Result.OK("新增会议文件成功!"); - } - } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java index 4b801f8c..a4cad15e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java @@ -47,7 +47,7 @@ import java.util.stream.Collectors; * @date: 2021-09-02 * @version: V1.0 */ -@Api(tags = "参会人员信息") +@Api(tags = "参会人员信息-国际研讨会") @RestController @RequestMapping("/meeting/internalMeetingSituation") @Slf4j diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java index d539ca79..fdcc9b4e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java @@ -438,52 +438,4 @@ public class OtherMeetingController extends JeroController publishReminder(@RequestBody PublishReminderVO publishReminderVO) { - payMeetingService.publishReminder(publishReminderVO); - return Result.OK(); - } - - @ApiOperation(value = "生成base64") - @GetMapping(value = "/createBase64") - @ApiImplicitParam(name = "contact", value = "内容", required = true, paramType = "query") - public Result createBase64(String contact) { - return Result.OK(QrcodeUtil.create(contact)); - } - - /** - * 新增标协会议 - */ - @ApiOperation(value = "新增标协会议") - @PostMapping(value = "/addStandards") - public Result addStandards(@RequestBody PayMeeting payMeeting, HttpServletRequest request) { - String publicKey = request.getParameter("publicKey"); - String token = request.getParameter("token"); - authenticationUtils.check(token, publicKey); - - payMeetingService.addStandards(payMeeting); - return Result.OK("合并开票成功!"); - } - - /** - * 新增会议文件 - */ - @ApiOperation(value = "新增会议文件", notes = "新增会议文件") - @PostMapping(value = "/addStandardsFile") - public Result addStandardsFile(@RequestBody List ossFileList, HttpServletRequest request) { - String publicKey = request.getParameter("publicKey"); - String token = request.getParameter("token"); - authenticationUtils.check(token, publicKey); - for (OSSFile ossFile : ossFileList) { - iossFileService.saveOrUpdate(ossFile); - } - return Result.OK("新增会议文件成功!"); - } - } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java index b7a655f5..66f749b8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java @@ -47,7 +47,7 @@ import java.util.stream.Collectors; * @date: 2021-09-02 * @version: V1.0 */ -@Api(tags = "参会人员信息") +@Api(tags = "参会人员信息-其他会议") @RestController @RequestMapping("/meeting/ohterMeetingSituation") @Slf4j diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index 0efce32b..6137869a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java @@ -459,7 +459,6 @@ public class PayMeetingController extends JeroController addStandards(@RequestBody PayMeeting payMeeting, HttpServletRequest request) { String publicKey = request.getParameter("publicKey"); @@ -473,7 +472,6 @@ public class PayMeetingController extends JeroController addStandardsFile(@RequestBody List ossFileList, HttpServletRequest request) { String publicKey = request.getParameter("publicKey"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java index d36b8bf9..026e9b91 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java @@ -438,52 +438,4 @@ public class StandardsMeetingController extends JeroController publishReminder(@RequestBody PublishReminderVO publishReminderVO) { - payMeetingService.publishReminder(publishReminderVO); - return Result.OK(); - } - - @ApiOperation(value = "生成base64") - @GetMapping(value = "/createBase64") - @ApiImplicitParam(name = "contact", value = "内容", required = true, paramType = "query") - public Result createBase64(String contact) { - return Result.OK(QrcodeUtil.create(contact)); - } - - /** - * 新增标协会议 - */ - @ApiOperation(value = "新增标协会议") - @PostMapping(value = "/addStandards") - public Result addStandards(@RequestBody PayMeeting payMeeting, HttpServletRequest request) { - String publicKey = request.getParameter("publicKey"); - String token = request.getParameter("token"); - authenticationUtils.check(token, publicKey); - - payMeetingService.addStandards(payMeeting); - return Result.OK("合并开票成功!"); - } - - /** - * 新增会议文件 - */ - @ApiOperation(value = "新增会议文件", notes = "新增会议文件") - @PostMapping(value = "/addStandardsFile") - public Result addStandardsFile(@RequestBody List ossFileList, HttpServletRequest request) { - String publicKey = request.getParameter("publicKey"); - String token = request.getParameter("token"); - authenticationUtils.check(token, publicKey); - for (OSSFile ossFile : ossFileList) { - iossFileService.saveOrUpdate(ossFile); - } - return Result.OK("新增会议文件成功!"); - } - } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java index 9e754038..df34b9ae 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java @@ -47,7 +47,7 @@ import java.util.stream.Collectors; * @date: 2021-09-02 * @version: V1.0 */ -@Api(tags = "参会人员信息") +@Api(tags = "参会人员信息-标协会议") @RestController @RequestMapping("/meeting/standardsMeetingSituation") @Slf4j diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java index 533219fe..4bf49d14 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java @@ -450,40 +450,4 @@ public class WorkGroupMeetingController extends JeroController createBase64(String contact) { - return Result.OK(QrcodeUtil.create(contact)); - } - - /** - * 新增标协会议 - */ - @ApiOperation(value = "新增标协会议") - @PostMapping(value = "/addStandards") - public Result addStandards(@RequestBody PayMeeting payMeeting, HttpServletRequest request) { - String publicKey = request.getParameter("publicKey"); - String token = request.getParameter("token"); - authenticationUtils.check(token, publicKey); - - payMeetingService.addStandards(payMeeting); - return Result.OK("合并开票成功!"); - } - - /** - * 新增会议文件 - */ - @ApiOperation(value = "新增会议文件", notes = "新增会议文件") - @PostMapping(value = "/addStandardsFile") - public Result addStandardsFile(@RequestBody List ossFileList, HttpServletRequest request) { - String publicKey = request.getParameter("publicKey"); - String token = request.getParameter("token"); - authenticationUtils.check(token, publicKey); - for (OSSFile ossFile : ossFileList) { - iossFileService.saveOrUpdate(ossFile); - } - return Result.OK("新增会议文件成功!"); - } - } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java index 77d3c17b..a58bc138 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java @@ -47,7 +47,7 @@ import java.util.stream.Collectors; * @date: 2021-09-02 * @version: V1.0 */ -@Api(tags = "参会人员信息") +@Api(tags = "参会人员信息-工作组会议") @RestController @RequestMapping("/meeting/workGroupMeetingSituation") @Slf4j diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java index 417ec415..68e41505 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.exception.JeroBootException; +import com.jero.common.system.vo.LoginUser; import com.jero.common.util.*; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; @@ -11,6 +12,7 @@ import lombok.extern.slf4j.Slf4j; import com.jero.common.api.vo.Result; import com.jero.common.constant.CommonConstant; import com.jero.common.system.api.ISysBaseAPI; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpHeaders; @@ -130,7 +132,7 @@ public class CommonController { * @param response */ @GetMapping(value = "/download/{id}") - public void view(@PathVariable String id,HttpServletRequest request, HttpServletResponse response) { + public void view(@PathVariable String id,HttpServletRequest request, HttpServletResponse response,String type) { // 查询数据表数据是否存在 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OSSFile::getId,id); @@ -174,6 +176,24 @@ public class CommonController { outputStream.write(buf, 0, len); } response.flushBuffer(); + //统计下载和上传次数 + if ("download".equals(type)) { + Integer downloadNumber = ossFile.getDownloadNumber(); + if (downloadNumber == null) { + ossFile.setDownloadNumber(0); + } else { + ossFile.setDownloadNumber(downloadNumber + 1); + } + ossFileService.updateAndPush(ossFile); + } else if ("view".equals(type)) { + Integer viewNumber = ossFile.getViewNumber(); + if (viewNumber == null) { + ossFile.setViewNumber(0); + } else { + ossFile.setViewNumber(viewNumber + 1); + } + ossFileService.updateAndPush(ossFile); + } } catch (IOException e) { log.error("预览文件失败" + e.getMessage()); response.setStatus(404);