From 3ca7f722f25c1908bc4588c75dbde1f56a8d9877 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期五, 26 三月 2021 10:08:46 +0800
Subject: [PATCH] Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 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 f3bb9b7..4bf2734 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,6 +1,7 @@
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.ComPbActivityDTO;
@@ -37,8 +38,10 @@
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();
@@ -76,7 +79,14 @@
comPbDynUserVO.setCreateAt(new Date());
comPbDynUserVO.setDynId(id);
comPbDynUserVO.setUserId(userId);
- partyBuildingService.addDynUser(comPbDynUserVO);
+ 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;
}
@@ -133,7 +143,8 @@
sysUserNoticeVO.setTitle("报名成功");
sysUserNoticeVO.setBusinessType(2);
sysUserNoticeVO.setBusinessTitle(partyBuildingActivityVO.getName());
- sysUserNoticeVO.setBusinessContent(String.format("活动将于%s开始，请按时参加",partyBuildingActivityVO.getActivityTimeBegin()));
+ Date activityTimeBegin = partyBuildingActivityVO.getActivityTimeBegin();
+ sysUserNoticeVO.setBusinessContent(String.format("活动将于 %tF %tT 开始，请按时参加", activityTimeBegin,activityTimeBegin));
sysUserNoticeVO.setBusinessId(id);
sysUserNoticeVO.setStatus(0);
sysUserNoticeVO.setBusinessStatus(2);
@@ -148,6 +159,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();
@@ -182,4 +198,9 @@
return partyBuildingService.pageServiceTeam(pageComPbServiceTeamDTO);
}
+ 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