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

huanghongfa

2021-05-19 14590de8e4fb23909f1767a53d1f92007f9bbcc4

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

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

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

New file
@@ -0,0 +1,80 @@
package com.panzhihua.applets.api;


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.ClazzUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.model.vos.IPageVO;

import javax.annotation.Resource;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthVO;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Slf4j
@RestController
@RequestMapping("/eldersauth")
@Api(tags = {"高龄认证"})
public class EldersAuthApi extends BaseController {

    @Resource
    private CommunityService eldersAuthService;

    /**
     * 分页查找
     * @param pageEldersAuthDTO 查找高龄认证传递对象
     * @return 查找结果
     */
    @PostMapping("/page")
    @ApiOperation(value = "查询高龄认证", response = EldersAuthVO.class)
    R query(@Validated @RequestBody PageEldersAuthDTO pageEldersAuthDTO){
        ClazzUtils.setIfStringIsEmpty(pageEldersAuthDTO);
        pageEldersAuthDTO.setSumitUserId(this.getUserId());
        return eldersAuthService.query(pageEldersAuthDTO);
    }

    /**
     * 查询高龄认证详细信息
     * @param id 高龄认证 id
     * @return 查找结果
     */
    @GetMapping("/{id}")
    @ApiOperation(value = "查询高龄认证详细信息", response = EldersAuthDetailsVO.class)
    R<EldersAuthDetailsVO> details(@PathVariable("id") Long id){
        return eldersAuthService.eldersAuthDetails(id);
    }


    @GetMapping("/family")
    @ApiOperation(value = "我的家庭成员", response = R.class)
    R<IPageVO<ComMngFamilyInfoVO>> family(){
        return eldersAuthService.getMyfamilyElders(getUserId());
    }


    /**
     * 新增高龄认证
     * @param {classNameFirstLower}AddDTO 添加高龄认证传递对象
     * @return 新增结果
     */
    @PostMapping("/addByFamily")
    @ApiOperation(value = "通过家庭成员新增高龄认证", response = R.class)
    R addByFamily(@RequestBody EldersAuthAddByFamilyDTO eldersAuthAddByFamilyDTO){
        eldersAuthAddByFamilyDTO.setSumitUserId(getUserId());
        eldersAuthAddByFamilyDTO.setUserId(getUserId());
        return eldersAuthService.addByFamilyUser(eldersAuthAddByFamilyDTO);
    }
}

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

@@ -294,10 +294,6 @@
        if (null == id || 0 == id) {
            return R.fail("心愿主键不能为空");
        }
        String evaluate = comActMicroWishVO.getEvaluate();
        if (ObjectUtils.isEmpty(evaluate)) {
            return R.fail("用户评价不能为空");
        }
        Integer score = comActMicroWishVO.getScore();
        if (null == score || 0 == score) {
            return R.fail("评分不能为空");

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/AdvertisingManagementApi.java

@@ -63,7 +63,6 @@
            if (null==jumpId||0==jumpId.intValue()) {
                return R.fail("跳转内容不能为空");
            }
            comOpsAdvDTO.setJumpUrl(null);
        } else {
            String jumpUrl = comOpsAdvDTO.getJumpUrl();
            if (ObjectUtils.isEmpty(jumpUrl)) {
@@ -92,7 +91,6 @@
            if (null==jumpId||0==jumpId.intValue()) {
                return R.fail("跳转内容不能为空");
            }
            comOpsAdvDTO.setJumpUrl(null);
        } else {
            String jumpUrl = comOpsAdvDTO.getJumpUrl();
            if (ObjectUtils.isEmpty(jumpUrl)) {

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java

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

import com.panzhihua.auth.model.dos.LoginBody;
import com.panzhihua.auth.service.LoginService;
import com.panzhihua.common.exceptions.TokenException;
import com.panzhihua.common.exceptions.UnAuthenticationException;
@@ -9,10 +10,7 @@
import com.panzhihua.common.utlis.JWTTokenUtil;
import io.jsonwebtoken.Claims;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@@ -51,35 +49,60 @@
        loginService.logoutApplets(token);
        return R.ok();
    }

    /**
     * 运营后台登录
     * @param account 账户
     *
     * @param account  账户
     * @param password 密码
     * @return 登录结果
     */
    @PostMapping("/loginAppletsBackStage")
    public R loginAppletsBackStage(@RequestParam("account") String account, @RequestParam("password")String password){
        LoginReturnVO loginReturnVO =loginService.loginAppletsBackStage(account,password);
    public R loginAppletsBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginAppletsBackStage(account, password);
        return R.ok(loginReturnVO);
    }

    /**
     * 大数据统计平台（区、街道、社区三层登陆接口）
     *
     * @param loginBody 账户
     * @return 登录结果
     * @author manailin
     * @date 2021-5-13 10:56
     */
    @PostMapping("/loginBigDataBackStage")
    public R loginBigDataBackStage(@RequestBody LoginBody loginBody) {
        String account = loginBody.getAccount();
        String password = loginBody.getPassword();
        if (ObjectUtils.isEmpty(account) || ObjectUtils.isEmpty(password)) {
            return R.fail("账户密码不能为空");
        }
        LoginReturnVO loginReturnVO = loginService.loginBigDataBackStage(account, password);
        return R.ok(loginReturnVO);
    }

    /**
     * 社区后台登录
     * @param account 账户
     *
     * @param account  账户
     * @param password 密码
     * @return 登录结果
     */
    @PostMapping("/loginCommunityBackage")
    public R loginCommunityBackage(@RequestParam("account") String account, @RequestParam("password")String password){
        LoginReturnVO loginReturnVO =loginService.loginCommunityBackage(account,password);
    public R loginCommunityBackage(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginCommunityBackage(account, password);
        return R.ok(loginReturnVO);
    }

    /**
     * 认证中心刷新token
     *
     * @param refreshToken 用户端保存的刷新token
     * @return 新的token 和刷新token
     */
    @PostMapping("/refreshToken")
    public R refreshToken(@RequestParam("refreshToken")String refreshToken){
    public R refreshToken(@RequestParam("refreshToken") String refreshToken) {
        Boolean expired = JWTTokenUtil.isTokenExpired(refreshToken);
        if (expired) {
            throw new TokenException("刷新token已过期");
@@ -90,18 +113,18 @@
            throw new TokenException("刷新token校验失败");
        }
        String subject = claims.getSubject();
        Integer type = (Integer)claims.get("type");
        Integer type = (Integer) claims.get("type");
        boolean empty1 = ObjectUtils.isEmpty(subject);
        boolean empty2 = ObjectUtils.isEmpty(type);
        if (empty1||empty2) {
        if (empty1 || empty2) {
            throw new TokenException("刷新token校验失败");
        }
        LoginUserInfoVO loginUserInfoVO=new LoginUserInfoVO();
        LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
        loginUserInfoVO.setUserId(Long.valueOf(subject));
        loginUserInfoVO.setType(type);
        String token = JWTTokenUtil.generateToken(loginUserInfoVO);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUserInfoVO);
        LoginReturnVO loginReturnVO=new LoginReturnVO();
        LoginReturnVO loginReturnVO = new LoginReturnVO();
        loginReturnVO.setToken(token);
        loginReturnVO.setRefreshToken(refeshToken);
        return R.ok(loginReturnVO);
@@ -109,13 +132,14 @@

    /**
     * 商家后台登录
     * @param account 账户
     *
     * @param account  账户
     * @param password 密码
     * @return 登录结果
     */
    @PostMapping("/loginShopBackStage")
    public R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password")String password){
        LoginReturnVO loginReturnVO =loginService.loginShopBackStage(account,password);
    public R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginShopBackStage(account, password);
        return R.ok(loginReturnVO);
    }


 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/model/dos/LoginBody.java

New file
@@ -0,0 +1,24 @@
package com.panzhihua.auth.model.dos;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

/**
 * 大数据统计平台（区、街道、社区三层登陆接口）
 * @author manailin
 * @date 2021-5-13 10:56
 */
@Data
@ApiModel(value = "管理后台登录")
@AllArgsConstructor
@NoArgsConstructor
public class LoginBody {

    @ApiModelProperty(value = "登录账户")
    private String account;
    @ApiModelProperty(value = "登录密码")
    private String password;
}

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java

@@ -47,4 +47,13 @@
     * @return 登录结果
     */
    LoginReturnVO loginShopBackStage(String account, String password);
    /**
     * 大数据统计平台（区、街道、社区三层登陆接口）
     * @param account 账户
     * @param password 密码
     * @author manailin
     * @return 登录结果
     * @date 2021-5-13 10:56
     */
    LoginReturnVO loginBigDataBackStage(String account, String password);
}

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java

@@ -125,4 +125,26 @@
        return loginReturnVO;
    }

    /**
     * 大数据统计平台（区、街道、社区三层登陆接口）
     * @param account 账户
     * @param password 密码
     * @author manailin
     * @return 登录结果
     * @date 2021-5-13 10:56
     */
    @Override
    public LoginReturnVO loginBigDataBackStage(String account, String password) {
        Authentication authentication = null;
        authentication = authenticationManager
                .authenticate(new UsernamePasswordAuthenticationToken(account+"_8", password));
        LoginUserInfoVO loginUser = (LoginUserInfoVO) authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
        LoginReturnVO loginReturnVO=new LoginReturnVO();
        loginReturnVO.setToken(token);
        loginReturnVO.setRefreshToken(refeshToken);
        return loginReturnVO;
    }

}

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

@@ -2,6 +2,7 @@

import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.excel.exception.ExcelDataConvertException;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.R;
@@ -57,4 +58,23 @@
            throw new ServiceException(r.getMsg());
        }
    }


    /**
     * 在转换异常
     * @param exception
     * @param context
     * @throws Exception
     */
    @Override
    public void onException(Exception exception, AnalysisContext context) throws ServiceException {
        log.error("抛出异常:{}", exception.getMessage());
        if (exception instanceof ExcelDataConvertException) {
            ExcelDataConvertException excelDataConvertException = (ExcelDataConvertException)exception;
            log.error("第{}行，第{}列解析异常，数据为:{}", excelDataConvertException.getRowIndex(),
                    excelDataConvertException.getColumnIndex(), excelDataConvertException.getCellData());
        }else{
            throw new ServiceException(exception.getMessage());
        }
    }
}

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

