From 583a11b28dfba598b94e6f9a4d0d1875f6373c3d Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 26 九月 2023 17:55:27 +0800
Subject: [PATCH] 配置文件
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 89 +++++++++++++++++++++++++++++++++-----------
1 files changed, 67 insertions(+), 22 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 2e49d68..36d5508 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
@@ -4,10 +4,16 @@
import javax.annotation.Resource;
+import cn.hutool.core.util.StrUtil;
+import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto;
+import com.panzhihua.common.model.dtos.community.PageMemberForInviteDTO;
import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
+import com.panzhihua.common.model.vos.grid.EventGridCommunityAdminVO;
+import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.ComPbCheckUnitFeign;
+import com.panzhihua.common.service.partybuilding.PartyBuildingWestService;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -45,11 +51,15 @@
@Resource
private PartyBuildingService partyBuildingService;
@Resource
+ private PartyBuildingWestService partyBuildingWestService;
+ @Resource
private UserService userService;
@Resource
private CheckService checkService;
@Resource
private ComPbCheckUnitFeign pbCheckUnitFeign;
+ @Resource
+ private CommunityService communityService;
public static void main(String[] args) {
Date date = new Date();
@@ -69,7 +79,7 @@
return R.fail("类型不能为空");
}
partyBuildingComPbDynVO.setStatus(2);
- return partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
+ return partyBuildingWestService.pageYnamic(partyBuildingComPbDynVO);
}
@ApiOperation(value = "分页查询党员活动", response = PageActivityMembersVO.class)
@@ -106,7 +116,7 @@
@ApiOperation(value = "动态/政策文件详情", response = PartyBuildingComPbDynVO.class)
@GetMapping("infodynamic")
public R infoYnamic(@RequestParam("id") Long id) {
- R r = partyBuildingService.infoYnamic(id);
+ R r = partyBuildingWestService.infoYnamic(id);
if (R.isOk(r)) {
if (ObjectUtils.isEmpty(id) || 0 == id) {
return R.fail("主键id不能为空");
@@ -118,13 +128,13 @@
}
PartyBuildingComPbDynVO partyBuildingComPbDynVO =
- JSONObject.parseObject(JSONObject.toJSONString(r.getData()), PartyBuildingComPbDynVO.class);
+ 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);
+ R r1 = partyBuildingWestService.addDynUser(comPbDynUserVO);
if (R.isOk(r1)) {
partyBuildingComPbDynVO.setIsAdd(1);
} else {
@@ -173,7 +183,7 @@
if (R.isOk(r) && activitySignUpDTO.getType().intValue() == 1) {
R r2 = partyBuildingService.activityinfo(id, userId);
PartyBuildingActivityVO partyBuildingActivityVO =
- JSONObject.parseObject(JSONObject.toJSONString(r2.getData()), PartyBuildingActivityVO.class);
+ JSONObject.parseObject(JSONObject.toJSONString(r2.getData()), PartyBuildingActivityVO.class);
SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
sysUserNoticeVO.setUserId(userId);
sysUserNoticeVO.setType(1);
@@ -182,7 +192,7 @@
sysUserNoticeVO.setBusinessTitle(partyBuildingActivityVO.getName());
Date activityTimeBegin = partyBuildingActivityVO.getActivityTimeBegin();
sysUserNoticeVO
- .setBusinessContent(String.format("活动将于 %tF %tT 开始，请按时参加", activityTimeBegin, activityTimeBegin));
+ .setBusinessContent(String.format("活动将于 %tF %tT 开始，请按时参加", activityTimeBegin, activityTimeBegin));
sysUserNoticeVO.setBusinessId(id);
sysUserNoticeVO.setStatus(0);
sysUserNoticeVO.setBusinessStatus(2);
@@ -199,8 +209,11 @@
public R addActivityinfo(@RequestBody @Validated(AddGroup.class) ComPbActivityDTO comPbActivityDTO) {
// 微信内容审核
String msg = comPbActivityDTO.getRichText();
- if (!checkService.checkMessage(msg)) {
- return R.fail("内容违规");
+ if (StrUtil.isNotBlank(msg)) {
+ String result = checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(),this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
}
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
@@ -255,37 +268,69 @@
@ApiOperation(value = "编辑党员")
@PutMapping("updatepartybuildingmember")
public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
- if(partyBuildingMemberVO.getIsPb()!=null){
- Long id = partyBuildingMemberVO.getId();
- if(partyBuildingMemberVO.getIsPb()==1){
- if (null == id || 0 == id) {
- return partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
- }
return partyBuildingService.updatePartyBuildingMember(partyBuildingMemberVO);
- }
- return partyBuildingService.deleteprepartybuildingmember(id);
- }
- return R.fail();
}
@ApiOperation(value = "查询社区下所有党员报到单位", response = ComPbCheckUnitVo.class)
@PostMapping("/comPbCheckUnit/list")
public R getPbCheckUnitList(@RequestBody PageComPbCheckUnitDto comPbCheckUnit) {
- if(comPbCheckUnit.getCommunityId() == null){
+ if (comPbCheckUnit.getCommunityId() == null) {
comPbCheckUnit.setCommunityId(this.getCommunityId());
}
return pbCheckUnitFeign.queryByList(comPbCheckUnit);
}
+
@OperLog(operModul = "党员管理", operType = 1)
@ApiOperation(value = "新增党员")
@PostMapping("addpartybuildingmember")
public R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
- Long communityId = this.getCommunityId();
- partyBuildingMemberVO.setCommunityId(communityId);
+ Long userId = this.getUserId();
+ partyBuildingMemberVO.setUserId(userId);
R r = partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
if (R.isOk(r)) {
- R r1 = userService.updateUserIsPartymember(partyBuildingMemberVO.getIdCard());
+ R r1 = userService.updateUserPartyStatus(this.getUserId());
}
return r;
}
+
+ @OperLog(operModul = "党员管理", operType = 1)
+ @ApiOperation(value = "分页查询党员列表",response = PartyBuildingMemberVO.class)
+ @PostMapping("/page/member")
+ public R pageMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
+ //partyBuildingMemberVO.setCommunityId(this.getCommunityId());
+ return partyBuildingService.getPagePbMember(partyBuildingMemberVO);
+ }
+
+ @ApiOperation(value = "分页查询注册党员列表",response = PartyBuildingMemberVO.class)
+ @PostMapping("/page/registerMember")
+ public R pageRegisterMember(@RequestBody PageMemberForInviteDTO pageMemberForInviteDTO) {
+ pageMemberForInviteDTO.setAppid(this.getAppId());
+ return partyBuildingService.pageRegisterMember(pageMemberForInviteDTO);
+ }
+
+ @ApiOperation(value = "查询所有社区列表", response = EventGridCommunityAdminVO.class)
+ @GetMapping("/community/list")
+ public R getCommunityLists() {
+ return communityService.getCommunityLists();
+ }
+
+ @ApiOperation(value = "查询当前用户党员信息")
+ @GetMapping("/getPartyMember")
+ public R getPartyMember(@RequestParam("type")Integer type){
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (StrUtil.isEmpty(loginUserInfo.getPhone())){
+ return R.fail("请先实名认证");
+ }
+ return partyBuildingService.getPartyMember(loginUserInfo.getPhone(),type);
+ }
+ @ApiOperation(value = "查询报道单位详情")
+ @GetMapping("/comPbCheckUnit/detailByPhone")
+ public R detailById(@RequestParam("phone") String phone) {
+ return partyBuildingService.detailByPhone(phone);
+ }
+ @ApiOperation(value = "党员详情",response =PartyBuildingMemberVO.class)
+ @GetMapping("/memberDetail")
+ public R memberDetail(@RequestParam("id")Long id){
+ return partyBuildingService.memberDetail(id);
+ }
}
--
Gitblit v1.7.1