社区管理房屋管理志愿者接口完成

huanghongfa

2020-12-18 425daed225844521327f0913f7e28304db492c82

社区管理房屋管理志愿者接口完成

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

@@ -1,19 +1,24 @@
package com.panzhihua.applets.api;

import com.panzhihua.common.constants.FtpConstants;
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.common.utlis.SFTPUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
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.apache.commons.lang3.RandomUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.InputStream;
import java.util.concurrent.TimeUnit;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -26,6 +31,8 @@
@RequestMapping("/common/")
@Api(tags = {"公共接口"})
public class CommonApi {
    @Resource
    private StringRedisTemplate stringRedisTemplate;

    @ApiOperation(value = "上传照片")
    @PostMapping(value = "uploadimage",consumes = "multipart/*",headers = "content-type=multipart/form-date")
@@ -44,4 +51,23 @@
        }

    }

    @ApiOperation(value = "发送验证码")
    @PostMapping(value = "smscode")
    public R smscode(@RequestBody UserPhoneVO userPhoneVO) {
        String newPhone = userPhoneVO.getNewPhone();
        if (ObjectUtils.isEmpty(newPhone)) {
            return R.fail("新手机号不能为空");
        }
        //todo 发送验证码接第三方
        int nextInt = RandomUtils.nextInt(99999, 1000000);
        ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
        valueOperations.set(UserConstants.PHONE_PUT+newPhone,nextInt+"",3, TimeUnit.MINUTES);
        return R.ok(nextInt);
    }

    public static void main(String[] args) {
        int nextInt = RandomUtils.nextInt(99999, 1000000);
        System.out.println(nextInt);
    }
}

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

@@ -3,10 +3,7 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -90,5 +87,13 @@
        return communityService.addDynamicUser(id,userId);
    }

    @ApiOperation(value = "志愿者申请")
    @PostMapping("volunteer")
    public R addVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
        comMngVolunteerMngVO.setState(1);
        return communityService.addVolunteer(comMngVolunteerMngVO);
    }


}


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

@@ -64,7 +64,7 @@
    @PutMapping("easyphoto")
    public R putEasyPhoto (@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){
        Long id = comActEasyPhotoVO.getId();
        if (ObjectUtils.isEmpty(id)) {
        if (null==id||id==0) {
            return R.fail("随手拍主键不能为空");
        }
        Long userId = this.getUserId();
@@ -114,7 +114,7 @@
    @PutMapping("microwish")
    public R putMicroWish (@RequestBody ComActMicroWishVO comActMicroWishVO){
        Long id = comActMicroWishVO.getId();
        if (ObjectUtils.isEmpty(id)) {
        if (null==id||id==0) {
            return R.fail("微心愿主键不能为空");
        }
        Long userId = this.getUserId();

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

@@ -7,7 +7,9 @@
import com.panzhihua.applets.config.WxMaConfiguration;
import com.panzhihua.applets.model.vos.LoginRequest;
import com.panzhihua.common.model.vos.LoginReturnVO;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.service.auth.TokenService;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.exceptions.UnAuthenticationException;
@@ -37,6 +39,8 @@
    private WxMaConfiguration wxMaConfiguration;
    @Resource
    private TokenService tokenService;
    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "登录" ,response =LoginReturnVO.class )
    @PostMapping("login")
@@ -60,8 +64,7 @@
        String sessionKey = sessionInfo.getSessionKey();
        String unionid = sessionInfo.getUnionid();
        userService.addOrUpdate(openid,sessionKey,unionid);
        R r = tokenService.loginApplets(openid);
        return r;
        return tokenService.loginApplets(openid);
    }

    @ApiOperation(value = "维护用户基本信息（昵称、性别、头像）")
@@ -85,13 +88,12 @@
        WxMaUserInfo wxUserInfo = maService.getUserService().getUserInfo(loginUserInfoVO.getSessionKey(),
                encryptedData, iv);
        if (null == wxUserInfo) {
            throw new WeiXinException("微信解析基本信息失败");
            return R.fail("微信解析基本信息失败");
        }
        String avatarUrl = wxUserInfo.getAvatarUrl();
        String gender = wxUserInfo.getGender();
        String nickName = wxUserInfo.getNickName();
        R r1=userService.updateUserWeiXinInfo(userId,nickName,Integer.parseInt(gender),avatarUrl);
        return r1;
        return userService.updateUserWeiXinInfo(userId,nickName,Integer.parseInt(gender),avatarUrl);
    }

    @ApiOperation(value = "维护微信用户手机号")
@@ -118,8 +120,7 @@
            throw new WeiXinException("微信解析手机号失败");
        }
        String purePhoneNumber = wxMaPhoneNumberInfo.getPurePhoneNumber();
        R r1=userService.updateUserWeiXinPhone(userId,purePhoneNumber);
        return r1;
        return userService.updateUserWeiXinPhone(userId,purePhoneNumber);
    }

    @ApiOperation(value = "用户登出")
@@ -130,16 +131,35 @@
        if (empty2) {
            return R.ok();
        }
        R r=tokenService.logout(token);
        return r;
        return tokenService.logout(token);
    }

    @ApiOperation(value = "刷新token",response = LoginReturnVO.class)
    @GetMapping("refreshToken")
    @ApiImplicitParam(name ="refreshToken",value = "登录返回的刷新token")
    public R refreshToken(@RequestParam("refreshToken")String refreshToken){
        R r=tokenService.refreshToken(refreshToken);
        return r;
        return tokenService.refreshToken(refreshToken);
    }

    @ApiOperation(value = "查询社区")
    @GetMapping("listcommunity")
    public R listCommunity(@RequestBody ComActVO comActVO){
        return communityService.listCommunity(comActVO);
    }

    @ApiOperation(value = "用户绑定社区、小区")
    @PutMapping("putusercommunityarea")
    public R putUserCommunityArea(@RequestBody LoginUserInfoVO loginUserInfoVO){
        Long userId = this.getUserId();
        Long communityId = loginUserInfoVO.getCommunityId();
        Long areaId = loginUserInfoVO.getAreaId();
        if (null==communityId||0==communityId) {
            return R.fail("社区未选择");
        }
        if (null==areaId||0==areaId) {
            return R.fail("小区未选择");
        }
        loginUserInfoVO.setUserId(userId);
        return userService.putUserCommunityArea(loginUserInfoVO);
    }
}

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

@@ -28,28 +28,25 @@
    @ApiOperation(value = "分页党建动态/政策文件",response =PartyCommitteeVO.class )
    @PostMapping("pagedynamic")
    public R pageYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO){
        Long communityId=1l;//todo 获取社区id
        Long communityId = this.getCommunityId();
        Integer type = partyBuildingComPbDynVO.getType();
        if (ObjectUtils.isEmpty(type)) {
            return R.fail("类型不能为空");
        }
        partyBuildingComPbDynVO.setCommunityId(communityId);
        R r = partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
        return r;
        return partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
    }

    @ApiOperation(value = "分页查询党员活动",response = PageActivityMembersVO.class)
    @PostMapping("pageactivity")
    public R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        R r = partyBuildingService.pageActivity(partyBuildingActivityVO);
        return r;
        return partyBuildingService.pageActivity(partyBuildingActivityVO);
    }

    @ApiOperation(value = "动态/政策文件详情",response =PartyBuildingComPbDynVO.class )
    @GetMapping("infodynamic")
    public R infoYnamic(@RequestParam("id") Long id) {
        R r = partyBuildingService.infoYnamic(id);
        return r;
        return partyBuildingService.infoYnamic(id);
    }

    @ApiOperation(value = "增加阅读记录")
@@ -64,25 +61,21 @@
        comPbDynUserVO.setCreateAt(new Date());
        comPbDynUserVO.setDynId(id);
        comPbDynUserVO.setUserId(userId);
        R r = partyBuildingService.addDynUser(comPbDynUserVO);
        return r;
        return partyBuildingService.addDynUser(comPbDynUserVO);
    }

    @ApiOperation(value = "分页党委查询",response =PartyCommitteeVO.class )
    @PostMapping("pagepartycommittee")
    public R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
        //todo 获取用户的社区信息
        Long communityId = 1l;
        Long communityId =this.getCommunityId();
        partyCommitteeVO.setCommunityId(communityId);
        R r = partyBuildingService.pagePartyCommittee(partyCommitteeVO);
        return r;
        return partyBuildingService.pagePartyCommittee(partyCommitteeVO);
    }

    @ApiOperation(value = "活动详情",response = PartyBuildingActivityVO.class)
    @GetMapping("activityinfo")
    public R activityinfo(@RequestParam("id") Long id) {
        R r = partyBuildingService.activityinfo(id);
        return r;
        return partyBuildingService.activityinfo(id);
    }



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

@@ -1,6 +1,9 @@
package com.panzhihua.applets.api;

import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.controller.BaseController;
@@ -8,14 +11,13 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -32,25 +34,106 @@
    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "当前登录用户信息",response = LoginUserInfoVO.class)
    @ApiOperation(value = "当前登录用户信息", response = LoginUserInfoVO.class)
    @GetMapping("info")
    public R getUserInfo(){
    public R getUserInfo() {
        Long userId = this.getUserId();
        boolean empty = ObjectUtils.isEmpty(userId);
        if (empty) {
           throw new UnAuthenticationException();
            throw new UnAuthenticationException();
        }
        R<LoginUserInfoVO> r = userService.getUserInfoByUserId(userId + "");
        if (R.isOk(r)) {
            Object data = r.getData();
            if (!ObjectUtils.isEmpty(data)) {
                LoginUserInfoVO loginUserInfoVO = (LoginUserInfoVO) data;
                R r1 = communityService.detailHouse(userId);
                if (R.isOk(r1)) {
                    Object data1 = r1.getData();
                    if (!ObjectUtils.isEmpty(data1)) {
                        loginUserInfoVO.setComMngStructHouseVOS((List<ComMngStructHouseVO>) data1);
                        r.setData(loginUserInfoVO);
                    }
                }
            }
        }
        return r;
    }

    @ApiOperation(value = "分页展示我的活动",response = ComActActivityVO.class)
    @GetMapping("pagemyactivity")
    public R pageMyActivity(@RequestBody ComActActivityVO comActActivityVO){
    @ApiOperation(value = "用户实名认证")
    @PutMapping("putuserauthentication")
    public R putUserAuthentication(@RequestBody LoginUserInfoVO loginUserInfoVO) {
        Long userId = this.getUserId();
//        todo 我的活动包括普通社区活动、志愿者活动、党建活动
        comActActivityVO.setSponsorId(userId);//登录人id 暂时存入负责人字段
        R r = communityService.pageMyActivity(comActActivityVO);
        loginUserInfoVO.setUserId(userId);
        return userService.putUserAuthentication(loginUserInfoVO);
    }

    @ApiOperation(value = "修改用户手机号")
    @PutMapping("userphone")
    public R putUserphone(@RequestBody UserPhoneVO userPhoneVO) {
        Long userId = this.getUserId();
        userPhoneVO.setUserId(userId);
        R r = userService.putUserphone(userPhoneVO);
        if (R.isOk(r)) {
            communityService.putVolunteerPhone(userPhoneVO);
        }
        return r;
    }

    @ApiOperation(value = "修改用户手机号")
    @PutMapping("user")
    public R putUser(@RequestBody LoginUserInfoVO loginUserInfoVO) {
        Long userId = this.getUserId();
        loginUserInfoVO.setUserId(userId);
        return userService.putUser(loginUserInfoVO);
    }

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

    @ApiOperation(value = "新增房屋")
    @PostMapping("houses")
    public R addHouses(@RequestBody ComMngStructHouseVO comMngStructHouseVO) {
        String houseCode = comMngStructHouseVO.getHouseCode();
        if (ObjectUtils.isEmpty(houseCode)) {
            return R.fail("房屋地址编码不能为空");
        }
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        comMngStructHouseVO.setUserId(loginUserInfo.getUserId());
        comMngStructHouseVO.setAreaId(loginUserInfo.getAreaId());
        return communityService.addHouses(comMngStructHouseVO);
    }

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

    @ApiOperation(value = "新增家庭成员")
    @GetMapping("addfamily")
    public R addFamily(@RequestBody ComMngFamilyInfoVO comMngFamilyInfoVO) {
        Long userId = this.getUserId();
        comMngFamilyInfoVO.setUserId(userId);
        return userService.addFamily(comMngFamilyInfoVO);
    }

    @ApiOperation(value = "编辑家庭成员")
    @PutMapping("putfamily")
    public R putFamily(@RequestBody ComMngFamilyInfoVO comMngFamilyInfoVO) {
        Long id = comMngFamilyInfoVO.getId();
        if (null==id||0==id) {
            return R.fail("成员主键不能为空");
        }
        return userService.putFamily(comMngFamilyInfoVO);
    }
}

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

New file
@@ -0,0 +1,40 @@
package com.panzhihua.applets_backstage.api;

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 社区管理
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-15 09:54
 **/
@Api(tags = {"社区管理"})
@RestController
@RequestMapping("/communitymanager/")
public class CommunityApi {
    @Resource
    private CommunityService communityService;

    @ApiOperation("新增社区")
    @PostMapping("community")
    public R addCommunity(@RequestBody ComActVO comActVO){
       return communityService.addCommunity(comActVO);
    }

    @ApiOperation("编辑社区")
    @PutMapping("community")
    public R putCommunity(@RequestBody ComActVO comActVO){
        Long communityId = comActVO.getCommunityId();
        if (null==communityId||0==communityId) {
            return R.fail("社区主键不能为空");
        }
        return communityService.putCommunity(comActVO);
    }
}

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

@@ -35,8 +35,7 @@
        if (empty||empty1) {
            return R.fail("账户密码不能为空");
        }
        R r=tokenService.loginAppletsBackStage(account,password);
        return r;
        return tokenService.loginAppletsBackStage(account,password);
    }

    @ApiOperation(value = "登出")
@@ -46,16 +45,14 @@
        if (ObjectUtils.isEmpty(token)) {
            return R.ok();
        }
        R r=tokenService.logout(token);
        return r;
        return tokenService.logout(token);
    }

    @ApiOperation(value = "刷新token")
    @GetMapping("refreshToken")
    @ApiImplicitParam(name ="refreshToken",value = "登录返回的刷新token")
    public R refreshToken(@RequestParam("refreshToken")String refreshToken){
        R r=tokenService.refreshToken(refreshToken);
        return r;
        return tokenService.refreshToken(refreshToken);
    }



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

@@ -31,29 +31,19 @@
    @GetMapping("info")
    public R getUserInfo(){
        Long userId = this.getUserId();
        boolean empty2 = ObjectUtils.isEmpty(userId);
        if (empty2) {
            throw new UnAuthenticationException();
        }
        R<LoginUserInfoVO> userInfoByUserId = userService.getUserInfoByUserId(userId + "");
        LoginUserInfoVO loginUserInfoVO = userInfoByUserId.getData();
        return R.ok(loginUserInfoVO);
        return userService.detailUser(userId);
    }

    @ApiOperation(value = "修改密码")
    @PutMapping("changepassword")
    public R changePassword(@Validated @RequestBody ChangePasswordVO changePasswordVO){
        Long userId = this.getUserId();
        if (ObjectUtils.isEmpty(userId)) {
            return R.fail(HttpStatus.UNAUTHORIZED);
        }
        String newPassword = changePasswordVO.getNewPassword();
        String oldPassword=changePasswordVO.getOldPassword();
        if (newPassword.equals(oldPassword)) {
            return R.fail("修改失败，新密码和原密码一致");
        }
        changePasswordVO.setUserId(userId);
        R r=userService.changePassword(changePasswordVO);
        return r;
        return userService.changePassword(changePasswordVO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/UserConstants.java

@@ -12,4 +12,5 @@
    public static final String USER_ID = "user_id";
    public static final String LOGOUT_TOKEN = "logout:";
    public static final String LOGIN_USER_INFO = "login_user_info:";
    public static final String PHONE_PUT="phone_put:";
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java

@@ -51,6 +51,16 @@
    }

    /**
     * 获取登录对象所在小区
     * @return 小区id
     */
    public Long getAreaId(){
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long areaId = loginUserInfo.getAreaId();
        return areaId;
    }

    /**
     * 获取登录token
     * @return token
     */

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

@@ -1,10 +1,13 @@
package com.panzhihua.common.model.vos;

import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;
import java.util.List;
import java.util.Set;

/**
@@ -29,70 +32,53 @@
    @ApiModelProperty("登录账户")
    private String account;


    @ApiModelProperty("登录密码")
    private String password;


    @ApiModelProperty("微信小程序唯一标识")
    private String openid;


    @ApiModelProperty("手机号")
    private String phone;


    @ApiModelProperty("昵称")
    private String nickName;


    @ApiModelProperty("真实名字")
    private String name;


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

    @ApiModelProperty("社区名字")
    private String communityName;

    @ApiModelProperty("性别 1 男 2 女")
    private Integer sex;


    @ApiModelProperty("身份证号")
    private String idcard;


    @ApiModelProperty("生日")
    private Date birthday;


    @ApiModelProperty("头像")
    private String imageUrl;


    @ApiModelProperty("用户类型 1 小程序 2 运营平台 3 社区平台")
    private Integer type;


    @ApiModelProperty("职业")
    private String job;


    @ApiModelProperty("是否志愿者 0否 1 是")
    private Integer isVolunteer;


    @ApiModelProperty("是否党员 0 否 1 是")
    private Integer isPartymember;


    @ApiModelProperty("1 启用 2 禁用")
    private Integer status;


    @ApiModelProperty("创建时间")
    private Date createTime;

    private Date createAt;

    @ApiModelProperty("最后登录时间")
    private Date lastLoginTime;
@@ -102,4 +88,45 @@

    @ApiModelProperty("权限集合")
    private Set<String> permissions;

    @ApiModelProperty("人脸采集照片url")
    private String faceUrl;

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

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

    @ApiModelProperty("标签 多个用,隔开")
    private String tags;

    @ApiModelProperty("家庭id")
    private Long familyId;

    @ApiModelProperty(value = "分页每页数量",example = "10")
    private Long pageSize;

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

    @ApiModelProperty("人脸采集审核状态 0 待审核 1 审核通过 2驳回")
    private Integer faceState;

    @ApiModelProperty("操作类型 1通过 2驳回 3删除")
    private Integer operationType;

    @ApiModelProperty("家庭成员")
    private List<ComMngFamilyInfoVO> comMngFamilyInfoVOS;

    @ApiModelProperty("房屋信息")
    private List<ComMngStructHouseVO> comMngStructHouseVOS;

    @ApiModelProperty("用户小区id")
    private Long areaId;





}

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

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

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

import javax.validation.constraints.NotNull;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 批量建房
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-16 09:40
 **/
@Data
@ApiModel("批量建房")
public class BatchhouseVO {

    @ApiModelProperty(value = "楼栋区间-开始",example = "1")
    private Integer buildingBegin;
    @ApiModelProperty(value = "楼栋区间-结束",example = "10")
    private Integer buildingEnd;
    @ApiModelProperty(value = "单元区间-结束",example = "3")
    private Integer unitEnd;
    @ApiModelProperty(value = "单元区间-开始",example = "1")
    private Integer unitBegin;
    @ApiModelProperty(value = "楼层区间-开始",example = "1")
    private Integer floorBegin;
    @ApiModelProperty(value = "楼层区间-结束",example = "30")
    private Integer floorEnd;
    @ApiModelProperty(value = "门牌号区间-结束",example = "6")
    private Integer doorEnd;
    @ApiModelProperty(value = "门牌号区间-开始",example = "1")
    private Integer doorBegin;
    @ApiModelProperty(value = "门牌号规则-楼层",example = "1")
    private String ruleFloor;
    @ApiModelProperty(value = "门牌号规则-连接符",example = "-")
    private String ruleConnector;
    @ApiModelProperty(value = "门牌号规则-门牌号",example = "001")
    private String ruleDoor;
    @ApiModelProperty(value = "门牌编号是否累加 0 否  1  是",example = "0")
    private Integer isAccumulation;
    @ApiModelProperty(value = "小区地址编码")
    private String areaCode;
    @ApiModelProperty(value = "添加同级-类型 2楼栋  3 单元 4楼层  5门牌号")
    private Integer type;
    @ApiModelProperty(value = "添加同级-上级地址编码")
    private String parentCode;
}

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

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

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

import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 社区
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-15 10:06
 **/
@Data
@ApiModel("社区表")
public class ComActVO {

    @ApiModelProperty("community_id")
    private Long communityId;

    @ApiModelProperty("社区名字")
    private String name;

    @ApiModelProperty("社区地址")
    private String address;

    @ApiModelProperty("经度")
    private String lng;

    @ApiModelProperty("维度")
    private String lat;

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

    @ApiModelProperty("省份地址编码")
    private String provinceCode;

    @ApiModelProperty("市级地址编码")
    private String cityCode;

    @ApiModelProperty("区级地址编码")
    private String areaCode;

    @ApiModelProperty("社区面积")
    private Double square;

    @ApiModelProperty("联系人")
    private String contacts;

    @ApiModelProperty("联系人电话")
    private String contactsPhone;

    @ApiModelProperty("超管账号")
    private String account;

    @ApiModelProperty("账号密码")
    private String password;

    @ApiModelProperty(value = "状态 0 启用 1 禁用",example = "0")
    private Integer state;

    @ApiModelProperty("距离-单位米")
    private String distance;
}

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

@@ -3,6 +3,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.omg.PortableInterceptor.INACTIVE;

import java.util.Date;

@@ -19,8 +20,8 @@
    @ApiModelProperty("自增id")
    private Long id;

    @ApiModelProperty("地址编码")
    private String addressCode;
    @ApiModelProperty("社区id")
    private String communityId;

    @ApiModelProperty("小区名称")
    private String areaName;
@@ -30,4 +31,25 @@

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

    @ApiModelProperty("分页页数")
    private Long pageNum;

    @ApiModelProperty("每页记录数")
    private Long pageSize;

    @ApiModelProperty("地址编码")
    private String areaCode;

    @ApiModelProperty("楼层规则 1 01 001")
    private String roleFloor;

    @ApiModelProperty("连接符 空格 或者 -")
    private String roleConnector;

    @ApiModelProperty("门牌号规则 1 01 001")
    private String roleDoor;

    @ApiModelProperty("是否累加门牌号 0 否 1 是")
    private Integer isAccumulation;
}

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

