修改

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

@@ -0,0 +1,18 @@
+package org.springblade.community.dto;
+
+import lombok.Builder;
+import lombok.Data;
+import org.springblade.community.entity.Residential;
+
+/**
+ * 级联物理删除所需的对象
+ * @author cy-computer
+ */
+@Data
+public class AgencyMngDelDTO {
+	private Long residentialId;
+	private Long buildingId;
+	private Long unitId;
+	private Long floorId;
+	private Long roomId;
+}

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

@@ -4,6 +4,7 @@ import lombok.Data;
 import org.springblade.community.entity.Residential;
 
 /**
+ * 批量添加所需的对象
  * @author cy-computer
  */
 @Data

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

@@ -27,9 +27,9 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
-import org.springblade.community.entity.BatchAddInfo;
-import org.springblade.community.entity.Residential;
-import org.springblade.community.service.IResidentialService;
+import org.springblade.community.dto.AgencyMngDelDTO;
+import org.springblade.community.entity.*;
+import org.springblade.community.service.*;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -38,13 +38,12 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.system.expand.feign.IConfClient;
 import org.springblade.system.expand.feign.IOrgPositionClient;
 import org.springblade.system.expand.util.QueryWrapperUtil;
+import org.springframework.transaction.annotation.Transactional;
 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.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.Map;
