合并

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

@@ -1,9 +1,16 @@
 package com.community.huiju.controller;
 
+import com.community.commom.constant.Constant;
+import com.community.commom.session.UserElement;
+import com.community.huiju.exception.WisdomException;
 import com.community.huiju.model.ToCommunities;
 import com.community.huiju.service.CommunityServiceI;
+import com.community.huiju.vo.TaUserVO;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import javax.servlet.http.HttpSession;
+
 /**
  * 公共 controller
  */
@@ -24,4 +31,34 @@ public class BaseController {
         return false;
     }
 
+    /**
+     * 设置用户 session
+     * @param userVO
+     * @param session
+     */
+    protected void setUserSession(TaUserVO userVO, HttpSession session) {
+        if (null == userVO) {
+            throw new WisdomException("用户信息不能为空!");
+        }
+
+        UserElement userElement = new UserElement();
+        BeanUtils.copyProperties(userVO,userElement);
+        userElement.setLoginType(Constant.APP_LOGIN_TYPE);
+        session.setAttribute(Constant.APP_USER_SESSION,userElement);
+        userVO.setToken(session.getId());
+    }
+
+    /**
+     * 获取用户 session
+     * @param session
+     * @return
+     */
+    protected UserElement getUserElement(HttpSession session) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        if (null == userElement) {
+            throw new WisdomException("用户 session 不存在！");
+        }
+        return userElement;
+    }
+
 }

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

@@ -51,14 +51,7 @@ public class UserController extends BaseController {
         JSONObject jsonObject = JSONObject.parseObject(parameter);
         ResponseBean responseBean = iTaUserService.login(jsonObject.getString("loginName"),jsonObject.getString("code"));
         TaUserVO userVO = (TaUserVO) responseBean.getData();
-
-        if (null != userVO) {
-            UserElement userElement = new UserElement();
-            BeanUtils.copyProperties(userVO,userElement);
-            userElement.setLoginType(Constant.APP_LOGIN_TYPE);
-            session.setAttribute(Constant.APP_USER_SESSION,userElement);
-            userVO.setToken(session.getId());
-        }
+        setUserSession(userVO, session);
         return responseBean;
 
     }

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

@@ -33,7 +33,7 @@ public interface TaUserMapper {
      * @param map
      * @return 用户
      */
-    TaUser selectByLoginName(Map<String, Object> map);
+    TaUser selectByLoginName(@Param("map") Map<String, Object> map);
 
     /**
      * 更新当前用户电话