Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/WxLoginController.java

@@ -36,7 +36,7 @@ public class WxLoginController {
 			return responseBean;
 		}
 		//根据wxcode获取openid
-		wxLoginService.getOpenidByWxcode(wxcode);
+		responseBean = wxLoginService.getOpenidByWxcode(wxcode);
 		return responseBean;
 	}
 }

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

@@ -1,5 +1,7 @@
 package com.community.huiju.service;
 
+import com.community.commom.mode.ResponseBean;
+
 public interface WxLoginServiceI {
-	void getOpenidByWxcode(String wxcode);
+	ResponseBean getOpenidByWxcode(String wxcode);
 }

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

@@ -1,5 +1,6 @@
 package com.community.huiju.service.impl;
 
+import com.community.commom.mode.ResponseBean;
 import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.model.TaUser;
 import com.community.huiju.service.WxLoginServiceI;
@@ -26,7 +27,8 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 	private TaUserMapper taUserMapper;
 	
 	@Override
-	public void getOpenidByWxcode(String wxcode) {
+	public ResponseBean getOpenidByWxcode(String wxcode) {
+		ResponseBean responseBean = new ResponseBean();
 		ApiConfig apiConfig = new ApiConfig("wx6070fd3e8ef854e4","cb07709de2f05b824f1ebda220684d3b", true);
 		logger.info("获取微信相关信息");
 		OauthAPI oauthAPI = new OauthAPI(apiConfig);
@@ -35,10 +37,12 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 		logger.info("获取到wxcode:" + wxcode + " 获取到的openid: " + openId);
 		
 		//根据openId查询关联的手机号
-		TaUser taUser = taUserMapper.getByOpenId(openId);
-		
+		//TaUser taUser = taUserMapper.getByOpenId(openId);
+
 		UserAPI userAPI = new UserAPI(apiConfig);
         GetUserInfoResponse userInfo = userAPI.getUserInfo(openId);
 		logger.info(userInfo.getNickname());
+		responseBean.addSuccess(userInfo);
+		return responseBean;
 	}
 }

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

@@ -5,8 +5,10 @@ import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.commom.utils.AccountValidatorUtil;
+import com.community.huiju.dao.TpPhaseMapper;
 import com.community.huiju.model.TaUser;
 import com.community.huiju.model.TpBuildingOwnerInfo;
+import com.community.huiju.model.TpPhase;
 import com.community.huiju.service.BuildingTreeServiceI;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Row;
@@ -15,6 +17,7 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -33,6 +36,8 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 	
 	public static final Logger logger = LoggerFactory.getLogger(BuildingOwnerInfoServiceImpl.class);
 	
+	@Autowired
+	private TpPhaseMapper tpPhaseMapper;
 	/**
 	 * 获取整个小区的基础数据
 	 *
@@ -148,13 +153,20 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		Map<String,Object> map = (Map<String, Object>) responseBean.getData();
 		List<TpBuildingOwnerInfo> list = (List<TpBuildingOwnerInfo>) map.get("list");
 		
-		for (int i = 0; i < list.size(); i++){
-			//拆分数据
-			if (i == 0){
-			
-			}
-		}
+		//入库
+		Integer communityId = userElement.getCommunityId();
+		
+		//保存数据到表中--拆分数据
+		String state = saveBuildingTreeData(communityId,list);
 		responseBean.addSuccess("success");
 		return responseBean;
 	}
+	
+	private String saveBuildingTreeData(Integer communityId, List<TpBuildingOwnerInfo> list) {
+		String lastPhaseName = "";
+		for (int i = 0; i < list.size(); i++){
+		
+		}
+		return "";
+	}
 }