修复 错误, 登陆

CODE/smart-community/property-api/src/main/java/com/community/huiju/common/code/cache/AppkeyCache.java

@@ -15,10 +15,13 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 public class AppkeyCache {
 
-    // .refreshAfterWrite(3, TimeUnit.HOURS)// 给定时间内没有被读/写访问，则回收。
+    // 给定时间内没有被读/写访问，则回收。
+    // .refreshAfterWrite(3, TimeUnit.HOURS)
     static LoadingCache<String, Object> cache = CacheBuilder.newBuilder()
-            .expireAfterAccess(Constant.CACHE_EXPIRE, TimeUnit.HOURS)// 缓存过期时间和redis缓存时长一样
-            .maximumSize(Constant.CACHE_SIZE).// 设置缓存个数
+            // 缓存过期时间和redis缓存时长一样
+            .expireAfterAccess(Constant.CACHE_EXPIRE, TimeUnit.HOURS)
+            // 设置缓存个数
+            .maximumSize(Constant.CACHE_SIZE).
             build(new CacheLoader<String, Object>() {
             @Override
             /** 当本地缓存命没有中时，调用load方法获取结果并将结果缓存 **/

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

@@ -113,9 +113,10 @@ public class BuildingOwnerInfoController extends BaseController {
                     "unit单元;level楼层;roomNo户号")
     })
     @RequestMapping(value = "/building/info",method = RequestMethod.POST)
-    public ResponseBean buildingUnitNumber(@RequestBody String parameter){
+    public ResponseBean buildingUnitNumber(@RequestBody String parameter, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
-
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.getBuildingOrUnitOrNumber(parameter, userElement.getCommunityId());
         return responseBean;
     }
 

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

@@ -0,0 +1,62 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.utils.AccountValidatorUtil;
+import com.community.huiju.common.code.ICode;
+import com.community.huiju.common.code.cache.AppkeyCache;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * @author weiximei
+ */
+@RestController
+@RequestMapping("/")
+@RefreshScope
+@Api(value = "获取验证码的API", description = "获取验证码的API")
+@Slf4j
+public class CodeController {
+
+    @Autowired
+    @Qualifier("phoneCodeImpl")
+    private ICode iCode;
+
+    @ApiOperation(value = "获取手机验证码", notes = "根据手机号发送验证码")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "query",dataType = "String",name = "phone",value = "手机号")})
+    @RequestMapping(value = "/code/sendCode",method = RequestMethod.POST)
+    public ResponseBean sendCode(@RequestParam String phone, HttpSession session) {
+        ResponseBean response = new ResponseBean();
+
+        log.info("{} 手机号校验结果: {}",phone, AccountValidatorUtil.isPhone(phone));
+        if (!AccountValidatorUtil.isPhone(phone)){
+            response.addError("请输入正取的手机号!");
+            return response;
+        }
+
+        int code = (int) ((Math.random()*9+1)*1000);
+        boolean result = iCode.sendCode(phone,String.valueOf(code));
+        // boolean result = true;
+        if (result) {
+            log.info("{} 验证码: {}",phone,code);
+            // 设置缓存
+            AppkeyCache.setCache(phone,String.valueOf(code));
+            response.addSuccess("发送成功!"+code);
+        } else {
+            response.addError("发送失败!");
+        }
+        return response;
+    }
+
+}

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

@@ -2,6 +2,7 @@ package com.community.huiju.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.community.huiju.model.BuildingOwnerInfo;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.community.huiju.model.BuildingOwnerInfo;
  * @author weiximei
  * @since 2018-12-18
  */
+@Mapper
 public interface BuildingOwnerInfoMapper extends BaseMapper<BuildingOwnerInfo> {
 
 }

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

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

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

@@ -0,0 +1,23 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TaSysRole;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TaSysRoleMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaSysRole record);
+
+    int insertSelective(TaSysRole record);
+
+    TaSysRole selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaSysRole record);
+
+    int updateByPrimaryKey(TaSysRole record);
+
+    TaSysRole findRoleByUserId(Integer userId);
+
+}

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

@@ -0,0 +1,18 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.UserCommunity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 物业端用户和小区关联表 Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-19
+ */
+@Mapper
+public interface UserCommunityMapper extends BaseMapper<UserCommunity> {
+
+}

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

@@ -2,6 +2,7 @@ package com.community.huiju.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.community.huiju.model.User;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 import java.util.Map;
@@ -14,6 +15,7 @@ import java.util.Map;
  * @author jobob
  * @since 2018-12-18
  */
+@Mapper
 public interface UserMapper extends BaseMapper<User> {
 
     List<Map<Object,Object>> selectUserApprove(Map<Object,Object> map);

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

@@ -0,0 +1,63 @@
+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>
+ * 物业web端角色表
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_sys_role")
+public class SysRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
+
+}

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

@@ -7,6 +7,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -24,6 +25,8 @@ public class User implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    private Integer id;
+
     /**
      * 小区id
      */
@@ -84,4 +87,10 @@ public class User implements Serializable {
      */
     private LocalDateTime updateDate;
 
+    /** 用户token **/
+    private String token;
+
+    /** 角色 **/
+    private List<SysRole> roles;
+
 }

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

