From d05e79f08a584bac02dc5994c5786863e47b2be4 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 07 五月 2021 16:23:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 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 64e9037..742c6aa 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,8 +1,10 @@
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;
@@ -37,6 +39,8 @@
private PartyBuildingService partyBuildingService;
@Resource
private UserService userService;
+ @Resource
+ private CheckService checkService;
@ApiOperation(value = "分页党建动态/政策文件",response =PartyBuildingComPbDynVO.class )
@PostMapping("pagedynamic")
@@ -156,6 +160,11 @@
@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();
@@ -190,6 +199,17 @@
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);
--
Gitblit v1.7.1