页面用户信息使用修改

周伟鹏
1 parent 35ae702f
Showing 6 changed files with 57 additions and 47 deletions
src/main/java/com/cnlive/shenhe/bean/SessionUser.java
src/main/java/com/cnlive/shenhe/controller/SitesController.java
src/main/java/com/cnlive/shenhe/controller/UsersController.java
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/resources/templates/page/site.html
src/main/resources/templates/page/video.html
@@ -10,8 +10,11 @@ public class SessionUser {
     public static final String SESSION_KEY = "sessionUser";
     private String userId;
-
+    private String userName;
     private Integer spid;
+    private String company;
+    private String email;
+    private String logo;
     public String getUserId() {
         return userId;
@@ -32,4 +35,36 @@ public class SessionUser {
     public void setSpid(Integer spid) {
         this.spid = spid;
     }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getLogo() {
+        return logo;
+    }
+
+    public void setLogo(String logo) {
+        this.logo = logo;
+    }
 }
 package com.cnlive.shenhe.controller;
-import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.SessionUser;
 import com.cnlive.shenhe.entity.ShySites;
-import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
-import com.cnlive.shenhe.serviceImpl.UsersServiceImpl;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageInfo;
 import org.slf4j.Logger;
@@ -15,7 +12,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import javax.servlet.http.HttpSession;
@@ -33,10 +29,9 @@ public class SitesController {
     @Autowired
     SitesServiceImpl sitesService;
-    @Autowired
-    UsersServiceImpl usersService;
     /**
      * 站点白名单分页列表
+     *
      * @param page
      * @param pageSize
      * @param orderByClause
@@ -44,26 +39,15 @@ public class SitesController {
      * @return
      */
     @GetMapping(value = "/page")
-    public String getTest(Model model, Integer page, Integer pageSize, String orderByClause, String key, HttpSession session){
+    public String getTest(Model model, Integer page, Integer pageSize, String orderByClause, String key, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
-        ShyUsers shyUsers = new ShyUsers();
-        shyUsers.setUser_id(sessionUser.getUserId());
-        shyUsers = usersService.select(shyUsers);
-        JSONObject user = new JSONObject();
-        user.put("name", shyUsers.getUsername());
-        user.put("company", shyUsers.getCompany_brief());
-        user.put("spid", shyUsers.getSp_id());
-        user.put("email", shyUsers.getEmail());
-        user.put("logo", shyUsers.getUser_logo());
-        model.addAttribute("user", user);
-
         Integer spid = sessionUser.getSpid();
-        if(spid==0)spid=82;
-        if(CommonUtils.isNull(page))page=1;
-        if(CommonUtils.isNull(pageSize))pageSize=10;
+        if (spid == 0) spid = 82;
+        if (CommonUtils.isNull(page)) page = 1;
+        if (CommonUtils.isNull(pageSize)) pageSize = 10;
         PageInfo<ShySites> sitePage = sitesService.getPage(page, pageSize, orderByClause, key, spid);
         model.addAttribute("sitePage", sitePage);
-        return  "page/site.html";
+        return "page/site.html";
     }
 }
@@ -54,6 +54,10 @@ public class UsersController {
                 SessionUser sessionUser = new SessionUser();
                 sessionUser.setUserId(user.getUser_id());
                 sessionUser.setSpid(Integer.parseInt(principal.getAttributes().get("new_sp_id").toString()));
+                sessionUser.setUserName(user.getUsername());
+                sessionUser.setCompany(user.getCompany_brief());
+                sessionUser.setEmail(user.getEmail());
+                sessionUser.setLogo(user.getUser_logo());
                 request.getSession().setAttribute(SessionUser.SESSION_KEY,sessionUser);
                 return "page/head.html";
             }
@@ -14,10 +14,8 @@ import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpSession;
@@ -87,19 +85,8 @@ public class VideosController {
      * @return
      */
     @RequestMapping("/page")
-    public Object getListVideos(Model model,String video_title, String start_date, String end_date, Integer state, Integer page, Integer pageSize, String orderByClause, HttpSession session) {
+    public Object getListVideos(Model model, String video_title, String start_date, String end_date, Integer state, Integer page, Integer pageSize, String orderByClause, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
-        ShyUsers shyUsers = new ShyUsers();
-        shyUsers.setUser_id(sessionUser.getUserId());
-        shyUsers = usersService.select(shyUsers);
-        JSONObject user = new JSONObject();
-        user.put("name", shyUsers.getUsername());
-        user.put("company", shyUsers.getCompany_brief());
-        user.put("spid", shyUsers.getSp_id());
-        user.put("email", shyUsers.getEmail());
-        user.put("logo", shyUsers.getUser_logo());
-        model.addAttribute("user", user);
-
         Integer spid = sessionUser.getSpid();
         if (CommonUtils.isNull(page)) page = 1;
         if (CommonUtils.isNull(pageSize)) pageSize = 10;
@@ -105,22 +105,22 @@
                 <ul class="nav navbar-nav">
                     <li class="dropdown messages-menu" style="margin: 0 auto">
             <span class="label label-primary" style="height: 2em;
-line-height: 2em; margin: 0 auto;font-size: 2em" th:text="${user.company}+'('+${user.spid}+')'">
+line-height: 2em; margin: 0 auto;font-size: 2em" th:text="${session.sessionUser.company}+'('+${session.sessionUser.spid}+')'">
             </span>
                     </li>
                     <!-- User Account: style can be found in dropdown.less -->
                     <li class="dropdown user user-menu">
                         <a href="http://shenhe.cnlive.com/videos#" class="dropdown-toggle" data-toggle="dropdown">
-                            <img th:src="@{${user.logo}}" class="user-image" alt="User Image">
-                            <span class="hidden-xs" th:text="${user.name}">
+                            <img th:src="@{${session.sessionUser.logo}}" class="user-image" alt="User Image">
+                            <span class="hidden-xs" th:text="${session.sessionUser.userName}">
                         </span>
                         </a>
                         <ul class="dropdown-menu">
                             <!-- User image -->
                             <li class="user-header">
-                                <img th:src="@{${user.logo}}" class="img-circle" alt="User Image">
-                                <p th:text="${user.email}">
+                                <img th:src="@{${session.sessionUser.logo}}" class="img-circle" alt="User Image">
+                                <p th:text="${session.sessionUser.email}">
                                 </p>
                             </li>
@@ -95,22 +95,22 @@
                 <ul class="nav navbar-nav">
                     <li class="dropdown messages-menu" style="margin: 0 auto">
             <span class="label label-primary" style="height: 2em;
-line-height: 2em; margin: 0 auto;font-size: 2em" th:text="${user.company}+'('+${user.spid}+')'">
+line-height: 2em; margin: 0 auto;font-size: 2em" th:text="${session.sessionUser.company}+'('+${session.sessionUser.spid}+')'">
             </span>
                     </li>
                     <!-- User Account: style can be found in dropdown.less -->
                     <li class="dropdown user user-menu">
                         <a href="http://shenhe.cnlive.com/videos#" class="dropdown-toggle" data-toggle="dropdown">
-                            <img th:src="@{${user.logo}}" class="user-image" alt="User Image">
-                            <span class="hidden-xs" th:text="${user.name}">
+                            <img th:src="@{${session.sessionUser.logo}}" class="user-image" alt="User Image">
+                            <span class="hidden-xs" th:text="${session.sessionUser.userName}">
                         </span>
                         </a>
                         <ul class="dropdown-menu">
                             <!-- User image -->
                             <li class="user-header">
-                                <img th:src="@{${user.logo}}" class="img-circle" alt="User Image">
-                                <p th:text="${user.email}">
+                                <img th:src="@{${session.sessionUser.logo}}" class="img-circle" alt="User Image">
+                                <p th:text="${session.sessionUser.email}">
                                 </p>
                             </li>