From 23e9f7463069b31b5455c0d85deec5245bd18359 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期三, 20 一月 2021 14:57:53 +0800
Subject: [PATCH] 活动
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 79 +++++++++++++++++++++++++++++++--------
1 files changed, 62 insertions(+), 17 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 869c9c0..a39812f 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,13 +1,17 @@
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.*;
@@ -21,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")
@@ -37,6 +44,7 @@
return R.fail("类型不能为空");
}
partyBuildingComPbDynVO.setCommunityId(communityId);
+ partyBuildingComPbDynVO.setStatus(2);
return partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
}
@@ -45,29 +53,45 @@
public R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
Long communityId = this.getCommunityId();
partyBuildingActivityVO.setCommunityId(communityId);
+ Integer status = partyBuildingActivityVO.getStatus();
+ if (null!=status&&status.intValue()==4) {
+ partyBuildingActivityVO.setIsAppliets(1);
+ }
return partyBuildingService.pageActivity(partyBuildingActivityVO);
}
@ApiOperation(value = "动态/政策文件详情",response =PartyBuildingComPbDynVO.class )
@GetMapping("infodynamic")
public R infoYnamic(@RequestParam("id") Long id) {
- return partyBuildingService.infoYnamic(id);
+ R r = partyBuildingService.infoYnamic(id);
+ if (R.isOk(r)) {
+ if (ObjectUtils.isEmpty(id)||0==id) {
+ return R.fail("主键id不能为空");
+ }
+ Long userId = this.getUserId();
+ ComPbDynUserVO comPbDynUserVO=new ComPbDynUserVO();
+ comPbDynUserVO.setCreateAt(new Date());
+ comPbDynUserVO.setDynId(id);
+ comPbDynUserVO.setUserId(userId);
+ partyBuildingService.addDynUser(comPbDynUserVO);
+ }
+ return r;
}
- @ApiOperation(value = "增加阅读记录")
- @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();
- ComPbDynUserVO comPbDynUserVO=new ComPbDynUserVO();
- comPbDynUserVO.setCreateAt(new Date());
- comPbDynUserVO.setDynId(id);
- comPbDynUserVO.setUserId(userId);
- return partyBuildingService.addDynUser(comPbDynUserVO);
- }
+// @ApiOperation(value = "增加阅读记录")
+// @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();
+// ComPbDynUserVO comPbDynUserVO=new ComPbDynUserVO();
+// comPbDynUserVO.setCreateAt(new Date());
+// comPbDynUserVO.setDynId(id);
+// comPbDynUserVO.setUserId(userId);
+// return partyBuildingService.addDynUser(comPbDynUserVO);
+// }
@ApiOperation(value = "分页党委查询",response =PartyCommitteeVO.class )
@PostMapping("pagepartycommittee")
@@ -93,8 +117,29 @@
@ApiOperation(value = "报名、取消报名党员活动")
@PutMapping("activitysignup")
public R putActivitySignUp(@RequestBody @Validated ActivitySignUpDTO activitySignUpDTO) {
- activitySignUpDTO.setUserId(this.getUserId());
- return partyBuildingService.putActivitySignUp(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