From c60eea0ab4d74ab8f39a33f896e978dc591f1800 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 10 十月 2022 12:11:47 +0800
Subject: [PATCH] Merge branch 'local_20221010' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 119 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 61 insertions(+), 58 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
index daa40d2..811b9d9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -1,58 +1,38 @@
package com.panzhihua.applets.api;
-import java.util.Date;
-import java.util.List;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerOrgTeamDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerServiceTypeDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerSkillDto;
-import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
-import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
-import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
+import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.common.ComMngVolunteerOrgTeamVo;
import com.panzhihua.common.model.vos.common.ComMngVolunteerServiceTypeVo;
import com.panzhihua.common.model.vos.common.ComMngVolunteerSkillVo;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.neighbor.ActivityAnalysisVO;
-import com.panzhihua.common.model.vos.neighbor.ActivityAnalysisVO;
-import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAnalysisVO;
-import com.panzhihua.common.service.community.CommunityWestService;
-import io.swagger.annotations.*;
-import org.springframework.util.ObjectUtils;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.alibaba.fastjson.JSONObject;
-import com.panzhihua.common.controller.BaseController;
-import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO;
-import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
-import com.panzhihua.common.model.dtos.community.PageVolunteerDTO;
-import com.panzhihua.common.model.vos.LoginUserInfoVO;
-import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.community.CommunityWestService;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.common.validated.PageGroup;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.*;
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 javax.validation.Valid;
+import java.util.Date;
+import java.util.List;
import static java.util.Objects.isNull;
import static org.apache.commons.lang3.ObjectUtils.isEmpty;
@@ -76,12 +56,15 @@
private UserService userService;
@Resource
private PartyBuildingService partyBuildingService;
+ @Resource
+ private CheckService checkService;
@ApiOperation(value = "分页查询小区", response = ComMngStructAreaVO.class)
@PostMapping("pagearea")
public R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO) {
return communityService.pageArea(comMngStructAreaVO);
}
+
@ApiOperation(value = "新分页查询小区", response = ComMngVillageVO.class)
@PostMapping("pagevillage")
public R pageVillage(@RequestBody PageComMngVillageDTO pageComMngVillageDTO) {
@@ -155,7 +138,7 @@
if (loginUserInfo != null) {
userId = loginUserInfo.getUserId();
}
- return communityService.detailActivity(id, userId,null,null);
+ return communityService.detailActivity(id, userId, null, null);
}
@ApiOperation(value = "分页查询活动评价记录", response = ComActActEvaluateVO.class)
@@ -177,6 +160,24 @@
public R activityEvaluate(@RequestBody ComActActEvaluateVO comActActEvaluateVO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
comActActEvaluateVO.setUserId(loginUserInfo.getUserId());
+ String openid = this.getLoginUserInfo().getOpenid();
+ String appId = this.getAppId();
+ // 微信内容审核
+ String evaluateContent = comActActEvaluateVO.getEvaluateContent();
+ if (StrUtil.isNotBlank(evaluateContent)) {
+ String result = checkService.checkMessageBy(evaluateContent, openid, appId);
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail("填写内容存在 " + result + " 违规信息");
+ }
+ }
+
+ //微信图片审核
+ String photo = comActActEvaluateVO.getPhoto();
+ if (StrUtil.isNotBlank(photo)) {
+ if (!checkService.checkImageBy(photo, appId)) {
+ return R.fail("上传图片存在违规信息");
+ }
+ }
return communityService.activityEvaluate(comActActEvaluateVO);
}
@@ -194,9 +195,9 @@
signactivityVO.setUserId(userId);
R r = communityService.signActivity(signactivityVO);
if (R.isOk(r) && signactivityVO.getType().intValue() == 1) {
- R r2 = communityService.detailActivity(activityId, userId,null,null);
+ R r2 = communityService.detailActivity(activityId, userId, null, null);
ComActActivityVO comActActivityVO =
- JSONObject.parseObject(JSONObject.toJSONString(r2.getData()), ComActActivityVO.class);
+ JSONObject.parseObject(JSONObject.toJSONString(r2.getData()), ComActActivityVO.class);
Integer isVolunteer = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), Integer.class);
SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
sysUserNoticeVO.setUserId(userId);
@@ -220,7 +221,7 @@
@ApiOperation(value = "活动人员列表", response = ActivitySignVO.class)
@ApiImplicitParams({@ApiImplicitParam(name = "type", value = "人员类型 1 普通居民 2 志愿者", required = true),
- @ApiImplicitParam(name = "id", value = "社区活动主键", required = true)})
+ @ApiImplicitParam(name = "id", value = "社区活动主键", required = true)})
@GetMapping("listactivitysign")
public R listActivitySign(@RequestParam("id") Long id, @RequestParam("type") Integer type) {
ActivitySignVO activitySignVO = new ActivitySignVO();
@@ -238,7 +239,7 @@
@ApiImplicitParam(name = "type", value = "活动类型，1.居民/志愿者活动 2.党员活动", required = true)
})
@GetMapping("activity/sign-in/list")
- public R listSignInRecord(@RequestParam("id") Long id, @RequestParam("type") Integer type) {
+ public R listSignInRecord(@RequestParam("id") Long id, @RequestParam("type") Integer type) {
LoginUserInfoVO loginUserInfo = getLoginUserInfo();
if (loginUserInfo.getIsCommunityWorker().intValue() != 1) {
return R.fail("非社区工作人员");
@@ -256,7 +257,7 @@
@ApiImplicitParam(name = "userId", value = "用户id", required = true)
})
@GetMapping("activity/regist/list")
- public R listRegistRecord(@RequestParam("id") Long id,
+ public R listRegistRecord(@RequestParam("id") Long id,
@RequestParam("type") Integer type,
@RequestParam("userId") Long userId) {
if (type.intValue() == 1) {
@@ -317,7 +318,7 @@
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
if (loginUserInfo != null) {
comMngVolunteerMngVO.setCommunityId(loginUserInfo.getCommunityId());
- }else{
+ } else {
comMngVolunteerMngVO.setCommunityId(pageVolunteerDTO.getCommunityId());
}
comMngVolunteerMngVO.setPageNum(pageVolunteerDTO.getPageNum());
@@ -381,16 +382,17 @@
@ApiOperation(value = "获取树结构区域信息")
@GetMapping(value = "arealist")
public R getAllArea(@ApiParam(name = "城市编码:四川510000",
- required = true) @RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
+ required = true) @RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
return communityService.getCityTreeByProvinceCode(provinceAdcode, null);
}
+
@ApiOperation(value = "社区详情", response = ComActVO.class)
@GetMapping("community")
public R detailCommunity() {
return communityService.detailCommunity(this.getCommunityId());
}
- @ApiOperation(value = "查询活动报名名单集合",response = ActivitySignVO.class)
+ @ApiOperation(value = "查询活动报名名单集合", response = ActivitySignVO.class)
@PostMapping("listactivitysign")
public R listActivitySign(@RequestBody ActivitySignVO activitySignVO) {
if (ObjectUtils.isEmpty(activitySignVO.getActivityId())) {
@@ -422,24 +424,25 @@
comActActivityVO.setHasPrize(0);
return communityService.addActivity(comActActivityVO);
}
- @ApiOperation(value = "单位活动统计",response = ActivityAnalysisVO.class)
+
+ @ApiOperation(value = "单位活动统计", response = ActivityAnalysisVO.class)
@GetMapping("activity/analysis")
- public R activityUnitAnalysis(@RequestParam(value = "year",required = false) Integer year,
- @RequestParam(value = "type",required = false) Integer type,
- @RequestParam(value = "range",required = false)Integer range,
- @RequestParam(value = "communityId",required = false) Long communityId,
- @RequestParam(value = "page",required = false) Integer page,
- @RequestParam(value = "size",required = false) Integer size,
- @RequestParam(value = "belongTo",required = false) String belongTo,
- @RequestParam(value = "unitId",required = false) Long unitId){
- return communityService.institutionalUnitServiceAnalysis(year,type,range,communityId,page,size,belongTo,unitId,this.getLoginUserInfo().getAccount());
+ public R activityUnitAnalysis(@RequestParam(value = "year", required = false) Integer year,
+ @RequestParam(value = "type", required = false) Integer type,
+ @RequestParam(value = "range", required = false) Integer range,
+ @RequestParam(value = "communityId", required = false) Long communityId,
+ @RequestParam(value = "page", required = false) Integer page,
+ @RequestParam(value = "size", required = false) Integer size,
+ @RequestParam(value = "belongTo", required = false) String belongTo,
+ @RequestParam(value = "unitId", required = false) Long unitId) {
+ return communityService.institutionalUnitServiceAnalysis(year, type, range, communityId, page, size, belongTo, unitId, this.getLoginUserInfo().getAccount());
}
- @ApiOperation(value = "分页查询服务范围数据",response = ComActColumnVO.class)
+ @ApiOperation(value = "分页查询服务范围数据", response = ComActColumnVO.class)
@PostMapping("comActColumn/queryAll")
public R selectAll(@RequestBody CommonPage commonPage) {
- if(this.getLoginUserInfo().getStreetId()!=null){
+ if (this.getLoginUserInfo().getStreetId() != null) {
commonPage.setStreetId(this.getLoginUserInfo().getStreetId());
} else {
commonPage.setCommunityId(this.getCommunityId());
--
Gitblit v1.7.1