Merge branch 'local_20221010' into huacheng_test

yanghui

2022-10-10 2cdbb69378ac6af3786b8800977de437ba53241c

 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,6 +85,11 @@
            addNeighborCircleAppDTO.setCommunityId(communityId);
        }

        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);
@@ -93,7 +99,7 @@
                if (value.equals("1")) {
                    addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
                    String msg = addNeighborCircleAppDTO.getReleaseContent();
                    if (checkService.checkMessage(msg)) {
                        if (StrUtil.isEmpty(checkService.checkMessageBy(msg,this.getLoginUserInfo().getOpenid(),this.getAppId()))) {
                        addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.yes);
                    } else {
                        addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.no);
@@ -108,6 +114,8 @@
        } 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);