From 2192a916e90a8030c6614f9f0702c56cee2d4b7e Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期二, 12 一月 2021 11:00:57 +0800
Subject: [PATCH] 政策文件加图片
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 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 ee9b169..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,12 +25,15 @@
* @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")
@@ -40,6 +50,8 @@
@ApiOperation(value = "分页查询党员活动",response = PageActivityMembersVO.class)
@PostMapping("pageactivity")
public R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
+ Long communityId = this.getCommunityId();
+ partyBuildingActivityVO.setCommunityId(communityId);
return partyBuildingService.pageActivity(partyBuildingActivityVO);
}
@@ -75,8 +87,45 @@
@ApiOperation(value = "活动详情",response = PartyBuildingActivityVO.class)
@GetMapping("activityinfo")
public R activityinfo(@RequestParam("id") Long id) {
- return partyBuildingService.activityinfo(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