New file
@@ -0,0 +1,43 @@
package com.panzhihua.common.model.dtos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Max;
import javax.validation.constraints.NotBlank;
import java.util.Date;


/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Data
@ApiModel("创建高龄认证请求参数")
public class EldersAuthAddByFamilyDTO {

    @NotBlank()
    @Max(9223372036854775807L)
    @ApiModelProperty(value = "家庭成员ID", hidden = false, example = "1", required = true)
    private Long familyUserId;

    @Length(max=1024) @NotBlank()
    @ApiModelProperty(value = "视频地址", hidden = false, example = "")
    private String videoUrl;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "提交人", hidden = true, example = "1")
    private Long sumitUserId;


    @ApiModelProperty(value = "用户ID", hidden = true, example = "")
    private Long userId;


}

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

New file
@@ -0,0 +1,59 @@
package com.panzhihua.common.model.dtos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonFormat;



/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Data
@ApiModel("创建高龄认证请求参数")
public class EldersAuthAddDTO {

    @NotBlank() @Length(max=18)
    @ApiModelProperty(value = "身份证", hidden = false, example = "")
    private String idCard;

    @Length(max=32) @NotBlank()
    @ApiModelProperty(value = "认证人姓名", hidden = false, example = "")
    private String authUserName;

    @Length(max=1024) @NotBlank()
    @ApiModelProperty(value = "视频地址", hidden = false, example = "")
    private String videoUrl;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "提交人", hidden = true, example = "1")
    private Long sumitUserId;

    @Length(max=1024)
    @ApiModelProperty(value = "户籍地", hidden = false, example = "")
    private String domicile;

    @Length(max=1)
    @ApiModelProperty(value = "状态", hidden = false, example = "")
    private String status;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "出生日期", hidden = false, example = "2021-05-01 18:05:50")
    private Date birthDay;

    @ApiModelProperty(value = "用户ID", hidden = true, example = "")
    private Long userId;


}

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

New file
@@ -0,0 +1,24 @@
package com.panzhihua.common.model.dtos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;


/**
 * 删除表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Data
@ApiModel("删除高龄认证请求参数")
public class EldersAuthDeleteDTO {

    @ApiModelProperty(value = "ID", hidden = false, example = "1")
    private Long id;

}

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

New file
@@ -0,0 +1,62 @@
package com.panzhihua.common.model.dtos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import org.hibernate.validator.constraints.Length;

import com.fasterxml.jackson.annotation.JsonFormat;
import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;

/**
 * 编辑表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Data
@ApiModel("编辑高龄认证请求参数")
public class EldersAuthEditDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "ID", hidden = false, example = "1")
    private Long id;

    @NotBlank() @Length(max=18)
    @ApiModelProperty(value = "身份证", hidden = false, example = "")
    private String idCard;

    @Length(max=32)
    @ApiModelProperty(value = "认证人姓名", hidden = false, example = "")
    private String authUserName;

    @Length(max=1024)
    @ApiModelProperty(value = "视频地址", hidden = false, example = "")
    private String videoUrl;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "提交人", hidden = false, example = "1")
    private Long sumitUserId;

    @Length(max=1024)
    @ApiModelProperty(value = "户籍地", hidden = false, example = "")
    private String domicile;

    @Length(max=1)
    @ApiModelProperty(value = "状态", hidden = false, example = "")
    private String status;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "出生日期", hidden = false, example = "2021-05-01 18:05:50")
    private Date birthDay;

    @ApiModelProperty(value = "用户ID", hidden = true, example = "")
    private Long userId;

}

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

New file
@@ -0,0 +1,38 @@
package com.panzhihua.common.model.dtos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonFormat;



/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Data
@ApiModel("创建高龄认证社区反馈请求参数")
public class EldersAuthFeedbackAddDTO {

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "认证ID", hidden = false, example = "1")
    private Long authId;

    @Length(max=1024)
    @ApiModelProperty(value = "反馈结果", hidden = false, example = "")
    private String feedBack;

    @ApiModelProperty(value = "用户ID", hidden = true, example = "")
    private Long userId;

}

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

New file
@@ -0,0 +1,24 @@
package com.panzhihua.common.model.dtos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;


/**
 * 删除表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Data
@ApiModel("删除高龄认证社区反馈请求参数")
public class EldersAuthFeedbackDeleteDTO {

    @ApiModelProperty(value = "ID", hidden = false, example = "1")
    private Long id;

}

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

New file
@@ -0,0 +1,39 @@
package com.panzhihua.common.model.dtos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import org.hibernate.validator.constraints.Length;

import com.fasterxml.jackson.annotation.JsonFormat;
import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;

/**
 * 编辑表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Data
@ApiModel("编辑高龄认证社区反馈请求参数")
public class EldersAuthFeedbackEditDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "ID", hidden = false, example = "1")
    private Long id;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "认证ID", hidden = false, example = "1")
    private Long authId;

    @Length(max=1024)
    @ApiModelProperty(value = "反馈结果", hidden = false, example = "")
    private String feedBack;


}

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

New file
@@ -0,0 +1,53 @@
package com.panzhihua.common.model.dtos.community;

import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.NumberFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

/**
 * @description: 商城订单导出
 * @author: cedoo
 * @date: 2021-4-18 16:13:21
 */
@Data
public class ExcelElderAuthDTO {

    @ExcelProperty("*序号")
    private Integer seq;

    @ExcelProperty("*项目名称")
    private String subsidy;

    @ExcelProperty("*发放批次")
    private String batch;

    @ExcelProperty("*姓名")
    private String name;

    @ExcelProperty("*身份证号")
    private String idCard;

    @ExcelProperty("*人员类别")
    private String type;

    @ExcelProperty("*应付年月")
    private String yearMonth;

    @ExcelProperty("*发放金额（元）")
    private String payCount;

