Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-09-01 e53f93c3de72503e8d813a960293945ed3356975

Merge remote-tracking branch 'origin/test' into test

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

@@ -111,6 +111,12 @@
        return communityService.detailActivity(id, userId);
    }

    @ApiOperation(value = "分页查询活动评价记录", response = ComActActEvaluateVO.class)
    @PostMapping("evaluate/page")
    public R pageActivityEvaluates(@RequestBody ComActActEvaluateVO comActActEvaluateVO) {
        return communityService.pageActivityEvaluates(comActActEvaluateVO);
    }

    @ApiOperation(value = "社区活动/志愿者活动签到")
    @PostMapping("activity/sign-in")
    public R activitySignIn(@RequestBody ComActActRegistVO comActActRegistVO) {
@@ -121,7 +127,9 @@
    @ApiOperation(value = "社区活动/志愿者活动评价")
    @PostMapping("activity/evaluate")
    public R activityEvaluate(@RequestBody ComActActEvaluateVO comActActEvaluateVO) {
        comActActEvaluateVO.setUserId(this.getUserId());
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        comActActEvaluateVO.setUserId(loginUserInfo.getUserId());
        comActActEvaluateVO.setIsVolunteer(loginUserInfo.getIsVolunteer());
        return communityService.activityEvaluate(comActActEvaluateVO);
    }


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

New file
@@ -0,0 +1,18 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComElderAuthElderliesDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * title: ComElderAuthElderliesDAO  社区政务》高龄老人认证》高龄老人表mapper类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区政务》高龄老人认证》高龄老人表mapper类
 *
 * @author txb
 * @date 2021/9/01 14:12
 */
@Mapper
public interface ComElderAuthElderliesDAO extends BaseMapper<ComElderAuthElderliesDO> {

}

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

New file
@@ -0,0 +1,18 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComElderAuthRecordsDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * title: ComElderAuthRecordsDAO  社区政务》高龄老人认证》认证记录表mapper类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区政务》高龄老人认证》认证记录表mapper类
 *
 * @author txb
 * @date 2021/9/01 14:12
 */
@Mapper
public interface ComElderAuthRecordsDAO extends BaseMapper<ComElderAuthRecordsDO> {

}

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

New file
@@ -0,0 +1,151 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * title: ComElderAuthElderliesDO  社区政务》高龄老人认证》高龄老人表实体类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区政务》高龄老人认证》高龄老人表实体类
 *
 * @author txb
 * @date 2021/9/01 14:12
 */

@Data
@TableName("com_elder_auth_elderlies")
public class ComElderAuthElderliesDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
    * 主键id
    */
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
    * 人口id
    */
    private Long populationId;

    /**
    * 街道id
    */
    private Long streetId;

    /**
    * 社区id
    */
    private Long communityId;

    /**
    * 联系电话
    */
    private String phone;

    /**
    * 姓名
    */
    private String name;

    /**
    * 身份证号
    */
    private String idCard;

    /**
    * 性别
    */
    private String sex;

    /**
    * 年龄
    */
    private Integer age;

    /**
    * 出生日期
    */
    private String birthday;

    /**
    * 人员类别（1.80-89周岁 2.90-99周岁 3.100周岁（含）以上）
    */
    private Integer personnelCategory;

    /**
    * 是否高龄老人登记（1.是  0.否）
    */
    private Integer isRegister;

    /**
    * 是否健在（1.是  0.否）
    */
    private Integer isAlive;

    /**
    * 居住地址
    */
    private String address;

    /**
    * 备注
    */
    private String remark;

    /**
    * 高龄津贴开始领取日期
    */
    private Date receiveAllowanceBegin;

    /**
    * 创建时间
    */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
    * 创建用户
    */
    private Long createBy;

    /**
    * 更新时间
    */
    private Date updateAt;

    /**
    * 修改用户
    */
    private Long updateBy;

@Override
public String toString() {
        return "ComElderAuthElderliesDO{" +
                "id=" + id +
                ", populationId=" + populationId +
                ", streetId=" + streetId +
                ", communityId=" + communityId +
                ", phone=" + phone +
                ", name=" + name +
                ", idCard=" + idCard +
                ", sex=" + sex +
                ", age=" + age +
                ", birthday=" + birthday +
                ", personnelCategory=" + personnelCategory +
                ", isRegister=" + isRegister +
                ", isAlive=" + isAlive +
                ", address=" + address +
                ", remark=" + remark +
                ", receiveAllowanceBegin=" + receiveAllowanceBegin +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
        "}";
        }
}

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

