实有人口优化

huanghongfa

2021-05-25 fcccf88621e51fd8b5e856dc00e087914e293951

实有人口优化

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

@@ -16,7 +16,12 @@
    @ApiModelProperty(value="级别（1.街路巷 2.门牌号 3.楼排号 4.单元号 5.户室）")
    private Integer level = 1;

    @ApiModelProperty(value="名称")
    private String name;
    @ApiModelProperty(value="房屋id")
    private String houseId;

    @ApiModelProperty(value="社区id",hidden = true)
    private Long communityId;

    @ApiModelProperty(value="小区id")
    private Long villageId;
}

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

@@ -73,7 +73,7 @@
    /**
     * 小区id（实有房屋id）
     */
    @ApiModelProperty(value="小区id（实有房屋id）",hidden = true)
    @ApiModelProperty(value="小区id（实有房屋id）")
    private Integer villageId;
    /**
     * 家庭成员（姓名）

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

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

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

import java.io.Serializable;

/**
 *  实有房屋DTO
 */
@Data
@ApiModel("实有房屋请求参数")
public class ComMngPopulationHouseAdminDTO implements Serializable {
    /**
     * 分页-当前页数
     */
    @ApiModelProperty(value = "分页-当前页数",example = "1")
    private Long pageNum = 1L;

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

    /**
     * 街路巷
     */
    @ApiModelProperty("街路巷")
    private String alley;
    /**
     * 门牌号
     */
    @ApiModelProperty(value="门牌号")
    private String houseNum;
    /**
     * 小区组
     */
    @ApiModelProperty(value="小区组")
    private String groupAt;

    /**
     * 房屋状态(1.自住 2.租住 3.其他)
     */
    @ApiModelProperty("房屋状态(1.自住 2.租住 3.其他)")
    private Integer status;
    /**
     * 房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他)
     */
    @ApiModelProperty("房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他)")
    private Integer purpose;
    /**
     * 管控状态(1.常规 2.关注 3.管控)
     */
    @ApiModelProperty(value="管控状态(1.常规 2.关注 3.管控)")
    private Integer controlStatus;

    /**
     * 房屋id
     */
    @ApiModelProperty(value="房屋id")
    private Long houseId;

    /**
     * 级别（1.街路巷 2.门牌号 3.楼排号 4.单元号 5.户室）
     */
    @ApiModelProperty(value="级别（1.街路巷 2.门牌号 3.楼排号 4.单元号 5.户室）")
    private Integer level;

    /**
     * 更新开始时间
     */
    @ApiModelProperty(value="更新开始时间")
    private String startTime;

    /**
     * 更新结束时间
     */
    @ApiModelProperty(value="更新结束时间")
    private String endTime;

    /**
     * 社区id
     */
    @ApiModelProperty(value="社区id",hidden = true)
    private Long communityId;

    /**
     * 街路巷
     */
    @ApiModelProperty(value="街路巷",hidden = true)
    private String road;
    /**
     * 门牌号
     */
    @ApiModelProperty(value="门牌号",hidden = true)
    private String doorNo;
    /**
     * 楼排号
     */
    @ApiModelProperty(value="楼排号",hidden = true)
    private String floor;
    /**
     * 单元号
     */
    @ApiModelProperty(value="单元号",hidden = true)
    private String unitNo;
    /**
     * 户室（房间号）
     */
    @ApiModelProperty(value="户室（房间号）",hidden = true)
    private String houseNo;
    /**
     * 小区id
     */
    @ApiModelProperty(value="小区id")
    private Long villageId;

}

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

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

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

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

/**
 *  实有房屋编辑请求参数
 */
@Data
@ApiModel("实有房屋编辑请求参数")
public class ComMngPopulationHouseEditAdminDTO implements Serializable {

    @ApiModelProperty("房屋id")
    private Long houseId;
    /**
     * 建筑面积
     */
    @ApiModelProperty("建筑面积")
    private BigDecimal constructArea;
    /**
     * 建筑用途
     */
    @ApiModelProperty(value="建筑用途")
    private String constructPurpose;
    /**
     * 房屋编号
     */
    @ApiModelProperty(value="房屋编号")
    private String code;

    /**
     * 房屋状态(1.自住 2.租住 3.其他)
     */
    @ApiModelProperty("房屋状态(1.自住 2.租住 3.其他)")
    private Integer status;
    /**
     * 房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他)
     */
    @ApiModelProperty("房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他)")
    private Integer purpose;
    /**
     * 管控状态(1.常规 2.关注 3.管控)
     */
    @ApiModelProperty(value="管控状态(1.常规 2.关注 3.管控)")
    private Integer controlStatus;

}

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

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

    @ApiModelProperty("小区id")
    private Long villageId;


}

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

@@ -16,14 +16,23 @@
    private String alley;

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

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

    @ApiModelProperty("社区id")
    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;

    @ApiModelProperty("小区/组")
    private String groupAt;

    @ApiModelProperty("小区类型（1.城镇 2.农村 3.未知）")
    private Integer type;

    @ApiModelProperty("门牌号")
    private String houseNum;



}

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

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

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

import java.util.Date;

/**
 * 实有房屋Vo
 */
@Data
@ApiModel("实有房屋")
public class ComMngPopulationHouseAdminVO {

    /**
     * 实有房屋id
     */
    @ApiModelProperty("实有房屋id")
    private Long id;
    /**
     * 房屋地址
     */
    @ApiModelProperty("房屋地址")
    private String address;
    /**
     * 街/路/巷
     */
    @ApiModelProperty("街/路/巷")
    private String alley;
    /**
     * 门牌号
     */
    @ApiModelProperty("门牌号")
    private String houseNum;
    /**
     * 小区/组
     */
    @ApiModelProperty("小区/组")
    private String groupAt;

    @ApiModelProperty("房屋状态(1.自住 2.租住 3.其他)")
    private Integer status;

    @ApiModelProperty("房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他)")
    private Integer purpose;

    @ApiModelProperty("管控状态(1.常规 2.关注 3.管控)")
    private Integer controlStatus;

    @ApiModelProperty("空户(1.是 2.否)")
    private Integer isEmpty;

    @ApiModelProperty("更新时间")
    @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/community/ComMngPopulationHouseDetailAdminVO.java

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

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

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

/**
 * 实有房屋Vo
 */
@Data
@ApiModel("实有房屋详情")
public class ComMngPopulationHouseDetailAdminVO {

    /**
     * 实有房屋id
     */
    @ApiModelProperty("实有房屋id")
    private Long id;
    /**
     * 房屋地址
     */
    @ApiModelProperty("房屋地址")
    private String address;

    @ApiModelProperty("房屋状态(1.自住 2.租住 3.其他)")
    private Integer status;

    @ApiModelProperty("房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他)")
    private Integer purpose;

    @ApiModelProperty("管控状态(1.常规 2.关注 3.管控)")
    private Integer controlStatus;

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

    @ApiModelProperty("建筑面积")
    private BigDecimal constructArea;

    @ApiModelProperty("建筑用途")
    private String constructPurpose;

    @ApiModelProperty("房屋编号")
    private String code;

