From 802bbc9b1a26334607b04ab562e62594e383d2c2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 31 七月 2021 17:58:31 +0800
Subject: [PATCH] 修改bug以及获取天气接口
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 153 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 ee9b169..a2a087c 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,24 @@
package com.panzhihua.applets.api;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.applets.weixin.CheckService;
import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO;
+import com.panzhihua.common.model.dtos.partybuilding.ComListPartyDTO;
+import com.panzhihua.common.model.dtos.partybuilding.ComPbActivityDTO;
+import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO;
+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 com.panzhihua.common.validated.AddGroup;
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,14 +30,19 @@
* @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;
+ @Resource
+ private CheckService checkService;
- @ApiOperation(value = "分页党建动态/政策文件",response =PartyCommitteeVO.class )
+ @ApiOperation(value = "分页党建动态/政策文件",response =PartyBuildingComPbDynVO.class )
@PostMapping("pagedynamic")
public R pageYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO){
Long communityId = this.getCommunityId();
@@ -34,35 +51,61 @@
return R.fail("类型不能为空");
}
partyBuildingComPbDynVO.setCommunityId(communityId);
+ partyBuildingComPbDynVO.setStatus(2);
return partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
}
@ApiOperation(value = "分页查询党员活动",response = PageActivityMembersVO.class)
@PostMapping("pageactivity")
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);
+ R r1 = partyBuildingService.addDynUser(comPbDynUserVO);
+ PartyBuildingComPbDynVO partyBuildingComPbDynVO=JSONObject.parseObject(JSONObject.toJSONString(r.getData()),PartyBuildingComPbDynVO.class);
+ if (R.isOk(r1)) {
+ partyBuildingComPbDynVO.setIsAdd(1);
+ }else{
+ partyBuildingComPbDynVO.setIsAdd(0);
+ }
+ return R.ok(partyBuildingComPbDynVO);
+ }
+ 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")
@@ -75,8 +118,101 @@
@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());
+ Date activityTimeBegin = partyBuildingActivityVO.getActivityTimeBegin();
+ sysUserNoticeVO.setBusinessContent(String.format("活动将于 %tF %tT 开始，请按时参加", activityTimeBegin,activityTimeBegin));
+ 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;
+ }
+
+ @ApiOperation(value = "创建党员活动")
+ @PostMapping("activityinfo")
+ public R addActivityinfo(@RequestBody @Validated(AddGroup.class) ComPbActivityDTO comPbActivityDTO) {
+ // 微信内容审核
+ String msg = comPbActivityDTO.getRichText();
+ if (!checkService.checkMessage(msg)) {
+ return R.fail("内容违规");
+ }
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long userId = loginUserInfo.getUserId();
+ Long communityId = loginUserInfo.getCommunityId();
+ comPbActivityDTO.setCreateBy(userId);
+ comPbActivityDTO.setCommunityId(communityId);
+ Date date=new Date();
+ comPbActivityDTO.setReleaseTime(date);
+ Date activityTimeBegin = comPbActivityDTO.getActivityTimeBegin();
+ Date activityTimeEnd = comPbActivityDTO.getActivityTimeEnd();
+ boolean before = activityTimeEnd.before(activityTimeBegin);
+ if (before) {
+ return R.fail("活动结束时间不能早于开始时间");
+ }
+// 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消
+ int status=2;
+ Date enrollTimeBegin = comPbActivityDTO.getEnrollTimeBegin();
+ Date enrollTimeEnd = comPbActivityDTO.getEnrollTimeEnd();
+ if (enrollTimeEnd.before(enrollTimeBegin)) {
+ return R.fail("报名结束时间不能早于报名开始时间");
+ }
+ if (enrollTimeBegin.before(date)) {
+ status=3;
+ }
+ comPbActivityDTO.setStatus(status);
+ return partyBuildingService.addActivityApplets(comPbActivityDTO);
+ }
+
+ @ApiOperation(value = "分页查询服务团队成员",response = ComPbServiceTeamVO.class)
+ @PostMapping("pageserviceteam")
+ public R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO) {
+ pageComPbServiceTeamDTO.setCommunityId(this.getCommunityId());
+ return partyBuildingService.pageServiceTeam(pageComPbServiceTeamDTO);
+ }
+
+ @ApiOperation(value = "社区所有启用的党组织列表", response = PartyOrganizationVO.class)
+ @PostMapping("listpartyorganization")
+ public R listPartyOrganization(@RequestBody ComListPartyDTO comListPartyDTO) {
+// Long communityId = this.getCommunityId();
+// log.info("社区所有党组织社区id【{}】", communityId);
+// if(communityId != null){
+// comListPartyDTO.setCommunityId(communityId);
+// }
+ return partyBuildingService.listPartyOrganizationByApp(comListPartyDTO);
+ }
+
+ public static void main(String[] args) {
+ Date date = new Date();
+ String dateFormat = String.format("%tF %tT ", date, date);
+ System.out.println(dateFormat);
+ }
}
--
Gitblit v1.7.1