社区代码生成

blade-service-api/community-api/src/main/java/org/springblade/community/dto/AgencyDTO.java

@@ -16,24 +16,19 @@
  */
 package org.springblade.community.dto;
 
+import org.springblade.community.entity.Agency;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.community.entity.Agency;
 
 /**
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2020-10-27
+ * @since 2021-03-29
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class AgencyDTO extends Agency {
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 调用什么方法： 1-新增  2-删除  3-修改
-	 */
-	private Integer wMethod;
-
 }

blade-service-api/community-api/src/main/java/org/springblade/community/dto/BuildingDTO.java

@@ -16,23 +16,19 @@
  */
 package org.springblade.community.dto;
 
+import org.springblade.community.entity.Building;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.community.entity.Building;
 
 /**
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2020-10-31
+ * @since 2021-03-29
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class BuildingDTO extends Building {
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 调用什么方法： 1-新增  2-删除  3-修改
-	 */
-	private Integer wMethod;
 }

blade-service-api/community-api/src/main/java/org/springblade/community/dto/FloorDTO.java

@@ -16,23 +16,19 @@
  */
 package org.springblade.community.dto;
 
+import org.springblade.community.entity.Floor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.community.entity.Floor;
 
 /**
  * 数据传输对象实体类
  *
  * @author BladeX
- * @since 2020-11-06
+ * @since 2021-03-29
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class FloorDTO extends Floor {
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 调用什么方法： 1-新增  2-删除  3-修改
-	 */
-	private Integer wMethod;
 }

blade-service-api/community-api/src/main/java/org/springblade/community/dto/HouseuserDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.community.dto;
+
+import org.springblade.community.entity.Houseuser;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 住户表数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2021-03-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class HouseuserDTO extends Houseuser {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/community-api/src/main/java/org/springblade/community/dto/ResidentialDTO.java

@@ -16,24 +16,19 @@
  */
 package org.springblade.community.dto;
 
+import org.springblade.community.entity.Residential;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.community.entity.Residential;
 
 /**
  * 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号数据传输对象实体类
  *
  * @author BladeX
- * @since 2020-10-16
+ * @since 2021-03-29
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class ResidentialDTO extends Residential {
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 调用什么方法： 1-新增  2-删除  3-修改
-	 */
-	private Integer wMethod;
-
 }

blade-service-api/community-api/src/main/java/org/springblade/community/dto/RoomDTO.java

@@ -16,23 +16,19 @@
  */
 package org.springblade.community.dto;
 
+import org.springblade.community.entity.Room;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.community.entity.Room;
 
 /**
  * 房间表数据传输对象实体类
  *
  * @author BladeX
- * @since 2020-10-18
+ * @since 2021-03-29
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class RoomDTO extends Room {
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 调用什么方法： 1-新增  2-删除  3-修改
-	 */
-	private Integer wMethod;
 }

blade-service-api/community-api/src/main/java/org/springblade/community/dto/UnitDTO.java

@@ -16,23 +16,19 @@
  */
 package org.springblade.community.dto;
 
+import org.springblade.community.entity.Unit;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.community.entity.Unit;
 
 /**
  * 单元表数据传输对象实体类
  *
  * @author BladeX
- * @since 2020-10-18
+ * @since 2021-03-29
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class UnitDTO extends Unit {
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 调用什么方法： 1-新增  2-删除  3-修改
-	 */
-	private Integer wMethod;
 }

blade-service-api/community-api/src/main/java/org/springblade/community/entity/Agency.java

@@ -16,20 +16,18 @@
  */
 package org.springblade.community.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.mp.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 实体类
  *
  * @author BladeX
- * @since 2020-10-27
+ * @since 2021-03-29
  */
 @Data
 @TableName("community_agency")
@@ -39,45 +37,46 @@ public class Agency extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 
-	private String tenantId;
-
-	@ApiModelProperty("主键id")
-	@TableId(
-		value = "id",
-		type = IdType.ASSIGN_ID
-	)
-	private Long id;
-
 	/**
 	* 社区名称
 	*/
 		@ApiModelProperty(value = "社区名称")
-		private String agencyName;
+		private String name;
 	/**
-	* 社区编号
+	* 所属省
 	*/
-		@ApiModelProperty(value = "社区编号")
-		private String agencyNo;
+		@ApiModelProperty(value = "所属省")
+		private String regionProvince;
 	/**
-	* 地区
+	* 所属市
 	*/
-		@ApiModelProperty(value = "地区")
-		private String agencyArea;
+		@ApiModelProperty(value = "所属市")
+		private String regionCity;
 	/**
-	* 省ID
+	* 所属区
 	*/
-		@ApiModelProperty(value = "省ID")
-		private String regionProvince;
+		@ApiModelProperty(value = "所属区")
+		private String regionArea;
 	/**
-	* 市ID
+	* 所属街道
 	*/
-		@ApiModelProperty(value = "市ID")
-		private String regionCity;
+		@ApiModelProperty(value = "所属街道")
+		private String regionStreet;
 	/**
-	* 区/县ID
+	* 详细地址
 	*/
-		@ApiModelProperty(value = "区/县ID")
-		private String regionArea;
+		@ApiModelProperty(value = "详细地址")
+		private String address;
+	/**
+	* 经度
+	*/
+		@ApiModelProperty(value = "经度")
+		private String longitude;
+	/**
+	* 纬度
+	*/
+		@ApiModelProperty(value = "纬度")
+		private String latitude;
 	/**
 	* 负责人名称
 	*/
@@ -89,76 +88,60 @@ public class Agency extends BaseEntity {
 		@ApiModelProperty(value = "负责人联系方式")
 		private String personPhone;
 	/**
-	* 备注
+	* 小区数量
 	*/
-		@ApiModelProperty(value = "备注")
-		private String remark;
+		@ApiModelProperty(value = "小区数量")
+		private Integer residentialCount;
 	/**
-	 * 小区数量
-	 */
-	@ApiModelProperty(value = "小区数量")
-	private Integer residentialCount;
-	/**
-	 * 单元数量
-	 */
-	@ApiModelProperty(value = "单元数量")
-	private Integer unitCount;
-	/**
-	 * 房间数量
-	 */
-	@ApiModelProperty(value = "房间数量")
-	private Integer roomCount;
-	/**
-	 * 人员数量
-	 */
-	@ApiModelProperty(value = "人员数量")
-	private Integer personCount;
-	/**
-	 * 车辆数量
-	 */
-	@ApiModelProperty(value = "车辆数量")
-	private Integer carCount;
-
-
-
+	* 楼栋数
+	*/
+		@ApiModelProperty(value = "楼栋数")
+		private Integer buildingCount;
 	/**
-	 * 详细地址
-	 */
-	@ApiModelProperty(value = "详细地址")
-	private String address;
-	/**
-	 * 经度
-	 */
-	@ApiModelProperty(value = "经度")
-	private String longitude;
-	/**
-	 * 纬度
-	 */
-	@ApiModelProperty(value = "纬度")
-	private String latitude;
-	/**
-	 * 车辆数量
-	 */
-	@ApiModelProperty(value = "社区背景图")
-	private String pic;
-
+	* 单元数量
+	*/
+		@ApiModelProperty(value = "单元数量")
+		private Integer unitCount;
 	/**
-	 * 所属街道
-	 */
-	@ApiModelProperty(value = "所属街道")
-	private String regionStreet;
-
+	* 楼层数
+	*/
+		@ApiModelProperty(value = "楼层数")
+		private Integer floorCount;
 	/**
-	 * 机构路径
-	 */
-	@ApiModelProperty(value = "机构路径")
-	private String orgPosition;
-
+	* 房间数量
+	*/
+		@ApiModelProperty(value = "房间数量")
+		private Integer roomCount;
+	/**
+	* 人员数量
+	*/
+		@ApiModelProperty(value = "人员数量")
+		private Integer personCount;
+	/**
+	* 车辆数量
+	*/
+		@ApiModelProperty(value = "车辆数量")
+		private Integer carCount;
+	/**
+	* 社区背景图
+	*/
+		@ApiModelProperty(value = "社区背景图")
+		private String pic;
 	/**
-	 * 旧平台id
-	 */
-	@ApiModelProperty(value = "旧平台id")
-	private String oldId;
+	* 备注
+	*/
+		@ApiModelProperty(value = "备注")
+		private String remark;
+	/**
+	* 机构路径
+	*/
+		@ApiModelProperty(value = "机构路径")
+		private String orgPosition;
+	/**
+	* 旧平台id
+	*/
+		@ApiModelProperty(value = "旧平台id")
+		private String oldId;
 
 
 }

blade-service-api/community-api/src/main/java/org/springblade/community/entity/BatchAddInfo.java

@@ -1,40 +0,0 @@
-package org.springblade.community.entity;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@Data
-@ApiModel(value = "批量新增对象", description = "批量新增对象")
-public class BatchAddInfo {
-
-	// 小区id
-	private Long residentialId;
-	//起止楼栋
-	private Integer buildingBegin;
-	private Integer buildingEnd;
-	private String buildingPrefix;
-	private String buildingSuffix;
-
-	//起止单元
-	private Integer unitBegin;
-	private Integer unitEnd;
-	private String unitPrefix;
-	private String unitSuffix;
-
-	//起止楼层
-	private Integer floorBegin;
-	private Integer floorEnd;
-	private String floorPrefix;
-	private String floorSuffix;
-	//排除楼层（可多个）
-	private String floorExclude;
-
-	//起止房屋
-	private Integer roomBegin;
-	private Integer roomEnd;
-	private String roomPrefix;
-	private String roomSuffix;
-	//排除房屋
-	private String roomExclude;
-
-}

blade-service-api/community-api/src/main/java/org/springblade/community/entity/Building.java

@@ -16,20 +16,18 @@
  */
 package org.springblade.community.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.mp.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 实体类
  *
  * @author BladeX
- * @since 2020-10-31
+ * @since 2021-03-29
  */
 @Data
 @TableName("community_building")
@@ -39,58 +37,66 @@ public class Building extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 
-
-	@ApiModelProperty("主键id")
-	@TableId(
-		value = "id",
-		type = IdType.ASSIGN_ID
-	)
-	private Long id;
-
-	@ApiModelProperty("楼栋名称")
-	private String name;
-
-	@ApiModelProperty("所属小区id")
-	private Long residentialId;
-
-	@ApiModelProperty("所属小区名称")
-	private String residentialName;
-
-	@ApiModelProperty("单元数")
-	private Integer unitNumber;
-
-	@ApiModelProperty("楼层数")
-	private Integer floorNumber;
-
-	@ApiModelProperty("房间数")
-	private Integer roomNumber;
-
-	@ApiModelProperty("住户数")
-	private Integer personNumber;
-
-	@ApiModelProperty("旧平台id")
-	private Long oldId;
-
-	@ApiModelProperty("楼栋图片")
-	private String pic;
-
-	@ApiModelProperty("机构路径")
-	private String orgPosition;
-
-	@ApiModelProperty("租户id")
-	private String tenantId;
-
-
-	@ApiModelProperty("所属社区id")
-	private Long agencyId;
-
-	@ApiModelProperty("所属社区名称")
-	private String agencyName;
-
-
-
-
-
+	/**
+	* 楼栋名称
+	*/
+		@ApiModelProperty(value = "楼栋名称")
+		private String name;
+	/**
+	* 社区id
+	*/
+		@ApiModelProperty(value = "社区id")
+		private Long agencyId;
+	/**
+	* 社区名称
+	*/
+		@ApiModelProperty(value = "社区名称")
+		private String agencyName;
+	/**
+	* 小区id
+	*/
+		@ApiModelProperty(value = "小区id")
+		private Long residentialId;
+	/**
+	* 小区名称
+	*/
+		@ApiModelProperty(value = "小区名称")
+		private String residentialName;
+	/**
+	* 单元数
+	*/
+		@ApiModelProperty(value = "单元数")
+		private Integer unitCount;
+	/**
+	* 楼层数
+	*/
+		@ApiModelProperty(value = "楼层数")
+		private Integer floorCount;
+	/**
+	* 房间数
+	*/
+		@ApiModelProperty(value = "房间数")
+		private Integer roomCount;
+	/**
+	* 住户数
+	*/
+		@ApiModelProperty(value = "住户数")
+		private Integer userCount;
+	/**
+	* 图片
+	*/
+		@ApiModelProperty(value = "图片")
+		private String pic;
+	/**
+	* 旧平台id
+	*/
+		@ApiModelProperty(value = "旧平台id")
+		private Long oldId;
+	/**
+	* 机构路径
+	*/
+		@ApiModelProperty(value = "机构路径")
+		private String orgPosition;
 
 
 }

blade-service-api/community-api/src/main/java/org/springblade/community/entity/Floor.java

@@ -16,20 +16,18 @@
  */
 package org.springblade.community.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.mp.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 实体类
  *
  * @author BladeX
- * @since 2020-11-06
+ * @since 2021-03-29
  */
 @Data
 @TableName("community_floor")
@@ -39,34 +37,51 @@ public class Floor extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 
-
-	@ApiModelProperty("主键id")
-	@TableId(
-		value = "id",
-		type = IdType.ASSIGN_ID
-	)
-	private Long id;
 	/**
 	* 楼层名称
 	*/
 		@ApiModelProperty(value = "楼层名称")
 		private String name;
 	/**
-	* 所属小区id
+	* 社区id
+	*/
+		@ApiModelProperty(value = "社区id")
+		private Long agencyId;
+	/**
+	* 社区名称
 	*/
-		@ApiModelProperty(value = "所属小区id")
+		@ApiModelProperty(value = "社区名称")
+		private String agencyName;
+	/**
+	* 小区id
+	*/
+		@ApiModelProperty(value = "小区id")
 		private Long residentialId;
 	/**
-	* 所属小区名称
+	* 小区名称
 	*/
-		@ApiModelProperty(value = "所属小区名称")
+		@ApiModelProperty(value = "小区名称")
 		private String residentialName;
 	/**
-	* 存储位置（通过该字段快速查询，所有的子节点）
+	* 楼栋id
 	*/
-		@ApiModelProperty(value = "存储位置（通过该字段快速查询，所有的子节点）")
-		private String orgPosition;
-
+		@ApiModelProperty(value = "楼栋id")
+		private Long buildingId;
+	/**
+	* 楼栋名称
+	*/
+		@ApiModelProperty(value = "楼栋名称")
+		private String buildingName;
+	/**
+	* 单元id
+	*/
+		@ApiModelProperty(value = "单元id")
+		private Long unitId;
+	/**
+	* 单元名称
+	*/
+		@ApiModelProperty(value = "单元名称")
+		private String unitName;
 	/**
 	* 负责人姓名
 	*/
@@ -83,11 +98,6 @@ public class Floor extends BaseEntity {
 		@ApiModelProperty(value = "建筑年代")
 		private String builtYear;
 	/**
-	* 产权性质
-	*/
-		@ApiModelProperty(value = "产权性质")
-		private String propertyNature;
-	/**
 	* 有无电梯
 	*/
 		@ApiModelProperty(value = "有无电梯")
@@ -96,56 +106,27 @@ public class Floor extends BaseEntity {
 	* 房间数量
 	*/
 		@ApiModelProperty(value = "房间数量")
-		private Integer roomNumber;
+		private Integer roomCount;
 	/**
 	* 住户数量
 	*/
 		@ApiModelProperty(value = "住户数量")
-		private Integer userNumber;
-	/**
-	* 序号
-	*/
-		@ApiModelProperty(value = "序号")
-		private Integer serial;
+		private Integer userCount;
 	/**
 	* 备注
 	*/
 		@ApiModelProperty(value = "备注")
 		private String remark;
-
-
+	/**
+	* 机构路径
+	*/
+		@ApiModelProperty(value = "机构路径")
+		private String orgPosition;
 	/**
 	* 原数据的Id
 	*/
 		@ApiModelProperty(value = "原数据的Id")
 		private String oldId;
-	/**
-	* 所属楼栋id
-	*/
-		@ApiModelProperty(value = "所属楼栋id")
-		private Long buildingId;
-	/**
-	* 所属楼栋名称
-	*/
-		@ApiModelProperty(value = "所属楼栋名称")
-		private String buildingName;
-	/**
-	* 所属单元id
-	*/
-		@ApiModelProperty(value = "所属单元id")
-		private Long unitId;
-	/**
-	* 所属单元名称
-	*/
-		@ApiModelProperty(value = "所属单元名称")
-		private String unitName;
-
-	@ApiModelProperty("所属社区id")
-	private Long agencyId;
-
-	@ApiModelProperty("所属社区名称")
-	private String agencyName;
 
-	private String tenantId;
 
 }

blade-service-api/community-api/src/main/java/org/springblade/community/entity/Houseuser.java

@@ -0,0 +1,238 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.community.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.springblade.core.mp.base.BaseEntity;
+import java.time.LocalDateTime;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 住户表实体类
+ *
+ * @author BladeX
+ * @since 2021-03-29
+ */
+@Data
+@TableName("community_houseuser")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "Houseuser对象", description = "住户表")
+public class Houseuser extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 住户名字
+	*/
+		@ApiModelProperty(value = "住户名字")
+		private String name;
+	/**
+	* 社区id
+	*/
+		@ApiModelProperty(value = "社区id")
+		private Long agencyId;
+	/**
+	* 社区名称
+	*/
+		@ApiModelProperty(value = "社区名称")
+		private String agencyName;
+	/**
+	* 小区id
+	*/
+		@ApiModelProperty(value = "小区id")
+		private Long residentialId;
+	/**
+	* 小区名称
+	*/
+		@ApiModelProperty(value = "小区名称")
+		private String residentialName;
+	/**
+	* 楼栋id
+	*/
+		@ApiModelProperty(value = "楼栋id")
+		private Long buildingId;
+	/**
+	* 楼栋名称
+	*/
+		@ApiModelProperty(value = "楼栋名称")
+		private String buildingName;
+	/**
+	* 单元id
+	*/
+		@ApiModelProperty(value = "单元id")
+		private Long unitId;
+	/**
+	* 单元名称
+	*/
+		@ApiModelProperty(value = "单元名称")
+		private String unitName;
+	/**
+	* 楼层id
+	*/
+		@ApiModelProperty(value = "楼层id")
+		private Long floorId;
+	/**
+	* 楼层名称
+	*/
+		@ApiModelProperty(value = "楼层名称")
+		private String floorName;
+	/**
+	* 房间id
+	*/
+		@ApiModelProperty(value = "房间id")
+		private Long roomId;
+	/**
+	* 房间名称
+	*/
+		@ApiModelProperty(value = "房间名称")
+		private String roomName;
+	/**
+	* 机构路径
+	*/
+		@ApiModelProperty(value = "机构路径")
+		private String orgPosition;
+	/**
+	* 审核状态：，0-待审核 1-审核通过 2-审核不通过
+	*/
+		@ApiModelProperty(value = "审核状态：，0-待审核 1-审核通过 2-审核不通过")
+		private Integer checkState;
+	/**
+	* 审核意见
+	*/
+		@ApiModelProperty(value = "审核意见")
+		private String checkOpinion;
+	/**
+	* 人员分类：常住；重点。。。。
+	*/
+		@ApiModelProperty(value = "人员分类：常住；重点。。。。")
+		private Integer personType;
+	/**
+	* 手机号
+	*/
+		@ApiModelProperty(value = "手机号")
+		private String tel;
+	/**
+	* 国籍，0 中国大陆 1 中国香港/澳门 2 中国台湾 3海外
+	*/
+		@ApiModelProperty(value = "国籍，0 中国大陆 1 中国香港/澳门 2 中国台湾 3海外")
+		private Integer nationality;
+	/**
+	* 证件号码 中国大陆:身份证；中国香港/澳门:港澳居民来往内地通行证；中国台湾:台湾居民来往内地通行证；海外:护照
+	*/
+		@ApiModelProperty(value = "证件号码 中国大陆:身份证；中国香港/澳门:港澳居民来往内地通行证；中国台湾:台湾居民来往内地通行证；海外:护照")
+		private String idCard;
+	/**
+	* 籍贯（nationality = 0时,国籍为中国大陆）
+	*/
+		@ApiModelProperty(value = "籍贯（nationality = 0时,国籍为中国大陆）")
+		private String birthPlace;
+	/**
+	* 护照照片url
+	*/
+		@ApiModelProperty(value = "护照照片url")
+		private String passportImgUri;
+	/**
+	* 入境证明url
+	*/
+		@ApiModelProperty(value = "入境证明url")
+		private String entryImgUri;
+	/**
+	* 性别  0-未定义  1-男 2-女
+	*/
+		@ApiModelProperty(value = "性别  0-未定义  1-男 2-女")
+		private Integer sex;
+	/**
+	* 备注
+	*/
+		@ApiModelProperty(value = "备注")
+		private String remark;
+	/**
+	* 脸部照片url（没有域名）
+	*/
+		@ApiModelProperty(value = "脸部照片url（没有域名）")
+		private String imageUri;
+	/**
+	* 根据图片生成的faceId
+	*/
+		@ApiModelProperty(value = "根据图片生成的faceId")
+		private String faceCode;
+	/**
+	* 小区省（id）
+	*/
+		@ApiModelProperty(value = "小区省（id）")
+		private String regionProvince;
+	/**
+	* 小区市（id）
+	*/
+		@ApiModelProperty(value = "小区市（id）")
+		private String regionCity;
+	/**
+	* 小区区/县（id）
+	*/
+		@ApiModelProperty(value = "小区区/县（id）")
+		private String regionArea;
+	/**
+	* 住户来源创建类型，0-小程序添加 1-后台添加  2-后台导入 3-app添加
+	*/
+		@ApiModelProperty(value = "住户来源创建类型，0-小程序添加 1-后台添加  2-后台导入 3-app添加")
+		private Integer createType;
+	/**
+	* 创建时间
+	*/
+		@ApiModelProperty(value = "创建时间")
+		private LocalDateTime createDate;
+	/**
+	* 是否激活App
+	*/
+		@ApiModelProperty(value = "是否激活App")
+		private Integer isMember;
+	/**
+	* 住户类型 1-业主 2-成员 3-租户
+	*/
+		@ApiModelProperty(value = "住户类型 1-业主 2-成员 3-租户")
+		private Integer type;
+	/**
+	* 民族
+	*/
+		@ApiModelProperty(value = "民族")
+		private Integer nation;
+	/**
+	* 政治面貌
+	*/
+		@ApiModelProperty(value = "政治面貌")
+		private Integer political;
+	/**
+	* 文化程度
+	*/
+		@ApiModelProperty(value = "文化程度")
+		private Integer education;
+	/**
+	* 旧平台id
+	*/
+		@ApiModelProperty(value = "旧平台id")
+		private String oldId;
+	/**
+	* 人员标签
+	*/
+		@ApiModelProperty(value = "人员标签")
+		private String personTag;
+
+
+}