    @ApiModelProperty("实有房屋住户信息")
    private List<ComMngPopulationHouseUserAdminVO> houseUserList;

}

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

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

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

/**
 * 实有房屋统计返回参数
 */
@Data
@ApiModel("实有房屋统计返回参数")
public class ComMngPopulationHouseTotalVO {

    /**
     * 房屋数量
     */
    @ApiModelProperty("房屋数量")
    private Integer houseTotal = 0;
    /**
     * 空房屋数量
     */
    @ApiModelProperty("空房屋数量")
    private Integer emptyTotal = 0;
    /**
     * 关注人口数量
     */
    @ApiModelProperty("关注人口数量")
    private Integer followTotal = 0;
    /**
     * 管控人口数量
     */
    @ApiModelProperty("管控人口数量")
    private Integer controlTotal = 0;

}

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

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

import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * 实有房屋内人口信息Vo
 */
@Data
@ApiModel("实有房屋内住户信息")
@EncryptDecryptClass
public class ComMngPopulationHouseUserAdminVO {

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

    @ApiModelProperty("身份证号码")
    @EncryptDecryptField
    private String cardNo;

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

    @ApiModelProperty("住户来源（1.系统录入 2.小程序登记）")
    private Integer source = 1;
}

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

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

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

@Data
@ApiModel("查询社区的省市区")
public class ComMngVillageRegionVO {

    @ApiModelProperty("省份行政区划代码")
    private Integer provinceAdcode;

    @ApiModelProperty("省份行政区划名称")
    private String provinceName;

    @ApiModelProperty("城市行政区划代码")
    private Integer cityAdcode;

    @ApiModelProperty("城市行政区划名称")
    private String cityName;

    @ApiModelProperty("区县行政区划代码")
    private Integer districtAdcode;

    @ApiModelProperty("区县行政区划名称")
    private String districtName;
}

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

@@ -24,7 +24,7 @@
    private String alley;

    @ExcelProperty(value = "门牌号" ,index = 1)
    private Integer houseNum;
    private String houseNum;

    @ExcelProperty(value = "小区（组）" ,index = 2)
    private String groupAt;

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

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

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

/**
 * 小区统计返回参数
 */
@Data
@ApiModel("小区统计返回参数")
public class ComMngVillageTotalVO {

    /**
     * 小区数量
     */
    @ApiModelProperty("小区数量")
    private Integer villageTotal = 0;
    /**
     * 城镇小区数量
     */
    @ApiModelProperty("城镇小区数量")
    private Integer townTotal = 0;
    /**
     * 农村小区数量
     */
    @ApiModelProperty("农村小区数量")
    private Integer countrysideTotal = 0;


}

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

@@ -22,7 +22,7 @@

    @ApiModelProperty("门牌号")
    @NotBlank(groups = {AddGroup.class}, message = "门牌号不能为空")
    private Integer houseNum;
    private String houseNum;

    @ApiModelProperty("小区（组）")
    private String groupAt;
@@ -33,4 +33,26 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("创建时间")
    private Date createAt;

    @ApiModelProperty("小区类型（1.城镇 2.农村 3.未知）")
    private Integer type;

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

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

    @ApiModelProperty("栋数")
    private Integer floorTotal = 0;

    @ApiModelProperty("户数")
    private Integer houseTotal = 0;

    @ApiModelProperty("人口数")
    private Integer populationTotal = 0;

    @ApiModelProperty("车辆数")
    private Integer carTotal = 0;
}

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

@@ -2477,4 +2477,68 @@
     */
    @PostMapping("/common/data/population/cascade/list")
    R getCascadeHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO);

    /**
     * 分页查询房屋列表
     * @param populationHouseAdminDTO   请求参数
     * @return  房屋列表
     */
    @PostMapping("/common/data/population/page/house")
    R pageHouse(@RequestBody ComMngPopulationHouseAdminDTO populationHouseAdminDTO);

    /**
     * 根据id查询实有房屋信息
     * @param houseId   房屋id
     * @return  房屋信息
     */
    @PostMapping("/common/data/population/house/detail")
    R getHouseDetail(@RequestParam(value = "houseId") Long houseId);

    /**
     * 编辑实有房屋信息
     * @param houseEditAdminDTO 请求参数
     * @return  编辑结果
     */
    @PostMapping("/common/data/population/house/edit")
    R editHouse(@RequestBody ComMngPopulationHouseEditAdminDTO houseEditAdminDTO);

    /**
     * 根据房屋id列表删除房屋信息
     * @param Ids   请求参数
     * @return  删除结果
     */
    @PostMapping("/common/data/population/house/delete")
    R deleteHouses(@RequestBody List<Long> Ids);

    /**
     * 实有房屋统计
     * @param communityId   社区id
     * @return  统计结果
     */
    @PostMapping("/common/data/population/house/statistics")
    R getHouseTotalByAdmin(@RequestParam("communityId") Long communityId);

    /**
     * 根据社区id查询社区所有省市区
     * @param communityId   社区id
     * @return  社区所在省市区
     */
    @PostMapping("/common/data/village/getRegion")
    R getRegion(@RequestParam("communityId") Long communityId);

    /**
     * 统计社区内小区数量
     * @param communityId   社区id
     * @return  统计小区数量
     */
    @PostMapping("/common/data/village/statistics")
    R villageStatistics(@RequestParam("communityId") Long communityId);

    /**
     * 小区详情
     * @param villageId 小区id
     * @return  小区详情
     */
    @PostMapping("/village/getVillage")
    R getVillage(@RequestParam("villageId") Long villageId);
}

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

@@ -11,16 +11,10 @@
import com.panzhihua.common.enums.PopulPoliticalOutlookEnum;
import com.panzhihua.common.enums.PopulSexEnum;
import com.panzhihua.common.listen.ComMngPopulationServeExcelListen;
import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationEditDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngPopulationExcelVo;
import com.panzhihua.common.model.vos.community.ComMngPopulationTotalVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.model.vos.community.EditComMngPopulationVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
@@ -389,6 +383,48 @@
    @ApiOperation(value = "房屋级联菜单查询")
    @PostMapping("/cascade/list")
    public R getCascadeHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO){
        //获取登陆用户绑定社区id
        LoginUserInfoVO loginUser = this.getLoginUserInfo();
        if(loginUser != null){
            cascadeHouseDTO.setCommunityId(loginUser.getCommunityId());
        }
        return communityService.getCascadeHouseAddress(cascadeHouseDTO);
    }

    @ApiOperation(value = "分页查询实有房屋列表", response = ComMngPopulationHouseAdminVO.class)
    @PostMapping("/pageHouse")
    public R pageHouse(@RequestBody ComMngPopulationHouseAdminDTO populationHouseAdminDTO) {
        //获取登陆用户绑定社区id
        LoginUserInfoVO loginUser = this.getLoginUserInfo();
        if(loginUser != null){
            populationHouseAdminDTO.setCommunityId(loginUser.getCommunityId());
        }
        return communityService.pageHouse(populationHouseAdminDTO);
    }

    @ApiOperation(value = "查询实有房屋详情", response = ComMngPopulationHouseDetailAdminVO.class)
    @PostMapping("/house/detail")
    public R getHouseDetail(@RequestParam(value = "houseId") Long houseId) {
        return communityService.getHouseDetail(houseId);
    }

    @ApiOperation(value = "编辑实有房屋")
    @PostMapping("/edit/house")
    public R editHouse(@RequestBody ComMngPopulationHouseEditAdminDTO houseEditAdminDTO) {
        return communityService.editHouse(houseEditAdminDTO);
    }

    @ApiOperation(value = "批量删除实有房屋")
    @PostMapping("/house/delete")
    public R deleteHouses(@RequestBody List<Long> Ids){
        return communityService.deleteHouses(Ids);
    }

    @ApiOperation(value = "实有房屋统计接口", response = ComMngPopulationHouseTotalVO.class)
    @PostMapping("/house/statistics")
    public R getHouseTotalByAdmin() {
        //获取登陆用户绑定社区id
        Long communityId = this.getLoginUserInfo().getCommunityId();
        return communityService.getHouseTotalByAdmin(communityId);
    }
}

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

