From 499fcf4b24c104c7c627d0951d96fabdf8cb0631 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 10 十月 2022 12:08:23 +0800
Subject: [PATCH] #feat 提交微信违规信息校验
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java | 64 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 20 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
index 0b7f25b..2bd29d6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
@@ -1,23 +1,14 @@
package com.panzhihua.applets.api;
-import javax.annotation.Resource;
-
-import com.panzhihua.common.model.dtos.common.EditComActEasyPhotoHandlerDto;
-import com.panzhihua.common.model.dtos.common.EvaluateEasyDto;
-import com.panzhihua.common.model.dtos.common.PageComActEasyPhotoHandlerDto;
-import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo;
-import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
-import com.panzhihua.common.service.community.ComActEasyPhotoEvaluateFeign;
-import com.panzhihua.common.service.community.ComActEasyPhotoHandlerFeign;
-import org.springframework.util.ObjectUtils;
-import org.springframework.validation.annotation.Validated;
-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.controller.BaseController;
import com.panzhihua.common.model.dtos.CommonDTO;
import com.panzhihua.common.model.dtos.PageDTO;
+import com.panzhihua.common.model.dtos.common.EditComActEasyPhotoHandlerDto;
+import com.panzhihua.common.model.dtos.common.EvaluateEasyDto;
+import com.panzhihua.common.model.dtos.common.PageComActEasyPhotoHandlerDto;
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO;
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
@@ -25,19 +16,26 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.advertisement.ComOpsAdvVO;
+import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoClassifyVO;
import com.panzhihua.common.model.vos.user.NoticeUnReadVO;
import com.panzhihua.common.model.vos.user.SysUserAgreementVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
+import com.panzhihua.common.service.community.ComActEasyPhotoEvaluateFeign;
import com.panzhihua.common.service.community.CommunityService;
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.ApiOperation;
+import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -74,9 +72,23 @@
@PostMapping("easyphoto")
public R addEasyPhoto(@RequestBody @Validated(AddGroup.class) ComActEasyPhotoVO comActEasyPhotoVO) {
// 微信内容审核
- String msg = comActEasyPhotoVO.getDetail();
- if (!checkService.checkMessage(msg)) {
- return R.fail("内容违规");
+ String openid = this.getLoginUserInfo().getOpenid();
+ String appId = this.getAppId();
+ // 微信内容审核
+ String detail = comActEasyPhotoVO.getDetail();
+ if (StrUtil.isNotBlank(detail)) {
+ String result = checkService.checkMessageBy(detail, openid, appId);
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail("填写内容存在 " + result + " 违规信息");
+ }
+ }
+
+ //微信图片审核
+ String photoPathList = comActEasyPhotoVO.getPhotoPathList();
+ if (StrUtil.isNotBlank(photoPathList)) {
+ if (!checkService.checkImageBy(photoPathList, appId)) {
+ return R.fail("上传图片存在违规信息");
+ }
}
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long communityId = loginUserInfo.getCommunityId();
@@ -98,12 +110,13 @@
* @author lyq
* @date 2022-03-01 13:45:10
*/
- @ApiOperation(value = "查询处理列表",response = ComActEasyPhotoHandlerVo.class)
+ @ApiOperation(value = "查询处理列表", response = ComActEasyPhotoHandlerVo.class)
@PostMapping("/handleList")
public R handleList(@RequestBody PageComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
comActEasyPhotoHandler.setUserId(this.getUserId());
return this.communityService.queryEasyPhotoHandler(comActEasyPhotoHandler);
}
+
/**
* description edit 编辑数据
*
@@ -163,6 +176,17 @@
@ApiOperation(value = "随手拍--评论--新增评论")
@PostMapping("comacteasyphotocomment")
public R addComActEasyPhotoComment(@RequestBody ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO) {
+ // 微信内容审核
+ String openid = this.getLoginUserInfo().getOpenid();
+ String appId = this.getAppId();
+ // 微信内容审核
+ String comment = comActEasyPhotoCommentDTO.getComment();
+ if (StrUtil.isNotBlank(comment)) {
+ String result = checkService.checkMessageBy(comment, openid, appId);
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail("填写内容存在 " + result + " 违规信息");
+ }
+ }
comActEasyPhotoCommentDTO.setUserId(this.getUserId());
return communityService.addComActEasyPhotoComment(comActEasyPhotoCommentDTO);
}
@@ -285,7 +309,7 @@
@GetMapping("agreement")
@ApiImplicitParam(name = "type", value = "1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策")
public R agreement(@RequestParam("type") Integer type) {
- return userService.agreement(type,this.getAppId());
+ return userService.agreement(type, this.getAppId());
}
@ApiOperation("发布留言")
@@ -395,7 +419,7 @@
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
if (loginUserInfo != null) {
userId = loginUserInfo.getUserId();
- if(loginUserInfo.getCommunityId()!=null){
+ if (loginUserInfo.getCommunityId() != null) {
communityId = loginUserInfo.getCommunityId();
}
}
--
Gitblit v1.7.1