@@ -28,8 +28,8 @@
    @ApiModelProperty("父类地址编码")
    private String parentCode;

    @ApiModelProperty("地址类型 1 楼栋 2 单元 3 楼层 门牌号")
    private boolean type;
    @ApiModelProperty("地址类型 1小区  2楼栋  3 单元 4楼层  5房间")
    private Integer type;

    @ApiModelProperty("create_at")
    private Date createAt;
@@ -39,4 +39,23 @@

    @ApiModelProperty("房屋面积")
    private Double square;

    @ApiModelProperty("居住用户名字-多个用，隔开")
    private String names;

    @ApiModelProperty("居住用户手机号-多个用，隔开")
    private String phones;

    @ApiModelProperty("房屋状态 1 自主 2 租住 3 商用")
    private Integer states;

    @ApiModelProperty("身份 1租户 2房主")
    private Integer identity;

    @ApiModelProperty(value = "登录用户id",hidden = true)
    private Long userId;

    @ApiModelProperty(value = "小区地址id",hidden = true)
    private Long areaId;

}

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

File was deleted

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

@@ -31,12 +31,21 @@
    @ApiModelProperty("建筑地址")
    private String address;

    @ApiModelProperty("建筑状态")
    private boolean status;
    @ApiModelProperty("建筑状态 1建筑中 2使用中")
    private Integer state;

    @ApiModelProperty("楼层类型id")
    private Long layerTypeId;
    @ApiModelProperty("楼层类型 高层 中层 底层")
    private String layerType;

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

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

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

    @ApiModelProperty("建筑类型名字")
    private String buileTypeName;
}

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

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

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

import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 志愿者
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-15 09:51
 **/
@Data
@ApiModel("社区》管理》志愿者服务 》志愿者管理")
public class ComMngVolunteerMngVO {

    @ApiModelProperty("自增id")
    private Long id;

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

    @ApiModelProperty("状态：1- 申请；2 - 通过；3 - 驳回")
    private Integer state;

    @ApiModelProperty("姓名")
    private String name;

    @ApiModelProperty("电话号码")
    private String phone;

    @ApiModelProperty("照片路径")
    private String photoPath;

    @ApiModelProperty("政治面貌：1 - 党员；2- 团员；3 - 群众")
    private Integer politicalFace;

    @ApiModelProperty("拒绝原因")
    private String rejectReson;

    @ApiModelProperty("申请原因")
    private String applyReson;

    @ApiModelProperty("居住地址")
    private String address;

    @ApiModelProperty("当前页数")
    private Long pageNum;

    @ApiModelProperty("每页记录数")
    private Long pageSize;

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

    @ApiModelProperty(value = "职业",example = "家庭主妇")
    private String job;
}

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

@@ -1,8 +1,11 @@
package com.panzhihua.common.model.vos.user;

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

import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -17,27 +20,36 @@
    @ApiModelProperty("自增id")
    private Long id;

    @ApiModelProperty("丈夫 人员信息id")
    private Long husbandId;

    @ApiModelProperty("妻子 人员信息id")
    private Long wifeId;

    @ApiModelProperty("父亲 人员信息id")
    private Long fatherId;

    @ApiModelProperty("母亲 人员信息id")
    private Long motherId;

    @ApiModelProperty("子女 人员信息id列表信息，以逗号分隔")
    private String childrenIds;

    @ApiModelProperty("岳父 人员 id")
    private Long fatherInLawId;

    @ApiModelProperty("岳母 人员 id")
    private Long motherInLawId;

    @ApiModelProperty("本人id")
    private Long userId;

    @ApiModelProperty("与本人关系")
    private String relationship;

    @ApiModelProperty("名字")
    private String name;

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

    @ApiModelProperty("手机号")
    private String phone;

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

    @ApiModelProperty("健康状况")
    private String health;

    @ApiModelProperty("工作")
    private String job;

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

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

}

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

File was deleted

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

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

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

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 修改手机号
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-17 15:25
 **/
@Data
@ApiModel("修改手机号")
public class UserPhoneVO {

    @ApiModelProperty("老手机号")
    private String oldPhone;
    @ApiModelProperty("新手机号")
    private String newPhone;
    @ApiModelProperty("短信验证码")
    private String smsCode;
    @ApiModelProperty(value = "当前登录用户id",hidden = true)
    private Long userId;
}

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

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

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -226,4 +227,220 @@
     */
    @PostMapping("puteasyphotostatus")
    R putEasypHotoStatus(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);

    /**
     * 新增社区
     * @param comActVO 社区信息
     * @return 新增结果
     */
    @PostMapping("addcommunity")
    R addCommunity(@RequestBody ComActVO comActVO);

    /**
     * 编辑社区
     * @param comActVO 编辑内容
     * @return 编辑结果
     */
    @PostMapping("putCommunity")
    R putCommunity(@RequestBody ComActVO comActVO);

    /**
     * 房屋信息
     * @param userId 用户id
     * @return 房屋信息
     */
    @PostMapping("detailhouse")
    R detailHouse(@RequestParam("userId") Long userId);

    /**
     * 新增小区
     * @param comMngStructAreaVO 小区信息
     * @return 新增结果
     */
    @PostMapping("addarea")
    R addArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO);

    /**
     * 分页查询小区
     * @param comMngStructAreaVO 查询参数
     * @return 分页结果
     */
    @PostMapping("pagearea")
    R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO);

    /**
     * 编辑小区
     * @param comMngStructAreaVO 编辑内容
     * @return 编辑结果
     */
    @PostMapping("putarea")
    R putArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO);

    /**
     * 删除小区
     * @param comMngStructAreaVO 地址编码
     * @return 删除结果
     */
    @PostMapping("deletearea")
    R deleteArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO);

    /**
     * 小区批量建房
     * @param batchhouseVO 建房参数
     * @return 建房结果
     */
    @PostMapping("batchhouse")
    R batchHouse(@RequestBody BatchhouseVO batchhouseVO);

    /**
     * 展示下级建筑
     * @param houseCode 房屋编号
     * @return 下级建筑列表
     */
    @PostMapping("listsubordinatebuilding")
    R listSubordinatebuilding(@RequestParam("houseCode")String houseCode);

    /**
     * 添加同级地址
     * @param comMngStructHouseVO 同级参数
     * @return 添加结果
     */
    @PostMapping("addhouse")
    R addHouse(@RequestBody BatchhouseVO comMngStructHouseVO);

    /**
     * 编辑地址
     * @param comMngStructHouseVO 编辑内容
     * @return 编辑结果
     */
    @PostMapping("addhouse")
    R putHouse(@RequestBody ComMngStructHouseVO comMngStructHouseVO);

    /**
     * 删除地址
     * @param comMngStructHouseVO 删除指定地址和所有下级
     * @return 删除结果
     */
    @PostMapping("deletehouse")
    R deleteHouse(@RequestBody ComMngStructHouseVO comMngStructHouseVO);

    /**
     * 新增其他建筑
     * @param comMngStructOtherBuildVO 建筑参数
     * @return 新增结果
     */
    @PostMapping("addotherbuild")
    R addOtherbuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO);

    /**
     * 查询所有建筑类型
     * @return 类型列表
     */
    @PostMapping("listbuildtype")
    R listBuildType();

    /**
     * 分页查询 其他建筑
     * @param comMngStructOtherBuildVO 分页查询参数
     * @return 查询结果
     */
    @PostMapping("pageotherbuild")
    R pageOtherBuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO);

    /**
     * 增加志愿者
     * @param comMngVolunteerMngVO 志愿者信息
     * @return 增加结果
     */
    @PostMapping("addvolunteer")
    R addVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO);

    /**
     * 删除志愿者
     * @param comMngVolunteerMngVO 手机号
     * @return 删除结果
     */
    @PostMapping("deletevolunteer")
    R deleteVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO);

    /**
     * 编辑志愿者
     * @param comMngVolunteerMngVO 编辑内容
     * @return 编辑结果
     */
    @PostMapping("putvolunteer")
    R putVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO);

    /**
     * 分页展示志愿者
     * @param comMngVolunteerMngVO 查询参数
     * @return 分页集合返回
     */
    @PostMapping("pagevolunteer")
    R pageVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO);

    /**
     * 分页展示志愿者审核
     * @param comMngVolunteerMngVO 查询参数
     * @return 查询结果
     */
    @PostMapping("pagevolunteerexamine")
    R pageVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO);

    /**
     * 志愿者审核详情
     * @param id 主键
     * @return 详情
     */
    @PostMapping("detailvolunteerexamine")
    R detailVolunteerExamine(@RequestParam("id") Long id);

    /**
     * 志愿者审核
     * @param comMngVolunteerMngVO 审核操作
     * @return 审核结果
     */
    @PostMapping("putvolunteerexamine")
    R putVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO);

    /**
     * 删除志愿者审核
     * @param comMngVolunteerMngVO 主键
     * @return 删除结果
     */
    @PostMapping("deletevolunteerexamine")
    R deleteVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO);

    /**
     * 查询区域
     * @param comActVO 登录人的经纬度、或者指定区域的社区
     * @return 10个社区
     */
    @PostMapping("listcommunity")
    R listCommunity(@RequestBody ComActVO comActVO);

    /**
     * 用户修改手机号对应的志愿者手机号也要修改
     * @param userPhoneVO 新旧手机号
     * @return 修改结果
     */
    @PostMapping("putvolunteerphone")
    R putVolunteerPhone(UserPhoneVO userPhoneVO);

    /**
     * 房屋地址下拉列表
     * @param parentCode 父级编码
     * @param areaId 小区id
     * @return 下级列表
     */
    @PostMapping("listhouses")
    R listHouses(@RequestParam("parentCode")String parentCode, @RequestParam("areaId")Long areaId);

    /**
     * 新增房屋
     * @param comMngStructHouseVO 房屋信息
     * @return 新增结果
     */
    @PostMapping("addhouses")
    R addHouses(@RequestBody ComMngStructHouseVO comMngStructHouseVO);
}

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

@@ -30,7 +30,7 @@
     * @return 党组织集合
     */
    @PostMapping("/partybuildIng/listpartyorganization")
    List<PartyOrganizationVO> listPartyOrganization();
    R listPartyOrganization();

    /**
     * 批量新增党员
@@ -85,7 +85,7 @@
     * @return 党员列表
     */
    @PostMapping("/partybuildIng/listPartyMember")
    R listPartyMember(@RequestParam("communityId")Integer communityId);
    R listPartyMember(@RequestParam("communityId")Long communityId);

    /**
     * 社区下拉选择身份

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

@@ -4,6 +4,8 @@
import com.panzhihua.common.model.vos.MenuVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.ChangePasswordVO;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -19,6 +21,7 @@
 **/
@FeignClient(name = "user")
public interface UserService {


    /**
     * 新增微信用户
@@ -87,7 +90,7 @@
     * @return 党委角色列表
     */
    @PostMapping("/role/listidentity")
    R listIdentity(@RequestParam("communityId")Integer communityId);
    R listIdentity(@RequestParam("communityId")Long communityId);

    /**
     * 修改用户登录密码
@@ -105,4 +108,115 @@
     */
    @PostMapping("listactivitymanager")
    R listActivityManager(@RequestParam("param") String param, @RequestParam("communityId")Long communityId);

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

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

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

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

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

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

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

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

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

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

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

    /**
     * 家庭成员列表
     * @param userId 登录用户
     * @return 成员集合
     */
    @PostMapping("listfamily")
    R listFamily(@RequestParam("userId")Long userId);

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

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

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/constants/UserConstants.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/controller/BaseController.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/LoginUserInfoVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/BatchhouseVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComMngStructAreaVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComMngStructLayerTypeVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComMngStructOtherBuildVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/user/ComMngStructHouseVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/user/UserPhoneVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/community/CommunityService.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/partybuilding/PartyBuildingService.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/user/UserService.class

Binary files differ

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

@@ -41,8 +41,7 @@
        if (ObjectUtils.isEmpty(param)) {
            param="";
        }
        R r=userService.listActivityManager(param,communityId);
        return r;
        return userService.listActivityManager(param,communityId);

    }

@@ -51,8 +50,7 @@
    public R addActivity(@RequestBody ComActActivityVO ComActActivityVO) {
        Long communityId = this.getCommunityId();
        ComActActivityVO.setCommunityId(communityId);
        R r = communityService.addActivity(ComActActivityVO);
        return r;
        return communityService.addActivity(ComActActivityVO);
    }

    @ApiOperation(value = "编辑社区活动")
@@ -64,19 +62,17 @@
        }
        Long communityId = this.getCommunityId();
        ComActActivityVO.setCommunityId(communityId);
        R r = communityService.putActivity(ComActActivityVO);
        return r;
        return communityService.putActivity(ComActActivityVO);
    }

    @ApiOperation(value = "删除社区活动")
    @DeleteMapping("activity")
    public R deleteActivity(@RequestBody ComActActivityVO ComActActivityVO) {
        Long id = ComActActivityVO.getId();
        if (ObjectUtils.isEmpty(id)) {
        if (null==id||0==id) {
            return R.fail("活动id主键不能为空");
        }
        R r = communityService.deleteActivity(ComActActivityVO);
        return r;
        return communityService.deleteActivity(ComActActivityVO);
    }

    @ApiOperation(value = "分页查询社区活动")
@@ -84,8 +80,7 @@
    public R pageActivity(@RequestBody ComActActivityVO ComActActivityVO) {
        Long communityId = this.getCommunityId();
        ComActActivityVO.setCommunityId(communityId);
        R r = communityService.pageActivity(ComActActivityVO);
        return r;
        return communityService.pageActivity(ComActActivityVO);
    }

    @ApiOperation(value = "发布活动")
@@ -97,31 +92,25 @@
        }
        ComActActivityVO.setPublishAt(new Date());
        ComActActivityVO.setStatus(2);
        R r = communityService.releaseActivity(ComActActivityVO);
        return r;
        return communityService.releaseActivity(ComActActivityVO);
    }

    @ApiOperation(value = "取消活动")
    @PutMapping("cancelactivity")
    public R cancelActivity(@RequestBody @Validated ComActActivityVO ComActActivityVO) {
        Long id = ComActActivityVO.getId();
        if (ObjectUtils.isEmpty(id)&&id!=0) {
        if (null==id||0==id) {
            return R.fail("活动id主键不能为空");
        }
        ComActActivityVO.setStatus(6);
        R r = communityService.cancelActivity(ComActActivityVO);
        return r;
        return communityService.cancelActivity(ComActActivityVO);
    }

    @ApiOperation(value = "活动详情")
    @GetMapping("detailactivity")
    public R detailActivity(@RequestParam("id") Long id) {
        Long userId = this.getUserId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("活动id主键不能为空");
        }
        R r = communityService.detailActivity(id, userId);
        return r;
        return communityService.detailActivity(id, userId);
    }

    @ApiOperation(value = "查询活动报名名单集合")
@@ -130,8 +119,7 @@
        if (ObjectUtils.isEmpty(activitySignVO.getActivityId())) {
            return R.fail("活动id主键不能为空");
        }
        R r = communityService.listActivitySign(activitySignVO);
        return r;
        return communityService.listActivitySign(activitySignVO);
    }

    @ApiOperation(value = "新增社区动态")
@@ -145,10 +133,9 @@
        if (l>=time) {
            comActDynVO.setStatus(1);
        }
        R r = communityService.addDynamic(comActDynVO);
        return communityService.addDynamic(comActDynVO);
        //todo 五天自动取消置顶状态
        //todo 发布时间到了直接修改状态为已发布
        return r;
    }

    @ApiOperation(value = "编辑社区动态、取消置顶、设置置顶")
@@ -168,9 +155,8 @@
            }
        }
        comActDynVO.setCommunityId(communityId);
        R r = communityService.putDynamic(comActDynVO);
        return communityService.putDynamic(comActDynVO);
        //todo 五天自动取消置顶状态
        return r;
    }

    @ApiOperation(value = "删除社区动态")
@@ -180,9 +166,8 @@
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("动态主键不能为空");
        }
        R r = communityService.deleteDynamic(comActDynVO);
        return communityService.deleteDynamic(comActDynVO);
        //todo 五天自动取消置顶状态
        return r;
    }

    @ApiOperation(value = "分页查询社区动态")
@@ -190,16 +175,14 @@
    public R pageDynamic(@RequestBody ComActDynVO comActDynVO) {
        Long communityId = this.getCommunityId();
        comActDynVO.setCommunityId(communityId);
        R r = communityService.pageDynamic(comActDynVO);
        return r;
        return communityService.pageDynamic(comActDynVO);
    }

    @ApiOperation(value = "社区动态详情")
    @GetMapping("detaildynamic")
    @ApiImplicitParam(name ="id",value = "社区动态主键",required = true)
    public R detailDynamic(@RequestParam("id") Long id) {
        R r = communityService.detailDynamic(id);
        return r;
        return communityService.detailDynamic(id);
    }


@@ -208,16 +191,14 @@
    public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        Long communityId = this.getCommunityId();
        comActEasyPhotoVO.setCommunityId(communityId);
        R r = communityService.pageEasyPhoto(comActEasyPhotoVO);
        return r;
        return communityService.pageEasyPhoto(comActEasyPhotoVO);
    }

    @ApiOperation(value = "随手拍详情")
    @GetMapping("easyphoto")
    public R detailEasyPhoto(@RequestParam("id")Long id) {
        Long userId = this.getUserId();
        R r = communityService.detailEasyPhoto(id, userId);
        return r;
        return communityService.detailEasyPhoto(id, userId);
    }

    @ApiOperation(value = "分页查询微心愿")
@@ -225,16 +206,14 @@
    public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
        Long communityId = this.getCommunityId();
        comActMicroWishVO.setCommunityId(communityId);
        R r = communityService.pageMicroWish(comActMicroWishVO);
        return r;
        return communityService.pageMicroWish(comActMicroWishVO);
    }

    @ApiOperation(value = "心愿详情")
    @GetMapping("detailmicrowish")
    public R detailMicroWish(@RequestParam("id")Long id) {
        Long userId = this.getUserId();
        R r = communityService.detailMicroWish(id,userId);
        return r;
        return communityService.detailMicroWish(id,userId);
    }

    @ApiOperation(value = "审核、分配、反馈心愿")
@@ -244,8 +223,7 @@
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("心愿主键不能为空");
        }
        R r = communityService.putlMicroWish(comActMicroWishVO);
        return r;
        return communityService.putlMicroWish(comActMicroWishVO);
    }

    @ApiOperation(value = "微心愿人员下拉搜索")
@@ -256,8 +234,7 @@
        if (ObjectUtils.isEmpty(param)) {
            param="";
        }
        R r = userService.listActivityManager(param,communityId);
        return r;
        return userService.listActivityManager(param,communityId);
    }

    @ApiOperation(value = "审核、反馈随手拍")
@@ -271,8 +248,7 @@
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("随手拍主键不能为空");
        }
        R r = communityService.putEasypHotoStatus(comActEasyPhotoVO);
        return r;
        return communityService.putEasypHotoStatus(comActEasyPhotoVO);
    }


@@ -281,4 +257,6 @@





}

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

New file
@@ -0,0 +1,297 @@
package com.panzhihua.community_backstage.api;

import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 社区管理
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-15 10:40
 **/