@@ -7,7 +7,9 @@
import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngVillageRegionVO;
import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngVillageTotalVO;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
@@ -26,11 +28,11 @@
import java.util.List;

/**
 * @description: 实有房屋(小区)管理
 * @description: 小区管理
 * @author: llming
 **/
@Slf4j
@Api(tags = {"实有房屋管理"})
@Api(tags = {"小区管理"})
@RestController
@RequestMapping("/villagemanager/")
public class VillageApi extends BaseController {
@@ -40,7 +42,7 @@
    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "分页查询实有房屋", response = ComMngVillageVO.class)
    @ApiOperation(value = "分页查询小区", response = ComMngVillageVO.class)
    @PostMapping("pagevillage")
    public R pageVillage(@RequestBody PageComMngVillageDTO pageComMngVillageDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
@@ -49,7 +51,13 @@
        return communityService.pageVillage(pageComMngVillageDTO);
    }

    @ApiOperation(value = "查询实有房屋", response = ComMngVillageVO.class)
    @ApiOperation(value = "小区详情", response = ComMngVillageVO.class)
    @PostMapping("getVillage")
    public R getVillage(@RequestParam("villageId") Long villageId) {
        return communityService.getVillage(villageId);
    }

    @ApiOperation(value = "查询小区", response = ComMngVillageVO.class)
    @PostMapping("listvillage")
    public R listVillage(@RequestBody ComMngVillageVO comMngVillageVO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
@@ -58,7 +66,7 @@
        return communityService.listVillage(comMngVillageVO);
    }

    @ApiOperation(value = "新增实有房屋", response = ComMngVillageVO.class)
    @ApiOperation(value = "新增小区", response = ComMngVillageVO.class)
    @PostMapping("addvillage")
    public R addVillage(@Valid @RequestBody ComMngVillageVO comMngVillageVO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
@@ -67,19 +75,19 @@
        return communityService.addVillage(comMngVillageVO);
    }

    @ApiOperation(value = "删除实有房屋")
    @ApiOperation(value = "删除小区")
    @PostMapping("deletevillage")
    public R delectVillage(@RequestBody List<Long> Ids) {
        return communityService.delectVillage(Ids);
    }

    @ApiOperation(value = "下载模板-实有房屋")
    @ApiOperation(value = "下载模板-小区")
    @GetMapping(value = "/serve/download/template")
    public R downloadTemplate(HttpServletResponse response){
        return R.ok(excelConvenientUrl + "实有房屋导入模板.xlsx");
    }

    @ApiOperation(value = "excel导入实有房屋")
    @ApiOperation(value = "excel导入小区")
    @PostMapping(value = "/serve/import", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R downloadTemplate(@RequestParam MultipartFile file, HttpServletRequest request) {
        //获取文件名
@@ -98,7 +106,7 @@
        return R.ok();
    }

    @ApiOperation(value = "编辑实有房屋", response = ComMngVillageVO.class)
    @ApiOperation(value = "编辑小区", response = ComMngVillageVO.class)
    @PostMapping("editvillage/{villageId}")
    public R editvillage(@PathVariable("villageId")Long villageId,@Valid @RequestBody ComMngVillageVO comMngVillageVO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
@@ -107,5 +115,20 @@
        return communityService.editvillage(villageId,comMngVillageVO);
    }

    @ApiOperation(value = "查询当前社区所在省市区", response = ComMngVillageRegionVO.class)
    @PostMapping("/getRegion")
    public R getRegion() {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = loginUserInfo.getCommunityId();
        return communityService.getRegion(communityId);
    }

    @ApiOperation(value = "统计小区接口", response = ComMngVillageTotalVO.class)
    @PostMapping("/statistics")
    public R statistics() {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = loginUserInfo.getCommunityId();
        return communityService.villageStatistics(communityId);
    }

}

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

@@ -94,4 +94,16 @@
    public R editvillage(@PathVariable("villageId")Long villageId,@Valid @RequestBody ComMngVillageVO comMngVillageVO) {
        return comMngVillageService.editVillage(villageId,comMngVillageVO);
    }

    /**
     * 小区详情
     * @param villageId 小区id
     * @return  小区详情
     */
    @PostMapping("/village/getVillage")
    public R getVillage(@RequestParam("villageId") Long villageId) {
        return comMngVillageService.getVillage(villageId);
    }


}

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

@@ -41,6 +41,8 @@
    private ComMngPopulationService comMngPopulationService;
    @Resource
    private ComMngPopulationHouseService comMngPopulationHouseService;
    @Resource
    private ComMngVillageService comMngVillageService;


    /**
@@ -399,7 +401,7 @@
     * @param communityId   社区id
     * @return  统计结果
     */
    @PostMapping("/population/Statistics")
    @PostMapping("/population/statistics")
    public R getPopulationTotalByAdmin(@RequestParam("communityId") Long communityId) {
        return comMngPopulationService.getPopulationTotalByAdmin(communityId);
    }
@@ -414,4 +416,74 @@
        return comMngPopulationHouseService.getCascadeHouseAddress(cascadeHouseDTO);
    }

    /**
     * 分页查询房屋列表
     * @param populationHouseAdminDTO   请求参数
     * @return  房屋列表
     */
    @PostMapping("/population/page/house")
    public R getPageHouse(@RequestBody ComMngPopulationHouseAdminDTO populationHouseAdminDTO){
        return comMngPopulationHouseService.getPageHouse(populationHouseAdminDTO);
    }

    /**
     * 根据id查询实有房屋信息
     * @param houseId   房屋id
     * @return  房屋信息
     */
    @PostMapping("/population/house/detail")
    public R getHouseDetail(@RequestParam(value = "houseId") Long houseId) {
        return comMngPopulationHouseService.getHouseDetail(houseId);
    }

    /**
     * 编辑实有房屋信息
     * @param houseEditAdminDTO 请求参数
     * @return  编辑结果
     */
    @PostMapping("/population/house/edit")
    public R editHouse(@RequestBody ComMngPopulationHouseEditAdminDTO houseEditAdminDTO) {
        return comMngPopulationHouseService.editHouse(houseEditAdminDTO);
    }

    /**
     * 根据房屋id列表删除房屋信息
     * @param Ids   请求参数
     * @return  删除结果
     */
    @PostMapping("/population/house/delete")
    public R deleteHouses(@RequestBody List<Long> Ids){
        return comMngPopulationHouseService.deleteHouses(Ids);
    }

    /**
     * 实有房屋统计
     * @param communityId   社区id
     * @return  统计结果
     */
    @PostMapping("/population/house/statistics")
    public R getHouseTotalByAdmin(@RequestParam("communityId") Long communityId) {
        return comMngPopulationHouseService.getHouseTotalByAdmin(communityId);
    }

    /**
     * 根据社区id查询社区所有省市区
     * @param communityId   社区id
     * @return  社区所在省市区
     */
    @PostMapping("/village/getRegion")
    public R getRegion(@RequestParam("communityId") Long communityId) {
        return comMngPopulationHouseService.getRegion(communityId);
    }

    /**
     * 统计社区内小区数量
     * @param communityId   社区id
     * @return  统计小区数量
     */
    @PostMapping("/village/statistics")
    public R villageStatistics(@RequestParam("communityId") Long communityId) {
        return comMngVillageService.villageStatistics(communityId);
    }

}

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