blade-service-api/community-api/src/main/java/org/springblade/community/entity/Residential.java

@@ -16,20 +16,18 @@
  */
 package org.springblade.community.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.mp.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号实体类
  *
  * @author BladeX
- * @since 2020-10-16
+ * @since 2021-03-29
  */
 @Data
 @TableName("community_residential")
@@ -39,176 +37,106 @@ public class Residential extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 
-
-
-	@ApiModelProperty("主键id")
-	@TableId(
-		value = "id",
-		type = IdType.ASSIGN_ID
-	)
-	private Long id;
-	/**
-	 * 旧平台id
-	 */
-	@ApiModelProperty(value = "旧平台id")
-	private Long oldId;
-
 	/**
 	* 小区名字
 	*/
 		@ApiModelProperty(value = "小区名字")
 		private String name;
 	/**
-	* 小区编号 (固定字母A+数字自增，物业内唯一)
+	* 社区id
 	*/
-		@ApiModelProperty(value = "小区编号 (固定字母A+数字自增，物业内唯一)")
-		private String residentialNumber;
-
-
-	/**
-	* 存储位置（通过该字段快速查询，所有的子节点）
-	*/
-		@ApiModelProperty(value = "存储位置（通过该字段快速查询，所有的子节点）")
-		private String orgPosition;
-
+		@ApiModelProperty(value = "社区id")
+		private Long agencyId;
 	/**
-	* 所属物业名称
+	* 社区名称
 	*/
-		@ApiModelProperty(value = "所属物业名称")
-		private String estatePidName;
-
+		@ApiModelProperty(value = "社区名称")
+		private String agencyName;
 	/**
-	 * 物业联系电话
-	 */
-	@ApiModelProperty(value = "物业联系电话")
-	private String estatePidPhone;
-
-	/**
-	* 省code
+	* 省（id）
 	*/
-		@ApiModelProperty(value = "省code")
+		@ApiModelProperty(value = "省（id）")
 		private String regionProvince;
 	/**
-	* 市code
+	* 市（id）
 	*/
-		@ApiModelProperty(value = "市code")
+		@ApiModelProperty(value = "市（id）")
 		private String regionCity;
 	/**
-	* 区/县code
+	* 区/县（id）
 	*/
-		@ApiModelProperty(value = "区/县（code）")
+		@ApiModelProperty(value = "区/县（id）")
 		private String regionArea;
 	/**
-	* 地区（广东省广州市天河区）
-	*/
-		@ApiModelProperty(value = "地区（广东省广州市天河区）")
-		private String region;
-	/**
 	* 详细地址
 	*/
 		@ApiModelProperty(value = "详细地址")
 		private String address;
 	/**
-	* 单元总数
+	* 经度
 	*/
-		@ApiModelProperty(value = "单元总数")
-		private Integer totalUnitNumber;
+		@ApiModelProperty(value = "经度")
+		private String longitude;
 	/**
-	* 房间总数
+	* 纬度
 	*/
-		@ApiModelProperty(value = "房间总数")
-		private Integer totalRoomNumber;
+		@ApiModelProperty(value = "纬度")
+		private String latitude;
 	/**
-	* 住户总数
+	* 楼栋总数
 	*/
-		@ApiModelProperty(value = "住户总数")
-		private Integer totalUserNumber;
+		@ApiModelProperty(value = "楼栋总数")
+		private Integer buildingCount;
 	/**
-	 * 楼栋总数
-	 */
-	@ApiModelProperty(value = "楼栋总数")
-	private Integer buildingNumber;
-
-	/**
-	 * 楼层数
-	 */
-	@ApiModelProperty(value = "楼层数")
-	private Integer floorNumber;
-	/**
-	* 已录单元数量
+	* 单元总数
 	*/
-		@ApiModelProperty(value = "已录单元数量")
-		private Integer unitNumber;
+		@ApiModelProperty(value = "单元总数")
+		private Integer unitCount;
 	/**
-	* 已录房间数量
+	* 楼层总数
 	*/
-		@ApiModelProperty(value = "已录房间数量")
-		private Integer roomNumber;
+		@ApiModelProperty(value = "楼层总数")
+		private Integer floorCount;
 	/**
-	* 已录住户数量
+	* 房间总数
 	*/
-		@ApiModelProperty(value = "已录住户数量")
-		private Integer userNumber;
+		@ApiModelProperty(value = "房间总数")
+		private Integer roomCount;
 	/**
-	* 已录入人脸住户数
+	* 住户总数
 	*/
-		@ApiModelProperty(value = "已录入人脸住户数")
-		private Integer userFaceNumber;
+		@ApiModelProperty(value = "住户总数")
+		private Integer userCount;
 	/**
-	* 负责人姓名
+	* 所属物业名称
 	*/
-		@ApiModelProperty(value = "负责人姓名")
-		private String personName;
+		@ApiModelProperty(value = "所属物业名称")
+		private String estateName;
 	/**
-	* 负责人电话
+	* 所属物业联系方式
 	*/
-		@ApiModelProperty(value = "负责人电话")
-		private String personTel;
+		@ApiModelProperty(value = "所属物业联系方式")
+		private String estatePhone;
 	/**
 	* 备注
 	*/
 		@ApiModelProperty(value = "备注")
 		private String remark;
-
-	/**
-	 * 社区id
-	 */
-	@ApiModelProperty(value = "社区id")
-	private Long agencyId;
-
 	/**
-	 * 社区名称
-	 */
-	@ApiModelProperty(value = "社区名称")
-	private String agencyName;
-
-
-	/**
-	 * 经度
-	 */
-	@ApiModelProperty(value = "经度")
-	private String longitude;
-
+	* 小区图片
+	*/
+		@ApiModelProperty(value = "小区图片")
+		private String pic;
 	/**
-	 * 纬度
-	 */
-	@ApiModelProperty(value = "纬度")
-	private String latitude;
-
-
-
-
+	* 旧平台id
+	*/
+		@ApiModelProperty(value = "旧平台id")
+		private Long oldId;
 	/**
-	 * 图片
-	 */
-	@ApiModelProperty(value = "图片")
-	private String pic;
-
+	* 机构路径
+	*/
+		@ApiModelProperty(value = "机构路径")
+		private String orgPosition;
 
-	/**
-	 * 所属租户
-	 */
-	@ApiModelProperty(value = "所属租户")
-	private String tenantId;
 
 }

blade-service-api/community-api/src/main/java/org/springblade/community/entity/Room.java

@@ -16,20 +16,19 @@
  */
 package org.springblade.community.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.mp.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 房间表实体类
  *
  * @author BladeX
- * @since 2020-10-18
+ * @since 2021-03-29
  */
 @Data
 @TableName("community_room")
@@ -39,131 +38,96 @@ public class Room extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 
-
-	@ApiModelProperty("主键id")
-	@TableId(
-		value = "id",
-		type = IdType.ASSIGN_ID
-	)
-	private Long id;
-	/**
-	 * 旧平台id
-	 */
-	@ApiModelProperty(value = "旧平台id")
-	private Long oldId;
-	/**
-	 * 所属楼栋id
-	 */
-	@ApiModelProperty(value = "所属楼栋id")
-	private Long buildingId;
-
-	/**
-	 * 所属楼栋名称
-	 */
-	@ApiModelProperty(value = "所属楼栋名称")
-	private String buildingName;
-
-	/**
-	 * 所属楼层id
-	 */
-	@ApiModelProperty(value = "所属楼层id")
-	private Long floorId;
-
-	/**
-	 * 所属楼层名称
-	 */
-	@ApiModelProperty(value = "所属楼层名称")
-	private String floorName;
-
-
-
 	/**
 	* 房间名称
 	*/
 		@ApiModelProperty(value = "房间名称")
 		private String name;
 	/**
-	* 门牌号-限制数字，单元楼下唯一
+	* 社区id
 	*/
-		@ApiModelProperty(value = "门牌号-限制数字，单元楼下唯一  ")
-		private String houseNumber;
+		@ApiModelProperty(value = "社区id")
+		private Long agencyId;
 	/**
-	* 所属单元id
+	* 社区名称
 	*/
-		@ApiModelProperty(value = "所属单元id")
-		private Long unitId;
+		@ApiModelProperty(value = "社区名称")
+		private String agencyName;
 	/**
-	* 所属单元名称
+	* 小区id
 	*/
-		@ApiModelProperty(value = "所属单元名称")
-		private String unitName;
+		@ApiModelProperty(value = "小区id")
+		private Long residentialId;
 	/**
-	* 所属社区id
+	* 小区名称
 	*/
-		@ApiModelProperty(value = "所属单元id")
-		private Long agencyId;
+		@ApiModelProperty(value = "小区名称")
+		private String residentialName;
 	/**
-	* 所属单元名称
+	* 楼栋id
 	*/
-		@ApiModelProperty(value = "所属社区名称")
-		private String agencyName;
+		@ApiModelProperty(value = "楼栋id")
+		private Long buildingId;
 	/**
-	* 存储位置（通过该字段快速查询，所有的子节点）
+	* 楼栋名称
 	*/
-		@ApiModelProperty(value = "存储位置（通过该字段快速查询，所有的子节点）")
-		private String orgPosition;
-
+		@ApiModelProperty(value = "楼栋名称")
+		private String buildingName;
+	/**
+	* 单元id
+	*/
+		@ApiModelProperty(value = "单元id")
+		private Long unitId;
+	/**
+	* 单元名称
+	*/
+		@ApiModelProperty(value = "单元名称")
+		private String unitName;
+	/**
+	* 楼层id
+	*/
+		@ApiModelProperty(value = "楼层id")
+		private Long floorId;
+	/**
+	* 楼层名称
+	*/
+		@ApiModelProperty(value = "楼层名称")
+		private String floorName;
 	/**
 	* 房屋面积m2
 	*/
 		@ApiModelProperty(value = "房屋面积m2")
-		private Double area;
+		private BigDecimal area;
 	/**
 	* 户型
 	*/
 		@ApiModelProperty(value = "户型")
 		private String houseType;
 	/**
-	* 楼层
-	*/
-		@ApiModelProperty(value = "楼层")
-		private String floor;
-	/**
-	* 装饰
-	*/
-		@ApiModelProperty(value = "装饰")
-		private String ornament;
-	/**
 	* 房屋朝向
 	*/
 		@ApiModelProperty(value = "房屋朝向")
 		private String orientation;
 	/**
-	* i_user_number
+	* 住户数
 	*/
-		@ApiModelProperty(value = "i_user_number")
-		private Integer userNumber;
-	/**
-	* 序号
-	*/
-		@ApiModelProperty(value = "序号")
-		private Integer serial;
+		@ApiModelProperty(value = "住户数")
+		private Integer userCount;
 	/**
 	* 备注
 	*/
 		@ApiModelProperty(value = "备注")
 		private String remark;
 	/**
-	* 所属小区id
+	* 旧平台id
 	*/
-		@ApiModelProperty(value = "所属小区id")
-		private Long residentialId;
+		@ApiModelProperty(value = "旧平台id")
+		private Long oldId;
 	/**
-	* 所属小区名称
+	* 机构路径
 	*/
-		@ApiModelProperty(value = "所属小区名称")
-		private String residentialName;
+		@ApiModelProperty(value = "机构路径")
+		private String orgPosition;
 
 
-		private String tenantId;
 }

blade-service-api/community-api/src/main/java/org/springblade/community/entity/Unit.java

@@ -16,22 +16,19 @@
  */
 package org.springblade.community.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
-
 import java.time.LocalDateTime;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 单元表实体类
  *
  * @author BladeX
- * @since 2020-10-18
+ * @since 2021-03-29
  */
 @Data
 @TableName("community_unit")
@@ -41,61 +38,41 @@ public class Unit extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty("主键id")
-	@TableId(
-		value = "id",
-		type = IdType.ASSIGN_ID
-	)
-	private Long id;
-	private Long oldId;
-
-	private Long buildingId;
-
-	private String buildingName;
-
 	/**
-	* 单元名称-只能输入数字和字母
+	* 单元名称
 	*/
-		@ApiModelProperty(value = "单元名称-只能输入数字和字母")
+		@ApiModelProperty(value = "单元名称")
 		private String name;
 	/**
-	* 单元编号
+	* 社区id
 	*/
-		@ApiModelProperty(value = "单元编号")
-		private String unitNumber;
-
-	/**
-	 * 单元楼类型
-	 */
-		@ApiModelProperty(value = "单元楼类型")
-		private Integer type;
+		@ApiModelProperty(value = "社区id")
+		private Long agencyId;
 	/**
+	* 社区名称
+	*/
+		@ApiModelProperty(value = "社区名称")
+		private String agencyName;
 	/**
-	* 所属小区id
+	* 小区id
 	*/
-		@ApiModelProperty(value = "所属小区id")
+		@ApiModelProperty(value = "小区id")
 		private Long residentialId;
 	/**
-	* 所属小区名称
+	* 小区名称
 	*/
-		@ApiModelProperty(value = "所属小区名称")
+		@ApiModelProperty(value = "小区名称")
 		private String residentialName;
 	/**
-	* 所属网格id
+	* 楼栋id
 	*/
-		@ApiModelProperty(value = "所属网格id")
-		private Long agencyId;
+		@ApiModelProperty(value = "楼栋id")
+		private Long buildingId;
 	/**
-	* 所属小区名称
+	* 楼栋名称
 	*/
-		@ApiModelProperty(value = "所属网格名称")
-		private String agencyName;
-	/**
-	* 存储位置（通过该字段快速查询，所有的子节点）
-	*/
-		@ApiModelProperty(value = "存储位置（通过该字段快速查询，所有的子节点）")
-		private String orgPosition;
-
+		@ApiModelProperty(value = "楼栋名称")
+		private String buildingName;
 	/**
 	* 负责人姓名
 	*/
@@ -112,52 +89,50 @@ public class Unit extends BaseEntity {
 		@ApiModelProperty(value = "建筑年代")
 		private String builtYear;
 	/**
-	* 产权性质
-	*/
-		@ApiModelProperty(value = "产权性质")
-		private String propertyNature;
-	/**
 	* 有无电梯
 	*/
 		@ApiModelProperty(value = "有无电梯")
 		private String includingElevator;
 	/**
+	* 楼层数
+	*/
+		@ApiModelProperty(value = "楼层数")
+		private Integer floorCount;
+	/**
 	* 房间数量
 	*/
 		@ApiModelProperty(value = "房间数量")
-		private Integer roomNumber;
+		private Integer roomCount;
 	/**
 	* 住户数量
 	*/
 		@ApiModelProperty(value = "住户数量")
-		private Integer userNumber;
-
+		private Integer userCount;
 	/**
-	 * 楼层数
-	 */
-	@ApiModelProperty(value = "楼层数")
-	private Integer floorNumber;
-	/**
-	* 序号
+	* 单元楼图片
 	*/
-		@ApiModelProperty(value = "序号")
-		private Integer serial;
+		@ApiModelProperty(value = "单元楼图片")
+		private String pic;
 	/**
 	* 备注
 	*/
 		@ApiModelProperty(value = "备注")
 		private String remark;
-
 	/**
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
 		private LocalDateTime createDate;
-
-		private String pic;
-
-	@ApiModelProperty(value = "租户id")
-	private String tenantId;
+	/**
+	* 旧平台id
+	*/
+		@ApiModelProperty(value = "旧平台id")
+		private Long oldId;
+	/**
+	* 机构路径
+	*/
+		@ApiModelProperty(value = "机构路径")
+		private String orgPosition;
 
 
 }

blade-service-api/community-api/src/main/java/org/springblade/community/feign/AgencyClientFallback.java

@@ -0,0 +1,62 @@
+package org.springblade.community.feign;
+
+import org.springblade.community.entity.Agency;
+import org.springblade.community.vo.AgencyVO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class AgencyClientFallback implements IAgencyClient {
+            /**
+         * 详情
+         */
+        @Override
+        public AgencyVO detail(Agency agency) {
+            return null;
+        }
+
+        /**
+         * 查询
+         */
+        @Override
+        public List<AgencyVO> list(Agency agency) {
+            return null;
+        }
+
+
+
+        /**
+         * 新增
+         */
+        @Override
+        public boolean save( Agency agency) {
+            return false;
+        }
+
+        /**
+         * 修改
+         */
+        @Override
+        public boolean update( Agency agency) {
+            return false;
+        }
+
+        /**
+         * 新增或修改
+         */
+        @Override
+        public boolean submit( Agency agency) {
+            return false;
+        }
+
+
+        /**
+         * 删除
+         */
+        @Override
+        public boolean remove( String ids) {
+            return false;
+        }
+
+    }

blade-service-api/community-api/src/main/java/org/springblade/community/feign/BuildingClientFallback.java

@@ -0,0 +1,62 @@
+package org.springblade.community.feign;
+
+import org.springblade.community.entity.Building;
+import org.springblade.community.vo.BuildingVO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class BuildingClientFallback implements IBuildingClient {
+            /**
+         * 详情
+         */
+        @Override
+        public BuildingVO detail(Building building) {
+            return null;
+        }
+
+        /**
+         * 查询
+         */
+        @Override
+        public List<BuildingVO> list(Building building) {
+            return null;
+        }
+
+
+
+        /**
+         * 新增
+         */
+        @Override
+        public boolean save( Building building) {
+            return false;
+        }
+
+        /**
+         * 修改
+         */
+        @Override
+        public boolean update( Building building) {
+            return false;
+        }
+
+        /**
+         * 新增或修改
+         */
+        @Override
+        public boolean submit( Building building) {
+            return false;
+        }
+
+
+        /**
+         * 删除
+         */
+        @Override
+        public boolean remove( String ids) {
+            return false;
+        }
+
+    }

blade-service-api/community-api/src/main/java/org/springblade/community/feign/FloorClientFallback.java

@@ -0,0 +1,62 @@
+package org.springblade.community.feign;
+
+import org.springblade.community.entity.Floor;
+import org.springblade.community.vo.FloorVO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class FloorClientFallback implements IFloorClient {
+            /**
+         * 详情
+         */
+        @Override
+        public FloorVO detail(Floor floor) {
+            return null;
+        }
+
+        /**
+         * 查询
+         */
+        @Override
+        public List<FloorVO> list(Floor floor) {
+            return null;
+        }
+
+
+
+        /**
+         * 新增
+         */
+        @Override
+        public boolean save( Floor floor) {
+            return false;
+        }
+
+        /**
+         * 修改
+         */
+        @Override
+        public boolean update( Floor floor) {
+            return false;
+        }
+
+        /**
+         * 新增或修改
+         */
+        @Override
+        public boolean submit( Floor floor) {
+            return false;
+        }
+
+
+        /**
+         * 删除
+         */
+        @Override
+        public boolean remove( String ids) {
+            return false;
+        }
+
+    }

blade-service-api/community-api/src/main/java/org/springblade/community/feign/HouseuserClientFallback.java

@@ -0,0 +1,62 @@
+package org.springblade.community.feign;
+
+import org.springblade.community.entity.Houseuser;
+import org.springblade.community.vo.HouseuserVO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class HouseuserClientFallback implements IHouseuserClient {
+            /**
+         * 详情
+         */
+        @Override
+        public HouseuserVO detail(Houseuser houseuser) {
+            return null;
+        }
+
+        /**
+         * 查询 住户表
+         */
+        @Override
+        public List<HouseuserVO> list(Houseuser houseuser) {
+            return null;
+        }
+
+
+
+        /**
+         * 新增 住户表
+         */
+        @Override
+        public boolean save( Houseuser houseuser) {
+            return false;
+        }
+
+        /**
+         * 修改 住户表
+         */
+        @Override
+        public boolean update( Houseuser houseuser) {
+            return false;
+        }
+
+        /**
+         * 新增或修改 住户表
+         */
+        @Override
+        public boolean submit( Houseuser houseuser) {
+            return false;
+        }
+
+
+        /**
+         * 删除 住户表
+         */
+        @Override
+        public boolean remove( String ids) {
+            return false;
+        }
+
+    }

blade-service-api/community-api/src/main/java/org/springblade/community/feign/IAgencyClient.java

@@ -0,0 +1,63 @@
+package org.springblade.community.feign;
+
+import io.swagger.annotations.ApiParam;
+import org.springblade.community.entity.Agency;
+import org.springblade.community.vo.AgencyVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *  Feign
+ *
+ * @author lianghanqiang
+ * @since 2021-03-29
+ */
+@FeignClient(value = "blade-community",path = "/feign/agency")
+public interface IAgencyClient  {
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+    AgencyVO detail(Agency agency);
+
+	/**
+	 * 查询 
+	 */
+	@GetMapping("/list")
+    List<AgencyVO> list(Agency agency);
+
+
+
+	/**
+	 * 新增 
+	 */
+	@PostMapping("/save")
+	boolean save(@Valid @RequestBody Agency agency);
+
+	/**
+	 * 修改 
+	 */
+	@PostMapping("/update")
+    boolean update(@Valid @RequestBody Agency agency);
+
+	/**
+	 * 新增或修改 
+	 */
+	@PostMapping("/submit")
+    boolean submit(@Valid @RequestBody Agency agency);
+
+	
+	/**
+	 * 删除 
+	 */
+	@PostMapping("/remove")
+    boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
+
+	
+}

blade-service-api/community-api/src/main/java/org/springblade/community/feign/IBuildingClient.java