New file
@@ -0,0 +1,116 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import io.swagger.models.auth.In;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * title: ComElderAuthRecordsDO  社区政务》高龄老人认证》认证记录表实体类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区政务》高龄老人认证》认证记录表实体类
 *
 * @author txb
 * @date 2021/9/01 14:12
 */

@Data
@TableName("com_elder_auth_records")
public class ComElderAuthRecordsDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
    * 主键id
    */
    @TableId(type = IdType.INPUT)
    private Long id;

    /**
    * 高龄人口id
    */
    private Long elderliesId;

    /**
    * 认证期数
    */
    private String authPeriod;

    /**
    * 提交用户id
    */
    private Long submitUserId;

    /**
    * 认证视频
    */
    private String authVideo;

    /**
    * 审核人员
    */
    private String approver;

    /**
    * 审核状态（1.待审核 2.驳回 3.通过）
    */
    private Integer approvalStatus;

    /**
    * 审核时间
    */
    private Date approvalDate;

    /**
    * 标记
    */
    private String mark;

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

    /**
    * 认证状态（1.已认证 0.未认证）
    */
    private Boolean authStatus;

    /**
    * 认证时间
    */
    private Date authDate;

    /**
    * 创建时间
    */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
    * 更新时间
    */
    private Date updateAt;

@Override
public String toString() {
        return "ComElderAuthRecordsDO{" +
                "id=" + id +
                ", elderliesId=" + elderliesId +
                ", authPeriod=" + authPeriod +
                ", submitUserId=" + submitUserId +
                ", authVideo=" + authVideo +
                ", approver=" + approver +
                ", approvalStatus=" + approvalStatus +
                ", approvalDate=" + approvalDate +
                ", mark=" + mark +
                ", rejectReason=" + rejectReason +
                ", authStatus=" + authStatus +
                ", authDate=" + authDate +
                ", createAt=" + createAt +
                ", updateAt=" + updateAt +
        "}";
        }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComElderAuthElderliesService.java

New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComElderAuthElderliesDO;

/**
 * title: ComElderAuthElderliesService  社区政务》高龄老人认证》高龄老人表服务类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区政务》高龄老人认证》高龄老人表服务类
 *
 * @author txb
 * @date 2021/9/01 14:12
 */
public interface ComElderAuthElderliesService extends IService<ComElderAuthElderliesDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComElderAuthRecordsService.java

New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComElderAuthRecordsDO;

/**
 * title: ComElderAuthRecordsService  社区政务》高龄老人认证》认证记录表服务类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区政务》高龄老人认证》认证记录表服务类
 *
 * @author txb
 * @date 2021/9/01 14:12
 */
public interface ComElderAuthRecordsService extends IService<ComElderAuthRecordsDO> {

}

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

@@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

import javax.annotation.Resource;
@@ -51,11 +52,17 @@
     */
    @Override
    public R activityEvaluate(ComActActEvaluateVO comActActEvaluateVO) {
        ComActActEvaluateDO currentUserEvaluateForThisActivity = this.baseMapper.selectOne(new QueryWrapper<ComActActEvaluateDO>().lambda()
                .eq(ComActActEvaluateDO::getActivityId, comActActEvaluateVO.getActivityId())
                .eq(ComActActEvaluateDO::getUserId, comActActEvaluateVO.getUserId()));
        if (Objects.nonNull(currentUserEvaluateForThisActivity)) {
            return R.fail("该用户已评论过了，请勿重复评论");
        }
        ComActActEvaluateDO comActActEvaluateDO = new ComActActEvaluateDO();
        BeanUtils.copyProperties(comActActEvaluateVO, comActActEvaluateDO);
        int result = this.baseMapper.insert(comActActEvaluateDO);
        if (result < 0) {
            return R.fail();
            return R.fail("评论失败，请重试");
        }
        return R.ok();
    }

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

New file
@@ -0,0 +1,22 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComElderAuthElderliesDAO;
import com.panzhihua.service_community.model.dos.ComElderAuthElderliesDO;
import com.panzhihua.service_community.service.ComElderAuthElderliesService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * title: ComElderAuthElderliesServiceImpl  社区政务》高龄老人认证》高龄老人表服务实现类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区政务》高龄老人认证》高龄老人表服务实现类
 *
 * @author txb
 * @date 2021/9/01 14:12
 */