@Slf4j
@Api(tags = {"社区管理"})
@RestController
@RequestMapping("/communitymanager/")
public class CommunityManagerApi {
    @Resource
    private UserService userService;
    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "分页查询人脸采集",response = LoginUserInfoVO.class)
    @PutMapping("pageuserface")
    public R pageUserFace(@RequestBody LoginUserInfoVO loginUserInfoVO){
        return userService.pageUserFace(loginUserInfoVO);
    }

    @ApiOperation(value = "编辑人脸采集数据通过、驳回、删除")
    @PutMapping("putuserface")
    public R putUserFace(@RequestBody LoginUserInfoVO loginUserInfoVO){
        Integer operationType = loginUserInfoVO.getOperationType();
        if (null==operationType||operationType.intValue()>3||operationType.intValue()<1) {
            return R.fail("操作类型错误");
        }
        Long userId = loginUserInfoVO.getUserId();
        if (null==userId||0==userId) {
            return R.fail("用户主键不能为空");
        }
        return userService.putUserFace(loginUserInfoVO);
    }

    @ApiOperation(value = "分页查询人口管理",response = LoginUserInfoVO.class)
    @PutMapping("pageuser")
    public R pageUser(@RequestBody LoginUserInfoVO loginUserInfoVO){
        return userService.pageUser(loginUserInfoVO);
    }

    @ApiOperation(value = "查询所有人员标签")
    @GetMapping("listtag")
    public R listTag(){
        return userService.listTag();
    }

    @ApiOperation(value = "人员详情",response = LoginUserInfoVO.class)
    @GetMapping("detailuser")
    @ApiImplicitParam(name ="userId",value = "人员id",required = true)
    public R detailUser(@RequestParam("userId")Long userId){
        R r = userService.detailUser(userId);
        boolean ok = R.isOk(r);
        if (ok) {
            Object data = r.getData();
            if (!ObjectUtils.isEmpty(data)) {
                LoginUserInfoVO loginUserInfoVO=(LoginUserInfoVO)data;
                R r1=communityService.detailHouse(userId);
                if (R.isOk(r1)) {
                    Object data1 = r1.getData();
                    if (!ObjectUtils.isEmpty(data1)) {
                        loginUserInfoVO.setComMngStructHouseVOS((List<ComMngStructHouseVO>)data1);
                        r.setData(loginUserInfoVO);
                    }
                }
            }
        }
        return r;
    }

    @ApiOperation(value = "设置标签")
    @PutMapping("usertag")
    public R putUserTag(@RequestBody LoginUserInfoVO loginUserInfoVO){
        Long userId = loginUserInfoVO.getUserId();
        if (null==userId||0==userId) {
            return R.fail("用户主键不能为空");
        }
        return userService.putUserTag(loginUserInfoVO);
    }

    @ApiOperation(value = "新增小区")
    @PostMapping("area")
    public R addArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO){
        String communityId = comMngStructAreaVO.getCommunityId();
        comMngStructAreaVO.setCommunityId(communityId);
        return communityService.addArea(comMngStructAreaVO);
    }

    @ApiOperation(value = "分页查询小区",response =ComMngStructAreaVO.class )
    @PostMapping("pagearea")
    public R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO){
        String communityId = comMngStructAreaVO.getCommunityId();
        comMngStructAreaVO.setCommunityId(communityId);
        return communityService.pageArea(comMngStructAreaVO);
    }

    @ApiOperation(value = "编辑小区")
    @PutMapping("area")
    public R putArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO){
        String areaCode = comMngStructAreaVO.getAreaCode();
        if (ObjectUtils.isEmpty(areaCode)) {
            return R.fail("地址编码不能为空");
        }
        return communityService.putArea(comMngStructAreaVO);
    }


    @ApiOperation(value = "删除小区")
    @DeleteMapping("area")
    public R deleteArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO){
        String areaCode = comMngStructAreaVO.getAreaCode();
        if (ObjectUtils.isEmpty(areaCode)) {
            return R.fail("地址编码不能为空");
        }
        return communityService.deleteArea(comMngStructAreaVO);
    }

    @ApiOperation(value = "批量建房")
    @PostMapping("batchhouse")
    public R batchHouse(@RequestBody BatchhouseVO batchhouseVO){
        String areaCode = batchhouseVO.getAreaCode();
        if (ObjectUtils.isEmpty(areaCode)) {
            return R.fail("小区地址编码不能为空");
        }
        return communityService.batchHouse(batchhouseVO);
    }

    @ApiOperation(value = "展示下级建筑")
    @GetMapping("listsubordinatebuilding")
    public R listSubordinatebuilding(@RequestParam("houseCode")String houseCode){
        return communityService.listSubordinatebuilding(houseCode);
    }

    @ApiOperation(value = "添加同级地址")
    @PostMapping("house")
    public R addHouse(@RequestBody BatchhouseVO batchhouseVO){
        String parentCode = batchhouseVO.getParentCode();
        Integer type = batchhouseVO.getType();
        if (ObjectUtils.isEmpty(parentCode)) {
            return R.fail("父级地址编码不能为空");
        }
        if (null==type||type>5||type<2) {
            return R.fail("同级类型错误");
        }
        return communityService.addHouse(batchhouseVO);
    }

    @ApiOperation(value = "编辑地址")
    @PutMapping("house")
    public R putHouse(@RequestBody ComMngStructHouseVO comMngStructHouseVO){
        String houseCode = comMngStructHouseVO.getHouseCode();
        if (ObjectUtils.isEmpty(houseCode)) {
            return R.fail("址编码不能为空");
        }
        return communityService.putHouse(comMngStructHouseVO);
    }

    @ApiOperation(value = "删除地址-删除所有下级")
    @DeleteMapping("house")
    public R deleteHouse(@RequestBody ComMngStructHouseVO comMngStructHouseVO){
        String houseCode = comMngStructHouseVO.getHouseCode();
        if (ObjectUtils.isEmpty(houseCode)) {
            return R.fail("址编码不能为空");
        }
        return communityService.deleteHouse(comMngStructHouseVO);
    }

    @ApiOperation(value = "新增其他建筑")
    @PostMapping("otherbuild")
    public R addOtherbuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO){
        return communityService.addOtherbuild(comMngStructOtherBuildVO);
    }

    @ApiOperation(value = "查询所有建筑类型",response = ComMngStructBuildTypeVO.class)
    @GetMapping("listbuildtype")
    public R listBuildType(){
        return communityService.listBuildType();
    }

    @ApiOperation(value = "分页查询其他建筑",response = ComMngStructOtherBuildVO.class)
    @GetMapping("pageotherbuild")
    public R pageOtherBuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO){
        return communityService.pageOtherBuild(comMngStructOtherBuildVO);
    }

    @ApiOperation(value = "增加志愿者")
    @PostMapping("volunteer")
    public R addVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
        comMngVolunteerMngVO.setState(3);
        R r = communityService.addVolunteer(comMngVolunteerMngVO);
//        支援者添加成功，修改小程序用户的志愿者状态，通过手机号
        if (R.isOk(r)) {
            String phone = comMngVolunteerMngVO.getPhone();
            R r1 = userService.putUserIsVolunteer(phone,1);
            if (R.isOk(r1)) {
                log.info("修改手机号【{}】的支援者状态为是",phone);
            }else{
                log.info("手机号【{}】没有小程序用户",phone);
            }
        }
        return r;
    }

    @ApiOperation(value = "删除志愿者")
    @DeleteMapping("volunteer")
    public R deleteVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
        String phone1 = comMngVolunteerMngVO.getPhone();
        if (ObjectUtils.isEmpty(phone1)) {
            return R.fail("志愿者手机号不能为空");
        }
        R r = communityService.deleteVolunteer(comMngVolunteerMngVO);
//        支援者添加成功，修改小程序用户的志愿者状态，通过手机号
        if (R.isOk(r)) {
            String phone = comMngVolunteerMngVO.getPhone();
            R r1 = userService.putUserIsVolunteer(phone,0);
            if (R.isOk(r1)) {
                log.info("修改手机号【{}】的支援者状态为否",phone);
            }else{
                log.info("手机号【{}】没有小程序用户",phone);
            }
        }
        return r;
    }

    @ApiOperation(value = "编辑志愿者")
    @PutMapping("volunteer")
    public R putVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
        Long id = comMngVolunteerMngVO.getId();
        if (null==id||0==id) {
            return R.fail("志愿者主键不能为空");
        }
        return communityService.putVolunteer(comMngVolunteerMngVO);
    }

    @ApiOperation(value = "分页展示志愿者")
    @PutMapping("pagevolunteer")
    public R pageVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
        return communityService.pageVolunteer(comMngVolunteerMngVO);
    }

    @ApiOperation(value = "分页展示志愿者审核")
    @PutMapping("pagevolunteerexamine")
    public R pageVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
        return communityService.pageVolunteerExamine(comMngVolunteerMngVO);
    }

    @ApiOperation(value = "志愿者审核详情")
    @GetMapping("volunteerexamine")
    public R detailVolunteerExamine(@RequestParam("id")Long id){
        return communityService.detailVolunteerExamine(id);
    }

    @ApiOperation(value = "志愿者审核")
    @PutMapping("volunteerexamine")
    public R putVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
        Long id = comMngVolunteerMngVO.getId();
        if (null==id||0==id) {
            return R.fail("审核主键不能为空");
        }
        return communityService.putVolunteerExamine(comMngVolunteerMngVO);
    }

    @ApiOperation(value = "删除志愿者审核")
    @DeleteMapping("volunteerexamine")
    public R deleteVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
        Long id = comMngVolunteerMngVO.getId();
        if (null==id||0==id) {
            return R.fail("审核主键不能为空");
        }
        return communityService.deleteVolunteerExamine(comMngVolunteerMngVO);
    }







}

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

@@ -4,6 +4,7 @@
import com.jcraft.jsch.SftpException;
import com.panzhihua.common.constants.FtpConstants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.common.model.vos.user.RoleVO;
@@ -59,33 +60,25 @@
    @ApiOperation(value = "社区所有党组织",response = PartyOrganizationVO.class)
    @GetMapping("listpartyorganization")
    public R listPartyOrganization() {
        final Long userId = this.getUserId();
        List<PartyOrganizationVO> partyOrganizationVOList = new ArrayList<>();
        partyOrganizationVOList = partyBuildingService.listPartyOrganization();
        return R.ok(partyOrganizationVOList);

        return partyBuildingService.listPartyOrganization();
    }

    @ApiOperation(value = "新增党员")
    @PostMapping("addpartybuildingmember")
    public R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
        final Long userId = this.getUserId();
        //todo 获取用户的社区信息
        Long communityId = 1l;
        Long communityId = this.getCommunityId();
        partyBuildingMemberVO.setCommunityId(communityId);
        R r = partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
        return r;
        return partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
    }

    @ApiOperation(value = "编辑党员")
    @PutMapping("updatepartybuildingmember")
    public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
        Long id = partyBuildingMemberVO.getId();
        if (ObjectUtils.isEmpty(id)) {
        if (null==id||0==id) {
            return R.fail("党员id不能为空");
        }
        R r = partyBuildingService.updatePartyBuildingMember(partyBuildingMemberVO);
        return r;
        return partyBuildingService.updatePartyBuildingMember(partyBuildingMemberVO);
    }

    @ApiOperation(value = "下载模板-导入党员")
@@ -104,6 +97,7 @@

        } catch (Exception e) {
            e.printStackTrace();
            log.error("下载模板失败【{}】",e.getMessage());
        }
        return null;
    }