@@ -0,0 +1,63 @@
+package org.springblade.community.feign;
+
+import io.swagger.annotations.ApiParam;
+import org.springblade.community.entity.Building;
+import org.springblade.community.vo.BuildingVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *  Feign
+ *
+ * @author lianghanqiang
+ * @since 2021-03-29
+ */
+@FeignClient(value = "blade-community",path = "/feign/building")
+public interface IBuildingClient  {
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+    BuildingVO detail(Building building);
+
+	/**
+	 * 查询 
+	 */
+	@GetMapping("/list")
+    List<BuildingVO> list(Building building);
+
+
+
+	/**
+	 * 新增 
+	 */
+	@PostMapping("/save")
+	boolean save(@Valid @RequestBody Building building);
+
+	/**
+	 * 修改 
+	 */
+	@PostMapping("/update")
+    boolean update(@Valid @RequestBody Building building);
+
+	/**
+	 * 新增或修改 
+	 */
+	@PostMapping("/submit")
+    boolean submit(@Valid @RequestBody Building building);
+
+	
+	/**
+	 * 删除 
+	 */
+	@PostMapping("/remove")
+    boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
+
+	
+}

blade-service-api/community-api/src/main/java/org/springblade/community/feign/IEstateFeign.java

@@ -1,7 +0,0 @@
-package org.springblade.community.feign;
-
-/**
- * Created By lidexi in 2021/2/23
- **/
-public interface IEstateFeign {
-}

blade-service-api/community-api/src/main/java/org/springblade/community/feign/IFloorClient.java

@@ -0,0 +1,63 @@
+package org.springblade.community.feign;
+
+import io.swagger.annotations.ApiParam;
+import org.springblade.community.entity.Floor;
+import org.springblade.community.vo.FloorVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *  Feign
+ *
+ * @author lianghanqiang
+ * @since 2021-03-29
+ */
+@FeignClient(value = "blade-community",path = "/feign/floor")
+public interface IFloorClient  {
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+    FloorVO detail(Floor floor);
+
+	/**
+	 * 查询 
+	 */
+	@GetMapping("/list")
+    List<FloorVO> list(Floor floor);
+
+
+
+	/**
+	 * 新增 
+	 */
+	@PostMapping("/save")
+	boolean save(@Valid @RequestBody Floor floor);
+
+	/**
+	 * 修改 
+	 */
+	@PostMapping("/update")
+    boolean update(@Valid @RequestBody Floor floor);
+
+	/**
+	 * 新增或修改 
+	 */
+	@PostMapping("/submit")
+    boolean submit(@Valid @RequestBody Floor floor);
+
+	
+	/**
+	 * 删除 
+	 */
+	@PostMapping("/remove")
+    boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
+
+	
+}

blade-service-api/community-api/src/main/java/org/springblade/community/feign/IHouseuserClient.java

@@ -0,0 +1,63 @@
+package org.springblade.community.feign;
+
+import io.swagger.annotations.ApiParam;
+import org.springblade.community.entity.Houseuser;
+import org.springblade.community.vo.HouseuserVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 住户表 Feign
+ *
+ * @author lianghanqiang
+ * @since 2021-03-29
+ */
+@FeignClient(value = "blade-community",path = "/feign/houseuser")
+public interface IHouseuserClient  {
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+    HouseuserVO detail(Houseuser houseuser);
+
+	/**
+	 * 查询 住户表
+	 */
+	@GetMapping("/list")
+    List<HouseuserVO> list(Houseuser houseuser);
+
+
+
+	/**
+	 * 新增 住户表
+	 */
+	@PostMapping("/save")
+	boolean save(@Valid @RequestBody Houseuser houseuser);
+
+	/**
+	 * 修改 住户表
+	 */
+	@PostMapping("/update")
+    boolean update(@Valid @RequestBody Houseuser houseuser);
+
+	/**
+	 * 新增或修改 住户表
+	 */
+	@PostMapping("/submit")
+    boolean submit(@Valid @RequestBody Houseuser houseuser);
+
+	
+	/**
+	 * 删除 住户表
+	 */
+	@PostMapping("/remove")
+    boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
+
+	
+}

blade-service-api/community-api/src/main/java/org/springblade/community/feign/IResidentialClient.java

@@ -0,0 +1,63 @@
+package org.springblade.community.feign;
+
+import io.swagger.annotations.ApiParam;
+import org.springblade.community.entity.Residential;
+import org.springblade.community.vo.ResidentialVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号 Feign
+ *
+ * @author lianghanqiang
+ * @since 2021-03-29
+ */
+@FeignClient(value = "blade-community",path = "/feign/residential")
+public interface IResidentialClient  {
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+    ResidentialVO detail(Residential residential);
+
+	/**
+	 * 查询 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号
+	 */
+	@GetMapping("/list")
+    List<ResidentialVO> list(Residential residential);
+
+
+
+	/**
+	 * 新增 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号
+	 */
+	@PostMapping("/save")
+	boolean save(@Valid @RequestBody Residential residential);
+
+	/**
+	 * 修改 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号
+	 */
+	@PostMapping("/update")
+    boolean update(@Valid @RequestBody Residential residential);
+
+	/**
+	 * 新增或修改 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号
+	 */
+	@PostMapping("/submit")
+    boolean submit(@Valid @RequestBody Residential residential);
+
+	
+	/**
+	 * 删除 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号
+	 */
+	@PostMapping("/remove")
+    boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
+
+	
+}

blade-service-api/community-api/src/main/java/org/springblade/community/feign/IRoomClient.java

@@ -0,0 +1,63 @@
+package org.springblade.community.feign;
+
+import io.swagger.annotations.ApiParam;
+import org.springblade.community.entity.Room;
+import org.springblade.community.vo.RoomVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 房间表 Feign
+ *
+ * @author lianghanqiang
+ * @since 2021-03-29
+ */
+@FeignClient(value = "blade-community",path = "/feign/room")
+public interface IRoomClient  {
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+    RoomVO detail(Room room);
+
+	/**
+	 * 查询 房间表
+	 */
+	@GetMapping("/list")
+    List<RoomVO> list(Room room);
+
+
+
+	/**
+	 * 新增 房间表
+	 */
+	@PostMapping("/save")
+	boolean save(@Valid @RequestBody Room room);
+
+	/**
+	 * 修改 房间表
+	 */
+	@PostMapping("/update")
+    boolean update(@Valid @RequestBody Room room);
+
+	/**
+	 * 新增或修改 房间表
+	 */
+	@PostMapping("/submit")
+    boolean submit(@Valid @RequestBody Room room);
+
+	
+	/**
+	 * 删除 房间表
+	 */
+	@PostMapping("/remove")
+    boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
+
+	
+}

blade-service-api/community-api/src/main/java/org/springblade/community/feign/IUnitClient.java

@@ -0,0 +1,63 @@
+package org.springblade.community.feign;
+
+import io.swagger.annotations.ApiParam;
+import org.springblade.community.entity.Unit;
+import org.springblade.community.vo.UnitVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 单元表 Feign
+ *
+ * @author lianghanqiang
+ * @since 2021-03-29
+ */
+@FeignClient(value = "blade-community",path = "/feign/unit")
+public interface IUnitClient  {
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+    UnitVO detail(Unit unit);
+
+	/**
+	 * 查询 单元表
+	 */
+	@GetMapping("/list")
+    List<UnitVO> list(Unit unit);
+
+
+
+	/**
+	 * 新增 单元表
+	 */
+	@PostMapping("/save")
+	boolean save(@Valid @RequestBody Unit unit);
+
+	/**
+	 * 修改 单元表
+	 */
+	@PostMapping("/update")
+    boolean update(@Valid @RequestBody Unit unit);
+
+	/**
+	 * 新增或修改 单元表
+	 */
+	@PostMapping("/submit")
+    boolean submit(@Valid @RequestBody Unit unit);
+
+	
+	/**
+	 * 删除 单元表
+	 */
+	@PostMapping("/remove")
+    boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
+
+	
+}

blade-service-api/community-api/src/main/java/org/springblade/community/feign/ResidentialClientFallback.java

@@ -0,0 +1,62 @@
+package org.springblade.community.feign;
+
+import org.springblade.community.entity.Residential;
+import org.springblade.community.vo.ResidentialVO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class ResidentialClientFallback implements IResidentialClient {
+            /**
+         * 详情
+         */
+        @Override
+        public ResidentialVO detail(Residential residential) {
+            return null;
+        }
+
+        /**
+         * 查询 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号
+         */
+        @Override
+        public List<ResidentialVO> list(Residential residential) {
+            return null;
+        }
+
+
+
+        /**
+         * 新增 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号
+         */
+        @Override
+        public boolean save( Residential residential) {
+            return false;
+        }
+
+        /**
+         * 修改 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号
+         */
+        @Override
+        public boolean update( Residential residential) {
+            return false;
+        }
+
+        /**
+         * 新增或修改 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号
+         */
+        @Override
+        public boolean submit( Residential residential) {
+            return false;
+        }
+
+
+        /**
+         * 删除 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号
+         */
+        @Override
+        public boolean remove( String ids) {
+            return false;
+        }
+
+    }

blade-service-api/community-api/src/main/java/org/springblade/community/feign/RoomClientFallback.java

@@ -0,0 +1,62 @@
+package org.springblade.community.feign;
+
+import org.springblade.community.entity.Room;
+import org.springblade.community.vo.RoomVO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class RoomClientFallback implements IRoomClient {
+            /**
+         * 详情
+         */
+        @Override
+        public RoomVO detail(Room room) {
+            return null;
+        }
+
+        /**
+         * 查询 房间表
+         */
+        @Override
+        public List<RoomVO> list(Room room) {
+            return null;
+        }
+
+
+
+        /**
+         * 新增 房间表
+         */
+        @Override
+        public boolean save( Room room) {
+            return false;
+        }
+
+        /**
+         * 修改 房间表
+         */
+        @Override
+        public boolean update( Room room) {
+            return false;
+        }
+
+        /**
+         * 新增或修改 房间表
+         */
+        @Override
+        public boolean submit( Room room) {
+            return false;
+        }
+
+
+        /**
+         * 删除 房间表
+         */
+        @Override
+        public boolean remove( String ids) {
+            return false;
+        }
+
+    }

blade-service-api/community-api/src/main/java/org/springblade/community/feign/UnitClientFallback.java

@@ -0,0 +1,62 @@
+package org.springblade.community.feign;
+
+import org.springblade.community.entity.Unit;
+import org.springblade.community.vo.UnitVO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class UnitClientFallback implements IUnitClient {
+            /**
+         * 详情
+         */
+        @Override
+        public UnitVO detail(Unit unit) {
+            return null;
+        }
+
+        /**
+         * 查询 单元表
+         */
+        @Override
+        public List<UnitVO> list(Unit unit) {
+            return null;
+        }
+
+
+
+        /**
+         * 新增 单元表
+         */
+        @Override
+        public boolean save( Unit unit) {
+            return false;
+        }
+
+        /**
+         * 修改 单元表
+         */
+        @Override
+        public boolean update( Unit unit) {
+            return false;
+        }
+
+        /**
+         * 新增或修改 单元表
+         */
+        @Override
+        public boolean submit( Unit unit) {
+            return false;
+        }
+
+
+        /**
+         * 删除 单元表
+         */
+        @Override
+        public boolean remove( String ids) {
+            return false;
+        }
+
+    }

blade-service-api/community-api/src/main/java/org/springblade/community/vo/AgencyVO.java

@@ -16,17 +16,16 @@
  */
 package org.springblade.community.vo;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import org.springblade.community.entity.Agency;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.community.entity.Agency;
+import io.swagger.annotations.ApiModel;
 
 /**
  * 视图实体类
  *
  * @author BladeX
- * @since 2020-10-27
+ * @since 2021-03-29
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -34,18 +33,4 @@ import org.springblade.community.entity.Agency;
 public class AgencyVO extends Agency {
 	private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty("省名")
-	private String provinceName;
-
-	@ApiModelProperty("市名")
-	private String cityName;
-
-	@ApiModelProperty("区名")
-	private String areaName;
-
-	@ApiModelProperty("街道名")
-	private String streetName;
-
-
-
 }

blade-service-api/community-api/src/main/java/org/springblade/community/vo/BuildingVO.java

@@ -16,16 +16,16 @@
  */
 package org.springblade.community.vo;
 
-import io.swagger.annotations.ApiModel;
+import org.springblade.community.entity.Building;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.community.entity.Building;
+import io.swagger.annotations.ApiModel;
 
 /**
  * 视图实体类
  *
  * @author BladeX
- * @since 2020-10-31
+ * @since 2021-03-29
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

blade-service-api/community-api/src/main/java/org/springblade/community/vo/FloorVO.java

@@ -16,16 +16,16 @@
  */
 package org.springblade.community.vo;
 
-import io.swagger.annotations.ApiModel;
+import org.springblade.community.entity.Floor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.community.entity.Floor;
+import io.swagger.annotations.ApiModel;
 
 /**
  * 视图实体类
  *
  * @author BladeX
- * @since 2020-11-06
+ * @since 2021-03-29
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

blade-service-api/community-api/src/main/java/org/springblade/community/vo/HouseuserVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.community.vo;
+
+import org.springblade.community.entity.Houseuser;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 住户表视图实体类
+ *
+ * @author BladeX
+ * @since 2021-03-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "HouseuserVO对象", description = "住户表")
+public class HouseuserVO extends Houseuser {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/community-api/src/main/java/org/springblade/community/vo/ResidentialVO.java

@@ -16,20 +16,20 @@
  */
 package org.springblade.community.vo;
 
-import io.swagger.annotations.ApiModel;
+import org.springblade.community.entity.Residential;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.community.entity.Residential;
+import io.swagger.annotations.ApiModel;
 
 /**
- * 小区表，
+ * 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号视图实体类
  *
  * @author BladeX
- * @since 2020-10-16
+ * @since 2021-03-29
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "ResidentialVO对象", description = "小区表")
+@ApiModel(value = "ResidentialVO对象", description = "小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号")
 public class ResidentialVO extends Residential {
 	private static final long serialVersionUID = 1L;
 

blade-service-api/community-api/src/main/java/org/springblade/community/vo/RoomVO.java

@@ -16,16 +16,16 @@
  */
 package org.springblade.community.vo;
 
-import io.swagger.annotations.ApiModel;
+import org.springblade.community.entity.Room;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.community.entity.Room;
+import io.swagger.annotations.ApiModel;
 
 /**
  * 房间表视图实体类
  *
  * @author BladeX
- * @since 2020-10-18
+ * @since 2021-03-29
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

blade-service-api/community-api/src/main/java/org/springblade/community/vo/UnitVO.java

@@ -16,16 +16,16 @@
  */
 package org.springblade.community.vo;
 
-import io.swagger.annotations.ApiModel;
+import org.springblade.community.entity.Unit;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.community.entity.Unit;
+import io.swagger.annotations.ApiModel;
 
 /**
  * 单元表视图实体类
  *
  * @author BladeX
- * @since 2020-10-18
+ * @since 2021-03-29
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

blade-service/community/src/main/java/org/springblade/community/controller/AgencyController.java

@@ -16,56 +16,39 @@
  */
 package org.springblade.community.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import org.springblade.community.entity.Agency;
-import org.springblade.community.service.IAgencyService;
-import org.springblade.community.vo.AgencyVO;
-import org.springblade.community.wrapper.AgencyWrapper;
-import org.springblade.core.boot.ctrl.BladeController;
+import javax.validation.Valid;
+
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.system.entity.Role;
-import org.springblade.system.expand.entity.OrgPosition;
-import org.springblade.system.expand.entity.Street;
-import org.springblade.system.expand.feign.IOrgPositionClient;
-import org.springblade.system.expand.feign.IStreetClient;
-import org.springblade.system.expand.feign.ISysAreaClient;
-import org.springblade.system.feign.ISysClient;
 import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.community.entity.Agency;
+import org.springblade.community.vo.AgencyVO;
+import org.springblade.community.wrapper.AgencyWrapper;
+import org.springblade.community.service.IAgencyService;
+import org.springblade.core.boot.ctrl.BladeController;
 
 /**
- * 控制器
+ *  控制器
  *
  * @author BladeX
- * @since 2020-10-27
+ * @since 2021-03-29
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("agency")
-@Api(value = "", tags = "园区接口")
+@RequestMapping("/agency")
+@Api(value = "", tags = "接口")
 public class AgencyController extends BladeController {
 
-
-	private IAgencyService agencyService;
-	private IOrgPositionClient orgPositionClient;
-	private IStreetClient streetClient;
-	private ISysClient sysClient;
-	private ISysAreaClient sysAreaClient;
-
+	private final IAgencyService agencyService;
 
 	/**
 	 * 详情
@@ -73,58 +56,25 @@ public class AgencyController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入agency")
-	public R<Agency> detail(Agency agency) {
+	public R<AgencyVO> detail(Agency agency) {
 		Agency detail = agencyService.getOne(Condition.getQueryWrapper(agency));
-		return R.data(detail);
+		return R.data(AgencyWrapper.build().entityVO(detail));
 	}
 
 	/**
-	 * 分页
+	 * 分页 
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入agency")
-	public R<IPage<Agency>> list(@RequestParam Map<String, Object> agency, Query query, BladeUser bladeUser) {
-
-		String deptId = bladeUser.getDeptId();
-		String[] deptIds = deptId.split(",");
-		LambdaQueryWrapper<Agency> wrapper = Condition.getQueryWrapper(agency, Agency.class).lambda();
-
-		//获取角色信息
-
-		R<Role> role = sysClient.getRole(Long.valueOf(bladeUser.getRoleId()));
-		//非超管，根据tenantId租户id过滤
-		if (!role.getData().getRoleAlias().equals("administrator")){
-			wrapper.eq(Agency::getTenantId,bladeUser.getTenantId());
-		}
-
-		for (int i = 0; i < deptIds.length; i++) {
-//			Dept dept = sysClient.getDept(Long.valueOf(deptIds[i]));
-//			if(dept.getDeptCategory() == 1){//cloud版部门没有分类
-//				return R.data(null);
-//			}
-			OrgPosition orgPosition = orgPositionClient.getByOrgId(deptIds[i]);
-			if (i == 0) {
-				wrapper.like(Agency::getOrgPosition,orgPosition.getOrgPosition());
-			}else{
-				wrapper.or().like(Agency::getOrgPosition,orgPosition.getOrgPosition());
-			}
-		}
-//		LambdaQueryWrapper<Agency> wrapper = new QueryWrapperUtil<Agency>().getBasicQueryWrapper(Agency::getOrgPosition,agency,bladeUser,orgPositionService);
-
-
-
-		IPage<Agency> pages = agencyService.page(Condition.getPage(query), wrapper);
-//		pages.getRecords().parallelStream().forEach(agency1->{
-//			//统计该社区下的小区总数
-//
-//		});
-//		IPage<Agency> pages = agencyService.page(Condition.getPage(query), Condition.getQueryWrapper(agency,Agency.class));
-		return R.data(pages);
+	public R<IPage<AgencyVO>> list(Agency agency, Query query) {
+		IPage<Agency> pages = agencyService.page(Condition.getPage(query), Condition.getQueryWrapper(agency));
+		return R.data(AgencyWrapper.build().pageVO(pages));
 	}
 
+
 	/**
-	 * 自定义分页
+	 * 自定义分页 
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -135,60 +85,38 @@ public class AgencyController extends BladeController {
 	}
 
 	/**
-	 * 新增
+	 * 新增 
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入agency")
 	public R save(@Valid @RequestBody Agency agency) {
-		if(agency.getRegionProvince()!=null&&agency.getRegionCity()!=null&&agency.getRegionArea()!=null&&agency.getRegionStreet()!=null){
-			if(agencyService.save(agency)){
-				agency.setOrgPosition("/" + agency.getRegionProvince()+"/"+agency.getRegionCity()+"/"+agency.getRegionArea()+"/"+agency.getRegionStreet()+"/"+agency.getId());
-				agencyService.updateById(agency);
-			}
-		}
-
-		return R.status(false);
+		return R.status(agencyService.save(agency));
 	}
 
 	/**
-	 * 修改
+	 * 修改 
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入agency")
 	public R update(@Valid @RequestBody Agency agency) {
-		if(agency.getRegionProvince()!=null&&agency.getRegionCity()!=null&&agency.getRegionArea()!=null&&agency.getRegionStreet()!=null){
-			agency.setOrgPosition("/" + agency.getRegionProvince()+"/"+agency.getRegionCity()+"/"+agency.getRegionArea()+"/"+agency.getRegionStreet()+"/"+agency.getId());
-			agencyService.updateById(agency);
-		}
-
-		return R.status(false);
+		return R.status(agencyService.updateById(agency));
 	}
 
 	/**
-	 * 新增或修改
+	 * 新增或修改 
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入agency")
 	public R submit(@Valid @RequestBody Agency agency) {
-		Street street = streetClient.getByCode(agency.getRegionStreet());
-		if(agency.getId() != null){
-
-			agency.setOrgPosition(street.getOrgPosition()+"/"+agency.getId());
-			return R.status(agencyService.updateById(agency));
-		}else{
-			agencyService.save(agency);
-
-			agency.setOrgPosition(street.getOrgPosition()+"/"+agency.getId());
-			return R.status(agencyService.updateById(agency));
-		}
+		return R.status(agencyService.saveOrUpdate(agency));
 	}
 
-
+	
 	/**
-	 * 删除
+	 * 删除 
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
@@ -197,61 +125,5 @@ public class AgencyController extends BladeController {
 		return R.status(agencyService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	/**
-	 * 下拉列表
-	 */
-	@GetMapping("/select")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "下拉列表", notes = "agency")
-	public R<List<Agency>> select(@RequestParam Map<String,Object> agency, Integer size, BladeUser bladeUser) {
-
-		String deptId = bladeUser.getDeptId();
-		String[] deptIds = deptId.split(",");
-		LambdaQueryWrapper<Agency> wrapper = Condition.getQueryWrapper(agency,Agency.class).lambda();
-
-		//获取角色信息
-		R<Role> role = sysClient.getRole(Long.valueOf(bladeUser.getRoleId()));
-		//非超管，根据tenantId租户id过滤
-		if (!role.getData().getRoleAlias().equals("administrator")){
-			wrapper.eq(Agency::getTenantId,bladeUser.getTenantId());
-		}
-
-		for (int i = 0; i < deptIds.length; i++) {
-			OrgPosition orgPosition = orgPositionClient.getByOrgId(deptIds[i]);
-			if (i == 0) {
-				wrapper.like(Agency::getOrgPosition,orgPosition.getOrgPosition());
-			}else{
-				wrapper.or().like(Agency::getOrgPosition,orgPosition.getOrgPosition());
-			}
-		}
-		wrapper.last(size != null,"limit " + size);
-		return R.data(this.agencyService.list(wrapper));
-	}
-
-	@GetMapping("/setOrgPosition")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "下拉列表", notes = "agency")
-	public R setOrgPosition(){
-		List<Agency> agencyList = agencyService.getBaseMapper().selectList(new QueryWrapper<>(new Agency()));
-
-		agencyList.parallelStream().forEach(agency -> {
-			agency.setOrgPosition("/"+agency.getRegionProvince()+"/"+agency.getRegionCity()+"/"+agency.getRegionArea()+"/"+agency.getRegionStreet()+"/"+agency.getId());
-			agencyService.updateById(agency);
-		});
-		return new R();
-	}
-
-
-	/**
-	 *获取园区列表
-	 */
-	@GetMapping("/getAgencyList")
-	@ApiOperationSupport(order = 9)
-	@ApiOperation(value = "获取园区列表")
-	public R getAgencyList(){
-		List<Agency> tenantIdList = agencyService.getAgencyList();
-		return R.data(AgencyWrapper.build(streetClient,sysAreaClient).listVO(tenantIdList));
-	}
-
-
+	
 }