@Slf4j
@Service
public class ComElderAuthElderliesServiceImpl extends ServiceImpl<ComElderAuthElderliesDAO, ComElderAuthElderliesDO> implements ComElderAuthElderliesService {

}

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

New file
@@ -0,0 +1,22 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComElderAuthRecordsDAO;
import com.panzhihua.service_community.model.dos.ComElderAuthRecordsDO;
import com.panzhihua.service_community.service.ComElderAuthRecordsService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * title: ComElderAuthRecordsServiceImpl  社区政务》高龄老人认证》认证记录表服务实现类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区政务》高龄老人认证》认证记录表服务实现类
 *
 * @author txb
 * @date 2021/9/01 14:12
 */
@Slf4j
@Service
public class ComElderAuthRecordsServiceImpl extends ServiceImpl<ComElderAuthRecordsDAO, ComElderAuthRecordsDO> implements ComElderAuthRecordsService {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActEvaluateMapper.xml

@@ -44,7 +44,7 @@

        FROM
            com_act_act_evaluate caae
            LEFT JOIN com_act_act_sign caas ON caae.activity_id = caas.activity_id
            LEFT JOIN com_act_act_sign caas ON caae.activity_id = caas.activity_id AND caae.user_id = caas.user_id
            LEFT JOIN sys_user su ON caae.user_id = su.user_id
        where caae.activity_id = #{comActActEvaluateVO.activityId}
        <if test="comActActEvaluateVO.phone != null and comActActEvaluateVO.phone !=''">

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComElderAuthElderliesMapper.xml

New file
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComElderAuthElderliesDAO">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComElderAuthElderliesDO">
                <id column="id" property="id" />
                <result column="population_id" property="populationId" />
                <result column="street_id" property="streetId" />
                <result column="community_id" property="communityId" />
                <result column="phone" property="phone" />
                <result column="name" property="name" />
                <result column="id_card" property="idCard" />
                <result column="sex" property="sex" />
                <result column="age" property="age" />
                <result column="birthday" property="birthday" />
                <result column="personnel_category" property="personnelCategory" />
                <result column="is_register" property="isRegister" />
                <result column="is_alive" property="isAlive" />
                <result column="address" property="address" />
                <result column="remark" property="remark" />
                <result column="receive_allowance_begin" property="receiveAllowanceBegin" />
                <result column="create_at" property="createAt" />
                <result column="create_by" property="createBy" />
                <result column="update_at" property="updateAt" />
                <result column="update_by" property="updateBy" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, population_id, street_id, community_id, phone, name, id_card, sex, age, birthday, personnel_category, is_register, is_alive, address, remark, receive_allowance_begin, create_at, create_by, update_at, update_by
    </sql>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComElderAuthRecordsMapper.xml

New file
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComElderAuthRecordsDAO">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComElderAuthRecordsDO">
                <id column="id" property="id" />
                <result column="elderlies_id" property="elderliesId" />
                <result column="auth_period" property="authPeriod" />
                <result column="submit_user_id" property="submitUserId" />
                <result column="auth_video" property="authVideo" />
                <result column="approver" property="approver" />
                <result column="approval_status" property="approvalStatus" />
                <result column="approval_date" property="approvalDate" />
                <result column="mark" property="mark" />
                <result column="reject_reason" property="rejectReason" />
                <result column="auth_status" property="authStatus" />
                <result column="auth_date" property="authDate" />
                <result column="create_at" property="createAt" />
                <result column="update_at" property="updateAt" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, elderlies_id, auth_period, submit_user_id, auth_video, approver, approval_status, approval_date, mark, reject_reason, auth_status, auth_date, create_at, update_at
    </sql>

</mapper>

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

@@ -244,6 +244,7 @@
                noLoginUrl.add("/api/applets/partybuilding/pageactivity");
                noLoginUrl.add("/api/applets/community/pagevolunteer");
                noLoginUrl.add("/api/applets/community/volunteer");
                noLoginUrl.add("/api/applets/community/evaluate/page");
                if (noLoginUrl.contains(requestURI)) {
                    List<SimpleGrantedAuthority> authorities = new ArrayList<>();
                    authorities.add(new SimpleGrantedAuthority(SecurityConstants.ROLE_APPLETS));