From 50687d620d71f7785f24fc0a8007c5a9f18e0e9d Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 10 十月 2022 15:46:30 +0800
Subject: [PATCH] #feat 提交
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborWestApi.java | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborWestApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborWestApi.java
index 2b71d6c..4ffc58c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborWestApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborWestApi.java
@@ -2,6 +2,7 @@
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.*;
@@ -65,7 +66,7 @@
if (StrUtil.isNotBlank(releaseContent)) {
String result = checkService.checkMessageBy(releaseContent, openid, appId);
if (StrUtil.isNotBlank(result)) {
- return R.fail("填写内容存在 " + result + " 违规信息");
+ return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
}
}
@@ -73,7 +74,7 @@
String releaseImages = addNeighborCircleAppDTO.getReleaseImages();
if (StrUtil.isNotBlank(releaseImages)) {
if (!checkService.checkImageBy(releaseImages, appId)) {
- return R.fail("上传图片存在违规信息");
+ return R.fail(Constants.NOTICE_FAIL, "上传图片存在违规信息");
}
}
@@ -84,30 +85,37 @@
addNeighborCircleAppDTO.setCommunityId(communityId);
}
- //查询社区自动审核是否开着
- String key = NeighborCircleConstants.NEIGHBOR_CIRCLE_AUTO_EXAMINE;
- R isOk = communityWestService.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 (checkService.checkMessage(msg)) {
- addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.yes);
+ if(this.getAppId().equals("wx118de8a734d269f0")){
+ //花城直接通过
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
+ addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.yes);
+ }else {
+ //查询社区自动审核是否开着
+ String key = NeighborCircleConstants.NEIGHBOR_CIRCLE_AUTO_EXAMINE;
+ R isOk = communityWestService.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.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.no);
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
}
} else {
- addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
+ communityWestService.addSysConfValue(key + communityId, communityId, "社区邻里圈自动审核参数", "1");
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
}
} else {
- communityWestService.addSysConfValue(key + communityId, communityId, "社区邻里圈自动审核参数", "1");
- addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
}
- } else {
- addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
}
+
return communityWestService.addNeighborByApp(addNeighborCircleAppDTO);
}
@@ -179,7 +187,7 @@
if (StrUtil.isNotBlank(content)) {
String result = checkService.checkMessageBy(content, openid, appId);
if (StrUtil.isNotBlank(result)) {
- return R.fail("填写内容存在 " + result + " 违规信息");
+ return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
}
}
return communityWestService.neighborCommentByApp(commentAppDTO);
--
Gitblit v1.7.1