blade-service/community/src/main/java/org/springblade/community/controller/BuildingController.java

@@ -16,53 +16,39 @@
  */
 package org.springblade.community.controller;
 
-
-import cn.hutool.core.lang.Assert;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import org.springblade.community.entity.BatchAddInfo;
-import org.springblade.community.entity.Building;
-import org.springblade.community.entity.Residential;
-import org.springblade.community.service.IBuildingService;
-import org.springblade.community.service.IResidentialService;
-import org.springblade.community.vo.BuildingVO;
-import org.springblade.core.boot.ctrl.BladeController;
+import javax.validation.Valid;
+
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.system.expand.entity.OrgPosition;
-import org.springblade.system.expand.feign.IOrgPositionClient;
 import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
-
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.community.entity.Building;
+import org.springblade.community.vo.BuildingVO;
+import org.springblade.community.wrapper.BuildingWrapper;
+import org.springblade.community.service.IBuildingService;
+import org.springblade.core.boot.ctrl.BladeController;
 
 /**
  *  控制器
  *
  * @author BladeX
- * @since 2020-10-31
+ * @since 2021-03-29
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("building")
-@Api(value = "楼栋接口", tags = "楼栋接口")
+@RequestMapping("/building")
+@Api(value = "", tags = "接口")
 public class BuildingController extends BladeController {
 
-	private IResidentialService residentialService;
-	private IBuildingService buildingService;
-
-	private IOrgPositionClient orgPositionClient;
+	private final IBuildingService buildingService;
 
 	/**
 	 * 详情
@@ -70,36 +56,25 @@ public class BuildingController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入building")
-	public R<Building> detail(Building building) {
+	public R<BuildingVO> detail(Building building) {
 		Building detail = buildingService.getOne(Condition.getQueryWrapper(building));
-		return R.data(detail);
+		return R.data(BuildingWrapper.build().entityVO(detail));
 	}
 
 	/**
-	 * 分页
+	 * 分页 
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入building")
-	public R<IPage<Building>> list(Building building, Query query, BladeUser bladeUser) {
-		String deptId = bladeUser.getDeptId();
-		String[] deptIds = deptId.split(",");
-		LambdaQueryWrapper<Building> wrapper = Condition.getQueryWrapper(building).lambda();
-		for(int i=0;i<deptIds.length;i++){
-			OrgPosition orgPosition = orgPositionClient.getByOrgId(deptIds[i]);
-			if(i ==0){
-				wrapper.like(Building::getOrgPosition,orgPosition.getOrgPosition());
-			}else{
-				wrapper.or().like(Building::getOrgPosition,orgPosition.getOrgPosition());
-			}
-		}
-		IPage<Building> pages = buildingService.page(Condition.getPage(query), wrapper.eq(Building::getTenantId,bladeUser.getTenantId()));
-
-		return R.data(pages);
+	public R<IPage<BuildingVO>> list(Building building, Query query) {
+		IPage<Building> pages = buildingService.page(Condition.getPage(query), Condition.getQueryWrapper(building));
+		return R.data(BuildingWrapper.build().pageVO(pages));
 	}
 
+
 	/**
-	 * 自定义分页
+	 * 自定义分页 
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -110,7 +85,7 @@ public class BuildingController extends BladeController {
 	}
 
 	/**
-	 * 新增
+	 * 新增 
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -120,7 +95,7 @@ public class BuildingController extends BladeController {
 	}
 
 	/**
-	 * 修改
+	 * 修改 
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -130,47 +105,18 @@ public class BuildingController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改
+	 * 新增或修改 
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入building")
 	public R submit(@Valid @RequestBody Building building) {
-
-		Long residentialId = building.getResidentialId();
-		Assert.notNull(residentialId, "小区id为空！！！");
-		Residential residential = residentialService.getById(residentialId);
-		Assert.notNull(residential, "找不到该小区！！！");
-
-		if (building.getId() == null){
-			Integer buildingNumber = residential.getBuildingNumber();
-			if ("null".equals(buildingNumber + "")){
-				buildingNumber = 0;
-			}
-			residential.setBuildingNumber(buildingNumber + 1);
-			if (buildingService.save(building)){
-				residentialService.updateById(residential);
-			}
-		}
-
-		building.setResidentialName(residential.getName());
-		building.setOrgPosition(residential.getOrgPosition() + "/" + building.getId());
 		return R.status(buildingService.saveOrUpdate(building));
 	}
 
+	
 	/**
-	 * 批量新增
-	 */
-	@PostMapping("/batchAdd")
-	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "批量添加", notes = "batchAddInfo")
-	public R batchAdd(@Valid @RequestBody BatchAddInfo batchAddInfo) {
-		return R.status(buildingService.batchAddBuilding(batchAddInfo));
-	}
-
-
-	/**
-	 * 删除
+	 * 删除 
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
@@ -179,39 +125,5 @@ public class BuildingController extends BladeController {
 		return R.status(buildingService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	/**
-	 * 下拉列表
-	 */
-	@GetMapping("/select")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "下拉列表", notes = "building")
-	public R<List<Building>> select(@RequestParam Map<String,Object> building, Integer size, BladeUser bladeUser) {
-		String deptId = bladeUser.getDeptId();
-		String[] deptIds = deptId.split(",");
-		LambdaQueryWrapper<Building> wrapper = Condition.getQueryWrapper(building,Building.class).lambda();
-		for (int i = 0; i < deptIds.length; i++) {
-			OrgPosition orgPosition = orgPositionClient.getByOrgId(deptIds[i]);
-			if (i == 0) {
-				wrapper.like(Building::getOrgPosition,orgPosition.getOrgPosition());
-			}else{
-				wrapper.or().like(Building::getOrgPosition,orgPosition.getOrgPosition());
-			}
-		}
-		wrapper.last(size != null,"limit " + size);
-		return R.data(this.buildingService.list(wrapper));
-	}
-
-	@PostMapping("/setOrgPosition")
-	public R setOrgPosition(){
-		List<Building> buildingList = buildingService.getBaseMapper().selectList(new QueryWrapper<>(new Building()));
-		buildingList.parallelStream().forEach(building -> {
-			Residential residential = residentialService.getById(building.getResidentialId());
-			building.setOrgPosition(residential.getOrgPosition()+"/"+building.getId());
-			buildingService.updateById(building);
-		});
-
-		return  new R();
-
-	}
-
+	
 }

blade-service/community/src/main/java/org/springblade/community/controller/FloorController.java

@@ -16,58 +16,39 @@
  */
 package org.springblade.community.controller;
 
-import cn.hutool.core.lang.Assert;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import org.springblade.community.entity.Building;
-import org.springblade.community.entity.Floor;
-import org.springblade.community.entity.Residential;
-import org.springblade.community.entity.Unit;
-import org.springblade.community.service.IBuildingService;
-import org.springblade.community.service.IFloorService;
-import org.springblade.community.service.IResidentialService;
-import org.springblade.community.service.IUnitService;
-import org.springblade.community.vo.FloorVO;
-import org.springblade.community.wrapper.FloorWrapper;
-import org.springblade.core.boot.ctrl.BladeController;
+import javax.validation.Valid;
+
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.system.expand.entity.OrgPosition;
-import org.springblade.system.expand.feign.IOrgPositionClient;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.community.entity.Floor;
+import org.springblade.community.vo.FloorVO;
+import org.springblade.community.wrapper.FloorWrapper;
+import org.springblade.community.service.IFloorService;
+import org.springblade.core.boot.ctrl.BladeController;
 
 /**
  *  控制器
  *
  * @author BladeX
- * @since 2020-11-06
+ * @since 2021-03-29
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("floor")
-@Api(value = "楼层接口", tags = "楼层接口")
+@RequestMapping("/floor")
+@Api(value = "", tags = "接口")
 public class FloorController extends BladeController {
 
-	private IFloorService floorService;
-	private IResidentialService residentialService;
-	private IBuildingService buildingService;
-	private IUnitService unitService;
-
-	private IOrgPositionClient orgPositionClient;
+	private final IFloorService floorService;
 
 	/**
 	 * 详情
@@ -81,30 +62,19 @@ public class FloorController extends BladeController {
 	}
 
 	/**
-	 * 分页
+	 * 分页 
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入floor")
-	public R<IPage<FloorVO>> list(Floor floor, Query query, BladeUser bladeUser) {
-		String deptId = bladeUser.getDeptId();
-		String[] deptIds = deptId.split(",");
-		LambdaQueryWrapper<Floor> wrapper = Condition.getQueryWrapper(floor).lambda();
-		for(int i=0;i<deptIds.length;i++){
-			OrgPosition orgPosition = orgPositionClient.getByOrgId(deptIds[i]);
-			if(i ==0){
-				wrapper.like(Floor::getOrgPosition,orgPosition.getOrgPosition());
-			}else{
-				wrapper.or().like(Floor::getOrgPosition,orgPosition.getOrgPosition());
-			}
-		}
-		IPage<Floor> pages = floorService.page(Condition.getPage(query), wrapper);
+	public R<IPage<FloorVO>> list(Floor floor, Query query) {
+		IPage<Floor> pages = floorService.page(Condition.getPage(query), Condition.getQueryWrapper(floor));
 		return R.data(FloorWrapper.build().pageVO(pages));
 	}
 
 
 	/**
-	 * 自定义分页
+	 * 自定义分页 
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -115,41 +85,17 @@ public class FloorController extends BladeController {
 	}
 
 	/**
-	 * 新增
+	 * 新增 
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入floor")
-	@Transactional
 	public R save(@Valid @RequestBody Floor floor) {
-/*		Agency agency = this.agencyService.getById(floor.getAgencyId());
-		Assert.notNull(agency,"选择的社区不存在");*/
-		Residential residential = this.residentialService.getById(floor.getResidentialId());
-		Assert.notNull(residential,"选择的小区不存在");
-		Building building = this.buildingService.getById(floor.getBuildingId());
-		Assert.notNull(building,"选择的楼栋不存在");
-		Unit unit = this.unitService.getById(floor.getUnitId());
-		Assert.notNull(unit,"选择的单元不存在");
-		if (this.floorService.save(floor)){
-			residential.setFloorNumber(residential.getFloorNumber() == null ? 0 + 1 : residential.getFloorNumber() +1);
-			this.residentialService.updateById(residential);
-			building.setFloorNumber(building.getFloorNumber() == null ? 0 + 1 : building.getFloorNumber() + 1);
-			this.buildingService.updateById(building);
-			unit.setFloorNumber(unit.getFloorNumber() == null ? 0 + 1 : unit.getFloorNumber() +1);
-			this.unitService.updateById(unit);
-		}else {
-			return R.status(false);
-		}
-		floor.setResidentialName(residential.getName());
-		floor.setBuildingName(building.getName());
-		floor.setUnitName(unit.getName());
-		floor.setOrgPosition(unit.getOrgPosition() + "/" + floor.getId());
-		return R.status(this.floorService.updateById(floor));
-//		return R.status(floorService.save(floor));
+		return R.status(floorService.save(floor));
 	}
 
 	/**
-	 * 修改
+	 * 修改 
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -159,7 +105,7 @@ public class FloorController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改
+	 * 新增或修改 
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
@@ -168,9 +114,9 @@ public class FloorController extends BladeController {
 		return R.status(floorService.saveOrUpdate(floor));
 	}
 
-
+	
 	/**
-	 * 删除
+	 * 删除 
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
@@ -179,40 +125,5 @@ public class FloorController extends BladeController {
 		return R.status(floorService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	/**
-	 * 下拉列表
-	 */
-	@GetMapping("/select")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "下拉列表", notes = "传入floor")
-	public R<List<Floor>> select(@RequestParam Map<String,Object> floor, Integer size, BladeUser bladeUser) {
-		String deptId = bladeUser.getDeptId();
-		String[] deptIds = deptId.split(",");
-		LambdaQueryWrapper<Floor> wrapper = Condition.getQueryWrapper(floor,Floor.class).lambda();
-		for (int i = 0; i < deptIds.length; i++) {
-			OrgPosition orgPosition = orgPositionClient.getByOrgId(deptIds[i]);
-			if (i == 0) {
-				wrapper.like(Floor::getOrgPosition,orgPosition.getOrgPosition());
-			}else{
-				wrapper.or().like(Floor::getOrgPosition,orgPosition.getOrgPosition());
-			}
-		}
-		wrapper.last(size != null,"limit " + size);
-		return R.data(this.floorService.list(wrapper));
-	}
-
-	@PostMapping("/setOrgPosition")
-	public R setOrgPosition(){
-
-		List<Floor> floorList = floorService.getBaseMapper().selectList(new QueryWrapper<>(new Floor()));
-		floorList.parallelStream().forEach(floor -> {
-			Unit unit = unitService.getById(floor.getUnitId());
-			floor.setOrgPosition(unit.getOrgPosition()+"/"+floor.getId());
-			floorService.updateById(floor);
-		});
-		return  new R();
-
-	}
-
-
+	
 }

blade-service/community/src/main/java/org/springblade/community/controller/HouseuserController.java

