From ae33fef700e5d2558dffb03c8f66358da2545791 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期四, 07 一月 2021 16:25:41 +0800
Subject: [PATCH] 通知后台加入代码
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 85 ++++++++++++++++++++++++++++++++----------
1 files changed, 64 insertions(+), 21 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 aa0c26b..d9a3a57 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
@@ -1,12 +1,19 @@
package com.panzhihua.applets.api;
+import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.*;
+import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
+import com.panzhihua.common.service.user.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -18,71 +25,107 @@
* @author: huang.hongfa weixin hhf9596 qq 959656820
* @create: 2020-12-02 16:19
**/
+@Slf4j
@RestController
@RequestMapping("/partybuilding/")
@Api(tags = {"党群服务"})
public class PartyBuildingApi extends BaseController {
@Resource
private PartyBuildingService partyBuildingService;
+ @Resource
+ private UserService userService;
@ApiOperation(value = "分页党建动态/政策文件",response =PartyCommitteeVO.class )
@PostMapping("pagedynamic")
- public R pageYnamic(PartyBuildingComPbDynVO partyBuildingComPbDynVO){
- Integer communityId=1;//todo 获取社区id
+ public R pageYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO){
+ 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;
+ Long communityId = this.getCommunityId();
+ partyBuildingActivityVO.setCommunityId(communityId);
+ return partyBuildingService.pageActivity(partyBuildingActivityVO);
}
@ApiOperation(value = "动态/政策文件详情",response =PartyBuildingComPbDynVO.class )
@GetMapping("infodynamic")
- public R infoYnamic(@RequestParam("id") Integer id) {
- R r = partyBuildingService.infoYnamic(id);
- return r;
+ public R infoYnamic(@RequestParam("id") Long id) {
+ return partyBuildingService.infoYnamic(id);
}
@ApiOperation(value = "增加阅读记录")
- @GetMapping("adddynuser")
- public R addDynUser(@RequestParam("id") Integer 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不能为空");
}
- Integer userId = this.getUserId();
+ Long userId = this.getUserId();
ComPbDynUserVO comPbDynUserVO=new ComPbDynUserVO();
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 获取用户的社区信息
- Integer communityId = 1;
+ 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") Integer id) {
- R r = partyBuildingService.activityinfo(id);
+ public R activityinfo(@RequestParam("id") Long id) {
+ Long userId = this.getUserId();
+ return partyBuildingService.activityinfo(id,userId);
+ }
+
+ @ApiOperation(value = "党员活动人员参入列表",response = PartyBuildingMemberVO.class)
+ @GetMapping("listpartybuildingmember")
+ public R listPartyBuildingMember(@RequestParam("id") Long id) {
+ return partyBuildingService.listPartyBuildingMember(id);
+ }
+
+ @ApiOperation(value = "报名、取消报名党员活动")
+ @PutMapping("activitysignup")
+ public R putActivitySignUp(@RequestBody @Validated ActivitySignUpDTO activitySignUpDTO) {
+ Long userId = this.getUserId();
+ activitySignUpDTO.setUserId(userId);
+ Long id = activitySignUpDTO.getId();
+ R r = partyBuildingService.putActivitySignUp(activitySignUpDTO);
+ if (R.isOk(r)&&activitySignUpDTO.getType().intValue()==1) {
+ R r2 = partyBuildingService.activityinfo(id, userId);
+ PartyBuildingActivityVO partyBuildingActivityVO=JSONObject.parseObject(JSONObject.toJSONString(r2.getData()),PartyBuildingActivityVO.class);
+ SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
+ sysUserNoticeVO.setUserId(userId);
+ sysUserNoticeVO.setType(1);
+ sysUserNoticeVO.setTitle("报名成功");
+ sysUserNoticeVO.setBusinessType(2);
+ sysUserNoticeVO.setBusinessTitle(partyBuildingActivityVO.getName());
+ sysUserNoticeVO.setBusinessContent(String.format("活动将于%s开始，请按时参加",partyBuildingActivityVO.getActivityTimeBegin()));
+ sysUserNoticeVO.setBusinessId(id);
+ sysUserNoticeVO.setStatus(0);
+ sysUserNoticeVO.setBusinessStatus(2);
+ R r1 = userService.addNotice(sysUserNoticeVO);
+ if (R.isOk(r1)) {
+ log.info("新增用户报名党建活动通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
+ }
+ }
return r;
}
+
+
}
--
Gitblit v1.7.1