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

# Conflicts:
#	CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/BuildingOwnerInfoController.java
#	CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/BuildingOwnerInfoMapper.java
#	CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TaUserMapper.java
#	CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java
#	CODE/smart-community/property-api/src/main/resources/mapper/TaUserMapper.xml

CODE/smart-community/property-api/pom.xml

@@ -78,6 +78,12 @@
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.session</groupId>
+			<artifactId>spring-session-jdbc</artifactId>
+			<version>2.0.5.RELEASE</version>
+		</dependency>
+
 		<dependency>
 			<groupId>com.baomidou</groupId>
 			<artifactId>mybatis-plus-boot-starter</artifactId>

CODE/smart-community/property-api/src/main/java/com/community/huiju/common/base/BaseController.java

@@ -3,6 +3,8 @@ package com.community.huiju.common.base;
 import com.community.commom.constant.Constant;
 import com.community.commom.session.UserElement;
 import com.community.huiju.exception.WisdomException;
+import com.community.huiju.vo.UserVO;
+import lombok.extern.slf4j.Slf4j;
 
 import javax.servlet.http.HttpSession;
 
@@ -10,6 +12,7 @@ import javax.servlet.http.HttpSession;
  * @author FXF
  * @date 2018-12-18
  */
+@Slf4j
 public class BaseController {
     
     /**
@@ -18,6 +21,7 @@ public class BaseController {
      * @return
      */
     protected UserElement getUserElement(HttpSession session){
+        log.info("获取sessionId: {}", session.getId());
         UserElement userElement = (UserElement) session.getAttribute(Constant.WEB_PROPERTY_USER_SESSION);
         if (null == userElement) {
             throw new WisdomException("用户凭证不存在!");
@@ -25,4 +29,23 @@ public class BaseController {
         return userElement;
     }
 
+    /**
+     * 获取 UserElement
+     * @param session
+     * @return
+     */
+    protected void setUserElement(HttpSession session, UserVO userVO){
+        log.info("获取sessionId: {}", session.getId());
+        UserElement userElement = new UserElement();
+        userElement.setId(userVO.getId());
+        userElement.setCommunityId(userVO.getCommunityId());
+        userElement.setEmail(userVO.getEmail());
+        userElement.setLoginName(userVO.getLoginName());
+        userElement.setUserName(userVO.getUserName());
+        userElement.setStatus(userVO.getStatus());
+        userElement.setLoginType(Constant.WEB_LOGIN_TYPE);
+
+        session.setAttribute(Constant.WEB_PROPERTY_USER_SESSION, userElement);
+    }
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/config/HttpSessionConfig.java

@@ -0,0 +1,20 @@
+package com.community.huiju.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.session.MapSession;
+import org.springframework.session.jdbc.config.annotation.web.http.EnableJdbcHttpSession;
+import org.springframework.session.web.http.HeaderHttpSessionIdResolver;
+import org.springframework.session.web.http.HttpSessionIdResolver;
+
+
+@Configuration
+@EnableJdbcHttpSession(maxInactiveIntervalInSeconds = MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS*48*7)
+public class HttpSessionConfig {
+
+    @Bean
+    public HttpSessionIdResolver httpSessionIdResolver() {
+        return HeaderHttpSessionIdResolver.xAuthToken();
+    }
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/BuildingOwnerInfoController.java

@@ -4,13 +4,14 @@ package com.community.huiju.controller;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.BaseController;
-import com.community.huiju.model.BuildingOwnerInfo;
+import com.community.huiju.model.TpBuildingOwnerInfo;
 import com.community.huiju.service.IBuildingOwnerInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,6 +33,7 @@ import java.util.stream.Collectors;
  * @since 2018-12-18
  */
 @RestController
+@RefreshScope
 @RequestMapping("/")
 @Api(value = "楼栋业主资料信息", description = "楼栋业主资料信息 Api")
 public class BuildingOwnerInfoController extends BaseController {
@@ -94,12 +96,12 @@ public class BuildingOwnerInfoController extends BaseController {
     public ResponseBean delete(@RequestBody List<Integer> ids, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = getUserElement(session);
-        List<BuildingOwnerInfo> infoList = ids.stream().map(e->{
-            BuildingOwnerInfo buildingOwnerInfo = new BuildingOwnerInfo();
-            buildingOwnerInfo.setId(e);
-            buildingOwnerInfo.setVerifyStatus("2");
-            buildingOwnerInfo.setUpdateUser(userElement.getId());
-            return buildingOwnerInfo;
+        List<TpBuildingOwnerInfo> infoList = ids.stream().map(e->{
+            TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
+            tpBuildingOwnerInfo.setId(e);
+            tpBuildingOwnerInfo.setVerifyStatus("2");
+            tpBuildingOwnerInfo.setUpdateUser(userElement.getId());
+            return tpBuildingOwnerInfo;
         }).collect(Collectors.toList());
         boolean result = iBuildingOwnerInfoService.updateBatchById(infoList);
         if (result) {
@@ -115,7 +117,7 @@ public class BuildingOwnerInfoController extends BaseController {
             @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "building楼层;" +
                     "unit单元;level楼层;roomNo户号")
     })
-    @RequestMapping(value = "/building/info",method = RequestMethod.POST)
+    @RequestMapping(value = "/building/address",method = RequestMethod.POST)
     public ResponseBean buildingUnitNumber(@RequestBody String parameter, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = getUserElement(session);
@@ -130,7 +132,7 @@ public class BuildingOwnerInfoController extends BaseController {
         responseBean = iBuildingOwnerInfoService.getExcelData(file);
         return responseBean;
     }
-    
+ 
     @ApiOperation(value = "上传楼栋信息并入库", notes = "上传楼栋信息并入库")
     @PostMapping(value = "/building/submitExcel", consumes = "multipart/*", headers = "content-type=multipart/form-data")
     public ResponseBean submitExcel(@RequestParam("file") MultipartFile file) {
@@ -138,4 +140,14 @@ public class BuildingOwnerInfoController extends BaseController {
         responseBean = iBuildingOwnerInfoService.submitExcelData(file);
         return responseBean;
     }
+
+    @ApiOperation(value = "获取已认证通过的用户信息",nickname ="获取已认证通过的用户信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="ownerName:姓名,ownerTel:手机号 ,current:每页显示多少条,pageSzie:当前页数")})
+
+    @RequestMapping(value="/userPassCertification",method = RequestMethod.POST)
+    public ResponseBean userPassCertification(@RequestBody String paramets){
+        ResponseBean allApprove=iBuildingOwnerInfoService.selectUserApprove(paramets);
+        return allApprove;
+    }
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/CommunitiesController.java

@@ -0,0 +1,50 @@
+package com.community.huiju.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.service.ICommunitiesService;
+import com.community.huiju.service.IUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 所有小区表 前端控制器
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-19
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "小区Api", description = "小区Api")
+public class CommunitiesController extends BaseController {
+
+    @Autowired
+    private IUserService iUserService;
+
+    @ApiOperation(value = "根据手机号 和 验证码 获取小区列表", notes = "根据手机号 和 验证码 获取小区列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "loginName手机号;code验证码")
+    })
+    @RequestMapping(value = "/community/user", method = RequestMethod.POST)
+    public ResponseBean userCommunity(@RequestBody String parameter){
+        ResponseBean responseBean = new ResponseBean();
+
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        responseBean = iUserService.userCommunity(jsonObject.getString("loginName"), jsonObject.getString("code"));
+        return responseBean;
+    }
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -9,6 +9,7 @@ import com.community.huiju.common.base.BaseController;
 import com.community.huiju.model.TaUser;
 import com.community.huiju.model.User;
 import com.community.huiju.service.IUserService;
+import com.community.huiju.vo.UserVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -18,7 +19,6 @@ import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpSession;
-import java.util.HashMap;
 
 /**
  * <p>
@@ -51,30 +51,22 @@ public class UserController extends BaseController {
 		return response;
 	}
 
-	@ApiOperation(value = "获取已认证通过的用户信息",nickname ="获取已认证通过的用户信息")
-	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="loginName:手机号,serName:姓名 ,verifyStatus:审核状态,current:每页显示多少条,pageSzie:当前页数")})
-
-	@RequestMapping(value="/userPassCertification",method = RequestMethod.POST)
-	public ResponseBean userPassCertification(@RequestBody String paramets){
-
-
-		ResponseBean allApprove=userService.selectUserApprove(paramets);
-		return allApprove;
-	}
-
-
 	@ApiOperation(value = "登陆", notes = "登陆")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "loginName手机号;code验证码;communityId小区Id")
 	})
 	@RequestMapping(value = "/user/login")
-	public ResponseBean login(@RequestBody String parameter){
+	public ResponseBean login(@RequestBody String parameter, HttpSession session){
 		ResponseBean responseBean = new ResponseBean();
 		JSONObject jsonObject = JSONObject.parseObject(parameter);
 		responseBean = userService.login(jsonObject.getString("loginName"),
 				jsonObject.getInteger("communityId"),
 				jsonObject.getString("code"));
+
+		UserVO userVO = (UserVO)responseBean.getData();
+		setUserElement(session,userVO);
+		userVO.setToken(session.getId());
+
 		return responseBean;
 	}
 

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

@@ -1,23 +0,0 @@
-package com.community.huiju.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.community.huiju.model.BuildingOwnerInfo;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * <p>
- * 楼栋业主资料信息表 Mapper 接口
- * </p>
- *
- * @author weiximei
- * @since 2018-12-18
- */
-@Mapper
-public interface BuildingOwnerInfoMapper extends BaseMapper<BuildingOwnerInfo> {
-	
-	int batchInsert(List<BuildingOwnerInfo> list);
-	
-	int batchUpdate(List<BuildingOwnerInfo> list);
-}

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

@@ -1,8 +1,9 @@
 package com.community.huiju.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.community.huiju.model.BuildingOwnerInfo;
+
 import com.community.huiju.model.TaUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -11,9 +12,11 @@ import java.util.List;
 import java.util.Map;
 
 @Mapper
-public interface TaUserMapper extends BaseMapper<BuildingOwnerInfo> {
-    int deleteByPrimaryKey(Integer id);
 
+public interface TaUserMapper extends BaseMapper<TaUser> {
+    int deleteByPrimaryKey(Integer id);
+    
+    @Override
     int insert(TaUser record);
 
     int insertSelective(TaUser record);
@@ -41,4 +44,5 @@ public interface TaUserMapper extends BaseMapper<BuildingOwnerInfo> {
     TaUser selectByTel(@Param("loginName") String ownerTel,@Param("communityId") Integer communityId);
     
     int batchUpdate(List<TaUser> updataTaUserList);
+
 }

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

@@ -0,0 +1,29 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.ToCommunities;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 所有小区表 Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-19
+ */
+@Mapper
+public interface ToCommunitiesMapper extends BaseMapper<ToCommunities> {
+
+    /**
+     * 根据 用户Id 查询出
+     * @param userId
+     * @return
+     */
+    @Select("SELECT tc.* FROM tp_user_community tuc LEFT JOIN to_communities tc on tuc.community_id = tc.id WHERE tuc.tp_user_id=#{userId}")
+    List<ToCommunities> selectUserById(Integer userId);
+
+}

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

@@ -0,0 +1,31 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.community.huiju.model.TpBuildingOwnerInfo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 楼栋业主资料信息表 Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-18
+ */
+@Mapper
+public interface TpBuildingOwnerInfoMapper extends BaseMapper<TpBuildingOwnerInfo> {
+    /**
+     * 获取已认证通过的
+     * @param
+     * @return
+     */
+    List<TpBuildingOwnerInfo> selectUserApprove(@Param("ownerName") String r , @Param("ownerTel") String ownerTel , Page page);
+    
+    int batchInsert(List<TpBuildingOwnerInfo> list);
+    
+    int batchUpdate(List<TpBuildingOwnerInfo> list);
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/SysRoleMapper.java → CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpSysRoleMapper.java

@@ -1,7 +1,7 @@
 package com.community.huiju.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.community.huiju.model.SysRole;
+import com.community.huiju.model.TpSysRole;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -16,13 +16,13 @@ import java.util.Map;
  * @since 2018-12-19
  */
 @Mapper
-public interface SysRoleMapper extends BaseMapper<SysRole> {
+public interface TpSysRoleMapper extends BaseMapper<TpSysRole> {
 
     /**
      * 多表查询 查询出这个用户所有的角色权限
      * @param map
      * @return
      */
-    List<SysRole> selectByUserIdAndRoleId(Map<String, Object> map);
+    List<TpSysRole> selectByUserIdAndRoleId(Map<String, Object> map);
 
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/UserCommunityMapper.java → CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpUserCommunityMapper.java

@@ -1,7 +1,7 @@
 package com.community.huiju.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.community.huiju.model.UserCommunity;
+import com.community.huiju.model.TpUserCommunity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2018-12-19
  */
 @Mapper
-public interface UserCommunityMapper extends BaseMapper<UserCommunity> {
+public interface TpUserCommunityMapper extends BaseMapper<TpUserCommunity> {
 
 }

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

@@ -1,12 +1,10 @@
 package com.community.huiju.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TaUser;
 import com.community.huiju.model.User;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * <p>
  * 物业web端用户表 Mapper 接口

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

@@ -1,240 +1,127 @@
 package com.community.huiju.model;
 
-import java.util.Date;
-
-public class TaUser {
-    private Integer id;
-
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 住户app端用户表
+ * </p>
+ *
+ * @author jobob
+ * @since 2018-12-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_user")
+public class TaUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区id
+     */
     private Integer communityId;
 
+    /**
+     * 楼栋业主资料信息id
+     */
     private Integer buildingOwnerInfoId;
 
+    /**
+     * 头像
+     */
     private String headPortrait;
 
+    /**
+     * 用户姓名
+     */
     private String userName;
 
+    /**
+     * 登录账号就是手机号确保唯一
+     */
     private String loginName;
 
+    /**
+     * 登录密码
+     */
     private String loginPassword;
 
+    /**
+     * 邮箱
+     */
     private String email;
 
+    /**
+     * 性别 1：男   2：女
+     */
     private String gender;
 
+    /**
+     * 1 有效 0 无效(逻辑删除)
+     */
     private String status;
 
+    /**
+     * 备注
+     */
     private String remark;
 
+    /**
+     * 上级目录id存在，表示是这个id下的租客或家属
+     */
     private Integer parentId;
 
+    /**
+     * 接受协议状态  0 是未接受 1是已接受
+     */
     private String acceptAgreementStatus;
 
+    /**
+     * 认证状态  0 是未认证    1是认证通过   2是已作废
+     */
     private String verifyStatus;
 
+    /**
+     * 创建人
+     */
     private Integer createUser;
 
-    private Date createDate;
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
 
+    /**
+     * 更新人
+     */
     private Integer updateUser;
 
-    private Date updateDate;
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
 
-    // 海康UserId
+    /**
+     * 海康人员ID
+     */
     private Integer hkUserId;
 
-    // 海康 卡片号
+    /**
+     * 海康 卡片号码
+     */
     private String hkCardNo;
 
-    // 人脸状态
+    /**
+     * 人脸状态  0 是未上传   1是已上传   register/unregister
+     */
     private String faceStatus;
 
-    // 角色编号
-    private Integer role;
-
-    // 角色名称
-    private String roleName;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getCommunityId() {
-        return communityId;
-    }
-
-    public void setCommunityId(Integer communityId) {
-        this.communityId = communityId;
-    }
-
-    public Integer getBuildingOwnerInfoId() {
-        return buildingOwnerInfoId;
-    }
-
-    public void setBuildingOwnerInfoId(Integer buildingOwnerInfoId) {
-        this.buildingOwnerInfoId = buildingOwnerInfoId;
-    }
-
-    public String getHeadPortrait() {
-        return headPortrait;
-    }
-
-    public void setHeadPortrait(String headPortrait) {
-        this.headPortrait = headPortrait == null ? null : headPortrait.trim();
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName == null ? null : userName.trim();
-    }
-
-    public String getLoginName() {
-        return loginName;
-    }
-
-    public void setLoginName(String loginName) {
-        this.loginName = loginName == null ? null : loginName.trim();
-    }
-
-    public String getLoginPassword() {
-        return loginPassword;
-    }
-
-    public void setLoginPassword(String loginPassword) {
-        this.loginPassword = loginPassword == null ? null : loginPassword.trim();
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email == null ? null : email.trim();
-    }
-
-    public String getGender() {
-        return gender;
-    }
-
-    public void setGender(String gender) {
-        this.gender = gender == null ? null : gender.trim();
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status == null ? null : status.trim();
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
-
-    public Integer getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Integer parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getAcceptAgreementStatus() {
-        return acceptAgreementStatus;
-    }
-
-    public void setAcceptAgreementStatus(String acceptAgreementStatus) {
-        this.acceptAgreementStatus = acceptAgreementStatus == null ? null : acceptAgreementStatus.trim();
-    }
-
-    public String getVerifyStatus() {
-        return verifyStatus;
-    }
-
-    public void setVerifyStatus(String verifyStatus) {
-        this.verifyStatus = verifyStatus == null ? null : verifyStatus.trim();
-    }
-
-    public String getFaceStatus() {
-        return faceStatus;
-    }
-
-    public void setFaceStatus(String faceStatus) {
-        this.faceStatus = faceStatus;
-    }
-
-    public Integer getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(Integer createUser) {
-        this.createUser = createUser;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Integer getUpdateUser() {
-        return updateUser;
-    }
-
-    public void setUpdateUser(Integer updateUser) {
-        this.updateUser = updateUser;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
-    public Integer getHkUserId() {
-        return hkUserId;
-    }
-
-    public void setHkUserId(Integer hkUserId) {
-        this.hkUserId = hkUserId;
-    }
-
-    public String getHkCardNo() {
-        return hkCardNo;
-    }
-
-    public void setHkCardNo(String hkCardNo) {
-        this.hkCardNo = hkCardNo;
-    }
-
-    public Integer getRole() {
-        return role;
-    }
-
-    public void setRole(Integer role) {
-        this.role = role;
-    }
-
-    public String getRoleName() {
-        return roleName;
-    }
 
-    public void setRoleName(String roleName) {
-        this.roleName = roleName;
-    }
-}
+}

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

@@ -0,0 +1,80 @@
+package com.community.huiju.model;
+
+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 weiximei
+ * @since 2018-12-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("to_communities")
+public class ToCommunities implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    /**
+     * 小区名称
+     */
+    private String communityName;
+
+    /**
+     * 小区别名
+     */
+    private String communityAlias;
+
+    /**
+     * 省份id
+     */
+    private Integer provinceId;
+
+    private Integer cityId;
+
+    /**
+     * 县/区id
+     */
+    private Integer districtId;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+
+    /**
+     * 登录账号
+     */
+    private String loginName;
+
+    private Integer createUser;
+
+    private LocalDateTime createDate;
+
+    private Integer updateUser;
+
+    private LocalDateTime updateDate;
+
+
+}

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

@@ -20,7 +20,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("tp_building_owner_info")
-public class BuildingOwnerInfo implements Serializable {
+public class TpBuildingOwnerInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/SysRole.java → CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpSysRole.java

@@ -20,7 +20,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("tp_sys_role")
-public class SysRole implements Serializable {
+public class TpSysRole implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/UserCommunity.java → CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpUserCommunity.java

@@ -20,7 +20,7 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("tp_user_community")
-public class UserCommunity implements Serializable {
+public class TpUserCommunity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -2,12 +2,9 @@ package com.community.huiju.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.community.commom.mode.ResponseBean;
-import com.community.huiju.model.BuildingOwnerInfo;
+import com.community.huiju.model.TpBuildingOwnerInfo;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * <p>
  * 楼栋业主资料信息表 服务类
@@ -16,8 +13,13 @@ import java.util.Map;
  * @author weiximei
  * @since 2018-12-18
  */
-public interface IBuildingOwnerInfoService extends IService<BuildingOwnerInfo> {
-
+public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo> {
+    /**
+     * 分页查询已认证通过的业主
+     * @param paramets
+     * @return
+     */
+    ResponseBean selectUserApprove(String paramets);
     /**
      * 根据条件查询
      * @param parameter

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

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.ToCommunities;
+
+/**
+ * <p>
+ * 所有小区表 服务类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-19
+ */
+public interface ICommunitiesService extends IService<ToCommunities> {
+
+}

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

@@ -1,7 +1,7 @@
 package com.community.huiju.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.community.huiju.model.SysRole;
+import com.community.huiju.model.TpSysRole;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.community.huiju.model.SysRole;
  * @author weiximei
  * @since 2018-12-19
  */
-public interface ISysRoleService extends IService<SysRole> {
+public interface ISysRoleService extends IService<TpSysRole> {
 
 }

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

@@ -1,7 +1,7 @@
 package com.community.huiju.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.community.huiju.model.UserCommunity;
+import com.community.huiju.model.TpUserCommunity;
 
 /**
  * <p>
@@ -11,7 +11,7 @@ import com.community.huiju.model.UserCommunity;
  * @author weiximei
  * @since 2018-12-19
  */
-public interface IUserCommunityService extends IService<UserCommunity> {
+public interface IUserCommunityService extends IService<TpUserCommunity> {
 
 
 

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

@@ -1,14 +1,10 @@
 package com.community.huiju.service;
 
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.community.commom.mode.ResponseBean;
-import com.community.huiju.model.TaUser;
 import com.community.huiju.model.User;
 
-import java.util.Map;
-
 /**
  * <p>
  * 物业web端用户表 服务类
@@ -18,8 +14,6 @@ import java.util.Map;
  * @since 2018-12-18
  */
 public interface IUserService extends IService<User> {
-    ResponseBean selectUserApprove(String paramets);
-
     /**
      * 登陆
      * @param phone
@@ -29,6 +23,14 @@ public interface IUserService extends IService<User> {
      */
     ResponseBean login(String phone, Integer communityId, String code);
 
+    /**
+     * 根据 手机号 验证码 获取 该用户的所管理的小区
+     * @param phone
+     * @param code
+     * @return
+     */
+    ResponseBean userCommunity(String phone, String code);
+
     /**
      * 查询用户信息
      * @param userId

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

@@ -9,11 +9,14 @@ import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.commom.utils.BeanTools;
-import com.community.huiju.dao.BuildingOwnerInfoMapper;
+
 import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.exception.WisdomException;
-import com.community.huiju.model.BuildingOwnerInfo;
 import com.community.huiju.model.TaUser;
+
+import com.community.huiju.dao.TpBuildingOwnerInfoMapper;
+import com.community.huiju.model.TpBuildingOwnerInfo;
+
 import com.community.huiju.service.IBuildingOwnerInfoService;
 import com.google.common.collect.Maps;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -47,10 +50,10 @@ import java.util.Map;
  */
 @Service("iBuildingOwnerInfoService")
 @Slf4j
-public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoMapper, BuildingOwnerInfo> implements IBuildingOwnerInfoService {
+public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInfoMapper, TpBuildingOwnerInfo> implements IBuildingOwnerInfoService {
 
     @Autowired
-    private BuildingOwnerInfoMapper buildingOwnerInfoMapper;
+    private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
     
     @Autowired
     private TaUserMapper taUserMapper;
@@ -63,34 +66,34 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
         ResponseBean responseBean = new ResponseBean();
 
         JSONObject jsonObject = JSONObject.parseObject(parameter);
-        BuildingOwnerInfo buildingOwnerInfo = jsonObject.toJavaObject(BuildingOwnerInfo.class);
+        TpBuildingOwnerInfo tpBuildingOwnerInfo = jsonObject.toJavaObject(TpBuildingOwnerInfo.class);
 
         Long pageNum = jsonObject.getLong("pageNum") == null ? 1 : jsonObject.getLong("pageNum");
         Long pageSize = jsonObject.getLong("pageSize") == null ? 10 : jsonObject.getLong("pageSize");
 
-        Page<BuildingOwnerInfo> page = new Page(pageNum,pageSize);
+        Page<TpBuildingOwnerInfo> page = new Page(pageNum,pageSize);
 
         Map<String, Object> map = Maps.newHashMap();
         // 栋
-        map.put("building",buildingOwnerInfo.getBuilding());
+        map.put("building", tpBuildingOwnerInfo.getBuilding());
         // 单元
-        map.put("unit",buildingOwnerInfo.getUnit());
+        map.put("unit", tpBuildingOwnerInfo.getUnit());
         // 楼层
-        map.put("level",buildingOwnerInfo.getLevel());
+        map.put("level", tpBuildingOwnerInfo.getLevel());
         // 房号
-        map.put("room_no",buildingOwnerInfo.getRoomNo());
+        map.put("room_no", tpBuildingOwnerInfo.getRoomNo());
 
-        QueryWrapper<BuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.allEq(map,false);
-        queryWrapper.like(buildingOwnerInfo.getOwnerName() != null,"owner_name",buildingOwnerInfo.getOwnerName());
+        queryWrapper.like(tpBuildingOwnerInfo.getOwnerName() != null,"owner_name", tpBuildingOwnerInfo.getOwnerName());
 
         // 分页查询
-        IPage<BuildingOwnerInfo> infoIPage = buildingOwnerInfoMapper.selectPage(page, queryWrapper);
+        IPage<TpBuildingOwnerInfo> infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, queryWrapper);
 
 
         Map<String, Object> retMap = Maps.newHashMap();
         // 获取数据
-        List<BuildingOwnerInfo> list = infoIPage.getRecords();
+        List<TpBuildingOwnerInfo> list = infoIPage.getRecords();
 
         retMap.put("data", list);
         retMap.put("total", infoIPage.getTotal());
@@ -108,18 +111,18 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
     public ResponseBean update(String parameter, Integer userId) {
         ResponseBean responseBean = new ResponseBean();
 
-        BuildingOwnerInfo buildingOwnerInfo = JSONObject.parseObject(parameter, BuildingOwnerInfo.class);
-        BuildingOwnerInfo oldBuildingOwnerInfo = buildingOwnerInfoMapper.selectById(buildingOwnerInfo.getId());
-        if (null == oldBuildingOwnerInfo) {
-            throw new WisdomException("%s 数据不存在!", buildingOwnerInfo.getId());
+        TpBuildingOwnerInfo tpBuildingOwnerInfo = JSONObject.parseObject(parameter, TpBuildingOwnerInfo.class);
+        TpBuildingOwnerInfo oldTpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(tpBuildingOwnerInfo.getId());
+        if (null == oldTpBuildingOwnerInfo) {
+            throw new WisdomException("%s 数据不存在!", tpBuildingOwnerInfo.getId());
         }
 
-        BeanTools.copyProperties(buildingOwnerInfo, oldBuildingOwnerInfo);
+        BeanTools.copyProperties(tpBuildingOwnerInfo, oldTpBuildingOwnerInfo);
 
-        oldBuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
-        oldBuildingOwnerInfo.setUpdateUser(userId);
+        oldTpBuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
+        oldTpBuildingOwnerInfo.setUpdateUser(userId);
 
-        int row = buildingOwnerInfoMapper.updateById(oldBuildingOwnerInfo);
+        int row = tpBuildingOwnerInfoMapper.updateById(oldTpBuildingOwnerInfo);
         if (row <= 0) {
             throw new WisdomException("操作失败!");
         } else {
@@ -133,15 +136,15 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
     public ResponseBean add(String parameter, Integer userId) {
         ResponseBean responseBean = new ResponseBean();
 
-        BuildingOwnerInfo buildingOwnerInfo = JSONObject.parseObject(parameter, BuildingOwnerInfo.class);
+        TpBuildingOwnerInfo tpBuildingOwnerInfo = JSONObject.parseObject(parameter, TpBuildingOwnerInfo.class);
         // 主键是自增的, 所以设置为 null
-        buildingOwnerInfo.setId(null);
-        buildingOwnerInfo.setUpdateUser(userId);
-        buildingOwnerInfo.setUpdateDate(LocalDateTime.now());
-        buildingOwnerInfo.setCreateDate(LocalDateTime.now());
-        buildingOwnerInfo.setCreateUser(userId);
+        tpBuildingOwnerInfo.setId(null);
+        tpBuildingOwnerInfo.setUpdateUser(userId);
+        tpBuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
+        tpBuildingOwnerInfo.setCreateDate(LocalDateTime.now());
+        tpBuildingOwnerInfo.setCreateUser(userId);
 
-        int row = buildingOwnerInfoMapper.insert(buildingOwnerInfo);
+        int row = tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
         if (row <= 0) {
             throw new WisdomException("操作失败!");
         } else {
@@ -159,20 +162,20 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
             throw new WisdomException("编号:%s 小区不存在!", communityId);
         }
 
-        BuildingOwnerInfo buildingOwnerInfo = JSONObject.parseObject(parameter, BuildingOwnerInfo.class);
+        TpBuildingOwnerInfo tpBuildingOwnerInfo = JSONObject.parseObject(parameter, TpBuildingOwnerInfo.class);
 
         Map<String, Object> map = Maps.newHashMap();
 
         // 小区
         map.put("community_id", communityId);
         // 栋
-        map.put("building",buildingOwnerInfo.getBuilding());
+        map.put("building", tpBuildingOwnerInfo.getBuilding());
         // 单元
-        map.put("unit",buildingOwnerInfo.getUnit());
+        map.put("unit", tpBuildingOwnerInfo.getUnit());
         // 楼层
-        map.put("level",buildingOwnerInfo.getLevel());
+        map.put("level", tpBuildingOwnerInfo.getLevel());
 
-        QueryWrapper<BuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.allEq(map, false);
 
         /**
@@ -188,17 +191,17 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
          */
 
         String column = null;
-        if (null == buildingOwnerInfo.getBuilding()) {
+        if (null == tpBuildingOwnerInfo.getBuilding()) {
             column = "building";
-        } else if (null == buildingOwnerInfo.getUnit()) {
+        } else if (null == tpBuildingOwnerInfo.getUnit()) {
             column = "unit";
-        } else if (null == buildingOwnerInfo.getLevel()){
+        } else if (null == tpBuildingOwnerInfo.getLevel()){
             column = "level";
-        } else if (null == buildingOwnerInfo.getRoomNo()) {
+        } else if (null == tpBuildingOwnerInfo.getRoomNo()) {
             column = "room_no";
         }
         queryWrapper.groupBy(column);
-        List<BuildingOwnerInfo> selectList = buildingOwnerInfoMapper.selectList(queryWrapper);
+        List<TpBuildingOwnerInfo> selectList = tpBuildingOwnerInfoMapper.selectList(queryWrapper);
 
         responseBean.addSuccess(selectList);
 
@@ -220,7 +223,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
         }
         //获取要上传的数据
         Map<String,Object> map = (Map<String, Object>) responseBean.getData();
-        List<BuildingOwnerInfo> list = (List<BuildingOwnerInfo>) map.get("list");
+        List<TpBuildingOwnerInfo> list = (List<TpBuildingOwnerInfo>) map.get("list");
         list.stream().forEach(BuildingOwnerInfo -> {
             BuildingOwnerInfo.setCommunityId(3);
             BuildingOwnerInfo.setVerifyStatus(Constant.UN_VERIFY_STATUS);
@@ -230,9 +233,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
             BuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
         });
         //批量插入
-        buildingOwnerInfoMapper.batchInsert(list);
+	    tpBuildingOwnerInfoMapper.batchInsert(list);
         //判断是否认证过
-        List<BuildingOwnerInfo> updateList = new ArrayList<BuildingOwnerInfo>();
+        List<TpBuildingOwnerInfo> updateList = new ArrayList<TpBuildingOwnerInfo>();
         List<TaUser> updataTaUserList = new ArrayList<TaUser>();
         list.stream().forEach(BuildingOwnerInfo -> {
             TaUser taUser = taUserMapper.selectByTel(BuildingOwnerInfo.getOwnerTel(),BuildingOwnerInfo.getCommunityId());
@@ -246,7 +249,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
         });
         //批量更新
         if (updateList.size() > 0){
-            buildingOwnerInfoMapper.batchUpdate(updateList);
+	        tpBuildingOwnerInfoMapper.batchUpdate(updateList);
         }
         if (updataTaUserList.size() > 0){
             taUserMapper.batchUpdate(updataTaUserList);
@@ -264,7 +267,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
     @Override
     public ResponseBean getExcelData(MultipartFile file) {
         ResponseBean responseBean = new ResponseBean();
-        List<BuildingOwnerInfo> list = new ArrayList<>();
+        List<TpBuildingOwnerInfo> list = new ArrayList<>();
         if (file == null) {
             responseBean.addError("对象不能为空");
             return responseBean;
@@ -297,7 +300,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
             //从第一行开始第一行一般是标题
             for (int j = 3; j <= lastRowNum; j++) {
                 Row row = sheet.getRow(j);
-                BuildingOwnerInfo buildingOwnerInfo = new BuildingOwnerInfo();
+                TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
                 String building = row.getCell(0).getStringCellValue();
                 String unit = row.getCell(1).getStringCellValue();
                 String level = row.getCell(2).getStringCellValue();
@@ -324,13 +327,13 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
                 temBuildingList.add(buildingInfo);
                 temTelList.add(ownerTel);
                 //构建数据
-                buildingOwnerInfo.setBuilding(building);
-                buildingOwnerInfo.setUnit(unit);
-                buildingOwnerInfo.setLevel(level);
-                buildingOwnerInfo.setRoomNo(roomNo);
-                buildingOwnerInfo.setOwnerName(ownerName);
-                buildingOwnerInfo.setOwnerTel(ownerTel);
-                list.add(buildingOwnerInfo);
+                tpBuildingOwnerInfo.setBuilding(building);
+                tpBuildingOwnerInfo.setUnit(unit);
+                tpBuildingOwnerInfo.setLevel(level);
+                tpBuildingOwnerInfo.setRoomNo(roomNo);
+                tpBuildingOwnerInfo.setOwnerName(ownerName);
+                tpBuildingOwnerInfo.setOwnerTel(ownerTel);
+                list.add(tpBuildingOwnerInfo);
             }
         }
         //构建分页
@@ -341,4 +344,25 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
         responseBean.addSuccess(data);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean selectUserApprove(String paramets) {
+
+        ResponseBean responseBean = new ResponseBean();
+
+        JSONObject jsonobject = JSONObject.parseObject(paramets);
+        Integer pageNum = jsonobject.getInteger("pageNum");
+        Integer pageSize = jsonobject.getInteger("pageSize");
+        TpBuildingOwnerInfo tpBuildingOwnerInfo = JSONObject.parseObject(paramets, TpBuildingOwnerInfo.class);
+
+        // 分页
+        Page<TpBuildingOwnerInfo> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+
+        List<TpBuildingOwnerInfo> mapList = tpBuildingOwnerInfoMapper.selectUserApprove(tpBuildingOwnerInfo.getOwnerName(),tpBuildingOwnerInfo.getOwnerTel(), page);
+        responseBean.addSuccess(mapList);
+
+        return responseBean;
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.ToCommunitiesMapper;
+import com.community.huiju.model.ToCommunities;
+import com.community.huiju.service.ICommunitiesService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 所有小区表 服务实现类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-19
+ */
+@Service
+public class CommunitiesServiceImpl extends ServiceImpl<ToCommunitiesMapper, ToCommunities> implements ICommunitiesService {
+
+}

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

@@ -1,8 +1,8 @@
 package com.community.huiju.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.community.huiju.dao.SysRoleMapper;
-import com.community.huiju.model.SysRole;
+import com.community.huiju.dao.TpSysRoleMapper;
+import com.community.huiju.model.TpSysRole;
 import com.community.huiju.service.ISysRoleService;
 import org.springframework.stereotype.Service;
 
@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2018-12-19
  */
 @Service
-public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
+public class SysRoleServiceImpl extends ServiceImpl<TpSysRoleMapper, TpSysRole> implements ISysRoleService {
 
 }

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

@@ -1,8 +1,8 @@
 package com.community.huiju.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.community.huiju.dao.UserCommunityMapper;
-import com.community.huiju.model.UserCommunity;
+import com.community.huiju.dao.TpUserCommunityMapper;
+import com.community.huiju.model.TpUserCommunity;
 import com.community.huiju.service.IUserCommunityService;
 import org.springframework.stereotype.Service;
 
@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2018-12-19
  */
 @Service
-public class UserCommunityServiceImpl extends ServiceImpl<UserCommunityMapper, UserCommunity> implements IUserCommunityService {
+public class UserCommunityServiceImpl extends ServiceImpl<TpUserCommunityMapper, TpUserCommunity> implements IUserCommunityService {
 
 }

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

@@ -5,17 +5,18 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
+import com.community.huiju.dao.*;
 import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.dao.UserMapper;
-import com.community.huiju.model.TaUser;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.huiju.common.code.cache.AppkeyCache;
-import com.community.huiju.dao.SysRoleMapper;
-import com.community.huiju.dao.UserCommunityMapper;
-import com.community.huiju.model.SysRole;
-import com.community.huiju.model.User;
-import com.community.huiju.model.UserCommunity;
+import com.community.huiju.model.*;
+import com.community.huiju.exception.WisdomException;
+import com.community.huiju.model.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.community.commom.utils.AccountValidatorUtil;
+import com.community.huiju.common.code.cache.AppkeyCache;
 import com.community.huiju.service.IUserService;
 import com.community.huiju.vo.UserVO;
 import lombok.extern.slf4j.Slf4j;
@@ -26,7 +27,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -42,79 +42,41 @@ import java.util.Map;
 @Transactional
 @Slf4j
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IUserService {
-    @Autowired
-    private TaUserMapper taUserMapper;
 
     @Autowired
     private UserMapper userMapper;
 
     @Autowired
-    private UserCommunityMapper userCommunityMapper;
+    private TpUserCommunityMapper tpUserCommunityMapper;
 
     @Autowired
-    private SysRoleMapper sysRoleMapper;
-
-    @Override
-    public ResponseBean selectUserApprove(String paramets) {
-
-        ResponseBean responseBean = new ResponseBean();
-
-        JSONObject jsonobject = JSONObject.parseObject(paramets);
-        Integer pageNum = jsonobject.getInteger("pageNum");
-        Integer pageSize = jsonobject.getInteger("pageSize");
-        TaUser tpTicket = JSONObject.parseObject(paramets, TaUser.class);
-        HashMap map = new HashMap<>();
-        map.put("loginName", tpTicket.getLoginName());
-        map.put("userName", tpTicket.getUserName());
-        map.put("verifyStatus", tpTicket.getVerifyStatus());
-
-        // 分页
-        Page<TaUser> page = new Page<>();
-        page.setSize(pageSize == null ? 1 : pageSize);
-        page.setCurrent(pageNum == null ? 10 : pageNum);
-
-        List<Map<Object, Object>> mapList = taUserMapper.selectUserApprove(map, page);
-        responseBean.addSuccess(mapList);
-
-        return responseBean;
-    }
-
-
+    private TpSysRoleMapper tpSysRoleMapper;
 
+    @Autowired
+    private ToCommunitiesMapper toCommunitiesMapper;
 
     @Override
     public ResponseBean login(String phone, Integer communityId, String code) {
         ResponseBean responseBean = new ResponseBean();
-        /**************  校验手机号, 验证码   ***************/
-        if (!AccountValidatorUtil.isPhone(phone)){
-            responseBean.addError("请输入正取的手机号!");
-            return responseBean;
-        }
-        String phoneCode = (String) AppkeyCache.getCache(phone);
-        if ("1234".equals(code)) {
 
-        } else if (StringUtils.isBlank(phoneCode) || !phoneCode.equals(code)) {
-            responseBean.addError("验证码错误!");
-            return responseBean;
-        }
-
-        /*******************  业务  ********************/
+        // 校验
+        checkPhoneAndCode(phone, code);
 
         // 查询用户
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("login_name", phone);
-        User user = userMapper.selectOne(queryWrapper);
+        User user = userMapper.selectOne(queryWrapper) ;
         if (null == user) {
             responseBean.addError("当前手机号不存在, 请联系运营人员!");
             return responseBean;
         }
 
         // 查询这个用户是否有这个小区的管理
-        QueryWrapper<UserCommunity> userCommunityQueryWrapper = new QueryWrapper<>();
+        QueryWrapper<TpUserCommunity> userCommunityQueryWrapper = new QueryWrapper<>();
         userCommunityQueryWrapper.eq("tp_user_id", user.getId());
         userCommunityQueryWrapper.eq("community_id", communityId);
-        UserCommunity userCommunity = userCommunityMapper.selectOne(userCommunityQueryWrapper);
-        if (null == userCommunity) {
+        TpUserCommunity tpUserCommunity = tpUserCommunityMapper.selectOne(userCommunityQueryWrapper);
+        if (null == tpUserCommunity) {
             responseBean.addError("当前手机号未绑定该社区");
             return responseBean;
         }
@@ -129,6 +91,29 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         return responseBean;
     }
 
+    @Override
+    public ResponseBean userCommunity(String phone, String code) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 校验
+        checkPhoneAndCode(phone, code);
+
+        // 获取这个用户所管理的小区
+        // 查询用户
+        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("login_name", phone);
+        User user = userMapper.selectOne(queryWrapper);
+        if (null == user) {
+            responseBean.addError("当前手机号不存在, 请联系运营人员!");
+            return responseBean;
+        }
+
+        List<ToCommunities> toCommunities = toCommunitiesMapper.selectUserById(user.getId());
+        responseBean.addSuccess(toCommunities);
+
+        return responseBean;
+    }
+
     @Override
     public ResponseBean userInfo(Integer userId) {
         ResponseBean responseBean = new ResponseBean();
@@ -162,9 +147,25 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         // 查询该用户的权限
         Map<String, Object> map = Maps.newHashMap();
         map.put("userId", user.getId());
-        List<SysRole> sysRoleList = sysRoleMapper.selectByUserIdAndRoleId(map);
+        List<TpSysRole> tpSysRoleList = tpSysRoleMapper.selectByUserIdAndRoleId(map);
+
+        userVO.setRoles(tpSysRoleList);
+    }
+
+    /**
+     * 校验手机号和验证码
+     */
+    private void checkPhoneAndCode(String phone, String code){
+        /**************  校验手机号, 验证码   ***************/
+        if (!AccountValidatorUtil.isPhone(phone)){
+            throw new WisdomException("请输入正取的手机号!");
+        }
+        String phoneCode = (String) AppkeyCache.getCache(phone);
+        if ("1234".equals(code)) {
 
-        userVO.setRoles(sysRoleList);
+        } else if (StringUtils.isBlank(phoneCode) || !phoneCode.equals(code)) {
+            throw new WisdomException("验证码错误!");
+        }
     }
 
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/vo/UserVO.java

@@ -1,6 +1,6 @@
 package com.community.huiju.vo;
 
-import com.community.huiju.model.SysRole;
+import com.community.huiju.model.TpSysRole;
 import com.community.huiju.model.User;
 import lombok.Data;
 
@@ -14,6 +14,6 @@ public class UserVO extends User {
     private String token;
 
     /** 角色 **/
-    private List<SysRole> roles;
+    private List<TpSysRole> roles;
 
 }

CODE/smart-community/property-api/src/main/resources/bootstrap.yml

@@ -12,6 +12,13 @@ spring:
       discovery:
         enabled: true
         serviceId: config-server
+  session:
+    store-type: jdbc
+    servlet:
+      multipart:
+        max-file-size: 10MB
+        max-request-size: 100MB
+
 eureka:
   client:
     service-url:

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

@@ -318,4 +318,5 @@
       where id = ${item.id}
     </foreach>
   </update>
+
 </mapper>

CODE/smart-community/property-api/src/main/resources/mapper/BuildingOwnerInfoMapper.xml → CODE/smart-community/property-api/src/main/resources/mapper/ToCommunitiesMapper.xml

@@ -1,6 +1,6 @@
 <?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.BuildingOwnerInfoMapper">
+<mapper namespace="com.community.huiju.dao.ToCommunitiesMapper">
 
     <insert id="batchInsert" useGeneratedKeys="true" keyProperty="id" parameterType="java.util.ArrayList">
         insert into tp_building_owner_info(community_id,id_card, building,unit, `level`,

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

@@ -0,0 +1,48 @@
+<?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.TpBuildingOwnerInfoMapper">
+    <select id="selectUserApprove" parameterType="map" resultType="com.community.huiju.model.TpBuildingOwnerInfo" >
+        SELECT
+        owner_name,
+        owner_tel,
+        gender,
+        id_card,
+        unit,
+        LEVEL ,
+        room_no,
+        create_date,
+        verify_status
+        FROM
+        tp_building_owner_info
+        <where>
+            <if test="ownerName != null and ownerName != ''" >
+                AND owner_name = #{ownerName,jdbcType=VARCHAR}
+            </if>
+            <if test="ownerTel != null and ownerTel != ''" >
+                AND  owner_tel = #{ownerTel,jdbcType=VARCHAR}
+            </if>
+            and tp_building_owner_info.pair_status=1
+        </where>
+    </select>
+
+    <insert id="batchInsert" useGeneratedKeys="true" keyProperty="id" parameterType="java.util.ArrayList">
+        insert into tp_building_owner_info(community_id,id_card, building,unit, `level`,
+        room_no,owner_name,owner_tel,gender,pair_status,verify_status,create_user,create_date,update_user,update_date)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.communityId},#{item.idCard},#{item.building},#{item.unit}, #{item.level},#{item.roomNo},#{item.ownerName},
+            #{item.ownerTel},#{item.gender},#{item.pairStatus},#{item.verifyStatus},#{item.createUser},#{item.createDate},#{item.updateUser},#{item.updateDate})
+        </foreach>
+    </insert>
+
+    <update id="batchUpdate" parameterType="java.util.ArrayList">
+        <foreach collection="list" item="item" index="index" open="" close="" separator=";">
+            update tp_building_owner_info
+            <set>
+                verify_status=${item.verifyStatus}
+            </set>
+            where id = ${item.id}
+        </foreach>
+    </update>
+
+</mapper>

CODE/smart-community/property-api/src/main/resources/mapper/SysRoleMapper.xml → CODE/smart-community/property-api/src/main/resources/mapper/TpSysRoleMapper.xml

@@ -1,8 +1,8 @@
 <?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.SysRoleMapper">
+<mapper namespace="com.community.huiju.dao.TpSysRoleMapper">
 
-    <select id="selectByUserIdAndRoleId" parameterType="map" resultType="com.community.huiju.model.SysRole">
+    <select id="selectByUserIdAndRoleId" parameterType="map" resultType="com.community.huiju.model.TpSysRole">
       SELECT tsr.* from
       tp_sys_user_role tsur
       LEFT JOIN tp_sys_role tsr

CODE/smart-community/property-api/src/test/java/com/community/huiju/DemoApplicationTests.java

@@ -1,10 +1,12 @@
 package com.community.huiju;
 
 import com.alibaba.fastjson.JSONObject;
-import com.community.huiju.dao.BuildingOwnerInfoMapper;
-import com.community.huiju.dao.SysRoleMapper;
-import com.community.huiju.model.BuildingOwnerInfo;
-import com.community.huiju.model.SysRole;
+import com.community.huiju.dao.ToCommunitiesMapper;
+import com.community.huiju.dao.TaUserMapper;
+import com.community.huiju.dao.TpBuildingOwnerInfoMapper;
+import com.community.huiju.dao.TpSysRoleMapper;
+import com.community.huiju.model.TpBuildingOwnerInfo;
+import com.community.huiju.model.TpSysRole;
 import com.google.common.collect.Maps;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -20,14 +22,21 @@ import java.util.Map;
 public class DemoApplicationTests {
 
 	@Autowired
-	private BuildingOwnerInfoMapper buildingOwnerInfoMapper;
+	private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
 	@Autowired
-	private SysRoleMapper sysRoleMapper;
+	private TpSysRoleMapper tpSysRoleMapper;
+
+	@Autowired
+	private ToCommunitiesMapper toCommunitiesMapper;
+
+	@Autowired
+	private TaUserMapper taUserMapper;
+
 
 	@Test
 	public void contextLoads() {
 
-		List<BuildingOwnerInfo> list = buildingOwnerInfoMapper.selectList(null);
+		List<TpBuildingOwnerInfo> list = tpBuildingOwnerInfoMapper.selectList(null);
 		System.out.println(list.size());
 	}
 
@@ -36,8 +45,15 @@ public class DemoApplicationTests {
 		// 查询该用户的权限
 		Map<String, Object> map = Maps.newHashMap();
 		map.put("userId", 29);
-		List<SysRole> sysRoleList = sysRoleMapper.selectByUserIdAndRoleId(map);
-		System.out.println(JSONObject.toJSONString(sysRoleList));
+		List<TpSysRole> tpSysRoleList = tpSysRoleMapper.selectByUserIdAndRoleId(map);
+		System.out.println(JSONObject.toJSONString(tpSysRoleList));
 	}
 
+	@Test
+	public void getUserCommunity(){
+		// 查询该用户的权限
+		toCommunitiesMapper.selectUserById(29);
+	}
+
+
 }

VUECODE/smart-property-manage/src/api/buildingOwnerInfo.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+//  查询 楼栋/单元/楼层/户号
+export function buildingAddress(data) {
+  return request({
+    uri: '/building/address',
+    method: 'post',
+    data
+  })
+}

VUECODE/smart-property-manage/src/api/community.js

@@ -46,3 +46,15 @@ export function fetchDistrictList(query) {
     params: { cityId: query }
   })
 }
+
+// 根据 手机号 和 验证码 查询用管理的小区
+export function userCommunity(data) {
+  return request({
+    url: '/community/user',
+    method: 'post',
+    data: {
+      'loginName': data.username,
+      'code': data.password
+    }
+  })
+}

VUECODE/smart-property-manage/src/api/login.js

@@ -1,12 +1,13 @@
 import request from '@/utils/request'
 
-export function login(username, password) {
+export function login(username, password, communityId) {
   const config = {
     url: '/user/login',
     method: 'post',
     data: {
       'loginName': username,
-      'code': password
+      'code': password,
+      'communityId': communityId
     }
   }
 

VUECODE/smart-property-manage/src/permission.js

@@ -9,36 +9,36 @@ const whiteList = ['/login'] // 不重定向白名单
 router.beforeEach((to, from, next) => {
   NProgress.start()
   console.log('路径: ', to.path)
-  // if (getToken()) {
-  //   if (to.path === '/login') {
-  //     next({ path: '/' })
-  //     NProgress.done() // if current page is dashboard will not trigger	afterEach hook, so manually handle it
-  //   } else {
-  //     if (store.getters.roles.length === 0) {
-  //       store.dispatch('GetInfo').then(res => { // 拉取用户信息
-  //         next()
-  //       }).catch((err) => {
-  //         store.dispatch('FedLogOut').then(() => {
-  //           Message.error(err || 'Verification failed, please login again')
-  //           next({ path: '/' })
-  //         })
-  //       })
-  //     } else {
-  //       next()
-  //     }
-  //   }
-  // } else {
-  //   // if (to.path === '/') {
-  //   //   next(`/login?redirect=${to.path}`)
-  //   //   NProgress.done()
-  //   // }
-  //   if (whiteList.indexOf(to.path) !== -1) {
-  //     next()
-  //   } else {
-  //     next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
-  //     NProgress.done()
-  //   }
-  // }
+  if (getToken()) {
+    if (to.path === '/login') {
+      next({ path: '/' })
+      NProgress.done() // if current page is dashboard will not trigger	afterEach hook, so manually handle it
+    } else {
+      if (store.getters.roles.length === 0) {
+        store.dispatch('GetInfo').then(res => { // 拉取用户信息
+          next()
+        }).catch((err) => {
+          store.dispatch('FedLogOut').then(() => {
+            Message.error(err || 'Verification failed, please login again')
+            next({ path: '/' })
+          })
+        })
+      } else {
+        next()
+      }
+    }
+  } else {
+    // if (to.path === '/') {
+    //   next(`/login?redirect=${to.path}`)
+    //   NProgress.done()
+    // }
+    if (whiteList.indexOf(to.path) !== -1) {
+      next()
+    } else {
+      next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
+      NProgress.done()
+    }
+  }
   next()
 })
 

VUECODE/smart-property-manage/src/store/modules/buildingOwnerInfo.js

@@ -0,0 +1,7 @@
+import { buildingAddress } from '@/api/buildingOwnerInfo'
+
+const buildingOwnerInfo = {
+  action: {
+    BuildingAddress(data)
+  }
+}

VUECODE/smart-property-manage/src/store/modules/community.js

@@ -1,4 +1,4 @@
-import { fetchList, createCommunity, updateCommunity, fetchProvinceList, fetchCityList, fetchDistrictList } from '@/api/community'
+import { fetchList, createCommunity, updateCommunity, fetchProvinceList, fetchCityList, fetchDistrictList, userCommunity } from '@/api/community'
 
 const community = {
   namespaced: true,
@@ -163,6 +163,25 @@ const community = {
           reject(error)
         })
       })
+    },
+
+    /**
+     * 根据 用户的 手机号 和 验证码 查询用户管理的小区
+     * @param commit
+     * @param data
+     * @returns {Promise<any>}
+     * @constructor
+     */
+    UserCommunity({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        userCommunity(data).then(response => {
+          const data = response.data
+          commit('SET_LIST', data)
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
 
   }

VUECODE/smart-property-manage/src/store/modules/user.js

@@ -30,11 +30,12 @@ const user = {
 
   actions: {
     // 登录
-    Login({ commit }, userInfo) {
-      const username = userInfo.username.trim()
+    Login({ commit }, data) {
+      const username = data.username.trim()
       return new Promise((resolve, reject) => {
-        login(username, userInfo.password).then(response => {
+        login(username, data.password, data.communityId).then(response => {
           const data = response.data
+          console.log('登陆后的数据的Token', data.token)
           setToken(data.token)
           commit('SET_TOKEN', data.token)
           resolve(response)

VUECODE/smart-property-manage/src/utils/request.js

@@ -14,6 +14,7 @@ service.interceptors.request.use(
   config => {
     if (store.getters.token) {
       config.headers['X-Auth-Token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+      config.headers['Login-Type'] = 'web'
     }
     return config
   },

VUECODE/smart-property-manage/src/views/banner/index.vue

@@ -32,8 +32,7 @@
       highlight-current-row
       style="width: 100%; margin-top: 20px;"
       @selection-change="handleSelectionChange">
-      <el-table-column label="选择" type="selection" sortable="custom" align="center" >
-      </el-table-column>
+      <el-table-column label="选择" type="selection" sortable="custom" align="center" />
       <el-table-column label="标题" align="center" min-width="250px">
         <template slot-scope="scope">
           <!-- <span class="link-type" @click="handleUpdate(scope.row)">{{ scope.row.title }}</span> -->
@@ -144,7 +143,7 @@ export default {
       },
       communityQuery: {
         pageNum: 1,
-        pageSize: 200,
+        pageSize: 200
       },
       importanceOptions: [1, 2, 3],
       calendarTypeOptions,
@@ -248,9 +247,9 @@ export default {
       var year = value.getFullYear()
       var month = value.getMonth() + 1
       var day = value.getDate()
-      var hour = value.getHours()
-      var minutes = value.getMinutes()
-      var seconds = value.getSeconds()
+      // var hour = value.getHours()
+      // var minutes = value.getMinutes()
+      // var seconds = value.getSeconds()
       // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
       return year + '-' + month + '-' + day
     },
@@ -270,7 +269,7 @@ export default {
       this.FetchCommunityList(this.communityQuery).then(() => {
         this.listLoading = false
       }).catch(() => {
-        this.loading = false
+        this.listLoading = false
         console.log('get list error')
       })
     },

VUECODE/smart-property-manage/src/views/login/index.vue

@@ -36,17 +36,36 @@
               auto-complete="on"
               placeholder="请输入验证码"
               @keyup.enter.native="handleLogin"
+              @blur.prevent="getUserCommunity"
             />
           </el-form-item>
           <el-button v-if="isCodeNum == false" type="primary" @click="sendCode();">发送验证码</el-button>
           <el-button v-else type="primary" disabled>{{ codeNum + '秒后重新获取' }}</el-button>
         </div>
+        <div v-show="isCommunityDiv" :class="{selectDiv: isSelectDiv, widSelectDiv: isWidSelectDiv}">
+          <el-form-item>
+            <div v-if="isSelectCommunity" class="select-community">
+              <i class="el-icon-circle-close-outline" style="margin-left: 60px;"/>  当前手机号未绑定任何社区
+            </div>
+            <div v-else class="select-community" >
+              <el-select v-model="loginForm.communityId" placeholder="请选择小区">
+                <el-option
+                  v-for="item in communityList"
+                  :key="item.id"
+                  :label="item.communityName"
+                  :value="item.id"/>
+              </el-select>
+            </div>
+          </el-form-item>
+        </div>
         <el-button
+          v-if="isLoginButton"
           :loading="loading"
           type="primary"
           style="width:100%;"
           @click.native.prevent="handleLogin"
         >登录</el-button>
+        <el-button v-else type="primary" style="width:100%;" disabled>登录</el-button>
       </el-form>
     </div>
     <span class="bottom-desc">Copyright © 南京荟房网络科技有限公司, All Rights Reserved.</span>
@@ -55,6 +74,7 @@
 
 <script>
 import { isvalidUsername, validatCode } from '@/utils/validate'
+import { mapState, mapActions } from 'vuex'
 
 export default {
   name: 'Login',
@@ -74,9 +94,15 @@ export default {
       }
     }
     return {
+      isCommunityDiv: false, // 是否显示带有 社区选项的div
+      isWidSelectDiv: true,
+      isSelectDiv: false,
+      isSelectCommunity: false, // 是否显示 社区选项
+      isLoginButton: false, // 默认按钮为不可点击
       loginForm: {
         username: '',
-        password: ''
+        password: '',
+        communityId: ''
       },
       loginRules: {
         username: [{ required: true, trigger: 'blur', validator: validateUsername }],
@@ -88,6 +114,11 @@ export default {
       codeNum: 60 // 验证码倒计时 60 秒
     }
   },
+  computed: {
+    ...mapState('community', {
+      communityList: s => s.list
+    })
+  },
   watch: {
     $route: {
       handler: function(route) {
@@ -97,6 +128,9 @@ export default {
     }
   },
   methods: {
+    ...mapActions('community', [
+      'UserCommunity'
+    ]),
     handleLogin() {
       this.$refs.loginForm.validate(valid => {
         if (valid) {
@@ -141,6 +175,62 @@ export default {
       }).catch(() => {
         console.log('error sendcode')
       })
+    },
+    getUserCommunity() { // 根据用户的手机号和验证码 获取用户的管理的小区
+      const loading = this.$loading({
+        lock: true,
+        text: '请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.UserCommunity(this.loginForm).then(() => {
+        loading.close()
+        this.checkPhoneAndCode()
+      }).catch(() => {
+        // 提示 当前手机号未绑定任何社区
+        // 显示 div
+        this.isCommunityDiv = true
+        this.isSelectCommunity = true
+        this.isWidSelectDiv = false
+        this.isSelectDiv = true
+        this.isLoginButton = false
+        loading.close()
+        console.log('get UserCommunity list error')
+      })
+    },
+    checkPhoneAndCode() { // 失去焦点的时候获取 获取用户的管理的小区
+      console.log('失去焦点')
+      const communitys = this.communityList
+      console.log('接收到的数据:', communitys)
+      console.log('大小:', communitys.length)
+      if (communitys.length === 0) {
+        // 提示 当前手机号未绑定任何社区
+        // 显示 div
+        this.isCommunityDiv = true
+        this.isSelectCommunity = true
+        this.isWidSelectDiv = false
+        this.isSelectDiv = true
+        this.isLoginButton = false
+      } else if (communitys.length === 1) {
+        // 只有一个小区的时候, 默认选中
+        // 显示 div
+        this.isCommunityDiv = true
+        this.isWidSelectDiv = true
+        this.isSelectCommunity = false
+        this.isWidSelectDiv = true
+        this.isSelectDiv = false
+        this.isLoginButton = true
+        this.loginForm.communityId = communitys[0].id
+      } else {
+        // 让用户选择
+        // 显示 div
+        this.isCommunityDiv = true
+        this.isWidSelectDiv = true
+        this.isSelectCommunity = false
+        this.isWidSelectDiv = true
+        this.isSelectDiv = false
+        this.isLoginButton = true
+      }
     }
   }
 }
@@ -195,6 +285,17 @@ $light_gray: #eee;
     border-radius: 5px;
     color: #454545;
   }
+  .select-community {
+    float: left;
+    color: #F56C6C;
+  }
+  .selectDiv {
+    margin-top: 80px;
+  }
+  .widSelectDiv {
+    margin-top: 80px;
+    width: 159px;
+  }
 }
 </style>
 

VUECODE/smart-property-manage/src/views/owner/index.vue

@@ -1,11 +1,95 @@
 
 <template>
-  <div>已认证业主</div>
+  <div class="root">
+    <el-form :inline="true" :model="listQuery" class="form-listQuery">
+        <el-form-item label="手机号">
+          <el-input placeholder="手机号" />
+        </el-form-item>
+        <el-form-item label="姓名">
+          <el-input placeholder="姓名" />
+        </el-form-item>
+      <el-form-item>
+        <el-button type="info">清空</el-button>
+        <el-button type="primary">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      ref="multipleTable"
+      :data="tableData3"
+      border
+      tooltip-effect="dark"
+      style="width: 100%; margin-top: 20px;"
+      @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55"/>
+      <el-table-column label="日期" width="120">
+        <template slot-scope="scope">{{ scope.row.date }}</template>
+      </el-table-column>
+      <el-table-column prop="name" label="姓名" width="120" />
+      <el-table-column prop="address" label="地址" show-overflow-tooltip />
+    </el-table>
+    <div class="block">
+      <el-pagination
+        :current-page="currentPage4"
+        :page-sizes="[100, 200, 300, 400]"
+        :page-size="100"
+        :total="400"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
 </template>
 
 <script>
 export default {
-
+  data() {
+    return {
+      listQuery: {},
+      tableData3: [{
+        date: '2016-05-03',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-02',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }],
+      currentPage4: 4
+    }
+  },
+  methods: {
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+    },
+    dialogBatchImport() {
+      this.$router.push({ name: 'batch-import' })
+    }
+  }
 }
 </script>
 
+<style scoped>
+.root{
+  display: flex;
+  flex-flow: column;
+}
+.form-listQuery{
+  margin-top: 20px;
+  margin-left: 30px;
+}
+.operation{
+  display: flex;
+  justify-content: space-between;
+  margin-left: 20px;
+  margin-right: 20px;
+}
+.block{
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10px;
+}
+</style>
+