    @ExcelProperty("联系电话（到账信息提醒）")
    private String telphone;

    @ExcelProperty("*所属村(社区)")
    private String communityName;

    @ExcelProperty("所属组")
    private String group;


}

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

New file
@@ -0,0 +1,110 @@
package com.panzhihua.common.model.dtos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Data
@ApiModel("查询高龄认证请求参数")
public class PageEldersAuthDTO {

    @ApiModelProperty(value = "分页-当前页数,默认1", example = "1", required = true)
    @NotNull
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数,默认10", example = "10")
    @NotNull
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", hidden = true, example = "createAt")
    private String sortBy="create_at";

    @ApiModelProperty(value = "排序方式: asc/desc(默认)", hidden = true, example = "desc")
    @Pattern(regexp = "asc|desc|ASC|DESC")
    private String order="desc";

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "ID", hidden = false, example = "1")
    private Long id;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "创建人", hidden = false, example = "1")
    private Long createBy;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAt;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "更新人", hidden = false, example = "1")
    private Long updateBy;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "更新时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date updateAt;

    @Length(max=18)
    @ApiModelProperty(value = "身份证", hidden = false, example = "")
    private String idCard;

    @Length(max=32)
    @ApiModelProperty(value = "认证人姓名", hidden = false, example = "")
    private String authUserName;

    @Length(max=1024)
    @ApiModelProperty(value = "视频地址", hidden = false, example = "")
    private String videoUrl;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "提交人", hidden = false, example = "1")
    private Long sumitUserId;

    @Length(max=1024)
    @ApiModelProperty(value = "户籍地", hidden = false, example = "")
    private String domicile;

    @Length(max=1)
    @ApiModelProperty(value = "状态", hidden = false, example = "")
    private String status;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "出生日期", hidden = false, example = "2021-05-01 18:05:50")
    private Date birthDay;

    @ApiModelProperty(value = "导出的ID", hidden = false, example = "")
    private Long[] ids;

    @ApiModelProperty(value = "查询类型 1 按月 2 按时间", hidden = false, example = "")
    private String type;


    @ApiModelProperty(value = "月份(1-12)", hidden = false, example = "")
    private Integer month;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建起始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAtStart;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建结束时间", hidden = false, example = "2021-05-02 18:05:50")
    private Date createAtEnd;

}

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

New file
@@ -0,0 +1,71 @@
package com.panzhihua.common.model.dtos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Data
@ApiModel("查询高龄认证社区反馈请求参数")
public class PageEldersAuthFeedbackDTO {

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
    private String sortBy="createAt";

    @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
    @Pattern(regexp = "asc|desc|ASC|DESC")
    private String order="desc";

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "ID", hidden = false, example = "1")
    private Long id;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "创建人", hidden = false, example = "1")
    private Long createBy;

    @NotNull() 
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAt;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "更新人", hidden = false, example = "1")
    private Long updateBy;

    
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "更新时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date updateAt;

    @NotNull() @Max(9223372036854775807L)
    @ApiModelProperty(value = "认证ID", hidden = false, example = "1")
    private Long authId;

    @Length(max=1024)
    @ApiModelProperty(value = "反馈结果", hidden = false, example = "")
    private String feedBack;


}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/IPageVO.java

New file
@@ -0,0 +1,210 @@
/*
 * Copyright (c) 2011-2020, baomidou (jobob@qq.com).
 * <p>
 * Licensed under the Apache License, Version 2.0 (the "License"); you may not
 * use this file except in compliance with the License. You may obtain a copy of
 * the License at
 * <p>
 * https://www.apache.org/licenses/LICENSE-2.0
 * <p>
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 * License for the specific language governing permissions and limitations under
 * the License.
 */
package com.panzhihua.common.model.vos;

import java.io.Serializable;
import java.util.List;
import java.util.Map;
import java.util.function.Function;

import static java.util.stream.Collectors.toList;

/**
 * 分页 Page 对象接口
 *
 * @author
 * @since
 */
public interface IPageVO<T> extends Serializable {

    /**
     * 获取排序信息，排序的字段和正反序
     *
     * @return 排序信息
     */
    List<Object> orders();

    /**
     * KEY/VALUE 条件
     *
     * @return ignore
     * @deprecated 3.4.0 @2020-06-30
     */
    @Deprecated
    default Map<Object, Object> condition() {
        return null;
    }

    /**
     * 自动优化 COUNT SQL【 默认：true 】
     *
     * @return true 是 / false 否
     */
    default boolean optimizeCountSql() {
        return true;
    }

    /**
     * 进行 count 查询 【 默认: true 】
     *
     * @return true 是 / false 否
     */
    default boolean isSearchCount() {
        return true;
    }

    /**
     * 计算当前分页偏移量
     */
    default long offset() {
        long current = getCurrent();
        if (current <= 1L) {
            return 0L;
        }
        return (current - 1) * getSize();
    }

    /**
     * 最大每页分页数限制,优先级高于分页插件内的 maxLimit
     *
     * @since 3.4.0 @2020-07-17
     */
    default Long maxLimit() {
        return null;
    }

    /**
     * 当前分页总页数
     */
    default long getPages() {
        if (getSize() == 0) {
            return 0L;
        }
        long pages = getTotal() / getSize();
        if (getTotal() % getSize() != 0) {
            pages++;
        }
        return pages;
    }

    /**
     * 内部什么也不干
     * <p>只是为了 json 反序列化时不报错</p>
     */
    default IPageVO<T> setPages(long pages) {
        // to do nothing
        return this;
    }

    /**
     * 设置是否命中count缓存
     *
     * @param hit 是否命中
     * @since 3.3.1
     * @deprecated 3.4.0 @2020-06-30 缓存遵循mybatis的一或二缓
     */
    @Deprecated
    default void hitCount(boolean hit) {

    }

    /**
     * 是否命中count缓存
     *
     * @return 是否命中count缓存
     * @since 3.3.1
     * @deprecated 3.4.0 @2020-06-30 缓存遵循mybatis的一或二缓
     */
    @Deprecated
    default boolean isHitCount() {
        return false;
    }

    /**
     * 分页记录列表
     *
     * @return 分页对象记录列表
     */
    List<T> getRecords();

    /**
     * 设置分页记录列表
     */
    IPageVO<T> setRecords(List<T> records);

    /**
     * 当前满足条件总行数
     *
     * @return 总条数
     */
    long getTotal();

    /**
     * 设置当前满足条件总行数
     */
    IPageVO<T> setTotal(long total);

    /**
     * 获取每页显示条数
     *
     * @return 每页显示条数
     */
    long getSize();

    /**
     * 设置每页显示条数
     */
    IPageVO<T> setSize(long size);

    /**
     * 当前页
     *
     * @return 当前页
     */
    long getCurrent();

    /**
     * 设置当前页
     */
    IPageVO<T> setCurrent(long current);

    /**
     * IPageVO 的泛型转换
     *
     * @param mapper 转换函数
     * @param <R>    转换后的泛型
     * @return 转换泛型后的 IPageVO
     */
    @SuppressWarnings("unchecked")
    default <R> IPageVO<R> convert(Function<? super T, ? extends R> mapper) {
        List<R> collect = this.getRecords().stream().map(mapper).collect(toList());
        return ((IPageVO<R>) this).setRecords(collect);
    }

    /**
     * 老分页插件不支持
     * <p>
     * MappedStatement 的 id
     *
     * @return id
     * @since 3.4.0 @2020-06-19
     */
    default String countId() {
        return null;
    }


}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java

@@ -140,8 +140,8 @@
    private List<ComMngStructHouseVO> comMngStructHouseVOS;

    @ApiModelProperty("用户小区id")
    @Min(value = 1,groups = {PutGroup.class},message = "用户小区id不能为空")
    @NotNull(groups = {PutGroup.class},message = "用户小区id不能为空")
//    @Min(value = 1,groups = {PutGroup.class},message = "用户小区id不能为空")
//    @NotNull(groups = {PutGroup.class},message = "用户小区id不能为空")
    private Long areaId;

    @ApiModelProperty("用户所在社区信息")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngAppletsVO.java