@@ -63,6 +62,9 @@ public class BuildingController extends BladeController {
 
 	private final IBuildingService buildingService;
 	private final IResidentialService residentialService;
+	private final IUnitService unitService;
+	private final IFloorService floorService;
+	private final IRoomService roomService;
 
 	private final IOrgPositionClient orgPositionClient;
 	private final IConfClient confClient;
@@ -162,6 +164,27 @@ public class BuildingController extends BladeController {
 		return R.status(buildingService.deleteLogic(Func.toLongList(ids)));
 	}
 
+	/**
+	 * 物理删除，及其所有子节点 单元...房间
+	 */
+	@PostMapping("/removeAll")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@Transactional(rollbackFor = Exception.class)
+	public R remove(@RequestParam Long id) {
+		AgencyMngDelDTO delDTO = new AgencyMngDelDTO();
+		delDTO.setBuildingId(id);
+		//物理删除楼栋
+		buildingService.delete(delDTO);
+		//物理删除单元
+		unitService.delete(delDTO);
+		//物理删除楼层
+		floorService.delete(delDTO);
+		//物理删除房间
+		roomService.delete(delDTO);
+		return R.status(true);
+	}
+
 	/**
 	 * 批量新增
 	 */

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

@@ -25,11 +25,11 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.springblade.community.dto.AgencyMngDelDTO;
 import org.springblade.community.entity.Building;
 import org.springblade.community.entity.Residential;
 import org.springblade.community.entity.Room;
-import org.springblade.community.service.IBuildingService;
-import org.springblade.community.service.IResidentialService;
+import org.springblade.community.service.*;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -39,13 +39,13 @@ import org.springblade.system.expand.feign.IConfClient;
 import org.springblade.system.expand.feign.IOrgPositionClient;
 import org.springblade.system.expand.util.QueryWrapperUtil;
 import org.springframework.boot.autoconfigure.info.ProjectInfoProperties;
+import org.springframework.transaction.annotation.Transactional;
 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.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.Map;
@@ -65,6 +65,8 @@ public class UnitController extends BladeController {
 	private final IUnitService unitService;
 	private final IBuildingService buildingService;
 	private final IResidentialService residentialService;
+	private final IFloorService floorService;
+	private final IRoomService roomService;
 
 	private final IOrgPositionClient orgPositionClient;
 	private final IConfClient confClient;
@@ -167,6 +169,25 @@ public class UnitController extends BladeController {
 		return R.status(unitService.saveOrUpdateUnit(unit));
 	}
 
+	/**
+	 * 物理删除，及其所有子节点 楼层...房间
+	 */
+	@PostMapping("/removeAll")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@Transactional(rollbackFor = Exception.class)
+	public R remove(@RequestParam Long id) {
+		AgencyMngDelDTO delDTO = new AgencyMngDelDTO();
+		delDTO.setUnitId(id);
+		//物理删除单元
+		unitService.delete(delDTO);
+		//物理删除楼层
+		floorService.delete(delDTO);
+		//物理删除房间
+		roomService.delete(delDTO);
+		return R.status(true);
+	}
+
 
 	/**
 	 * 删除 单元表

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

@@ -16,6 +16,7 @@
  */
 package org.springblade.community.mapper;
 
+import org.springblade.community.dto.AgencyMngDelDTO;
 import org.springblade.community.entity.Building;
 import org.springblade.community.vo.BuildingVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -39,4 +40,10 @@ public interface BuildingMapper extends BaseMapper<Building> {
 	 */
 	List<BuildingVO> selectBuildingPage(IPage page, BuildingVO building);
 
+	/**
+	 * 物理删除
+	 * @param agencyMngDelDTO
+	 * @return
+	 */
+	Boolean delete(AgencyMngDelDTO agencyMngDelDTO);
 }

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

@@ -35,4 +35,15 @@
         select * from community_building where is_deleted = 0
     </select>
 
+    <delete id="delete" parameterType="org.springblade.community.dto.AgencyMngDelDTO">
+        delete from community_building
+        where 1=1
+        <if test="buildingId != null and buildingId!=''">
+            and id = #{buildingId}
+        </if>
+        <if test="residentialId != null and residentialId!=''">
+            and residential_id = #{residentialId}
+        </if>
+    </delete>
+
 </mapper>

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

@@ -16,6 +16,7 @@
  */
 package org.springblade.community.mapper;
 
+import org.springblade.community.dto.AgencyMngDelDTO;
 import org.springblade.community.entity.Floor;
 import org.springblade.community.vo.FloorVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -39,4 +40,11 @@ public interface FloorMapper extends BaseMapper<Floor> {
 	 */
 	List<FloorVO> selectFloorPage(IPage page, FloorVO floor);
 
+	/**
+	 * 物理删除
+	 * @param agencyMngDelDTO
+	 * @return
+	 */
+	Boolean delete(AgencyMngDelDTO agencyMngDelDTO);
+
 }

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

@@ -38,4 +38,21 @@
         select * from community_floor where is_deleted = 0
     </select>
 
+    <delete id="delete" parameterType="org.springblade.community.dto.AgencyMngDelDTO">
+        delete from community_floor
+        where 1=1
+        <if test="floorId != null and floorId!=''">
+            and id = #{floorId}
+        </if>
+        <if test="unitId != null and unitId!=''">
+            and unit_id = #{unitId}
+        </if>
+        <if test="buildingId != null and buildingId!=''">
+            and building_id = #{buildingId}
+        </if>
+        <if test="residentialId != null and residentialId!=''">
+            and residential_id = #{residentialId}
+        </if>
+    </delete>
+
 </mapper>

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

@@ -43,4 +43,11 @@ public interface ResidentialMapper extends BaseMapper<Residential> {
 
 	List<ResidentialVO> findPage(Long current,Long size,String agencyId,String name);
 
+	/**
+	 * 物理删除
+	 * @param id
+	 * @return
+	 */
+	Boolean delete(Long id);
+
 }

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

@@ -61,4 +61,8 @@
         LIMIT #{current} , #{size}
     </select>
 
+    <delete id="delete" parameterType="Long">
+        delete from community_residential where id=#{id}
+    </delete>
+
 </mapper>

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

@@ -18,6 +18,7 @@ package org.springblade.community.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import org.apache.ibatis.annotations.Param;
+import org.springblade.community.dto.AgencyMngDelDTO;
 import org.springblade.community.entity.Room;
 import org.springblade.community.vo.RoomVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -45,4 +46,11 @@ public interface RoomMapper extends BaseMapper<Room> {
 
 	List<Room> queryPage(IPage page, @Param("ew") Wrapper<Room> queryWrapper);
 
+
+	/**
+	 * 物理删除
+	 * @param agencyMngDelDTO
+	 * @return
+	 */
+	Boolean delete(AgencyMngDelDTO agencyMngDelDTO);
 }

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

@@ -47,8 +47,24 @@
 
     </select>
 
-    <select id="queryPage" resultType="org.springblade.community.entity.Room">
-        SELECT * FROM community_room ${ew.customSqlSegment}
-    </select>
+    <delete id="delete" parameterType="org.springblade.community.dto.AgencyMngDelDTO">
+        delete from community_room
+        where 1=1
+        <if test="roomId != null and roomId!=''">
+            and id = #{roomId}
+        </if>
+        <if test="floorId != null and floorId!=''">
+            and floor_id = #{floorId}
+        </if>
+        <if test="unitId != null and unitId!=''">
+            and unit_id = #{unitId}
+        </if>
+        <if test="buildingId != null and buildingId!=''">
+            and building_id = #{buildingId}
+        </if>
+        <if test="residentialId != null and residentialId!=''">
+            and residential_id = #{residentialId}
+        </if>
+    </delete>
 
 </mapper>

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

@@ -16,6 +16,7 @@
  */
 package org.springblade.community.mapper;
 
+import org.springblade.community.dto.AgencyMngDelDTO;
 import org.springblade.community.entity.Unit;
 import org.springblade.community.vo.UnitVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -39,4 +40,11 @@ public interface UnitMapper extends BaseMapper<Unit> {
 	 */
 	List<UnitVO> selectUnitPage(IPage page, UnitVO unit);
 
+	/**
+	 * 物理删除
+	 * @param agencyMngDelDTO
+	 * @return
+	 */
+	Boolean delete(AgencyMngDelDTO agencyMngDelDTO);
+
 }

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

@@ -39,4 +39,19 @@
         select * from community_unit where is_deleted = 0
     </select>
 
+
+    <delete id="delete" parameterType="org.springblade.community.dto.AgencyMngDelDTO">
+        delete from community_unit
+        where 1=1
+        <if test="unitId != null and unitId!=''">
+            and id = #{unitId}
+        </if>
+        <if test="buildingId != null and buildingId!=''">
+            and building_id = #{buildingId}
+        </if>
+        <if test="residentialId != null and residentialId!=''">
+            and residential_id = #{residentialId}
+        </if>
+    </delete>
+
 </mapper>

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

@@ -16,6 +16,7 @@
  */
 package org.springblade.community.service;
 
+import org.springblade.community.dto.AgencyMngDelDTO;
 import org.springblade.community.entity.BatchAddInfo;
 import org.springblade.community.entity.Building;
 import org.springblade.community.vo.BuildingVO;
@@ -43,4 +44,11 @@ public interface IBuildingService extends BaseService<Building> {
 	boolean saveOrUpdateBuilding(Building building);
 
 	boolean batchAddBuilding(BatchAddInfo batchAddInfo);
+
+	/**
+	 * 物理删除
+	 * @param agencyMngDelDTO
+	 * @return
+	 */
+	Boolean delete(AgencyMngDelDTO agencyMngDelDTO);
 }

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

@@ -16,6 +16,7 @@
  */
 package org.springblade.community.service;
 
+import org.springblade.community.dto.AgencyMngDelDTO;
 import org.springblade.community.entity.Floor;
 import org.springblade.community.vo.FloorVO;
 import org.springblade.core.mp.base.BaseService;
@@ -40,4 +41,11 @@ public interface IFloorService extends BaseService<Floor> {
 
 	boolean saveOrUpdateFloor(Floor floor);
 
+	/**
+	 * 物理删除
+	 * @param agencyMngDelDTO
+	 * @return
+	 */
+	Boolean delete(AgencyMngDelDTO agencyMngDelDTO);
+
 }

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

@@ -47,4 +47,11 @@ public interface IResidentialService extends BaseService<Residential> {
 	List<ResidentialVO> findPage(Long current,Long size,String agencyId,String name);
 
 	List<Residential> getListWithYtelevatorXq(List<Long> residentialIds);
+
+	/**
+	 * 物理删除
+	 * @param id
+	 * @return
+	 */
+	Boolean delete(Long id);
 }

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

@@ -18,6 +18,7 @@ package org.springblade.community.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springblade.community.dto.AgencyMngDelDTO;
 import org.springblade.community.entity.Room;
 import org.springblade.community.vo.RoomVO;
 import org.springblade.core.mp.base.BaseService;
@@ -44,4 +45,10 @@ public interface IRoomService extends BaseService<Room> {
 
 	IPage<Room> queryPage(IPage<Room> page, LambdaQueryWrapper<Room> queryWrapper);
 
+	/**
+	 * 物理删除
+	 * @param agencyMngDelDTO
+	 * @return
+	 */
+	Boolean delete(AgencyMngDelDTO agencyMngDelDTO);
 }

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

@@ -16,6 +16,7 @@
  */
 package org.springblade.community.service;
 
+import org.springblade.community.dto.AgencyMngDelDTO;
 import org.springblade.community.entity.Unit;
 import org.springblade.community.vo.UnitVO;
 import org.springblade.core.mp.base.BaseService;
@@ -41,4 +42,10 @@ public interface IUnitService extends BaseService<Unit> {
 	boolean saveOrUpdateUnit(Unit unit);
 
 
+	/**
+	 * 物理删除
+	 * @param agencyMngDelDTO
+	 * @return
+	 */
+	Boolean delete(AgencyMngDelDTO agencyMngDelDTO);
 }

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

@@ -19,6 +19,7 @@ package org.springblade.community.service.impl;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import lombok.AllArgsConstructor;
 import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
+import org.springblade.community.dto.AgencyMngDelDTO;
 import org.springblade.community.entity.*;
 import org.springblade.community.service.*;
 import org.springblade.community.vo.BuildingVO;
@@ -82,17 +83,17 @@ public class BuildingServiceImpl extends BaseServiceImpl<BuildingMapper, Buildin
 			building.setAgencyName(agency.getName());
 			// 楼栋命名
 			String buildingName = "";
-			if (StringUtils.isNotBlank(batchAddInfo.getBuildingPrefix())){
+			if (StringUtils.isNotBlank(batchAddInfo.getBuildingPrefix())) {
 				buildingName += batchAddInfo.getBuildingPrefix();
 			}
 			buildingName += (i + "");
-			if (StringUtils.isNotBlank(batchAddInfo.getBuildingSuffix())){
+			if (StringUtils.isNotBlank(batchAddInfo.getBuildingSuffix())) {
 				buildingName += batchAddInfo.getBuildingSuffix();
-			}else{
+			} else {
 				buildingName += "栋";
 			}
 			building.setName(buildingName);
-			if (this.save(building)){
+			if (this.save(building)) {
 				// 更新楼栋的orgPosition
 				building.setOrgPosition(residential.getOrgPosition() + "/" + building.getId());
 				this.updateById(building);
@@ -109,17 +110,17 @@ public class BuildingServiceImpl extends BaseServiceImpl<BuildingMapper, Buildin
 
 					// 单元命名
 					String unitName = "";
-					if (StringUtils.isNotBlank(batchAddInfo.getUnitPrefix())){
+					if (StringUtils.isNotBlank(batchAddInfo.getUnitPrefix())) {
 						unitName += batchAddInfo.getUnitPrefix();
 					}
 					unitName += (j + "");
-					if (StringUtils.isNotBlank(batchAddInfo.getUnitSuffix())){
+					if (StringUtils.isNotBlank(batchAddInfo.getUnitSuffix())) {
 						unitName += batchAddInfo.getUnitSuffix();
-					}else{
+					} else {
 						unitName += "单元";
 					}
 					unit.setName(unitName);
-					if (unitService.save(unit)){
+					if (unitService.save(unit)) {
 						// 更新单元orgPosition
 						unit.setOrgPosition(building.getOrgPosition() + "/" + unit.getId());
 						unitService.updateById(unit);
@@ -127,7 +128,7 @@ public class BuildingServiceImpl extends BaseServiceImpl<BuildingMapper, Buildin
 						// 遍历新建楼层
 						for (int k = batchAddInfo.getFloorBegin(); k <= batchAddInfo.getFloorEnd(); k++) {
 							//跳过排除楼层
-							if (StringUtils.isNotBlank(batchAddInfo.getFloorExclude()) && (batchAddInfo.getFloorExclude()).contains((k + ""))){
+							if (StringUtils.isNotBlank(batchAddInfo.getFloorExclude()) && (batchAddInfo.getFloorExclude()).contains((k + ""))) {
 								continue;
 							}
 							Floor floor = new Floor();
@@ -142,18 +143,18 @@ public class BuildingServiceImpl extends BaseServiceImpl<BuildingMapper, Buildin
 
 							// 楼层命名
 							String floorName = "";
-							if (StringUtils.isNotBlank(batchAddInfo.getFloorPrefix())){
+							if (StringUtils.isNotBlank(batchAddInfo.getFloorPrefix())) {
 								floorName += batchAddInfo.getFloorPrefix();
 							}
 							floorName += (k + "");
-							if (StringUtils.isNotBlank(batchAddInfo.getFloorSuffix())){
+							if (StringUtils.isNotBlank(batchAddInfo.getFloorSuffix())) {
 								floorName += batchAddInfo.getFloorSuffix();
-							}else {
+							} else {
 								floorName += "层";
 							}
 							floor.setName(floorName);
 
-							if (floorService.save(floor)){
+							if (floorService.save(floor)) {
 								//更新楼层orgPosition
 								floor.setOrgPosition(unit.getOrgPosition() + "/" + floor.getId());
 								floorService.updateById(floor);
@@ -161,7 +162,7 @@ public class BuildingServiceImpl extends BaseServiceImpl<BuildingMapper, Buildin
 								// 遍历新建房间/房屋
 								for (int m = batchAddInfo.getRoomBegin(); m <= batchAddInfo.getRoomEnd(); m++) {
 									// 跳过排除楼层
-									if (StringUtils.isNotBlank(batchAddInfo.getRoomExclude()) && (batchAddInfo.getRoomExclude()).contains((m + ""))){
+									if (StringUtils.isNotBlank(batchAddInfo.getRoomExclude()) && (batchAddInfo.getRoomExclude()).contains((m + ""))) {
 										continue;
 									}
 									Room room = new Room();
@@ -178,16 +179,16 @@ public class BuildingServiceImpl extends BaseServiceImpl<BuildingMapper, Buildin
 
 									// 房屋命名
 									String roomName = "";
-									if (StringUtils.isNotBlank(batchAddInfo.getRoomPrefix())){
+									if (StringUtils.isNotBlank(batchAddInfo.getRoomPrefix())) {
 										roomName += batchAddInfo.getRoomPrefix();
 									}
 
 									roomName += (k + (m < 10 ? "0" : "") + m);
-									if (StringUtils.isNotBlank(batchAddInfo.getRoomSuffix())){
+									if (StringUtils.isNotBlank(batchAddInfo.getRoomSuffix())) {
 										roomName += batchAddInfo.getRoomSuffix();
 									}
 									room.setName(roomName);
-									if (roomService.save(room)){
+									if (roomService.save(room)) {
 										// 更新房屋orgPosition
 										room.setOrgPosition(floor.getOrgPosition() + "/" + room.getId());
 										roomService.updateById(room);
@@ -196,7 +197,7 @@ public class BuildingServiceImpl extends BaseServiceImpl<BuildingMapper, Buildin
 							}
 							//更新楼层的房间数
 							Integer roomNumber = floor.getRoomCount();
-							if ("null".equals(roomNumber + "")){
+							if ("null".equals(roomNumber + "")) {
 								roomNumber = 0;
 							}
 							floor.setRoomCount(roomNumber + roomCount);
@@ -204,12 +205,12 @@ public class BuildingServiceImpl extends BaseServiceImpl<BuildingMapper, Buildin
 						}
 						//更新单元的楼层数、房间数
 						Integer floorNumber = unit.getFloorCount();
-						if ("null".equals(floorNumber + "")){
+						if ("null".equals(floorNumber + "")) {
 							floorNumber = 0;
 						}
 						unit.setFloorCount(floorNumber + floorCount);
 						Integer roomNumber = unit.getRoomCount();
-						if ("null".equals(roomNumber + "")){
+						if ("null".equals(roomNumber + "")) {
 							roomNumber = 0;
 						}
 						unit.setRoomCount(roomNumber + roomCount * floorCount);
@@ -218,18 +219,18 @@ public class BuildingServiceImpl extends BaseServiceImpl<BuildingMapper, Buildin
 				}
 				// 更新楼栋的单元数、楼层数、房间数
 				Integer unitNumber = building.getUnitCount();
-				if ("null".equals(unitNumber + "")){
+				if ("null".equals(unitNumber + "")) {
 					unitNumber = 0;
 				}
 				building.setUnitCount(unitNumber + unitCount);
 				Integer floorNumber = building.getFloorCount();
-				if ("null".equals(floorNumber + "")){
-					floorNumber = 0 ;
+				if ("null".equals(floorNumber + "")) {
+					floorNumber = 0;
 				}
 				building.setFloorCount(floorNumber + floorCount * unitCount);
 				Integer roomNumber = building.getRoomCount();
-				if ("null".equals(roomNumber + "")){
-					roomNumber = 0 ;
+				if ("null".equals(roomNumber + "")) {
+					roomNumber = 0;
 				}
 				building.setRoomCount(roomNumber + roomCount * floorCount * unitCount);
 
@@ -238,23 +239,23 @@ public class BuildingServiceImpl extends BaseServiceImpl<BuildingMapper, Buildin
 		}
 		// 更新小区的楼栋数、单元数、楼层数、房间数
 		Integer buildingNumber = residential.getBuildingCount();
-		if ("null".equals(buildingNumber + "")){
-			buildingNumber = 0 ;
+		if ("null".equals(buildingNumber + "")) {
+			buildingNumber = 0;
 		}
 		residential.setBuildingCount(buildingNumber + buildingCount);
 		Integer unitNumber = residential.getUnitCount();
-		if ("null".equals(unitNumber + "")){
+		if ("null".equals(unitNumber + "")) {
 			unitNumber = 0;
 		}
 		residential.setUnitCount(unitNumber + unitCount * buildingCount);
 		Integer floorNumber = residential.getFloorCount();
-		if ("null".equals(floorNumber + "")){
-			floorNumber = 0 ;
+		if ("null".equals(floorNumber + "")) {
+			floorNumber = 0;
 		}
 		residential.setFloorCount(floorNumber + floorCount * unitCount * buildingCount);
 		Integer roomNumber = residential.getRoomCount();
-		if ("null".equals(roomNumber + "")){
-			roomNumber = 0 ;
+		if ("null".equals(roomNumber + "")) {
+			roomNumber = 0;
 		}
 		residential.setRoomCount(roomNumber + roomCount * floorCount * unitCount * buildingCount);
 		residentialService.updateById(residential);
@@ -262,4 +263,9 @@ public class BuildingServiceImpl extends BaseServiceImpl<BuildingMapper, Buildin
 		return true;
 	}
 
+	@Override
+	public Boolean delete(AgencyMngDelDTO agencyMngDelDTO) {
+		return baseMapper.delete(agencyMngDelDTO);
+	}
+
 }

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

@@ -17,6 +17,7 @@
 package org.springblade.community.service.impl;
 
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import org.springblade.community.dto.AgencyMngDelDTO;
 import org.springblade.community.entity.Floor;
 import org.springblade.community.vo.FloorVO;
 import org.springblade.community.mapper.FloorMapper;
@@ -52,4 +53,10 @@ public class FloorServiceImpl extends BaseServiceImpl<FloorMapper, Floor> implem
 		return this.updateById(floor);
 	}
 
+	@Override
+	public Boolean delete(AgencyMngDelDTO agencyMngDelDTO) {
+		return baseMapper.delete(agencyMngDelDTO);
+	}
+
+
 }

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

@@ -67,4 +67,9 @@ public class ResidentialServiceImpl extends BaseServiceImpl<ResidentialMapper, R
 		return baseMapper.selectList(queryWrapper);
 	}
 
+	@Override
+	public Boolean delete(Long id) {
+		return baseMapper.delete(id);
+	}
+
 }

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

@@ -17,6 +17,7 @@
 package org.springblade.community.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springblade.community.dto.AgencyMngDelDTO;
 import org.springblade.community.entity.Room;
 import org.springblade.community.vo.RoomVO;
 import org.springblade.community.mapper.RoomMapper;
@@ -59,4 +60,9 @@ public class RoomServiceImpl extends BaseServiceImpl<RoomMapper, Room> implement
 		return page.setRecords(rooms);
 	}
 
+    @Override
+    public Boolean delete(AgencyMngDelDTO agencyMngDelDTO) {
+        return baseMapper.delete(agencyMngDelDTO);
+    }
+
 }

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

@@ -17,6 +17,7 @@
 package org.springblade.community.service.impl;
 
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import org.springblade.community.dto.AgencyMngDelDTO;
 import org.springblade.community.entity.Unit;
 import org.springblade.community.vo.UnitVO;
 import org.springblade.community.mapper.UnitMapper;
@@ -51,4 +52,10 @@ public class UnitServiceImpl extends BaseServiceImpl<UnitMapper, Unit> implement
 
 	}
 
+	@Override
+	public Boolean delete(AgencyMngDelDTO agencyMngDelDTO) {
+		return baseMapper.delete(agencyMngDelDTO);
+	}
+
+
 }