@@ -1,7 +1,11 @@
package com.panzhihua.service_community.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.community.ComMngVillageTotalVO;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
import com.panzhihua.service_community.model.dos.ComMngVillageDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;


/**
@@ -10,4 +14,20 @@
 **/
@Mapper
public interface ComActVillageDAO extends BaseMapper<ComMngVillageDO> {

    @Select("select count(id) as houseTotal" +
            ",(select count(DISTINCT floor) from com_mng_population_house where village_id = #{villageId}) as floorTotal" +
            ",(select count(id) from com_mng_population where village_id = #{villageId}) as populationTotal" +
            ",(select count(id) from com_mng_car where area_id = #{villageId}) as carTotal" +
            " from com_mng_population_house where village_id = #{villageId}")
    ComMngVillageVO getStatisticsCount(@Param("villageId") Long villageId);

    @Select("select count(village_id) as villageTotal" +
            ",(select count(village_id) from com_mng_village where community_id = #{communityId} and type = 1) as townTotal" +
            ",(select count(village_id) from com_mng_village where community_id = #{communityId} and type = 2) as countrysideTotal" +
            " from com_mng_village where community_id = #{communityId}" )
    ComMngVillageTotalVO getVillageStatisticsCount(@Param("communityId") Long communityId);

    @Select("select village_id,alley,house_num,group_at,type,address,update_at from com_mng_village where village_id = #{villageId}")
    ComMngVillageVO getVillageById(@Param("villageId") Long villageId);
}

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

@@ -43,9 +43,12 @@
            " LEFT JOIN com_mng_struct_area t2 ON t2.id = t.area_id " +
            " LEFT JOIN sys_user t3 ON t.create_by = t3.user_id " +
            " WHERE 1=1" +
            "<if test='pageComMngCarDTO.name != null and pageComMngCarDTO.name.trim() != &quot;&quot;'>" +
            "<if test='pageComMngCarDTO.name != null and pageComMngCarDTO.name != &quot;&quot;'>" +
            " and t.user_name LIKE concat( '%',#{pageComMngCarDTO.name}, '%' )  " +
            " </if> " +
            "<if test='pageComMngCarDTO.villageId != null'>" +
            " and t.area_id = #{pageComMngCarDTO.villageId} " +
            " </if> " +
            "<if test='pageComMngCarDTO.communityId != null and pageComMngCarDTO.communityId != 0'>" +
            " and t.community_id = #{pageComMngCarDTO.communityId} " +
            " </if> " +

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

@@ -146,6 +146,9 @@
            "<if test='comMngPopulationVO.actId != null'>" +
            " and cmp.act_id = #{comMngPopulationVO.actId} " +
            " </if> " +
            "<if test='comMngPopulationVO.villageId != null'>" +
            " and cmp.village_id = #{comMngPopulationVO.villageId} " +
            " </if> " +
            "<if test='comMngPopulationVO.road != null and comMngPopulationVO.road != &quot;&quot;'>" +
            "AND cmp.road = #{comMngPopulationVO.road} " +
            " </if> " +

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