@@ -0,0 +1,40 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.models.auth.In;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 物业端用户和小区关联表
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_user_community")
+public class UserCommunity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 物业端用户id
+     */
+    private Integer tpUserId;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.SysRole;
+
+/**
+ * <p>
+ * 物业web端角色表 服务类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-19
+ */
+public interface ISysRoleService extends IService<SysRole> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.UserCommunity;
+
+/**
+ * <p>
+ * 物业端用户和小区关联表 服务类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-19
+ */
+public interface IUserCommunityService extends IService<UserCommunity> {
+
+
+
+}

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

@@ -2,6 +2,7 @@ package com.community.huiju.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.commom.mode.ResponseBean;
 import com.community.huiju.model.User;
 
 import java.util.List;
@@ -18,4 +19,13 @@ import java.util.Map;
 public interface IUserService extends IService<User> {
     List<Object> selectUserApprove(Map map);
 
+    /**
+     * 登陆
+     * @param phone
+     * @param communityId
+     * @param code
+     * @return
+     */
+    ResponseBean login(String phone, Integer communityId, Integer code);
+
 }

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

@@ -0,0 +1,20 @@
+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.service.ISysRoleService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 物业web端角色表 服务实现类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-19
+ */
+@Service
+public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
+
+}

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

@@ -0,0 +1,20 @@
+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.service.IUserCommunityService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 物业端用户和小区关联表 服务实现类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-19
+ */
+@Service
+public class UserCommunityServiceImpl extends ServiceImpl<UserCommunityMapper, UserCommunity> implements IUserCommunityService {
+
+}

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

@@ -1,10 +1,20 @@
 package com.community.huiju.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.commom.mode.ResponseBean;
+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.dao.UserMapper;
+import com.community.huiju.model.SysRole;
 import com.community.huiju.model.User;
+import com.community.huiju.model.UserCommunity;
 import com.community.huiju.service.IUserService;
+import com.google.common.collect.Maps;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,11 +31,66 @@ import java.util.Map;
  */
 @Service("userService")
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IUserService {
-@Autowired
-private UserMapper userMapper;
+
+    @Autowired
+    private UserMapper userMapper;
+
+    @Autowired
+    private UserCommunityMapper userCommunityMapper;
+
+    @Autowired
+    private SysRoleMapper sysRoleMapper;
+
     @Override
     public List<Object> selectUserApprove(Map map) {
-        List UserApprove=userMapper.selectUserApprove(map);
+        List UserApprove = userMapper.selectUserApprove(map);
         return UserApprove;
     }
+
+    @Override
+    public ResponseBean login(String phone, Integer communityId, Integer 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;
+        }
+
+        /*******************  业务  ********************/
+
+        // 查询用户
+        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("login_name", phone);
+        User user = userMapper.selectOne(queryWrapper);
+        if (null == user) {
+            responseBean.addError("当前手机号不存在, 请联系运营人员!");
+            return responseBean;
+        }
+
+        // 查询这个用户是否有这个小区的管理
+        QueryWrapper<UserCommunity> userCommunityQueryWrapper = new QueryWrapper<>();
+        userCommunityQueryWrapper.eq("tp_user_id", user.getId());
+        userCommunityQueryWrapper.eq("community_id", communityId);
+        UserCommunity userCommunity = userCommunityMapper.selectOne(userCommunityQueryWrapper);
+        if (null == userCommunity) {
+            responseBean.addError("当前手机号未绑定该社区");
+            return responseBean;
+        }
+
+        // 查询该用户的权限
+        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;
+    }
 }

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

@@ -7,3 +7,4 @@ management:
 mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+  mapper-locations: classpath:mapper/*.xml

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

@@ -0,0 +1,13 @@
+<?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">
+
+    <select id="selectByUserIdAndRoleId" parameterType="map" resultType="com.community.huiju.model.SysRole">
+      SELECT tsr.* from
+      tp_sys_user_role tsur
+      LEFT JOIN tp_sys_role tsr
+      on tsur.role_id = tsr.id
+      WHERE tsur.user_id = #{userId}
+    </select>
+
+</mapper>

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

@@ -1,7 +1,11 @@
 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.google.common.collect.Maps;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +13,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.List;
+import java.util.Map;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
@@ -16,6 +21,8 @@ public class DemoApplicationTests {
 
 	@Autowired
 	private BuildingOwnerInfoMapper buildingOwnerInfoMapper;
+	@Autowired
+	private SysRoleMapper sysRoleMapper;
 
 	@Test
 	public void contextLoads() {
@@ -24,4 +31,13 @@ public class DemoApplicationTests {
 		System.out.println(list.size());
 	}
 
+	@Test
+	public void getSysRoleMapper(){
+		// 查询该用户的权限
+		Map<String, Object> map = Maps.newHashMap();
+		map.put("userId", 29);
+		List<SysRole> sysRoleList = sysRoleMapper.selectByUserIdAndRoleId(map);
+		System.out.println(JSONObject.toJSONString(sysRoleList));
+	}
+
 }