@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -32,5 +33,9 @@
    @ApiModelProperty("志愿者参加的已经完成的活动")
    private List<ComActActivityVO> comActActivityVOList;

    @ApiModelProperty("时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;


}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthDetailsVO.java

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Data
@ApiModel("高龄认证返回参数")
public class EldersAuthDetailsVO {

    @ApiModelProperty(value = "ID")
    private Long id;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "更新人")
    private Long updateBy;

    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;

    @ApiModelProperty(value = "身份证")
    private String idCard;

    @ApiModelProperty(value = "认证人姓名")
    private String authUserName;

    @ApiModelProperty(value = "视频地址")
    private String videoUrl;

    @ApiModelProperty(value = "提交人")
    private Long sumitUserId;

    @ApiModelProperty(value = "户籍地")
    private String domicile;

    @ApiModelProperty(value = "状态")
    private String status;

    @ApiModelProperty(value = "出生日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date birthDay;


    @ApiModelProperty(value = "申请人")
    private String submitUserName;

    @ApiModelProperty(value = "申请账号")
    private String submitUserAccount;

    @ApiModelProperty(value = "年龄")
    private Integer age;

    @ApiModelProperty(value = "社区反馈")
    private List<EldersAuthFeedbackVO> eldersAuthFeedbackVOList;

    @ApiModelProperty(value = "家庭成员ID")
    private Long  familyUserId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthFeedbackDetailsVO.java

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Data
@ApiModel("高龄认证社区反馈返回参数")
public class EldersAuthFeedbackDetailsVO {

    @ApiModelProperty(value = "ID")
    private Long id;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "更新人")
    private Long updateBy;

    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;

    @ApiModelProperty(value = "认证ID")
    private Long authId;

    @ApiModelProperty(value = "反馈结果")
    private String feedBack;


}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthFeedbackVO.java

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Data
@ApiModel("高龄认证社区反馈返回参数")
public class EldersAuthFeedbackVO {

    @ApiModelProperty(value = "ID")
    private Long id;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "更新人")
    private Long updateBy;

    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;

    @ApiModelProperty(value = "认证ID")
    private Long authId;

    @ApiModelProperty(value = "反馈结果")
    private String feedBack;


}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthVO.java

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Data
@ApiModel("高龄认证返回参数")
public class EldersAuthVO {

    @ApiModelProperty(value = "ID")
    private Long id;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "申请时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "更新人")
    private Long updateBy;

    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;

    @ApiModelProperty(value = "身份证")
    private String idCard;

    @ApiModelProperty(value = "认证人姓名")
    private String authUserName;

    @ApiModelProperty(value = "视频地址")
    private String videoUrl;

    @ApiModelProperty(value = "提交人")
    private Long sumitUserId;

    @ApiModelProperty(value = "申请人")
    private String submitUserName;

    @ApiModelProperty(value = "申请账号")
    private String submitUserAccount;

    @ApiModelProperty(value = "户籍地")
    private String domicile;

    @ApiModelProperty(value = "状态")
    private String status;

    @ApiModelProperty(value = "出生日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date birthDay;

    @ApiModelProperty(value = "年龄")
    private Integer age;

    @ApiModelProperty(value = "家庭成员ID")
    private Long  familyUserId;

}

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

@@ -39,6 +39,7 @@
    private String cover;

    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty("内容")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -16,6 +16,7 @@
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.IPageVO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO;
@@ -2466,6 +2467,80 @@
    @PostMapping("/common/data/population/edit/electronicArchives")
    R editUserElectronicFile(@RequestBody UserElectronicFileVO userElectronicFileVO);


    /**
     * 新增高龄认证
     * @param eldersAuthAddDTO
     * @return 新增结果
     */
    @PostMapping("/eldersauth/add")
    R add(@RequestBody EldersAuthAddDTO eldersAuthAddDTO);

    /**
     * 修改高龄认证
     * @param eldersAuthEditDTO
     * @return 维护结果
     */
    @PostMapping("/eldersauth/edit")
    R edit(@RequestBody EldersAuthEditDTO eldersAuthEditDTO);

    /**
     * 分页查找高龄认证
     * @param pageEldersAuthDTO
     * @return 维护结果
     */
    @PostMapping("/eldersauth/page")
    R query(@RequestBody PageEldersAuthDTO pageEldersAuthDTO);

    /**
     * 删除高龄认证
     * @param eldersAuthDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/eldersauth/delete")
    R delete(@RequestBody EldersAuthDeleteDTO eldersAuthDeleteDTO);

    /**
     * 查询高龄认证详细信息
     * @param id 高龄认证 id
     * @return 查找结果
     */
    @PostMapping("/eldersauth/{id}")
    R<EldersAuthDetailsVO> eldersAuthDetails(@PathVariable("id") Long id);

    /**
     * 获取用户家庭成员
     * @param userId 用户ID
     * @return
     */
    @PostMapping("/eldersauth/getMyfamilyElders/{userId}")
    R getMyfamilyElders(@PathVariable("userId") Long userId);

    /**
     * 查询导出高龄老人
     * @param pageEldersAuthDTO
     * @return
     */
    @PostMapping("/eldersauth/eldersAuthQuery")
    R eldersAuthQuery(@RequestBody PageEldersAuthDTO pageEldersAuthDTO);

    /**
     * 通过家庭成员ID添加
     * @param eldersAuthAddByFamilyDTO 添加信息
     * @return
     */
    @PostMapping("/eldersauth/addByFamilyUser")
    R addByFamilyUser(@RequestBody EldersAuthAddByFamilyDTO eldersAuthAddByFamilyDTO);


    /**
     * 添加高龄认证反馈
     * @param eldersAuthFeedbackAddDTO
     * @return
     */
    @PostMapping("/eldersauth/addFeedback")
    R addFeedback(@RequestBody EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO);

    /**
     * 小程序-查询疫苗分类列表
     * @return  疫苗分类列表

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

New file
@@ -0,0 +1,196 @@
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.metadata.style.WriteCellStyle;
import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONArray;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.common.utlis.SFTPUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Slf4j
@RestController
@RequestMapping("/eldersauth")
@Api(tags = {"高龄认证"})
public class EldersAuthApi extends BaseController {

    // FTP 登录用户名
    @Value("${ftp.username}")
    private String userName;
    // FTP 登录密码
    @Value("${ftp.password}")
    private String password;
    // FTP 服务器地址IP地址
    @Value("${ftp.host}")
    private String host;
    // FTP 端口
    @Value("${ftp.port}")
    private int port;
    @Value("${ftp.url}")
    private String url;
    @Value("${excel.userurl}")
    private String excelUrl;

    @Resource
    private CommunityService communityService;

    /**
     * 新增高龄认证
     * @param {classNameFirstLower}AddDTO 添加高龄认证传递对象
     * @return 新增结果
     */
    @PostMapping()
    @ApiOperation(value = "新增高龄认证", response = R.class)
    R add(@Validated @RequestBody EldersAuthAddDTO eldersAuthAddDTO){
        ClazzUtils.setIfStringIsEmpty(eldersAuthAddDTO);
        eldersAuthAddDTO.setSumitUserId(getUserId());
        return communityService.add(eldersAuthAddDTO);
    }

    /**
     * 分页查找
     * @param pageEldersAuthDTO 查找高龄认证传递对象
     * @return 查找结果
     */
    @PostMapping("page")
    @ApiOperation(value = "查询高龄认证", response = EldersAuthVO.class)
    R query(@Validated @ModelAttribute PageEldersAuthDTO pageEldersAuthDTO){
        ClazzUtils.setIfStringIsEmpty(pageEldersAuthDTO);
        return communityService.query(pageEldersAuthDTO);
    }

    /**
     * 查询高龄认证详细信息
     * @param id 高龄认证 id
     * @return 查找结果
     */
    @GetMapping("/{id}")
    @ApiOperation(value = "查询高龄认证详细信息", response = EldersAuthDetailsVO.class)
    R<EldersAuthDetailsVO> details(@PathVariable("id") Long id){
        return communityService.eldersAuthDetails(id);
    }

