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

update 会议controller拆分

Browse Source
This commit is contained in:
lijiarao
2021-09-30 15:23:19 +08:00
parent a1aacc420b
commit 53ca276158
12 changed files with 26 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java
-36
View File
@@ -450,40 +450,4 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
return Result.OK();
}
@ApiOperation(value = "生成base64")
@GetMapping(value = "/createBase64")
@ApiImplicitParam(name = "contact", value = "内容", required = true, paramType = "query")
public Result<String> 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<OSSFile> 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("新增会议文件成功!");
}
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java
+1 -1
View File
@@ -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
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java
-48
View File
@@ -438,52 +438,4 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
return Result.OK("上传资料成功!");
}
/**
* 发布提醒
*/
@AutoLog("发布提醒")
@RequiresPermissions("internalMeeting:publish")
@ApiOperation(value = "发布提醒", notes = "发布提醒")
@PostMapping(value = "/publishReminder")
public Result<?> 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<String> 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<OSSFile> 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("新增会议文件成功!");
}
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java
+1 -1
View File
@@ -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
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java
-48
View File
@@ -438,52 +438,4 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
return Result.OK("上传资料成功!");
}
/**
* 发布提醒
*/
@AutoLog("发布提醒")
@RequiresPermissions("otherMeeting:publish")
@ApiOperation(value = "发布提醒", notes = "发布提醒")
@PostMapping(value = "/publishReminder")
public Result<?> 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<String> 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<OSSFile> 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("新增会议文件成功!");
}
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java
+1 -1
View File
@@ -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
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
-2
View File
@@ -459,7 +459,6 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
/**
* 新增标协会议
*/
@ApiOperation(value = "新增标协会议")
@PostMapping(value = "/addStandards")
public Result<?> addStandards(@RequestBody PayMeeting payMeeting, HttpServletRequest request) {
String publicKey = request.getParameter("publicKey");
@@ -473,7 +472,6 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
/**
* 新增会议文件
*/
@ApiOperation(value = "新增会议文件", notes = "新增会议文件")
@PostMapping(value = "/addStandardsFile")
public Result<?> addStandardsFile(@RequestBody List<OSSFile> ossFileList, HttpServletRequest request) {
String publicKey = request.getParameter("publicKey");
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java
-48
View File
@@ -438,52 +438,4 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
return Result.OK("上传资料成功!");
}
/**
* 发布提醒
*/
@AutoLog("发布提醒")
@RequiresPermissions("standardsMeeting:publish")
@ApiOperation(value = "发布提醒", notes = "发布提醒")
@PostMapping(value = "/publishReminder")
public Result<?> 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<String> 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<OSSFile> 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("新增会议文件成功!");
}
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java
+1 -1
View File
@@ -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
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java
-36
View File
@@ -450,40 +450,4 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
return Result.OK();
}
@ApiOperation(value = "生成base64")
@GetMapping(value = "/createBase64")
@ApiImplicitParam(name = "contact", value = "内容", required = true, paramType = "query")
public Result<String> 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<OSSFile> 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("新增会议文件成功!");
}
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java
+1 -1
View File
@@ -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
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java
+21 -1
View File
@@ -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<OSSFile> 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);