From 37f55403e7573d8c15b6b0f957b7cb1baf6be4ea Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期二, 29 十二月 2020 14:47:15 +0800
Subject: [PATCH] 攀枝花项目服务层异常捕获统一返回给视图层服务
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
index 690d7fb..ee9b169 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
@@ -28,34 +28,32 @@
@ApiOperation(value = "分页党建动态/政策文件",response =PartyCommitteeVO.class )
@PostMapping("pagedynamic")
public R pageYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO){
- Long communityId=1l;//todo 获取社区id
+ Long communityId = this.getCommunityId();
Integer type = partyBuildingComPbDynVO.getType();
if (ObjectUtils.isEmpty(type)) {
return R.fail("类型不能为空");
}
partyBuildingComPbDynVO.setCommunityId(communityId);
- R r = partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
- return r;
+ return partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
}
@ApiOperation(value = "分页查询党员活动",response = PageActivityMembersVO.class)
@PostMapping("pageactivity")
public R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
- R r = partyBuildingService.pageActivity(partyBuildingActivityVO);
- return r;
+ return partyBuildingService.pageActivity(partyBuildingActivityVO);
}
@ApiOperation(value = "动态/政策文件详情",response =PartyBuildingComPbDynVO.class )
@GetMapping("infodynamic")
public R infoYnamic(@RequestParam("id") Long id) {
- R r = partyBuildingService.infoYnamic(id);
- return r;
+ return partyBuildingService.infoYnamic(id);
}
@ApiOperation(value = "增加阅读记录")
- @GetMapping("adddynuser")
- public R addDynUser(@RequestParam("id") Long id) {
- if (ObjectUtils.isEmpty(id)) {
+ @PostMapping("adddynuser")
+ public R addDynUser(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
+ Long id = partyBuildingComPbDynVO.getId();
+ if (ObjectUtils.isEmpty(id)||0==id) {
return R.fail("主键id不能为空");
}
Long userId = this.getUserId();
@@ -63,25 +61,21 @@
comPbDynUserVO.setCreateAt(new Date());
comPbDynUserVO.setDynId(id);
comPbDynUserVO.setUserId(userId);
- R r = partyBuildingService.addDynUser(comPbDynUserVO);
- return r;
+ return partyBuildingService.addDynUser(comPbDynUserVO);
}
@ApiOperation(value = "分页党委查询",response =PartyCommitteeVO.class )
@PostMapping("pagepartycommittee")
public R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
- //todo 获取用户的社区信息
- Long communityId = 1l;
+ Long communityId =this.getCommunityId();
partyCommitteeVO.setCommunityId(communityId);
- R r = partyBuildingService.pagePartyCommittee(partyCommitteeVO);
- return r;
+ return partyBuildingService.pagePartyCommittee(partyCommitteeVO);
}
@ApiOperation(value = "活动详情",response = PartyBuildingActivityVO.class)
@GetMapping("activityinfo")
public R activityinfo(@RequestParam("id") Long id) {
- R r = partyBuildingService.activityinfo(id);
- return r;
+ return partyBuildingService.activityinfo(id);
}
--
Gitblit v1.7.1