    /**
     * 到处高龄认证信息
     * @param pageEldersAuthDTO 搜索条件
     * @return 查找结果
     */
    @PostMapping("export")
    @ApiOperation(value = "导出高龄认证信息")
    R<String> export(@Validated @ModelAttribute PageEldersAuthDTO pageEldersAuthDTO){
        String ftpUrl = "/mnt/data/web/excel/";

        ClazzUtils.setIfStringIsEmpty(pageEldersAuthDTO);
        String url=excelUrl;
        String uuid= UUID.randomUUID().toString().replace("-","");
        //String name=uuid+".xlsx";

        R r = communityService.eldersAuthQuery(pageEldersAuthDTO);
        if (R.isOk(r)) {
            List<ExcelElderAuthDTO> excelElderAuthDTO = JSONArray.parseArray(JSONArray.toJSONString(r.getData()),ExcelElderAuthDTO.class);
            if(excelElderAuthDTO==null||excelElderAuthDTO.size()==0){
                return R.ok("未找到数据");
            }

            List<ExcelElderAuthDTO> sortedList = excelElderAuthDTO.stream().sorted(Comparator.comparingInt(ExcelElderAuthDTO::getSeq)).collect(Collectors.toList());
            try {
                SFTPUtil sftp = new SFTPUtil(userName,password,host,port);
                sftp.login();
                String name =  "高龄认证-" + new SimpleDateFormat("yyyyMMddhhmmss").format(new Date()) + ".xlsx";
                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 {

                        WriteCellStyle contentWriteCellStyle = new WriteCellStyle();

                        contentWriteCellStyle.setWrapped(true);
                        WriteCellStyle headWriteCellStyle = new WriteCellStyle();

                        HorizontalCellStyleStrategy horizontalCellStyleStrategy =
                                new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);


                        excelWriter = EasyExcel.write(fileName, ExcelElderAuthDTO.class).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                                .registerWriteHandler(horizontalCellStyleStrategy).build();
                        WriteSheet writeSheet = EasyExcel.writerSheet("高龄认证").build();
                        excelWriter.write(sortedList, 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+ URLEncoder.encode(name,"UTF-8"));
            } catch (Exception e) {
                e.printStackTrace();
                log.error("文件传输失败【{}】", e.getMessage());
                return R.fail();
            }
        }
        return R.fail("导出数据失败");
    }
    /**
     * 新增高龄认证
     * @param {classNameFirstLower}AddDTO 添加高龄认证传递对象
     * @return 新增结果
     */
    @PostMapping("/addFeedback")
    @ApiOperation(value = "新增高龄认证反馈", response = R.class)
    R addFeedback(@Validated @RequestBody EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO){
        ClazzUtils.setIfStringIsEmpty(eldersAuthFeedbackAddDTO);
        eldersAuthFeedbackAddDTO.setUserId(getUserId());
        return communityService.addFeedback(eldersAuthFeedbackAddDTO);
    }

}

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

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.*;
@@ -11,11 +12,13 @@
import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.service_community.model.dos.ComActActPrizeDO;
import com.panzhihua.service_community.model.dos.ComActDynDO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
import com.panzhihua.service_community.model.dos.ComMngStructAreaDO;
import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.IdCardUtil;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.*;

import lombok.extern.slf4j.Slf4j;
@@ -28,6 +31,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

@@ -67,6 +71,11 @@
    private ComActMessageService comActMessageService;
    @Resource
    private ComActQuestnaireService comActQuestnaireService;

    @Resource
    private EldersAuthService eldersAuthService;
    @Resource
    public ComMngPopulationDAO comMngPopulationDAO;

    /**
     * 新增社区活动
@@ -1469,4 +1478,132 @@
    public R deletemicrowish(@RequestParam("id") Long id){
        return comActMicroWishService.deleteMicroWish(id);
    }




    /**
     * 新增高龄认证
     * @param eldersAuthAddDTO
     * @return 新增结果
     */
    @PostMapping("/eldersauth/add")
    R add(@RequestBody EldersAuthAddDTO eldersAuthAddDTO){
        return eldersAuthService.add(eldersAuthAddDTO);
    };

    /**
     * 修改高龄认证
     * @param eldersAuthEditDTO
     * @return 维护结果
     */
    @PostMapping("/eldersauth/edit")
    R edit(@RequestBody EldersAuthEditDTO eldersAuthEditDTO){
        return eldersAuthService.edit(eldersAuthEditDTO);
    };

    /**
     * 分页查找高龄认证
     * @param pageEldersAuthDTO
     * @return 维护结果
     */
    @PostMapping("/eldersauth/page")
    R<IPage<EldersAuthVO>> query(@RequestBody PageEldersAuthDTO pageEldersAuthDTO){
        return eldersAuthService.query(pageEldersAuthDTO);
    };

    /**
     * 删除高龄认证
     * @param EldersAuthDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/eldersauth/delete")
    R delete(@RequestBody EldersAuthDeleteDTO EldersAuthDeleteDTO){
        return eldersAuthService.delete(EldersAuthDeleteDTO);
    };

    /**
     * 查询高龄认证详细信息
     * @param id 高龄认证 id
     * @return 查找结果
     */
    @PostMapping("/eldersauth/{id}")
    R<EldersAuthDetailsVO> eldersAuthDetails(@PathVariable("id") Long id){
        return eldersAuthService.eldersAuthDetails(id);
    };

    @PostMapping("/eldersauth/getMyfamilyElders/{userId}")
    R<List<ComMngFamilyInfoVO>> getMyfamilyElders(@PathVariable("userId") Long userId){
        List<ComMngFamilyInfoVO> list = comMngPopulationDAO.listFamilyByUserId(userId);
        List<ComMngFamilyInfoVO> listRt = new ArrayList<>();
        list.forEach(rt -> {
            boolean isElders =  rt.getAge()>=80;
            if(isElders){
                listRt.add(rt);
            }
        });
        return R.ok(listRt);
    }

    @PostMapping("/eldersauth/addByFamilyUser")
    R addByFamilyUser(@RequestBody EldersAuthAddByFamilyDTO eldersAuthAddByFamilyDTO){

        List<ComMngFamilyInfoVO> list = comMngPopulationDAO.listFamilyByUserId(eldersAuthAddByFamilyDTO.getUserId());
        ComMngFamilyInfoVO theFamily = null;
        Long familyUserId = eldersAuthAddByFamilyDTO.getFamilyUserId();
        for (ComMngFamilyInfoVO family : list) {
            if (familyUserId == family.getId()) {
                theFamily = family;
            }
        }

        if(theFamily==null){
            return R.fail("家庭成员信息错误");
        }
        if(theFamily.getAge()>=80){
            Long loginUserId = eldersAuthAddByFamilyDTO.getUserId();
            EldersAuthDO eldersAuthDO = new EldersAuthDO();
            eldersAuthDO.setSumitUserId(eldersAuthAddByFamilyDTO.getSumitUserId());
            eldersAuthDO.setCreateBy(loginUserId);
            eldersAuthDO.setCreateAt(new Date());
            eldersAuthDO.setIdCard(theFamily.getIdCard());
            eldersAuthDO.setAuthUserName(theFamily.getName());
            eldersAuthDO.setVideoUrl(eldersAuthAddByFamilyDTO.getVideoUrl());
            eldersAuthDO.setFamilyUserId(eldersAuthAddByFamilyDTO.getFamilyUserId());
            //根据身份证查询出籍贯 出生日期
            String domicile = "";
            Date birthDay = IdCard.birthDay(eldersAuthDO.getIdCard());
            eldersAuthDO.setDomicile(domicile);
            eldersAuthDO.setBirthDay(birthDay);
            int add = eldersAuthService.getBaseMapper().insert(eldersAuthDO);
            if(add==1){
                return R.ok(eldersAuthDO.getId());
            }
        }else{
            return R.fail("家庭成员年龄还未达到80");
        }
        return R.fail();
    }

    /**
     * 新增高龄认证社区反馈
     * @param {classNameFirstLower}AddDTO 添加高龄认证社区反馈传递对象
     * @return 新增结果
     */
    @PostMapping("/eldersauth/addFeedback")
    R add(@RequestBody EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO){
        ClazzUtils.setIfStringIsEmpty(eldersAuthFeedbackAddDTO);
        return eldersAuthService.addFeedback(eldersAuthFeedbackAddDTO);
    }


    /**
     * 查询导出高龄老人
     * @param pageEldersAuthDTO
     * @return
     */
    @PostMapping("/eldersauth/eldersAuthQuery")
    R eldersAuthQuery(@RequestBody PageEldersAuthDTO pageEldersAuthDTO){
        return eldersAuthService.queryExportData(pageEldersAuthDTO);
    }
}

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

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


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.dtos.community.ExcelElderAuthDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthVO;
import com.panzhihua.service_community.model.dos.EldersAuthDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Mapper
public interface EldersAuthDAO extends BaseMapper<EldersAuthDO> {