@@ -0,0 +1,129 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.community.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.community.entity.Houseuser;
+import org.springblade.community.vo.HouseuserVO;
+import org.springblade.community.wrapper.HouseuserWrapper;
+import org.springblade.community.service.IHouseuserService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 住户表 控制器
+ *
+ * @author BladeX
+ * @since 2021-03-29
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/houseuser")
+@Api(value = "住户表", tags = "住户表接口")
+public class HouseuserController extends BladeController {
+
+	private final IHouseuserService houseuserService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入houseuser")
+	public R<HouseuserVO> detail(Houseuser houseuser) {
+		Houseuser detail = houseuserService.getOne(Condition.getQueryWrapper(houseuser));
+		return R.data(HouseuserWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 住户表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入houseuser")
+	public R<IPage<HouseuserVO>> list(Houseuser houseuser, Query query) {
+		IPage<Houseuser> pages = houseuserService.page(Condition.getPage(query), Condition.getQueryWrapper(houseuser));
+		return R.data(HouseuserWrapper.build().pageVO(pages));
+	}
+
+
+	/**
+	 * 自定义分页 住户表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入houseuser")
+	public R<IPage<HouseuserVO>> page(HouseuserVO houseuser, Query query) {
+		IPage<HouseuserVO> pages = houseuserService.selectHouseuserPage(Condition.getPage(query), houseuser);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 住户表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入houseuser")
+	public R save(@Valid @RequestBody Houseuser houseuser) {
+		return R.status(houseuserService.save(houseuser));
+	}
+
+	/**
+	 * 修改 住户表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入houseuser")
+	public R update(@Valid @RequestBody Houseuser houseuser) {
+		return R.status(houseuserService.updateById(houseuser));
+	}
+
+	/**
+	 * 新增或修改 住户表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入houseuser")
+	public R submit(@Valid @RequestBody Houseuser houseuser) {
+		return R.status(houseuserService.saveOrUpdate(houseuser));
+	}
+
+	
+	/**
+	 * 删除 住户表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(houseuserService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	
+}

blade-service/community/src/main/java/org/springblade/community/controller/ResidentialController.java

@@ -16,70 +16,39 @@
  */
 package org.springblade.community.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import org.springblade.community.entity.Agency;
-import org.springblade.community.entity.Residential;
-import org.springblade.community.service.IAgencyService;
-import org.springblade.community.service.IResidentialService;
-import org.springblade.community.vo.ResidentialVO;
-import org.springblade.community.wrapper.ResidentialWrapper;
-import org.springblade.core.boot.ctrl.BladeController;
+import javax.validation.Valid;
+
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.jackson.JsonUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.system.entity.Role;
-import org.springblade.system.expand.entity.OrgPosition;
-import org.springblade.system.expand.entity.Street;
-import org.springblade.system.expand.feign.IOrgPositionClient;
-import org.springblade.system.expand.feign.IStreetClient;
-import org.springblade.system.feign.ISysClient;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.RestTemplate;
-
-import javax.validation.Valid;
-import java.net.URI;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.community.entity.Residential;
+import org.springblade.community.vo.ResidentialVO;
+import org.springblade.community.wrapper.ResidentialWrapper;
+import org.springblade.community.service.IResidentialService;
+import org.springblade.core.boot.ctrl.BladeController;
 
 /**
  * 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号 控制器
  *
  * @author BladeX
- * @since 2020-10-16
+ * @since 2021-03-29
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("residential")
-@Api(value = "小区接口", tags = "小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号接口")
+@RequestMapping("/residential")
+@Api(value = "小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号", tags = "小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号接口")
 public class ResidentialController extends BladeController {
 
-	private IAgencyService agencyService;
-	private IResidentialService residentialService;
-
-	private IOrgPositionClient orgPositionClient;
-	private ISysClient sysClient;
-	private IStreetClient streetClient;
-
-
+	private final IResidentialService residentialService;
 
 	/**
 	 * 详情
@@ -87,9 +56,9 @@ public class ResidentialController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入residential")
-	public R<Residential> detail(Residential residential) {
+	public R<ResidentialVO> detail(Residential residential) {
 		Residential detail = residentialService.getOne(Condition.getQueryWrapper(residential));
-		return R.data(detail);
+		return R.data(ResidentialWrapper.build().entityVO(detail));
 	}
 
 	/**
@@ -98,30 +67,12 @@ public class ResidentialController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入residential")
-	public R<IPage<ResidentialVO>> list(@RequestParam Map<String,Object> residential, Query query, BladeUser bladeUser) {
-		String deptId = bladeUser.getDeptId();
-		String[] deptIds = deptId.split(",");
-		LambdaQueryWrapper<Residential> wrapper = Condition.getQueryWrapper(residential,Residential.class).lambda();
-		for (int i = 0; i < deptIds.length; i++) {
-			OrgPosition orgPosition = orgPositionClient.getByOrgId(deptIds[i]);
-			if (i == 0) {
-				wrapper.like(Residential::getOrgPosition,orgPosition.getOrgPosition());
-			}else{
-				wrapper.or().like(Residential::getOrgPosition,orgPosition.getOrgPosition());
-			}
-		}
-
-		//获取角色信息
-		R<Role> role = sysClient.getRole(Long.valueOf(bladeUser.getRoleId()));
-		//非超管，根据tenantId租户id过滤
-		if (!role.getData().getRoleAlias().equals("administrator")){
-			wrapper.eq(Residential::getTenantId,bladeUser.getTenantId());
-		}
-
-		IPage<Residential> pages = residentialService.page(Condition.getPage(query),wrapper);
-		return R.data(ResidentialWrapper.build(agencyService).pageVO(pages));
+	public R<IPage<ResidentialVO>> list(Residential residential, Query query) {
+		IPage<Residential> pages = residentialService.page(Condition.getPage(query), Condition.getQueryWrapper(residential));
+		return R.data(ResidentialWrapper.build().pageVO(pages));
 	}
 
+
 	/**
 	 * 自定义分页 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号
 	 */
@@ -140,25 +91,7 @@ public class ResidentialController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入residential")
 	public R save(@Valid @RequestBody Residential residential) {
-		Agency agency = this.agencyService.getById(residential.getAgencyId());
-		Assert.notNull(agency,"选择的社区不存在");
-		agency.setResidentialCount(agency.getResidentialCount()+1);
-		boolean saveAgency = this.agencyService.updateById(agency);
-		if (!saveAgency){
-			return R.status(false);
-		}
-		Assert.notNull(agency.getRegionStreet(),"选择的社区暂无街道信息，请先完善社区的街道信息");
-		Street street = streetClient.getByCode(agency.getRegionStreet());
-		Assert.notNull(street,"社区的街道信息不存在");
-		boolean save = residentialService.save(residential);
-		if(save){
-			residential.setOrgPosition(agency.getOrgPosition()+"/"+residential.getId());
-			residentialService.updateById(residential);
-		}else{
-			return R.status(false);
-		}
-
-		return R.status(true);
+		return R.status(residentialService.save(residential));
 	}
 
 	/**
@@ -168,12 +101,6 @@ public class ResidentialController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入residential")
 	public R update(@Valid @RequestBody Residential residential) {
-		Agency agency = this.agencyService.getById(residential.getAgencyId());
-		Assert.notNull(agency,"选择的社区不存在");
-		Assert.notNull(agency.getRegionStreet(),"选择的社区暂无街道信息，请先完善社区的街道信息");
-		Street street = streetClient.getByCode(agency.getRegionStreet());
-		Assert.notNull(street,"社区的街道信息不存在");
-		residential.setOrgPosition("/"+street.getId()+"/"+agency.getId()+"/"+residential.getId());
 		return R.status(residentialService.updateById(residential));
 	}
 
@@ -184,154 +111,19 @@ public class ResidentialController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入residential")
 	public R submit(@Valid @RequestBody Residential residential) {
-		Agency agency = this.agencyService.getById(residential.getAgencyId());
-		Assert.notNull(agency,"选择的社区不存在");
-		Assert.notNull(agency.getRegionStreet(),"选择的社区暂无街道信息，请先完善社区的街道信息");
-		Street street = streetClient.getByCode(agency.getRegionStreet());
-		Assert.notNull(street,"社区的街道信息不存在");
-
-		residential.setRegionProvince(agency.getRegionProvince());
-		residential.setRegionCity(agency.getRegionCity());
-		residential.setRegionArea(agency.getRegionArea());
-
-		if(residential.getId()!= null){
-			residential.setOrgPosition(agency.getOrgPosition()+"/"+residential.getId());
-			return R.status(residentialService.updateById(residential));
-		}else {
-			residentialService.save(residential);
-			residential.setOrgPosition(agency.getOrgPosition()+"/"+residential.getId());
-			return R.status(residentialService.updateById(residential));
-		}
-
+		return R.status(residentialService.saveOrUpdate(residential));
 	}
 
-
+	
 	/**
 	 * 删除 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
-	@Transactional
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		Arrays.stream(ids.split(",")).parallel().forEach(id->{
-			Residential residential = this.residentialService.getById(id);
-			Agency agency = this.agencyService.getById(residential.getAgencyId());
-			agency.setResidentialCount(agency.getResidentialCount()-1);
-			this.agencyService.updateById(agency);
-		});
 		return R.status(residentialService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	/**
-	 * 下拉列表
-	 */
-	@GetMapping("/select")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "下拉列表", notes = "传入residential")
-	public R<List<Residential>> select(@RequestParam Map<String,Object> residential, Integer size, BladeUser bladeUser) {
-
-		String deptId = bladeUser.getDeptId();
-		String[] deptIds = deptId.split(",");
-		LambdaQueryWrapper<Residential> wrapper = Condition.getQueryWrapper(residential,Residential.class).lambda();
-		//获取角色信息
-		R<Role> role = sysClient.getRole(Long.valueOf(bladeUser.getRoleId()));
-		//非超管，根据tenantId租户id过滤
-		if (!role.getData().getRoleAlias().equals("administrator")){
-			wrapper.eq(Residential::getTenantId,bladeUser.getTenantId());
-		}
-
-		for (int i = 0; i < deptIds.length; i++) {
-			OrgPosition orgPosition = orgPositionClient.getByOrgId(deptIds[i]);
-			if (i == 0) {
-				wrapper.like(Residential::getOrgPosition,orgPosition.getOrgPosition());
-			}else{
-				wrapper.or().like(Residential::getOrgPosition,orgPosition.getOrgPosition());
-			}
-		}
-		wrapper.last(size != null,"limit " + size);
-		return R.data(residentialService.list(wrapper));
-	}
-
-
-
-	/**
-	 * 同步亲邻智能物联网平台小区数据
-	 * @return
-	 */
-	@GetMapping("/tongbu")
-	public R test() {
-//		IResidentialService residentialService =new ResidentialServiceImpl();
-		RestTemplate restTemplate = new RestTemplate();
-//		HttpHeaders httpHeaders =
-		ResponseEntity responseEntity = null;
-		HttpHeaders headers = new HttpHeaders();
-		headers.add(HttpHeaders.CONTENT_TYPE, "text/plain");
-		headers.add(HttpHeaders.HOST, "qiotapi.qinlinkeji.com");
-		headers.add("Cookie", "acw_tc=2760821216040233709218017edfed503c3f299563c0716431831777dc716e");
-		Map<String, Object> map = new HashMap<>();
-		map.put("pageNum", 1);
-		map.put("pageSize", 134);
-
-		HttpEntity<String> requestEntity = new HttpEntity<String>(JsonUtil.toJson(map), headers);
-		ParameterizedTypeReference<Object> reference = new ParameterizedTypeReference<Object>() {
-		};
-		String url = "https://qiotapi.qinlinkeji.com/admin/community/findListPage?sessionId=admin:2c9480c2754b743701757db8397102ac";
-		URI uri = URI.create(url);
-		responseEntity = restTemplate.exchange(uri, HttpMethod.POST, requestEntity, reference);
-
-
-		Map map1 = (Map) responseEntity.getBody();
-		Map map2 = (Map) map1.get("data");
-		List<Map> list = (List<Map>) map2.get("list");
-//		IResidentialService residentialService = new ResidentialServiceImpl();
-		for (int i = 0; i < list.size(); i++) {
-			Residential residential = new Residential();
-			Integer integer = (Integer) list.get(i).get("id");
-			residential.setOldId(Long.valueOf(integer.toString()));
-			residential.setName((String)list.get(i).get("communityName"));
-			residential.setRegion((String) list.get(i).get("address"));
-			residential.setAddress((String) list.get(i).get("address"));
-			residential.setRegionCity((String) list.get(i).get("cityName"));
-			residential.setRegionArea((String) list.get(i).get("districtName"));
-			residential.setPersonName((String) list.get(i).get("propertyName"));
-			residential.setPersonTel((String) list.get(i).get("propertyPhone"));
-			residential.setRegionProvince((String) list.get(i).get("provinceName"));
-			Residential residential1 = residentialService.getOne(new QueryWrapper<>(new Residential()).lambda().eq(Residential::getOldId, residential.getOldId()));
-			if(residential1 != null){
-				residential.setId(residential1.getId());
-			}
-			boolean save = residentialService.saveOrUpdate(residential);
-			System.out.println(save);
-		}
-		System.out.println(list);
-		return new R();
-	}
-
-
-
-
-	@GetMapping("/setOrgPosition")
-	public R setOrgPosition(){
-		List<Residential> residentialList = residentialService.getBaseMapper().selectList(new QueryWrapper<>(new Residential()));
-
-		residentialList.parallelStream().forEach(residential -> {
-			Agency agency = agencyService.getById(residential.getAgencyId());
-			residential.setOrgPosition(agency.getOrgPosition()+"/"+residential.getId());
-			residentialService.updateById(residential);
-		});
-		return new R();
-	}
-
-	/**
-	 * 分页
-	 */
-	@GetMapping("/listByAgencyId")
-	@ApiOperationSupport(order = 9)
-	@ApiOperation(value = "按园区id分页", notes = "传入agencyid")
-	public R<IPage<ResidentialVO>> list(Residential residential, Query query) {
-		IPage<Residential> pages = residentialService.page(Condition.getPage(query), Condition.getQueryWrapper(residential));
-		return R.data(ResidentialWrapper.build(agencyService).pageVO(pages));
-	}
-
+	
 }

blade-service/community/src/main/java/org/springblade/community/controller/RoomController.java

@@ -16,53 +16,39 @@
  */
 package org.springblade.community.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import org.springblade.community.entity.*;
-import org.springblade.community.service.*;
-import org.springblade.community.vo.RoomVO;
-import org.springblade.core.boot.ctrl.BladeController;
+import javax.validation.Valid;
+
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.system.expand.entity.OrgPosition;
-import org.springblade.system.expand.feign.IOrgPositionClient;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.community.entity.Room;
+import org.springblade.community.vo.RoomVO;
+import org.springblade.community.wrapper.RoomWrapper;
+import org.springblade.community.service.IRoomService;
+import org.springblade.core.boot.ctrl.BladeController;
 
 /**
  * 房间表 控制器
  *
  * @author BladeX
- * @since 2020-10-18
+ * @since 2021-03-29
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("room")
+@RequestMapping("/room")
 @Api(value = "房间表", tags = "房间表接口")
 public class RoomController extends BladeController {
 
-	private IRoomService roomService;
-	private IUnitService unitService;
-	private IResidentialService residentialService;
-	private IAgencyService agencyService;
-	private IFloorService floorService;
-
-	private IOrgPositionClient orgPositionClient;
-
+	private final IRoomService roomService;
 
 	/**
 	 * 详情
@@ -70,20 +56,9 @@ public class RoomController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入room")
-	public R<Room> detail(Room room) {
+	public R<RoomVO> detail(Room room) {
 		Room detail = roomService.getOne(Condition.getQueryWrapper(room));
-		return R.data(detail);
-	}
-
-	/**
-	 * 获取用户的房屋信息
-	 */
-	@GetMapping("/getRoomByPersonId")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入room")
-	public R getRoomByPersonId(Long personId) {
-		List<Room> rooms = roomService.getRoomsByPersonId(personId);
-		return R.data(rooms);
+		return R.data(RoomWrapper.build().entityVO(detail));
 	}
 
 	/**
@@ -92,22 +67,12 @@ public class RoomController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入room")
-	public R<IPage<Room>> list(Room room, Query query, BladeUser bladeUser) {
-		String deptId = bladeUser.getDeptId();
-		String[] deptIds = deptId.split(",");
-		LambdaQueryWrapper<Room> wrapper = Condition.getQueryWrapper(room).lambda();
-		for(int i=0;i<deptIds.length;i++){
-			OrgPosition orgPosition = orgPositionClient.getByOrgId(deptIds[i]);
-			if(i ==0){
-				wrapper.like(Room::getOrgPosition,orgPosition.getOrgPosition());
-			}else{
-				wrapper.or().like(Room::getOrgPosition,orgPosition.getOrgPosition());
-			}
-		}
-		IPage<Room> pages = roomService.page(Condition.getPage(query), wrapper);
-		return R.data(pages);
+	public R<IPage<RoomVO>> list(Room room, Query query) {
+		IPage<Room> pages = roomService.page(Condition.getPage(query), Condition.getQueryWrapper(room));
+		return R.data(RoomWrapper.build().pageVO(pages));
 	}
 
+
 	/**
 	 * 自定义分页 房间表
 	 */
@@ -125,17 +90,7 @@ public class RoomController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入room")
-	@Transactional
 	public R save(@Valid @RequestBody Room room) {
-		Unit unit = this.unitService.getById(room.getUnitId());
-		unit.setRoomNumber(unit.getRoomNumber()+1);
-		this.unitService.updateById(unit);
-		Residential residential = this.residentialService.getById(room.getResidentialId());
-		residential.setRoomNumber(residential.getRoomNumber()+1);
-		this.residentialService.updateById(residential);
-		Agency agency = this.agencyService.getById(room.getAgencyId());
-		agency.setRoomCount(agency.getRoomCount()+1);
-		this.agencyService.updateById(agency);
 		return R.status(roomService.save(room));
 	}
 
@@ -159,7 +114,7 @@ public class RoomController extends BladeController {
 		return R.status(roomService.saveOrUpdate(room));
 	}
 
-
+	
 	/**
 	 * 删除 房间表
 	 */
@@ -167,82 +122,8 @@ public class RoomController extends BladeController {
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		Arrays.stream(ids.split(",")).forEach(id ->{
-			Room room = this.roomService.getById(id);
-			Unit unit = this.unitService.getById(room.getUnitId());
-			unit.setRoomNumber(unit.getRoomNumber()-1);
-			this.unitService.updateById(unit);
-			Residential residential = this.residentialService.getById(room.getResidentialId());
-			residential.setRoomNumber(residential.getRoomNumber()-1);
-			this.residentialService.updateById(residential);
-			Agency agency = this.agencyService.getById(room.getAgencyId());
-			agency.setRoomCount(agency.getRoomCount()-1);
-			this.agencyService.updateById(agency);
-		});
 		return R.status(roomService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	/**
-	 * 下拉列表
-	 */
-	@GetMapping("/select")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "下拉列表", notes = "room")
-	public R<List<Room>> select(@RequestParam Map<String,Object> room, Integer size, BladeUser bladeUser) {
-		String deptId = bladeUser.getDeptId();
-		String[] deptIds = deptId.split(",");
-		LambdaQueryWrapper<Room> wrapper = Condition.getQueryWrapper(room,Room.class).lambda();
-		for (int i = 0; i < deptIds.length; i++) {
-			OrgPosition orgPosition = orgPositionClient.getByOrgId(deptIds[i]);
-			if (i == 0) {
-				wrapper.like(Room::getOrgPosition,orgPosition.getOrgPosition());
-			}else{
-				wrapper.or().like(Room::getOrgPosition,orgPosition.getOrgPosition());
-			}
-		}
-		wrapper.last(size != null,"limit " + size);
-		return R.data(this.roomService.list(wrapper));
-	}
-
-	@PostMapping("/setOrgPosition")
-	public R setOrgPosition(){
-		List<Room> roomList = roomService.getBaseMapper().selectList(new QueryWrapper<>(new Room()).lambda().gt(Room::getId,1335518425358475265L));
-
-		for(int i=0;i<roomList.size();i++){
-			Room room = roomList.get(i);
-			Floor floor = floorService.getById(room.getFloorId());
-			if(room.getOrgPosition().contains(floor.getOrgPosition())){
-				continue;
-			}
-			room.setOrgPosition(floor.getOrgPosition()+"/"+room.getId());
-			roomService.updateById(room);
-		}
-
-
-
-		return  new R();
-
-	}
-
-	@PostMapping("/setAgencyId")
-	public R setAgencyId(){
-		List<Room> roomList = roomService.getBaseMapper().selectList(new QueryWrapper<>(new Room()));
-
-		roomList.parallelStream().forEach(room -> {
-			Residential residential = residentialService.getById(room.getResidentialId());
-			if(residential!=null){
-				room.setAgencyId(residential.getAgencyId());
-				roomService.updateById(room);
-			}
-		});
-
-
-
-		return  new R();
-
-	}
-
-
-
-
+	
 }

blade-service/community/src/main/java/org/springblade/community/controller/UnitController.java

@@ -16,68 +16,39 @@
  */
 package org.springblade.community.controller;
 
-import cn.hutool.core.lang.Assert;
-import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import org.springblade.community.entity.Agency;
-import org.springblade.community.entity.Building;
-import org.springblade.community.entity.Residential;
-import org.springblade.community.entity.Unit;
-import org.springblade.community.service.IAgencyService;
-import org.springblade.community.service.IBuildingService;
-import org.springblade.community.service.IResidentialService;
-import org.springblade.community.service.IUnitService;
-import org.springblade.community.vo.UnitVO;
-import org.springblade.core.boot.ctrl.BladeController;
+import javax.validation.Valid;
+
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-
-
-import org.springblade.system.expand.entity.OrgPosition;
-import org.springblade.system.expand.feign.IOrgPositionClient;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.RestTemplate;
-
-import javax.validation.Valid;
-import java.net.URI;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.community.entity.Unit;
+import org.springblade.community.vo.UnitVO;
+import org.springblade.community.wrapper.UnitWrapper;
+import org.springblade.community.service.IUnitService;
+import org.springblade.core.boot.ctrl.BladeController;
 
 /**
  * 单元表 控制器
  *
  * @author BladeX
- * @since 2020-10-18
+ * @since 2021-03-29
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("unit")
+@RequestMapping("/unit")
 @Api(value = "单元表", tags = "单元表接口")
 public class UnitController extends BladeController {
 
-	private IUnitService unitService;
-	private IResidentialService residentialService;
-	private IAgencyService agencyService;
-	private IBuildingService buildingService;
-
-	private IOrgPositionClient orgPositionClient;
+	private final IUnitService unitService;
 
 	/**
 	 * 详情
@@ -85,9 +56,9 @@ public class UnitController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入unit")
-	public R<Unit> detail(Unit unit) {
+	public R<UnitVO> detail(Unit unit) {
 		Unit detail = unitService.getOne(Condition.getQueryWrapper(unit));
-		return R.data(detail);
+		return R.data(UnitWrapper.build().entityVO(detail));
 	}
 
 	/**
@@ -96,23 +67,12 @@ public class UnitController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入unit")
-	public R<IPage<Unit>> list(@RequestParam Map<String,Object> unit, Query query, BladeUser bladeUser) {
-		String deptId = bladeUser.getDeptId();
-		String[] deptIds = deptId.split(",");
-		LambdaQueryWrapper<Unit> wrapper = Condition.getQueryWrapper(unit, Unit.class).lambda();
-		for(int i=0;i<deptIds.length;i++){
-			OrgPosition orgPosition = orgPositionClient.getByOrgId(deptIds[i]);
-			if(i ==0){
-				wrapper.like(Unit::getOrgPosition,orgPosition.getOrgPosition());
-			}else{
-				wrapper.or().like(Unit::getOrgPosition,orgPosition.getOrgPosition());
-			}
-		}
-
-		IPage<Unit> pages = unitService.page(Condition.getPage(query), wrapper);
-		return R.data(pages);
+	public R<IPage<UnitVO>> list(Unit unit, Query query) {
+		IPage<Unit> pages = unitService.page(Condition.getPage(query), Condition.getQueryWrapper(unit));
+		return R.data(UnitWrapper.build().pageVO(pages));
 	}
 
+
 	/**
 	 * 自定义分页 单元表
 	 */
@@ -130,31 +90,8 @@ public class UnitController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入unit")
-	@Transactional
 	public R save(@Valid @RequestBody Unit unit) {
-		Long residentialId = unit.getResidentialId();
-		Long buildingId = unit.getBuildingId();
-		Assert.notNull(residentialId, "归属id为空！");
-		Assert.notNull(buildingId, "楼栋id为空！");
-		Residential residential = residentialService.getById(residentialId);
-		Assert.notNull(residential, "找不到对应的归属！");
-		Building building = buildingService.getById(buildingId);
-		Assert.notNull(building, "找不到对应的楼栋！");
-
-		if (unit.getId() == null){
-			Integer unitNumberResi = residential.getUnitNumber();
-			Integer unitNumberBuild = building.getUnitNumber();
-			residential.setUnitNumber(unitNumberResi + 1);
-			building.setUnitNumber(unitNumberBuild + 1);
-			residentialService.updateById(residential);
-			buildingService.updateById(building);
-			unit.setResidentialName(residential.getName());
-			unit.setBuildingName(building.getName());
-			unitService.save(unit);
-		}
-
-		unit.setOrgPosition(building.getOrgPosition() + "/" + unit.getId());
-		return R.status(unitService.updateById(unit));
+		return R.status(unitService.save(unit));
 	}
 
 	/**
@@ -174,172 +111,19 @@ public class UnitController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入unit")
 	public R submit(@Valid @RequestBody Unit unit) {
-		Assert.notNull(unit.getAgencyId(), "归属不能为空！");
-		Agency agency = agencyService.getById(unit.getAgencyId());
-		unit.setAgencyName(agency.getAgencyName());
 		return R.status(unitService.saveOrUpdate(unit));
 	}
 
-
+	
 	/**
 	 * 删除 单元表
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
-	@Transactional
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		List<Long> list = Func.toLongList(ids);
-		list.forEach(id -> {
-			Unit unit = this.unitService.getById(id);
-			Residential residential = this.residentialService.getById(unit.getResidentialId());
-			residential.setUnitNumber(residential.getUnitNumber()-1);
-			this.residentialService.updateById(residential);
-			/*Agency agency = this.agencyService.getById(unit.getAgencyId());
-			agency.setUnitCount(agency.getUnitCount()-1);
-			this.agencyService.updateById(agency);*/
-		});
-		return R.status(unitService.deleteLogic(list));
-	}
-
-	/**
-	 * 下拉列表
-	 */
-	@GetMapping("/select")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "下拉列表", notes = "传入unit")
-	public R<List<Unit>> select(@RequestParam Map<String,Object> unit, Integer size, BladeUser bladeUser) {
-		String deptId = bladeUser.getDeptId();
-		String[] deptIds = deptId.split(",");
-		LambdaQueryWrapper<Unit> wrapper = Condition.getQueryWrapper(unit,Unit.class).lambda();
-		for (int i = 0; i < deptIds.length; i++) {
-			OrgPosition orgPosition = orgPositionClient.getByOrgId(deptIds[i]);
-			if (i == 0) {
-				wrapper.like(Unit::getOrgPosition,orgPosition.getOrgPosition());
-			}else{
-				wrapper.or().like(Unit::getOrgPosition,orgPosition.getOrgPosition());
-			}
-		}
-		wrapper.last(size != null,"limit " + size);
-		return R.data(this.unitService.list(wrapper));
-	}
-
-	/**
-	 * 同步亲邻智能物联网平台单元数据
-	 *
-	 * @return
-	 */
-	@PostMapping("/tongbu")
-	public R tongbu(Long residentialId) {
-		Residential residential = residentialService.getById(residentialId);
-//		IResidentialService residentialService =new ResidentialServiceImpl();
-		List<Building> buildingList = buildingService.getBaseMapper().selectList(new QueryWrapper<>(new Building()).lambda().eq(Building::getResidentialId,residentialId));
-		for (int j = 0; j < buildingList.size(); j++) {
-			RestTemplate restTemplate = new RestTemplate();
-//		HttpHeaders httpHeaders =
-			ResponseEntity responseEntity = null;
-			HttpHeaders headers = new HttpHeaders();
-			headers.add(HttpHeaders.CONTENT_TYPE, "text/plain");
-			headers.add(HttpHeaders.HOST, "qiotapi.qinlinkeji.com");
-			headers.add("Cookie", "acw_tc=2760822c16041156819701506e1f0df2b6797f5010bb8a47e5c8d932fa360e");
-			Map<String, Object> map = new HashMap<>();
-//			{
-//				"communityId": "9463",
-//				"id": 122792,
-//				"nodeType": 1,
-//				"requestSource": 2}
-			map.put("communityId", residential.getOldId());
-			map.put("id", buildingList.get(j).getOldId());
-			map.put("nodeType",1);
-			map.put("requestSource",2);
-
-			HttpEntity requestEntity = new HttpEntity<>(JSONUtil.toJsonStr(map), headers);
-			ParameterizedTypeReference<Object> reference = new ParameterizedTypeReference<Object>() {
-			};
-			String url = "https://qiotapi.qinlinkeji.com/admin/building/house/findChildList?sessionId=admin:2c94812e75fa974901760cfeea2e011d";
-			URI uri = URI.create(url);
-			responseEntity = restTemplate.exchange(uri, HttpMethod.POST, requestEntity, reference);
-
-
-			Map map1 = (Map) responseEntity.getBody();
-			List<Map> list = (List<Map>) map1.get("data");
-
-			for (int i = 0; i < list.size(); i++) {
-				Unit unit = new Unit();
-
-				Integer integer = (Integer) list.get(i).get("id");
-				unit.setOldId(Long.valueOf(integer.toString()));
-				unit.setName((String) list.get(i).get("label"));
-				unit.setBuildingId(Long.valueOf((Integer) list.get(i).get("parentId")));
-
-				Unit unit1 = unitService.getOne(new QueryWrapper<>(new Unit()).lambda().eq(Unit::getOldId, unit.getOldId()));
-				if (unit1 != null) {
-					unit.setId(unit1.getId());
-				}else{
-					Building building = buildingList.get(j);
-					building.setUnitNumber(building.getUnitNumber()+1);
-				}
-				boolean b = unitService.saveOrUpdate(unit);
-
-//			boolean save = residentialService.saveOrUpdate(residential);
-				System.out.println(b);
-			}
-			System.out.println("楼栋id为"+buildingList.get(j).getOldId()+"的单元："+list);
-
-		}
-		return new R();
-	}
-
-	@PostMapping("/setOrgPosition")
-	public R setOrgPosition(){
-		List<Unit> unitList = unitService.getBaseMapper().selectList(new QueryWrapper<>(new Unit()));
-		unitList.parallelStream().forEach(unit -> {
-			Building building = buildingService.getById(unit.getBuildingId());
-			unit.setOrgPosition(building.getOrgPosition()+"/"+unit.getId());
-			unitService.updateById(unit);
-		});
-
-		return  new R();
-
-	}
-
-	//阅海万家D区
-	@PostMapping("/addYhwjDUnit")
-	public void addYhwjDUnit(String residentialName){
-		Residential residential = residentialService.getBaseMapper().selectOne(new QueryWrapper<>(new Residential()).lambda().eq(Residential::getName, residentialName));
-		List<Building> buildingList = buildingService.getBaseMapper().selectList(new QueryWrapper<>(new Building()).lambda().eq(Building::getResidentialId, residential.getId()));
-		for(int j=0;j<buildingList.size();j++){
-			Building building = buildingList.get(j);
-
-			for(int i=0;i<2;i++){
-				Unit unit = new Unit();
-				unit.setName((i+1)+"单元");
-				unit.setBuildingId(building.getId());
-				unit.setResidentialId(residential.getId());
-				unit.setResidentialName(residentialName);
-				unit.setAgencyId(residential.getAgencyId());
-//				unit.setAgencyName(residential.getAgencyName());
-				unit.setBuildingName(building.getName());
-				unit.setFloorNumber(6);
-				unit.setRoomNumber(12);
-				unitService.getBaseMapper().insert(unit);
-
-			}
-		}
-
-	}
-
-	@PostMapping("/setYDOrgPosition")
-	public R setYDOrgPosition(){
-		List<Unit> unitList = unitService.getBaseMapper().selectList(new QueryWrapper<>(new Unit()).lambda().eq(Unit::getResidentialName,"阅海万家D区"));
-		unitList.parallelStream().forEach(unit -> {
-			Building building = buildingService.getById(unit.getBuildingId());
-			unit.setOrgPosition(building.getOrgPosition()+"/"+unit.getId());
-			unitService.updateById(unit);
-		});
-
-		return  new R();
-
+		return R.status(unitService.deleteLogic(Func.toLongList(ids)));
 	}
 
