合并

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

@@ -4,8 +4,10 @@ package com.community.huiju.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -60,4 +62,31 @@ public class UserController extends BaseController {
 		ResponseBean allApprove=userService.selectUserApprove(paramets);
 		return allApprove;
 	}
+
+
+	@ApiOperation(value = "登陆", notes = "登陆")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "phone手机号;code验证码;communityId小区Id")
+	})
+	@RequestMapping(value = "/user/login")
+	public ResponseBean login(@RequestBody String parameter){
+		ResponseBean responseBean = new ResponseBean();
+		JSONObject jsonObject = JSONObject.parseObject(parameter);
+		responseBean = userService.login(jsonObject.getString("phone"),
+				jsonObject.getInteger("communityId"),
+				jsonObject.getInteger("code"));
+		return responseBean;
+	}
+
+	@ApiOperation(value = "获取用户信息", notes = "获取用户信息")
+	@ApiImplicitParams({
+		@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/user/info", method = RequestMethod.GET)
+	public ResponseBean info(HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = userService.userInfo(userElement.getId());
+		return responseBean;
+	}
 }

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

@@ -40,17 +40,6 @@ public interface IBuildingOwnerInfoService extends IService<BuildingOwnerInfo> {
      * @return
      */
     ResponseBean add(String parameter, Integer userId);
-
-    /**
-     * 查询 楼栋/单元/楼层/号
-     *
-     *  楼栋是根据 小区ID查询
-     *
-     * @param parameter
-     * @return
-     */
-
-    ResponseBean deleteByIdDatch(List<Integer> ids);
     
     /**
      * 根据excel获取相关信息
@@ -59,6 +48,15 @@ public interface IBuildingOwnerInfoService extends IService<BuildingOwnerInfo> {
      */
     ResponseBean getExcelData(MultipartFile file);
 
+    /**
+     * 查询 楼栋/单元/楼层/号
+     *
+     *   楼栋是根据 小区ID查询
+     *
+     * @param parameter
+     * @param communityId
+     * @return
+     */
     ResponseBean getBuildingOrUnitOrNumber(String parameter, Integer communityId);
 
 }

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

@@ -29,4 +29,11 @@ public interface IUserService extends IService<User> {
      */
     ResponseBean login(String phone, Integer communityId, Integer code);
 
+    /**
+     * 查询用户信息
+     * @param userId
+     * @return
+     */
+    ResponseBean userInfo(Integer userId);
+
 }

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

@@ -120,13 +120,44 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             return responseBean;
         }
 
+        // 查询该用户的权限
+        // 获取用户权限
+        getUserRole(user);
+
+        responseBean.addSuccess(user);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean userInfo(Integer userId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 查询用户
+        User user = userMapper.selectById(userId);
+        if (null == user) {
+            responseBean.addError("该用户不存在!");
+            return responseBean;
+        }
+
+        // 获取用户权限
+        getUserRole(user);
+
+        responseBean.addSuccess(user);
+
+        return responseBean;
+    }
+
+    /**
+     * 获取 该用户的权限
+     * @param user
+     */
+    private void getUserRole(User user){
         // 查询该用户的权限
         Map<String, Object> map = Maps.newHashMap();
         map.put("userId", user.getId());
         List<SysRole> sysRoleList = sysRoleMapper.selectByUserIdAndRoleId(map);
 
         user.setRoles(sysRoleList);
-        responseBean.addSuccess(user);
-        return responseBean;
     }
+
 }

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

@@ -4,19 +4,16 @@
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item label="楼盘库">
         <el-select placeholder="栋">
-          <el-option label="区域一" value="shanghai" />
+          <el-option label="选择楼栋" value="-1" />
         </el-select>
         <el-select placeholder="单元">
-          <el-option label="区域一" value="shanghai" />
-          <el-option label="区域二" value="beijing" />
+          <el-option label="选择单元" value="-1" />
         </el-select>
         <el-select placeholder="楼层">
-          <el-option label="区域一" value="shanghai" />
-          <el-option label="区域二" value="beijing" />
+          <el-option label="选择楼层" value="-1" />
         </el-select>
         <el-select placeholder="户号">
-          <el-option label="区域一" value="shanghai" />
-          <el-option label="区域二" value="beijing" />
+          <el-option label="选择户号" value="-1" />
         </el-select>
         <el-form-item label="业主名称">
           <el-input placeholder="业主名称" />