    @Select("<script> " +
            "SELECT ea.id, ea.create_at, ea.create_by, ea.update_by, ea.update_at," +
            " ea.AUTH_USER_NAME , ea.ID_CARD, ea.BIRTH_DAY, ea.FAMILY_USER_ID ," +
            " ea.DOMICILE, ea.SUMIT_USER_ID,  u.phone as submitUserAccount , ea.VIDEO_URL, " +
            " u.name as submitUserName, ROUND(DATEDIFF(CURDATE(), ea.BIRTH_DAY)/365.2422) as age \n" +
            "FROM " +
            " (" +
            " SELECT MAX(id) AS id , DATE_FORMAT(create_at, '%Y-%m') AS yearMonth\n" +
            " FROM com_elders_auth \n" +
            " GROUP BY id_card, yearMonth\n" +
            " ) t  " +
            " LEFT JOIN com_elders_auth ea ON t.id = ea.id  " +
            " LEFT JOIN sys_user  u ON ea.SUMIT_USER_ID = u.user_id\n" +
            " <where> " +
            "<if test='pageEldersAuthDTO.sumitUserId != null'>" +
            " AND ea.SUMIT_USER_ID = #{pageEldersAuthDTO.sumitUserId} " +
            " </if> " +
            "<if test='pageEldersAuthDTO.idCard != null'>" +
            " AND ea.ID_CARD = #{pageEldersAuthDTO.idCard} " +
            " </if> " +
            "<if test='pageEldersAuthDTO.authUserName != null'>" +
            " AND ea.AUTH_USER_NAME = #{pageEldersAuthDTO.authUserName} " +
            " </if> " +
            "<if test='pageEldersAuthDTO.type == 1 '>" +
            "  AND ea.AUTH_USER_NAME = #{pageEldersAuthDTO.month} " +
            " </if> " +
            "<if test='pageEldersAuthDTO.type == 2 '>" +
                "<if test='pageEldersAuthDTO.createAtStart != null'>" +
                " AND ea.create_at <![CDATA[>=]]> #{pageComShopOrderSearchDTO.createAtStart} " +
                " </if> " +
                "<if test='pageEldersAuthDTO.createAtEnd != null'>" +
                " AND ea.create_at <![CDATA[<=]]> #{pageComShopOrderSearchDTO.createAtEnd} " +
                " </if> " +
            " </if> " +
            " </where>" +
            " ORDER BY ea.${pageEldersAuthDTO.sortBy} ${pageEldersAuthDTO.order}  " +
            "</script>")
    IPage<EldersAuthVO> selectByPage(Page page, @Param("pageEldersAuthDTO") PageEldersAuthDTO pageEldersAuthDTO);


    @Select("<script> " +
            "SELECT ea.id, ea.create_at, ea.create_by, ea.update_by, ea.update_at," +
            " ea.AUTH_USER_NAME , ea.ID_CARD, ea.BIRTH_DAY, ea.FAMILY_USER_ID, " +
            " ea.DOMICILE, ea.SUMIT_USER_ID,  u.phone as submitUserAccount  , ea.VIDEO_URL , ea.FAMILY_USER_ID, " +
            " u.name as submitUserName, ROUND(DATEDIFF(CURDATE(), ea.BIRTH_DAY)/365.2422) as age \n" +
            "FROM  com_elders_auth ea LEFT JOIN sys_user  u ON ea.SUMIT_USER_ID = u.user_id\n" +
            " where ea.id = #{id}"  +
            "</script>")
    EldersAuthDetailsVO selectDetails(@Param("id") Long id);