+	
 }

blade-service/community/src/main/java/org/springblade/community/feign/AgencyClient.java

@@ -0,0 +1,90 @@
+package org.springblade.community.feign;
+
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springblade.community.entity.Agency;
+import org.springblade.community.vo.AgencyVO;
+import org.springblade.community.wrapper.AgencyWrapper;
+import org.springblade.community.service.IAgencyService;
+import org.springblade.core.boot.ctrl.BladeController;
+import java.util.List;
+/**
+ *  client
+ *
+ * @author lianghanqiang
+ * @since 2021-03-29
+ */
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/feign/agency")
+
+public class AgencyClient implements IAgencyClient {
+
+    private final IAgencyService agencyService;
+
+        /**
+     * 详情
+     */
+    @Override
+    @GetMapping("/detail")
+    public AgencyVO detail(Agency agency) {
+        Agency detail = agencyService.getOne(Condition.getQueryWrapper(agency));
+        return AgencyWrapper.build().entityVO(detail);
+        }
+
+    /**
+     * 查询 
+     */
+    @Override
+    @GetMapping("/list")
+    public List<AgencyVO> list(Agency agency) {
+        return AgencyWrapper.build().listVO(agencyService.list(Condition.getQueryWrapper(agency)));
+        }
+
+    
+
+    /**
+     * 新增 
+     */
+    @Override
+    @PostMapping("/save")
+    public boolean save(@Valid @RequestBody Agency agency) {
+        return agencyService.save(agency);
+        }
+
+    /**
+     * 修改 
+     */
+    @Override
+    @PostMapping("/update")
+    public boolean update(@Valid @RequestBody Agency agency) {
+        return agencyService.updateById(agency);
+        }
+
+    /**
+     * 新增或修改 
+     */
+    @Override
+    @PostMapping("/submit")
+    public boolean submit(@Valid @RequestBody Agency agency) {
+        return agencyService.saveOrUpdate(agency);
+        }
+
+    
+    /**
+     * 删除 
+     */
+    @Override
+    @PostMapping("/remove")
+    public boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        return agencyService.deleteLogic(Func.toLongList(ids));
+        }
+
+    
+}

blade-service/community/src/main/java/org/springblade/community/feign/BuildingClient.java

@@ -0,0 +1,90 @@
+package org.springblade.community.feign;
+
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springblade.community.entity.Building;
+import org.springblade.community.vo.BuildingVO;
+import org.springblade.community.wrapper.BuildingWrapper;
+import org.springblade.community.service.IBuildingService;
+import org.springblade.core.boot.ctrl.BladeController;
+import java.util.List;
+/**
+ *  client
+ *
+ * @author lianghanqiang
+ * @since 2021-03-29
+ */
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/feign/building")
+
+public class BuildingClient implements IBuildingClient {
+
+    private final IBuildingService buildingService;
+
+        /**
+     * 详情
+     */
+    @Override
+    @GetMapping("/detail")
+    public BuildingVO detail(Building building) {
+        Building detail = buildingService.getOne(Condition.getQueryWrapper(building));
+        return BuildingWrapper.build().entityVO(detail);
+        }
+
+    /**
+     * 查询 
+     */
+    @Override
+    @GetMapping("/list")
+    public List<BuildingVO> list(Building building) {
+        return BuildingWrapper.build().listVO(buildingService.list(Condition.getQueryWrapper(building)));
+        }
+
+    
+
+    /**
+     * 新增 
+     */
+    @Override
+    @PostMapping("/save")
+    public boolean save(@Valid @RequestBody Building building) {
+        return buildingService.save(building);
+        }
+
+    /**
+     * 修改 
+     */
+    @Override
+    @PostMapping("/update")
+    public boolean update(@Valid @RequestBody Building building) {
+        return buildingService.updateById(building);
+        }
+
+    /**
+     * 新增或修改 
+     */
+    @Override
+    @PostMapping("/submit")
+    public boolean submit(@Valid @RequestBody Building building) {
+        return buildingService.saveOrUpdate(building);
+        }
+
+    
+    /**
+     * 删除 
+     */
+    @Override
+    @PostMapping("/remove")
+    public boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        return buildingService.deleteLogic(Func.toLongList(ids));
+        }
+
+    
+}

blade-service/community/src/main/java/org/springblade/community/feign/FloorClient.java

@@ -0,0 +1,90 @@
+package org.springblade.community.feign;
+
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springblade.community.entity.Floor;
+import org.springblade.community.vo.FloorVO;
+import org.springblade.community.wrapper.FloorWrapper;
+import org.springblade.community.service.IFloorService;
+import org.springblade.core.boot.ctrl.BladeController;
+import java.util.List;
+/**
+ *  client
+ *
+ * @author lianghanqiang
+ * @since 2021-03-29
+ */
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/feign/floor")
+
+public class FloorClient implements IFloorClient {
+
+    private final IFloorService floorService;
+
+        /**
+     * 详情
+     */
+    @Override
+    @GetMapping("/detail")
+    public FloorVO detail(Floor floor) {
+        Floor detail = floorService.getOne(Condition.getQueryWrapper(floor));
+        return FloorWrapper.build().entityVO(detail);
+        }
+
+    /**
+     * 查询 
+     */
+    @Override
+    @GetMapping("/list")
+    public List<FloorVO> list(Floor floor) {
+        return FloorWrapper.build().listVO(floorService.list(Condition.getQueryWrapper(floor)));
+        }
+
+    
+
+    /**
+     * 新增 
+     */
+    @Override
+    @PostMapping("/save")
+    public boolean save(@Valid @RequestBody Floor floor) {
+        return floorService.save(floor);
+        }
+
+    /**
+     * 修改 
+     */
+    @Override
+    @PostMapping("/update")
+    public boolean update(@Valid @RequestBody Floor floor) {
+        return floorService.updateById(floor);
+        }
+
+    /**
+     * 新增或修改 
+     */
+    @Override
+    @PostMapping("/submit")
+    public boolean submit(@Valid @RequestBody Floor floor) {
+        return floorService.saveOrUpdate(floor);
+        }
+
+    
+    /**
+     * 删除 
+     */
+    @Override
+    @PostMapping("/remove")
+    public boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        return floorService.deleteLogic(Func.toLongList(ids));
+        }
+
+    
+}

blade-service/community/src/main/java/org/springblade/community/feign/HouseuserClient.java

@@ -0,0 +1,90 @@
+package org.springblade.community.feign;
+
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springblade.community.entity.Houseuser;
+import org.springblade.community.vo.HouseuserVO;
+import org.springblade.community.wrapper.HouseuserWrapper;
+import org.springblade.community.service.IHouseuserService;
+import org.springblade.core.boot.ctrl.BladeController;
+import java.util.List;
+/**
+ * 住户表 client
+ *
+ * @author lianghanqiang
+ * @since 2021-03-29
+ */
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/feign/houseuser")
+
+public class HouseuserClient implements IHouseuserClient {
+
+    private final IHouseuserService houseuserService;
+
+        /**
+     * 详情
+     */
+    @Override
+    @GetMapping("/detail")
+    public HouseuserVO detail(Houseuser houseuser) {
+        Houseuser detail = houseuserService.getOne(Condition.getQueryWrapper(houseuser));
+        return HouseuserWrapper.build().entityVO(detail);
+        }
+
+    /**
+     * 查询 住户表
+     */
+    @Override
+    @GetMapping("/list")
+    public List<HouseuserVO> list(Houseuser houseuser) {
+        return HouseuserWrapper.build().listVO(houseuserService.list(Condition.getQueryWrapper(houseuser)));
+        }
+
+    
+
+    /**
+     * 新增 住户表
+     */
+    @Override
+    @PostMapping("/save")
+    public boolean save(@Valid @RequestBody Houseuser houseuser) {
+        return houseuserService.save(houseuser);
+        }
+
+    /**
+     * 修改 住户表
+     */
+    @Override
+    @PostMapping("/update")
+    public boolean update(@Valid @RequestBody Houseuser houseuser) {
+        return houseuserService.updateById(houseuser);
+        }
+
+    /**
+     * 新增或修改 住户表
+     */
+    @Override
+    @PostMapping("/submit")
+    public boolean submit(@Valid @RequestBody Houseuser houseuser) {
+        return houseuserService.saveOrUpdate(houseuser);
+        }
+
+    
+    /**
+     * 删除 住户表
+     */
+    @Override
+    @PostMapping("/remove")
+    public boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        return houseuserService.deleteLogic(Func.toLongList(ids));
+        }
+
+    
+}

blade-service/community/src/main/java/org/springblade/community/feign/ResidentialClient.java

@@ -0,0 +1,90 @@
+package org.springblade.community.feign;
+
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springblade.community.entity.Residential;
+import org.springblade.community.vo.ResidentialVO;
+import org.springblade.community.wrapper.ResidentialWrapper;
+import org.springblade.community.service.IResidentialService;
+import org.springblade.core.boot.ctrl.BladeController;
+import java.util.List;
+/**
+ * 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号 client
+ *
+ * @author lianghanqiang
+ * @since 2021-03-29
+ */
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/feign/residential")
+
+public class ResidentialClient implements IResidentialClient {
+
+    private final IResidentialService residentialService;
+
+        /**
+     * 详情
+     */
+    @Override
+    @GetMapping("/detail")
+    public ResidentialVO detail(Residential residential) {
+        Residential detail = residentialService.getOne(Condition.getQueryWrapper(residential));
+        return ResidentialWrapper.build().entityVO(detail);
+        }
+
+    /**
+     * 查询 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号
+     */
+    @Override
+    @GetMapping("/list")
+    public List<ResidentialVO> list(Residential residential) {
+        return ResidentialWrapper.build().listVO(residentialService.list(Condition.getQueryWrapper(residential)));
+        }
+
+    
+
+    /**
+     * 新增 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号
+     */
+    @Override
+    @PostMapping("/save")
+    public boolean save(@Valid @RequestBody Residential residential) {
+        return residentialService.save(residential);
+        }
+
+    /**
+     * 修改 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号
+     */
+    @Override
+    @PostMapping("/update")
+    public boolean update(@Valid @RequestBody Residential residential) {
+        return residentialService.updateById(residential);
+        }
+
+    /**
+     * 新增或修改 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号
+     */
+    @Override
+    @PostMapping("/submit")
+    public boolean submit(@Valid @RequestBody Residential residential) {
+        return residentialService.saveOrUpdate(residential);
+        }
+
+    
+    /**
+     * 删除 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号
+     */
+    @Override
+    @PostMapping("/remove")
+    public boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        return residentialService.deleteLogic(Func.toLongList(ids));
+        }
+
+    
+}

blade-service/community/src/main/java/org/springblade/community/feign/RoomClient.java

@@ -0,0 +1,90 @@
+package org.springblade.community.feign;
+
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springblade.community.entity.Room;
+import org.springblade.community.vo.RoomVO;
+import org.springblade.community.wrapper.RoomWrapper;
+import org.springblade.community.service.IRoomService;
+import org.springblade.core.boot.ctrl.BladeController;
+import java.util.List;
+/**
+ * 房间表 client
+ *
+ * @author lianghanqiang
+ * @since 2021-03-29
+ */
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/feign/room")
+
+public class RoomClient implements IRoomClient {
+
+    private final IRoomService roomService;
+
+        /**
+     * 详情
+     */
+    @Override
+    @GetMapping("/detail")
+    public RoomVO detail(Room room) {
+        Room detail = roomService.getOne(Condition.getQueryWrapper(room));
+        return RoomWrapper.build().entityVO(detail);
+        }
+
+    /**
+     * 查询 房间表
+     */
+    @Override
+    @GetMapping("/list")
+    public List<RoomVO> list(Room room) {
+        return RoomWrapper.build().listVO(roomService.list(Condition.getQueryWrapper(room)));
+        }
+
+    
+
+    /**
+     * 新增 房间表
+     */
+    @Override
+    @PostMapping("/save")
+    public boolean save(@Valid @RequestBody Room room) {
+        return roomService.save(room);
+        }
+
+    /**
+     * 修改 房间表
+     */
+    @Override
+    @PostMapping("/update")
+    public boolean update(@Valid @RequestBody Room room) {
+        return roomService.updateById(room);
+        }
+
+    /**
+     * 新增或修改 房间表
+     */
+    @Override
+    @PostMapping("/submit")
+    public boolean submit(@Valid @RequestBody Room room) {
+        return roomService.saveOrUpdate(room);
+        }
+
+    
+    /**
+     * 删除 房间表
+     */
+    @Override
+    @PostMapping("/remove")
+    public boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        return roomService.deleteLogic(Func.toLongList(ids));
+        }
+
+    
+}

blade-service/community/src/main/java/org/springblade/community/feign/UnitClient.java

@@ -0,0 +1,90 @@
+package org.springblade.community.feign;
+
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springblade.community.entity.Unit;
+import org.springblade.community.vo.UnitVO;
+import org.springblade.community.wrapper.UnitWrapper;
+import org.springblade.community.service.IUnitService;
+import org.springblade.core.boot.ctrl.BladeController;
+import java.util.List;
+/**
+ * 单元表 client
+ *
+ * @author lianghanqiang
+ * @since 2021-03-29
+ */
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/feign/unit")
+
+public class UnitClient implements IUnitClient {
+
+    private final IUnitService unitService;
+
+        /**
+     * 详情
+     */
+    @Override
+    @GetMapping("/detail")
+    public UnitVO detail(Unit unit) {
+        Unit detail = unitService.getOne(Condition.getQueryWrapper(unit));
+        return UnitWrapper.build().entityVO(detail);
+        }
+
+    /**
+     * 查询 单元表
+     */
+    @Override
+    @GetMapping("/list")
+    public List<UnitVO> list(Unit unit) {
+        return UnitWrapper.build().listVO(unitService.list(Condition.getQueryWrapper(unit)));
+        }
+
+    
+
+    /**
+     * 新增 单元表
+     */
+    @Override
+    @PostMapping("/save")
+    public boolean save(@Valid @RequestBody Unit unit) {
+        return unitService.save(unit);
+        }
+
+    /**
+     * 修改 单元表
+     */
+    @Override
+    @PostMapping("/update")
+    public boolean update(@Valid @RequestBody Unit unit) {
+        return unitService.updateById(unit);
+        }
+
+    /**
+     * 新增或修改 单元表
+     */
+    @Override
+    @PostMapping("/submit")
+    public boolean submit(@Valid @RequestBody Unit unit) {
+        return unitService.saveOrUpdate(unit);
+        }
+
+    
+    /**
+     * 删除 单元表
+     */
+    @Override
+    @PostMapping("/remove")
+    public boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        return unitService.deleteLogic(Func.toLongList(ids));
+        }
+
+    
+}

blade-service/community/src/main/java/org/springblade/community/mapper/AgencyMapper.java

@@ -16,18 +16,17 @@
  */
 package org.springblade.community.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.community.entity.Agency;
 import org.springblade.community.vo.AgencyVO;
