fix:

DESKTOP-71BH0QO\L、ming

2021-04-28 45609a2a45bd2ebe26cf7a7a4a066455e56d00da

fix:

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

@@ -66,22 +66,22 @@
            if (!ObjectUtils.isEmpty(data)) {
                LoginUserInfoVO loginUserInfoVO = (LoginUserInfoVO) data;
                R r1 = communityService.detailHouse(userId);
                if (null!=communityId&&0!=communityId) {
                    R r2=communityService.detailCommunity(communityId);
                if (null != communityId && 0 != communityId) {
                    R r2 = communityService.detailCommunity(communityId);
                    if (R.isOk(r2)) {
                        Object data1 = r2.getData();
                        if (!ObjectUtils.isEmpty(data1)) {
                            loginUserInfoVO.setComActVO(JSONObject.parseObject(JSONObject.toJSONString(data1),ComActVO.class));
                            loginUserInfoVO.setComActVO(JSONObject.parseObject(JSONObject.toJSONString(data1), ComActVO.class));
                            r.setData(loginUserInfoVO);
                        }
                    }
                }
                if (null!=areaId&&areaId!=0) {
                    R r3=communityService.detailArea(areaId);
                if (null != areaId && areaId != 0) {
                    R r3 = communityService.detailArea(areaId);
                    if (R.isOk(r3)) {
                        Object data1 = r3.getData();
                        if (!ObjectUtils.isEmpty(data1)) {
                            loginUserInfoVO.setComMngStructAreaVO(JSONObject.parseObject(JSONObject.toJSONString(data1),ComMngStructAreaVO.class));
                            loginUserInfoVO.setComMngStructAreaVO(JSONObject.parseObject(JSONObject.toJSONString(data1), ComMngStructAreaVO.class));
                            r.setData(loginUserInfoVO);
                        }
                    }
@@ -106,7 +106,7 @@
        R r = userService.putUserAuthentication(loginUserInfoVO);
        if (R.isOk(r)) {
            //通过发通知
            SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
            SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
            sysUserNoticeVO.setUserId(userId);
            sysUserNoticeVO.setType(3);
            sysUserNoticeVO.setTitle("实名制审核通过");
@@ -121,18 +121,18 @@
        } else {
            //未通过发通知
            /**
            SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
            sysUserNoticeVO.setUserId(userId);
            sysUserNoticeVO.setType(3);
            sysUserNoticeVO.setTitle("实名制审核未通过");
            sysUserNoticeVO.setBusinessType(6);
            sysUserNoticeVO.setBusinessContent(String.format("驳回原因：%s",r.getMsg()));
            sysUserNoticeVO.setStatus(0);
            sysUserNoticeVO.setBusinessStatus(1);
            R r1 = userService.addNotice(sysUserNoticeVO);
            if (R.isOk(r1)) {
                log.info("新增实名认证未通过通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
            }
             SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
             sysUserNoticeVO.setUserId(userId);
             sysUserNoticeVO.setType(3);
             sysUserNoticeVO.setTitle("实名制审核未通过");
             sysUserNoticeVO.setBusinessType(6);
             sysUserNoticeVO.setBusinessContent(String.format("驳回原因：%s",r.getMsg()));
             sysUserNoticeVO.setStatus(0);
             sysUserNoticeVO.setBusinessStatus(1);
             R r1 = userService.addNotice(sysUserNoticeVO);
             if (R.isOk(r1)) {
             log.info("新增实名认证未通过通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
             }
             */
        }
        return r;
@@ -162,7 +162,7 @@
    @PostMapping("editUserTips")
    public R putUserTips(@RequestBody SysUserEditTipsDTO userEditTipsDTO) {
        Long userId = this.getUserId();
        if(userId == null){
        if (userId == null) {
            return R.fail("请重新登录");
        }
        userEditTipsDTO.setUserId(userId);
@@ -171,13 +171,13 @@

    @ApiOperation(value = "房屋地址下拉列表")
    @GetMapping("listhouse")
    @ApiImplicitParam(name = "parentCode",value = "父级地址编码",required = false)
    @ApiImplicitParam(name = "parentCode", value = "父级地址编码", required = false)
    public R listHouses(String parentCode) {
        Long areaId = this.getAreaId();
        if (ObjectUtils.isEmpty(parentCode)) {
            parentCode="";
            parentCode = "";
        }
        return communityService.listHouses(parentCode,areaId);
        return communityService.listHouses(parentCode, areaId);
    }

    @ApiOperation(value = "新增房屋")
@@ -195,9 +195,9 @@

    @ApiOperation(value = "家庭成员列表")
    @GetMapping("listfamily")
    public R listFamily() {
    public R listFamily(@RequestParam(value = "pageNum") Long pageNum, @RequestParam("pageNum") Long pageSize) {
        Long userId = this.getUserId();
        return userService.listFamily(userId);
        return userService.listFamily(userId, pageNum, pageSize);
    }

    @ApiOperation(value = "新增家庭成员")
@@ -212,35 +212,35 @@
    @PutMapping("putfamily")
    public R putFamily(@RequestBody ComMngFamilyInfoVO comMngFamilyInfoVO) {
        Long id = comMngFamilyInfoVO.getId();
        if (null==id||0==id) {
        if (null == id || 0 == id) {
            return R.fail("成员主键不能为空");
        }
        comMngFamilyInfoVO.setUserId(this.getUserId());
        return userService.putFamily(comMngFamilyInfoVO);
    }

    @ApiOperation(value = "我的活动",response =ComActActivityVO.class )
    @ApiOperation(value = "我的活动", response = ComActActivityVO.class)
    @GetMapping("listactivity")
    public R listActivity() {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long userId = loginUserInfo.getUserId();
        Long communityId = loginUserInfo.getCommunityId();
        List<ComActActivityVO> comActActivityVOS=new ArrayList<>();
        R r=communityService.listActivity(userId);
        List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
        R r = communityService.listActivity(userId);
        if (R.isOk(r)) {
            comActActivityVOS =(List<ComActActivityVO>) r.getData();
            comActActivityVOS = (List<ComActActivityVO>) r.getData();
        }
        R r1=partyBuildingService.listActivity(userId,communityId);
        R r1 = partyBuildingService.listActivity(userId, communityId);
        if (R.isOk(r1)) {
            List<ComActActivityVO> data = (List<ComActActivityVO>) r1.getData();
            comActActivityVOS.addAll(data);
        }
        if (!ObjectUtils.isEmpty(comActActivityVOS)) {
            String s = JSONArray.toJSONString(comActActivityVOS);
            List<ComActActivityVO>comActActivityVOS1=new ArrayList<>();
            comActActivityVOS1=JSONArray.parseArray(s,ComActActivityVO.class);
            List<ComActActivityVO> comActActivityVOS1 = new ArrayList<>();
            comActActivityVOS1 = JSONArray.parseArray(s, ComActActivityVO.class);
            List<ComActActivityVO> collect = comActActivityVOS1.stream().sorted(Comparator.comparing(ComActActivityVO::getBeginAt).reversed()).collect(Collectors.toList());
            comActActivityVOS=collect;
            comActActivityVOS = collect;
        }
        if (!ObjectUtils.isEmpty(comActActivityVOS)) {
            List<ComActActivityVO> collect = comActActivityVOS.stream().sorted(Comparator.comparing(ComActActivityVO::getSingDate).reversed()).collect(Collectors.toList());
@@ -249,7 +249,7 @@
        return R.ok(comActActivityVOS);
    }

    @ApiOperation(value = "分页查询我的随手拍",response = ComActEasyPhotoVO.class )
    @ApiOperation(value = "分页查询我的随手拍", response = ComActEasyPhotoVO.class)
    @PostMapping("pageeasyphoto")
    public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        Long userId = this.getUserId();
@@ -258,30 +258,30 @@
        return communityService.pageEasyPhotoApplets(comActEasyPhotoVO);
    }

    @ApiOperation(value = "分页查询我的微心愿",response = ComActMicroWishVO.class )
    @ApiOperation(value = "分页查询我的微心愿", response = ComActMicroWishVO.class)
    @PostMapping("pagemicrowish")
    public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
        Long userId = this.getUserId();
        comActMicroWishVO.setUserId(userId);
        comActMicroWishVO.setCommunityId(null);
        Integer status = comActMicroWishVO.getStatus();
        if (null!=status&&status==1) {
        if (null != status && status == 1) {
            comActMicroWishVO.setIsPageMyWish(1);
        }else{
        } else {
            comActMicroWishVO.setIsPageMyWish(null);
        }

        return communityService.pageMicroWish(comActMicroWishVO);
    }

    @ApiOperation(value = "用户确认心愿" )
    @ApiOperation(value = "用户确认心愿")
    @PutMapping("microwishconfirm")
    public R putMicroWishConfirm(@RequestBody ComActMicroWishVO comActMicroWishVO) {
        Long userId = this.getUserId();
        comActMicroWishVO.setUserId(userId);
        comActMicroWishVO.setCommunityId(null);
        Long id = comActMicroWishVO.getId();
        if (null==id||0==id) {
        if (null == id || 0 == id) {
            return R.fail("心愿主键不能为空");
        }
        String evaluate = comActMicroWishVO.getEvaluate();
@@ -289,7 +289,7 @@
            return R.fail("用户评价不能为空");
        }
        Integer score = comActMicroWishVO.getScore();
        if (null==score||0==score) {
        if (null == score || 0 == score) {
            return R.fail("评分不能为空");
        }
        comActMicroWishVO.setEvaluateAt(new Date());
@@ -297,14 +297,14 @@
        return communityService.putMicroWishConfirm(comActMicroWishVO);
    }

    @ApiOperation(value = "调试接口--清除昵称、社区、小区" )
    @ApiOperation(value = "调试接口--清除昵称、社区、小区")
    @DeleteMapping("usertest")
    public R deleteUserTest() {
        Long userId = this.getUserId();
        return userService.deleteUserTest(userId);
    }

    @ApiOperation(value = "意见反馈" )
    @ApiOperation(value = "意见反馈")
    @PostMapping("feedback")
    public R addFeedback(@RequestBody @Validated(AddGroup.class) SysUserFeedbackDTO sysUserFeedbackDTO) {
        //        微信内容审核
@@ -316,7 +316,7 @@
        Long userId = loginUserInfo.getUserId();
        Long communityId = loginUserInfo.getCommunityId();
        Long areaId = loginUserInfo.getAreaId();
        if (null==communityId||0==communityId) {
        if (null == communityId || 0 == communityId) {
            return R.fail("未绑定社区");
        }
        sysUserFeedbackDTO.setCommunityId(communityId);
@@ -325,14 +325,14 @@
        return userService.addFeedback(sysUserFeedbackDTO);
    }

    @ApiOperation(value = "党员认证" )
    @ApiOperation(value = "党员认证")
    @PostMapping("partybuildingembercertification")
    public R partybuildingembercertification(@RequestBody @Validated(AddGroup.class) ComPbMemberCertificationDTO comPbMemberCertificationDTO) {
        //totest 党员认证
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long userId = loginUserInfo.getUserId();
        Long communityId = loginUserInfo.getCommunityId();
        if (null==communityId||0==communityId) {
        if (null == communityId || 0 == communityId) {
            return R.fail("未绑定社区");
        }

@@ -341,13 +341,13 @@

        Object certUserInfo = certUser.getData();
        boolean userCertified = false;
        if(certUserInfo!=null){
        if (certUserInfo != null) {
            PartyBuildingMemberVO certUserVo = (PartyBuildingMemberVO) certUserInfo;
            //已认证党员身份，直接返回
            userCertified = certUserVo.getAuditResult()==1;
            userCertified = certUserVo.getAuditResult() == 1;
        }
        //匹配手机，验证是否进行自动确认
        if(userCertified){
        if (userCertified) {
            return R.fail("用户已完成党员认证");
        }

@@ -357,9 +357,9 @@
        //用户实名认证信息判断
        String idCard = loginUserInfo.getIdCard();
        partyBuildingMemberVO.setUserId(userId);
        if(idCard==null) {
        if (idCard == null) {
            return R.fail("用户未完成实名认证");
        }else{
        } else {
            partyBuildingMemberVO.setIdCard(loginUserInfo.getIdCard());
            partyBuildingMemberVO.setName(loginUserInfo.getName());
        }
@@ -368,7 +368,7 @@
        return r;
    }

    @ApiOperation(value = "党员认证查询" )
    @ApiOperation(value = "党员认证查询")
    @GetMapping("partybuildingembercertification")
    public R partybuildingembercertification() {
        //totest 党员认证查询
@@ -378,11 +378,11 @@
    }


    @ApiOperation(value = "获取用户电子档案",response = UserArchivesVO.class)
    @ApiOperation(value = "获取用户电子档案", response = UserArchivesVO.class)
    @PostMapping("getUserArchives")
    public R getUserArchives() {
        Long userId = this.getUserId();
        if(userId == null){
        if (userId == null) {
            return R.fail("请重新登录");
        }
        return userService.getUserArchives(userId);
@@ -392,7 +392,7 @@
    @PostMapping("updateUserArchives")
    public R updateUserArchives(@RequestBody UpdateUserArchivesVO userArchivesVO) {
        Long userId = this.getUserId();
        if(userId == null){
        if (userId == null) {
            return R.fail("请重新登录");
        }
        userArchivesVO.setUserId(userId);

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java

@@ -1,8 +1,11 @@
package com.panzhihua.common.model.dtos.neighbor;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @auther llming
@@ -18,7 +21,16 @@
    @ApiModelProperty(value = "分页-每页记录数",example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty("邻里圈查询类型（1.热门 2.最新 3.精品）")
    private Integer type = 1;

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

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

    @ApiModelProperty("议事主题")
    private String releaseContent;

}

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

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

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


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

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

@@ -33,6 +33,9 @@
    @ApiModelProperty("办理时间")
    private String timeAt;

    @ApiModelProperty("创建时间")
    private String createAt;

    @ApiModelProperty("办理地点")
    private String address;


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

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

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

/**
 * @auther llming
 * @describe
 */
@Data
@ApiModel("新增邻里圈")
public class AddNeighborCircleAdminVO {

    @ApiModelProperty("发布内容")
    private String releaseContent;

    @ApiModelProperty("发布图片")
    private String releaseImages;
}

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

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

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

import java.util.Date;

/**
 * @auther llming
 * @describe 邻里圈VO
 */
@Data
@ApiModel("邻里圈")
public class ComActNeighborCircleAdminVO {

    @ApiModelProperty("id")
    private Long id;

    @ApiModelProperty("发布人id")
    private Long releaseId;

    @ApiModelProperty("发布人")
    private Long releaseName;

    @ApiModelProperty("发布人电话")
    private String releasePhone;


    @ApiModelProperty("社区")
    private Long communityName;

    @ApiModelProperty("详情")
    private String releaseContent;


    @ApiModelProperty("发布图片")
    private String releaseImages;

    @ApiModelProperty("发布状态(1.待审核 2.显示 3.隐藏 4.驳回)")
    private Integer status;


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


    @ApiModelProperty("评论数")
    private Integer commentNum;


    @ApiModelProperty("点赞数")
    private Integer fabulousNum;


    @ApiModelProperty("转发数")
    private Integer forwardNum;


    @ApiModelProperty("浏览量")
    private Integer viewsNum;

    @ApiModelProperty("发布时间")
    private Date createAt;

    @ApiModelProperty("评论数")
    private Integer lastCommentNum;

    @ApiModelProperty("点赞数")
    private Integer lastFabulousNum;

}

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

@@ -50,7 +50,7 @@
    private String position;

    @ApiModelProperty("职位2")
    private String position_two;
    private String positionTwo;

    @ApiModelProperty("岗位职责")
    @NotBlank(groups = {AddGroup.class},message = "岗位职责不能为空")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -214,7 +214,9 @@
     * @return 成员集合
     */
    @PostMapping("listfamily")
    R listFamily(@RequestParam("userId")Long userId);
    R listFamily(@RequestParam("userId")Long userId,
                 @RequestParam(value = "pageNum") Long pageNum,
                 @RequestParam("pageNum") Long pageSize);

    /**
     * 新增家庭成员

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

@@ -3,8 +3,10 @@
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.neighbor.ComActNeighborCircleAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO;
import org.apache.ibatis.annotations.Mapper;
@@ -22,4 +24,22 @@
    @Select("")
    IPage<ComActNeighborCircleAppVO> pageNeighborByApp(Page page, @Param("neighborCircleAppDTO") ComActNeighborCircleAppDTO neighborCircleAppDTO);

    @Select("<script> \n"+
            "SELECT\n" +
            "nc.*,\n" +
            "u.`name` AS releaseName \n" +
            "FROM\n" +
            "com_act_neighbor_circle nc\n" +
            "LEFT JOIN sys_user u ON nc.release_id = u.user_id\n" +
            "<where>"+
            "<if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent.trim() != &quot;&quot;'>" +
            "and t.release_content LIKE concat('%',#{neighborCircleAdminDTO.releaseContent}, '%' )  " +
            " </if> " +
            "<if test='neighborCircleAdminDTO.startAt != null and neighborCircleAdminDTO.endAt !=null '>" +
            "and t.create_at between #{neighborCircleAdminDTO.startAt} and #{neighborCircleAdminDTO.endAt}  " +
            " </if> " +
            "</where>"+
            "order by nc.`status` asc,nc.create_at desc " +
            "</script>")
    IPage<ComActNeighborCircleAdminVO> pageNeighborByAdmin(Page page,@Param("neighborCircleAdminDTO") ComActNeighborCircleAdminDTO neighborCircleAdminDTO);
}

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

@@ -17,7 +17,7 @@
@Mapper
public interface ComActWorkGuideDAO extends BaseMapper<ComActWorkGuideDO> {
    @Select("<script> " +
            "select id ,title,content,time_at,address,phone from com_act_work_guide " +
            "select id ,title,content,time_at,address,phone,create_at from com_act_work_guide " +
            " <where>" +
            "<if test='pageActWorkGuideDTO.title != null and pageActWorkGuideDTO.title.trim() != &quot;&quot;'>" +
            "title like concat('%',#{pageActWorkGuideDTO.title},'%')"+

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

@@ -14,9 +14,12 @@
@Data
public class BaseDO {
    private Long createBy;

    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    private Long updateBy;
    @TableField(fill = FieldFill.INSERT)

    private Date updateAt;
}

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

@@ -25,6 +25,8 @@
     * 管理后台查询邻里圈列表
     * @return
     */
    //R backstagePageNeighbor(ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
    R pageNeighborByAdmin(ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);

    R addNeighborByAdmin();

}

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

@@ -3,8 +3,10 @@
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.neighbor.ComActNeighborCircleAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
import com.panzhihua.service_community.dao.ComActNeighborCircleDAO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO;
@@ -32,4 +34,10 @@
        return R.ok(doPager);
    }

    @Override
    public R pageNeighborByAdmin(ComActNeighborCircleAdminDTO neighborCircleAdminDTO) {
        Page page = new Page(neighborCircleAdminDTO.getPageNum(), neighborCircleAdminDTO.getPageSize());
        IPage<ComActNeighborCircleAdminVO> doPager = this.baseMapper.pageNeighborByAdmin(page, neighborCircleAdminDTO);
        return R.ok(doPager);
    }
}

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

@@ -35,539 +35,593 @@

    /**
     * 新增微信用户
     * @param openid 微信小程序标志
     *
     * @param openid     微信小程序标志
     * @param sessionKey 会话密钥
     * @param unionid 微信平台唯一ID
     * @param unionid    微信平台唯一ID
     * @return 新增结果
     */
    @PostMapping("/addOrUpdate")
    public R addOrUpdate(@RequestParam("openid") String openid, @RequestParam("sessionKey")String sessionKey, @RequestParam("unionid")String unionid){
        return userService.updateInsertUser(openid,sessionKey,unionid);
    public R addOrUpdate(@RequestParam("openid") String openid, @RequestParam("sessionKey") String sessionKey, @RequestParam("unionid") String unionid) {
        return userService.updateInsertUser(openid, sessionKey, unionid);
    }

    /**
     * 维护小程序用户基本信息 头像 昵称 性别
     * @param userId 数据库用户ID
     * @param nickName 昵称
     * @param gender 性别
     *
     * @param userId    数据库用户ID
     * @param nickName  昵称
     * @param gender    性别
     * @param avatarUrl 头像
     * @return 维护结果
     */
    @PostMapping("/updateUserWeiXinInfo")
    public R updateUserWeiXinInfo(@RequestParam("userId")Long userId, @RequestParam("nickName")String nickName, @RequestParam("gender")int gender, @RequestParam("avatarUrl")String avatarUrl){
        return userService.updateUserWeiXinInfo(userId,nickName,gender,avatarUrl);
    public R updateUserWeiXinInfo(@RequestParam("userId") Long userId, @RequestParam("nickName") String nickName, @RequestParam("gender") int gender, @RequestParam("avatarUrl") String avatarUrl) {
        return userService.updateUserWeiXinInfo(userId, nickName, gender, avatarUrl);
    }

    /**
     * 维护微信用户手机号
     * @param userId 数据库ID
     *
     * @param userId          数据库ID
     * @param purePhoneNumber 没有区号的手机号
     * @return 维护结果
     */
    @PostMapping("/updateUserWeiXinPhone")
    public R updateUserWeiXinPhone(@RequestParam("userId")Long userId, @RequestParam("purePhoneNumber")String purePhoneNumber){
        return userService.updateUserWeiXinPhone(userId,purePhoneNumber);
    public R updateUserWeiXinPhone(@RequestParam("userId") Long userId, @RequestParam("purePhoneNumber") String purePhoneNumber) {
        return userService.updateUserWeiXinPhone(userId, purePhoneNumber);
    }

    /**
     * 获取平台用户
     *
     * @param userName 登录账户+_type
     * @return 平台用户信息
     */
    @PostMapping("/getUserInfo")
    public R<LoginUserInfoVO> getUserInfo(@RequestParam("userName") String userName){
    public R<LoginUserInfoVO> getUserInfo(@RequestParam("userName") String userName) {
        int index = userName.lastIndexOf("_");
        String type = userName.substring(index+1, userName.length());
        String type = userName.substring(index + 1, userName.length());
        String name = userName.substring(0, index);
        return userService.getUserInfo(name,Integer.parseInt(type));
        return userService.getUserInfo(name, Integer.parseInt(type));
    }

    /**
     * 获取平台用户
     *
     * @param userId 用户ID
     * @return 平台用户信息
     */
    @PostMapping("/getUserInfoUserId")
    public R<LoginUserInfoVO> getUserInfoByUserId(@RequestParam("userId") String userId){
    public R<LoginUserInfoVO> getUserInfoByUserId(@RequestParam("userId") String userId) {
        return userService.getUserInfo(userId);
    }

    /**
     * 修改用户登录密码
     *
     * @param changePasswordVO 新密码
     * @return 修改结果
     */
    @PostMapping("changepassword")
    public R changePassword(@RequestBody ChangePasswordVO changePasswordVO){
    public R changePassword(@RequestBody ChangePasswordVO changePasswordVO) {
        return userService.changePassword(changePasswordVO);
    }

    /**
     * 某社区后台人员查询
     * @param param 名字
     *
     * @param param       名字
     * @param communityId 社区id
     * @return 人员集合
     */
    @PostMapping("listactivitymanager")
    public R listActivityManager(@RequestParam("param") String param, @RequestParam("communityId")Long communityId){
        return userService.listActivityManager(param,communityId);
    public R listActivityManager(@RequestParam("param") String param, @RequestParam("communityId") Long communityId) {
        return userService.listActivityManager(param, communityId);
    }

    /**
     *分页查询人脸识别
     * 分页查询人脸识别
     *
     * @param loginUserInfoVO 查询参数
     * @return 分页集合
     */
    @PostMapping("pageuserface")
    public R pageUserFace(@RequestBody LoginUserInfoVO loginUserInfoVO){
    public R pageUserFace(@RequestBody LoginUserInfoVO loginUserInfoVO) {
        return userService.pageUserFace(loginUserInfoVO);
    }

    /**
     * 编辑人脸采集数据通过、驳回、删除
     *
     * @param loginUserInfoVO 操作信息
     * @return 操作结果
     */
    @PostMapping("putuserface")
    public R putUserFace(@RequestBody LoginUserInfoVO loginUserInfoVO){
    public R putUserFace(@RequestBody LoginUserInfoVO loginUserInfoVO) {
        return userService.putUserFace(loginUserInfoVO);
    }

    /**
     *分页查询人口管理
     * 分页查询人口管理
     *
     * @param loginUserInfoVO 查询参数
     * @return 分页数据
     */
    @PostMapping("pageuser")
    public R pageUser(@RequestBody LoginUserInfoVO loginUserInfoVO){
    public R pageUser(@RequestBody LoginUserInfoVO loginUserInfoVO) {
        return userService.pageUser(loginUserInfoVO);
    }

    /**
     * 查询所有人员标签
     *
     * @return 标签集合
     */
    @PostMapping("listtag")
    public R listTag(){
    public R listTag() {
        return userService.listTag();
    }

    /**
     * 查询当前社区所有标签以及预设标签
     *
     * @return 标签集合
     */
    @PostMapping("listtag/getTag")
    public R listTags(@RequestParam("communityId") Long communityId){
    public R listTags(@RequestParam("communityId") Long communityId) {
        return userService.listTags(communityId);
    }

    /**
     * 人员详情
     *
     * @param userId 用户id
     * @return 人员详情
     */
    @PostMapping("detailuser")
    public R detailUser(@RequestParam("userId") Long userId){
    public R detailUser(@RequestParam("userId") Long userId) {
        return userService.detailUser(userId);
    }

    /**
     * 设置用户标签
     *
     * @param loginUserInfoVO 标签信息
     * @return 设置结果
     */
    @PostMapping("putusertag")
    public R putUserTag(@RequestBody LoginUserInfoVO loginUserInfoVO){
    public R putUserTag(@RequestBody LoginUserInfoVO loginUserInfoVO) {
        return userService.putUserTag(loginUserInfoVO);
    }

    /**
     * 修改用户志愿者状态
     *
     * @param phone 志愿者手机号
     * @param type 1是志愿者 0 不是
     * @param type  1是志愿者 0 不是
     */
    @PostMapping("putuserisvolunteer")
    R putUserIsVolunteer(@RequestParam("phone")String phone,@RequestParam("type")int type){
        return userService.putUserIsVolunteer(phone,type);
    R putUserIsVolunteer(@RequestParam("phone") String phone, @RequestParam("type") int type) {
        return userService.putUserIsVolunteer(phone, type);
    }

    /**
     * 修改用户志愿者状态
     *
     * @param userId 志愿者ID
     * @param type 1是志愿者 0 不是
     * @param type   1是志愿者 0 不是
     */
    @PostMapping("putuserisvolunteerbyid")
    R putUserIsVolunteerById(@RequestParam("userId")Long userId,@RequestParam("type")int type){
    R putUserIsVolunteerById(@RequestParam("userId") Long userId, @RequestParam("type") int type) {
        return userService.putUserIsVolunteerById(userId, type);
    }

    /**
     * 用户绑定社区、小区
     *
     * @param loginUserInfoVO 社区小区数据
     * @return 绑定结果
     */
    @PostMapping("putusercommunityarea")
    R putUserCommunityArea(@RequestBody LoginUserInfoVO loginUserInfoVO){
    R putUserCommunityArea(@RequestBody LoginUserInfoVO loginUserInfoVO) {
        return userService.putUserCommunityArea(loginUserInfoVO);
    }

    /**
     * 用户实名认证
     *
     * @param loginUserInfoVO 认证数据
     * @return 认证结果
     */
    @PostMapping("putuserauthentication")
    public R putUserAuthentication(@RequestBody LoginUserInfoVO loginUserInfoVO){
    public R putUserAuthentication(@RequestBody LoginUserInfoVO loginUserInfoVO) {
        return userService.putUserAuthentication(loginUserInfoVO);
    }

    /**
     * 修改用户手机号
     *
     * @param userPhoneVO 手机号信息
     * @return 修改结果
     */
    @PostMapping("putuserphone")
    public R putUserphone(@RequestBody UserPhoneVO userPhoneVO){
    public R putUserphone(@RequestBody UserPhoneVO userPhoneVO) {
        return userService.putUserphone(userPhoneVO);
    }

    /**
     * 修改用户信息
     *
     * @param loginUserInfoVO 修改内容
     * @return 修改结果
     */
    @PostMapping("putuser")
    public R putUser(@RequestBody LoginUserInfoVO loginUserInfoVO){
    public R putUser(@RequestBody LoginUserInfoVO loginUserInfoVO) {
        return userService.putUser(loginUserInfoVO);
    }

    /**
     * 家庭成员列表
     *
     * @param userId 登录用户
     * @return 成员集合
     */
    @PostMapping("listfamily")
    public R listFamily(@RequestParam("userId")Long userId){
        return userService.listFamily(userId);
    public R listFamily(@RequestParam("userId") Long userId,
                        @RequestParam(value = "pageNum") Long pageNum,
                        @RequestParam("pageNum") Long pageSize) {
        return userService.listFamily(userId, pageNum, pageSize);
    }

    /**
     * 新增家庭成员
     *
     * @param comMngFamilyInfoVO 家庭成员基本信息
     * @return 增加结果
     */
    @PostMapping("addFamily")
    public R addFamily(@RequestBody ComMngFamilyInfoVO comMngFamilyInfoVO){
    public R addFamily(@RequestBody ComMngFamilyInfoVO comMngFamilyInfoVO) {
        return userService.addFamily(comMngFamilyInfoVO);
    }

    /**
     * 编辑家庭成员
     *
     * @param comMngFamilyInfoVO 家庭成员信息
     * @return 编辑结果
     */
    @PostMapping("putfamily")
    public R putFamily(@RequestBody ComMngFamilyInfoVO comMngFamilyInfoVO){
    public R putFamily(@RequestBody ComMngFamilyInfoVO comMngFamilyInfoVO) {
        return userService.putFamily(comMngFamilyInfoVO);
    }

    /**
     * 新增运营、社区后台账户
     *
     * @param administratorsUserVO 账户信息
     * @return 新增结果
     */
    @PostMapping("adduserbackstage")
    public R addUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){
    public R addUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO) {

        return userService.addUserBackstage(administratorsUserVO);
    }

    /**
     * 编辑运营、社区后台账户
     *
     * @param administratorsUserVO 编辑账户内容
     * @return 编辑结果
     */
    @PostMapping("putuserbackstage")
    R putUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){
    R putUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO) {
        return userService.putUserBackstage(administratorsUserVO);
    }

    /**
     * 删除后台用户
     *
     * @param administratorsUserVO 用户主键
     * @return 删除结果
     */
    @PostMapping("deleteuserbackstage")
    public R deleteUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){
    public R deleteUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO) {
        return userService.deleteUserBackstage(administratorsUserVO);
    }

    /**
     * 分页查询后台用户
     *
     * @param administratorsUserVO 查询参数
     * @return 后台用户
     */
    @PostMapping("pageuserbackstage")
    public R pageUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){
    public R pageUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO) {
        return userService.pageUserBackstage(administratorsUserVO);
    }

    /**
     * 保存操作日志
     *
     * @param operlog 日志内容
     * @return 保存结果
     */
    @PostMapping("addoperlog")
    public R addOperLog(@RequestBody SysOperLogVO operlog){
    public R addOperLog(@RequestBody SysOperLogVO operlog) {
        return userService.addOperLog(operlog);
    }

    /**
     * 分页展示操作日志
     *
     * @param sysOperLogVO 分页参数
     * @return 分页集合
     */
    @PostMapping("pageoperlog")
    public R pageOperLog(@RequestBody SysOperLogVO sysOperLogVO){
    public R pageOperLog(@RequestBody SysOperLogVO sysOperLogVO) {
        return userService.pageOperLog(sysOperLogVO);
    }

    /**
     * 用户协议
     *
     * @return 协议集合
     */
    @PostMapping("listagreement")
    public R listAgreement(){
    public R listAgreement() {
        return userService.listAgreement();
    }

    /**
     * 编辑用户协议
     *
     * @param sysUserAgreementVO 编辑内容
     * @return 编辑结果
     */
    @PostMapping("putagreement")
    public R putAgreement(@RequestBody SysUserAgreementVO sysUserAgreementVO){
    public R putAgreement(@RequestBody SysUserAgreementVO sysUserAgreementVO) {
        return userService.putAgreement(sysUserAgreementVO);
    }

    /**
     * 用户标签
     *
     * @param communityId 社区id
     * @return 标签集合
     */
    @PostMapping("listcommngusertag")
    public R listComMngUserTag(@RequestParam("communityId")Long communityId){
    public R listComMngUserTag(@RequestParam("communityId") Long communityId) {
        return userService.listComMngUserTag(communityId);
    }

    /**
     * 新增删除用户标签
     *
     * @param systemmanagementConfigVO 操作内容
     * @return 操作结果
     */
    @PostMapping("putcommngusertag")
    public R putComMngUserTag(@RequestBody SystemmanagementConfigVO systemmanagementConfigVO){
    public R putComMngUserTag(@RequestBody SystemmanagementConfigVO systemmanagementConfigVO) {
        return userService.putComMngUserTag(systemmanagementConfigVO);
    }

    /**
     * 分页查询小程序用户
     *
     * @param pageUserAppletsBackstageDTO 查询参数
     * @return 分页集合
     */
    @PostMapping("pageuserappletsbackstage")
    public R pageUserAppletsBackstage(@RequestBody PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO){
    public R pageUserAppletsBackstage(@RequestBody PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO) {
        return userService.pageUserAppletsBackstage(pageUserAppletsBackstageDTO);
    }

    /**
     * 编辑用户状态
     *
     * @param pageUserAppletsBackstageDTO 启用或者禁用 1 启用 2 禁用
     * @return 编辑结果
     */
    @PostMapping("putuserappletsbackstage")
    public R putUserAppletsBackstage(@RequestBody PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO){
    public R putUserAppletsBackstage(@RequestBody PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO) {
        return userService.putUserAppletsBackstage(pageUserAppletsBackstageDTO);
    }

    /**
     * 调试接口--清除昵称、社区、小区
     *
     * @param userId 登录用户id
     * @return 清除结果
     */
    @PostMapping("deleteusertest")
    public R deleteUserTest(@RequestParam("userId")Long userId){
    public R deleteUserTest(@RequestParam("userId") Long userId) {
        return userService.deleteUserTest(userId);
    }

    /**
     * 用户协议和隐私政策
     *
     * @param type 所属app 1居民端app 2网格员端app 3商家端app
     * @return 协议内容
     */
    @PostMapping("useragreement")
    public R userAgreement(@RequestParam("type")int type){
    public R userAgreement(@RequestParam("type") int type) {
        return userService.userAgreement(type);
    }

    /**
     * 意见反馈
     *
     * @param sysUserFeedbackDTO 反馈内容
     * @return 反馈结果
     */
    @PostMapping("addfeedback")
    public R addFeedback(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){
    public R addFeedback(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO) {
        return userService.addFeedback(sysUserFeedbackDTO);
    }

    /**
     * 分页通知列表
     *
     * @param pageDTO 分页参数
     * @return 分页结果
     */
    @PostMapping("pagenotice")
    public R pageNotice(@RequestBody PageDTO pageDTO){
    public R pageNotice(@RequestBody PageDTO pageDTO) {
        return userService.pageNotice(pageDTO);
    }

    /**
     * 通知已读
     *
     * @param noticeReadDTO 通知已读
     * @return 修改状态
     */
    @PostMapping("putnotice")
    public R putNotice(@RequestBody NoticeReadDTO noticeReadDTO){
    public R putNotice(@RequestBody NoticeReadDTO noticeReadDTO) {
        return userService.putNotice(noticeReadDTO);
    }

    /**
     * 分页查询用户意见反馈
     *
     * @param pageFeedBackDTO 分页查询参数
     * @return 意见集合
     */
    @PostMapping("pagefeedback")
    public R pageFeedback(@RequestBody PageFeedBackDTO pageFeedBackDTO){
    public R pageFeedback(@RequestBody PageFeedBackDTO pageFeedBackDTO) {
        return userService.pageFeedback(pageFeedBackDTO);
    }

    /**
     * 未读消息汇总
     *
     * @param userId 登录用户信息
     * @return 未读汇总
     */
    @PostMapping("noticeunreadnum")
    public R noticeUnreadNum(@RequestParam("userId")Long userId){
    public R noticeUnreadNum(@RequestParam("userId") Long userId) {
        return userService.noticeUnreadNum(userId);
    }

    /**
     * 反馈意见详情
     *
     * @param id 反馈主键
     * @return 反馈详情
     *
     */
    @PostMapping("detailfeedback")
    public R detailFeedback(@RequestParam("id")Long id){
    public R detailFeedback(@RequestParam("id") Long id) {
        return userService.detailFeedback(id);
    }

    /**
     * 数据看板
     *
     * @return 运营后台数据看板
     */
    @PostMapping("datakanban")
    public R dataKanban(){
    public R dataKanban() {
        return userService.dataKanban();
    }

    /**
     * 社区管理后台数据看板
     *
     * @param communityId 社区id
     * @return 看板用户数据
     */
    @PostMapping("indexdatacommunitybackstage")
    public R indexDataCommunityBackstage(@RequestParam("communityId")Long communityId){
    public R indexDataCommunityBackstage(@RequestParam("communityId") Long communityId) {
        return userService.indexDataCommunityBackstage(communityId);
    }

    /**
     * 定时任务维护用户持续登录时间
     *
     * @return 维护结果
     */
    @PostMapping("timedtaskcontinuouslandingdays")
    public R timedTaskContinuousLandingDays(){
    public R timedTaskContinuousLandingDays() {
        return userService.timedTaskContinuousLandingDays();
    }

    /**
     * 新增用户通知
     *
     * @param sysUserNoticeVO 通知内容
     * @return 新增结果
     */
    @PostMapping("addnotice")
    public R addNotice(@RequestBody SysUserNoticeVO sysUserNoticeVO){
    public R addNotice(@RequestBody SysUserNoticeVO sysUserNoticeVO) {
        return userService.addNotice(sysUserNoticeVO);
    }

    /**
     * 修改用户的党员状态
     *
     * @param idCard 身份证号
     * @return 修改结果
     */
    @PostMapping("updateuserispartymember")
    public R updateUserIsPartymember(@RequestParam("idCard")String idCard){
    public R updateUserIsPartymember(@RequestParam("idCard") String idCard) {
        return userService.updateUserIsPartymember(idCard);
    }

    /**
     * 获取各种协议
     * @param type  1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策
     *
     * @param type 1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策
     * @return 协议内容
     */
    @PostMapping("agreement")
    public R agreement(@RequestParam("type")Integer type){
    public R agreement(@RequestParam("type") Integer type) {
        return userService.agreement(type);
    }

    /**
     * 维护用户最后登录时间
     *
     * @param userId 用户主键
     * @return 维护结果
     */
    @PostMapping("putuserlastlogintime")
    public R putUserLastLoginTime(@RequestParam("userId")Long userId){
    public R putUserLastLoginTime(@RequestParam("userId") Long userId) {
        return userService.putUserLastLoginTime(userId);
    }

    /**
     * 删除意见反馈
     *
     * @param id 主键
     * @return 删除结果
     */
    @PostMapping("deletefeedback")
    public R deleteFeedback(@RequestParam("id")Long id){
    public R deleteFeedback(@RequestParam("id") Long id) {
        return userService.deleteFeedback(id);
    }

    /**
     * 校验小区是否存在
     *
     * @param areaName 小区名字
     * @return 校验结果
     */
    @PostMapping("checkaereaname")
    public R checkAereaName(@RequestParam("areaName")String areaName){
    public R checkAereaName(@RequestParam("areaName") String areaName) {
        return userService.checkAereaName(areaName);
    }

    /**
     * 批量导入居民用户
     * @param list 居民用户集合
     *
     * @param list     居民用户集合
     * @param areaName 小区名字
     * @return 导入结果
     */
    @PostMapping("batchsaveuser")
    public R batchSaveUser(@RequestBody List<EexcelUserDTO> list,@RequestParam("areaName")StringBuffer areaName){
    public R batchSaveUser(@RequestBody List<EexcelUserDTO> list, @RequestParam("areaName") StringBuffer areaName) {
        R r = null;
        try {
            r = sysUserInputService.batchSaveUser(list, areaName);
@@ -578,8 +632,8 @@
                int i = message.indexOf("'");
                String idcard = message.substring(i + 1, message.indexOf("'", i + 1));
//                System.out.println(idcard);
                return R.fail("身份证存在重复"+idcard);
            }else {
                return R.fail("身份证存在重复" + idcard);
            } else {
                return R.fail(e.getMessage());
            }
        }
@@ -588,78 +642,85 @@

    /**
     * 社区人员详情包括导入人员
     *
     * @param userId 人员id
     * @return CommunityUserInfoVO
     */
    @PostMapping("detailusercomunity")
    public R detailUserComunity(@RequestParam("userId")Long userId){
        CommunityUserInfoVO communityUserInfoVO=new CommunityUserInfoVO();
        if(userId<100000000l){
            communityUserInfoVO=userService.detailUserComunity(userId);
        }else{
            communityUserInfoVO=sysUserInputService.detailUserComunity(userId);
    public R detailUserComunity(@RequestParam("userId") Long userId) {
        CommunityUserInfoVO communityUserInfoVO = new CommunityUserInfoVO();
        if (userId < 100000000l) {
            communityUserInfoVO = userService.detailUserComunity(userId);
        } else {
            communityUserInfoVO = sysUserInputService.detailUserComunity(userId);
        }
        return R.ok(communityUserInfoVO);
    }

    /**
     *  用户搜索了就下载搜索的用户否则下载所有用户
     * 用户搜索了就下载搜索的用户否则下载所有用户
     *
     * @param exportUserDTO 用户搜索内容
     * @return List<EexcelUserDTO> excel内容
     */
    @PostMapping("export")
    public R export(@RequestBody ExportUserDTO exportUserDTO){
      return userService.export(exportUserDTO);
    public R export(@RequestBody ExportUserDTO exportUserDTO) {
        return userService.export(exportUserDTO);
    }

    /**
     * 通过手机号码查询用户信息
     *
     * @param phone
     * @return
     */
    @GetMapping("getUserByPhone")
    public R getSysUserVOByPhone(@RequestParam(value = "phone") String phone){
    public R getSysUserVOByPhone(@RequestParam(value = "phone") String phone) {
        return userService.getSysUserVOByPhone(phone);
    }

    /**
     * 通过账号和渠道查询用户信息
     *
     * @param account
     * @return
     */
    @GetMapping("getUserByAccount")
    public R getSysUserVOByAccount(@RequestParam(value = "account") String account,@RequestParam(value = "type") Integer type){
    public R getSysUserVOByAccount(@RequestParam(value = "account") String account, @RequestParam(value = "type") Integer type) {
        return userService.getSysUserVOByAccount(account, type);
    }

    /**
     *分页查询人口管理
     * 分页查询人口管理
     *
     * @param pageInputUserDTO 查询参数
     * @return 分页数据
     */
    @PostMapping("common/data/user/page")
    public R pageInputUser(@RequestBody PageInputUserDTO pageInputUserDTO){
    public R pageInputUser(@RequestBody PageInputUserDTO pageInputUserDTO) {
        return sysUserInputService.pageInputUser(pageInputUserDTO);
    }

    /**
     * 设置用户标签
     *
     * @param inputUserTagsDTO 标签信息
     * @return 设置结果
     */
    @PostMapping("common/data/user/tags")
    public R setInputUserTag(@RequestBody InputUserTagsDTO inputUserTagsDTO){
    public R setInputUserTag(@RequestBody InputUserTagsDTO inputUserTagsDTO) {
        return sysUserInputService.putUserTag(inputUserTagsDTO);
    }

    /**
     * 批量导入居民用户
     * @param list 居民用户集合
     *
     * @param list     居民用户集合
     * @param areaName 小区名字
     * @return 导入结果
     */
    @PostMapping("common/data/user/import")
    public R batchSaveInputUser(@RequestBody List<EexcelUserDTO> list,@RequestParam("areaName")StringBuffer areaName){
    public R batchSaveInputUser(@RequestBody List<EexcelUserDTO> list, @RequestParam("areaName") StringBuffer areaName) {
        R r = null;
        try {
            r = sysUserInputService.batchSaveUser(list, areaName);
@@ -670,8 +731,8 @@
                int i = message.indexOf("'");
                String idcard = message.substring(i + 1, message.indexOf("'", i + 1));
//                System.out.println(idcard);
                return R.fail("身份证存在重复"+idcard);
            }else {
                return R.fail("身份证存在重复" + idcard);
            } else {
                return R.fail(e.getMessage());
            }
        }
@@ -679,27 +740,30 @@
    }

    /**
     *  居民管理》居民详情
     * 居民管理》居民详情
     *
     * @param id 人员id
     * @return CommunityUserInfoVO
     */
    @PostMapping("common/data/user/detail")
    public R inputUserDetail(@RequestParam("id")Long id){
    public R inputUserDetail(@RequestParam("id") Long id) {
        return sysUserInputService.inputUserDetail(id);
    }

    /**
     *  用户搜索了就下载搜索的用户否则下载所有用户
     * 用户搜索了就下载搜索的用户否则下载所有用户
     *
     * @param exportUserDTO 用户搜索内容
     * @return List<EexcelUserDTO> excel内容
     */
    @PostMapping("common/data/user/export")
    public R inputUserExport(@RequestBody ExportUserDTO exportUserDTO){
    public R inputUserExport(@RequestBody ExportUserDTO exportUserDTO) {
        return sysUserInputService.exportInputUser(exportUserDTO);
    }

    /**
     * 特殊群体
     *
     * @param pageInputUserDTO
     * @return
     */
@@ -710,6 +774,7 @@

    /**
     * 特殊群体
     *
     * @param id
     * @return
     */
@@ -717,8 +782,10 @@
    R deleteSpecialInputUser(@RequestParam(value = "id") Long id) {
        return sysUserInputService.deleteSpecialInputUser(id);
    }

    /**
     * 特殊群体标签列表
     *
     * @param comMngUserTagDTO
     * @return
     */
@@ -729,6 +796,7 @@

    /**
     * 新增或修改特殊群体标签
     *
     * @param comMngTagVO
     * @return
     */
@@ -739,6 +807,7 @@

    /**
     * 删除特殊群体标签
     *
     * @param id
     * @return
     */
@@ -749,6 +818,7 @@

    /**
     * 特殊群体导出
     *
     * @param exportSpecialUserDTO
     * @return
     */
@@ -759,28 +829,31 @@

    /**
     * 创建SysUser用户信息以及权限
     * @param storeVO   请求参数
     * @return  创建结果
     *
     * @param storeVO 请求参数
     * @return 创建结果
     */
    @PostMapping("addSysUser")
    public R addSysUser(@RequestBody ShopStoreVO storeVO){
    public R addSysUser(@RequestBody ShopStoreVO storeVO) {
        return userService.addSysUser(storeVO);
    }

    /**
     * 修改SysUser用户信息
     * @param storeVO   请求参数
     * @return  修改结果
     *
     * @param storeVO 请求参数
     * @return 修改结果
     */
    @PostMapping("editSysUser")
    public R editSysUser(@RequestBody ShopStoreVO storeVO){
    public R editSysUser(@RequestBody ShopStoreVO storeVO) {
        return userService.editSysUser(storeVO);
    }

    /**
     * 修改用户小程序首页活动提示
     * @param userEditTipsDTO  请求参数
     * @return  修改结果
     *
     * @param userEditTipsDTO 请求参数
     * @return 修改结果
     */
    @PostMapping("editUserTips")
    public R editUserTips(@RequestBody SysUserEditTipsDTO userEditTipsDTO) {
@@ -789,21 +862,23 @@

    /**
     * 获取用户电子档案
     *
     * @param userId 家庭成员信息
     * @return 结果
     */
    @GetMapping("getUserArchives")
    public R getUserArchives(@RequestParam("userId") Long userId){
    public R getUserArchives(@RequestParam("userId") Long userId) {
        return userService.getUserArchives(userId);
    }

    /**
     * 编辑用户电子档案
     *
     * @param userArchivesVO 编辑的信息
     * @return 编辑结果
     */
    @PostMapping("updateUserArchives")
    public R updateUserArchives(@RequestBody UpdateUserArchivesVO userArchivesVO){
    public R updateUserArchives(@RequestBody UpdateUserArchivesVO userArchivesVO) {
        return userService.updateUserArchives(userArchivesVO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -12,6 +12,7 @@
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -380,7 +381,7 @@
     * @param userId 登录用户
     * @return 成员集合
     */
    R listFamily(Long userId);
    R listFamily(Long userId,Long pageNum, Long pageSize);
    /**
     * 新增家庭成员
     * @param comMngFamilyInfoVO 家庭成员基本信息

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

@@ -710,11 +710,12 @@
     * @return 成员集合
     */
    @Override
    public R listFamily(Long userId) {
    public R listFamily(Long userId,Long pageNum, Long pageSize) {
        List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = new ArrayList<>();
        List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO.selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
        if (!ObjectUtils.isEmpty(comMngFamilyInfoDOS)) {
            comMngFamilyInfoDOS.forEach(comMngFamilyInfoDO -> {
        LambdaQueryWrapper<ComMngFamilyInfoDO> query = new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId);
        IPage<ComMngFamilyInfoDO> pageData = comMngFamilyInfoDAO.selectPage(new Page<>(pageNum,pageSize), query);
        if (!ObjectUtils.isEmpty(pageData.getRecords())) {
            pageData.getRecords().forEach(comMngFamilyInfoDO -> {
                ComMngFamilyInfoVO comMngFamilyInfoVO = new ComMngFamilyInfoVO();
                BeanUtils.copyProperties(comMngFamilyInfoDO, comMngFamilyInfoVO);
                comMngFamilyInfoVOS.add(comMngFamilyInfoVO);