@@ -1,7 +1,10 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.community.ComMngCascadeHouseVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.ComMngHouseVo;
import com.panzhihua.service_community.model.dos.ComMngPopulationHouseDO;
import org.apache.ibatis.annotations.Mapper;
@@ -24,13 +27,151 @@
    List<ComMngHouseVo> getPopulHouseListByPopulId(@Param("populId")Long populId);

    @Select("<script> " +
            "select id,alley from com_mng_population_house" +
            "<if test='name != null and name != &quot;&quot;'>" +
            "and c.alley = #{name}" +
            "select id,cmv.alley from com_mng_population_house as cmph left join com_mng_village as cmv on cmv.village_id = cmph.village_id where cmph.community_id = #{communityId}" +
            "<if test='villageId != null'>" +
            "and cmv.village_id = #{villageId}" +
            " </if> " +
            " </script>")
    List<ComMngCascadeHouseVO> getHouseLevelByAlley(@Param("name") String name);
    List<ComMngCascadeHouseVO> getHouseLevelByAlley(@Param(value = "communityId") Long communityId,@Param(value = "villageId") Long villageId);

    @Select("<script> " +
            "select id,cmv.alley,cmv.house_num from com_mng_population_house as cmph left join com_mng_village as cmv on cmv.village_id = cmph.village_id where cmph.community_id = #{communityId}" +
            "<if test='name != null and name != &quot;&quot;'>" +
            "and cmv.alley = #{name}" +
            " </if> " +
            "<if test='villageId != null'>" +
            "and cmv.village_id = #{villageId}" +
            " </if> " +
            " </script>")
    List<ComMngCascadeHouseVO> getHouseLevelByHouseNum(@Param("name") String name,@Param("communityId") Long communityId,@Param(value = "villageId") Long villageId);

    @Select("<script> " +
            "select id,cmv.alley,cmv.house_num,cmph.floor from com_mng_population_house as cmph left join com_mng_village as cmv on cmv.village_id = cmph.village_id where cmph.community_id = #{communityId} " +
            "<if test='name != null and name != &quot;&quot;'>" +
            "and cmv.alley = #{name}" +
            " </if> " +
            "<if test='houseNum != null and houseNum != &quot;&quot;'>" +
            "and cmv.house_num = #{houseNum}" +
            " </if> " +
            "<if test='villageId != null'>" +
            "and cmv.village_id = #{villageId}" +
            " </if> " +
            " </script>")
    List<ComMngCascadeHouseVO> getHouseLevelByFloor(@Param("name") String name,@Param("houseNum") String houseNum,@Param("communityId") Long communityId,@Param(value = "villageId") Long villageId);

    @Select("<script> " +
            "select id,cmv.alley,cmv.house_num,cmph.floor,cmph.unit_no from com_mng_population_house as cmph left join com_mng_village as cmv on cmv.village_id = cmph.village_id where cmph.community_id = #{communityId} " +
            "<if test='name != null and name != &quot;&quot;'>" +
            "and cmv.alley = #{name}" +
            " </if> " +
            "<if test='houseNum != null and houseNum != &quot;&quot;'>" +
            "and cmv.house_num = #{houseNum}" +
            " </if> " +
            "<if test='floor != null and floor != &quot;&quot;'>" +
            "and cmph.floor = #{floor}" +
            " </if> " +
            "<if test='villageId != null'>" +
            "and cmv.village_id = #{villageId}" +
            " </if> " +
            " </script>")
    List<ComMngCascadeHouseVO> getHouseLevelByUnitNo(@Param("name") String name,@Param("houseNum") String houseNum,@Param("floor") String floor,@Param("communityId") Long communityId,@Param(value = "villageId") Long villageId);

    @Select("<script> " +
            "select cmph.id,cmv.alley,cmv.house_num,cmph.floor,cmph.unit_no,cmph.house_no from com_mng_population_house as cmph left join com_mng_village as cmv on cmv.village_id = cmph.village_id where cmph.community_id = #{communityId} " +
            "<if test='name != null and name != &quot;&quot;'>" +
            "and cmv.alley = #{name}" +
            " </if> " +
            "<if test='houseNum != null and houseNum != &quot;&quot;'>" +
            "and cmv.house_num = #{houseNum}" +
            " </if> " +
            "<if test='floor != null and floor != &quot;&quot;'>" +
            "and cmph.floor = #{floor}" +
            " </if> " +
            "<if test='unitNo != null and unitNo != &quot;&quot;'>" +
            "and cmph.unit_no = #{unitNo}" +
            " </if> " +
            "<if test='villageId != null'>" +
            "and cmv.village_id = #{villageId}" +
            " </if> " +
            " </script>")
    List<ComMngCascadeHouseVO> getHouseLevelByHouseNo(@Param("name") String name,@Param("houseNum") String houseNum,@Param("floor") String floor,@Param("unitNo") String unitNo,@Param("communityId") Long communityId,@Param(value = "villageId") Long villageId);

    @Select("update com_mng_population_house set is_empty = #{isEmpty} where id = #{houseId}")
    void updateHouseByIsEmpty(@Param("houseId") Long houseId,@Param("isEmpty") Integer isEmpty);

    @Select("<script> " +
            "select cmph.id,cmv.alley,cmv.house_num,cmv.group_at,cmph.address,cmph.status,cmph.purpose,cmph.control_status" +
            ",cmph.update_at,cmph.is_empty from com_mng_population_house as cmph" +
            " left join com_mng_village as cmv on cmv.village_id = cmph.village_id" +
            "<where>" +
            "<if test='populationHouseAdminDTO.communityId != null'>" +
            " and cmph.community_id = #{populationHouseAdminDTO.communityId} " +
            " </if> " +
            "<if test='populationHouseAdminDTO.alley != null and populationHouseAdminDTO.alley != &quot;&quot;'>" +
//            "AND cmv.alley like #{populationHouseAdminDTO.alley} " +
            "AND cmv.alley like concat('%',#{populationHouseAdminDTO.alley},'%') " +
            " </if> " +
            "<if test='populationHouseAdminDTO.houseNum != null and populationHouseAdminDTO.houseNum != &quot;&quot;'>" +
            "AND cmv.house_num = #{populationHouseAdminDTO.houseNum} " +
            " </if> " +
            "<if test='populationHouseAdminDTO.groupAt != null and populationHouseAdminDTO.groupAt != &quot;&quot;'>" +
            "AND cmv.group_at = #{populationHouseAdminDTO.groupAt} " +
            " </if> " +
            "<if test='populationHouseAdminDTO.status != null'>" +
            "AND cmph.status = #{populationHouseAdminDTO.status} " +
            " </if> " +
            "<if test='populationHouseAdminDTO.purpose != null'>" +
            "AND cmph.purpose = #{populationHouseAdminDTO.purpose} " +
            " </if> " +
            "<if test='populationHouseAdminDTO.controlStatus != null'>" +
            "AND cmph.control_status = #{populationHouseAdminDTO.controlStatus} " +
            " </if> " +
            "<if test='populationHouseAdminDTO.startTime != null and populationHouseAdminDTO.startTime != &quot;&quot; '>" +
            " AND cmph.update_at <![CDATA[>=]]> #{populationHouseAdminDTO.startTime}  " +
            "</if>" +
            "<if test='populationHouseAdminDTO.endTime != null and populationHouseAdminDTO.startTime != &quot;&quot; '>" +
            " AND cmph.update_at <![CDATA[<=]]> #{populationHouseAdminDTO.endTime}  " +
            " </if> " +

            "<if test='populationHouseAdminDTO.road != null and populationHouseAdminDTO.road != &quot;&quot; '>" +
            " AND cmv.alley = #{populationHouseAdminDTO.road}  " +
            " </if> " +
            "<if test='populationHouseAdminDTO.doorNo != null and populationHouseAdminDTO.doorNo != &quot;&quot; '>" +
            " AND cmv.houseNum = #{populationHouseAdminDTO.doorNo}  " +
            " </if> " +
            "<if test='populationHouseAdminDTO.floor != null and populationHouseAdminDTO.floor != &quot;&quot; '>" +
            " AND cmph.floor = #{populationHouseAdminDTO.floor}  " +
            " </if> " +
            "<if test='populationHouseAdminDTO.unitNo != null and populationHouseAdminDTO.unitNo != &quot;&quot; '>" +
            " AND cmph.unit_no = #{populationHouseAdminDTO.unitNo}  " +
            " </if> " +
            "<if test='populationHouseAdminDTO.houseNo != null and populationHouseAdminDTO.houseNo != &quot;&quot; '>" +
            " AND cmph.house_no = #{populationHouseAdminDTO.houseNo}  " +
            " </if> " +
            "<if test='populationHouseAdminDTO.villageId != null'>" +
            " and cmph.village_id = #{populationHouseAdminDTO.villageId} " +
            " </if> " +
            " </where>" +
            " order by update_at desc" +
            " </script>")
    IPage<ComMngPopulationHouseAdminVO> getPageHouse(Page page, @Param("populationHouseAdminDTO") ComMngPopulationHouseAdminDTO populationHouseAdminDTO);

    @Select("select id,address,status,purpose,control_status,update_at,code,construct_purpose,construct_area from com_mng_population_house where id = #{houseId}")
    ComMngPopulationHouseDetailAdminVO getHouseDetail(@Param("houseId") Long houseId);

    @Select("select count(id) as houseTotal" +
            ",(select count(id) from com_mng_population_house where is_empty = 1 and community_id = #{communityId}) as emptyTotal" +
            ",(select count(id) from com_mng_population_house where control_status = 2 and community_id = #{communityId}) as followTotal" +
            ",(select count(id) from com_mng_population_house where control_status = 3 and community_id = #{communityId}) as controlTotal" +
            " from com_mng_population_house as cmph where community_id = #{communityId}")
    ComMngPopulationHouseTotalVO getHouseTotalByAdmin(@Param("communityId") Long communityId);

    @Select("select (select province_name from com_mng_struct_area_province where province_adcode = ca.province_code) as provinceName," +
            "(select city_name from com_mng_struct_area_city where city_adcode = ca.city_code) as cityName," +
            "(select district_name from com_mng_struct_area_district where district_adcode = ca.area_code) as districtName" +
            ",ca.province_code as provinceAdcode,ca.city_code as cityAdcode,ca.area_code as districtAdcode" +
            " from com_act as ca where ca.community_id = #{communityId}")
    ComMngVillageRegionVO getRegion(@Param("communityId") Long communityId);


}

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