    @Select("<script> " +
            " SELECT \n" +
            " (@rownum:=@rownum+1) as seq,  '高龄补贴' AS subsidy, '' AS batch, ea.AUTH_USER_NAME AS NAME,  ea.ID_CARD, \n" +
            " CASE\n" +
            "    WHEN ROUND(DATEDIFF(CURDATE(), ea.BIRTH_DAY)/365.2422) > 99  THEN \"100周岁（含）以上\"\n" +
            "    WHEN ROUND(DATEDIFF(CURDATE(), ea.BIRTH_DAY)/365.2422) > 89  THEN \"90-99周岁\"\n" +
            "    WHEN ROUND(DATEDIFF(CURDATE(), ea.BIRTH_DAY)/365.2422) >= 80 THEN \"80-89周岁\"\n" +
            "    ELSE \"未达到年龄\"\n" +
            " END AS TYPE, DATE_FORMAT(ea.create_at, '%Y-%m') AS yearMonth,\n" +
            " CASE\n" +
            "    WHEN ROUND(DATEDIFF(CURDATE(), ea.BIRTH_DAY)/365.2422) > 99  THEN \"800\"\n" +
            "    WHEN ROUND(DATEDIFF(CURDATE(), ea.BIRTH_DAY)/365.2422) > 89  THEN \"200\"\n" +
            "    WHEN ROUND(DATEDIFF(CURDATE(), ea.BIRTH_DAY)/365.2422) >= 80 THEN \"50\"\n" +
            "    ELSE \"未达到年龄\"\n" +
            " END AS payCount,\n" +
            " ac.name AS communityName, '' AS 'group', '' AS telphone ,  ROUND(DATEDIFF(CURDATE(), ea.BIRTH_DAY)/365.2422) AS age\n" +
            " FROM \n" +
            " (" +
            " SELECT MAX(id) AS id , DATE_FORMAT(create_at, '%Y-%m') AS yearMonth, @rownum:=0 \n" +
            " FROM com_elders_auth \n" +
            " GROUP BY id_card, yearMonth\n" +
            " ) t \n" +
            " LEFT JOIN com_elders_auth ea ON t.id = ea.id \n" +
            " LEFT JOIN sys_user u ON ea.SUMIT_USER_ID = u.user_id\n" +
            " LEFT JOIN com_act ac ON u.community_id = ac.community_id\n" +
            " <where> " +


            "<if test='pageEldersAuthDTO.ids != null and pageEldersAuthDTO.ids.length>0 '>" +
            " AND ea.id in " +
            "<foreach collection='pageEldersAuthDTO.ids' item='id' index='index' open='(' close=')' separator=',' >\n" +
            "  #{id}" +
            "</foreach>" +
            " </if> " +

            "<if test='pageEldersAuthDTO.ids == null or pageEldersAuthDTO.ids.length==0 '>" +
                "<if test='pageEldersAuthDTO.sumitUserId != null'>" +
                " AND ea.SUMIT_USER_ID = #{pageEldersAuthDTO.sumitUserId} " +
                " </if> " +
                "<if test='pageEldersAuthDTO.idCard != null'>" +
                " AND ea.ID_CARD = #{pageEldersAuthDTO.idCard} " +
                " </if> " +
                "<if test='pageEldersAuthDTO.authUserName != null'>" +
                " AND ea.AUTH_USER_NAME = #{pageEldersAuthDTO.authUserName} " +
                " </if> " +
                "<if test='pageEldersAuthDTO.type == 1 '>" +
                "  AND ea.AUTH_USER_NAME = #{pageEldersAuthDTO.month} " +
                " </if> " +
                "<if test='pageEldersAuthDTO.type == 2 '>" +
                    "<if test='pageEldersAuthDTO.createAtStart != null'>" +
                    " AND ea.create_at <![CDATA[>=]]> #{pageComShopOrderSearchDTO.createAtStart} " +
                    " </if> " +
                    "<if test='pageEldersAuthDTO.createAtEnd != null'>" +
                    " AND ea.create_at <![CDATA[<=]]> #{pageComShopOrderSearchDTO.createAtEnd} " +
                    " </if> " +
                " </if> " +
            " </if> " +
            " </where>" +
            " ORDER BY ea.${pageEldersAuthDTO.sortBy} ${pageEldersAuthDTO.order}  " +
            "</script>")
    List<ExcelElderAuthDTO> selectByParams( @Param("pageEldersAuthDTO")  PageEldersAuthDTO pageEldersAuthDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthFeedbackDAO.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.EldersAuthFeedbackDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Mapper
public interface EldersAuthFeedbackDAO extends BaseMapper<EldersAuthFeedbackDO> {

}

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

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

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

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



/**
 * 高龄认证实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Data
@TableName("com_elders_auth")
public class EldersAuthDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * ID   列: ID
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 创建人   列: CREATE_BY
     */
    private Long createBy;
    /**
     * 创建时间   列: CREATE_AT
     */
    private Date createAt;
    /**
     * 更新人   列: UPDATE_BY
     */
    private Long updateBy;
    /**
     * 更新时间   列: UPDATE_AT
     */
    private Date updateAt;
    /**
     * 身份证   列: ID_CARD
     */
    private String idCard;
    /**
     * 认证人姓名   列: AUTH_USER_NAME
     */
    private String authUserName;
    /**
     * 视频地址   列: VIDEO_URL
     */
    private String videoUrl;
    /**
     * 提交人   列: SUMIT_USER_ID
     */
    private Long sumitUserId;
    /**
     * 户籍地   列: DOMICILE
     */
    private String domicile;
    /**
     * 状态   列: STATUS
     */
    private String status;
    /**
     * 出生日期   列: BIRTH_DAY
     */
    private Date birthDay;
    /**
     * 家庭成员ID   列: FAMILY_USER_ID
     */
    private Long  familyUserId;
}

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

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

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

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



/**
 * 高龄认证社区反馈实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Data
@TableName("com_elders_auth_feedback")
public class EldersAuthFeedbackDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * ID   列: ID
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 创建人   列: CREATE_BY
     */
    private Long createBy;
    /**
     * 创建时间   列: CREATE_AT
     */
    private Date createAt;
    /**
     * 更新人   列: UPDATE_BY
     */
    private Long updateBy;
    /**
     * 更新时间   列: UPDATE_AT
     */
    private Date updateAt;
    /**
     * 认证ID   列: AUTH_ID
     */
    private Long authId;
    /**
     * 反馈结果   列: FEED_BACK
     */
    private String feedBack;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/helper/encrypt/ResultInterceptor.java

@@ -57,10 +57,12 @@
    }

    public boolean needToDecrypt(Object object){
        Class<?> objectClass = object.getClass();
        EncryptDecryptClass encryptDecryptClass = AnnotationUtils.findAnnotation(objectClass, EncryptDecryptClass.class);
        if (Objects.nonNull(encryptDecryptClass)){
            return true;
        if(object!=null) {
            Class<?> objectClass = object.getClass();
            EncryptDecryptClass encryptDecryptClass = AnnotationUtils.findAnnotation(objectClass, EncryptDecryptClass.class);
            if (Objects.nonNull(encryptDecryptClass)) {
                return true;
            }
        }
        return false;
    }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/helper/sensitive/SensitiveInterceptor.java

@@ -44,14 +44,16 @@


    private void sensitive(Object source) {
        // 拿到返回值类型
        Class<?> sourceClass = source.getClass();
        // 初始化返回值类型的 MetaObject
        MetaObject metaObject = SystemMetaObject.forObject(source);
        // 捕捉到属性上的标记注解 @Sensitive 并进行对应的脱敏处理
        Stream.of(sourceClass.getDeclaredFields())
                .filter(field -> field.isAnnotationPresent(Sensitive.class))
                .forEach(field -> doSensitive(metaObject, field));
        if(source!=null) {
            // 拿到返回值类型
            Class<?> sourceClass = source.getClass();
            // 初始化返回值类型的 MetaObject
            MetaObject metaObject = SystemMetaObject.forObject(source);
            // 捕捉到属性上的标记注解 @Sensitive 并进行对应的脱敏处理
            Stream.of(sourceClass.getDeclaredFields())
                    .filter(field -> field.isAnnotationPresent(Sensitive.class))
                    .forEach(field -> doSensitive(metaObject, field));
        }
    }



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

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

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.EldersAuthFeedbackAddDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthFeedbackDeleteDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthFeedbackEditDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthFeedbackDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.EldersAuthFeedbackDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthFeedbackVO;
import com.panzhihua.service_community.model.dos.EldersAuthFeedbackDO;

/**
 * 高龄认证社区反馈 service
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
public interface EldersAuthFeedbackService extends IService<EldersAuthFeedbackDO> {

    /**
     * 新增高龄认证社区反馈
     * @param eldersAuthFeedbackAddDTO
     * @return 新增结果
     */
    R add(EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO);

    /**
     * 修改高龄认证社区反馈
     * @param eldersAuthFeedbackEditDTO
     * @return 维护结果
     */
    R edit(EldersAuthFeedbackEditDTO eldersAuthFeedbackEditDTO);

    /**
     * 分页查找高龄认证社区反馈
     * @param pageEldersAuthFeedbackDTO
     * @return 维护结果
     */
    R<IPage<EldersAuthFeedbackVO>> query(PageEldersAuthFeedbackDTO pageEldersAuthFeedbackDTO);

    /**
     * 删除高龄认证社区反馈
     * @param EldersAuthFeedbackDeleteDTO
     * @return 平台用户信息
     */
    R delete(EldersAuthFeedbackDeleteDTO EldersAuthFeedbackDeleteDTO);

    /**
     * 查询高龄认证社区反馈详细信息
     * @param id 高龄认证社区反馈 id
     * @return 查找结果
     */
    R<EldersAuthFeedbackDetailsVO> eldersAuthFeedbackDetails(Long id);


}

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

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

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthVO;
import com.panzhihua.service_community.model.dos.EldersAuthDO;

/**
 * 高龄认证 service
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
public interface EldersAuthService extends IService<EldersAuthDO> {

    /**
     * 新增高龄认证
     * @param eldersAuthAddDTO
     * @return 新增结果
     */
    R add(EldersAuthAddDTO eldersAuthAddDTO);

    /**
     * 修改高龄认证
     * @param eldersAuthEditDTO
     * @return 维护结果
     */
    R edit(EldersAuthEditDTO eldersAuthEditDTO);

    /**
     * 分页查找高龄认证
     * @param pageEldersAuthDTO
     * @return 维护结果
     */
    R<IPage<EldersAuthVO>> query(PageEldersAuthDTO pageEldersAuthDTO);

    /**
     * 删除高龄认证
     * @param EldersAuthDeleteDTO
     * @return 平台用户信息
     */
    R delete(EldersAuthDeleteDTO EldersAuthDeleteDTO);

    /**
     * 查询高龄认证详细信息
     * @param id 高龄认证 id
     * @return 查找结果
     */
    R<EldersAuthDetailsVO> eldersAuthDetails(Long id);

    /**
     * 新增高龄认证社区反馈
     * @param eldersAuthFeedbackAddDTO
     * @return 新增结果
     */
    R addFeedback(EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO);

    /**
     * 分页查找高龄认证导出数据
     * @param pageEldersAuthDTO
     * @return 维护结果
     */
    R queryExportData(PageEldersAuthDTO pageEldersAuthDTO);
}

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

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

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthFeedbackDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthFeedbackVO;
import com.panzhihua.common.model.vos.community.EldersAuthVO;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.EldersAuthFeedbackService;
import com.panzhihua.service_community.service.EldersAuthService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;

import javax.annotation.Resource;

/**
 * @auther lyq
 * @create 2021-04-14 15:03:01
 * @describe 订单表服务实现类
 */