@@ -139,222 +133,184 @@
            EasyExcel.read(inputStream, PartyBuildingMemberExcelVO.class, new PartyBuildingMemberExcelListen(partyBuildingService)).sheet().doRead();
        } catch (IOException e) {
            e.printStackTrace();
            log.error("导入模板失败【{}】",e.getMessage());
        }


        return R.ok();
    }

    @ApiOperation(value = "党员管理分页查询",response = PartyBuildingMemberVO.class)
    @PostMapping("pagepartyorganization")
    public R pagePartyOrganization(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO) {
        R r = partyBuildingService.pagePartyOrganization(pagePartyOrganizationVO);
        return r;
        return partyBuildingService.pagePartyOrganization(pagePartyOrganizationVO);
    }

    @ApiOperation(value = "党员档案--党员活动",response = PartyBuildingActivityVO.class)
    @PostMapping("listpartymemberactivities")
    public R listPartyMemberActivities(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        R r = partyBuildingService.listPartyMemberActivities(partyBuildingActivityVO);
        return r;
        return partyBuildingService.listPartyMemberActivities(partyBuildingActivityVO);
    }

    @ApiOperation(value = "活动报名名单分页查询",response = PageActivityMembersVO.class)
    @PostMapping("pageactivitymembers")
    public R pageActivityMembers(@RequestBody PageActivityMembersVO pageActivityMembersVO) {
        R r = partyBuildingService.pageActivityMembers(pageActivityMembersVO);
        return r;
        return partyBuildingService.pageActivityMembers(pageActivityMembersVO);
    }

    @ApiOperation(value = "活动详情",response = PartyBuildingActivityVO.class)
    @GetMapping("activityinfo")
    public R activityinfo(@RequestParam("id") Long id) {
        R r = partyBuildingService.activityinfo(id);
        return r;
        return partyBuildingService.activityinfo(id);
    }

    @ApiOperation(value = "新增党员活动")
    @PostMapping("addactivity")
    public R addActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        R r = partyBuildingService.addactivity(partyBuildingActivityVO);
        return r;
        return partyBuildingService.addactivity(partyBuildingActivityVO);
    }

    @ApiOperation(value = "编辑党员活动")
    @PutMapping("updateactivity")
    public R updateActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        Long id = partyBuildingActivityVO.getId();
        if (ObjectUtils.isEmpty(id)) {//todo 修改报名人数 最低人数 0 的判断
        if (null==id||0==id) {//todo 修改报名人数 最低人数 0 的判断
            return R.fail("主键不能为空");
        }
        R r = partyBuildingService.updateActivity(partyBuildingActivityVO);
        return r;
        return partyBuildingService.updateActivity(partyBuildingActivityVO);
    }

    @ApiOperation(value = "发布党员活动")
    @PutMapping("releaseactivity")
    public R releaseActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        Long id = partyBuildingActivityVO.getId();
        if (ObjectUtils.isEmpty(id)) {
        if (null==id||0==id) {
            return R.fail("主键不能为空");
        }
        R r = partyBuildingService.releaseActivity(id);
        return r;
        return partyBuildingService.releaseActivity(id);
    }

    @ApiOperation(value = "删除党员活动")
    @DeleteMapping("deleteactivity")
    public R deleteActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        Long id = partyBuildingActivityVO.getId();
        if (ObjectUtils.isEmpty(id)) {
        if (null==id||0==id) {
            return R.fail("主键不能为空");
        }
        R r = partyBuildingService.deleteActivity(id);
        return r;
        return partyBuildingService.deleteActivity(id);
    }

    @ApiOperation(value = "取消党员活动")
    @PutMapping("cancelactivity")
    public R cancelActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        Long id = partyBuildingActivityVO.getId();
        String createBy = partyBuildingActivityVO.getCreateBy();
        String cancelReason = partyBuildingActivityVO.getCancelReason();
        boolean empty = ObjectUtils.isEmpty(createBy);
        boolean emptycancelReason = ObjectUtils.isEmpty(cancelReason);
        boolean emptyid = ObjectUtils.isEmpty(id);
        if (empty||emptycancelReason||emptyid) {
        if (emptycancelReason||emptyid) {
            return R.fail("参数不全");
        }
//        R r = partyBuildingService.deleteActivity(id);
        R r = partyBuildingService.cancelActivity(partyBuildingActivityVO);
        return r;
        return partyBuildingService.cancelActivity(partyBuildingActivityVO);
    }

    @ApiOperation(value = "分页查询党员活动",response = PageActivityMembersVO.class)
    @PostMapping("pageactivity")
    public R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        Long CommunityId=1l;//todo 获取社区id
        Long CommunityId=this.getCommunityId();
        partyBuildingActivityVO.setCommunityId(CommunityId);
        R r = partyBuildingService.pageActivity(partyBuildingActivityVO);
        return r;
        return partyBuildingService.pageActivity(partyBuildingActivityVO);
    }

    @ApiOperation(value = "社区下拉选择党员",response = PartyBuildingMemberVO.class)
    @GetMapping("listpartymember")
    public R listPartyMember() {
        final Long userId = this.getUserId();
        //todo 获取用户的社区信息
        Integer communityId = 1;
        R r = partyBuildingService.listPartyMember(communityId);
        return r;
        Long communityId =this.getCommunityId();
        return partyBuildingService.listPartyMember(communityId);
    }

    @ApiOperation(value = "社区下拉选择身份",response = RoleVO.class)
    @GetMapping("listidentity")
    public R listIdentity() {
        final Long userId = this.getUserId();
        //todo 获取用户的社区信息
        Integer communityId = 1;
        R r = userService.listIdentity(communityId);
        return r;
        Long communityId =this.getCommunityId();
        return userService.listIdentity(communityId);
    }

    @ApiOperation(value = "新增党委")
    @PostMapping("addpartycommittee")
    public R addPartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
        final Long userId = this.getUserId();
        //todo 获取用户的社区信息
        Long communityId = 1l;
        Long communityId =this.getCommunityId();
        partyCommitteeVO.setCommunityId(communityId);
        R r = partyBuildingService.addPartyCommittee(partyCommitteeVO);
        return r;
        return partyBuildingService.addPartyCommittee(partyCommitteeVO);
    }

    @ApiOperation(value = "编辑党委")
    @PutMapping("updatepartycommittee")
    public R updatePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
        final Long userId = this.getUserId();
        //todo 获取用户的社区信息
        Long communityId = 1l;
        Long communityId = this.getCommunityId();
        partyCommitteeVO.setCommunityId(communityId);
        R r = partyBuildingService.updatePartyCommittee(partyCommitteeVO);
        return r;
        return partyBuildingService.updatePartyCommittee(partyCommitteeVO);
    }

    @ApiOperation(value = "删除党委")
    @DeleteMapping("deletepartycommittee")
    public R deletePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
        final Long userId = this.getUserId();
        //todo 获取用户的社区信息
        Long communityId = 1l;
        Long communityId = this.getCommunityId();
        partyCommitteeVO.setCommunityId(communityId);
        R r = partyBuildingService.deletePartyCommittee(partyCommitteeVO);
        return r;
        return partyBuildingService.deletePartyCommittee(partyCommitteeVO);
    }

    @ApiOperation(value = "分页党委查询",response = PartyCommitteeVO.class)
    @PostMapping("pagepartycommittee")
    public R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
        final Long userId = this.getUserId();
        //todo 获取用户的社区信息
        Long communityId = 1l;
        Long communityId = this.getCommunityId();
        partyCommitteeVO.setCommunityId(communityId);
        R r = partyBuildingService.pagePartyCommittee(partyCommitteeVO);
        return r;
        return partyBuildingService.pagePartyCommittee(partyCommitteeVO);
    }

    @ApiOperation(value = "新建动态/政策文件")
    @PostMapping("adddynamic")
    public R adddYnamic(@RequestBody PartyBuildingComPbDynVO partyCommitteeVO) {
        final Long userId = this.getUserId();
        Long communityId=1l;//todo 获取社区id
        partyCommitteeVO.setCreateBy(userId);
        partyCommitteeVO.setCommunityId(communityId);
        R r = partyBuildingService.adddYnamic(partyCommitteeVO);
        return r;
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        partyCommitteeVO.setCreateBy(loginUserInfo.getUserId());
        partyCommitteeVO.setCommunityId(loginUserInfo.getCommunityId());
        return partyBuildingService.adddYnamic(partyCommitteeVO);
    }

    @ApiOperation(value = "编辑动态/政策文件")
    @PutMapping("updatedynamic")
    public R updateYnamic(@RequestBody PartyBuildingComPbDynVO partyCommitteeVO) {
        Long id = partyCommitteeVO.getId();
        if (ObjectUtils.isEmpty(id)) {
        if (null==id||0==id) {
            return R.fail("动态主键不能为空");
        }
        R r = partyBuildingService.updateYnamic(partyCommitteeVO);
        return r;
        return partyBuildingService.updateYnamic(partyCommitteeVO);
    }

    @ApiOperation(value = "动态/政策文件详情",response = PartyBuildingComPbDynVO.class)
    @GetMapping("infodynamic")
    public R infoYnamic(@RequestParam("id") Long id) {
        R r = partyBuildingService.infoYnamic(id);
        return r;
        return partyBuildingService.infoYnamic(id);
    }

    @ApiOperation(value = "分页查询党员动态/政策文件",response = PartyCommitteeVO.class)
    @PostMapping("pagedynamic")
    public R pageYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
        Integer type = partyBuildingComPbDynVO.getType();
        if (ObjectUtils.isEmpty(type)) {
        if (null==type||0==type) {
            return R.fail("类型不能为空");
        }
        Long userId = this.getUserId();
        Long communityId=1l;//todo 获取社区id
        Long communityId=this.getCommunityId();
        partyBuildingComPbDynVO.setCommunityId(communityId);
        R r = partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
        return r;
        return partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
    }

    @ApiOperation(value = "删除动态/政策文件")
    @DeleteMapping("deletedynamic")
    public R deleteYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
        Long id = partyBuildingComPbDynVO.getId();
        if (ObjectUtils.isEmpty(id)) {
        if (null==id||0==id) {
            return R.fail("动态主键不能为空");
        }
        R r = partyBuildingService.deleteYnamic(id);
        return r;
        return partyBuildingService.deleteYnamic(id);
    }


@@ -364,11 +320,10 @@
    @DeleteMapping("deletepartybuildingmember")
    public R deleteDynUser(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO){
        Long id = partyBuildingMemberVO.getId();
        if (ObjectUtils.isEmpty(id)) {
        if (null==id||0==id) {
            return R.fail("党员主键不能为空");//todo 加限制只能删除自己小区的党员 或者日志记录
        }
        R r =partyBuildingService.deleteDynUser(id);
        return r;
        return partyBuildingService.deleteDynUser(id);
    }



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

@@ -38,16 +38,14 @@
        if (empty||empty1) {
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginCommunityBackage(account, password);
        return r;
        return tokenService.loginCommunityBackage(account, password);
    }

    @ApiOperation(value = "刷新token",response =LoginReturnVO.class)
    @GetMapping("refreshToken")
    @ApiImplicitParam(name ="refreshToken",value = "登录返回的刷新token")
    public R refreshToken(@RequestParam("refreshToken")String refreshToken){
        R r=tokenService.refreshToken(refreshToken);
        return r;
        return tokenService.refreshToken(refreshToken);
    }

    @ApiOperation(value = "用户登出")
@@ -58,8 +56,7 @@
        if (empty2) {
            return R.ok();
        }
        R r=tokenService.logout(token);
        return r;
        return tokenService.logout(token);
    }



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

@@ -23,38 +23,28 @@
 **/
@RestController
@Api(tags = {"用户模块"})
@RequestMapping("/user/")
@RequestMapping("/")
public class UserApi extends BaseController {
    @Resource
    private UserService userService;
    @ApiOperation(value = "当前登录用户信息",response = LoginUserInfoVO.class)
    @GetMapping("info")
    public R getUserInfo(){
    @GetMapping("user")
    public R detailUser(){
        Long userId = this.getUserId();
        boolean empty2 = ObjectUtils.isEmpty(userId);
        if (empty2) {
            throw new UnAuthenticationException();
        }
        R<LoginUserInfoVO> r = userService.getUserInfoByUserId(userId + "");
        LoginUserInfoVO loginUserInfoVO = (LoginUserInfoVO)r.getData();
        return R.ok(loginUserInfoVO);
        return userService.detailUser(userId);
    }

    @ApiOperation(value = "修改密码")
    @PutMapping("changepassword")
    public R changePassword(@Validated @RequestBody ChangePasswordVO changePasswordVO){
        Long userId = this.getUserId();
        if (ObjectUtils.isEmpty(userId)) {
            return R.fail(HttpStatus.UNAUTHORIZED);
        }
        String newPassword = changePasswordVO.getNewPassword();
        String oldPassword=changePasswordVO.getOldPassword();
        if (newPassword.equals(oldPassword)) {
            return R.fail("修改失败，新密码和原密码一致");
        }
        changePasswordVO.setUserId(userId);
        R r=userService.changePassword(changePasswordVO);
        return r;
        return userService.changePassword(changePasswordVO);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/eureka_server/pom.xml

@@ -43,8 +43,7 @@
                <artifactId>docker-maven-plugin</artifactId>
                <version>1.2.0</version>
                <configuration>
                    <imageName>registry.cn-hangzhou.aliyuncs.com/wooddeep/eureka-server:v3</imageName>
                    <serverId>my-docker-registry</serverId>
                    <imageName>eureka-server:v1</imageName>
                    <baseImage>java</baseImage>
                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
                    <resources>

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

@@ -4,9 +4,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
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.service_community.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -40,6 +42,16 @@
    private ComActMicroWishService comActMicroWishService;
    @Resource
    private ComActEasyPhotoService comActEasyPhotoService;
    @Resource
    private ComActService comActService;
    @Resource
    private ComMngStructHouseService comMngStructHouseService;
    @Resource
    private ComMngStructAreaService comMngStructAreaService;
    @Resource
    private ComMngStructOtherBuildService comMngStructOtherBuildService;
    @Resource
    private ComMngVolunteerMngService comMngVolunteerMngService;

    /**
     * 新增社区活动
@@ -72,7 +84,7 @@
                }

            }
        }else {
        } else {
            return R.fail();
        }
        return R.ok();
@@ -92,7 +104,7 @@
        boolean ok = R.isOk(r);
        if (ok) {
            Integer hasPrize = comActActivityVO.getHasPrize();
            if (!ObjectUtils.isEmpty(comActActPrizeVOList)&&hasPrize.intValue()==1) {
            if (!ObjectUtils.isEmpty(comActActPrizeVOList) && hasPrize.intValue() == 1) {
                Long actActivityVOId = comActActivityVO.getId();
                comActActPrizeService.remove(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, actActivityVOId));
                if (!ObjectUtils.isEmpty(comActActPrizeVOList)) {
@@ -123,7 +135,7 @@
    public R deleteActivity(@RequestBody ComActActivityVO comActActivityVO) {
        boolean remove = comActActivityService.removeById(comActActivityVO.getId());
        if (remove) {
            comActActPrizeService.remove(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId,comActActivityVO.getId()));
            comActActPrizeService.remove(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, comActActivityVO.getId()));
            return R.ok();
        }
        return R.fail();
@@ -139,17 +151,17 @@
    public R pageActivity(@RequestBody ComActActivityVO comActActivityVO) {
        R r = comActActivityService.pageActivity(comActActivityVO);
        if (R.isOk(r)) {
            Page<ComActActivityVO> page = (Page<ComActActivityVO>)r.getData();
            Page<ComActActivityVO> page = (Page<ComActActivityVO>) r.getData();
            List<ComActActivityVO> content = page.getRecords();
            if (!ObjectUtils.isEmpty(content)) {
                List<ComActActPrizeVO> comActActPrizeVOList=new ArrayList<>();
                List<ComActActPrizeVO> comActActPrizeVOList = new ArrayList<>();
                content.forEach(comActActivityVO1 -> {
                    Long id = comActActivityVO1.getId();
                    List<ComActActPrizeDO> list = comActActPrizeService.list(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, id));
                    if (!ObjectUtils.isEmpty(list)) {
                        list.forEach(comActActPrizeDO -> {
                            ComActActPrizeVO comActActPrizeVO=new ComActActPrizeVO();
                            BeanUtils.copyProperties(comActActPrizeDO,comActActPrizeVO);
                            ComActActPrizeVO comActActPrizeVO = new ComActActPrizeVO();
                            BeanUtils.copyProperties(comActActPrizeDO, comActActPrizeVO);
                            comActActPrizeVOList.add(comActActPrizeVO);
                        });
                    }
@@ -164,50 +176,53 @@

    /**
     * 发布活动
     *
     * @param comActActivityVO 主键id 发布时间
     * @return 发布结果
     */
    @PostMapping("releaseactivity")
    public R releaseActivity(@RequestBody ComActActivityVO comActActivityVO){
    public R releaseActivity(@RequestBody ComActActivityVO comActActivityVO) {
        return comActActivityService.releaseActivity(comActActivityVO);
    }

    /**
     * 取消活动
     *
     * @param comActActivityVO 取消原因
     * @return 取消结果
     */
    @PostMapping("cancelactivity")
    public R cancelActivity(@RequestBody ComActActivityVO comActActivityVO){
    public R cancelActivity(@RequestBody ComActActivityVO comActActivityVO) {
        return comActActivityService.cancelActivity(comActActivityVO);
    }

    /**
     * 活动详情
     *
     * @param id 活动id
     * @return 详情
     */
    @PostMapping("detailactivity")
    public R detailActivity(@RequestParam("id") Long id,@RequestParam("userId")Long userId){
        ComActActivityVO comActActivityVO = comActActivityService.inforActivity(id,userId);
    public R detailActivity(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
        ComActActivityVO comActActivityVO = comActActivityService.inforActivity(id, userId);
        if (ObjectUtils.isEmpty(comActActivityVO)) {
            return R.fail("活动不存在");
        }
        List<ComActActPrizeDO> comActActPrizeDOS = comActActPrizeService.list(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, id));
        if (!ObjectUtils.isEmpty(comActActPrizeDOS)) {
            List<ComActActPrizeVO> comActActPrizeVOS=new ArrayList<>();
            List<ComActActPrizeVO> comActActPrizeVOS = new ArrayList<>();
            comActActPrizeDOS.forEach(comActActPrizeDO -> {
                ComActActPrizeVO comActActPrizeVO=new ComActActPrizeVO();
                BeanUtils.copyProperties(comActActPrizeDO,comActActPrizeVO);
                ComActActPrizeVO comActActPrizeVO = new ComActActPrizeVO();
                BeanUtils.copyProperties(comActActPrizeDO, comActActPrizeVO);
                comActActPrizeVOS.add(comActActPrizeVO);
            });
            comActActivityVO.setComActActPrizeVOList(comActActPrizeVOS);
        }
        ActivitySignVO activitySignVO=new ActivitySignVO();
        ActivitySignVO activitySignVO = new ActivitySignVO();
        activitySignVO.setActivityId(id);
        R r = comActActivityService.listActivitySign(activitySignVO);
        if (R.isOk(r)) {
            List<ActivitySignVO> activitySignVOS=(List<ActivitySignVO>)r.getData();
            List<ActivitySignVO> activitySignVOS = (List<ActivitySignVO>) r.getData();
            comActActivityVO.setActivitySignVOList(activitySignVOS);
        }
        return R.ok(comActActivityVO);
@@ -215,33 +230,35 @@

    /**
     * 活动报名名单
     *
     * @param activitySignVO 查询参数
     * @return 报名人员集合
     */
    @PostMapping("listactivitysign")
    public R listActivitySign(@RequestBody ActivitySignVO activitySignVO){
    public R listActivitySign(@RequestBody ActivitySignVO activitySignVO) {
        return comActActivityService.listActivitySign(activitySignVO);
    }

    /**
     * 新增社区动态
     *
     * @param comActDynVO 新增信息
     * @return 新增结果
     */
    @PostMapping("adddynamic")
    public R addDynamic(@RequestBody ComActDynVO comActDynVO){
        ComActDynDO comActDynDO=new ComActDynDO();
        BeanUtils.copyProperties(comActDynVO,comActDynDO);
    public R addDynamic(@RequestBody ComActDynVO comActDynVO) {
        ComActDynDO comActDynDO = new ComActDynDO();
        BeanUtils.copyProperties(comActDynVO, comActDynDO);
        boolean save = comActDynService.save(comActDynDO);
        if (save) {
//            最多只能设置三条置顶状态，后边设置会取消先前设置的置顶
            Integer isTopping = comActDynVO.getIsTopping();
            boolean b = isTopping.intValue() == 1;
            if (b) {
                List<ComActDynDO> list = comActDynService.list(new QueryWrapper<ComActDynDO>().lambda().eq(ComActDynDO::getIsTopping, 1).eq(ComActDynDO::getCommunityId,comActDynVO.getCommunityId()));
                List<ComActDynDO> list = comActDynService.list(new QueryWrapper<ComActDynDO>().lambda().eq(ComActDynDO::getIsTopping, 1).eq(ComActDynDO::getCommunityId, comActDynVO.getCommunityId()));
                if (!ObjectUtils.isEmpty(list)) {
                    int size = list.size();
                    if (size==4) {
                    if (size == 4) {
                        List<ComActDynDO> collect = list.stream().sorted(Comparator.comparing(ComActDynDO::getCreateAt)).collect(Collectors.toList());
                        ComActDynDO comActDynDO1 = collect.get(0);
                        comActDynDO1.setIsTopping(0);
@@ -259,23 +276,24 @@

    /**
     * 编辑社区动态
     *
     * @param comActDynVO 编辑内容
     * @return 编辑结果
     */
    @PostMapping("putdynamic")
    public R putDynamic(@RequestBody ComActDynVO comActDynVO){
        ComActDynDO comActDynDO=new ComActDynDO();
        BeanUtils.copyProperties(comActDynVO,comActDynDO);
    public R putDynamic(@RequestBody ComActDynVO comActDynVO) {
        ComActDynDO comActDynDO = new ComActDynDO();
        BeanUtils.copyProperties(comActDynVO, comActDynDO);
        boolean update = comActDynService.updateById(comActDynDO);
        if (update) {
//            最多只能设置三条置顶状态，后边设置会取消先前设置的置顶
            Integer isTopping = comActDynVO.getIsTopping();
            boolean b = isTopping.intValue() == 1;
            if (b) {
                List<ComActDynDO> list = comActDynService.list(new QueryWrapper<ComActDynDO>().lambda().eq(ComActDynDO::getIsTopping, 1).eq(ComActDynDO::getCommunityId,comActDynVO.getCommunityId()));
                List<ComActDynDO> list = comActDynService.list(new QueryWrapper<ComActDynDO>().lambda().eq(ComActDynDO::getIsTopping, 1).eq(ComActDynDO::getCommunityId, comActDynVO.getCommunityId()));
                if (!ObjectUtils.isEmpty(list)) {
                    int size = list.size();
                    if (size==4) {
                    if (size == 4) {
                        List<ComActDynDO> collect = list.stream().sorted(Comparator.comparing(ComActDynDO::getUpdateAt)).collect(Collectors.toList());
                        ComActDynDO comActDynDO1 = collect.get(0);
                        comActDynDO1.setIsTopping(0);
@@ -293,11 +311,12 @@

    /**
     * 删除社区动态
     *
     * @param comActDynVO 动态id
     * @return 删除结果
     */
    @PostMapping("deletedynamic")
    public R deleteDynamic(@RequestBody ComActDynVO comActDynVO){
    public R deleteDynamic(@RequestBody ComActDynVO comActDynVO) {
        boolean b = comActDynService.removeById(comActDynVO.getId());
        if (b) {
            return R.ok();
@@ -307,116 +326,127 @@

    /**
     * 分页查询社区动态
     *
     * @param comActDynVO 查询参数
     * @return 动态集合
     */
    @PostMapping("pagedynamic")
    public R pageDynamic(@RequestBody ComActDynVO comActDynVO){
    public R pageDynamic(@RequestBody ComActDynVO comActDynVO) {
        return comActDynService.pageDynamic(comActDynVO);
    }

    /**
     * 社区动态详情
     *
     * @param id 动态id
     * @return 详情
     */
    @PostMapping("detaildynamic")
    public R detailDynamic(@RequestParam("id") Long id){
    public R detailDynamic(@RequestParam("id") Long id) {
        return comActDynService.detailDynamic(id);
    }


    /**
     * 分页查询随手拍
     *
     * @param comActEasyPhotoVO 查询参数
     * @return 心愿列表
     */
    @PostMapping("pageeasyphoto")
    public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){
    public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        return comActEasyPhotoService.pageEasyPhoto(comActEasyPhotoVO);
    }

    /**
     * 随手拍详情
     * @param id 随手拍主键
     *
     * @param id     随手拍主键
     * @param userId 登录用户
     * @return 详情内容
     */
    @PostMapping("detaileasyphoto")
    public R detailEasyPhoto(@RequestParam("id")Long id,@RequestParam("userId")Long userId){
        return comActEasyPhotoService.detailEasyPhoto(id,userId);
    public R detailEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
        return comActEasyPhotoService.detailEasyPhoto(id, userId);
    }

    /**
     * 分页查询微心愿
     *
     * @param comActMicroWishVO 查询参数
     * @return 分页集合
     */
    @PostMapping("pagemicrowish")
    public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO){
    public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
        return comActMicroWishService.pageMicroWish(comActMicroWishVO);
    }

    /**
     * 心愿详情
     * @param id 查询主键
     *
     * @param id     查询主键
     * @param userId 登录用户id
     * @return 心愿内容
     */
    @PostMapping("detailmicrowish")
    public R detailMicroWish(@RequestParam("id")Long id,@RequestParam("userId")Long userId){
        return comActMicroWishService.detailMicroWish(id,userId);
    public R detailMicroWish(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
        return comActMicroWishService.detailMicroWish(id, userId);
    }

    /**
     * 审核、分配、反馈心愿
     *
     * @param comActMicroWishVO 具体操作
     * @return 操作结果
     */
    @PostMapping("putlmicrowish")
    public R putlMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO){
    public R putlMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
        return comActMicroWishService.putlMicroWish(comActMicroWishVO);
    }

    /**
     * 分页展示我的所有活动 时间倒序排列
     *
     * @param comActActivityVO 分页参数
     * @return 分页集合
     */
    @PostMapping("pagemyactivity")
    public R pageMyActivity(@RequestBody ComActActivityVO comActActivityVO){
    public R pageMyActivity(@RequestBody ComActActivityVO comActActivityVO) {
        return comActActivityService.pageMyActivity(comActActivityVO);
    }

    /**
     * 报名/取消报名社区活动
     *
     * @param signactivityVO 报名参数
     * @return 报名 取消报名 结果
     */
    @PostMapping("signactivity")
    public R signActivity(@RequestBody SignactivityVO signactivityVO){
    public R signActivity(@RequestBody SignactivityVO signactivityVO) {
        return comActActivityService.signActivity(signactivityVO);
    }

    /**
     * 上传随手拍
     *
     * @param comActEasyPhotoVO 上传数据
     * @return 上传结果
     */
    @PostMapping("addeasyphoto")
    public R addEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){
    public R addEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        return comActEasyPhotoService.addEasyPhoto(comActEasyPhotoVO);
    }

    /**
     * 发布微心愿
     *
     * @param comActMicroWishVO 发布内容
     * @return 发布结果
     */
    @PostMapping("addmicrowish")
    public R addMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO){
        ComActMicroWishDO comActMicroWishDO=new ComActMicroWishDO();
        BeanUtils.copyProperties(comActMicroWishVO,comActMicroWishDO);
    public R addMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
        ComActMicroWishDO comActMicroWishDO = new ComActMicroWishDO();
        BeanUtils.copyProperties(comActMicroWishVO, comActMicroWishDO);
        boolean save = comActMicroWishService.save(comActMicroWishDO);
        if (save) {
            return R.ok();
@@ -426,43 +456,364 @@

    /**
     * 点赞/取消点赞随手拍
     *
     * @param comActEasyPhotoVO 操作参数
     * @return 操作结果
     */
    @PostMapping("puteasyphoto")
    public R putEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){
    public R putEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        return comActEasyPhotoService.putEasyPhoto(comActEasyPhotoVO);
    }

    /**
     * 点赞/取消点赞微心愿
     *
     * @param comActMicroWishVO 操作参数
     * @return 操作结果
     */
    @PostMapping("putmicrowish")
    public R putMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO){
    public R putMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
        return comActMicroWishService.comActMicroWishVO(comActMicroWishVO);
    }

    /**
     * 新增社区动态浏览记录
     * @param id 动态主键
     *
     * @param id     动态主键
     * @param userId 登录用户id
     * @return 新增结果
     */
    @PostMapping("adddynamicuser")
    public R addDynamicUser(@RequestParam("id") Long id, @RequestParam("userId")Long userId){
        return comActDynService.addDynamicUser(id,userId);
    public R addDynamicUser(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
        return comActDynService.addDynamicUser(id, userId);
    }

    /**
     * 审核反馈随手拍
     *
     * @param comActEasyPhotoVO 操作参数
     * @return 操作结果
     */
    @PostMapping("puteasyphotostatus")
    public R putEasypHotoStatus(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){
    public R putEasypHotoStatus(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        return comActEasyPhotoService.putEasypHotoStatus(comActEasyPhotoVO);
    }

    /**
     * 新增社区
     *
     * @param comActVO 社区信息
     * @return 新增结果
     */
    @PostMapping("addcommunity")
    R addCommunity(@RequestBody ComActVO comActVO) {
        return comActService.addCommunity(comActVO);
    }

    /**
     * 编辑社区
     *
     * @param comActVO 编辑内容
     * @return 编辑结果
     */
    @PutMapping("putCommunity")
    public R putCommunity(@RequestBody ComActVO comActVO) {
        return comActService.putCommunity(comActVO);
    }

    /**
     * 房屋信息
     *
     * @param userId 用户id
     * @return 房屋信息
     */
    @PostMapping("detailhouse")
    public R detailHouse(@RequestParam("userId") Long userId) {
        return comMngStructHouseService.detailHouse(userId);
    }

    /**
     * 新增小区
     *
     * @param comMngStructAreaVO 小区信息
     * @return 新增结果
     */
    @PostMapping("addarea")
    @Transactional(rollbackFor = Exception.class)
    R addArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO) {
        R r = comMngStructAreaService.addArea(comMngStructAreaVO);
        if (R.isOk(r)) {
            String areaCode = (String) r.getData();
            comMngStructAreaVO.setAreaCode(areaCode);
            R r1 = comMngStructHouseService.addHouseArea(comMngStructAreaVO);
            if (!R.isOk(r1)) {
                throw new RuntimeException("新增小区地址失败");
            }
        }
        return r;
    }

    /**
     * 分页查询小区
     *
     * @param comMngStructAreaVO 查询参数
     * @return 分页结果
     */
    @PostMapping("pagearea")
    public R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO) {
        return comMngStructAreaService.pageArea(comMngStructAreaVO);
    }

    /**
     * 编辑小区
     *
     * @param comMngStructAreaVO 编辑内容
     * @return 编辑结果
     */
    @PostMapping("putarea")
    public R putArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO) {
        return comMngStructAreaService.putArea(comMngStructAreaVO);
    }


    /**
     * 删除小区
     *
     * @param comMngStructAreaVO 地址编码
     * @return 删除结果
     */
    @PostMapping("deletearea")
    @Transactional(rollbackFor = Exception.class)
    public R deleteArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO) {
//        先删除小区小面所有房屋、删除用户和小区房屋的绑定关系
        R r = comMngStructHouseService.batchDeleteHouse(comMngStructAreaVO);
        if (R.isOk(r)) {
            R r1 = comMngStructAreaService.deleteArea(comMngStructAreaVO);
            if (!R.isOk(r1)) {
                throw new RuntimeException("删除小区失败");
            }
        }
        return r;
    }

    /**
     * 小区批量建房
     *
     * @param batchhouseVO 建房参数
     * @return 建房结果
     */
    @PostMapping("batchhouse")
    public R batchHouse(@RequestBody BatchhouseVO batchhouseVO) {
        return comMngStructHouseService.batchHouse(batchhouseVO);
    }

    /**
     * 展示下级建筑
     *
     * @param houseCode 房屋编号
     * @return 下级建筑列表
     */
    @PostMapping("listsubordinatebuilding")
    public R listSubordinatebuilding(@RequestParam("houseCode") String houseCode) {
        return comMngStructHouseService.listSubordinatebuilding(houseCode);
    }

    /**
     * 添加同级地址
     *
     * @param batchhouseVO 添加地址
     * @return 添加结果
     */
    @PostMapping("addhouse")
    public R addHouse(@RequestBody BatchhouseVO batchhouseVO) {
        R r=comMngStructAreaService.selectAreaByAreaCode(batchhouseVO.getAreaCode());
        if (R.isOk(r)) {
            ComMngStructAreaDO comMngStructAreaDO = (ComMngStructAreaDO)r.getData();
            return comMngStructHouseService.addHouse(batchhouseVO,comMngStructAreaDO);
        }
        return r;
    }

    /**
     * 编辑地址
     *
     * @param comMngStructHouseVO 编辑内容
     * @return 编辑结果
     */
    @PutMapping("puthouse")
    public R putHouse(@RequestBody ComMngStructHouseVO comMngStructHouseVO) {
        return comMngStructHouseService.putHouse(comMngStructHouseVO);
    }

    /**
     * 删除地址
     *
     * @param comMngStructHouseVO 删除指定地址和所有下级
     * @return 删除结果
     */
    @PostMapping("deletehouse")
    public R deleteHouse(@RequestBody ComMngStructHouseVO comMngStructHouseVO) {
        return comMngStructHouseService.deleteHouse(comMngStructHouseVO);
    }

    /**
     * 新增其他建筑
     *
     * @param comMngStructOtherBuildVO 建筑参数
     * @return 新增结果
     */
    @PostMapping("addotherbuild")
    public R addOtherbuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO) {
        return comMngStructOtherBuildService.addOtherbuild(comMngStructOtherBuildVO);
    }

    /**
     * 查询所有建筑类型
     * @return 类型列表
     */
    @PostMapping("listbuildtype")
    public R listBuildType(){
        return comMngStructOtherBuildService.listBuildType();
    }

    /**
     * 分页查询 其他建筑
     * @param comMngStructOtherBuildVO 分页查询参数
     * @return 查询结果
     */
    @PostMapping("pageotherbuild")
    public R pageOtherBuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO){
        return comMngStructOtherBuildService.pageOtherBuild(comMngStructOtherBuildVO);
    }

    /**
     * 增加志愿者
     * @param comMngVolunteerMngVO 志愿者信息
     * @return 增加结果
     */
    @PostMapping("addvolunteer")
    R addVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
        return comMngVolunteerMngService.addVolunteer(comMngVolunteerMngVO);
    }

    /**
     * 删除志愿者
     * @param comMngVolunteerMngVO 手机号
     * @return 删除结果
     */
    @PostMapping("deletevolunteer")
    public R deleteVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
        return comMngVolunteerMngService.deleteVolunteer(comMngVolunteerMngVO);
    }

    /**
     * 编辑志愿者
     * @param comMngVolunteerMngVO 编辑内容
     * @return 编辑结果
     */
    @PostMapping("putvolunteer")
    R putVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
        return comMngVolunteerMngService.putVolunteer(comMngVolunteerMngVO);
    }

    /**
     * 分页展示志愿者
     * @param comMngVolunteerMngVO 查询参数
     * @return 分页集合返回
     */
    @PostMapping("pagevolunteer")
    public R pageVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
        return comMngVolunteerMngService.pageVolunteer(comMngVolunteerMngVO);
    }

    /**
     * 分页展示志愿者审核
     * @param comMngVolunteerMngVO 查询参数
     * @return 查询结果
     */
    @PostMapping("pagevolunteerexamine")
    public R pageVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
        return comMngVolunteerMngService.pageVolunteerExamine(comMngVolunteerMngVO);
    }

    /**
     * 志愿者审核详情
     * @param id 主键
     * @return 详情
     */
    @PostMapping("detailvolunteerexamine")
    public R detailVolunteerExamine(@RequestParam("id") Long id){
        return comMngVolunteerMngService.detailVolunteerExamine(id);
    }

    /**
     * 志愿者审核
     * @param comMngVolunteerMngVO 审核操作
     * @return 审核结果
     */
    @PostMapping("putvolunteerexamine")
    public R putVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
        return comMngVolunteerMngService.putVolunteerExamine(comMngVolunteerMngVO);
    }

    /**
     * 删除志愿者审核
     * @param comMngVolunteerMngVO 主键
     * @return 删除结果
     */
    @PostMapping("deletevolunteerexamine")
    public R deleteVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
        return comMngVolunteerMngService.deleteVolunteerExamine(comMngVolunteerMngVO);
    }

    /**
     * 查询区域
     * @param comActVO 登录人的经纬度、或者指定区域的社区
     * @return 社区集合
     */
    @PostMapping("listcommunity")
    public R listCommunity(@RequestBody ComActVO comActVO){
        return comActService.listCommunity(comActVO);
    }

    /**
     * 用户修改手机号对应的志愿者手机号也要修改
     * @param userPhoneVO 新旧手机号
     * @return 修改结果
     */
    @PostMapping("putvolunteerphone")
    public R putVolunteerPhone(UserPhoneVO userPhoneVO){
        return comMngVolunteerMngService.putVolunteerPhone(userPhoneVO);
    }

    /**
     * 房屋地址下拉列表
     * @param parentCode 父级编码
     * @param areaId 小区id
     * @return 下级列表
     */
    @PostMapping("listhouses")
    public R listHouses(@RequestParam("parentCode")String parentCode, @RequestParam("areaId")Long areaId){
        if (ObjectUtils.isEmpty(parentCode)) {
            R r = comMngStructAreaService.selectAreaById(areaId);
            if (R.isOk(r)) {
                parentCode =(String) r.getData();
            }
        }
        return comMngStructHouseService.putVolunteerPhone(parentCode);
    }

    /**
     * 新增房屋
     * @param comMngStructHouseVO 房屋信息
     * @return 新增结果
     */
    @PostMapping("addhouses")
    public R addHouses(@RequestBody ComMngStructHouseVO comMngStructHouseVO){
        return comMngStructHouseService.addHouses(comMngStructHouseVO);
    }




}

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

@@ -1,8 +1,12 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.service_community.model.dos.ComActDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -12,4 +16,34 @@
 **/
@Mapper
public interface ComActDAO extends BaseMapper<ComActDO> {
    //    @Select("<script> " +
//            " <where>" +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            " </where>" +
//            "</script>")

    @Select("<script> " +
            "SELECT\n" +
            "c.community_id,\n" +
            "c.`name`,\n" +
            "ST_Distance_Sphere ( Point ( #{lng}, #{lat} ), Point ( c.lng, c.lat ) ) AS distance \n" +
            "FROM\n" +
            "com_act c \n" +
            " <where>" +
            "<if test='areaCode != null and areaCode.trim() != &quot;&quot;'>" +
            "c.area_code = #{areaCode} \n" +
            " </if> " +
            " </where>" +
            "ORDER BY\n" +
            "distance ASC" +
            "<if test='lng != null and lng.trim() != &quot;&quot;'>" +
            " limit 10 " +
            " </if> " +
            "</script>")
    List<ComActVO> listCommunity(ComActVO comActVO);
}

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

@@ -1,8 +1,14 @@
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.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.service_community.model.dos.ComMngStructAreaDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -12,4 +18,29 @@
 **/
@Mapper
public interface ComMngStructAreaDAO extends BaseMapper<ComMngStructAreaDO> {
    //    @Select("<script> " +
//            " <where>" +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            " </where>" +
//            "</script>")
    @Select("<script> " +
            "SELECT\n" +
            "id,\n" +
            "area_name,\n" +
            "address_detail,\n" +
            "create_at \n" +
            "FROM\n" +
            "com_mng_struct_area \n" +
            "WHERE\n" +
            "community_id = #{comMngStructAreaVO.communityId} \n" +
            "<if test='comMngStructAreaVO.areaName != null and comMngStructAreaVO.areaName.trim() != &quot;&quot;'>" +
            "AND area_name = #{comMngStructAreaVO.areaName}" +
            " </if> " +
            "</script>")
    IPage<ComActDynVO> pageArea(Page page, @Param("comMngStructAreaVO") ComMngStructAreaVO comMngStructAreaVO);
}

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

@@ -1,8 +1,14 @@
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.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComMngStructOtherBuildVO;
import com.panzhihua.service_community.model.dos.ComMngStructBuildTypeDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -12,4 +18,6 @@
 **/
@Mapper
public interface ComMngStructBuildTypeDAO extends BaseMapper<ComMngStructBuildTypeDO> {


}

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

@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComMngStructHouseDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Options;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.mapping.StatementType;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -12,4 +15,7 @@
 **/
@Mapper
public interface ComMngStructHouseDAO extends BaseMapper<ComMngStructHouseDO> {
    @Select("{call smart_life.removeByParentCode(#{areaCode,jdbcType=VARCHAR,mode=IN})}")
    @Options(statementType = StatementType.CALLABLE)
    int batchDeleteHouse(String areaCode);
}

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

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.service_community.model.dos.ComMngStructHouseUserDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 房屋人员关系
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-15 15:13
 **/
@Mapper
public interface ComMngStructHouseUserDAO extends BaseMapper<ComMngStructHouseUserDO> {
    @Select("select u.name,u.phone from com_mng_struct_house_user h left join sys_user u on h.user_id=u.user_id")
    List<LoginUserInfoVO> selectListHouseUser(String houseCode1);
}

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

File was deleted

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

@@ -1,8 +1,13 @@
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.vos.community.ComMngStructOtherBuildVO;
import com.panzhihua.service_community.model.dos.ComMngStructOtherBuildDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -12,4 +17,35 @@
 **/
@Mapper
public interface ComMngStructOtherBuildDAO extends BaseMapper<ComMngStructOtherBuildDO> {

    //    @Select("<script> " +
//            " <where>" +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            " </where>" +
//            "</script>")
    @Select("<script> " +
            "SELECT \n" +
            "b.id,\n" +
            "b.`name`,\n" +
            "t.name buileTypeName,\n" +
            "b.square,\n" +
            "b.address,\n" +
            "b.`state`,\n" +
            "b.layer_type,\n" +
            "b.create_at\n" +
            "FROM\n" +
            "com_mng_struct_other_build b \n" +
            "join com_mng_struct_build_type t on b.type_id=t.id\n" +
            " <where>" +
            "<if test='comMngStructOtherBuildVO.name != null and comMngStructOtherBuildVO.name.trim() != &quot;&quot;'>" +
            "b.name = #{comMngStructOtherBuildVO.name}"+
            " </if> " +
            " </where>" +
            "</script>")
    IPage<ComMngStructOtherBuildVO> pageOtherBuild(Page page, @Param("comMngStructOtherBuildVO") ComMngStructOtherBuildVO comMngStructOtherBuildVO);
}

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

New file
@@ -0,0 +1,73 @@
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.vos.community.ComMngStructOtherBuildVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.service_community.model.dos.ComMngVolunteerMngDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 志愿者
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-15 09:50
 **/
@Mapper
public interface ComMngVolunteerMngDAO extends BaseMapper<ComMngVolunteerMngDO> {
    //    @Select("<script> " +
//            " <where>" +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            " </where>" +
//            "</script>")
    @Select("<script> " +
            "SELECT\n" +
            "id,\n" +
            "`name`,\n" +
            "photo_path,\n" +
            "phone,\n" +
            "create_at \n" +
            "FROM\n" +
            "com_mng_volunteer_mng \n" +
            " where state=2 " +
            "<if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name.trim() != &quot;&quot;'>" +
            " and name = #{comMngVolunteerMngVO.name} \n" +
            " </if> " +
            "<if test='comMngVolunteerMngVO.phone != null and comMngVolunteerMngVO.phone.trim() != &quot;&quot;'>" +
            "AND phone = #{comMngVolunteerMngVO.phone}" +
            " </if> " +
            "</script>")
    IPage<ComMngVolunteerMngVO> pageVolunteer(Page page, @Param("comMngVolunteerMngVO") ComMngVolunteerMngVO comMngVolunteerMngVO);

    @Select("<script> " +
            "SELECT\n" +
            "id,\n" +
            "`name`,\n" +
            "state,\n" +
            "phone,\n" +
            "create_at \n" +
            "FROM\n" +
            "com_mng_volunteer_mng \n" +
            "WHERE\n" +
            "state in (1,3)\n" +
            "<if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name.trim() != &quot;&quot;'>" +
            "and name = #{comMngVolunteerMngVO.name} \n" +
            " </if> " +
            "<if test='comMngVolunteerMngVO.phone != null and comMngVolunteerMngVO.phone.trim() != &quot;&quot;'>" +
            "AND phone = #{comMngVolunteerMngVO.phone}\n" +
            " </if> " +
            "<if test='comMngVolunteerMngVO.state != null and comMngVolunteerMngVO.state != 0'>" +
            "and state=#{comMngVolunteerMngVO.state}\n" +
            " </if> " +
            "ORDER BY state asc " +
            "</script>")
    IPage<ComMngVolunteerMngVO> pageVolunteerExamine(Page page, @Param("comMngVolunteerMngVO") ComMngVolunteerMngVO comMngVolunteerMngVO);
}

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

@@ -20,7 +20,7 @@
    /**
     * community_id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type=IdType.AUTO)
    private Long communityId;

    /**
@@ -48,4 +48,51 @@
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
     * 省份地址编码
     */
    private String provinceCode;

    /**
     * 市级地址编码
     */
    private String cityCode;

    /**
     * 区级地址编码
     */
    private String areaCode;

    /**
     * 社区面积
     */
    private Double square;

    /**
     * 联系人
     */
    private String contacts;

    /**
     * 联系人电话
     */
    private String contactsPhone;

    /**
     * 超管账号
     */
    private String account;

    /**
     * 账号密码
     */
    private String password;

    /**
     * 状态 0 启用 1 禁用
     */
    private boolean state;


}

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

@@ -1,8 +1,6 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
@@ -22,6 +20,7 @@
    /**
     * id
     */
    @TableId(type= IdType.AUTO)
    private Long id;

    /**

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

@@ -1,8 +1,6 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
@@ -22,6 +20,7 @@
    /**
     * id
     */
    @TableId(type= IdType.AUTO)
    private Long id;

    /**

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

@@ -1,8 +1,6 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
@@ -22,6 +20,7 @@
    /**
     * id
     */
    @TableId(type= IdType.AUTO)
    private Long id;

    /**

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

@@ -1,6 +1,6 @@
package com.panzhihua.service_community.model.dos;

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

import java.io.Serializable;
@@ -20,12 +20,13 @@
    /**
     * 自增id
     */
    @TableId(type= IdType.AUTO)
    private Long id;

    /**
     * 地址编码
     * 社区id
     */
    private String addressCode;
    private String communityId;

    /**
     * 小区名称
@@ -40,5 +41,30 @@
    /**
     * 创建时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 地址编码
     */
    private String areaCode;
    /**
     * 楼层规则 1 01 001
     */
    private String roleFloor;

    /**
     * 连接符 空格 或者 -
     */
    private String roleConnector;

    /**
     * 门牌号规则 1 01 001
     */
    private String roleDoor;

    /**
     * 是否累加门牌号 0 否 1 是
     */
    private Integer isAccumulation;

}

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

@@ -1,5 +1,7 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

@@ -19,6 +21,7 @@
    /**
     * 自增id
     */
    @TableId(type= IdType.AUTO)
    private Long id;

    /**

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

@@ -1,6 +1,6 @@
package com.panzhihua.service_community.model.dos;

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

import java.io.Serializable;
@@ -20,6 +20,7 @@
    /**
     * id
     */
    @TableId(type= IdType.AUTO)
    private Long id;

    /**
@@ -38,13 +39,14 @@
    private String parentCode;

    /**
     * 地址类型 1 楼栋 2 单元 3 楼层 门牌号
     * 地址类型 1小区  2楼栋  3 单元 4楼层  5门牌号
     */
    private boolean type;
    private Integer type;

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

    /**
@@ -56,4 +58,8 @@
     * 房屋面积
     */
    private Double square;
    /**
     * 状态 1 自主 2 租住 3 商用
     */
    private Integer states;
}

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

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

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

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 房屋用户关系
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-15 15:13
 **/
@Data
@TableName(value = "com_mng_struct_house_user")
public class ComMngStructHouseUserDO implements Serializable {

    private static final long serialVersionUID = 1L;

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

    /**
     * 用户id
     */
    private Long userId;

    /**
     * 房屋地址编码
     */
    private String houseCode;

    /**
     * 绑定时间
     */
    private Date createAt;
    /**
     * 小区地址编码
     */
    private String areaCode;
    /**
     * 身份 1租户 2房主
     */
    private Integer identity;
}

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

File was deleted

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

@@ -1,6 +1,6 @@
package com.panzhihua.service_community.model.dos;

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

import java.io.Serializable;
@@ -20,6 +20,7 @@
    /**
     * 自增id
     */
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
@@ -44,16 +45,19 @@

    /**
     * 建筑状态
     * 1 建设中
     * 2 使用中
     */
    private boolean status;
    private Integer state;

    /**
     * 楼层类型id
     * 楼层类型
     */
    private Long layerTypeId;
    private String layerType;

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

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

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

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

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 志愿者
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-15 09:49
 **/
@Data
@TableName(value = "com_mng_volunteer_mng")
public class ComMngVolunteerMngDO implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * 自增id
     */
    @TableId(type= IdType.AUTO)
    private Long id;

    /**
     * 创建时间
     */
    private Date createAt;

    /**
     * 状态：1 - 申请；2 - 通过；3 - 驳回
     */
    private Integer state;

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

    /**
     * 电话号码
     */
    private String phone;

    /**
     * 照片路径
     */
    private String photoPath;

    /**
     * 政治面貌：1- 党员；2 - 团员；3 - 群众
     */
    private Integer politicalFace;

    /**
     * 拒绝原因
     */
    private String rejectReson;

    /**
     * 申请原因
     */
    private String applyReson;

    /**
     * 居住地址
     */
    private String address;
    /**
     * 工作
     */
    private String job;
    /**
     * 年龄
     */
    private Integer age;
}

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

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

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 社区
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-15 10:13
 **/
public interface ComActService {
    /**
     * 新增社区
     * @param comActVO 社区信息
     * @return 新增结果
     */
    R addCommunity(ComActVO comActVO);
    /**
     * 编辑社区
     * @param comActVO 编辑内容
     * @return 编辑结果
     */
    R putCommunity(ComActVO comActVO);
    /**
     * 查询社区
     * @param comActVO 登录人的经纬度、或者指定区域的社区
     * @return 社区集合
     */
    R listCommunity(ComActVO comActVO);
}

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

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

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.BatchhouseVO;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 小区
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-15 15:48
 **/
public interface ComMngStructAreaService {
    /**
     * 新增小区
     * @param comMngStructAreaVO 小区信息
     * @return 新增结果
     */
    @PostMapping("addarea")
    R addArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO);
    /**
     * 分页查询小区
     * @param comMngStructAreaVO 查询参数
     * @return 分页结果
     */
    @PostMapping("pagearea")
    R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO);
    /**
     * 编辑小区
     * @param comMngStructAreaVO 编辑内容
     * @return 编辑结果
     */
    R putArea(ComMngStructAreaVO comMngStructAreaVO);
    /**
     * 删除小区
     * @param comMngStructAreaVO 地址编码
     * @return 删除结果
     */
    R deleteArea(ComMngStructAreaVO comMngStructAreaVO);

    /**
     * 查询小区信息
     * @param areaCode 小区地址编码
     * @return 小区信息
     */
    R selectAreaByAreaCode(String areaCode);

    /**
     * 获取小区的地址编码
     * @param areaId 小区id
     * @return 小区地址编码
     */
    R selectAreaById(Long areaId);
}

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.BatchhouseVO;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
import com.panzhihua.service_community.model.dos.ComMngStructAreaDO;
import com.panzhihua.service_community.model.dos.ComMngStructHouseDO;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 房屋
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-15 15:06
 **/
public interface ComMngStructHouseService extends IService<ComMngStructHouseDO> {
    /**
     * 房屋信息
     * @param userId 用户id
     * @return 房屋信息
     */
    R detailHouse(Long userId);
    /**
     * 小区批量建房
     * @param batchhouseVO 建房参数
     * @return 建房结果
     */
    R batchHouse(BatchhouseVO batchhouseVO);

    /**
     * 新增小区地址
     * @param comMngStructAreaVO 小区地址
     */
    R addHouseArea(ComMngStructAreaVO comMngStructAreaVO);

    /**
     * 先删除小区小面所有房屋、删除用户和小区房屋的绑定关系
     * @param comMngStructAreaVO 小区地址编码
     * @return 删除结果
     */
    R batchDeleteHouse(ComMngStructAreaVO comMngStructAreaVO);
    /**
     * 展示下级建筑
     * @param houseCode 房屋编号
     * @return 下级建筑列表
     */
    R listSubordinatebuilding(String houseCode);
    /**
     * 添加同级地址
     * @param batchhouseVO 添加参数
     * @param comMngStructAreaDO 小区信息-规则
     * @return 添加结果
     */
    R addHouse(BatchhouseVO batchhouseVO, ComMngStructAreaDO comMngStructAreaDO);
    /**
     * 编辑地址
     * @param comMngStructHouseVO 编辑内容
     * @return 编辑结果
     */
    R putHouse(ComMngStructHouseVO comMngStructHouseVO);
    /**
     * 删除地址
     * @param comMngStructHouseVO 删除指定地址和所有下级
     * @return 删除结果
     */
    R deleteHouse(ComMngStructHouseVO comMngStructHouseVO);
    /**
     * 房屋地址下拉列表
     * @param parentCode 父级编码
     * @return 下级列表
     */
    R putVolunteerPhone(String parentCode);
    /**
     * 新增房屋
     * @param comMngStructHouseVO 房屋信息
     * @return 新增结果
     */
    R addHouses(ComMngStructHouseVO comMngStructHouseVO);
}

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

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

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngStructOtherBuildVO;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 其他建筑
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-16 15:27
 **/
public interface ComMngStructOtherBuildService {
    /**
     * 新增其他建筑
     *
     * @param comMngStructOtherBuildVO 建筑参数
     * @return 新增结果
     */
    R addOtherbuild(ComMngStructOtherBuildVO comMngStructOtherBuildVO);
    /**
     * 查询所有建筑类型
     * @return 类型列表
     */
    R listBuildType();
    /**
     * 分页查询 其他建筑
     * @param comMngStructOtherBuildVO 分页查询参数
     * @return 查询结果
     */
    R pageOtherBuild(ComMngStructOtherBuildVO comMngStructOtherBuildVO);
}

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

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

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 志愿者
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-17 09:23
 **/
public interface ComMngVolunteerMngService {
    /**
     * 增加志愿者
     * @param comMngVolunteerMngVO 志愿者信息
     * @return 增加结果
     */
    R addVolunteer(ComMngVolunteerMngVO comMngVolunteerMngVO);
    /**
     * 删除志愿者
     * @param comMngVolunteerMngVO 手机号
     * @return 删除结果
     */
    R deleteVolunteer(ComMngVolunteerMngVO comMngVolunteerMngVO);
    /**
     * 编辑志愿者
     * @param comMngVolunteerMngVO 编辑内容
     * @return 编辑结果
     */
    R putVolunteer(ComMngVolunteerMngVO comMngVolunteerMngVO);
    /**
     * 分页展示志愿者
     * @param comMngVolunteerMngVO 查询参数
     * @return 分页集合返回
     */
    R pageVolunteer(ComMngVolunteerMngVO comMngVolunteerMngVO);
    /**
     * 分页展示志愿者审核
     * @param comMngVolunteerMngVO 查询参数
     * @return 查询结果
     */
    R pageVolunteerExamine(ComMngVolunteerMngVO comMngVolunteerMngVO);
    /**
     * 志愿者审核详情
     * @param id 主键
     * @return 详情
     */
    R detailVolunteerExamine(Long id);
    /**
     * 志愿者审核
     * @param comMngVolunteerMngVO 审核操作
     * @return 审核结果
     */
    R putVolunteerExamine(ComMngVolunteerMngVO comMngVolunteerMngVO);
    /**
     * 删除志愿者审核
     * @param comMngVolunteerMngVO 主键
     * @return 删除结果
     */
    R deleteVolunteerExamine(ComMngVolunteerMngVO comMngVolunteerMngVO);
    /**
     * 用户修改手机号对应的志愿者手机号也要修改
     * @param userPhoneVO 新旧手机号
     * @return 修改结果
     */
    R putVolunteerPhone(UserPhoneVO userPhoneVO);

}

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

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

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.service.ComActService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 社区
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-15 10:13
 **/
@Service
public class ComActServiceImpl implements ComActService {
    @Resource
    private ComActDAO comActDAO;
    /**
     * 新增社区
     *
     * @param comActVO 社区信息
     * @return 新增结果
     */
    @Override
    public R addCommunity(ComActVO comActVO) {
        ComActDO comActDO=new ComActDO();
        BeanUtils.copyProperties(comActVO,comActDO);
        int insert = comActDAO.insert(comActDO);
        if (insert>0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 编辑社区
     *
     * @param comActVO 编辑内容
     * @return 编辑结果
     */
    @Override
    public R putCommunity(ComActVO comActVO) {
        ComActDO comActDO=new ComActDO();
        BeanUtils.copyProperties(comActVO,comActDO);
        int update = comActDAO.updateById(comActDO);
        if (update>0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 查询社区
     *
     * @param comActVO 登录人的经纬度、或者指定区域的社区
     * @return 社区集合
     */
    @Override
    public R listCommunity(ComActVO comActVO) {
        List<ComActVO> comActVOS=comActDAO.listCommunity(comActVO);
        return R.ok(comActVOS);
    }
}

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

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

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.BatchhouseVO;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.service_community.dao.ComMngStructAreaDAO;
import com.panzhihua.service_community.model.dos.ComMngStructAreaDO;
import com.panzhihua.service_community.service.ComMngStructAreaService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 小区
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-15 15:48
 **/
@Service
public class ComMngStructAreaServiceImpl implements ComMngStructAreaService {
    @Resource
    private ComMngStructAreaDAO comMngStructAreaDAO;
    /**
     * 新增小区
     *
     * @param comMngStructAreaVO 小区信息
     * @return 新增结果
     */
    @Override
    public R addArea(ComMngStructAreaVO comMngStructAreaVO) {
        ComMngStructAreaDO comMngStructAreaDO=new ComMngStructAreaDO();
        BeanUtils.copyProperties(comMngStructAreaVO,comMngStructAreaDO);
        long areaCode=510000510400000001l;//攀枝花区域地址编码+000001
        ComMngStructAreaDO comMngStructAreaDO1 = comMngStructAreaDAO.selectOne(new QueryWrapper<ComMngStructAreaDO>().lambda().orderByDesc(ComMngStructAreaDO::getAreaCode).last(" limit 1 "));
        if (!ObjectUtils.isEmpty(comMngStructAreaDO1)) {
             areaCode = Long.valueOf(comMngStructAreaDO1.getAreaCode())+1;
        }
        comMngStructAreaDO.setAreaCode(areaCode+"");
        int insert = comMngStructAreaDAO.insert(comMngStructAreaDO);
        if (insert>0) {
            return R.ok(areaCode);
        }
        return R.fail();
    }

    /**
     * 分页查询小区
     *
     * @param comMngStructAreaVO 查询参数
     * @return 分页结果
     */
    @Override
    public R pageArea(ComMngStructAreaVO comMngStructAreaVO) {
        Page page = new Page<>();
        Long pageNum = comMngStructAreaVO.getPageNum();
        Long pageSize = comMngStructAreaVO.getPageSize();
        if (ObjectUtils.isEmpty(pageNum)||0==pageNum) {
            pageNum = 1l;
        }
        if (ObjectUtils.isEmpty(pageSize)||0==pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComActDynVO> iPage = comMngStructAreaDAO.pageArea(page, comMngStructAreaVO);
        return R.ok(iPage);
    }

    /**
     * 编辑小区
     *
     * @param comMngStructAreaVO 编辑内容
     * @return 编辑结果
     */
    @Override
    public R putArea(ComMngStructAreaVO comMngStructAreaVO) {
        ComMngStructAreaDO comMngStructAreaDO=new ComMngStructAreaDO();
        BeanUtils.copyProperties(comMngStructAreaVO,comMngStructAreaDO);
        int update = comMngStructAreaDAO.update(comMngStructAreaDO, new UpdateWrapper<ComMngStructAreaDO>().lambda().eq(ComMngStructAreaDO::getAreaCode, comMngStructAreaVO.getAreaCode()));
        if (update>0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 删除小区
     *
     * @param comMngStructAreaVO 地址编码
     * @return 删除结果
     */
    @Override
    public R deleteArea(ComMngStructAreaVO comMngStructAreaVO) {
        int delete = comMngStructAreaDAO.delete(new QueryWrapper<ComMngStructAreaDO>().lambda().eq(ComMngStructAreaDO::getAreaCode, comMngStructAreaVO.getAreaCode()));
        if (delete>0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 查询小区信息
     *
     * @param areaCode 小区地址编码
     * @return 小区信息
     */
    @Override
    public R selectAreaByAreaCode(String areaCode) {
        ComMngStructAreaDO comMngStructAreaDO = comMngStructAreaDAO.selectOne(new QueryWrapper<ComMngStructAreaDO>().lambda().eq(ComMngStructAreaDO::getAreaCode, areaCode));
        if (ObjectUtils.isEmpty(comMngStructAreaDO)) {
            return R.fail();
        }
        return R.ok(comMngStructAreaDO);
    }

    /**
     * 获取小区的地址编码
     *
     * @param areaId 小区id
     * @return 小区地址编码
     */
    @Override
    public R selectAreaById(Long areaId) {
        ComMngStructAreaDO comMngStructAreaDO = comMngStructAreaDAO.selectById(areaId);
        if (ObjectUtils.isEmpty(comMngStructAreaDO)) {
            return R.fail("小区不存在");
        }
        return R.ok(comMngStructAreaDO.getAreaCode());
    }


}

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

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

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.BatchhouseVO;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
import com.panzhihua.service_community.dao.ComMngStructHouseDAO;
import com.panzhihua.service_community.dao.ComMngStructHouseUserDAO;
import com.panzhihua.service_community.model.dos.ComMngStructAreaDO;
import com.panzhihua.service_community.model.dos.ComMngStructHouseDO;
import com.panzhihua.service_community.model.dos.ComMngStructHouseUserDO;
import com.panzhihua.service_community.service.ComMngStructHouseService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 房屋
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-15 15:07
 **/
@Slf4j
@Service
public class ComMngStructHouseServiceImpl extends ServiceImpl<ComMngStructHouseDAO, ComMngStructHouseDO> implements ComMngStructHouseService {
    @Resource
    private ComMngStructHouseDAO comMngStructHouseDAO;
    @Resource
    private ComMngStructHouseUserDAO comMngStructHouseUserDAO;

    /**
     * 房屋信息
     *
     * @param userId 用户id
     * @return 房屋信息
     */
    @Override
    public R detailHouse(Long userId) {
        List<ComMngStructHouseVO> comMngStructHouseVOS = new ArrayList<>();
        List<ComMngStructHouseUserDO> comMngStructHouseUserDOS = comMngStructHouseUserDAO.selectList(new QueryWrapper<ComMngStructHouseUserDO>().lambda().eq(ComMngStructHouseUserDO::getUserId, userId));
        if (!ObjectUtils.isEmpty(comMngStructHouseUserDOS)) {
            comMngStructHouseUserDOS.forEach(comMngStructHouseUserDO -> {
                ComMngStructHouseDO comMngStructHouseDO = comMngStructHouseDAO.selectOne(new QueryWrapper<ComMngStructHouseDO>().lambda().eq(ComMngStructHouseDO::getHouseCode, comMngStructHouseUserDO.getHouseCode()));
                ComMngStructHouseVO comMngStructHouseVO = new ComMngStructHouseVO();
                BeanUtils.copyProperties(comMngStructHouseDO, comMngStructHouseVO);
                comMngStructHouseVO.setIdentity(comMngStructHouseUserDO.getIdentity());
                comMngStructHouseVOS.add(comMngStructHouseVO);
            });
            return R.ok(comMngStructHouseVOS);
        }
        return R.ok(comMngStructHouseVOS);
    }

    /**
     * 小区批量建房
     *
     * @param batchhouseVO 建房参数
     * @return 建房结果
     */
    @Override
    public R batchHouse(BatchhouseVO batchhouseVO) {
        String areaCode = batchhouseVO.getAreaCode();
        Integer integer = comMngStructHouseDAO.selectCount(new QueryWrapper<ComMngStructHouseDO>().lambda().eq(ComMngStructHouseDO::getParentCode, areaCode));
        if (null != integer && integer.intValue() > 0) {
            return R.fail("小区房屋已经存在，删除后批量创建或者使用编辑功能单独创建");
        }
       this.batchSaveHouse(batchhouseVO);
        return R.ok();
    }

    /**
     * 批量添加地址功能提取出一个公共方法
     * @param batchhouseVO 批量添加小区、同级（楼栋、单元、楼层、房间）
     */
    private void batchSaveHouse(BatchhouseVO batchhouseVO) {
        String areaCode = batchhouseVO.getAreaCode();
        ComMngStructHouseDO comMngStructHouseDO = comMngStructHouseDAO.selectOne(new QueryWrapper<ComMngStructHouseDO>().lambda().eq(ComMngStructHouseDO::getHouseCode, areaCode));
        String areaName = comMngStructHouseDO.getHouseName();//小区地址
        int buildingBegin = batchhouseVO.getBuildingBegin().intValue();
        int buildingEnd = batchhouseVO.getBuildingEnd().intValue();
        int unitBegin = batchhouseVO.getUnitBegin().intValue();
        int unitEnd = batchhouseVO.getUnitEnd().intValue();
        int floorBegin = batchhouseVO.getFloorBegin().intValue();
        int floorEnd = batchhouseVO.getFloorEnd().intValue();
        int doorBegin = batchhouseVO.getDoorBegin().intValue();
        int doorEnd = batchhouseVO.getDoorEnd().intValue();
        int isAccumulation = batchhouseVO.getIsAccumulation().intValue();
        String ruleFloor = batchhouseVO.getRuleFloor();
        String ruleConnector = batchhouseVO.getRuleConnector();
        String ruleDoor = batchhouseVO.getRuleDoor();
        List<ComMngStructHouseDO> comMngStructHouseDOList = new ArrayList<>();
        long buildCode = 510000;
        long unitCode = 410000;
        long floorCode = 310000;
        long doorCode = 210000;
        Integer type = batchhouseVO.getType();
        ComMngStructHouseDO comMngStructHouseDOParent = comMngStructHouseDAO.selectOne(new QueryWrapper<ComMngStructHouseDO>().lambda().eq(ComMngStructHouseDO::getHouseCode, batchhouseVO.getParentCode()));
//        2楼栋  3 单元 4楼层  5门牌号
        for (int i = buildingBegin; i <= buildingEnd; i++) {//楼栋
            ComMngStructHouseDO comMngStructHouseDO1 = new ComMngStructHouseDO();
            if (buildingBegin==buildingEnd&&null!=type&&type==3) {
                    comMngStructHouseDO1=comMngStructHouseDOParent;
            } else {
                comMngStructHouseDO1.setHouseName(areaName + i + "栋");
                comMngStructHouseDO1.setHouseCode(areaCode + (buildCode + i));
                comMngStructHouseDO1.setParentCode(areaCode);
                comMngStructHouseDO1.setType(2);
                comMngStructHouseDOList.add(comMngStructHouseDO1);
            }
            for (int m = unitBegin; m <= unitEnd; m++) {//单元
                ComMngStructHouseDO comMngStructHouseDO2 = new ComMngStructHouseDO();
                if (unitBegin==unitEnd&&null!=type&&type==4) {
                    comMngStructHouseDO2=comMngStructHouseDOParent;
                } else {
                    comMngStructHouseDO2.setType(3);
                    comMngStructHouseDO2.setParentCode(comMngStructHouseDO1.getHouseCode());
                    comMngStructHouseDO2.setHouseName(comMngStructHouseDO1.getHouseName() + m + "单元");
                    comMngStructHouseDO2.setHouseCode(comMngStructHouseDO1.getHouseCode() + (unitCode + m));
                    comMngStructHouseDOList.add(comMngStructHouseDO2);
                }
                int num = 0;//门牌累加时使用
                for (int k = floorBegin; k <= floorEnd; k++) {//楼层
                    ComMngStructHouseDO comMngStructHouseDO3 = new ComMngStructHouseDO();
                    if (floorBegin==floorEnd&&null!=type&&type==5) {
                        comMngStructHouseDO3=comMngStructHouseDOParent;
                    } else {
                        comMngStructHouseDO3.setType(4);
                        comMngStructHouseDO3.setParentCode(comMngStructHouseDO2.getHouseCode());
                        comMngStructHouseDO3.setHouseName(comMngStructHouseDO2.getHouseName() + "层");
                        comMngStructHouseDO3.setHouseCode(comMngStructHouseDO2.getHouseCode() + (floorCode + k));
                        comMngStructHouseDOList.add(comMngStructHouseDO3);
                    }
                    for (int h = doorBegin; h <= doorEnd; h++) {//门牌
                        num++;
                        ComMngStructHouseDO comMngStructHouseDO4 = new ComMngStructHouseDO();
                        comMngStructHouseDO4.setType(5);
                        comMngStructHouseDO4.setParentCode(comMngStructHouseDO3.getHouseCode());
                        String doorName = "";
                        String floorName = "";
//                        楼层规则
                        if (ruleFloor.equals("1")) {
                            floorName = k + "";
                        } else if (ruleFloor.equals("01")) {
                            if (k < 10) {
                                floorName = "0" + k;
                            } else {
                                floorName = "" + k;
                            }
                        } else {//001
                            if (k < 10) {
                                floorName = "00" + k;
                            } else if (k < 100) {
                                floorName = "0" + k;
                            } else {
                                floorName = "" + k;
                            }
                        }
//                        门牌规则
                        if (ruleDoor.equals("1")) {
                            if (isAccumulation == 1) {//累加
                                doorName = "" + num;
                            } else {
                                doorName = "" + h;
                            }
                        } else if (ruleDoor.equals("01")) {
                            if (k < 10) {
                                if (isAccumulation == 1) {//累加
                                    doorName = "0" + num;
                                } else {
                                    doorName = "" + h;
                                }
                            } else {
                                if (isAccumulation == 1) {//累加
                                    doorName = "0" + num;
                                } else {
                                    doorName = "" + h;
                                }
                            }

                        } else if (ruleDoor.equals("001")) {
                            if (k < 10) {
                                if (isAccumulation == 1) {//累加
                                    doorName = "00" + num;
                                } else {
                                    doorName = "00" + h;
                                }
                            } else if (k < 100) {
                                if (isAccumulation == 1) {//累加
                                    doorName = "0" + num;
                                } else {
                                    doorName = "0" + h;
                                }
                            } else {
                                if (isAccumulation == 1) {//累加
                                    doorName = "" + num;
                                } else {
                                    doorName = "" + h;
                                }
                            }
                        }
                        comMngStructHouseDO4.setHouseName(comMngStructHouseDO3.getHouseName() + floorName + ruleConnector + doorName);
                        comMngStructHouseDO4.setHouseCode(comMngStructHouseDO3.getHouseCode() + (doorCode + num));
                        comMngStructHouseDO4.setType(5);
                        comMngStructHouseDO4.setParentCode(comMngStructHouseDO3.getHouseCode());
                        comMngStructHouseDOList.add(comMngStructHouseDO4);
                    }
                }
            }
        }
        boolean b = this.saveBatch(comMngStructHouseDOList);
        if (b) {
            log.info("批量新增房屋地址数量【{}】", comMngStructHouseDOList.size());
        }
    }

    /**
     * 新增小区地址
     *
     * @param comMngStructAreaVO 小区地址
     */
    @Override
    public R addHouseArea(ComMngStructAreaVO comMngStructAreaVO) {
        ComMngStructHouseDO comMngStructHouseDO = new ComMngStructHouseDO();
        comMngStructHouseDO.setHouseCode(comMngStructAreaVO.getAreaCode());
        comMngStructHouseDO.setHouseName(comMngStructAreaVO.getAreaName());
        comMngStructHouseDO.setType(1);
        comMngStructHouseDO.setParentCode("0");
        int insert = comMngStructHouseDAO.insert(comMngStructHouseDO);
        if (insert > 0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 先删除小区小面所有房屋、删除用户和小区房屋的绑定关系
     *
     * @param comMngStructAreaVO 小区地址编码
     * @return 删除结果
     */
    @Override
    public R batchDeleteHouse(ComMngStructAreaVO comMngStructAreaVO) {
        String areaCode = comMngStructAreaVO.getAreaCode();
        try {
            int i = comMngStructHouseDAO.batchDeleteHouse(areaCode);//调用存储过程删除
            log.info("调用存储工程共删除地址数量【{}】", i);
        } catch (Exception e) {
            log.error(e.getMessage());
            return R.fail();
        }
        return R.ok();
    }

    /**
     * 展示下级建筑
     *
     * @param houseCode 房屋编号
     * @return 下级建筑列表
     */
    @Override
    public R listSubordinatebuilding(String houseCode) {
        List<ComMngStructHouseVO> comMngStructHouseVOS = new ArrayList<>();
        List<ComMngStructHouseDO> comMngStructHouseDOList = comMngStructHouseDAO.selectList(new QueryWrapper<ComMngStructHouseDO>().lambda().eq(ComMngStructHouseDO::getParentCode, houseCode));
        if (!ObjectUtils.isEmpty(comMngStructHouseDOList)) {
            ComMngStructHouseVO comMngStructHouseVO = new ComMngStructHouseVO();
            comMngStructHouseDOList.forEach(comMngStructHouseDO -> {
                int type = comMngStructHouseDO.getType().intValue();
                String houseCode1 = comMngStructHouseDO.getHouseCode();
                BeanUtils.copyProperties(comMngStructHouseDO, comMngStructHouseVO);
                if (type == 5) {
                    List<LoginUserInfoVO> loginUserInfoVOS = comMngStructHouseUserDAO.selectListHouseUser(houseCode1);
                    if (!ObjectUtils.isEmpty(loginUserInfoVOS)) {
                        String names = loginUserInfoVOS.stream().map(loginUserInfoVO -> loginUserInfoVO.getName()).collect(Collectors.joining());
                        String phones = loginUserInfoVOS.stream().map(loginUserInfoVO -> loginUserInfoVO.getPhone()).collect(Collectors.joining());
                        comMngStructHouseVO.setNames(names);
                        comMngStructHouseVO.setPhones(phones);
                    }
                }

                comMngStructHouseVOS.add(comMngStructHouseVO);
            });
        }
        return R.ok(comMngStructHouseVOS);
    }

    /**
     * 添加同级地址
     *
     * @param batchhouseVO 添加参数
     * @param comMngStructAreaDO  小区信息-规则
     * @return 添加结果
     */
    @Override
    public R addHouse(BatchhouseVO batchhouseVO, ComMngStructAreaDO comMngStructAreaDO) {
        int type = batchhouseVO.getType().intValue();
        String parentCode1 = batchhouseVO.getParentCode();
        List<ComMngStructHouseDO> comMngStructHouseDOList = comMngStructHouseDAO.selectList(new QueryWrapper<ComMngStructHouseDO>().lambda().eq(ComMngStructHouseDO::getType, type).eq(ComMngStructHouseDO::getParentCode, parentCode1));
        List<String> stringList = new ArrayList<>();
        if (!ObjectUtils.isEmpty(comMngStructHouseDOList)) {
            stringList = comMngStructHouseDOList.stream().map(comMngStructHouseDO -> comMngStructHouseDO.getHouseName()).collect(Collectors.toList());
        }
        int begin = 0, end = 0;
        String typeName = "";
//        2楼栋  3 单元 4楼层  5房间
        switch (type) {
            case 2:
                begin = batchhouseVO.getBuildingBegin().intValue();
                end = batchhouseVO.getBuildingEnd().intValue();
                typeName = "栋";
                break;
            case 3:
                begin = batchhouseVO.getUnitBegin();
                end = batchhouseVO.getUnitEnd();
                typeName = "单元";
                batchhouseVO.setBuildingBegin(1);
                batchhouseVO.setBuildingEnd(1);
                break;
            case 4:
                begin = batchhouseVO.getFloorBegin();
                end = batchhouseVO.getFloorEnd();
                typeName = "层";
                batchhouseVO.setBuildingBegin(1);
                batchhouseVO.setBuildingEnd(1);
                batchhouseVO.setUnitBegin(1);
                batchhouseVO.setUnitEnd(1);
                break;
            case 5:
                begin = batchhouseVO.getDoorBegin();
                end = batchhouseVO.getDoorEnd();
                batchhouseVO.setBuildingBegin(1);
                batchhouseVO.setBuildingEnd(1);
                batchhouseVO.setUnitBegin(1);
                batchhouseVO.setUnitEnd(1);
                batchhouseVO.setFloorBegin(1);
                batchhouseVO.setFloorEnd(1);
                break;
            default:
                break;
        }
        if (!ObjectUtils.isEmpty(stringList)) {
            for (int i = begin; i <= end; i++) {
                String address = i + typeName;
                if (stringList.contains(address)) {
                    return R.fail(address + "已经存在，请删除后重新添加");
                }
            }
        }
        this.batchSaveHouse(batchhouseVO);
        return R.ok();
    }

    /**
     * 编辑地址
     *
     * @param comMngStructHouseVO 编辑内容
     * @return 编辑结果
     */
    @Override
    public R putHouse(ComMngStructHouseVO comMngStructHouseVO) {
        ComMngStructHouseDO comMngStructHouseDO = new ComMngStructHouseDO();
        comMngStructHouseDO.setSquare(comMngStructHouseVO.getSquare());
        int update = comMngStructHouseDAO.update(comMngStructHouseDO, new UpdateWrapper<ComMngStructHouseDO>().lambda().eq(ComMngStructHouseDO::getHouseCode, comMngStructHouseVO.getHouseCode()));
        if (update > 0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 删除地址
     *
     * @param comMngStructHouseVO 删除指定地址和所有下级
     * @return 删除结果
     */
    @Override
    public R deleteHouse(ComMngStructHouseVO comMngStructHouseVO) {
        String houseCode = comMngStructHouseVO.getHouseCode();
        int i = comMngStructHouseDAO.batchDeleteHouse(houseCode);
        if (i > 0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 房屋地址下拉列表
     *
     * @param parentCode 父级编码
     * @return 下级列表
     */
    @Override
    public R putVolunteerPhone(String parentCode) {
        List<ComMngStructHouseVO> comMngStructHouseVOS = new ArrayList<>();
        List<ComMngStructHouseDO> comMngStructHouseDOList = comMngStructHouseDAO.selectList(new QueryWrapper<ComMngStructHouseDO>().lambda().eq(ComMngStructHouseDO::getParentCode, parentCode));
        if (!ObjectUtils.isEmpty(comMngStructHouseDOList)) {
            ComMngStructHouseVO comMngStructHouseVO = new ComMngStructHouseVO();
            comMngStructHouseDOList.forEach(comMngStructHouseDO -> {
                BeanUtils.copyProperties(comMngStructHouseDO, comMngStructHouseVO);
                comMngStructHouseVOS.add(comMngStructHouseVO);
            });
        }
        return R.ok(comMngStructHouseVOS);
    }

    /**
     * 新增房屋
     *
     * @param comMngStructHouseVO 房屋信息
     * @return 新增结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R addHouses(ComMngStructHouseVO comMngStructHouseVO) {
        String houseCode = comMngStructHouseVO.getHouseCode();
        Integer states1 = comMngStructHouseVO.getStates();
        ComMngStructHouseDO comMngStructHouseDO1 = comMngStructHouseDAO.selectOne(new QueryWrapper<ComMngStructHouseDO>().lambda().eq(ComMngStructHouseDO::getHouseCode, houseCode));
        if (ObjectUtils.isEmpty(comMngStructHouseDO1)) {
            return R.fail("房屋不存在");
        }
        Integer states = comMngStructHouseDO1.getStates();
        if (null != states && 0 != states.intValue()) {
            if (states1.intValue() != states.intValue()) {
                return R.fail("房屋已经被绑定了,请通过意见反馈联系后台处理");
            }
        }
        ComMngStructHouseDO comMngStructHouseDO = new ComMngStructHouseDO();
        comMngStructHouseDO.setSquare(comMngStructHouseVO.getSquare());
        comMngStructHouseDO.setStates(states1);
        comMngStructHouseDO.setId(comMngStructHouseDO1.getId());
        int update = comMngStructHouseDAO.updateById(comMngStructHouseDO);
        if (update == 0) {
            return R.fail("修改房屋面积、状态失败");
        }
        ComMngStructHouseUserDO comMngStructHouseUserDO = new ComMngStructHouseUserDO();
        comMngStructHouseUserDO.setUserId(comMngStructHouseVO.getUserId());
        comMngStructHouseUserDO.setIdentity(comMngStructHouseVO.getIdentity());
        ComMngStructHouseDO comMngStructHouseDO2 = comMngStructHouseDAO.selectById(comMngStructHouseVO.getAreaId());
        comMngStructHouseUserDO.setAreaCode(comMngStructHouseDO2.getHouseCode());
        int insert = comMngStructHouseUserDAO.insert(comMngStructHouseUserDO);
        if (insert > 0) {
            return R.ok();
        }
        throw new RuntimeException("绑定房屋和人员关系失败");
    }


}

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

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

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngStructBuildTypeVO;
import com.panzhihua.common.model.vos.community.ComMngStructOtherBuildVO;
import com.panzhihua.service_community.dao.ComMngStructBuildTypeDAO;
import com.panzhihua.service_community.dao.ComMngStructOtherBuildDAO;
import com.panzhihua.service_community.model.dos.ComMngStructBuildTypeDO;
import com.panzhihua.service_community.model.dos.ComMngStructOtherBuildDO;
import com.panzhihua.service_community.service.ComMngStructOtherBuildService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: ComMngStructOtherBuildService
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-16 15:27
 **/
@Service
public class ComMngStructOtherBuildServiceImpl implements ComMngStructOtherBuildService {
    @Resource
    private ComMngStructOtherBuildDAO comMngStructOtherBuildDAO;
    @Resource
    private ComMngStructBuildTypeDAO comMngStructBuildTypeDAO;

    /**
     * 新增其他建筑
     *
     * @param comMngStructOtherBuildVO 建筑参数
     * @return 新增结果
     */
    @Override
    public R addOtherbuild(ComMngStructOtherBuildVO comMngStructOtherBuildVO) {
        ComMngStructOtherBuildDO comMngStructOtherBuildDO=new ComMngStructOtherBuildDO();
        BeanUtils.copyProperties(comMngStructOtherBuildVO,comMngStructOtherBuildDO);
        int insert = comMngStructOtherBuildDAO.insert(comMngStructOtherBuildDO);
        if (insert>0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 查询所有建筑类型
     *
     * @return 类型列表
     */
    @Override
    public R listBuildType() {
        List<ComMngStructBuildTypeVO>comMngStructBuildTypeVOS=new ArrayList<>();
        List<ComMngStructBuildTypeDO> comMngStructBuildTypeDOS = comMngStructBuildTypeDAO.selectList(null);
        if (!ObjectUtils.isEmpty(comMngStructBuildTypeDOS)) {
            ComMngStructBuildTypeVO comMngStructBuildTypeVO=new ComMngStructBuildTypeVO();
            comMngStructBuildTypeDOS.forEach(comMngStructBuildTypeDO -> {
                BeanUtils.copyProperties(comMngStructBuildTypeDO,comMngStructBuildTypeVO);
                comMngStructBuildTypeVOS.add(comMngStructBuildTypeVO);
            });
        }
        return R.ok(comMngStructBuildTypeVOS);
    }

    /**
     * 分页查询 其他建筑
     *
     * @param comMngStructOtherBuildVO 分页查询参数
     * @return 查询结果
     */
    @Override
    public R pageOtherBuild(ComMngStructOtherBuildVO comMngStructOtherBuildVO) {
        Page page = new Page<>();
        Long pageNum = comMngStructOtherBuildVO.getPageNum();
        Long pageSize = comMngStructOtherBuildVO.getPageSize();
        if (ObjectUtils.isEmpty(pageNum)||0==pageNum) {
            pageNum = 1l;
        }
        if (ObjectUtils.isEmpty(pageSize)||0==pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComMngStructOtherBuildVO> iPage = comMngStructOtherBuildDAO.pageOtherBuild(page, comMngStructOtherBuildVO);
        return R.ok(iPage);
    }
}

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

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

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.service_community.dao.ComMngVolunteerMngDAO;
import com.panzhihua.service_community.model.dos.ComMngVolunteerMngDO;
import com.panzhihua.service_community.service.ComMngVolunteerMngService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 志愿者
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-17 09:23
 **/
@Service
public class ComMngVolunteerMngServiceImpl implements ComMngVolunteerMngService {
    @Resource
    private ComMngVolunteerMngDAO comMngVolunteerMngDAO;
    /**
     * 增加志愿者
     *
     * @param comMngVolunteerMngVO 志愿者信息
     * @return 增加结果
     */
    @Override
    public R addVolunteer(ComMngVolunteerMngVO comMngVolunteerMngVO) {
        String phone = comMngVolunteerMngVO.getPhone();
        Integer integer = comMngVolunteerMngDAO.selectCount(new QueryWrapper<ComMngVolunteerMngDO>().lambda().eq(ComMngVolunteerMngDO::getPhone, phone));
        if (null!=integer&&integer.intValue()>0) {
            return R.fail("手机号已经存在");
        }
        ComMngVolunteerMngDO comMngVolunteerMngDO=new ComMngVolunteerMngDO();
        int insert = comMngVolunteerMngDAO.insert(comMngVolunteerMngDO);
        if (insert>0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 删除志愿者
     *
     * @param comMngVolunteerMngVO 手机号
     * @return 删除结果
     */
    @Override
    public R deleteVolunteer(ComMngVolunteerMngVO comMngVolunteerMngVO) {
        int delete = comMngVolunteerMngDAO.delete(new QueryWrapper<ComMngVolunteerMngDO>().lambda().eq(ComMngVolunteerMngDO::getPhone, comMngVolunteerMngVO.getPhone()));
        if (delete>0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 编辑志愿者
     *
     * @param comMngVolunteerMngVO 编辑内容
     * @return 编辑结果
     */
    @Override
    public R putVolunteer(ComMngVolunteerMngVO comMngVolunteerMngVO) {
        ComMngVolunteerMngDO comMngVolunteerMngDO=new ComMngVolunteerMngDO();
        BeanUtils.copyProperties(comMngVolunteerMngVO,comMngVolunteerMngDO);
        int update = comMngVolunteerMngDAO.updateById(comMngVolunteerMngDO);
        if (update>0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 分页展示志愿者
     *
     * @param comMngVolunteerMngVO 查询参数
     * @return 分页集合返回
     */
    @Override
    public R pageVolunteer(ComMngVolunteerMngVO comMngVolunteerMngVO) {
        Page page = new Page<>();
        Long pageNum = comMngVolunteerMngVO.getPageNum();
        Long pageSize = comMngVolunteerMngVO.getPageSize();
        if (ObjectUtils.isEmpty(pageNum)||0==pageNum) {
            pageNum = 1l;
        }
        if (ObjectUtils.isEmpty(pageSize)||0==pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComMngVolunteerMngVO> iPage = comMngVolunteerMngDAO.pageVolunteer(page, comMngVolunteerMngVO);
        return R.ok(iPage);
    }

    /**
     * 分页展示志愿者审核
     *
     * @param comMngVolunteerMngVO 查询参数
     * @return 查询结果
     */
    @Override
    public R pageVolunteerExamine(ComMngVolunteerMngVO comMngVolunteerMngVO) {
        Page page = new Page<>();
        Long pageNum = comMngVolunteerMngVO.getPageNum();
        Long pageSize = comMngVolunteerMngVO.getPageSize();
        if (ObjectUtils.isEmpty(pageNum)||0==pageNum) {
            pageNum = 1l;
        }
        if (ObjectUtils.isEmpty(pageSize)||0==pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComMngVolunteerMngVO> iPage = comMngVolunteerMngDAO.pageVolunteerExamine(page, comMngVolunteerMngVO);
        return R.ok(iPage);
    }

    /**
     * 志愿者审核详情
     *
     * @param id 主键
     * @return 详情
     */
    @Override
    public R detailVolunteerExamine(Long id) {
        ComMngVolunteerMngDO comMngVolunteerMngDO = comMngVolunteerMngDAO.selectById(id);
        if (ObjectUtils.isEmpty(comMngVolunteerMngDO)) {
            return R.fail("审核不存在");
        }
        ComMngVolunteerMngVO comMngVolunteerMngVO=new ComMngVolunteerMngVO();
        BeanUtils.copyProperties(comMngVolunteerMngDO,comMngVolunteerMngVO);
        return R.ok(comMngVolunteerMngVO);
    }

    /**
     * 志愿者审核
     *
     * @param comMngVolunteerMngVO 审核操作
     * @return 审核结果
     */
    @Override
    public R putVolunteerExamine(ComMngVolunteerMngVO comMngVolunteerMngVO) {
        ComMngVolunteerMngDO comMngVolunteerMngDO=new ComMngVolunteerMngDO();
        BeanUtils.copyProperties(comMngVolunteerMngVO,comMngVolunteerMngDO);
        int update = comMngVolunteerMngDAO.updateById(comMngVolunteerMngDO);
        if (update>0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 删除志愿者审核
     *
     * @param comMngVolunteerMngVO 主键
     * @return 删除结果
     */
    @Override
    public R deleteVolunteerExamine(ComMngVolunteerMngVO comMngVolunteerMngVO) {
        int delete = comMngVolunteerMngDAO.deleteById(comMngVolunteerMngVO.getId());
        if (delete>0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 用户修改手机号对应的志愿者手机号也要修改
     *
     * @param userPhoneVO 新旧手机号
     * @return 修改结果
     */
    @Override
    public R putVolunteerPhone(UserPhoneVO userPhoneVO) {
        ComMngVolunteerMngDO comMngVolunteerMngDO=new ComMngVolunteerMngDO();
        comMngVolunteerMngDO.setPhone(userPhoneVO.getNewPhone());
        int update = comMngVolunteerMngDAO.update(comMngVolunteerMngDO, new UpdateWrapper<ComMngVolunteerMngDO>().lambda().eq(ComMngVolunteerMngDO::getPhone, userPhoneVO.getOldPhone()));
        if (update>0) {
            return R.ok();
        }
        return R.fail();
    }




}

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

@@ -32,9 +32,9 @@
     * @return 党组织集合
     */
    @PostMapping("listpartyorganization")
    public List<PartyOrganizationVO> listPartyOrganization(){
    public R listPartyOrganization(){
        List<PartyOrganizationVO> partyOrganizationVOS=partyOrganizationService.listPartyOrganization();
        return partyOrganizationVOS;
        return R.ok(partyOrganizationVOS);
    }
    /**
     * 新增党员
@@ -122,7 +122,7 @@
     * @return 党员列表
     */
    @PostMapping("listPartyMember")
    public R listPartyMember(@RequestParam("communityId")Integer communityId){
    public R listPartyMember(@RequestParam("communityId")Long communityId){
        R r=comPbMemberService.listPartyMember(communityId);
        return r;
    }

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

@@ -1,5 +1,7 @@
package com.panzhihua.service_dangjian.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

@@ -20,6 +22,7 @@
    /**
     * id
     */
    @TableId(type= IdType.AUTO)
    private Long id;

    /**

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

@@ -1,5 +1,7 @@
package com.panzhihua.service_dangjian.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

@@ -20,6 +22,7 @@
    /**
     * id
     */
    @TableId(type= IdType.AUTO)
    private Long id;

    /**

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

@@ -1,5 +1,7 @@
package com.panzhihua.service_dangjian.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

@@ -18,6 +20,7 @@
    /**
     * 党组织id
     */
    @TableId(type= IdType.AUTO)
    private Long id;

    /**

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

@@ -45,7 +45,7 @@
     * @param communityId 社区id
     * @return 党员列表
     */
    R listPartyMember(Integer communityId);
    R listPartyMember(Long communityId);
    /**
     * 新增党委
     * @param partyCommitteeVO 新增信息

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

@@ -186,7 +186,7 @@
     * @return 党员列表
     */
    @Override
    public R listPartyMember(Integer communityId) {
    public R listPartyMember(Long communityId) {
        List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectList(null);
        if (ObjectUtils.isEmpty(comPbMemberDOS)) {
           return R.ok();

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

@@ -3,6 +3,8 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.ChangePasswordVO;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.service_user.service.UserService;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -102,5 +104,142 @@
        return userService.listActivityManager(param,communityId);
    }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

File was deleted

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

@@ -2,8 +2,13 @@


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.service_user.model.dos.SysUserDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -13,4 +18,72 @@
 **/
@Mapper
public interface UserDao extends BaseMapper<SysUserDO> {
    //    @Select("<script> " +
//            " <where>" +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            " </where>" +
//            "</script>")

    @Select("<script> " +
            "SELECT\n" +
            "u.user_id,\n" +
            "u.face_url,\n" +
            "u.nick_name,\n" +
            "u.`name`,\n" +
            "u.phone,\n" +
            "u.id_card,\n" +
            "u.face_state,\n" +
            "c.NAME,\n" +
            "is_tanant,\n" +
            "u.create_at \n" +
            "FROM\n" +
            "sys_user u\n" +
            "JOIN com_act c ON u.community_id = c.community_id \n" +
            "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != &quot;&quot;'>" +
            "AND c.`name` = #{loginUserInfoVO.name} \n" +
            " </if> " +
            " <where>" +
            "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
            "and u.`name` = #{loginUserInfoVO.communityName} \n" +
            " </if> " +
            "<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != &quot;&quot;'>" +
            "AND u.phone = #{loginUserInfoVO.phone}"+
            " </if> " +
            " </where>" +
            " order by u.face_state asc,u.create_at asc "+
            "</script>")
    IPage<LoginUserInfoVO> pageUserFace(Page page, @Param("loginUserInfoVO") LoginUserInfoVO loginUserInfoVO);
    @Select("<script> " +
            "SELECT\n" +
            "u.user_id,\n" +
            "u.`name`,\n" +
            "u.nick_name,\n" +
            "u.phone,\n" +
            "u.id_card,\n" +
            "u.job,\n" +
            "c.NAME,\n" +
            "u.is_tanant,\n" +
            "u.tags,\n" +
            "u.create_at \n" +
            "FROM\n" +
            "sys_user u\n" +
            "LEFT JOIN com_act c ON u.community_id = c.community_id \n" +
            "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
            "AND c.`name` = #{loginUserInfoVO.communityName} \n" +
            " </if> " +
            " <where>" +
            "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != &quot;&quot;'>" +
            " and u.`name` = #{loginUserInfoVO.name} \n" +
            " </if> " +
            "<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != &quot;&quot;'>" +
            "AND u.phone = #{loginUserInfoVO.phone}"+
            " </if> " +
        " </where>" +
        "</script>")
    IPage<LoginUserInfoVO> pageUser(Page page, @Param("loginUserInfoVO")LoginUserInfoVO loginUserInfoVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngFamilyInfoDO.java

@@ -1,11 +1,10 @@
package com.panzhihua.service_user.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

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

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -25,42 +24,54 @@
    private Long id;

    /**
     * 丈夫 人员信息id
     */
    private Long husbandId;

    /**
     * 妻子 人员信息id
     */
    private Long wifeId;

    /**
     * 父亲 人员信息id
     */
    private Long fatherId;

    /**
     * 母亲 人员信息id
     */
    private Long motherId;

    /**
     * 子女 人员信息id列表信息，以逗号分隔
     */
    private String childrenIds;

    /**
     * 岳父 人员 id
     */
    private Long fatherInLawId;

    /**
     * 岳母 人员 id
     */
    private Long motherInLawId;

    /**
     * 本人id
     */
    private Long userId;

    /**
     * 与本人关系
     */
    private String relationship;

    /**
     * 名字
     */
    private String name;

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

    /**
     * 手机号
     */
    private String phone;

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

    /**
     * 健康状况
     */
    private String health;

    /**
     * 工作
     */
    private String job;

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

    /**
     * update_at
     */
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngJobSetDO.java

File was deleted

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngUserTagDO.java

@@ -1,5 +1,10 @@
package com.panzhihua.service_user.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;

/**
@@ -8,6 +13,8 @@
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-14 17:25
 **/
@Data
@TableName("com_mng_user_tag")
public class ComMngUserTagDO implements Serializable {

    private static final long serialVersionUID = 1L;
@@ -15,6 +22,7 @@
    /**
     * 自增id
     */
    @TableId(type= IdType.AUTO)
    private Long id;

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysDeptDO.java

@@ -1,5 +1,7 @@
package com.panzhihua.service_user.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@@ -16,6 +18,7 @@
    private static final long serialVersionUID = 1L;

    /** 部门ID */
    @TableId(type= IdType.AUTO)
    private Long deptId;

    /** 父部门ID */

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java

@@ -25,16 +25,9 @@
    /**
     * user_id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type=IdType.AUTO)
    private Long userId;
    /**
     *会话密钥
     */
    private String sessionKey;
    /**
     *用户在开放平台的唯一标识符
     */
    private String unionid;

    /**
     * 登录账户
     */
@@ -49,6 +42,16 @@
     * 微信小程序唯一标识
     */
    private String openid;

    /**
     * 会话密钥
     */
    private String sessionKey;

    /**
     * 用户在开放平台的唯一标识符
     */
    private String unionid;

    /**
     * 手机号
@@ -86,12 +89,12 @@
    private Date birthday;

    /**
     * image_url
     * 头像
     */
    private String imageUrl;

    /**
     * type 用户类型 1 小程序 2 运营平台 3 社区平台
     * 用户类型 1 小程序 2 运营平台 3 社区平台
     */
    private Integer type;

@@ -101,12 +104,12 @@
    private String job;

    /**
     * 是否志愿者 1 是 2 否
     * 是否志愿者 0 否 1 是
     */
    private Integer isVolunteer;

    /**
     * 是否党员 1 是 2 否
     * 是否党员 0 否 1 是
     */
    private Integer isPartymember;

@@ -118,41 +121,41 @@
    /**
     * 创建时间
     */
    private Date createTime;
    private Date createAt;

    /**
     * last_login_time
     * 最后登录时间
     */
    private Date lastLoginTime;

    /** 部门对象 */
    @TableField(exist = false)
    private SysDeptDO dept;
    /**
     * 标签id 多个用,隔开
     */
    private String tags;

    /** 角色对象 */
    @TableField(exist = false)
    private List<SysRoleDO> roles;
    /**
     * 家庭id
     */
    private Long familyId;

    /** 角色组 */
    @TableField(exist = false)
    private Long[] roleIds;
    /**
     * 人脸采集照片url
     */
    private String faceUrl;

    /** 岗位组 */
    @TableField(exist = false)
    private Long[] postIds;
    /**
     * 人脸采集审核状态 0 待审核 1 审核通过 2驳回
     */
    private Integer faceState;

    public SysUserDO()
    {

    }
    public static boolean isAdmin(Long userId)
    {
        return userId != null && 1l== userId;
    }
    public boolean isAdmin()
    {
        return isAdmin(this.userId);
    }
    /**
     * 驳回原因
     */
    private String rejectReson;
    /**
     * 小区id
     */
    private long areaId;


}

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

@@ -3,6 +3,8 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.ChangePasswordVO;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -64,4 +66,88 @@
     * @return 人员集合
     */
    R listActivityManager(String param, Long communityId);
    /**
     *分页查询人脸识别
     * @param loginUserInfoVO 查询参数
     * @return 分页集合
     */
    R pageUserFace(LoginUserInfoVO loginUserInfoVO);
    /**
     * 编辑人脸采集数据通过、驳回、删除
     * @param loginUserInfoVO 操作信息
     * @return 操作结果
     */
    R putUserFace(LoginUserInfoVO loginUserInfoVO);
    /**
     *分页查询人口管理
     * @param loginUserInfoVO 查询参数
     * @return 分页数据
     */
    R pageUser(LoginUserInfoVO loginUserInfoVO);
    /**
     * 查询所有人员标签
     * @return 标签集合
     */
    R listTag();
    /**
     * 人员详情
     * @param userId 用户id
     * @return 人员详情
     */
    R detailUser(Long userId);
    /**
     * 设置用户标签
     * @param loginUserInfoVO 标签信息
     * @return 设置结果
     */
    R putUserTag(LoginUserInfoVO loginUserInfoVO);
    /**
     * 修改用户志愿者状态
     * @param phone 志愿者手机号
     * @param type 1是志愿者 0 不是
     */
    R putUserIsVolunteer(String phone, int type);
    /**
     * 用户绑定社区、小区
     * @param loginUserInfoVO 社区小区数据
     * @return 绑定结果
     */
    R putUserCommunityArea(LoginUserInfoVO loginUserInfoVO);
    /**
     * 用户实名认证
     * @param loginUserInfoVO 认证数据
     * @return 认证结果
     */
    R putUserAuthentication(LoginUserInfoVO loginUserInfoVO);
    /**
     * 修改用户手机号
     * @param userPhoneVO 手机号信息
     * @return 修改结果
     */
    R putUserphone(UserPhoneVO userPhoneVO);
    /**
     * 修改用户信息
     * @param loginUserInfoVO 修改内容
     * @return 修改结果
     */
    R putUser(LoginUserInfoVO loginUserInfoVO);

    /**
     * 家庭成员列表
     * @param userId 登录用户
     * @return 成员集合
     */
    R listFamily(Long userId);
    /**
     * 新增家庭成员
     * @param comMngFamilyInfoVO 家庭成员基本信息
     * @return 增加结果
     */
    R addFamily(ComMngFamilyInfoVO comMngFamilyInfoVO);
    /**
     * 编辑家庭成员
     * @param comMngFamilyInfoVO 家庭成员信息
     * @return 编辑结果
     */
    R putFamily(ComMngFamilyInfoVO comMngFamilyInfoVO);
}

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

@@ -2,23 +2,35 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
import com.panzhihua.common.model.vos.user.ChangePasswordVO;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.service_user.dao.ComMngFamilyInfoDAO;
import com.panzhihua.service_user.dao.ComMngUserTagDAO;
import com.panzhihua.service_user.dao.RoleDAO;
import com.panzhihua.service_user.dao.UserDao;
import com.panzhihua.service_user.model.dos.ComMngFamilyInfoDO;
import com.panzhihua.service_user.model.dos.ComMngUserTagDO;
import com.panzhihua.service_user.model.dos.SysRoleDO;
import com.panzhihua.service_user.model.dos.SysUserDO;
import com.panzhihua.service_user.service.UserService;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -32,6 +44,13 @@
    private UserDao userDao;
    @Resource
    private RoleDAO roleDAO;
    @Resource
    private ComMngUserTagDAO comMngUserTagDAO;
    @Resource
    private ComMngFamilyInfoDAO comMngFamilyInfoDAO;
    @Resource
    private StringRedisTemplate stringRedisTemplate;


    /**
     * 小程序微信用户信息更新
@@ -53,7 +72,7 @@
            sysUserDO1.setOpenid(openid);
            sysUserDO1.setUnionid(unionid);
            sysUserDO1.setSessionKey(sessionKey);
            sysUserDO1.setCreateTime(date);
            sysUserDO1.setCreateAt(date);
            sysUserDO1.setLastLoginTime(date);
            sysUserDO1.setPassword(encode);
            sysUserDO1.setType(1);
@@ -229,6 +248,318 @@
        return R.ok(activityManagerVOS);
    }

    /**
     * 分页查询人脸识别
     *
     * @param loginUserInfoVO 查询参数
     * @return 分页集合
     */
    @Override
    public R pageUserFace(LoginUserInfoVO loginUserInfoVO) {
        Page page = new Page<>();
        Long pageNum = loginUserInfoVO.getPageNum();
        Long pageSize = loginUserInfoVO.getPageSize();
        if (ObjectUtils.isEmpty(pageNum)||0==pageNum) {
            pageNum = 1l;
        }
        if (ObjectUtils.isEmpty(pageSize)||0==pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<LoginUserInfoVO> iPage = userDao.pageUserFace(page, loginUserInfoVO);
        return R.ok(iPage);
    }

    /**
     * 编辑人脸采集数据通过、驳回、删除
     *
     * @param loginUserInfoVO 操作信息
     * @return 操作结果
     */
    @Override
    public R putUserFace(LoginUserInfoVO loginUserInfoVO) {
        int operationType = loginUserInfoVO.getOperationType().intValue();
        Long userId = loginUserInfoVO.getUserId();
        SysUserDO sysUserDO=new SysUserDO();
        sysUserDO.setUserId(userId);
        switch (operationType){
            case 1:
                sysUserDO.setFaceState(1);
                break;
            case 2:
                sysUserDO.setFaceState(3);
                break;
            case 3:
                break;
            default:
                break;
        }
        int num=0;
        if (operationType==3) {
            num=userDao.deleteById(userId);
        } else {
            num=userDao.updateById(sysUserDO);
        }
        if (num>0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 分页查询人口管理
     *
     * @param loginUserInfoVO 查询参数
     * @return 分页数据
     */
    @Override
    public R pageUser(LoginUserInfoVO loginUserInfoVO) {
        Page page = new Page<>();
        Long pageNum = loginUserInfoVO.getPageNum();
        Long pageSize = loginUserInfoVO.getPageSize();
        if (ObjectUtils.isEmpty(pageNum)||0==pageNum) {
            pageNum = 1l;
        }
        if (ObjectUtils.isEmpty(pageSize)||0==pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<LoginUserInfoVO> iPage = userDao.pageUser(page, loginUserInfoVO);
        return R.ok(iPage);
    }

    /**
     * 查询所有人员标签
     *
     * @return 标签集合
     */
    @Override
    public R listTag() {
        List<String> list=new ArrayList<>();
        List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(null);
        if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
            list=comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
        }
        return R.ok(list);
    }

    /**
     * 人员详情
     *
     * @param userId 用户id
     * @return 人员详情
     */
    @Override
    public R detailUser(Long userId) {
        SysUserDO sysUserDO = userDao.selectById(userId);
        if (ObjectUtils.isEmpty(sysUserDO)) {
            return R.fail("人员不存在");
        }
        LoginUserInfoVO loginUserInfoVO=new LoginUserInfoVO();
        BeanUtils.copyProperties(sysUserDO,loginUserInfoVO);
        List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO.selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
        if (!ObjectUtils.isEmpty(comMngFamilyInfoDOS)) {
            List<ComMngFamilyInfoVO>comMngFamilyInfoVOS=new ArrayList<>();
            comMngFamilyInfoDOS.forEach(comMngFamilyInfoDO -> {
                ComMngFamilyInfoVO comMngFamilyInfoVO=new ComMngFamilyInfoVO();
                BeanUtils.copyProperties(comMngFamilyInfoDO,comMngFamilyInfoVO);
                comMngFamilyInfoVOS.add(comMngFamilyInfoVO);
            });
            loginUserInfoVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
        }
        return R.ok(loginUserInfoVO);
    }

    /**
     * 设置用户标签
     *
     * @param loginUserInfoVO 标签信息
     * @return 设置结果
     */
    @Override
    public R putUserTag(LoginUserInfoVO loginUserInfoVO) {
        SysUserDO sysUserDO=new SysUserDO();
        sysUserDO.setUserId(loginUserInfoVO.getUserId());
        sysUserDO.setTags(loginUserInfoVO.getTags());
        int update = userDao.updateById(sysUserDO);
        if (update>0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 修改用户志愿者状态
     *
     * @param phone 志愿者手机号
     * @param type
     */
    @Override
    public R putUserIsVolunteer(String phone, int type) {
        SysUserDO sysUserDO=new SysUserDO();
        sysUserDO.setIsVolunteer(type);
        int update = userDao.update(sysUserDO, new UpdateWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, phone));
        if (update>0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 用户绑定社区、小区
     *
     * @param loginUserInfoVO 社区小区数据
     * @return 绑定结果
     */
    @Override
    public R putUserCommunityArea(LoginUserInfoVO loginUserInfoVO) {
        SysUserDO sysUserDO=new SysUserDO();
        sysUserDO.setCommunityId(loginUserInfoVO.getCommunityId());
        sysUserDO.setAreaId(loginUserInfoVO.getAreaId());
        sysUserDO.setUserId(loginUserInfoVO.getUserId());
        int update = userDao.updateById(sysUserDO);
        if (update>0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 用户实名认证
     *
     * @param loginUserInfoVO 认证数据
     * @return 认证结果
     */
    @Override
    public R putUserAuthentication(LoginUserInfoVO loginUserInfoVO) {
        SysUserDO sysUserDO=new SysUserDO();
        sysUserDO.setName(loginUserInfoVO.getName());
        sysUserDO.setIdCard(loginUserInfoVO.getIdCard());
        sysUserDO.setSex(loginUserInfoVO.getSex());
        sysUserDO.setBirthday(loginUserInfoVO.getBirthday());
        sysUserDO.setJob(loginUserInfoVO.getJob());
        sysUserDO.setUserId(loginUserInfoVO.getUserId());
        sysUserDO.setFaceUrl(loginUserInfoVO.getFaceUrl());
        sysUserDO.setFaceState(0);
        int update = userDao.updateById(sysUserDO);
        if (update>0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 修改用户手机号
     *
     * @param userPhoneVO 手机号信息
     * @return 修改结果
     */
    @Override
    public R putUserphone(UserPhoneVO userPhoneVO) {
        String oldPhone = userPhoneVO.getOldPhone();
        String newPhone = userPhoneVO.getNewPhone();
        String smsCode = userPhoneVO.getSmsCode();
        if (oldPhone.equals(newPhone)) {
            return R.fail("新旧手机号不能重复");
        }
        String key = UserConstants.PHONE_PUT + newPhone;
        Boolean hasKey = stringRedisTemplate.hasKey(key);
        if (!hasKey) {
            return R.fail("重新发送验证码");
        }
        SysUserDO sysUserDO1 = userDao.selectById(userPhoneVO.getUserId());
        String phone = sysUserDO1.getPhone();
        if (!phone.equals(oldPhone)) {
            return R.fail("旧手机号错误");
        }
        ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
        String code = valueOperations.get(key);
        if (!code.equals(smsCode)) {
            return R.fail("验证码错误");
        }
        SysUserDO sysUserDO=new SysUserDO();
        sysUserDO.setUserId(userPhoneVO.getUserId());
        sysUserDO.setPhone(newPhone);
        int update = userDao.updateById(sysUserDO);
        if (update>0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 修改用户信息
     *
     * @param loginUserInfoVO 修改内容
     * @return 修改结果
     */
    @Override
    public R putUser(LoginUserInfoVO loginUserInfoVO) {
        SysUserDO sysUserDO=new SysUserDO();
        BeanUtils.copyProperties(loginUserInfoVO,sysUserDO);
        int update = userDao.updateById(sysUserDO);
        if (update>0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 家庭成员列表
     *
     * @param userId 登录用户
     * @return 成员集合
     */
    @Override
    public R listFamily(Long userId) {
        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 -> {
                ComMngFamilyInfoVO comMngFamilyInfoVO=new ComMngFamilyInfoVO();
                BeanUtils.copyProperties(comMngFamilyInfoDO,comMngFamilyInfoVO);
                comMngFamilyInfoVOS.add(comMngFamilyInfoVO);
            });
        }
        return R.ok(comMngFamilyInfoVOS);
    }

    /**
     * 新增家庭成员
     *
     * @param comMngFamilyInfoVO 家庭成员基本信息
     * @return 增加结果
     */
    @Override
    public R addFamily(ComMngFamilyInfoVO comMngFamilyInfoVO) {
        ComMngFamilyInfoDO comMngFamilyInfoDO=new ComMngFamilyInfoDO();
        BeanUtils.copyProperties(comMngFamilyInfoVO,comMngFamilyInfoDO);
        int insert = comMngFamilyInfoDAO.insert(comMngFamilyInfoDO);
        if (insert>0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 编辑家庭成员
     *
     * @param comMngFamilyInfoVO 家庭成员信息
     * @return 编辑结果
     */
    @Override
    public R putFamily(ComMngFamilyInfoVO comMngFamilyInfoVO) {
        ComMngFamilyInfoDO comMngFamilyInfoDO=new ComMngFamilyInfoDO();
        BeanUtils.copyProperties(comMngFamilyInfoDO,comMngFamilyInfoVO);
        int update = comMngFamilyInfoDAO.updateById(comMngFamilyInfoDO);
        if (update>0) {
            return R.ok();
        }
        return R.fail();
    }

    public static void main(String[] args) {
        String encode = new BCryptPasswordEncoder().encode("123456");
        System.out.println(encode);

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

@@ -144,8 +144,12 @@
                    String hexStr = AES.parseByte2HexStr(encrypt);
                    safeboxRequestWrapper.addHeader(TokenConstant.TOKEN_USERINFO, hexStr);
                }else{
                    R<LoginUserInfoVO> userInfoByUserId = userService.getUserInfoByUserId(username);
                    LoginUserInfoVO data = userInfoByUserId.getData();
                    R<LoginUserInfoVO> r = userService.getUserInfoByUserId(username);
                    if (!R.isOk(r)) {
                        ResultUtil.responseJson(response, R.fail(HttpStatus.ERROR, "登录用户信息查询失败"));
                        return;
                    }
                    LoginUserInfoVO data = r.getData();
                    String userInfo = JSONObject.toJSONString(data);
                    valueOperations.set(userKey,userInfo,24,TimeUnit.HOURS);
                    byte[] encrypt = AES.encrypt(userInfo, Constants.AES_KEY);