feats

src/main/java/com/huiju/estateagents/property/controller/BuildingTreeController.java

@@ -15,6 +15,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.util.Map;
 
 /**
  * @author FXF
@@ -72,6 +73,17 @@ public class BuildingTreeController extends BaseController {
 		return responseBean;
 	}
 
+	// @ApiOperation(value = "添加当前节点", notes = "添加当前节点")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "id:当前节点;" +
+					"name:节点名称;type：(phase:(期)，building:(栋),unit:(单元),level:(楼层),roomNo:(房间号)), roomNonodeNumber:输入的节点")
+	})
+	@RequestMapping(value = "/admin/buildingInfo/updatenode",method = RequestMethod.POST)
+	public ResponseBean editNode(@RequestBody Map<String, Object> parameter, HttpServletRequest request){
+		TaUser userElement = getTaUser(request);
+		return buildingTreeService.editNode(parameter, userElement.getOrgId());
+	}
+
 	// @ApiOperation(value = "删除当前节点", notes = "删除当前节点")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "id:当前节点;type:(end:(房间)，roomNo:(楼层),level:(单元)，unit:(楼栋),building:(期))")

src/main/java/com/huiju/estateagents/property/dao/TpBuildingMapper.java

@@ -27,4 +27,11 @@ public interface TpBuildingMapper extends BaseMapper<TpBuilding> {
     @ResultType(TpBuilding.class)
     @Select("select * from tp_building where org_id=#{orgId} and phase_id=#{phaseId}")
     List<TpBuilding> selectByAddress(@Param("orgId") Integer orgId, @Param("phaseId") Integer phaseId);
+
+    @Update("update tp_building set `name` = #{name} where id = #{id}")
+    int updateName(@Param("orgId") Integer orgId, @Param("id") Integer id, @Param("name") String name);
+
+    @Update("update tp_building set phase_name = #{phaseName} where org_id=#{orgId} and phase_id=#{phaseId}")
+    int updatePhaseName(@Param("orgId") Integer orgId,  @Param("phaseId") Integer phaseId, @Param("phaseName") String phaseName);
+
 }

src/main/java/com/huiju/estateagents/property/dao/TpLevelMapper.java

@@ -2,10 +2,7 @@ package com.huiju.estateagents.property.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.property.model.TpLevel;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.ResultMap;
-import org.apache.ibatis.annotations.ResultType;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
@@ -30,4 +27,16 @@ public interface TpLevelMapper extends BaseMapper<TpLevel> {
     @ResultType(TpLevel.class)
     @Select("select * from tp_level where org_id=#{orgId} and phase_id=#{phaseId} and building_id=#{buildingId} and unit_id=#{unitId}")
     List<TpLevel> selectByAddress(Integer orgId, Integer phaseId, Integer buildingId, Integer unitId);
+
+    @Update("update tp_level set `name` = #{name} where id = #{id}")
+    int updateName(@Param("orgId") Integer orgId, @Param("id") Integer id, @Param("name") String name);
+
+    @Update("update tp_level set phase_name = #{phaseName} where org_id=#{orgId} and phase_id=#{phaseId}")
+    int updatePhaseName(@Param("orgId") Integer orgId,  @Param("phaseId") Integer phaseId, @Param("phaseName") String phaseName);
+
+    @Update("update tp_level set building_name = #{buildingName} where org_id=#{orgId} and building_id=#{buildingId}")
+    int updateBuildingName(@Param("orgId") Integer orgId, @Param("buildingId") Integer buildingId, @Param("buildingName") String buildingName);
+
+    @Update("update tp_level set unit_name = #{unitName} where org_id=#{orgId} and unit_id=#{unitId}")
+    int updateUnitName(@Param("orgId") Integer orgId, @Param("unitId") Integer unitId, @Param("unitName") String unitName);
 }

src/main/java/com/huiju/estateagents/property/dao/TpPhaseMapper.java

@@ -26,4 +26,6 @@ public interface TpPhaseMapper extends BaseMapper<TpPhase> {
     @Select("select * from tp_phase where org_id = #{orgId}")
     List<TpPhase> selectByAddress(@Param("orgId") Integer orgId);
 
+    @Update("update tp_phase set `name` = #{name} where id = #{id}")
+    int updateName(@Param("orgId") Integer orgId, @Param("id") Integer id, @Param("name") String name);
 }

src/main/java/com/huiju/estateagents/property/dao/TpRoomNoMapper.java

@@ -69,4 +69,19 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
     List<TpRoomNo> selectComunityList(@Param("orgId") Integer orgId, @Param("phaseId") String phaseId, @Param("buildingId") String buildingId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
 
     IPage<TpRoomNo> getRoomList(IPage<TpRoomNo> page, @Param("orgId") Integer orgId,@Param("phaseId") Integer phaseId,@Param("buildingId") Integer buildingId,@Param("unitId") Integer unitId,@Param("levelId") Integer levelId,@Param("roomNoId") Integer roomNoId);
+
+    @Update("update tp_room_no set `name` = #{name} where id = #{id}")
+    int updateName(@Param("orgId") Integer orgId, @Param("id") Integer id, @Param("name") String name);
+
+    @Update("update tp_room_no set phase_name = #{phaseName} where org_id=#{orgId} and phase_id=#{phaseId}")
+    int updatePhaseName(@Param("orgId") Integer orgId,  @Param("phaseId") Integer phaseId, @Param("phaseName") String phaseName);
+
+    @Update("update tp_room_no set building_name = #{buildingName} where org_id=#{orgId} and building_id=#{buildingId}")
+    int updateBuildingName(@Param("orgId") Integer orgId, @Param("buildingId") Integer buildingId, @Param("buildingName") String buildingName);
+
+    @Update("update tp_room_no set unit_name = #{unitName} where org_id=#{orgId} and unit_id=#{unitId}")
+    int updateUnitName(@Param("orgId") Integer orgId, @Param("unitId") Integer unitId, @Param("unitName") String unitName);
+
+    @Update("update tp_room_no set level_name = #{levelName} where org_id=#{orgId} and level_id=#{levelId}")
+    int updateLevelName(@Param("orgId") Integer orgId, @Param("levelId") Integer levelId, @Param("levelName") String levelName);
 }

src/main/java/com/huiju/estateagents/property/dao/TpUnitMapper.java

@@ -2,10 +2,7 @@ package com.huiju.estateagents.property.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.property.model.TpUnit;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.ResultMap;
-import org.apache.ibatis.annotations.ResultType;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
@@ -31,4 +28,12 @@ public interface TpUnitMapper extends BaseMapper<TpUnit> {
     @Select("select * from tp_unit where org_id =#{orgId} and phase_id=#{phaseId} and building_id=#{buildingId}")
     List<TpUnit> selectByAddress(Integer orgId, Integer phaseId, Integer buildingId);
 
+    @Update("update tp_unit set `name` = #{name} where id = #{id}")
+    int updateName(@Param("orgId") Integer orgId, @Param("id") Integer id, @Param("name") String name);
+
+    @Update("update tp_unit set phase_name = #{phaseName} where org_id=#{orgId} and phase_id=#{phaseId}")
+    int updatePhaseName(@Param("orgId") Integer orgId,  @Param("phaseId") Integer phaseId, @Param("phaseName") String phaseName);
+
+    @Update("update tp_unit set building_name = #{buildingName} where org_id=#{orgId} and building_id=#{buildingId}")
+    int updateBuildingName(@Param("orgId") Integer orgId, @Param("buildingId") Integer buildingId, @Param("buildingName") String buildingName);
 }

src/main/java/com/huiju/estateagents/property/service/BuildingTreeServiceI.java

@@ -7,6 +7,8 @@ import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.TpRoomNo;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.Map;
+
 public interface BuildingTreeServiceI {
 	
 	/**
@@ -50,4 +52,6 @@ public interface BuildingTreeServiceI {
 	ResponseBean deleteNode(String parameter, Integer orgId);
 
 	IPage<TpRoomNo> getRoomList(IPage<TpRoomNo> page, Integer orgId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId);
+
+	ResponseBean editNode(Map<String, Object> parameter, Integer orgId);
 }

src/main/java/com/huiju/estateagents/property/service/impl/BuildingTreeServiceImpl.java

@@ -313,6 +313,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 					tpPhase.setName(nodeNumber);
 					tpPhase.setCreateDate(LocalDateTime.now());
 					tpPhaseMapper.insert(tpPhase);
+			return ResponseBean.success(tpPhase);
 		}
 		TpPhase	tpPhase= tpPhaseMapper.selectById(id);
 		if(type.equals("building")){
@@ -334,6 +335,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 						 .setName(nodeNumber)
 						 .setCreateDate(LocalDateTime.now());
 			tpBuildingMapper.insert(tpBuilding);
+			return ResponseBean.success(tpBuilding);
 		}
 		//查询栋，维护单元
 		 TpBuilding selectTpBuilding= tpBuildingMapper.selectById(id);
@@ -358,6 +360,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 						.setName(nodeNumber)
 						.setCreateDate(LocalDateTime.now());
 		 	 tpUnitMapper.insert(tpUnit);
+			return ResponseBean.success(tpUnit);
 		 }
 
 		//查询单元，维护楼层
@@ -387,6 +390,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				.setName(nodeNumber)
 				.setCreateDate(LocalDateTime.now());
 			 tpLevelMapper.insert(tpLevel);
+			return ResponseBean.success(tpLevel);
 			}
 		 //房间号
 	 	TpLevel selectTpLevel= tpLevelMapper.selectById(id);
@@ -415,6 +419,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 							.setName(nodeNumber)
 							.setCreateDate(LocalDateTime.now());
 			tpRoomNoMapper.insert(tpRoomNo);
+			return ResponseBean.success(tpRoomNo);
 		}
 		responseBean.addSuccess("成功");
 		return responseBean;
@@ -518,10 +523,11 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 							tpRoomNoMapper.delete(tpRoomNoQueryWrapper);
 						}
 				}
+
+					//删除所有楼层
+					tpLevelMapper.delete(tpLevel);
 			  }
 			}
-			//删除所有楼层
-			tpLevelMapper.delete(tpLevel);
 			//删除此单元
 			tpUnitMapper.delete(tpUnit);
 			//删除栋
@@ -536,47 +542,46 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			building.eq("name", phase.getName());
 			List<TpBuilding> tpBuildingList= tpBuildingMapper.selectList(building);
 			for (TpBuilding tpBuilding:tpBuildingList){
-			//删除单元-楼层-房间
-			QueryWrapper<TpUnit> tpUnit = new QueryWrapper<>();
-			List<TpUnit> unitList=null;
-			if (null!=tpBuilding) {
+				//删除单元-楼层-房间
+				QueryWrapper<TpUnit> tpUnit = new QueryWrapper<>();
 				tpUnit.eq("org_id", tpBuilding.getOrgId());
 				tpUnit.eq("phase_id", tpBuilding.getPhaseId());
 				tpUnit.eq("building_id", tpBuilding.getId());
 				tpUnit.eq("building_name", tpBuilding.getName());
-				unitList= tpUnitMapper.selectList(tpUnit);
-			}
-			//先查询楼层
-			QueryWrapper<TpLevel> tpLevel = new QueryWrapper<>();
-			if (null!=unitList) {
-				for (TpUnit unit : unitList) {
-					tpLevel.eq("phase_id", unit.getPhaseId());
-					tpLevel.eq("org_id", unit.getOrgId());
-					tpLevel.eq("building_id", unit.getBuildingId());
-					tpLevel.eq("unit_id", unit.getId());
-					tpLevel.eq("unit_name", unit.getName());
-					//查询房间
-					List<TpLevel> levelList = tpLevelMapper.selectList(tpLevel);
-					if (null != levelList) {
-						for (TpLevel level : levelList) {
-							QueryWrapper<TpRoomNo> tpRoomNoQueryWrapper = new QueryWrapper<>();
-							tpRoomNoQueryWrapper.eq("phase_id", level.getPhaseId());
-							tpRoomNoQueryWrapper.eq("org_id", level.getOrgId());
-							tpRoomNoQueryWrapper.eq("building_id", level.getBuildingId());
-							tpRoomNoQueryWrapper.eq("unit_id", level.getUnitId());
-							tpRoomNoQueryWrapper.eq("level_id", level.getId());
-							tpRoomNoQueryWrapper.eq("level_name", level.getName());
-							//先删除所有房间
-							tpRoomNoMapper.delete(tpRoomNoQueryWrapper);
+
+				List<TpUnit> unitList = tpUnitMapper.selectList(tpUnit);
+
+				//先查询楼层
+				QueryWrapper<TpLevel> tpLevel = new QueryWrapper<>();
+				if (null!=unitList) {
+					for (TpUnit unit : unitList) {
+						tpLevel.eq("phase_id", unit.getPhaseId());
+						tpLevel.eq("org_id", unit.getOrgId());
+						tpLevel.eq("building_id", unit.getBuildingId());
+						tpLevel.eq("unit_id", unit.getId());
+						tpLevel.eq("unit_name", unit.getName());
+						//查询房间
+						List<TpLevel> levelList = tpLevelMapper.selectList(tpLevel);
+						if (null != levelList) {
+							for (TpLevel level : levelList) {
+								QueryWrapper<TpRoomNo> tpRoomNoQueryWrapper = new QueryWrapper<>();
+								tpRoomNoQueryWrapper.eq("phase_id", level.getPhaseId());
+								tpRoomNoQueryWrapper.eq("org_id", level.getOrgId());
+								tpRoomNoQueryWrapper.eq("building_id", level.getBuildingId());
+								tpRoomNoQueryWrapper.eq("unit_id", level.getUnitId());
+								tpRoomNoQueryWrapper.eq("level_id", level.getId());
+								tpRoomNoQueryWrapper.eq("level_name", level.getName());
+								//先删除所有房间
+								tpRoomNoMapper.delete(tpRoomNoQueryWrapper);
+							}
 						}
+						//再删除所有楼层
+						tpLevelMapper.delete(tpLevel);
 					}
-					//再删除所有楼层
-					tpLevelMapper.delete(tpLevel);
 				}
+				//删除此单元
+				tpUnitMapper.delete(tpUnit);
 			}
-			//删除此单元
-			tpUnitMapper.delete(tpUnit);
-	}
 			//删除栋
 			tpBuildingMapper.delete(building);
 			//删除整个期
@@ -591,6 +596,63 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		return tpRoomNoMapper.getRoomList(page, orgId, phaseId, buildingId, unitId, levelId, roomNoId);
 	}
 
+	@Override
+	public ResponseBean editNode(Map<String, Object> parameter, Integer orgId) {
+		if (null == parameter) {
+			return ResponseBean.error("编辑内容不能为空", ResponseBean.ERROR_MISSING_PARAMS);
+		}
+
+		Integer id = (Integer) parameter.get("id");
+		String type = (String) parameter.get("type");
+		String name = (String) parameter.get("name");
+
+		if (null == id || StringUtils.isEmpty(type) || StringUtils.isEmpty(name)) {
+			return ResponseBean.error("部分编辑内容不能为空", ResponseBean.ERROR_MISSING_PARAMS);
+		}
+
+		// 如果是期数
+		if ("phase".equals(type)) {
+			tpPhaseMapper.updateName(orgId, id, name);
+			tpBuildingMapper.updatePhaseName(orgId, id, name);
+			tpUnitMapper.updatePhaseName(orgId, id, name);
+			tpLevelMapper.updatePhaseName(orgId, id, name);
+			tpRoomNoMapper.updatePhaseName(orgId, id, name);
+			return ResponseBean.success("success");
+		}
+
+		// 如果是楼栋
+		if ("building".equals(type)) {
+			tpBuildingMapper.updateName(orgId, id, name);
+			tpUnitMapper.updateBuildingName(orgId, id, name);
+			tpLevelMapper.updateBuildingName(orgId, id, name);
+			tpRoomNoMapper.updateBuildingName(orgId, id, name);
+			return ResponseBean.success("success");
+		}
+
+		// 如果是单元
+		if ("unit".equals(type)) {
+			tpUnitMapper.updateName(orgId, id, name);
+			tpLevelMapper.updateUnitName(orgId, id, name);
+			tpRoomNoMapper.updateUnitName(orgId, id, name);
+			return ResponseBean.success("success");
+		}
+
+		// 如果是楼层
+		if ("level".equals(type)) {
+			tpLevelMapper.updateName(orgId, id, name);
+			tpRoomNoMapper.updateLevelName(orgId, id, name);
+			return ResponseBean.success("success");
+		}
+
+		// 如果是房间
+		if ("roomNo".equals(type)) {
+			tpRoomNoMapper.updateName(orgId, id, name);
+			return ResponseBean.success("success");
+		}
+
+		return ResponseBean.error("数据类型不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+	}
+
 	private void saveBuildingTreeData(Integer orgId, List<TpBuildingOwnerInfo> list) {
 		String lastPhaseName = "";
 		String lastBuildingName = "";

src/main/resources/mapper/property/TpRoomNoMapper.xml

@@ -80,31 +80,42 @@
         LIMIT #{pageNum}, #{pageSize}
     </select>
     <select id="getRoomList" resultType="com.huiju.estateagents.property.model.TpRoomNo">
-        SELECT
-            t.*
+        SELECT DISTINCT
+            t.id,
+            t.name,
+            q.id as phase_id,
+            q.name as phase_name,
+            n.id as building_id,
+            n.name as building_name,
+            m.id as unit_id,
+            m.name as unit_name,
+            s.id as level_id,
+            s.name as level_name,
+            t.sort,
+            t.create_date
         FROM
-            tp_room_no t
-            INNER JOIN tp_level s ON s.id = t.level_id
-            INNER JOIN tp_unit m ON m.id = t.unit_id
-            INNER JOIN tp_building n ON n.id = t.building_id
-            INNER JOIN tp_phase q ON q.id = t.phase_id
+            tp_phase q
+            LEFT JOIN tp_building n ON n.phase_id = q.id
+            LEFT JOIN tp_unit m ON m.building_id = n.id
+            LEFT JOIN tp_level s ON s.unit_id = m.id
+            LEFT JOIN tp_room_no t ON t.level_id = s.id
         WHERE
-            t.org_id = #{orgId}
-        <if test="roomNoId != null" >
-            and t.id = #{roomNoId}
-        </if>
+            q.org_id = #{orgId}
         <if test="phaseId != null" >
-            and t.phase_id = #{phaseId}
+            and q.id = #{phaseId}
         </if>
         <if test="buildingId != null" >
-            and t.building_id = #{buildingId}
+            and n.id = #{buildingId}
         </if>
         <if test="unitId != null" >
-            and t.unit_id = #{unitId}
+            and m.id = #{unitId}
         </if>
         <if test="levelId != null" >
-            and t.level_id = #{levelId}
+            and s.id = #{levelId}
+        </if>
+        <if test="roomNoId != null" >
+            and t.id = #{roomNoId}
         </if>
-        ORDER BY t.phase_id ASC, t.building_id ASC, t.unit_id ASC, (t.level_name - 0) DESC
+        ORDER BY q.id ASC, n.id ASC, m.id ASC, (s.name - 0) DESC
     </select>
 </mapper>