合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/WxLoginServiceImpl.java

 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
 
 /**
  * @author FXF
 		logger.info("获取到wxcode:" + wxcode + " 获取到的openid: " + openId);
 		
 		//根据openId查询关联的手机号
-		//TaUser taUser = taUserMapper.getByOpenId(openId);
-
-		UserAPI userAPI = new UserAPI(apiConfig);
-        GetUserInfoResponse userInfo = userAPI.getUserInfo(openId);
-		logger.info(userInfo.getNickname());
+		TaUser taUser = taUserMapper.getByOpenId(openId);
+		
+		//根据OPENID获取用户信息
+		RestTemplate restTemplate = new RestTemplate();
+		String wxUrl = "https://api.weixin.qq.com/sns/auth?access_token="+codeResponse.getAccessToken()+"&openid=" + openId;
+		String userInfo = restTemplate.getForObject(wxUrl,String.class);
 		responseBean.addSuccess(userInfo);
 		return responseBean;
 	}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpRoomNoMapper.java

+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TpRoomNo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 户号信息表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-09
+ */
+@Mapper
+public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpBuildingOwnerInfo.java

     /**
      * 户号
      */
-    private String name;
+    private String roomNoId;
+    
+    /**
+     * 户号
+     */
+    private String roomNoName;
     
     /**
      * 业主姓名
      * 更新时间
      */
     private LocalDateTime updateDate;
-
-    /**
-     * 户号树信息
-     */
-    private Integer treeStatus;
     
-    /**
-     * 1代表的是资料库信息
-     */
-    private String ownerStatus;
     /**
      * 身份
      */

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpRoomNo.java

+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 户号信息表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_room_no")
+public class TpRoomNo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 期区ID
+     */
+    private Integer phaseId;
+
+    /**
+     * 期区名称
+     */
+    private String phaseName;
+
+    /**
+     * 楼栋ID
+     */
+    private Integer buildingId;
+
+    /**
+     * 楼栋姓名
+     */
+    private String buildingName;
+
+    /**
+     * 单元ID
+     */
+    private Integer unitId;
+
+    /**
+     * 单元名称
+     */
+    private String unitName;
+
+    /**
+     * 楼层ID
+     */
+    private Integer levelId;
+
+    /**
+     * 楼层名字
+     */
+    private String levelName;
+
+    /**
+     * 户号
+     */
+    private String name;
+
+    /**
+     * 排序
+     */
+    private String sort;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BillServiceImpl.java

                 cell = row.createCell(3);
                 cell.setCellValue(buildingOwnerInfo.getLevelName());
                 cell = row.createCell(4);
-                cell.setCellValue(buildingOwnerInfo.getName());
+                cell.setCellValue(buildingOwnerInfo.getRoomNoName());
                 cell = row.createCell(5);
                 cell.setCellValue(buildingOwnerInfo.getOwnerName());
                 currentRow ++;

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java

     @Autowired
     private TpLevelMapper tpLevelMapper;
     
+    @Autowired
+    private TpRoomNoMapper tpRoomNoMapper;
+    
     public static final Logger logger = LoggerFactory.getLogger(BuildingOwnerInfoServiceImpl.class);
     
     @Override
         taUserVerify.setLevelId(tpBuildingOwnerInfo.getLevelId());
         taUserVerify.setLevelName(tpBuildingOwnerInfo.getLevelName());
         taUserVerify.setRoomNoId(tpBuildingOwnerInfo.getId());
-        taUserVerify.setRoomNoName(tpBuildingOwnerInfo.getName());
+        taUserVerify.setRoomNoName(tpBuildingOwnerInfo.getRoomNoName());
         taUserVerify.setVerifyStatus("1");
         taUserVerify.setCreateDate(LocalDateTime.now());
         taUserVerify.setVerifyName(userElement.getUserName());
                 checkOwnerInfo.setRoleName(ownerRole);
                 checkOwnerInfo.setOwnerName(ownerName);
                 checkOwnerInfo.setOwnerTel(ownerTel);
