From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 140 ++++++++++++++++++++++++----------------------
1 files changed, 73 insertions(+), 67 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 db2b480..835bdb2 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,5 +1,13 @@
package com.panzhihua.applets.api;
+import java.util.Date;
+
+import javax.annotation.Resource;
+
+import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.applets.weixin.CheckService;
import com.panzhihua.common.controller.BaseController;
@@ -14,15 +22,10 @@
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;
-import java.util.Date;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -42,11 +45,17 @@
@Resource
private CheckService checkService;
- @ApiOperation(value = "分页党建动态/政策文件",response =PartyBuildingComPbDynVO.class )
+ public static void main(String[] args) {
+ Date date = new Date();
+ String dateFormat = String.format("%tF %tT ", date, date);
+ System.out.println(dateFormat);
+ }
+
+ @ApiOperation(value = "分页党建动态/政策文件", response = PartyBuildingComPbDynVO.class)
@PostMapping("pagedynamic")
- public R pageYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO){
+ public R pageYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
- if(loginUserInfo != null){
+ if (loginUserInfo != null) {
partyBuildingComPbDynVO.setCommunityId(loginUserInfo.getCommunityId());
}
Integer type = partyBuildingComPbDynVO.getType();
@@ -57,49 +66,65 @@
return partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
}
- @ApiOperation(value = "分页查询党员活动",response = PageActivityMembersVO.class)
+ @ApiOperation(value = "分页查询党员活动", response = PageActivityMembersVO.class)
@PostMapping("pageactivity")
public R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
- if(loginUserInfo != null){
+ if (loginUserInfo != null) {
partyBuildingActivityVO.setCommunityId(loginUserInfo.getCommunityId());
}
-// Long communityId = this.getCommunityId();
-// partyBuildingActivityVO.setCommunityId(communityId);
+ // Long communityId = this.getCommunityId();
+ // partyBuildingActivityVO.setCommunityId(communityId);
Integer status = partyBuildingActivityVO.getStatus();
- if (null!=status&&status.intValue()==4) {
+ if (null != status && status.intValue() == 4) {
partyBuildingActivityVO.setIsAppliets(1);
}
return partyBuildingService.pageActivity(partyBuildingActivityVO);
}
- @ApiOperation(value = "动态/政策文件详情",response =PartyBuildingComPbDynVO.class )
+ // @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 = PartyBuildingComPbDynVO.class)
@GetMapping("infodynamic")
public R infoYnamic(@RequestParam("id") Long id) {
R r = partyBuildingService.infoYnamic(id);
if (R.isOk(r)) {
- if (ObjectUtils.isEmpty(id)||0==id) {
+ if (ObjectUtils.isEmpty(id) || 0 == id) {
return R.fail("主键id不能为空");
}
Long userId = null;
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
- if(loginUserInfo != null){
+ if (loginUserInfo != null) {
userId = loginUserInfo.getUserId();
}
- PartyBuildingComPbDynVO partyBuildingComPbDynVO=JSONObject.parseObject(JSONObject.toJSONString(r.getData()),PartyBuildingComPbDynVO.class);
- if(userId != null){
- ComPbDynUserVO comPbDynUserVO=new ComPbDynUserVO();
+ PartyBuildingComPbDynVO partyBuildingComPbDynVO =
+ JSONObject.parseObject(JSONObject.toJSONString(r.getData()), PartyBuildingComPbDynVO.class);
+ if (userId != null) {
+ ComPbDynUserVO comPbDynUserVO = new ComPbDynUserVO();
comPbDynUserVO.setCreateAt(new Date());
comPbDynUserVO.setDynId(id);
comPbDynUserVO.setUserId(userId);
R r1 = partyBuildingService.addDynUser(comPbDynUserVO);
if (R.isOk(r1)) {
partyBuildingComPbDynVO.setIsAdd(1);
- }else{
+ } else {
partyBuildingComPbDynVO.setIsAdd(0);
}
- }else{
+ } else {
partyBuildingComPbDynVO.setIsAdd(0);
}
return R.ok(partyBuildingComPbDynVO);
@@ -107,41 +132,26 @@
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 = "分页党委查询",response =PartyCommitteeVO.class )
+ @ApiOperation(value = "分页党委查询", response = PartyCommitteeVO.class)
@PostMapping("pagepartycommittee")
public R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
-// Long communityId =this.getCommunityId();
-// partyCommitteeVO.setCommunityId(communityId);
+ // Long communityId =this.getCommunityId();
+ // partyCommitteeVO.setCommunityId(communityId);
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
- if(loginUserInfo != null){
+ if (loginUserInfo != null) {
partyCommitteeVO.setCommunityId(loginUserInfo.getCommunityId());
}
return partyBuildingService.pagePartyCommittee(partyCommitteeVO);
}
- @ApiOperation(value = "活动详情",response = PartyBuildingActivityVO.class)
+ @ApiOperation(value = "活动详情", response = PartyBuildingActivityVO.class)
@GetMapping("activityinfo")
public R activityinfo(@RequestParam("id") Long id) {
Long userId = this.getUserId();
- return partyBuildingService.activityinfo(id,userId);
+ return partyBuildingService.activityinfo(id, userId);
}
- @ApiOperation(value = "党员活动人员参入列表",response = PartyBuildingMemberVO.class)
+ @ApiOperation(value = "党员活动人员参入列表", response = PartyBuildingMemberVO.class)
@GetMapping("listpartybuildingmember")
public R listPartyBuildingMember(@RequestParam("id") Long id) {
return partyBuildingService.listPartyBuildingMember(id);
@@ -154,17 +164,19 @@
activitySignUpDTO.setUserId(userId);
Long id = activitySignUpDTO.getId();
R r = partyBuildingService.putActivitySignUp(activitySignUpDTO);
- if (R.isOk(r)&&activitySignUpDTO.getType().intValue()==1) {
+ 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();
+ 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
+ .setBusinessContent(String.format("活动将于 %tF %tT 开始，请按时参加", activityTimeBegin, activityTimeBegin));
sysUserNoticeVO.setBusinessId(id);
sysUserNoticeVO.setStatus(0);
sysUserNoticeVO.setBusinessStatus(2);
@@ -179,7 +191,7 @@
@ApiOperation(value = "创建党员活动")
@PostMapping("activityinfo")
public R addActivityinfo(@RequestBody @Validated(AddGroup.class) ComPbActivityDTO comPbActivityDTO) {
- // 微信内容审核
+ // 微信内容审核
String msg = comPbActivityDTO.getRichText();
if (!checkService.checkMessage(msg)) {
return R.fail("内容违规");
@@ -189,7 +201,7 @@
Long communityId = loginUserInfo.getCommunityId();
comPbActivityDTO.setCreateBy(userId);
comPbActivityDTO.setCommunityId(communityId);
- Date date=new Date();
+ Date date = new Date();
comPbActivityDTO.setReleaseTime(date);
Date activityTimeBegin = comPbActivityDTO.getActivityTimeBegin();
Date activityTimeEnd = comPbActivityDTO.getActivityTimeEnd();
@@ -197,45 +209,39 @@
if (before) {
return R.fail("活动结束时间不能早于开始时间");
}
-// 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消
- int status=2;
+ // 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;
+ status = 3;
}
comPbActivityDTO.setStatus(status);
return partyBuildingService.addActivityApplets(comPbActivityDTO);
}
- @ApiOperation(value = "分页查询服务团队成员",response = ComPbServiceTeamVO.class)
+ @ApiOperation(value = "分页查询服务团队成员", response = ComPbServiceTeamVO.class)
@PostMapping("pageserviceteam")
public R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
- if(loginUserInfo != null){
+ if (loginUserInfo != null) {
pageComPbServiceTeamDTO.setCommunityId(loginUserInfo.getCommunityId());
}
-// pageComPbServiceTeamDTO.setCommunityId(this.getCommunityId());
+ // 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);
-// }
+ // 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