Merge branch 'test' into 'master'

罗yu 元桥

2021-05-07 70eb051b54b835edb3f93e701e5d07a1d21045e6

Merge branch 'test' into 'master'

Test

See merge request root/zhihuishequ!9

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java

@@ -249,7 +249,6 @@
        comActMessageVO.setUserId(userId);
        comActMessageVO.setUserName(loginUserInfo.getName());
        comActMessageVO.setUserAccount(loginUserInfo.getAccount());
        comActMessageVO.setUserPhone(loginUserInfo.getPhone());
        comActMessageVO.setIspublic(1);
        comActMessageVO.setStatus(1);
        return communityService.addMessage(comActMessageVO);

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java

@@ -6,6 +6,7 @@
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.ComActNeighborCommentReplyAppVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
@@ -151,7 +152,7 @@
        return communityService.neighborAddBrowseByApp(addBrowseAppDTO);
    }

    @ApiOperation(value = "分页查询评论下所有回复")
    @ApiOperation(value = "分页查询评论下所有回复",response = ComActNeighborCommentReplyAppVO.class)
    @PostMapping("comment/reply")
    public R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO) {
        Long userId = this.getLoginUserInfo().getUserId();

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java

@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.applets.weixin.CheckService;
import com.panzhihua.applets.model.dtos.ComPbMemberCertificationDTO;
import com.panzhihua.common.model.dtos.shop.ExcelShopOrderDTO;
import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.community.*;
@@ -26,10 +27,8 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;

/**
@@ -340,16 +339,20 @@
        R certUser = partyBuildingService.userCertification(userId);

        Object certUserInfo = certUser.getData();
        boolean userCertified = false;
        if (certUserInfo != null) {
        AtomicBoolean userCertified = new AtomicBoolean(false);
        if (R.isOk(certUser) && certUserInfo != null) {
            try {
                PartyBuildingMemberVO certUserVo = JSONObject.parseObject(JSONObject.toJSONString(certUser.getData()), PartyBuildingMemberVO.class);
                List<PartyBuildingMemberVO> partyBuildingMemberVOList = JSONArray.parseArray(JSONArray.toJSONString(certUser.getData()), PartyBuildingMemberVO.class);
                //已认证党员身份，直接返回
                userCertified = certUserVo.getAuditResult() == 1;
                if(partyBuildingMemberVOList!=null && partyBuildingMemberVOList.size()>0) {
                    partyBuildingMemberVOList.forEach(vo -> {
                        userCertified.set(vo.getAuditResult() == 1);
                    });
                }
            }catch (Exception e){}
        }
        //匹配手机，验证是否进行自动确认
        if (userCertified) {
        if (userCertified.get()) {
            return R.fail("您已审核通过，无需重复提交");
        }

@@ -378,7 +381,20 @@
        //党员认证查询
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long userId = loginUserInfo.getUserId();
        return partyBuildingService.userCertification(userId);
        R r = partyBuildingService.userCertification(userId);

        if(R.isOk(r)) {
            List<PartyBuildingMemberVO> partyBuildingMemberVOList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), PartyBuildingMemberVO.class);
            if(partyBuildingMemberVOList!=null && partyBuildingMemberVOList.size()>0){
                Optional<PartyBuildingMemberVO> ot = partyBuildingMemberVOList.stream().filter(partyBuildingMemberVO -> partyBuildingMemberVO.getAuditResult()==1).findFirst();
                if(ot.isPresent()){
                    return R.ok(ot.get());
                }else{
                    return R.ok(partyBuildingMemberVOList.get(0));
                }
            }
        }
        return R.ok();
    }



 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java

@@ -16,6 +16,7 @@
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.IdCardUtil;
import com.panzhihua.common.utlis.ListUtils;
import com.panzhihua.common.utlis.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
@@ -24,6 +25,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * @description: 实有人口导入监听
@@ -183,6 +185,7 @@
                        vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("(")));
                    }
                }

                voList.add(vo);
                index++;
            }
@@ -195,7 +198,9 @@
//            }else{
//                throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
//            }
            R r = communityService.listSavePopulationServeExcelVO(voList, communityId);
            //根据list中的IdCard城市来去重
            List<ComMngPopulationServeExcelVO> newVoList = voList.stream().filter(ListUtils.distinctByKey(ComMngPopulationServeExcelVO::getCardNo)).collect(Collectors.toList());
            R r = communityService.listSavePopulationServeExcelVO(newVoList, communityId);
            if (!R.isOk(r)) {
                String errMsg = r.getMsg();
                List<ComMngPopulationImportErrorVO> errorList = JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class);

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngRealCompanyExcelListen.java

@@ -6,12 +6,15 @@
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.ListUtils;
import lombok.extern.slf4j.Slf4j;

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @description: 实有单位导入监听
@@ -40,7 +43,9 @@
        // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
        if(list.size() >= BATCH_COUNT){
            log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
            R r = this.communityService.listSaveMngRealCompanyExcelVO(list,this.communityId);
            // 根据list中的creditCode来去重
            List<ComMngRealCompanyExcelVO> newVoList = list.stream().filter(ListUtils.distinctByKey(ComMngRealCompanyExcelVO::getCreditCode)).collect(Collectors.toList());
            R r = this.communityService.listSaveMngRealCompanyExcelVO(newVoList,this.communityId);
            if (!R.isOk(r)) {
                throw new ServiceException(r.getMsg());
            }
@@ -52,7 +57,9 @@
    @Override
    public void doAfterAllAnalysed(AnalysisContext analysisContext) {
        log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
        R r = this.communityService.listSaveMngRealCompanyExcelVO(list,this.communityId);//确保最后遗留的数据保存在数据库中
        // 根据list中的creditCode来去重
        List<ComMngRealCompanyExcelVO> newVoList = list.stream().filter(ListUtils.distinctByKey(ComMngRealCompanyExcelVO::getCreditCode)).collect(Collectors.toList());
        R r = this.communityService.listSaveMngRealCompanyExcelVO(newVoList,this.communityId);//确保最后遗留的数据保存在数据库中
        if (!R.isOk(r)) {
            throw new ServiceException(r.getMsg());
        }

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComCvtBusinessDTO.java

@@ -7,6 +7,7 @@
import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
@@ -45,7 +46,7 @@
    private String busScope;

    @ApiModelProperty("服务范围标记：1-全攀枝花市，2-部分地区")
    @NotBlank(groups = {AddGroup.class},message = "服务范围标记不能为空")
    @NotNull(groups = {AddGroup.class},message = "服务范围标记不能为空")
    private Integer areaFlag;

    @ApiModelProperty("商家logo")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java

@@ -83,4 +83,15 @@
    @ApiModelProperty("是否已经点赞 1 是 2 否")
    private Integer haveSign;

    /**
     * 发布类型（1.小程序发布  2.后台发布）
     */
    @ApiModelProperty("发布类型（1.小程序发布  2.后台发布）")
    private Integer type;

    /**
     * 社区id
     */
    @ApiModelProperty("社区id")
    private Long communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentAppVO.java

@@ -48,6 +48,9 @@
    @ApiModelProperty("邻里圈评论回复列表（默认展示2条）")
    private List<ComActNeighborCircleCommentReplyAppVO> circleCommentReplyAppList;

    @ApiModelProperty("邻里圈评论回复数量")
    private Integer commentReplyNum;

    /**
     * 是否已经点赞 1 是 2 否
     */

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java

@@ -61,4 +61,16 @@
    @ApiModelProperty("是否已经点赞 1 是 2 否")
    private Integer haveSign;

    /**
     * 发布类型（1.小程序发布  2.后台发布）
     */
    @ApiModelProperty("发布类型（1.小程序发布  2.后台发布）")
    private Integer type;

    /**
     * 社区id
     */
    @ApiModelProperty("社区id")
    private Long communityId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/EditNeighborCircleAdminVO.java

@@ -23,4 +23,14 @@

    @ApiModelProperty("驳回原因")
    private String refuseReason;

    /**
     * 发布状态(1.待审核 2.显示 3.隐藏 4.驳回)
     */
    public interface status{
        int dsh = 1;
        int xs = 2;
        int yc = 3;
        int bh = 4;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberExcelVO.java

New file
@@ -0,0 +1,33 @@
package com.panzhihua.common.model.vos.partybuilding;

import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @description: 党员信息导出
 * @author: lyq
 * @date: 2021/5/6 17:48
 */
@Data
public class ComPbMemberExcelVO {

    @ExcelProperty(value = "党员姓名" ,index = 0)
    private String comName;

    @ExcelProperty(value = "身份证号" ,index = 1)
    private String idCard;

    @ExcelProperty(value = "所属党组织" ,index = 2)
    private String orgName;

    @ExcelProperty(value = "入党日期" ,index = 3)
    private Date joinTime;

    @ExcelProperty(value = "转正日期" ,index = 4)
    private Date employmentTime;

    @ExcelProperty(value = "所属社区" ,index = 5)
    private String communityName;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java

@@ -51,4 +51,6 @@
    private Long userId;
    @ApiModelProperty(value = "党员审查结果: 0 待审核 1 已审核 2 自动认证 3 已驳回")
    private Integer auditResult;
    @ApiModelProperty(value = "驳回原因")
    private String refuseReason;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserNoticeVO.java

@@ -29,7 +29,7 @@
    @ApiModelProperty("消息标题")
    private String title;

    @ApiModelProperty("具体业务类型 1 社区活动 2党建活动 3微心愿通知 4随手拍服务通知 5支援者申请 6实名制审核 7人脸识别审核 8积分获取和消耗 9积分点击直接跳转积分列表 10 房屋审核通知")
    @ApiModelProperty("具体业务类型 1 社区活动 2党建活动 3微心愿通知 4随手拍服务通知 5支援者申请 6实名制审核 7人脸识别审核 8积分获取和消耗 9积分点击直接跳转积分列表 10 房屋审核通知 11 党员认证审核通知 12邻里圈审核通知")
    private Integer businessType;

    @ApiModelProperty("业务标题")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java

@@ -399,4 +399,12 @@
     */
    @PostMapping("/partybuildIng/deleteprepartybuildingmember")
    R deleteprepartybuildingmember(@RequestParam("id") Long id);

    /**
     * 导出党员信息
     * @param organizationVO    请求参数
     * @return  党员信息列表
     */
    @PostMapping("/partybuildIng/exportPbMember")
    R exportPbMember(@RequestBody PagePartyOrganizationVO organizationVO);
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ListUtils.java

New file
@@ -0,0 +1,14 @@
package com.panzhihua.common.utlis;

import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
import java.util.function.Predicate;

public class ListUtils {

    public static <T> Predicate<T> distinctByKey(Function<? super T, Object> keyExtractor) {
        Map<Object, Boolean> seen = new ConcurrentHashMap<>();
        return t -> seen.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java

@@ -1,16 +1,23 @@
package com.panzhihua.community_backstage.api;

import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.jcraft.jsch.SftpException;
import com.panzhihua.common.constants.FtpConstants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.dtos.community.ExportRealCompanyExcelDTO;
import com.panzhihua.common.model.dtos.partybuilding.ComPbServiceTeamDTO;
import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComActMessageVO;
import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO;
import com.panzhihua.common.model.vos.community.ResetComActMessageVO;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.common.model.vos.user.RoleVO;
@@ -20,11 +27,11 @@
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
import com.panzhihua.community_backstage.listen.PartyBuildingMemberExcelListen;
import com.panzhihua.community_backstage.model.dto.PartyBuildingMemberDTO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javassist.expr.NewArray;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.ObjectUtils;
@@ -35,6 +42,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
@@ -60,7 +69,9 @@
    @Resource
    private UserService userService;
    @Value("${excel.url}")
    private String excelUrl = "http://panzhihua.nhys.cdnhxx.com/web/%E7%A4%BE%E5%8C%BA%E5%85%9A%E5%91%98%E6%95%B0%E6%8D%AE%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx";
    private String excelUrl = "http://panzhihua.nhys.cdnhxx.com/web/";
    @Value("${excel.userurl}")
    private String userurl;
    // FTP 登录用户名
    @Value("${ftp.username}")
    private String userName;
@@ -541,17 +552,59 @@
                break;
            case 0:
                partyBuildingMemberVO.setAuditResult(3);
                partyBuildingMemberVO.setRefuseReason(partyBuildingMemberDTO.getRefuseReason());
                break;
            default:
                return R.fail("参数错误");
        }

        R updated = partyBuildingService.updatePartyBuildingMember(partyBuildingMemberVO);

        //审核通过： 修改用户的党员状态
        if(R.isOk(updated)) {
            PartyBuildingMemberVO vo1 = JSONObject.parseObject(JSONObject.toJSONString(updated.getData()), PartyBuildingMemberVO.class);
            Long userId = vo1.getUserId();
            Long memId = partyBuildingMemberVO.getId();
            String userIdcard = vo1.getIdCard();
        if((1==partyBuildingMemberVO.getAuditResult()) && R.isOk(updated) ) {
            return userService.updateUserIsPartymember(updated.getData().toString());
        }else if(0==partyBuildingMemberVO.getAuditResult() && R.isOk(updated)){
            return userService.updateUserNotPartymember(updated.getData().toString());
                R r = userService.updateUserIsPartymember(userIdcard);
                if (R.isOk(r)) {
                    SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
                    sysUserNoticeVO.setUserId(userId);
                    sysUserNoticeVO.setType(3);
                    sysUserNoticeVO.setTitle("党员认证申请审核通过");
                    sysUserNoticeVO.setBusinessType(11);
                    sysUserNoticeVO.setBusinessTitle(" ");
                    sysUserNoticeVO.setBusinessContent("你提交的党员认证申请已被审核通过");
                    sysUserNoticeVO.setBusinessId(memId);
                    sysUserNoticeVO.setStatus(0);
                    sysUserNoticeVO.setBusinessStatus(2);
                    R r1 = userService.addNotice(sysUserNoticeVO);
                    if (R.isOk(r1)) {
                        log.info("新增党员认证已被审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                    }
                }
                return r;
            } else if (3 == partyBuildingMemberVO.getAuditResult() && R.isOk(updated)) {
                R r = userService.updateUserNotPartymember(userIdcard);
                if (R.isOk(r)) {
                    SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
                    sysUserNoticeVO.setUserId(userId);
                    sysUserNoticeVO.setType(3);
                    sysUserNoticeVO.setTitle("党员认证申请被驳回");
                    sysUserNoticeVO.setBusinessType(11);
                    sysUserNoticeVO.setBusinessTitle(" ");
                    sysUserNoticeVO.setBusinessContent("你提交的党员认证申请已被驳回");
                    sysUserNoticeVO.setBusinessId(memId);
                    sysUserNoticeVO.setStatus(0);
                    sysUserNoticeVO.setBusinessStatus(1);
                    R r1 = userService.addNotice(sysUserNoticeVO);
                    if (R.isOk(r1)) {
                        log.info("新增党员认证已被审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                    }
                }
                return r;
            }
        }
        return updated;
    }
@@ -562,4 +615,58 @@
        return partyBuildingService.deleteprepartybuildingmember(id);
    }

    @ApiOperation(value = "党员信息导出Excel")
    @PostMapping("/member/export")
    public R exportPbMember(@RequestBody PagePartyOrganizationVO organizationVO) {
        organizationVO.setCommunityId(this.getCommunityId());
        String url = userurl;
        String name = "党员信息数据.xlsx";
        String ftpUrl = "/mnt/data/web/excel/";
//        用户搜索了就下载搜索的用户否则下载所有用户
        R r = partyBuildingService.exportPbMember(organizationVO);
        if (R.isOk(r)) {
            List<ComPbMemberExcelVO> eexcelUserDTOS = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComPbMemberExcelVO.class);
            try {
                SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
                sftp.login();
                boolean existDir = sftp.isExistDir(ftpUrl + name);
                if (!existDir) {
                    String property = System.getProperty("user.dir");
                    String fileName = property + File.separator + name;
                    // 这里 需要指定写用哪个class去写
                    ExcelWriter excelWriter = null;
                    InputStream inputStream = null;
                    try {
                        excelWriter = EasyExcel.write(fileName, ComPbMemberExcelVO.class).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).registerWriteHandler(new CustomSheetWriteHandler()).build();
                        WriteSheet writeSheet = EasyExcel.writerSheet("党员信息数据导出").build();
                        excelWriter.write(eexcelUserDTOS, writeSheet);
                        excelWriter.finish();
                        File file = new File(fileName);
                        inputStream = new FileInputStream(file);
                        sftp.uploadMore(ftpUrl, name, inputStream);
                        sftp.logout();
                        inputStream.close();
                        String absolutePath = file.getAbsolutePath();
                        boolean delete = file.delete();
                        log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                    } finally {
                        // 千万别忘记finish 会帮忙关闭流
                        if (inputStream != null) {
                            inputStream.close();
                        }
                        if (excelWriter != null) {
                            excelWriter.finish();
                        }
                    }
                }
                return R.ok(url + name);
            } catch (Exception e) {
                e.printStackTrace();
                log.error("文件传输失败【{}】", e.getMessage());
                return R.fail();
            }
        }
        return R.fail("未查询到用户");
    }

}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NeighborApi.java

@@ -1,5 +1,6 @@
package com.panzhihua.community_backstage.api;

import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
@@ -7,7 +8,9 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.*;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -26,6 +29,8 @@
public class NeighborApi extends BaseController {
    @Resource
    private CommunityService communityService;
    @Resource
    private UserService userService;

    @ApiOperation(value = "邻里圈_分页",response = ComActNeighborCircleAdminVO.class)
    @PostMapping("pageNeighborByAdmin")
@@ -42,7 +47,43 @@
    @ApiOperation(value = "邻里圈_修改")
    @PostMapping("changeStatusByAdmin")
    R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO){
        return communityService.changeStatusByAdmin(editNeighborCircleAdminVO);
        R r = communityService.changeStatusByAdmin(editNeighborCircleAdminVO);
        if (R.isOk(r)){//邻里圈审核
            if(editNeighborCircleAdminVO.getStatus().equals(EditNeighborCircleAdminVO.status.xs)){
                //审核通过添加提示信息
                SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
                sysUserNoticeVO.setUserId(Long.parseLong(r.getData().toString()));
                sysUserNoticeVO.setType(3);
                sysUserNoticeVO.setTitle("邻里圈审核通过");
                sysUserNoticeVO.setBusinessType(12);
                sysUserNoticeVO.setBusinessTitle("");
                sysUserNoticeVO.setBusinessContent("您发布的邻里圈已通过审核，可在邻里圈模块查看");
                sysUserNoticeVO.setBusinessId(editNeighborCircleAdminVO.getId());
                sysUserNoticeVO.setStatus(0);
                sysUserNoticeVO.setBusinessStatus(2);
                R r2 = userService.addNotice(sysUserNoticeVO);
                if (R.isOk(r2)) {
                    log.info("邻里圈审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                }
            }else if(editNeighborCircleAdminVO.getStatus().equals(EditNeighborCircleAdminVO.status.bh)){
                //审核驳回添加提示信息
                SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
                sysUserNoticeVO.setUserId(Long.parseLong(r.getData().toString()));
                sysUserNoticeVO.setType(3);
                sysUserNoticeVO.setTitle("邻里圈审核未通过");
                sysUserNoticeVO.setBusinessType(12);
                sysUserNoticeVO.setBusinessContent("驳回原因：" + editNeighborCircleAdminVO.getRefuseReason());
                sysUserNoticeVO.setBusinessTitle("");
                sysUserNoticeVO.setBusinessId(editNeighborCircleAdminVO.getId());
                sysUserNoticeVO.setStatus(0);
                sysUserNoticeVO.setBusinessStatus(1);
                R r2 = userService.addNotice(sysUserNoticeVO);
                if (R.isOk(r2)) {
                    log.info("邻里圈审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                }
            }
        }
        return r;
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/model/dto/PartyBuildingMemberDTO.java

@@ -20,4 +20,7 @@
    @ApiModelProperty(value = "身份证号", required = true)
    private String idCard;

    @ApiModelProperty(value = "驳回原因")
    private String refuseReason;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java

@@ -29,12 +29,21 @@
    @Select("select * from com_act_message_back where msg_id=#{id} order by create_at desc")
    List<ComActMessageBackVO> selectMsgBackList(@Param("id")Long id);
    
    @Select("select * from com_act_message where (sendto_user_id in (select id from com_pb_member_role t1 where t1.phone=#{comActMessageVO.phone})) or (sendto_user_id in (select id from com_pb_service_team t2 where t2.phone=#{comActMessageVO.phone}))  order by create_at desc")
    @Select("<script>" +
            "select * from com_act_message " +
            " where " +
            " ((sendto_user_id in (select id from com_pb_member_role t1 where t1.phone=#{comActMessageVO.phone})) " +
            " or (sendto_user_id in (select id from com_pb_service_team t2 where t2.phone=#{comActMessageVO.phone})))" +
            "<if test='comActMessageVO.status != null'>" +
            " and status=#{comActMessageVO.status} \n" +
            " </if> " +
            " order by create_at desc"+
            "</script>")
    IPage<PageComActMessageVO> pageSendMeMessageApplets(Page page, @Param("comActMessageVO")ComActMessageVO comActMessageVO);
    
    @Select("select * from com_act_message where user_id=#{comActMessageVO.userId}  order by create_at desc")
    IPage<PageComActMessageVO> pageMyMessageApplets(Page page, @Param("comActMessageVO")ComActMessageVO comActMessageVO);
    @Select("select * from com_act_message where sendto_user_id=#{comActMessageVO.sendtoUserId} and ispublic=1")
    @Select("select * from com_act_message where sendto_user_id=#{comActMessageVO.sendtoUserId} and ispublic=1 order by create_at desc ")
    IPage<PageComActMessageVO> pageMessageByUserApplets(Page page, @Param("comActMessageVO")ComActMessageVO comActMessageVO);
    
    @Update("update com_act_message set ispublic=#{ispublic} where id=#{id}")

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java

@@ -38,7 +38,7 @@
    IPage<ComActNeighborCircleCommentAppVO> pageNeighborCommentByApp(Page page, @Param("neighborCircleAppDTO") ComActNeighborCircleDetailAppDTO neighborCircleAppDTO);

    @Select("<script> " +
            "select nc.*,u.name as userName from com_act_neighbor_circle_comment nc left join sys_user u on nc.user_id=u.user_id  " +
            "select nc.*,u.nick_name as userName,u.phone as userPhone from com_act_neighbor_circle_comment nc left join sys_user u on nc.user_id=u.user_id  " +
            "<where>"+
            "<if test='dto.id != null and dto.id!= 0l'>" +
            "nc.circle_id = #{dto.id}"+

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyDAO.java

@@ -28,7 +28,7 @@
            " from com_act_neighbor_circle_comment_reply as reply" +
            " left join sys_user su1 on su1.user_id = reply.user_id " +
            " left join sys_user su2 on su2.user_id = reply.parent_user_id " +
            " where reply.comment_id = #{commentId} order by create_at desc limit 2" +
            " where reply.comment_id = #{commentId} order by create_at desc" +
            " </script>")
    List<ComActNeighborCircleCommentReplyAppVO> getCircleCommentReplyList(@Param("commentId") Long commentId);


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java

@@ -39,7 +39,9 @@
            "canc.last_comment_num," +
            "canc.last_fabulous_num," +
            "canc.last_views_num," +
            "canc.type," +
            "su.nick_name as name," +
            "su.community_id," +
            "su.image_url as headUrl " +
            " FROM " +
            " com_act_neighbor_circle AS canc" +
@@ -60,19 +62,18 @@
    @Select("<script> " +
            "select canc.id,su.nick_name as name,su.image_url as headUrl,canc.release_content " +
            ",canc.release_images,canc.comment_num,canc.fabulous_num,canc.forward_num,canc.views_num " +
            ",canc.is_boutique,canc.create_at,canc.reply_at from com_act_neighbor_circle as canc " +
            ",canc.is_boutique,canc.create_at,canc.reply_at,su.community_id,canc.type from com_act_neighbor_circle as canc " +
            " left join sys_user as su on su.user_id = canc.release_id where id = #{circleId}"+
            " </script>")
    ComActNeighborCircleDetailAppVO neighborDetailByApp(@Param("circleId") Long circleId);
    @Select("<script> \n"+
            "SELECT\n" +
            "nc.*,\n" +
            "u.`name` AS releaseName,u.`type` as userType\n" +
            ",ca.name as communityName\n" +
            "u.`nick_name` AS releaseName,u.`type` as userType\n" +
            ",u.name as communityName\n" +
            "FROM\n" +
            "com_act_neighbor_circle nc\n" +
            "LEFT JOIN sys_user u ON nc.release_id = u.user_id\n" +
            "left join com_act ca on u.community_id=ca.community_id \n" +
            "<where>"+
            "nc.community_id = #{neighborCircleAdminDTO.communityId}  \n"+
            "<if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent != &quot;&quot;'>" +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java

@@ -112,6 +112,11 @@
    private Integer lastViewsNum;

    /**
     * 发布类型（1.小程序发布  2.后台发布）
     */
    private Integer type;

    /**
     * 发布状态(1.待审核 2.显示 3.隐藏 4.驳回)
     */
    public interface status{
@@ -121,6 +126,14 @@
        int bh = 4;
    }

    /**
     * 发布类型（1.小程序发布  2.后台发布）
     */
    public interface type{
        int mini = 1;
        int admin = 2;
    }

    @Override
    public String toString() {
        return "ComActNeighborCircleDO{" +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java

@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;

import java.util.ArrayList;
import java.util.Date;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -68,6 +69,8 @@
    private ComActNeighborCircleFabulousDAO comActNeighborCircleFabulousDAO;
    @Resource
    private ComActNeighborCircleBrowseDAO comActNeighborCircleBrowseDAO;
    @Resource
    private ComActDAO comActDAO;

    /**
     * 分页查询邻里圈列表
@@ -91,6 +94,14 @@
                }else{
                    circleAppVO.setHaveSign(2);
                }

                if(circleAppVO.getType() != null && circleAppVO.getType().equals(ComActNeighborCircleDO.type.admin)){
                    ComActDO actDO = comActDAO.selectById(circleAppVO.getCommunityId());
                    if(actDO != null){
                        circleAppVO.setName(actDO.getName());
                    }
                }

            }
        }
        return R.ok(doPager);
@@ -136,6 +147,13 @@
            return R.fail("未找到邻里圈信息");
        }

        if(circleDetailAppVO.getType() != null && circleDetailAppVO.getType().equals(ComActNeighborCircleDO.type.admin)){
            ComActDO actDO = comActDAO.selectById(circleDetailAppVO.getCommunityId());
            if(actDO != null){
                circleDetailAppVO.setName(actDO.getName());
            }
        }

        //查询邻里圈点赞信息
        ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,circleDetailAppVO.getId())
@@ -167,7 +185,12 @@
                //查询评论下评论回复
                List<ComActNeighborCircleCommentReplyAppVO> commentReplyAppVOS = comActNeighborCircleCommentReplyDAO.getCircleCommentReplyList(circleCommentVo.getId());
                if(!commentReplyAppVOS.isEmpty()){
                    List<ComActNeighborCircleCommentReplyAppVO> newCommentReplyAppVOS = new ArrayList<>();
                    int i = 0;
                    for (ComActNeighborCircleCommentReplyAppVO commentReplyVO:commentReplyAppVOS) {
                        if(i >= 2){
                            break;
                        }
                        //查询点赞信息
                        ComActNeighborCircleFabulousDO circleReplyFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                                new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,commentReplyVO.getId())
@@ -179,8 +202,11 @@
                        }else{
                            commentReplyVO.setHaveSign(2);
                        }
                        newCommentReplyAppVOS.add(commentReplyVO);
                        i++;
                    }
                    circleCommentVo.setCircleCommentReplyAppList(commentReplyAppVOS);
                    circleCommentVo.setCircleCommentReplyAppList(newCommentReplyAppVOS);
                    circleCommentVo.setCommentReplyNum(commentReplyAppVOS.size());
                }
            }
        }
@@ -212,7 +238,8 @@
        comActNeighborCircleDO.setCommunityId(adminUser.getCommunityId());
        comActNeighborCircleDO.setReleaseContent(addVO.getReleaseContent());
        comActNeighborCircleDO.setReleaseImages(addVO.getReleaseImages());
        comActNeighborCircleDO.setStatus(1);
        comActNeighborCircleDO.setType(2);
        comActNeighborCircleDO.setStatus(2);
        comActNeighborCircleDO.setCommentNum(0);
        comActNeighborCircleDO.setFabulousNum(0);
        comActNeighborCircleDO.setForwardNum(0);
@@ -237,7 +264,7 @@
            neighborCircleDO.setRefuseReason(editVO.getRefuseReason());
        }
        this.baseMapper.updateById(neighborCircleDO);
        return R.ok();
        return R.ok(neighborCircleDO.getReleaseId());
    }

    /**
@@ -676,8 +703,9 @@
                ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                        new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,commentReplyAppVO.getId())
                                .eq(ComActNeighborCircleFabulousDO::getUserId,commentReplyAppDTO.getUserId())
                                .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.hf));
                if(circleFabulousDO != null && circleFabulousDO.getIsEffective().equals(ComActNeighborCircleFabulousDO.isEffective.yes)){
                                .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.hf)
                                .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
                if(circleFabulousDO != null){
                    commentReplyAppVO.setHaveSign(1);
                }else{
                    commentReplyAppVO.setHaveSign(2);

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -512,8 +512,8 @@
     */
    @GetMapping("usercertification")
    R userCertification(@RequestParam("id")Long id){
        ComPbMemberDO comPbMemberDO = comPbMemberService.getOne(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getUserId, id).eq(ComPbMemberDO::getAuditResult, 1));
        return R.ok(comPbMemberDO);
        List<ComPbMemberDO> comPbMemberDOList = comPbMemberService.list(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getUserId, id));
        return R.ok(comPbMemberDOList);
    }


@@ -546,4 +546,14 @@
    public R deleteprepartybuildingmember(@RequestParam("id")Long id){
        return R.ok(comPbMemberService.removeById(id));
    }

    /**
     * 导出党员信息
     * @param organizationVO    请求参数
     * @return  党员信息列表
     */
    @PostMapping("exportPbMember")
    public R exportPbMember(@RequestBody PagePartyOrganizationVO organizationVO){
        return comPbMemberService.exportPbMember(organizationVO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.partybuilding.ComPbMemberExcelVO;
import com.panzhihua.common.model.vos.partybuilding.PagePartyBuildingMemberVO;
import com.panzhihua.common.model.vos.partybuilding.PagePartyOrganizationVO;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO;
@@ -138,7 +139,8 @@
            "CASE\n" +
            "WHEN u.id_card IS NULL THEN\n" +
            "'未注册' ELSE '已注册' \n" +
            "END STATUS \n" +
            "END STATUS," +
            " m.create_at \n" +
            "FROM\n" +
            "com_pb_member m\n" +
            "LEFT JOIN sys_user u ON m.id_card = u.id_card\n" +
@@ -156,4 +158,22 @@
            " order by m.join_time desc "+
            "</script>")
    IPage<PartyBuildingMemberVO> pagePartyBuildingMembersVO(Page page, @Param("pagePartyBuildingMemberVO") PagePartyBuildingMemberVO pagePartyBuildingMemberVO);

    @Select("<script> " +
            "select cpm.name as comName,cpm.id_card,cpm.join_time,cpm.employment_time,ca.`name` as communityName,cpo.name as orgName from com_pb_member as cpm " +
            " left join com_act as ca on ca.community_id = cpm.community_id " +
            " left join com_pb_org as cpo on cpo.id = cpm.org_id " +
            " LEFT JOIN sys_user u ON cpm.id_card = u.id_card " +
            " where cpm.community_id = #{organizationVO.communityId} " +
            "<if test='organizationVO.orgName != null'>" +
            " and cpo.name LIKE CONCAT('%',#{organizationVO.orgName},'%') "+
            " </if> " +
            "<if test='organizationVO.account != null and organizationVO.account != &quot;&quot;'>" +
            " and u.phone like concat (#{organizationVO.account},'%')"+
            " </if> " +
            "<if test='organizationVO.name != null and organizationVO.name != &quot;&quot;'>" +
            " and cpm.name like concat (#{organizationVO.name},'%')"+
            " </if> " +
            "</script>")
    List<ComPbMemberExcelVO> exportPbMember(@Param("organizationVO") PagePartyOrganizationVO organizationVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java

@@ -82,4 +82,9 @@
     */
    private Long userId;

    /**
     * 驳回原因
     */
    private String refuseReason;

}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java

@@ -133,4 +133,11 @@
     * @return 编辑结果
     */
    R updatePartyBuildingMembers(PartyBuildingMemberVO partyBuildingMemberVO);

    /**
     * 导出党员信息
     * @param organizationVO    请求参数
     * @return  党员信息列表
     */
    R exportPbMember(PagePartyOrganizationVO organizationVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -206,7 +206,8 @@
     */
    @Override
    public R listPartyMember(Long communityId) {
        List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getCommunityId,communityId));
        List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda()
                .eq(ComPbMemberDO::getCommunityId,communityId).eq(ComPbMemberDO::getAuditResult, 1));
//        查询社区所有已经注册的党员
//        排除掉已经成为党委的党员
//        List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectListRegister(communityId);
@@ -506,13 +507,23 @@
            return R.fail("未找到党员认证信息");
        }
        comPbMemberDO.setAuditResult(partyBuildingMemberVO.getAuditResult());
        if(partyBuildingMemberVO.getAuditResult().equals(3)){
            comPbMemberDO.setRefuseReason(partyBuildingMemberVO.getRefuseReason());
        }
        if(partyBuildingMemberVO.getAuditResult()!=null && partyBuildingMemberVO.getAuditResult().equals(1)){
            comPbMemberDO.setUpdateAt(new Date());
        }
        if (comPbMemberDAO.updateById(comPbMemberDO) > 0) {
            return R.ok(comPbMemberDO.getIdCard());
            PartyBuildingMemberVO rtVO = new PartyBuildingMemberVO();
            BeanUtils.copyProperties(comPbMemberDO, rtVO);
            return R.ok(rtVO);
        }
        return R.fail();
    }

    @Override
    public R exportPbMember(PagePartyOrganizationVO organizationVO){
        return R.ok(comPbMemberDAO.exportPbMember(organizationVO));
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -229,7 +229,7 @@
    @Select("SELECT \n" +
            "COUNT(DISTINCT u.user_id)allUser,\n" +
            "(select COUNT(m.id) from com_mng_volunteer_mng m where m.community_id=#{communityId} and m.`state`=2)volunteerUser,\n" +
            "COUNT(DISTINCT case when u.is_partymember=1 then u.user_id else null end )partymemberUser,\n" +
            " (select count(id) from com_pb_member cpm where cpm.audit_result = 1 and cpm.community_id = #{communityId}) partymemberUser,\n" +
            "COUNT(h.id)house\n" +
            "FROM\n" +
            "sys_user u\n" +

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -1377,6 +1377,7 @@
    @Override
    public R indexDataCommunityBackstage(Long communityId) {
        IndexDataVO indexDataVO = userDao.indexDataCommunityBackstage(communityId);
        //查询后台党员数量
        return R.ok(indexDataVO);
    }


 springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/filter/StoreValidFilter.java

New file
@@ -0,0 +1,73 @@
package com.panzhihua.shop_backstage.filter;

import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.constants.TokenConstant;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.AES;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;

/**
 * @ClasssName StoreValidFilter
 * @Description 商铺有效性过滤
 * @Author cedoo
 * @Date 2021/5/7
 * @Version 1.0
 **/
@Slf4j
@Component
public class StoreValidFilter implements Filter {

    @Resource
    private CommunityService communityService;

    @Override
    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
        HttpServletRequest request = (HttpServletRequest) servletRequest;
        HttpServletResponse response = (HttpServletResponse) servletResponse;

        String uri = request.getRequestURI();

        if(!"/login".equals(uri)) {
            String userInfo = request.getHeader(TokenConstant.TOKEN_USERINFO);
            boolean empty = ObjectUtils.isEmpty(userInfo);
            if (empty) {
                log.error("获取登录用户信息失败【{}】", request);
                return;
            }
            byte[] bytes = AES.parseHexStr2Byte(userInfo);
            byte[] decrypt = AES.decrypt(bytes, Constants.AES_KEY);
            userInfo = new String(decrypt);
            LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(userInfo, LoginUserInfoVO.class);

            R r = communityService.getUserStoreInfo(loginUserInfoVO.getUserId());
            boolean shopStoreValid = false;
            if (R.isOk(r) && r.getData() != null) {
                ShopStoreVO shopStoreVO = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), ShopStoreVO.class);
                shopStoreValid = shopStoreVO.getStatus() == 1;
            }
            if (!shopStoreValid) {
                //返回请求被拒绝响应
                response.setContentType("application/json");
                response.setCharacterEncoding("UTF-8");
                response.getWriter().write(JSONObject.toJSONString(R.fail(403)));
                response.flushBuffer();
                return;
            }
        }
        filterChain.doFilter(servletRequest, servletResponse);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/CommunityJobHandler.java

@@ -122,7 +122,7 @@
     * @return 刷新个数
     * @throws Exception 出现的异常
     */
    @XxlJob("timedTaskActActivityAllJobHandler")
    @XxlJob("timedTaskActMicroWishAllJobHandler")
    public ReturnT<String> timedTaskActMicroWishAllJobHandler(String param) throws Exception {
        log.info("定时任务刷新微心愿 待自动确认的状态");
        R r=communityService.timedTaskActMicroWishAll();

 springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java

@@ -80,8 +80,13 @@
        boolean wxCgi = requestURI.contains("cgi");

        boolean isShop = requestURI.contains("isShop");

        boolean listadvertisement = requestURI.contains("listadvertisement");

        boolean pageworkguide = !requestURI.contains("workguide/pageworkguide");

        boolean detailworkguide = !requestURI.contains("workguide/detailworkguide");

        boolean pagedynamic = !requestURI.contains("partybuilding/pagedynamic");

        boolean infodynamic = !requestURI.contains("partybuilding/infodynamic");

        SafeboxRequestWrapper safeboxRequestWrapper = new SafeboxRequestWrapper(request);

        if (login||doc||css||js||ui||swagger||ico||docs||error||refreshToken||useragreement||wxPay||wxCgi||isShop||listadvertisement) {

        if (login||doc||css||js||ui||swagger||ico||docs||error||refreshToken||useragreement||wxPay

                ||wxCgi||isShop||listadvertisement||pageworkguide||detailworkguide||pagedynamic||infodynamic) {

            //什么也不做

        } else {

            // 获取请求头中JWT的Token


 springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/SercuritFilter.java

@@ -81,7 +81,12 @@
        boolean refreshToken = !requestUrl.contains("refreshToken");

        boolean useragreement = !requestUrl.contains("useragreement");

        boolean listadvertisement = !requestUrl.contains("listadvertisement");

        if (contains&&docs&&login&&refreshToken&&useragreement&&wxNotify&&wxCgi&&isShop&&listadvertisement) {

        boolean pageworkguide = !requestUrl.contains("workguide/pageworkguide");

        boolean detailworkguide = !requestUrl.contains("workguide/detailworkguide");

        boolean pagedynamic = !requestUrl.contains("partybuilding/pagedynamic");

        boolean infodynamic = !requestUrl.contains("partybuilding/infodynamic");

        if (contains&&docs&&login&&refreshToken&&useragreement&&wxNotify&&wxCgi&&isShop&&listadvertisement

                &&pageworkguide&&detailworkguide&&pagedynamic&&infodynamic) {

            configAttributes.add(new SecurityConfig(SecurityConstants.ROLE_APPLETS));

        }

        return configAttributes;