@Slf4j
@Service
public class EldersAuthFeedbackServiceImpl extends ServiceImpl<EldersAuthFeedbackDAO, EldersAuthFeedbackDO> implements EldersAuthFeedbackService {

    @Resource
    private EldersAuthFeedbackDAO eldersAuthFeedbackDAO;
    /**
     * 新增高龄认证社区反馈
     * @param eldersAuthFeedbackAddDTO
     * @return 新增结果
     */
    public R add(EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO){
        EldersAuthFeedbackDO eldersAuthFeedbackDO = new EldersAuthFeedbackDO();
        BeanUtils.copyProperties(eldersAuthFeedbackAddDTO, eldersAuthFeedbackDO);
        if(eldersAuthFeedbackDAO.insert(eldersAuthFeedbackDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 修改高龄认证社区反馈
     * @param eldersAuthFeedbackEditDTO
     * @return 维护结果
     */
    public R edit(EldersAuthFeedbackEditDTO eldersAuthFeedbackEditDTO){
        EldersAuthFeedbackDO eldersAuthFeedbackDO = new EldersAuthFeedbackDO();
        BeanUtils.copyProperties(eldersAuthFeedbackEditDTO, eldersAuthFeedbackDO);
        if(eldersAuthFeedbackDAO.updateById(eldersAuthFeedbackDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 分页查找高龄认证社区反馈
     * @param pageEldersAuthFeedbackDTO
     * @return 维护结果
     */
    public R<IPage<EldersAuthFeedbackVO>> query(PageEldersAuthFeedbackDTO pageEldersAuthFeedbackDTO){
        return R.fail();
    }

    /**
     * 删除高龄认证社区反馈
     * @param EldersAuthFeedbackDeleteDTO
     * @return 平台用户信息
     */
    public R delete(EldersAuthFeedbackDeleteDTO EldersAuthFeedbackDeleteDTO){
        return R.fail();
    }

    /**
     * 查询高龄认证社区反馈详细信息
     * @param id 高龄认证社区反馈 id
     * @return 查找结果
     */
    public R<EldersAuthFeedbackDetailsVO> eldersAuthFeedbackDetails(Long id){
        EldersAuthFeedbackDO eldersAuthFeedbackDO = eldersAuthFeedbackDAO.selectById(id);
        if(eldersAuthFeedbackDO!=null) {
            EldersAuthFeedbackDetailsVO eldersAuthFeedbackDetailsVO = new EldersAuthFeedbackDetailsVO();
            BeanUtils.copyProperties(eldersAuthFeedbackDO, eldersAuthFeedbackDetailsVO);
            return R.ok(eldersAuthFeedbackDetailsVO);
        }
        return R.fail();
    }

}

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

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

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthFeedbackVO;
import com.panzhihua.common.model.vos.community.EldersAuthVO;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.EldersAuthService;
import io.swagger.annotations.ApiModelProperty;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;

/**
 * @auther lyq
 * @create 2021-04-14 15:03:01
 * @describe 订单表服务实现类
 */
@Slf4j
@Service
public class EldersAuthServiceImpl extends ServiceImpl<EldersAuthDAO, EldersAuthDO> implements EldersAuthService {

    @Resource
    private EldersAuthDAO eldersAuthDAO;

    @Resource
    private EldersAuthFeedbackDAO eldersAuthFeedbackDAO;
    /**
     * 新增高龄认证
     * @param eldersAuthAddDTO
     * @return 新增结果
     */
    public R add(EldersAuthAddDTO eldersAuthAddDTO){
        EldersAuthDO eldersAuthDO = new EldersAuthDO();
        BeanUtils.copyProperties(eldersAuthAddDTO, eldersAuthDO);
        eldersAuthDO.setCreateAt(new Date());
        eldersAuthDO.setCreateBy(eldersAuthAddDTO.getSumitUserId());
        if(eldersAuthDAO.insert(eldersAuthDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 修改高龄认证
     * @param eldersAuthEditDTO
     * @return 维护结果
     */
    public R edit(EldersAuthEditDTO eldersAuthEditDTO){
        EldersAuthDO eldersAuthDO = new EldersAuthDO();
        BeanUtils.copyProperties(eldersAuthEditDTO, eldersAuthDO);
        eldersAuthDO.setUpdateAt(new Date());
        eldersAuthDO.setUpdateBy(eldersAuthEditDTO.getSumitUserId());
        if(eldersAuthDAO.updateById(eldersAuthDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 分页查找高龄认证
     * @param pageEldersAuthDTO
     * @return 维护结果
     */
    public R<IPage<EldersAuthVO>> query(PageEldersAuthDTO pageEldersAuthDTO){
        Page page = new Page<>();
        page.setSize(pageEldersAuthDTO.getPageSize());
        page.setCurrent(pageEldersAuthDTO.getPageNum());
        return R.ok(eldersAuthDAO.selectByPage(page, pageEldersAuthDTO));
    }

    /**
     * 删除高龄认证
     * @param EldersAuthDeleteDTO
     * @return 平台用户信息
     */
    public R delete(EldersAuthDeleteDTO EldersAuthDeleteDTO){
        return R.fail();
    }

    /**
     * 查询高龄认证详细信息
     * @param id 高龄认证 id
     * @return 查找结果
     */
    public R<EldersAuthDetailsVO> eldersAuthDetails(Long id){
        EldersAuthDetailsVO eldersAuthDetailsVO = eldersAuthDAO.selectDetails(id);
        if(eldersAuthDetailsVO!=null) {
            //社区反馈
            List<EldersAuthFeedbackDO> list =
                    eldersAuthFeedbackDAO.selectList(new LambdaQueryWrapper<EldersAuthFeedbackDO>()
                            .eq(EldersAuthFeedbackDO::getAuthId, eldersAuthDetailsVO.getId()));
            List<EldersAuthFeedbackVO> listVO = new ArrayList<>();
            list.forEach(feedDo ->{
                EldersAuthFeedbackVO eldersAuthFeedbackVO = new EldersAuthFeedbackVO();
                BeanUtils.copyProperties(feedDo, eldersAuthFeedbackVO);
                listVO.add(eldersAuthFeedbackVO);
            });
            eldersAuthDetailsVO.setEldersAuthFeedbackVOList(listVO);
            return R.ok(eldersAuthDetailsVO);
        }
        return R.fail();
    }
    /**
     * 新增高龄认证社区反馈
     * @param eldersAuthFeedbackAddDTO
     * @return 新增结果
     */
    public R addFeedback(EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO){
        EldersAuthFeedbackDO eldersAuthFeedbackDO = new EldersAuthFeedbackDO();
        eldersAuthFeedbackDO.setCreateBy(eldersAuthFeedbackAddDTO.getUserId());
        eldersAuthFeedbackDO.setCreateAt(new Date());
        BeanUtils.copyProperties(eldersAuthFeedbackAddDTO, eldersAuthFeedbackDO);
        if(eldersAuthFeedbackDAO.insert(eldersAuthFeedbackDO)>0){
            return R.ok();
        }
        return R.fail();
    }


    /**
     * 查找高龄认证导出数据
     * @param pageEldersAuthDTO
     * @return 维护结果
     */
    public R<List<ExcelElderAuthDTO>> queryExportData(PageEldersAuthDTO pageEldersAuthDTO){
        Page page = new Page<>();
        page.setSize(pageEldersAuthDTO.getPageSize());
        page.setCurrent(10000);
        return R.ok(eldersAuthDAO.selectByParams(pageEldersAuthDTO));
    }
}

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

@@ -585,7 +585,7 @@
    public R putUserCommunityArea(LoginUserInfoVO loginUserInfoVO) {
        SysUserDO sysUserDO = new SysUserDO();
        sysUserDO.setCommunityId(loginUserInfoVO.getCommunityId());
        sysUserDO.setAreaId(loginUserInfoVO.getAreaId());
//        sysUserDO.setAreaId(loginUserInfoVO.getAreaId());
        sysUserDO.setUserId(loginUserInfoVO.getUserId());
        int update = userDao.updateById(sysUserDO);
        if (update > 0) {