-
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
 
 /**
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2020-10-27
+ * @since 2021-03-29
  */
 public interface AgencyMapper extends BaseMapper<Agency> {
 
@@ -40,7 +39,4 @@ public interface AgencyMapper extends BaseMapper<Agency> {
 	 */
 	List<AgencyVO> selectAgencyPage(IPage page, AgencyVO agency);
 
-//	@Select("SELECT yc_agency.* FROM yc_agency,system_tenant_type WHERE system_tenant_type.tenant_type = 1 AND system_tenant_type.tenant_id = yc_agency.tenant_id AND yc_agency.is_deleted = 0 AND system_tenant_type.is_deleted = 0;")
-	List<Agency> getAgencyList();
-
 }

blade-service/community/src/main/java/org/springblade/community/mapper/AgencyMapper.xml

@@ -12,33 +12,32 @@
         <result column="update_time" property="updateTime"/>
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
-        <result column="agency_name" property="agencyName"/>
-        <result column="agency_no" property="agencyNo"/>
-        <result column="agency_area" property="agencyArea"/>
+        <result column="name" property="name"/>
+        <result column="region_province" property="regionProvince"/>
+        <result column="region_city" property="regionCity"/>
+        <result column="region_area" property="regionArea"/>
+        <result column="region_street" property="regionStreet"/>
+        <result column="address" property="address"/>
+        <result column="longitude" property="longitude"/>
+        <result column="latitude" property="latitude"/>
         <result column="person_name" property="personName"/>
         <result column="person_phone" property="personPhone"/>
-        <result column="remark" property="remark"/>
         <result column="residential_count" property="residentialCount"/>
+        <result column="building_count" property="buildingCount"/>
         <result column="unit_count" property="unitCount"/>
+        <result column="floor_count" property="floorCount"/>
         <result column="room_count" property="roomCount"/>
         <result column="person_count" property="personCount"/>
         <result column="car_count" property="carCount"/>
-        <result column="region_province" property="regionProvince"/>
-        <result column="region_city" property="regionCity"/>
-        <result column="region_area" property="regionArea"/>
-        <result column="address" property="address"/>
-        <result column="longitude" property="longitude"/>
-        <result column="latitude" property="latitude"/>
         <result column="pic" property="pic"/>
-        <result column="region_street" property="regionStreet"/>
+        <result column="remark" property="remark"/>
         <result column="org_position" property="orgPosition"/>
-        <result column="tenant_id" property="tenantId"/>
         <result column="old_id" property="oldId"/>
     </resultMap>
 
 
     <select id="selectAgencyPage" resultMap="agencyResultMap">
-        select * from estate_agency where is_deleted = 0
+        select * from community_agency where is_deleted = 0
     </select>
 
 </mapper>

blade-service/community/src/main/java/org/springblade/community/mapper/BuildingMapper.java

@@ -16,18 +16,17 @@
  */
 package org.springblade.community.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.community.entity.Building;
 import org.springblade.community.vo.BuildingVO;
-
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
 
 /**
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2020-10-31
+ * @since 2021-03-29
  */
 public interface BuildingMapper extends BaseMapper<Building> {
 

blade-service/community/src/main/java/org/springblade/community/mapper/BuildingMapper.xml

@@ -5,13 +5,6 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="buildingResultMap" type="org.springblade.community.entity.Building">
         <result column="id" property="id"/>
-        <result column="name" property="name"/>
-        <result column="residential_id" property="residentialId"/>
-        <result column="residential_name" property="residentialName"/>
-        <result column="unit_number" property="unitNumber"/>
-        <result column="floor_number" property="floorNumber"/>
-        <result column="room_number" property="roomNumber"/>
-        <result column="person_number" property="personNumber"/>
         <result column="create_user" property="createUser"/>
         <result column="create_dept" property="createDept"/>
         <result column="create_time" property="createTime"/>
@@ -19,18 +12,23 @@
         <result column="update_time" property="updateTime"/>
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
-        <result column="old_id" property="oldId"/>
-        <result column="pic" property="pic"/>
-        <result column="org_position" property="orgPosition"/>
-        <result column="tenant_id" property="tenantId"/>
+        <result column="name" property="name"/>
         <result column="agency_id" property="agencyId"/>
         <result column="agency_name" property="agencyName"/>
-
+        <result column="residential_id" property="residentialId"/>
+        <result column="residential_name" property="residentialName"/>
+        <result column="unit_count" property="unitCount"/>
+        <result column="floor_count" property="floorCount"/>
+        <result column="room_count" property="roomCount"/>
+        <result column="user_count" property="userCount"/>
+        <result column="pic" property="pic"/>
+        <result column="old_id" property="oldId"/>
+        <result column="org_position" property="orgPosition"/>
     </resultMap>
 
 
     <select id="selectBuildingPage" resultMap="buildingResultMap">
-        select * from estate_building where is_deleted = 0
+        select * from community_building where is_deleted = 0
     </select>
 
 </mapper>

blade-service/community/src/main/java/org/springblade/community/mapper/FloorMapper.java

@@ -16,18 +16,17 @@
  */
 package org.springblade.community.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.community.entity.Floor;
 import org.springblade.community.vo.FloorVO;
-
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
 
 /**
  *  Mapper 接口
  *
  * @author BladeX
- * @since 2020-11-06
+ * @since 2021-03-29
  */
 public interface FloorMapper extends BaseMapper<Floor> {
 

blade-service/community/src/main/java/org/springblade/community/mapper/FloorMapper.xml

@@ -13,30 +13,28 @@
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="name" property="name"/>
+        <result column="agency_id" property="agencyId"/>
+        <result column="agency_name" property="agencyName"/>
         <result column="residential_id" property="residentialId"/>
         <result column="residential_name" property="residentialName"/>
-        <result column="org_position" property="orgPosition"/>
+        <result column="building_id" property="buildingId"/>
+        <result column="building_name" property="buildingName"/>
+        <result column="unit_id" property="unitId"/>
+        <result column="unit_name" property="unitName"/>
         <result column="person_name" property="personName"/>
         <result column="person_tel" property="personTel"/>
         <result column="built_year" property="builtYear"/>
-        <result column="property_nature" property="propertyNature"/>
         <result column="including_elevator" property="includingElevator"/>
-        <result column="room_number" property="roomNumber"/>
-        <result column="user_number" property="userNumber"/>
-        <result column="serial" property="serial"/>
+        <result column="room_count" property="roomCount"/>
+        <result column="user_count" property="userCount"/>
         <result column="remark" property="remark"/>
-
+        <result column="org_position" property="orgPosition"/>
         <result column="old_id" property="oldId"/>
-        <result column="building_id" property="buildingId"/>
-        <result column="building_name" property="buildingName"/>
-        <result column="unit_id" property="unitId"/>
-        <result column="unit_name" property="unitName"/>
-        <result column="tenant_id" property="tenantId"/>
     </resultMap>
 
 
     <select id="selectFloorPage" resultMap="floorResultMap">
-        select * from estate_floor where is_deleted = 0
+        select * from community_floor where is_deleted = 0
     </select>
 
 </mapper>

blade-service/community/src/main/java/org/springblade/community/mapper/HouseuserMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.community.mapper;
+
+import org.springblade.community.entity.Houseuser;
+import org.springblade.community.vo.HouseuserVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 住户表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-03-29
+ */
+public interface HouseuserMapper extends BaseMapper<Houseuser> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param houseuser
+	 * @return
+	 */
+	List<HouseuserVO> selectHouseuserPage(IPage page, HouseuserVO houseuser);
+
+}

blade-service/community/src/main/java/org/springblade/community/mapper/HouseuserMapper.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.community.mapper.HouseuserMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="houseuserResultMap" type="org.springblade.community.entity.Houseuser">
+        <result column="id" property="id"/>
+        <result column="status" property="status"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="name" property="name"/>
+        <result column="agency_id" property="agencyId"/>
+        <result column="agency_name" property="agencyName"/>
+        <result column="residential_id" property="residentialId"/>
+        <result column="residential_name" property="residentialName"/>
+        <result column="building_id" property="buildingId"/>
+        <result column="building_name" property="buildingName"/>
+        <result column="unit_id" property="unitId"/>
+        <result column="unit_name" property="unitName"/>
+        <result column="floor_id" property="floorId"/>
+        <result column="floor_name" property="floorName"/>
+        <result column="room_id" property="roomId"/>
+        <result column="room_name" property="roomName"/>
+        <result column="org_position" property="orgPosition"/>
+        <result column="check_state" property="checkState"/>
+        <result column="check_opinion" property="checkOpinion"/>
+        <result column="person_type" property="personType"/>
+        <result column="tel" property="tel"/>
+        <result column="nationality" property="nationality"/>
+        <result column="id_card" property="idCard"/>
+        <result column="birth_place" property="birthPlace"/>
+        <result column="passport_img_uri" property="passportImgUri"/>
+        <result column="entry_img_uri" property="entryImgUri"/>
+        <result column="sex" property="sex"/>
+        <result column="remark" property="remark"/>
+        <result column="image_uri" property="imageUri"/>
+        <result column="face_code" property="faceCode"/>
+        <result column="region_province" property="regionProvince"/>
+        <result column="region_city" property="regionCity"/>
+        <result column="region_area" property="regionArea"/>
+        <result column="create_type" property="createType"/>
+        <result column="create_date" property="createDate"/>
+        <result column="is_member" property="isMember"/>
+        <result column="type" property="type"/>
+        <result column="nation" property="nation"/>
+        <result column="political" property="political"/>
+        <result column="education" property="education"/>
+        <result column="old_id" property="oldId"/>
+        <result column="person_tag" property="personTag"/>
+    </resultMap>
+
+
+    <select id="selectHouseuserPage" resultMap="houseuserResultMap">
+        select * from community_houseuser where is_deleted = 0
+    </select>
+
+</mapper>

blade-service/community/src/main/java/org/springblade/community/mapper/ResidentialMapper.java

@@ -16,18 +16,17 @@
  */
 package org.springblade.community.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.community.entity.Residential;
 import org.springblade.community.vo.ResidentialVO;
-
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
 
 /**
  * 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号 Mapper 接口
  *
  * @author BladeX
- * @since 2020-10-16
+ * @since 2021-03-29
  */
 public interface ResidentialMapper extends BaseMapper<Residential> {
 

blade-service/community/src/main/java/org/springblade/community/mapper/ResidentialMapper.xml

@@ -5,29 +5,6 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="residentialResultMap" type="org.springblade.community.entity.Residential">
         <result column="id" property="id"/>
-        <result column="old_id" property="oldId"/>
-        <result column="name" property="name"/>
-        <result column="residential_number" property="residentialNumber"/>
-        <result column="org_position" property="orgPosition"/>
-        <result column="estate_pid_name" property="estatePidName"/>
-        <result column="estate_pid_phone" property="estatePidPhone"/>
-        <result column="region_province" property="regionProvince"/>
-        <result column="region_city" property="regionCity"/>
-        <result column="region_area" property="regionArea"/>
-        <result column="region" property="region"/>
-        <result column="address" property="address"/>
-        <result column="total_unit_number" property="totalUnitNumber"/>
-        <result column="total_room_number" property="totalRoomNumber"/>
-        <result column="total_user_number" property="totalUserNumber"/>
-        <result column="building_number" property="buildingNumber"/>
-        <result column="floor_number" property="floorNumber"/>
-        <result column="unit_number" property="unitNumber"/>
-        <result column="room_number" property="roomNumber"/>
-        <result column="user_number" property="userNumber"/>
-        <result column="user_face_number" property="userFaceNumber"/>
-        <result column="person_name" property="personName"/>
-        <result column="person_tel" property="personTel"/>
-        <result column="remark" property="remark"/>
         <result column="create_user" property="createUser"/>
         <result column="create_dept" property="createDept"/>
         <result column="create_time" property="createTime"/>
@@ -35,18 +12,31 @@
         <result column="update_time" property="updateTime"/>
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="name" property="name"/>
         <result column="agency_id" property="agencyId"/>
         <result column="agency_name" property="agencyName"/>
-        <result column="latitude" property="latitude"/>
+        <result column="region_province" property="regionProvince"/>
+        <result column="region_city" property="regionCity"/>
+        <result column="region_area" property="regionArea"/>
+        <result column="address" property="address"/>
         <result column="longitude" property="longitude"/>
+        <result column="latitude" property="latitude"/>
+        <result column="building_count" property="buildingCount"/>
+        <result column="unit_count" property="unitCount"/>
+        <result column="floor_count" property="floorCount"/>
+        <result column="room_count" property="roomCount"/>
+        <result column="user_count" property="userCount"/>
+        <result column="estate_name" property="estateName"/>
+        <result column="estate_phone" property="estatePhone"/>
+        <result column="remark" property="remark"/>
         <result column="pic" property="pic"/>
-        <result column="tenant_id" property="tenantId"/>
-
+        <result column="old_id" property="oldId"/>
+        <result column="org_position" property="orgPosition"/>
     </resultMap>
 
 
     <select id="selectResidentialPage" resultMap="residentialResultMap">
-        select * from estate_residential where is_deleted = 0
+        select * from community_residential where is_deleted = 0
     </select>
 
 </mapper>

blade-service/community/src/main/java/org/springblade/community/mapper/RoomMapper.java

@@ -16,18 +16,17 @@
  */
 package org.springblade.community.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.community.entity.Room;
 import org.springblade.community.vo.RoomVO;
-
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
 
 /**
  * 房间表 Mapper 接口
  *
  * @author BladeX
- * @since 2020-10-18
+ * @since 2021-03-29
  */
 public interface RoomMapper extends BaseMapper<Room> {
 
@@ -40,5 +39,4 @@ public interface RoomMapper extends BaseMapper<Room> {
 	 */
 	List<RoomVO> selectRoomPage(IPage page, RoomVO room);
 
-    List<Room> getRoomsByPersonId(Long personId);
 }

blade-service/community/src/main/java/org/springblade/community/mapper/RoomMapper.xml

@@ -5,41 +5,36 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="roomResultMap" type="org.springblade.community.entity.Room">
         <result column="id" property="id"/>
-        <result column="building_id" property="buildingId"/>
-        <result column="building_name" property="buildingName"/>
-        <result column="floor_id" property="floorId"/>
-        <result column="floor_name" property="floorName"/>
         <result column="status" property="status"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
         <result column="name" property="name"/>
-        <result column="old_id" property="oldId"/>
-        <result column="house_number" property="houseNumber"/>
-        <result column="unit_id" property="unitId"/>
-        <result column="unit_name" property="unitName"/>
         <result column="agency_id" property="agencyId"/>
         <result column="agency_name" property="agencyName"/>
-        <result column="org_position" property="orgPosition"/>
+        <result column="residential_id" property="residentialId"/>
+        <result column="residential_name" property="residentialName"/>
+        <result column="building_id" property="buildingId"/>
+        <result column="building_name" property="buildingName"/>
+        <result column="unit_id" property="unitId"/>
+        <result column="unit_name" property="unitName"/>
+        <result column="floor_id" property="floorId"/>
+        <result column="floor_name" property="floorName"/>
         <result column="area" property="area"/>
         <result column="house_type" property="houseType"/>
-        <result column="floor" property="floor"/>
-        <result column="ornament" property="ornament"/>
         <result column="orientation" property="orientation"/>
-        <result column="user_number" property="userNumber"/>
-        <result column="serial" property="serial"/>
+        <result column="user_count" property="userCount"/>
         <result column="remark" property="remark"/>
-        <result column="residential_id" property="residentialId"/>
-        <result column="residential_name" property="residentialName"/>
-        <result column="tenant_id" property="tenantId"/>
+        <result column="old_id" property="oldId"/>
+        <result column="org_position" property="orgPosition"/>
     </resultMap>
 
 
     <select id="selectRoomPage" resultMap="roomResultMap">
-        select * from estate_room where is_deleted = 0
-    </select>
-
-    <select id="getRoomsByPersonId" resultMap="roomResultMap">
-        SELECT room.* FROM `estate_room` room, estate_houseuser houseuser
-        WHERE houseuser.room_id = room.id
-        and  houseuser.id = #{personId}
+        select * from community_room where is_deleted = 0
     </select>
 
 </mapper>

blade-service/community/src/main/java/org/springblade/community/mapper/UnitMapper.java

@@ -16,18 +16,17 @@
  */
 package org.springblade.community.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.community.entity.Unit;
 import org.springblade.community.vo.UnitVO;
-
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
 
 /**
  * 单元表 Mapper 接口
  *
  * @author BladeX
- * @since 2020-10-18
+ * @since 2021-03-29
  */
 public interface UnitMapper extends BaseMapper<Unit> {
 

blade-service/community/src/main/java/org/springblade/community/mapper/UnitMapper.xml

@@ -6,33 +6,36 @@
     <resultMap id="unitResultMap" type="org.springblade.community.entity.Unit">
         <result column="id" property="id"/>
         <result column="status" property="status"/>
-        <result column="type" property="type"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
         <result column="name" property="name"/>
-        <result column="unit_number" property="unitNumber"/>
+        <result column="agency_id" property="agencyId"/>
+        <result column="agency_name" property="agencyName"/>
         <result column="residential_id" property="residentialId"/>
         <result column="residential_name" property="residentialName"/>
-        <result column="org_position" property="orgPosition"/>
+        <result column="building_id" property="buildingId"/>
+        <result column="building_name" property="buildingName"/>
         <result column="person_name" property="personName"/>
         <result column="person_tel" property="personTel"/>
         <result column="built_year" property="builtYear"/>
-        <result column="property_nature" property="propertyNature"/>
         <result column="including_elevator" property="includingElevator"/>
-        <result column="room_number" property="roomNumber"/>
-        <result column="user_number" property="userNumber"/>
-        <result column="serial" property="serial"/>
+        <result column="floor_count" property="floorCount"/>
+        <result column="room_count" property="roomCount"/>
+        <result column="user_count" property="userCount"/>
+        <result column="pic" property="pic"/>
         <result column="remark" property="remark"/>
         <result column="create_date" property="createDate"/>
-        <result column="building_id" property="buildingId"/>
         <result column="old_id" property="oldId"/>
-        <result column="floor_number" property="floorNumber"/>
-        <result column="building_name" property="buildingName"/>
-        <result column="pic" property="pic"/>
-        <result column="tenant_id" property="tenantId"/>
+        <result column="org_position" property="orgPosition"/>
     </resultMap>
 
 
     <select id="selectUnitPage" resultMap="unitResultMap">
-        select * from estate_unit where is_deleted = 0
+        select * from community_unit where is_deleted = 0
     </select>
 
 </mapper>

blade-service/community/src/main/java/org/springblade/community/service/IAgencyService.java

@@ -16,18 +16,16 @@
  */
 package org.springblade.community.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.community.entity.Agency;
 import org.springblade.community.vo.AgencyVO;
 import org.springblade.core.mp.base.BaseService;
-
-import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
- * 服务类
+ *  服务类
  *
  * @author BladeX
- * @since 2020-10-27
+ * @since 2021-03-29
  */
 public interface IAgencyService extends BaseService<Agency> {
 
@@ -40,5 +38,4 @@ public interface IAgencyService extends BaseService<Agency> {
 	 */
 	IPage<AgencyVO> selectAgencyPage(IPage<AgencyVO> page, AgencyVO agency);
 
-	List<Agency> getAgencyList();
 }

blade-service/community/src/main/java/org/springblade/community/service/IBuildingService.java

@@ -16,17 +16,16 @@
  */
 package org.springblade.community.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.community.entity.BatchAddInfo;
 import org.springblade.community.entity.Building;
 import org.springblade.community.vo.BuildingVO;
 import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
  *  服务类
  *
  * @author BladeX
- * @since 2020-10-31
+ * @since 2021-03-29
  */
 public interface IBuildingService extends BaseService<Building> {
 
@@ -39,6 +38,4 @@ public interface IBuildingService extends BaseService<Building> {
 	 */
 	IPage<BuildingVO> selectBuildingPage(IPage<BuildingVO> page, BuildingVO building);
 
-    boolean batchAddBuilding(BatchAddInfo batchAddInfo);
-
 }

blade-service/community/src/main/java/org/springblade/community/service/IFloorService.java

@@ -16,16 +16,16 @@
  */
 package org.springblade.community.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.community.entity.Floor;
 import org.springblade.community.vo.FloorVO;
 import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
  *  服务类
  *
  * @author BladeX
- * @since 2020-11-06
+ * @since 2021-03-29
  */
 public interface IFloorService extends BaseService<Floor> {
 

blade-service/community/src/main/java/org/springblade/community/service/IHouseuserService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.community.service;
+
+import org.springblade.community.entity.Houseuser;
+import org.springblade.community.vo.HouseuserVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 住户表 服务类
+ *
+ * @author BladeX
+ * @since 2021-03-29
+ */
+public interface IHouseuserService extends BaseService<Houseuser> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param houseuser
+	 * @return
+	 */
+	IPage<HouseuserVO> selectHouseuserPage(IPage<HouseuserVO> page, HouseuserVO houseuser);
+
+}

blade-service/community/src/main/java/org/springblade/community/service/IResidentialService.java

@@ -16,16 +16,16 @@
  */
 package org.springblade.community.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.community.entity.Residential;
 import org.springblade.community.vo.ResidentialVO;
 import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
  * 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号 服务类
  *
  * @author BladeX
- * @since 2020-10-16
+ * @since 2021-03-29
  */
 public interface IResidentialService extends BaseService<Residential> {
 

blade-service/community/src/main/java/org/springblade/community/service/IRoomService.java

@@ -16,18 +16,16 @@
  */
 package org.springblade.community.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.community.entity.Room;
 import org.springblade.community.vo.RoomVO;
 import org.springblade.core.mp.base.BaseService;
-
-import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
  * 房间表 服务类
  *
  * @author BladeX
- * @since 2020-10-18
+ * @since 2021-03-29
  */
 public interface IRoomService extends BaseService<Room> {
 
@@ -40,5 +38,4 @@ public interface IRoomService extends BaseService<Room> {
 	 */
 	IPage<RoomVO> selectRoomPage(IPage<RoomVO> page, RoomVO room);
 
-    List<Room> getRoomsByPersonId(Long personId);
 }

blade-service/community/src/main/java/org/springblade/community/service/IUnitService.java

@@ -16,16 +16,16 @@
  */
 package org.springblade.community.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.community.entity.Unit;
 import org.springblade.community.vo.UnitVO;
 import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
  * 单元表 服务类
  *
  * @author BladeX
- * @since 2020-10-18
+ * @since 2021-03-29
  */
 public interface IUnitService extends BaseService<Unit> {
 

blade-service/community/src/main/java/org/springblade/community/service/impl/AgencyServiceImpl.java

@@ -16,21 +16,19 @@
  */
 package org.springblade.community.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.community.entity.Agency;
+import org.springblade.community.vo.AgencyVO;
 import org.springblade.community.mapper.AgencyMapper;
 import org.springblade.community.service.IAgencyService;
-import org.springblade.community.vo.AgencyVO;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
  *  服务实现类
  *
  * @author BladeX
- * @since 2020-10-27
+ * @since 2021-03-29
  */
 @Service
 public class AgencyServiceImpl extends BaseServiceImpl<AgencyMapper, Agency> implements IAgencyService {
@@ -40,8 +38,4 @@ public class AgencyServiceImpl extends BaseServiceImpl<AgencyMapper, Agency> imp
 		return page.setRecords(baseMapper.selectAgencyPage(page, agency));
 	}
 
-	@Override
-	public List<Agency> getAgencyList() {
-		return baseMapper.getAgencyList();
-	}
 }

blade-service/community/src/main/java/org/springblade/community/service/impl/BuildingServiceImpl.java

@@ -16,239 +16,26 @@
  */
 package org.springblade.community.service.impl;
 
-import com.alibaba.cloud.commons.lang.StringUtils;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import lombok.AllArgsConstructor;
-import org.springblade.community.entity.*;
-import org.springblade.community.mapper.BuildingMapper;
-import org.springblade.community.service.*;
+import org.springblade.community.entity.Building;
 import org.springblade.community.vo.BuildingVO;
+import org.springblade.community.mapper.BuildingMapper;
+import org.springblade.community.service.IBuildingService;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-//import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
  *  服务实现类
  *
  * @author BladeX
- * @since 2020-10-31
+ * @since 2021-03-29
  */
 @Service
-@AllArgsConstructor
 public class BuildingServiceImpl extends BaseServiceImpl<BuildingMapper, Building> implements IBuildingService {
 
-	private IAgencyService agencyService;
-	private IResidentialService residentialService;
-	private IUnitService unitService;
-	private IFloorService floorService;
-	private IRoomService roomService;
-
 	@Override
 	public IPage<BuildingVO> selectBuildingPage(IPage<BuildingVO> page, BuildingVO building) {
 		return page.setRecords(baseMapper.selectBuildingPage(page, building));
 	}
 
-	@Override
-	@Transactional
-	public boolean batchAddBuilding(BatchAddInfo batchAddInfo) {
-		Residential residential = residentialService.getById(batchAddInfo.getResidentialId());
-		Agency agency = agencyService.getById(residential.getAgencyId());
-
-		// 计算将要新建的楼栋数、单元数、楼层数、房间数
-		Integer buildingCount = batchAddInfo.getBuildingEnd() - batchAddInfo.getBuildingBegin() + 1;
-		Integer unitCount = batchAddInfo.getUnitEnd() - batchAddInfo.getUnitBegin() + 1;
-		Integer floorCount = batchAddInfo.getFloorEnd() - batchAddInfo.getFloorBegin() + 1;
-		Integer roomCount = batchAddInfo.getRoomEnd() - batchAddInfo.getRoomBegin() + 1;
-
-		// 遍历新建楼栋
-		for (int i = batchAddInfo.getBuildingBegin(); i <= batchAddInfo.getBuildingEnd(); i++) {
-			Building building = new Building();
-			building.setResidentialId(batchAddInfo.getResidentialId());
-			building.setResidentialName(residential.getName());
-			building.setAgencyId(agency.getId());
-			building.setAgencyName(agency.getAgencyName());
-			// 楼栋命名
-			String buildingName = "";
-			if (StringUtils.isNotBlank(batchAddInfo.getBuildingPrefix())){
-				buildingName += batchAddInfo.getBuildingPrefix();
-			}
-			buildingName += (i + "");
-			if (StringUtils.isNotBlank(batchAddInfo.getBuildingSuffix())){
-				buildingName += batchAddInfo.getBuildingSuffix();
-			}else{
-				buildingName += "栋";
-			}
-			building.setName(buildingName);
-			if (this.save(building)){
-				// 更新楼栋的orgPosition
-				building.setOrgPosition(residential.getOrgPosition() + "/" + building.getId());
-				this.updateById(building);
-
-				// 遍历新建单元
-				for (int j = batchAddInfo.getUnitBegin(); j <= batchAddInfo.getUnitEnd(); j++) {
-					Unit unit = new Unit();
-					unit.setBuildingId(building.getId());
-					unit.setBuildingName(building.getName());
-					unit.setAgencyId(agency.getId());
-					unit.setAgencyName(agency.getAgencyName());
-					unit.setResidentialId(residential.getId());
-					unit.setResidentialName(residential.getName());
-
-					// 单元命名
-					String unitName = "";
-					if (StringUtils.isNotBlank(batchAddInfo.getUnitPrefix())){
-						unitName += batchAddInfo.getUnitPrefix();
-					}
-					unitName += (j + "");
-					if (StringUtils.isNotBlank(batchAddInfo.getUnitSuffix())){
-						unitName += batchAddInfo.getUnitSuffix();
-					}else{
-						unitName += "单元";
-					}
-					unit.setName(unitName);
-					if (unitService.save(unit)){
-						// 更新单元orgPosition
-						unit.setOrgPosition(building.getOrgPosition() + "/" + unit.getId());
-						unitService.updateById(unit);
-
-						// 遍历新建楼层
-						for (int k = batchAddInfo.getFloorBegin(); k <= batchAddInfo.getFloorEnd(); k++) {
-							//跳过排除楼层
-							if (StringUtils.isNotBlank(batchAddInfo.getFloorExclude()) && (batchAddInfo.getFloorExclude()).contains((k + ""))){
-								continue;
-							}
-							Floor floor = new Floor();
-							floor.setAgencyId(agency.getId());
-							floor.setAgencyName(agency.getAgencyName());
-							floor.setResidentialId(residential.getId());
-							floor.setResidentialName(residential.getName());
-							floor.setBuildingId(building.getId());
-							floor.setBuildingName(building.getName());
-							floor.setUnitId(unit.getId());
-							floor.setUnitName(unitName);
-
-							// 楼层命名
-							String floorName = "";
-							if (StringUtils.isNotBlank(batchAddInfo.getFloorPrefix())){
-								floorName += batchAddInfo.getFloorPrefix();
-							}
-							floorName += (k + "");
-							if (StringUtils.isNotBlank(batchAddInfo.getFloorSuffix())){
-								floorName += batchAddInfo.getFloorSuffix();
-							}else {
-								floorName += "层";
-							}
-							floor.setName(floorName);
-
-							if (floorService.save(floor)){
-								//更新楼层orgPosition
-								floor.setOrgPosition(unit.getOrgPosition() + "/" + floor.getId());
-								floorService.updateById(floor);
-
-								// 遍历新建房间/房屋
-								for (int m = batchAddInfo.getRoomBegin(); m <= batchAddInfo.getRoomEnd(); m++) {
-									// 跳过排除楼层
-									if (StringUtils.isNotBlank(batchAddInfo.getRoomExclude()) && (batchAddInfo.getRoomExclude()).contains((m + ""))){
-										continue;
-									}
-									Room room = new Room();
-									room.setAgencyId(agency.getId());
-									room.setAgencyName(agency.getAgencyName());
-									room.setResidentialId(residential.getId());
-									room.setResidentialName(residential.getName());
-									room.setBuildingId(building.getId());
-									room.setBuildingName(building.getName());
-									room.setUnitId(unit.getId());
-									room.setUnitName(unit.getName());
-									room.setFloorId(floor.getId());
-									room.setFloorName(floorName);
-
-									// 房屋命名
-									String roomName = "";
-									if (StringUtils.isNotBlank(batchAddInfo.getRoomPrefix())){
-										roomName += batchAddInfo.getRoomPrefix();
-									}
-
-									roomName += (k + (m < 10 ? "0" : "") + m);
-									if (StringUtils.isNotBlank(batchAddInfo.getRoomSuffix())){
-										roomName += batchAddInfo.getRoomSuffix();
-									}
-									room.setName(roomName);
-									if (roomService.save(room)){
-										// 更新房屋orgPosition
-										room.setOrgPosition(floor.getOrgPosition() + "/" + room.getId());
-										roomService.updateById(room);
-									}
-								}
-							}
-							//更新楼层的房间数
-							Integer roomNumber = floor.getRoomNumber();
-							if ("null".equals(roomNumber + "")){
-								roomNumber = 0;
-							}
-							floor.setRoomNumber(roomNumber + roomCount);
-							floorService.updateById(floor);
-						}
-						//更新单元的楼层数、房间数
-						Integer floorNumber = unit.getFloorNumber();
-						if ("null".equals(floorNumber + "")){
-							floorNumber = 0;
-						}
-						unit.setFloorNumber(floorNumber + floorCount);
-						Integer roomNumber = unit.getRoomNumber();
-						if ("null".equals(roomNumber + "")){
-							roomNumber = 0;
-						}
-						unit.setRoomNumber(roomNumber + roomCount * floorCount);
-						unitService.updateById(unit);
-					}
-				}
-				// 更新楼栋的单元数、楼层数、房间数
-				Integer unitNumber = building.getUnitNumber();
-				if ("null".equals(unitNumber + "")){
-					unitNumber = 0;
-				}
-				building.setUnitNumber(unitNumber + unitCount);
-				Integer floorNumber = building.getFloorNumber();
-				if ("null".equals(floorNumber + "")){
-					floorNumber = 0 ;
-				}
-				building.setFloorNumber(floorNumber + floorCount * unitCount);
-				Integer roomNumber = building.getRoomNumber();
-				if ("null".equals(roomNumber + "")){
-					roomNumber = 0 ;
-				}
-				building.setRoomNumber(roomNumber + roomCount * floorCount * unitCount);
-
-				this.updateById(building);
-			}
-		}
-		// 更新小区的楼栋数、单元数、楼层数、房间数
-		Integer buildingNumber = residential.getBuildingNumber();
-		if ("null".equals(buildingNumber + "")){
-			buildingNumber = 0 ;
-		}
-		residential.setBuildingNumber(buildingNumber + buildingCount);
-		Integer unitNumber = residential.getUnitNumber();
-		if ("null".equals(unitNumber + "")){
-			unitNumber = 0;
-		}
-		residential.setUnitNumber(unitNumber + unitCount * buildingCount);
-		Integer floorNumber = residential.getFloorNumber();
-		if ("null".equals(floorNumber + "")){
-			floorNumber = 0 ;
-		}
-		residential.setFloorNumber(floorNumber + floorCount * unitCount * buildingCount);
-		Integer roomNumber = residential.getRoomNumber();
-		if ("null".equals(roomNumber + "")){
-			roomNumber = 0 ;
-		}
-		residential.setRoomNumber(roomNumber + roomCount * floorCount * unitCount * buildingCount);
-		residentialService.updateById(residential);
-
-		return true;
-	}
-
 }

blade-service/community/src/main/java/org/springblade/community/service/impl/FloorServiceImpl.java

@@ -16,19 +16,19 @@
  */
 package org.springblade.community.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.community.entity.Floor;
+import org.springblade.community.vo.FloorVO;
 import org.springblade.community.mapper.FloorMapper;
 import org.springblade.community.service.IFloorService;
-import org.springblade.community.vo.FloorVO;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
  *  服务实现类
  *
  * @author BladeX
- * @since 2020-11-06
+ * @since 2021-03-29
  */
 @Service
 public class FloorServiceImpl extends BaseServiceImpl<FloorMapper, Floor> implements IFloorService {

blade-service/community/src/main/java/org/springblade/community/service/impl/HouseuserServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.community.service.impl;
+
+import org.springblade.community.entity.Houseuser;
+import org.springblade.community.vo.HouseuserVO;
+import org.springblade.community.mapper.HouseuserMapper;
+import org.springblade.community.service.IHouseuserService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 住户表 服务实现类
+ *
+ * @author BladeX
+ * @since 2021-03-29
+ */
+@Service
+public class HouseuserServiceImpl extends BaseServiceImpl<HouseuserMapper, Houseuser> implements IHouseuserService {
+
+	@Override
+	public IPage<HouseuserVO> selectHouseuserPage(IPage<HouseuserVO> page, HouseuserVO houseuser) {
+		return page.setRecords(baseMapper.selectHouseuserPage(page, houseuser));
+	}
+
+}

blade-service/community/src/main/java/org/springblade/community/service/impl/ResidentialServiceImpl.java

@@ -16,19 +16,19 @@
  */
 package org.springblade.community.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.community.entity.Residential;
+import org.springblade.community.vo.ResidentialVO;
 import org.springblade.community.mapper.ResidentialMapper;
 import org.springblade.community.service.IResidentialService;
-import org.springblade.community.vo.ResidentialVO;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
  * 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号 服务实现类
  *
  * @author BladeX
- * @since 2020-10-16
+ * @since 2021-03-29
  */
 @Service
 public class ResidentialServiceImpl extends BaseServiceImpl<ResidentialMapper, Residential> implements IResidentialService {

blade-service/community/src/main/java/org/springblade/community/service/impl/RoomServiceImpl.java

@@ -16,21 +16,19 @@
  */
 package org.springblade.community.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.community.entity.Room;
+import org.springblade.community.vo.RoomVO;
 import org.springblade.community.mapper.RoomMapper;
 import org.springblade.community.service.IRoomService;
-import org.springblade.community.vo.RoomVO;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
  * 房间表 服务实现类
  *
  * @author BladeX
- * @since 2020-10-18
+ * @since 2021-03-29
  */
 @Service
 public class RoomServiceImpl extends BaseServiceImpl<RoomMapper, Room> implements IRoomService {
@@ -40,9 +38,4 @@ public class RoomServiceImpl extends BaseServiceImpl<RoomMapper, Room> implement
 		return page.setRecords(baseMapper.selectRoomPage(page, room));
 	}
 
-	@Override
-	public List<Room> getRoomsByPersonId(Long personId) {
-		return baseMapper.getRoomsByPersonId(personId);
-	}
-
 }

blade-service/community/src/main/java/org/springblade/community/service/impl/UnitServiceImpl.java

@@ -16,19 +16,19 @@
  */
 package org.springblade.community.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.community.entity.Unit;
+import org.springblade.community.vo.UnitVO;
 import org.springblade.community.mapper.UnitMapper;
 import org.springblade.community.service.IUnitService;
-import org.springblade.community.vo.UnitVO;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
  * 单元表 服务实现类
  *
  * @author BladeX
- * @since 2020-10-18
+ * @since 2021-03-29
  */
 @Service
 public class UnitServiceImpl extends BaseServiceImpl<UnitMapper, Unit> implements IUnitService {

blade-service/community/src/main/java/org/springblade/community/wrapper/AgencyWrapper.java

@@ -16,60 +16,33 @@
  */
 package org.springblade.community.wrapper;
 
-
-import org.springblade.community.entity.Agency;
-import org.springblade.community.vo.AgencyVO;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.system.expand.entity.Street;
-import org.springblade.system.expand.entity.SysArea;
-import org.springblade.system.expand.feign.IStreetClient;
-import org.springblade.system.expand.feign.ISysAreaClient;
-
+import org.springblade.community.entity.Agency;
+import org.springblade.community.vo.AgencyVO;
 import java.util.Objects;
 
 /**
  * 包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2020-11-06
+ * @since 2021-03-29
  */
-public class AgencyWrapper extends BaseEntityWrapper<Agency, AgencyVO> {
-
-	private IStreetClient streetClient;
-	private ISysAreaClient sysAreaClient;
+public class AgencyWrapper extends BaseEntityWrapper<Agency, AgencyVO>  {
 
-	private AgencyWrapper(IStreetClient streetClient, ISysAreaClient sysAreaClient){
-		this.streetClient = streetClient;
-		this.sysAreaClient = sysAreaClient;
-	}
-
-	public static AgencyWrapper build(IStreetClient streetClient, ISysAreaClient sysAreaClient) {
-		return new AgencyWrapper(streetClient,sysAreaClient);
+	public static AgencyWrapper build() {
+		return new AgencyWrapper();
  	}
 
 	@Override
 	public AgencyVO entityVO(Agency agency) {
 		AgencyVO agencyVO = Objects.requireNonNull(BeanUtil.copy(agency, AgencyVO.class));
-		SysArea province = sysAreaClient.getByCode(agency.getRegionProvince());
-		if(province != null){
-			agencyVO.setProvinceName(province.getSName());
-		}
-
-		SysArea city = sysAreaClient.getByCode(agency.getRegionCity());
-		if(province != null){
-			agencyVO.setCityName(city.getSName());
-		}
 
-		SysArea area = sysAreaClient.getByCode(agency.getRegionArea());
-		if(province != null){
-			agencyVO.setAreaName(area.getSName());
-		}
+		//User createUser = UserCache.getUser(agency.getCreateUser());
+		//User updateUser = UserCache.getUser(agency.getUpdateUser());
+		//agencyVO.setCreateUserName(createUser.getName());
+		//agencyVO.setUpdateUserName(updateUser.getName());
 
-		Street street = streetClient.getByCode(agency.getRegionStreet());
-		if(street != null){
-			agencyVO.setStreetName(street.getName());
-		}
 		return agencyVO;
 	}
 

blade-service/community/src/main/java/org/springblade/community/wrapper/BuildingWrapper.java

@@ -1,40 +1,47 @@
-/**
- * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
  */
 package org.springblade.community.wrapper;
 
-import org.springblade.community.entity.Building;
-import org.springblade.community.vo.BuildingVO;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.community.entity.Building;
+import org.springblade.community.vo.BuildingVO;
+import java.util.Objects;
 
 /**
  * 包装类,返回视图层所需的字段
  *
- * @author Blade
- * @since 2021-02-24
+ * @author BladeX
+ * @since 2021-03-29
  */
-public class BuildingWrapper extends BaseEntityWrapper<Building, BuildingVO> {
+public class BuildingWrapper extends BaseEntityWrapper<Building, BuildingVO>  {
 
-    public static BuildingWrapper build() {
-        return new BuildingWrapper();
-    }
+	public static BuildingWrapper build() {
+		return new BuildingWrapper();
+ 	}
 
 	@Override
 	public BuildingVO entityVO(Building building) {
-		BuildingVO buildingVO = BeanUtil.copy(building, BuildingVO.class);
+		BuildingVO buildingVO = Objects.requireNonNull(BeanUtil.copy(building, BuildingVO.class));
+
+		//User createUser = UserCache.getUser(building.getCreateUser());
+		//User updateUser = UserCache.getUser(building.getUpdateUser());
+		//buildingVO.setCreateUserName(createUser.getName());
+		//buildingVO.setUpdateUserName(updateUser.getName());
 
 		return buildingVO;
 	}

blade-service/community/src/main/java/org/springblade/community/wrapper/FloorWrapper.java

@@ -16,21 +16,19 @@
  */
 package org.springblade.community.wrapper;
 
-
-import org.springblade.community.entity.Floor;
-import org.springblade.community.vo.FloorVO;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-
+import org.springblade.community.entity.Floor;
+import org.springblade.community.vo.FloorVO;
 import java.util.Objects;
 
 /**
  * 包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2020-11-06
+ * @since 2021-03-29
  */
-public class FloorWrapper extends BaseEntityWrapper<Floor, FloorVO> {
+public class FloorWrapper extends BaseEntityWrapper<Floor, FloorVO>  {
 
 	public static FloorWrapper build() {
 		return new FloorWrapper();

blade-service/community/src/main/java/org/springblade/community/wrapper/HouseuserWrapper.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.community.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.community.entity.Houseuser;
+import org.springblade.community.vo.HouseuserVO;
+import java.util.Objects;
+
+/**
+ * 住户表包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2021-03-29
+ */
+public class HouseuserWrapper extends BaseEntityWrapper<Houseuser, HouseuserVO>  {
+
+	public static HouseuserWrapper build() {
+		return new HouseuserWrapper();
+ 	}
+
+	@Override
+	public HouseuserVO entityVO(Houseuser houseuser) {
+		HouseuserVO houseuserVO = Objects.requireNonNull(BeanUtil.copy(houseuser, HouseuserVO.class));
+
+		//User createUser = UserCache.getUser(houseuser.getCreateUser());
+		//User updateUser = UserCache.getUser(houseuser.getUpdateUser());
+		//houseuserVO.setCreateUserName(createUser.getName());
+		//houseuserVO.setUpdateUserName(updateUser.getName());
+
+		return houseuserVO;
+	}
+
+}

blade-service/community/src/main/java/org/springblade/community/wrapper/ResidentialWrapper.java

@@ -16,47 +16,32 @@
  */
 package org.springblade.community.wrapper;
 
-
-
-
-import org.springblade.community.entity.Agency;
-import org.springblade.community.entity.Residential;
-import org.springblade.community.service.IAgencyService;
-import org.springblade.community.vo.ResidentialVO;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-
+import org.springblade.community.entity.Residential;
+import org.springblade.community.vo.ResidentialVO;
 import java.util.Objects;
 
 /**
- * 包装类,返回视图层所需的字段
+ * 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号包装类,返回视图层所需的字段
  *
  * @author BladeX
- * @since 2020-11-06
+ * @since 2021-03-29
  */
-public class ResidentialWrapper extends BaseEntityWrapper<Residential, ResidentialVO> {
-
-	private IAgencyService agencyService;
+public class ResidentialWrapper extends BaseEntityWrapper<Residential, ResidentialVO>  {
 
-
-	public ResidentialWrapper(IAgencyService agencyService){
-		this.agencyService = agencyService;
-	}
-	public static ResidentialWrapper build(IAgencyService agencyService) {
-		return new ResidentialWrapper(agencyService);
+	public static ResidentialWrapper build() {
+		return new ResidentialWrapper();
  	}
 
-
 	@Override
 	public ResidentialVO entityVO(Residential residential) {
 		ResidentialVO residentialVO = Objects.requireNonNull(BeanUtil.copy(residential, ResidentialVO.class));
 
-		if(residential.getAgencyId()!=null){
-			Agency agency = agencyService.getById(residential.getAgencyId());
-			if(agency != null){
-				residentialVO.setAgencyName(agency.getAgencyName());
-			}
-		}
+		//User createUser = UserCache.getUser(residential.getCreateUser());
+		//User updateUser = UserCache.getUser(residential.getUpdateUser());
+		//residentialVO.setCreateUserName(createUser.getName());
+		//residentialVO.setUpdateUserName(updateUser.getName());
 
 		return residentialVO;
 	}

blade-service/community/src/main/java/org/springblade/community/wrapper/RoomWrapper.java

@@ -1,40 +1,47 @@
-/**
- * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
  */
 package org.springblade.community.wrapper;
 
-import org.springblade.community.entity.Room;
-import org.springblade.community.vo.RoomVO;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.community.entity.Room;
+import org.springblade.community.vo.RoomVO;
+import java.util.Objects;
 
 /**
  * 房间表包装类,返回视图层所需的字段
  *
- * @author Blade
- * @since 2021-02-24
+ * @author BladeX
+ * @since 2021-03-29
  */
-public class RoomWrapper extends BaseEntityWrapper<Room, RoomVO> {
+public class RoomWrapper extends BaseEntityWrapper<Room, RoomVO>  {
 
-    public static RoomWrapper build() {
-        return new RoomWrapper();
-    }
+	public static RoomWrapper build() {
+		return new RoomWrapper();
+ 	}
 
 	@Override
 	public RoomVO entityVO(Room room) {
-		RoomVO roomVO = BeanUtil.copy(room, RoomVO.class);
+		RoomVO roomVO = Objects.requireNonNull(BeanUtil.copy(room, RoomVO.class));
+
+		//User createUser = UserCache.getUser(room.getCreateUser());
+		//User updateUser = UserCache.getUser(room.getUpdateUser());
+		//roomVO.setCreateUserName(createUser.getName());
+		//roomVO.setUpdateUserName(updateUser.getName());
 
 		return roomVO;
 	}

blade-service/community/src/main/java/org/springblade/community/wrapper/UnitWrapper.java

@@ -1,40 +1,47 @@
-/**
- * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
  */
 package org.springblade.community.wrapper;
 
-import org.springblade.community.entity.Unit;
-import org.springblade.community.vo.UnitVO;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.community.entity.Unit;
+import org.springblade.community.vo.UnitVO;
+import java.util.Objects;
 
 /**
  * 单元表包装类,返回视图层所需的字段
  *
- * @author Blade
- * @since 2021-02-24
+ * @author BladeX
+ * @since 2021-03-29
  */
-public class UnitWrapper extends BaseEntityWrapper<Unit, UnitVO> {
+public class UnitWrapper extends BaseEntityWrapper<Unit, UnitVO>  {
 
-    public static UnitWrapper build() {
-        return new UnitWrapper();
-    }
+	public static UnitWrapper build() {
+		return new UnitWrapper();
+ 	}
 
 	@Override
 	public UnitVO entityVO(Unit unit) {
-		UnitVO unitVO = BeanUtil.copy(unit, UnitVO.class);
+		UnitVO unitVO = Objects.requireNonNull(BeanUtil.copy(unit, UnitVO.class));
+
+		//User createUser = UserCache.getUser(unit.getCreateUser());
+		//User updateUser = UserCache.getUser(unit.getUpdateUser());
+		//unitVO.setCreateUserName(createUser.getName());
+		//unitVO.setUpdateUserName(updateUser.getName());
 
 		return unitVO;
 	}