From 86df207c37502cce1b2043e1c7c0486459eef1d6 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期四, 13 三月 2025 19:58:45 +0800 Subject: [PATCH] 党员、诉求评论基础代码 --- springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 154 insertions(+), 16 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java index 4a37f51..9a370ce 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java @@ -1,23 +1,22 @@ package com.panzhihua.applets.api; -import javax.annotation.Resource; - -import org.springframework.web.bind.annotation.*; - +import cn.hutool.core.util.StrUtil; +import com.panzhihua.applets.weixin.CheckService; +import com.panzhihua.common.constants.Constants; +import com.panzhihua.common.constants.NeighborCircleConstants; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.neighbor.*; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; -import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO; -import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO; -import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAppVO; -import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentReplyAppVO; +import com.panzhihua.common.model.vos.neighbor.*; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.utlis.StringUtils; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; /** * @auther lyq @@ -32,16 +31,30 @@ @Resource private CommunityService communityService; + @Resource + private CheckService checkService; @ApiOperation(value = "分页查询邻里圈列表", response = ComActNeighborCircleAppVO.class) @PostMapping("pageApp") public R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) { LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin(); if (loginUserInfo != null) { - neighborCircleAppDTO.setCommunityId(loginUserInfo.getCommunityId()); + neighborCircleAppDTO.setPhone(loginUserInfo.getPhone()); neighborCircleAppDTO.setUserId(loginUserInfo.getUserId()); } return communityService.pageNeighborByApp(neighborCircleAppDTO); + } + + @ApiOperation(value = "分页查询可关联清单列表", response = ComActNeighborCircleAppVO.class) + @PostMapping("pageRelationList") + public R pageRelationList(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) { + LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin(); + if (loginUserInfo != null) { + neighborCircleAppDTO.setPhone(loginUserInfo.getPhone()); + neighborCircleAppDTO.setUserId(loginUserInfo.getUserId()); + neighborCircleAppDTO.setCheckUnitId(loginUserInfo.getCheckUnitId()); + } + return communityService.pageRelationList(neighborCircleAppDTO); } @ApiOperation(value = "用户发布邻里圈审核") @@ -49,16 +62,67 @@ public R addNeighborByApp(@RequestBody AddComActNeighborCircleAppDTO addNeighborCircleAppDTO) { LoginUserInfoVO loginUser = this.getLoginUserInfo(); Long userId = loginUser.getUserId(); + Long communityId = loginUser.getCommunityId(); if (userId == null) { return R.fail("请重新登录"); + } + if (!this.getAppId().equals("wx118de8a734d269f0")){ + String releaseContent = addNeighborCircleAppDTO.getReleaseContent(); + if (StrUtil.isNotBlank(releaseContent)) { + String result = checkService.checkMessageBy(releaseContent, this.getLoginUserInfo().getOpenid(), this.getAppId()); + if (StrUtil.isNotBlank(result)) { + return R.fail(501, "填写内容存在 " + result + " 违规信息"); + } + } + /* String releaseImages = addNeighborCircleAppDTO.getReleaseImages(); + if (StrUtil.isNotBlank(releaseImages)) { + if (checkService.checkImageBy(releaseImages, this.getAppId())) { + return R.fail(501, "上传图片存在违规信息"); + } + }*/ } addNeighborCircleAppDTO.setUserId(userId); if (StringUtils.isNotEmpty(loginUser.getPhone())) { addNeighborCircleAppDTO.setPhone(this.getLoginUserInfo().getPhone()); } - if (loginUser.getCommunityId() != null) { - addNeighborCircleAppDTO.setCommunityId(loginUser.getCommunityId()); + if (communityId != null) { + addNeighborCircleAppDTO.setCommunityId(communityId); } + + //查询社区自动审核是否开着 + + if (this.getAppId().equals("wx118de8a734d269f0")) { + //花城直接通过 + addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no); + addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.yes); + + } else { + //西区 + String key = NeighborCircleConstants.NEIGHBOR_CIRCLE_AUTO_EXAMINE; + R isOk = communityService.getSysConfValue(key + communityId, communityId); + if (R.isOk(isOk)) { + if (isOk.getData() != null) { + String value = isOk.getData().toString(); + if (value.equals("1")) { + addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no); + String msg = addNeighborCircleAppDTO.getReleaseContent(); + if (StrUtil.isEmpty(checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(), this.getAppId()))) { + addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.yes); + } else { + addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.no); + } + } else { + addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes); + } + } else { + communityService.addSysConfValue(key + communityId, communityId, "社区邻里圈自动审核参数", "1"); + addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no); + } + } else { + addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes); + } + } + return communityService.addNeighborByApp(addNeighborCircleAppDTO); } @@ -121,6 +185,13 @@ if (userId == null) { return R.fail("请先登录"); } + String content = commentAppDTO.getContent(); + if (StrUtil.isNotBlank(content)) { + String result = checkService.checkMessageBy(content, this.getLoginUserInfo().getOpenid(), this.getAppId()); + if (StrUtil.isNotBlank(result)) { + return R.fail(501, "填写内容存在 " + result + " 违规信息"); + } + } commentAppDTO.setUserId(userId); return communityService.neighborCommentByApp(commentAppDTO); } @@ -131,6 +202,13 @@ Long userId = this.getLoginUserInfo().getUserId(); if (userId == null) { return R.fail("请先登录"); + } + String content = replyAppDTO.getContent(); + if (StrUtil.isNotBlank(content)) { + String result = checkService.checkMessageBy(content, this.getLoginUserInfo().getOpenid(), this.getAppId()); + if (StrUtil.isNotBlank(result)) { + return R.fail(501, "填写内容存在 " + result + " 违规信息"); + } } replyAppDTO.setUserId(userId); return communityService.neighborReplyByApp(replyAppDTO); @@ -175,11 +253,71 @@ @ApiOperation(value = "查询社区邻里圈话题列表", response = ComActNeighborCircleTopicAppVO.class) @GetMapping("topic/list") - public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId) { + public R getNeighborTopicByApp( + @RequestParam(value = "name", defaultValue = "", required = false) String name) { + return communityService.getNeighborTopicByApp(name); + } + + @GetMapping("topic/list/new") + public R getNeighborTopicByAppNew(@RequestParam(value = "name", defaultValue = "", required = false) String name){ + return communityService.getNeighborTopicByAppNew(name); + } + + @ApiOperation(value = "用户删除邻里圈") + @PostMapping("delete") + public R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO) { LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin(); - if (loginUserInfo != null) { - communityId = loginUserInfo.getCommunityId(); + if (loginUserInfo == null) { + return R.fail(401, "请先登录"); } - return communityService.getNeighborTopicByApp(communityId); + circleTopicAppDTO.setUserId(loginUserInfo.getUserId()); + circleTopicAppDTO.setCommunityId(loginUserInfo.getCommunityId()); + return communityService.deleteNeighborByApp(circleTopicAppDTO); + } + + /** + * 分页查询邻里圈列表 + * + * @param neighborCircleAppDTO 请求参数 + * @return 邻里圈列表 + */ + @ApiOperation(value = "新版接单问题", response = ComActNeighborCircleAppVO.class) + @PostMapping("selectSolve") + public R selectSolve(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) { + neighborCircleAppDTO.setUserId(this.getUserId()); + return communityService.selectSolve(neighborCircleAppDTO); + } + + + /** + * 修改数据 + * + * @param editNeighborCircleAdminVO + * @return + */ + @ApiOperation(value = "接单 反馈", response = ComActNeighborCircleAppVO.class) + @PostMapping("update") + public R order(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO) { + return this.communityService.order(editNeighborCircleAdminVO); + } + + @ApiOperation(value = "服务统计", response = ServiceStaticsVO.class) + @PostMapping("/serviceStatic") + public R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO) { + return this.communityService.serviceStatic(serviceStaticDTO); + } + + /** + * 求助我的问题数量统计 + * + * @param type + * @param phone + * @return + */ + @ApiOperation(value = "求助我的问题数量统计") + @GetMapping("/selectCount") + public R selectCount(@RequestParam("type") Integer type, @RequestParam(value = "phone", required = false) String phone, @RequestParam("communityId") Long communityId) { + return this.communityService.selectCount(type, phone, communityId); } } + -- Gitblit v1.7.1