@@ -1,10 +1,13 @@
package com.panzhihua.service_community.dao;

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

import java.util.List;

/**
 * @auther lyq
@@ -17,4 +20,14 @@
    @Select("delete from com_mng_population_house_user where popul_id = #{populationId}")
    void deletePopulationHouseByUserId(@Param("populationId") Long populationId);

    @Select("select house_id from com_mng_population_house_user where popul_id = #{populationId}")
    List<Long> getPopulationHouseIdByUserId(@Param("populationId") Long populationId);

    @Select("select popul_id from com_mng_population_house_user where house_id = #{houseId}")
    List<Long> getPopulationHouseIdByhHosueId(@Param("houseId") Long houseId);

    @Select("select cmp.name,cmp.card_no,cmp.phone from com_mng_population_house_user as cmphu " +
            "left join com_mng_population as cmp on cmp.id = cmphu.popul_id where cmphu.house_id = #{houseId}")
    List<ComMngPopulationHouseUserAdminVO> getHouseUserByHouseId(@Param("houseId") Long houseId);

}

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

@@ -105,6 +105,11 @@
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;

    /**
     * 小区id
     */
    private Long villageId;

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

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

@@ -27,7 +27,7 @@
    /**
     * 门牌号
     */
    private Integer houseNum;
    private String houseNum;
    /**
     * 小区（组）
     */
@@ -48,4 +48,20 @@
     * 街道id
     */
    private Long streetId;

    /**
     * 小区类型（1.城镇 2.农村 3.未知）
     */
    private Integer type;

    /**
     * 小区地址
     */
    private String address;

    /**
     * 更新时间
     */
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;
}

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

@@ -2,8 +2,12 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseEditAdminDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComMngPopulationHouseDO;

import java.util.List;

/**
 * @auther lyq
@@ -19,4 +23,46 @@
     */
    R getCascadeHouseAddress(CascadeHouseDTO cascadeHouseDTO);

    /**
     * 分页查询房屋列表
     * @param populationHouseAdminDTO   请求参数
     * @return  房屋列表
     */
    R getPageHouse(ComMngPopulationHouseAdminDTO populationHouseAdminDTO);

    /**
     * 根据id查询实有房屋信息
     * @param houseId   房屋id
     * @return  房屋信息
     */
    R getHouseDetail(Long houseId);

    /**
     * 编辑实有房屋信息
     * @param houseEditAdminDTO 请求参数
     * @return  编辑结果
     */
    R editHouse(ComMngPopulationHouseEditAdminDTO houseEditAdminDTO);

    /**
     * 根据房屋id列表删除房屋信息
     * @param Ids   请求参数
     * @return  删除结果
     */
    R deleteHouses(List<Long> Ids);

    /**
     * 实有房屋统计
     * @param communityId   社区id
     * @return  统计结果
     */
    R getHouseTotalByAdmin(Long communityId);

    /**
     * 根据社区id查询社区所有省市区
     * @param communityId   社区id
     * @return  社区所在省市区
     */
    R getRegion(Long communityId);

}

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

@@ -55,4 +55,18 @@
     * @return
     */
    R editVillage(Long villageId, ComMngVillageVO comMngVillageVO);

    /**
     * 统计社区内小区数量
     * @param communityId   社区id
     * @return  统计小区数量
     */
    R villageStatistics(Long communityId);

    /**
     * 小区详情
     * @param villageId 小区id
     * @return  小区详情
     */
    R getVillage(Long villageId);
}

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

@@ -1,19 +1,27 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseEditAdminDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngCascadeHouseVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationHouseDetailAdminVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationHouseTotalVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationHouseUserAdminVO;
import com.panzhihua.service_community.dao.ComMngPopulationHouseDAO;
import com.panzhihua.service_community.dao.ComMngPopulationHouseUserDAO;
import com.panzhihua.service_community.model.dos.ComMngPopulationHouseDO;
import com.panzhihua.service_community.service.ComMngPopulationHouseService;
import lombok.extern.slf4j.Slf4j;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

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