-                checkOwnerInfo.setOwnerStatus("1");
                 list.add(checkOwnerInfo);
             }
         }
             if (null!=e.getLevelName()&&!"".equals(e.getLevelName())&&isNumeric(e.getLevelName())){
                 e.setLevelName(e.getLevelName()+"层");
             }
-            if (null!=e.getName()&&!"".equals(e.getName())&&isNumeric(e.getName())){
-                e.setName(e.getName()+"户");
+            if (null!=e.getRoomNoName()&&!"".equals(e.getRoomNoName())&&isNumeric(e.getRoomNoName())){
+                e.setRoomNoName(e.getRoomNoName()+"户");
             }
             if (null!=e.getPhaseName()&&!"".equals(e.getPhaseName())&&isNumeric(e.getPhaseName())){
                 e.setPhaseName(e.getPhaseName()+"期");
         // 楼层
         queryWrapper.eq("level", tpBuildingOwnerInfo.getLevelName());
         // 房号
-        queryWrapper.eq("room_no", tpBuildingOwnerInfo.getName());
+        queryWrapper.eq("room_no", tpBuildingOwnerInfo.getRoomNoName());
         TpBuildingOwnerInfo selectBuild = tpBuildingOwnerInfoMapper.selectOne(queryWrapper);
 
         return selectBuild;
                         buildingOwnerInfo.getBuildingName() +
                         buildingOwnerInfo.getUnitName() +
                         buildingOwnerInfo.getLevelName() +
-                        buildingOwnerInfo.getName();
+                        buildingOwnerInfo.getRoleName();
 
                 cell = row.createCell(0);
                 cell.setCellValue(address);
             throw new WisdomException("编号:%s 小区不存在!", communityId);
         }
     
-        QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<TpRoomNo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("community_id", communityId);
         queryWrapper.eq("level_id", levelId);
     
-        List<TpBuildingOwnerInfo> tpLevelList = tpBuildingOwnerInfoMapper.selectList(queryWrapper);
+        List<TpRoomNo> tpLevelList = tpRoomNoMapper.selectList(queryWrapper);
         responseBean.addSuccess(tpLevelList);
     
         return responseBean;

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingTreeServiceImpl.java

 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.commom.utils.AccountValidatorUtil;
+
+import com.community.huiju.dao.TpBuildingMapper;
+import com.community.huiju.dao.TpBuildingOwnerInfoMapper;
+import com.community.huiju.dao.TpLevelMapper;
+import com.community.huiju.dao.TpPhaseMapper;
+import com.community.huiju.dao.TpRoomNoMapper;
+import com.community.huiju.dao.TpUnitMapper;
+import com.community.huiju.model.TaUser;
+import com.community.huiju.model.TpBuilding;
+import com.community.huiju.model.TpBuildingOwnerInfo;
+import com.community.huiju.model.TpLevel;
+import com.community.huiju.model.TpPhase;
+import com.community.huiju.model.TpRoomNo;
+import com.community.huiju.model.TpUnit;
+
 import com.community.huiju.dao.*;
 import com.community.huiju.model.*;
+
 import com.community.huiju.service.BuildingTreeServiceI;
 import jdk.nashorn.internal.ir.IfNode;
 import org.apache.ibatis.annotations.Mapper;
 	private TpLevelMapper tpLevelMapper;
 	
 	@Autowired
-	private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
+	private TpRoomNoMapper tpRoomNoMapper;
+	
 	@Autowired
 	private TaUserVerifyMapper taUserVerifyMapper;
 	
 				tpBuildingOwnerInfo.setBuildingName(building);
 				tpBuildingOwnerInfo.setUnitName(unit);
 				tpBuildingOwnerInfo.setLevelName(level);
-				tpBuildingOwnerInfo.setName(roomNo);
+				tpBuildingOwnerInfo.setRoomNoName(roomNo);
 				list.add(tpBuildingOwnerInfo);
 			}
 		}
 				resultList.add(map);
 			});
 		}else if (treeType.equals("roomNo")){
-			QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
+			QueryWrapper<TpRoomNo> queryWrapper = new QueryWrapper<>();
 			queryWrapper.eq("community_id",communityId);
 			queryWrapper.eq("level_id",id);
 			queryWrapper.orderByAsc("create_date");
-			List<TpBuildingOwnerInfo> list = tpBuildingOwnerInfoMapper.selectList(queryWrapper);
+			List<TpRoomNo> list = tpRoomNoMapper.selectList(queryWrapper);
 			list.stream().forEach(e -> {
 				Map<String,Object> map = new HashMap<>();
 				map.put("name",e.getName());
 		 //房间号
 	 	TpLevel selectTpLevel= tpLevelMapper.selectById(id);
 		if(type.equals("roomNo")){
-		 TpBuildingOwnerInfo tpBuildingOwnerInfo= new TpBuildingOwnerInfo();
-		tpBuildingOwnerInfo.setCommunityId(selectTpLevel.getCommunityId())
+		 TpRoomNo tpRoomNo= new TpRoomNo();
+			tpRoomNo.setCommunityId(selectTpLevel.getCommunityId())
 							.setPhaseId(selectTpLevel.getPhaseId())
 							.setPhaseName(selectTpLevel.getPhaseName())
 							.setBuildingId(selectTpLevel.getBuildingId())
 							.setLevelId(selectTpLevel.getId())
 							.setLevelName(selectTpLevel.getName())
 							.setName(nodeNumber)
-							.setTreeStatus(1)
 							.setCreateDate(LocalDateTime.now());
 
 
-			tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
+			tpRoomNoMapper.insert(tpRoomNo);
 		}
 		responseBean.addSuccess("成功");
 		return responseBean;
 		//审核是否通过
 		InfoPass(type,id);
 		if (type.equals("end")) {
-			tpBuildingOwnerInfoMapper.deleteById(id);
+			tpRoomNoMapper.deleteById(id);
 		}
 		//删除楼层
 		if(type.equals("roomNo")){
 			TpLevel tpLevel= tpLevelMapper.selectById(id);
-			QueryWrapper<TpBuildingOwnerInfo> Info = new QueryWrapper<>();
+			QueryWrapper<TpRoomNo> Info = new QueryWrapper<>();
 			Info.eq("community_id", tpLevel.getCommunityId());
 			Info.eq("phase_id", tpLevel.getPhaseId());
 			Info.eq("building_id",tpLevel.getBuildingId());
 			Info.eq("unit_id", tpLevel.getUnitId());
 			Info.eq("level_id", tpLevel.getId());
-			tpBuildingOwnerInfoMapper.delete(Info);
+			tpRoomNoMapper.delete(Info);
 			tpLevelMapper.deleteById(id);
 		}
 
 			Integer tpLevelID=null;
 
 			TpLevel levelevel = tpLevelMapper.selectOne(tpLevel);
-			QueryWrapper<TpBuildingOwnerInfo> Info = new QueryWrapper<>();
+			QueryWrapper<TpRoomNo> Info = new QueryWrapper<>();
 			Info.eq("community_id", tpUnit.getCommunityId());
 			Info.eq("phase_id", tpUnit.getPhaseId());
 			Info.eq("building_id",tpUnit.getBuildingId());
 			}
 
 			//先删除所有房间
-			tpBuildingOwnerInfoMapper.delete(Info);
+			tpRoomNoMapper.delete(Info);
 			//再删除所有楼层
 			tpLevelMapper.delete(tpLevel);
 			//删除此单元
 			tpUnit.eq("community_id", tpBuilding.getCommunityId());
 			tpUnit.eq("phase_id", tpBuilding.getPhaseId());
 			tpUnit.eq("building_id", tpBuilding.getId());
-
+			
+			//删除单元-楼层-下的房间
+			TpLevel tpLevelToo= tpLevelMapper.selectById(id);
+				QueryWrapper<TpRoomNo> Info = new QueryWrapper<>();
+			Info.eq("community_id", tpLevelToo.getCommunityId());
+			Info.eq("phase_id", tpLevelToo.getPhaseId());
+			Info.eq("building_id",tpLevelToo.getBuildingId());
+			Info.eq("unit_id", tpLevelToo.getUnitId());
+			Info.eq("level_id", tpLevelToo.getId());
+			//先删除所有房间
+			tpRoomNoMapper.delete(Info);
 			//先查询楼层
 			TpUnit unit= tpUnitMapper.selectOne(tpUnit);
 			QueryWrapper<TpLevel> tpLevel = new QueryWrapper<>();
 			}
 			//查询房间
 			List<TpLevel> levelList= tpLevelMapper.selectList(tpLevel);
-			QueryWrapper<TpBuildingOwnerInfo> tpBuildingOwnerInfo = new QueryWrapper<>();
+			QueryWrapper<TpRoomNo> tpRoomNoQueryWrapper = new QueryWrapper<>();
 			if (null!=levelList) {
 				for (TpLevel level:levelList) {
-					tpBuildingOwnerInfo.eq("phase_id", level.getPhaseId());
-					tpBuildingOwnerInfo.eq("community_id", level.getCommunityId());
-					tpBuildingOwnerInfo.eq("building_id", level.getBuildingId());
-					tpBuildingOwnerInfo.eq("unit_id", level.getUnitId());
-					tpBuildingOwnerInfo.eq("level_id", level.getId());
+					tpRoomNoQueryWrapper.eq("phase_id", level.getPhaseId());
+					tpRoomNoQueryWrapper.eq("community_id", level.getCommunityId());
+					tpRoomNoQueryWrapper.eq("building_id", level.getBuildingId());
+					tpRoomNoQueryWrapper.eq("unit_id", level.getUnitId());
+					tpRoomNoQueryWrapper.eq("level_id", level.getId());
 					//先删除所有房间
-					tpBuildingOwnerInfoMapper.delete(tpBuildingOwnerInfo);
+					tpRoomNoMapper.delete(tpRoomNoQueryWrapper);
 				}
 			}
+
 			//再删除所有楼层
 			tpLevelMapper.delete(tpLevel);
 			//删除此单元
 					//查询房间
 					TpLevel level= tpLevelMapper.selectOne(tpLevel);
 					if (null!=level) {
-						QueryWrapper<TpBuildingOwnerInfo> tpBuildingOwnerInfo = new QueryWrapper<>();
-						tpBuildingOwnerInfo.eq("phase_id", level.getPhaseId());
-						tpBuildingOwnerInfo.eq("community_id", level.getCommunityId());
-						tpBuildingOwnerInfo.eq("building_id", level.getBuildingId());
-						tpBuildingOwnerInfo.eq("unit_id", level.getUnitId());
-						tpBuildingOwnerInfo.eq("level_id", level.getId());
+						QueryWrapper<TpRoomNo> tpRoomNoQueryWrapper = new QueryWrapper<>();
+						tpRoomNoQueryWrapper.eq("phase_id", level.getPhaseId());
+						tpRoomNoQueryWrapper.eq("community_id", level.getCommunityId());
+						tpRoomNoQueryWrapper.eq("building_id", level.getBuildingId());
+						tpRoomNoQueryWrapper.eq("unit_id", level.getUnitId());
+						tpRoomNoQueryWrapper.eq("level_id", level.getId());
 						//先删除所有房间
-						tpBuildingOwnerInfoMapper.delete(tpBuildingOwnerInfo);
+						tpRoomNoMapper.delete(tpRoomNoQueryWrapper);
 				}
 					//再删除所有楼层
 					tpLevelMapper.delete(tpLevel);
 				lastLevelId = tpLevel.getId();
 			}
 			//插入房间号信息