/**
@@ -25,6 +33,9 @@
@Service
public class ComMngPopulationHouseServiceImpl extends ServiceImpl<ComMngPopulationHouseDAO, ComMngPopulationHouseDO> implements ComMngPopulationHouseService {

    @Resource
    private ComMngPopulationHouseUserDAO comMngPopulationHouseUserDAO;

    /**
     * 查询房屋级联菜单
     * @param cascadeHouseDTO   请求参数
@@ -34,25 +45,169 @@
    public R getCascadeHouseAddress(CascadeHouseDTO cascadeHouseDTO){
        List<ComMngCascadeHouseVO> cascadeHouseVOList = new ArrayList<>();

        ComMngPopulationHouseDO houseDO = null;
        if(cascadeHouseDTO.getHouseId() != null){
            houseDO = this.baseMapper.selectById(cascadeHouseDTO.getHouseId());
        }

        switch (cascadeHouseDTO.getLevel()){
            case 1:
                cascadeHouseVOList = this.baseMapper.getHouseLevelByAlley(cascadeHouseDTO.getName());
                cascadeHouseVOList = this.baseMapper.getHouseLevelByAlley(cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
                cascadeHouseVOList = cascadeHouseVOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getAlley()))), ArrayList::new));
                break;
            case 2:
                if(houseDO != null){
                    cascadeHouseVOList = this.baseMapper.getHouseLevelByHouseNum(houseDO.getAlley(),cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
                    cascadeHouseVOList = cascadeHouseVOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getAlley() + ";" + o.getHouseNum()))), ArrayList::new));
                }
                break;
            case 3:
                if(houseDO != null) {
                    cascadeHouseVOList = this.baseMapper.getHouseLevelByFloor(houseDO.getAlley(), houseDO.getHouseNum(), cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
                    cascadeHouseVOList = cascadeHouseVOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getAlley() + ";" + o.getHouseNum() + ";" + o.getFloor()))), ArrayList::new));
                }
                break;
            case 4:
                if(houseDO != null) {
                    cascadeHouseVOList = this.baseMapper.getHouseLevelByUnitNo(houseDO.getAlley(), houseDO.getHouseNum(), houseDO.getFloor(), cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
                    cascadeHouseVOList = cascadeHouseVOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getAlley() + ";" + o.getHouseNum() + ";" + o.getFloor() + ";" + o.getUnitNo()))), ArrayList::new));
                }
                break;
            case 5:
                if(houseDO != null) {
                    cascadeHouseVOList = this.baseMapper.getHouseLevelByHouseNo(houseDO.getAlley(), houseDO.getHouseNum(), houseDO.getFloor(), houseDO.getUnitNo(), cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
                    cascadeHouseVOList = cascadeHouseVOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getAlley() + ";" + o.getHouseNum() + ";" + o.getFloor() + ";" + o.getUnitNo() + ";" + o.getHouseNo()))), ArrayList::new));
                }
                break;
            default:
                break;
        }


        return R.ok(cascadeHouseVOList);
    }

    /**
     * 分页查询房屋列表
     * @param populationHouseAdminDTO   请求参数
     * @return  房屋列表
     */
    @Override
    public R getPageHouse(ComMngPopulationHouseAdminDTO populationHouseAdminDTO){

        if(populationHouseAdminDTO.getHouseId() != null){
            ComMngPopulationHouseDO houseDO = this.baseMapper.selectById(populationHouseAdminDTO.getHouseId());
            if(houseDO != null){
                switch (populationHouseAdminDTO.getLevel()){
                    case 1:
                        populationHouseAdminDTO.setRoad(houseDO.getAlley());
                        break;
                    case 2:
                        populationHouseAdminDTO.setRoad(houseDO.getAlley());
                        populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
                        break;
                    case 3:
                        populationHouseAdminDTO.setRoad(houseDO.getAlley());
                        populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
                        populationHouseAdminDTO.setFloor(houseDO.getFloor());
                        break;
                    case 4:
                        populationHouseAdminDTO.setRoad(houseDO.getAlley());
                        populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
                        populationHouseAdminDTO.setFloor(houseDO.getFloor());
                        populationHouseAdminDTO.setUnitNo(houseDO.getUnitNo());
                        break;
                    case 5:
                        populationHouseAdminDTO.setRoad(houseDO.getAlley());
                        populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
                        populationHouseAdminDTO.setFloor(houseDO.getFloor());
                        populationHouseAdminDTO.setUnitNo(houseDO.getUnitNo());
                        populationHouseAdminDTO.setHouseNo(houseDO.getHouseNo());
                        break;
                    default:
                        break;
                }
            }
        }
        return R.ok(this.baseMapper.getPageHouse(new Page(populationHouseAdminDTO.getPageNum(),populationHouseAdminDTO.getPageSize()),populationHouseAdminDTO));
    }

    /**
     * 根据id查询实有房屋信息
     * @param houseId   房屋id
     * @return  房屋信息
     */
    @Override
    public R getHouseDetail(Long houseId){
        ComMngPopulationHouseDetailAdminVO houseDetailAdminVO = this.baseMapper.getHouseDetail(houseId);
        if(houseDetailAdminVO != null){
            //查询房屋下住户信息
            List<ComMngPopulationHouseUserAdminVO> houseUserList = comMngPopulationHouseUserDAO.getHouseUserByHouseId(houseDetailAdminVO.getId());
            if(!houseUserList.isEmpty()){
                houseDetailAdminVO.setHouseUserList(houseUserList);
            }
        }
        return R.ok(houseDetailAdminVO);
    }

    /**
     * 编辑实有房屋信息
     * @param houseEditAdminDTO 请求参数
     * @return  编辑结果
     */
    @Override
    public R editHouse(ComMngPopulationHouseEditAdminDTO houseEditAdminDTO){

        //查询实有房屋信息
        ComMngPopulationHouseDO houseDO = this.baseMapper.selectById(houseEditAdminDTO.getHouseId());
        if(houseDO == null){
            return R.fail("参数错误");
        }

        BeanUtils.copyProperties(houseEditAdminDTO,houseDO);
        houseDO.setUpdateAt(new Date());
        if(this.baseMapper.updateById(houseDO) > 0){
            return R.ok();
        }else{
            return R.fail();
        }
    }

    /**
     * 根据房屋id列表删除房屋信息
     * @param Ids   请求参数
     * @return  删除结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R deleteHouses(List<Long> Ids){
        if(this.baseMapper.deleteBatchIds(Ids) > 0){
            return R.ok();
        }else{
            return R.fail();
        }
    }

    /**
     * 实有房屋统计
     * @param communityId   社区id
     * @return  统计结果
     */
    @Override
    public R getHouseTotalByAdmin(Long communityId){
        ComMngPopulationHouseTotalVO houseTotalVO = new ComMngPopulationHouseTotalVO();
        if(communityId != null){
            houseTotalVO = this.baseMapper.getHouseTotalByAdmin(communityId);
        }
        return R.ok(houseTotalVO);
    }

    /**
     * 根据社区id查询社区所有省市区
     * @param communityId   社区id
     * @return  社区所在省市区
     */
    @Override
    public R getRegion(Long communityId){
        return R.ok(this.baseMapper.getRegion(communityId));
    }

}

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

@@ -165,6 +165,9 @@
        //查询当前用户房屋信息
        List<ComMngHouseVo> houseList = comMngPopulationHouseDAO.getPopulHouseListByPopulId(populationId);
        if(!houseList.isEmpty()){
            houseList.forEach(house ->{

            });
            comMngPopulationVO.setHouseList(houseList);
        }

@@ -285,8 +288,7 @@
            if(populationHouseDO == null){
                //查询该房屋未建立，执行建立房屋信息
                populationHouseDO = new ComMngPopulationHouseDO();
                populationHouseDO.setAlley(vo.getRoad());
                populationHouseDO.setHouseNum(vo.getDoorNo());
                populationHouseDO.setVillageId(comMngVillageDO.getVillageId());
                populationHouseDO.setCommunityId(communityId);
                populationHouseDO.setFloor(vo.getFloor());
                populationHouseDO.setUnitNo(vo.getUnitNo());
@@ -571,8 +573,21 @@
            populationDO.setStreetId(comActDO.getStreetId());
        }

        //查询当前用户所有房屋id
        List<Long> houseIds = comMngPopulationHouseUserDAO.getPopulationHouseIdByUserId(vo.getId());
        //清除用户房屋居住信息
        comMngPopulationHouseUserDAO.deletePopulationHouseByUserId(vo.getId());
        if(!houseIds.isEmpty()){
            houseIds.forEach(houseId -> {
                //查询当前房屋下是否有人口信息，如果没有则将房屋设置为空户
                List<Long> oldHouseIds = comMngPopulationHouseUserDAO.getPopulationHouseIdByhHosueId(houseId);
                if(oldHouseIds.isEmpty()){
                    //修改房屋信息为空户
                    comMngPopulationHouseDAO.updateHouseByIsEmpty(houseId,1);
                }
            });
        }


        //更新用户的房屋信息
        Long houseId = null;
@@ -586,6 +601,9 @@
                    houseId = houseEditDto.getId();//居住地
                }
                populationHouseUserDOList.add(populationHouseUserDO);

                //修改房屋信息不为空户
                comMngPopulationHouseDAO.updateHouseByIsEmpty(houseEditDto.getId(),2);
            }
        }
        comMngPopulationHouseUserService.saveBatch(populationHouseUserDOList);

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

@@ -11,11 +11,14 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComActVillageDAO;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.dao.ComMngPopulationHouseDAO;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
import com.panzhihua.service_community.model.dos.ComMngPopulationHouseDO;
import com.panzhihua.service_community.model.dos.ComMngVillageDO;
import com.panzhihua.service_community.service.ComMngVillageService;
import org.springframework.beans.BeanUtils;
@@ -23,6 +26,7 @@

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

/**
@@ -37,6 +41,8 @@
    ComActDAO comActDAO;
    @Resource
    ComMngPopulationDAO populationDAO;
    @Resource
    private ComMngPopulationHouseDAO comMngPopulationHouseDAO;

    @Override
    public R addComActVillage(ComMngVillageVO comMngVillageVO) {
@@ -55,12 +61,13 @@
            return R.fail("社区没有绑定街道，请绑定后操作！");
        }
        comMngVillageDO.setStreetId(comActDO.getStreetId());
        comMngVillageDO.setUpdateAt(new Date());
        int insert = comActVillageDAO.insert(comMngVillageDO);
        if (insert > 0) {
            param.eq(ComMngVillageDO::getAlley, comMngVillageVO.getAlley());
            param.eq(ComMngVillageDO::getHouseNum, comMngVillageVO.getHouseNum());
            ComMngVillageDO comMngVillageDO1 = comActVillageDAO.selectOne(param);
            BeanUtils.copyProperties(comMngVillageDO1, comMngVillageVO);
//            param.eq(ComMngVillageDO::getAlley, comMngVillageVO.getAlley());
//            param.eq(ComMngVillageDO::getHouseNum, comMngVillageVO.getHouseNum());
//            ComMngVillageDO comMngVillageDO1 = comActVillageDAO.selectOne(param);
            BeanUtils.copyProperties(comMngVillageDO, comMngVillageVO);
            return R.ok(comMngVillageVO);
        }
        return R.fail();
@@ -80,17 +87,6 @@

    @Override
    public R pageComActVillage(PageComMngVillageDTO pageComMngVillageDTO) {
        Page page = new Page<>();
        Long pageNum = pageComMngVillageDTO.getPageNum();
        Long pageSize = pageComMngVillageDTO.getPageSize();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        LambdaQueryWrapper<ComMngVillageDO> userLambdaQueryWrapper = Wrappers.lambdaQuery();
        if(pageComMngVillageDTO.getCommunityId() != null){
            userLambdaQueryWrapper.eq(ComMngVillageDO::getCommunityId,pageComMngVillageDTO.getCommunityId());
@@ -98,17 +94,58 @@
        if (pageComMngVillageDTO.getAlley() != null) {
            userLambdaQueryWrapper.like(ComMngVillageDO::getAlley, pageComMngVillageDTO.getAlley());
        }
        Page userPage = new Page(pageNum, pageSize);
        if (StringUtils.isNotEmpty(pageComMngVillageDTO.getHouseNum())) {
            userLambdaQueryWrapper.eq(ComMngVillageDO::getHouseNum, pageComMngVillageDTO.getHouseNum());
        }
        if (StringUtils.isNotEmpty(pageComMngVillageDTO.getGroupAt())) {
            userLambdaQueryWrapper.eq(ComMngVillageDO::getGroupAt, pageComMngVillageDTO.getGroupAt());
        }
        if(pageComMngVillageDTO.getType() != null){
            userLambdaQueryWrapper.eq(ComMngVillageDO::getType, pageComMngVillageDTO.getType());
        }
        Page userPage = new Page(pageComMngVillageDTO.getPageNum(), pageComMngVillageDTO.getPageSize());
        IPage<ComMngVillageDO> doPager = comActVillageDAO.selectPage(userPage, userLambdaQueryWrapper.orderByDesc(ComMngVillageDO::getCreateAt));
        return R.ok(doPager);

        IPage<ComMngVillageVO> villageVOIPage = new Page<>();
        villageVOIPage.setCurrent(doPager.getCurrent());
        villageVOIPage.setPages(doPager.getPages());
        villageVOIPage.setSize(doPager.getSize());
        villageVOIPage.setTotal(doPager.getTotal());
        if(!doPager.getRecords().isEmpty()){
            List<ComMngVillageVO> villageVOList = new ArrayList<>();
            //统计小区下的数据
            doPager.getRecords().forEach(village -> {
                ComMngVillageVO villageVO = new ComMngVillageVO();
                BeanUtils.copyProperties(village,villageVO);
                //查询小区统计数据
                ComMngVillageVO villageTotal = comActVillageDAO.getStatisticsCount(village.getVillageId());
                if(villageTotal != null){
                    villageVO.setFloorTotal(villageTotal.getFloorTotal());
                    villageVO.setCarTotal(villageTotal.getCarTotal());
                    villageVO.setHouseTotal(villageTotal.getHouseTotal());
                    villageVO.setPopulationTotal(villageTotal.getPopulationTotal());
                }
                villageVOList.add(villageVO);

            });
            villageVOIPage.setRecords(villageVOList);
        }
        return R.ok(villageVOIPage);
    }

    @Override
    public R delecComActVillage(List<Long> Ids) {
        LambdaQueryWrapper<ComMngPopulationHouseDO> paramHouseWrapper = Wrappers.lambdaQuery();
        paramHouseWrapper.in(ComMngPopulationHouseDO::getVillageId,Ids);
        List<ComMngPopulationHouseDO> populationHouseDOList = comMngPopulationHouseDAO.selectList(paramHouseWrapper);
        if (!populationHouseDOList.isEmpty()) {
            return R.fail("无法删除，已绑定实有房屋!");
        }

        LambdaQueryWrapper<ComMngPopulationDO> paramWrapper = Wrappers.lambdaQuery();
        paramWrapper.in(ComMngPopulationDO::getVillageId, Ids);
        ComMngPopulationDO mngPopulationDO = populationDAO.selectOne(paramWrapper);
        if (mngPopulationDO != null) {
        List<ComMngPopulationDO> mngPopulationDOList = populationDAO.selectList(paramWrapper);
        if (!mngPopulationDOList.isEmpty()) {
            return R.fail("无法删除，已绑定实有人口!");
        }
        int delete = comActVillageDAO.deleteBatchIds(Ids);
@@ -134,7 +171,7 @@
                return R.fail("街路巷第" + index + "行为空!");
            }
            //判断DB和exel数据重复判断
            boolean result = comMngVillageDOs.stream().anyMatch(village -> village.getAlley().equals(vo.getAlley()) && village.getHouseNum().intValue() == vo.getHouseNum().intValue());
            boolean result = comMngVillageDOs.stream().anyMatch(village -> village.getAlley().equals(vo.getAlley()) && village.getHouseNum().equals(vo.getHouseNum()));
            if (result) {
                return R.fail("导入街路巷已存在(" + vo.getAlley() + ")");
            }
@@ -175,4 +212,24 @@
        }
        return R.fail();
    }

    /**
     * 统计社区内小区数量
     * @param communityId   社区id
     * @return  统计小区数量
     */
    @Override
    public R villageStatistics(Long communityId){
        return R.ok(this.baseMapper.getVillageStatisticsCount(communityId));
    }

    /**
     * 小区详情
     * @param villageId 小区id
     * @return  小区详情
     */
    @Override
    public R getVillage(Long villageId){
        return R.ok(this.baseMapper.getVillageById(villageId));
    }
}