-			if (!tpBuildingOwnerInfo.getName().equals(lastRoomNoName)){
-				TpBuildingOwnerInfo tpBuildingOwnerInfoNew = new TpBuildingOwnerInfo();
-				tpBuildingOwnerInfoNew.setCommunityId(communityId);
-				tpBuildingOwnerInfoNew.setPhaseId(lastPhaseId);
-				tpBuildingOwnerInfoNew.setPhaseName(lastPhaseName);
-				tpBuildingOwnerInfoNew.setBuildingId(lastBuildingId);
-				tpBuildingOwnerInfoNew.setBuildingName(lastBuildingName);
-				tpBuildingOwnerInfoNew.setUnitId(lastUnitId);
-				tpBuildingOwnerInfoNew.setUnitName(lastUnitName);
-				tpBuildingOwnerInfoNew.setLevelId(lastLevelId);
-				tpBuildingOwnerInfoNew.setLevelName(lastLevelName);
-				tpBuildingOwnerInfoNew.setName(tpBuildingOwnerInfo.getName());
-				tpBuildingOwnerInfoNew.setCreateDate(LocalDateTime.now());
-				tpBuildingOwnerInfoNew.setTreeStatus(1);
-				tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfoNew);
+			if (!tpBuildingOwnerInfo.getRoomNoName().equals(lastRoomNoName)){
+				TpRoomNo tpRoomNo = new TpRoomNo();
+				tpRoomNo.setCommunityId(communityId);
+				tpRoomNo.setPhaseId(lastPhaseId);
+				tpRoomNo.setPhaseName(lastPhaseName);
+				tpRoomNo.setBuildingId(lastBuildingId);
+				tpRoomNo.setBuildingName(lastBuildingName);
+				tpRoomNo.setUnitId(lastUnitId);
+				tpRoomNo.setUnitName(lastUnitName);
+				tpRoomNo.setLevelId(lastLevelId);
+				tpRoomNo.setLevelName(lastLevelName);
+				tpRoomNo.setName(tpBuildingOwnerInfo.getRoomNoName());
+				tpRoomNo.setCreateDate(LocalDateTime.now());
+				tpRoomNoMapper.insert(tpRoomNo);
 			}
 		}
 	}
 		ResponseBean responseBean = new ResponseBean();
 		if (type.equals("end")) {
 			//判断书否有已审核人员
-			TpBuildingOwnerInfo info = tpBuildingOwnerInfoMapper.selectById(id);
+			TpRoomNo info = tpRoomNoMapper.selectById(id);
 			QueryWrapper<TaUserVerify> taUserVerify = new QueryWrapper<>();
 			taUserVerify.eq("community_id", info.getCommunityId())
 					.eq("phase_id", info.getPhaseId())

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivitySignUpServiceImpl.java

 
             activitySignUpVO.setUserName(taUser.getUserName());
             activitySignUpVO.setPhone(taUser.getLoginName());
+
             activitySignUpVO.setRoleName(e.getUserRole());
             activitySignUpVO.setAddress(e.getAddress());
 

CODE/smart-community/property-api/src/main/resources/mapper/TpRoomNoMapper.xml

+<?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="com.community.huiju.dao.TpRoomNoMapper">
+
+</mapper>

VUECODE/smart-property-manage/src/views/building/buildingdata/BuildingBatchImport.vue

         <template slot-scope="scope">{{ scope.row.levelName }}</template>
       </el-table-column>
       <el-table-column label="户号/室号" align="center">
-        <template slot-scope="scope">{{ scope.row.name }}</template>
+        <template slot-scope="scope">{{ scope.row.roomNoName }}</template>
       </el-table-column>
     </el-table>
     <div class="block">