fix(登录态切换sso获取)

src/main/java/com/mokamrp/privates/config/XxlSsoConfig.java

@@ -29,25 +29,25 @@ public class XxlSsoConfig implements DisposableBean {
     private String xxlSsoRedisAddress;
 
 
-//    @Bean
-//    public FilterRegistrationBean xxlSsoFilterRegistration() {
-//
-//        // xxl-sso, redis init
-//        JedisUtil.init(xxlSsoRedisAddress);
-//
-//        // xxl-sso, filter init
-//        FilterRegistrationBean registration = new FilterRegistrationBean();
-//
-//        registration.setName("XxlSsoWebFilter");
-//        registration.setOrder(1);
-//        registration.addUrlPatterns("/*");
-//        registration.setFilter(new XxlSsoWebFilter());
-//        registration.addInitParameter(Conf.SSO_SERVER, xxlSsoServer);
-//        registration.addInitParameter(Conf.SSO_LOGOUT_PATH, xxlSsoLogoutPath);
-//        registration.addInitParameter(Conf.SSO_EXCLUDED_PATHS, xxlSsoExcludedPaths);
-//
-//        return registration;
-//    }
+    @Bean
+    public FilterRegistrationBean xxlSsoFilterRegistration() {
+
+        // xxl-sso, redis init
+        JedisUtil.init(xxlSsoRedisAddress);
+
+        // xxl-sso, filter init
+        FilterRegistrationBean registration = new FilterRegistrationBean();
+
+        registration.setName("XxlSsoWebFilter");
+        registration.setOrder(1);
+        registration.addUrlPatterns("/*");
+        registration.setFilter(new XxlSsoWebFilter());
+        registration.addInitParameter(Conf.SSO_SERVER, xxlSsoServer);
+        registration.addInitParameter(Conf.SSO_LOGOUT_PATH, xxlSsoLogoutPath);
+        registration.addInitParameter(Conf.SSO_EXCLUDED_PATHS, xxlSsoExcludedPaths);
+
+        return registration;
+    }
 
     @Override
     public void destroy() throws Exception {

src/main/java/com/mokamrp/privates/controller/LoginController.java

@@ -39,5 +39,10 @@ public class LoginController {
         }
         return AjaxResult.success("登录成功", res);
     }
+
+    @RequestMapping("/index")
+    public String index() {
+        return "index";
+    }
 }
 

src/main/java/com/mokamrp/privates/controller/WorkContactEmployeeController.java

@@ -21,6 +21,8 @@ import com.mokamrp.privates.service.UserCorpService;
 import com.mokamrp.privates.service.WorkContactEmployeeService;
 import com.mokamrp.privates.utils.OssFile;
 import com.mokamrp.privates.utils.RedisUtil;
+import com.xxl.sso.core.conf.Conf;
+import com.xxl.sso.core.user.XxlSsoUser;
 import io.netty.handler.codec.json.JsonObjectDecoder;
 import lombok.extern.flogger.Flogger;
 import org.apache.ibatis.annotations.Param;
@@ -67,13 +69,16 @@ public class WorkContactEmployeeController extends BaseController<WorkContactEmp
     @ResponseBody
     public Object getList(
             @AuthUser User authUser,
-            @Valid @RequestBody GetWorkContactEmployeeHandle handle, BindingResult bindingResult) {
+            @Valid @RequestBody GetWorkContactEmployeeHandle handle, BindingResult bindingResult,
+            HttpServletRequest request) {
+
+        XxlSsoUser user = (XxlSsoUser) request.getAttribute(Conf.SSO_USER);
 
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(authUser.getId());
+        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(user.getUserid());
 
         if(corpIds.size() <=0){
             return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
@@ -90,12 +95,15 @@ public class WorkContactEmployeeController extends BaseController<WorkContactEmp
     @ResponseBody
     public Object export(
             @AuthUser User authUser,
-            @Valid @RequestBody GetWorkContactEmployeeHandle handle, BindingResult bindingResult){
+            @Valid @RequestBody GetWorkContactEmployeeHandle handle, BindingResult bindingResult,
+            HttpServletRequest request) {
+        XxlSsoUser user = (XxlSsoUser) request.getAttribute(Conf.SSO_USER);
+
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(authUser.getId());
+        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(user.getUserid());
         if(corpIds.size() <=0){
             return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
         }

src/main/java/com/mokamrp/privates/controller/WorkEmployeeController.java

@@ -8,6 +8,8 @@ import com.mokamrp.privates.mapper.pojo.Corp;
 import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.mapper.pojo.UserCorp;
 import com.mokamrp.privates.service.UserCorpService;
+import com.xxl.sso.core.conf.Conf;
+import com.xxl.sso.core.user.XxlSsoUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -18,6 +20,7 @@ import com.mokamrp.privates.mapper.pojo.WorkEmployee;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.swing.border.EtchedBorder;
 import javax.validation.Valid;
 import java.util.ArrayList;
@@ -48,11 +51,17 @@ public class WorkEmployeeController extends BaseController<WorkEmployee> {
      */
 
     @PostMapping("/getWorkEmployeeList")
-    public Object getWorkEmployeeList(@Valid @RequestBody WorkEmployeeHandle workEmployee, @AuthUser User authUser, BindingResult bindingResult) {
+    public Object getWorkEmployeeList(@Valid @RequestBody WorkEmployeeHandle workEmployee, @AuthUser User authUser,
+                                      BindingResult bindingResult,HttpServletRequest request) {
+
+        XxlSsoUser user = (XxlSsoUser) request.getAttribute(Conf.SSO_USER);
+
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.LOGIN_ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
-        Object res = workEmployeeService.selectWorkEmployeeList(authUser.getId(), workEmployee);
+
+        List<Integer> userCorpIds = userCorpService.getAuthUserCorpIds(user.getUserid());
+        Object res = workEmployeeService.selectWorkEmployeeList(user.getUserid(), workEmployee);
         return AjaxResult.success(res);
     }
 

src/main/java/com/mokamrp/privates/controller/WorkRoomController.java

@@ -12,17 +12,21 @@ import com.mokamrp.privates.interceptor.AuthUser;
 import com.mokamrp.privates.mapper.pojo.Downfile;
 import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.mapper.pojo.WorkRoom;
+import com.mokamrp.privates.mapper.vo.WorkRoomVo;
 import com.mokamrp.privates.service.DownfileService;
 import com.mokamrp.privates.service.UserCorpService;
 import com.mokamrp.privates.service.WorkContactEmployeeService;
 import com.mokamrp.privates.service.WorkRoomService;
 import com.mokamrp.privates.utils.RedisUtil;
+import com.xxl.sso.core.conf.Conf;
+import com.xxl.sso.core.user.XxlSsoUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
@@ -57,17 +61,21 @@ public class WorkRoomController extends BaseController<WorkRoom> {
     @ResponseBody
     public Object getList(
             @AuthUser User authUser,
-            @Valid @RequestBody GetWorkRoomHandle handle, BindingResult bindingResult) {
+            @Valid @RequestBody GetWorkRoomHandle handle, BindingResult bindingResult,
+            HttpServletRequest request) {
+
+        XxlSsoUser user = (XxlSsoUser) request.getAttribute(Conf.SSO_USER);
+
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(authUser.getId());
+        List<Integer> corpIds  = userCorpService.getAuthUserCorpIds(user.getUserid());
         if (corpIds.size() <= 0) {
             return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
         }
-        handle.setAuthCorpIds(corpIds);
 
+        handle.setAuthCorpIds(corpIds);
         Map<String, Object> resMap = workRoomService.getPageList(handle);//所有
 
         return AjaxResult.success(resMap);
@@ -77,12 +85,15 @@ public class WorkRoomController extends BaseController<WorkRoom> {
     @ResponseBody
     public Object export(
             @AuthUser User authUser,
-            @Valid @RequestBody GetWorkRoomHandle handle, BindingResult bindingResult) {
+            @Valid @RequestBody GetWorkRoomHandle handle, BindingResult bindingResult,
+            HttpServletRequest request) {
+
+        XxlSsoUser user = (XxlSsoUser) request.getAttribute(Conf.SSO_USER);
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(authUser.getId());
+        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(user.getUserid());
         if (corpIds.size() <= 0) {
             return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
         }

src/main/java/com/mokamrp/privates/mapper/WorkContactEmployeeMapper.xml

@@ -2,9 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.mokamrp.privates.mapper.WorkContactEmployeeMapper">
 
-    <!-- 开启二级缓存 -->
-    <cache type="org.mybatis.caches.ehcache.LoggingEhcache"/>
-
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.WorkContactEmployee">
         <id column="id" property="id"/>
@@ -61,7 +58,7 @@
                  LEFT JOIN mc_work_contact AS c ON a.contact_id = c.id
                  LEFT JOIN mc_corp AS p ON p.id = a.corp_id
                  LEFT JOIN mc_channel_code AS l ON l.id = a.channel_code_id
-        where 1 = 1 ${ew.sqlSegment}
+        where 1 = 1 AND ${ew.sqlSegment}
     </select>
 
     <select id="getAllVoList" resultType="com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo">
@@ -83,7 +80,7 @@
                  LEFT JOIN mc_work_contact AS c ON a.contact_id = c.id
                  LEFT JOIN mc_corp AS p ON p.id = a.corp_id
                  LEFT JOIN mc_channel_code AS l ON l.id = a.channel_code_id
-        where 1 = 1 ${ew.sqlSegment}
+        where 1 = 1 AND ${ew.sqlSegment}
     </select>
 
 </mapper>

src/main/java/com/mokamrp/privates/mapper/WorkRoomMapper.java

@@ -2,6 +2,7 @@ package com.mokamrp.privates.mapper;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.mokamrp.privates.mapper.pojo.WorkContactEmployee;
 import com.mokamrp.privates.mapper.pojo.WorkRoom;
@@ -21,7 +22,7 @@ import java.util.List;
  * @since 2021-04-21
  */
 public interface WorkRoomMapper extends BaseMapper<WorkRoom> {
-    List<WorkRoomVo> getVoList(Page<WorkRoom> page, @Param("ew") QueryWrapper<WorkRoom> queryWrapper);
+    List<WorkRoomVo> getVoList(IPage<WorkRoomVo> page, @Param("ew") QueryWrapper<WorkRoomVo> queryWrapper);
 
-    Integer getVoListTotal(@Param("ew") QueryWrapper<WorkRoom> queryWrapper);
+    Integer getVoListTotal(@Param("ew") QueryWrapper<WorkRoomVo> queryWrapper);
 }

src/main/java/com/mokamrp/privates/mapper/WorkRoomMapper.xml

@@ -2,9 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.mokamrp.privates.mapper.WorkRoomMapper">
 
-    <!-- 开启二级缓存 -->
-    <cache type="org.mybatis.caches.ehcache.LoggingEhcache"/>
-
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.WorkRoom">
         <id column="id" property="id"/>

src/main/java/com/mokamrp/privates/service/UserCorpService.java

@@ -33,7 +33,7 @@ public interface UserCorpService extends IService<UserCorp> {
      * @param userId
      * @return
      */
-    public List<Integer> getAuthUserCorpIds(Integer userId);
+    public List<Integer> getAuthUserCorpIds(String userId);
 
     /**
      * 绑定账户和企业

src/main/java/com/mokamrp/privates/service/WorkEmployeeService.java

@@ -16,5 +16,5 @@ import java.util.List;
  * @since 2021-04-20
  */
 public interface WorkEmployeeService extends IService<WorkEmployee> {
-    public Object selectWorkEmployeeList(Integer authUserId, WorkEmployeeHandle workEmployee);
+    public Object selectWorkEmployeeList(String authUserId, WorkEmployeeHandle workEmployee);
 }

src/main/java/com/mokamrp/privates/service/impl/UserCorpServiceImpl.java

@@ -54,7 +54,7 @@ public class UserCorpServiceImpl extends ServiceImpl<UserCorpMapper, UserCorp> i
      * @param userId
      * @return
      */
-    public List<Integer> getAuthUserCorpIds(Integer userId) {
+    public List<Integer> getAuthUserCorpIds(String userId) {
         List<Integer> corpIds = new ArrayList<Integer>();
         List<UserCorp> corps = this.list(new QueryWrapper<UserCorp>().eq("user_id", userId));
         for (UserCorp userCorp : corps) {

src/main/java/com/mokamrp/privates/service/impl/WorkContactEmployeeServiceImpl.java

@@ -173,7 +173,7 @@ public class WorkContactEmployeeServiceImpl extends ServiceImpl<WorkContactEmplo
             obj.eq("a.corp_id", corpId);
         }
 
-        if (employeeId != null) {
+        if (employeeId != null && employeeId.size() >=1) {
             obj.in("a.employee_id", employeeId);
         }
 

src/main/java/com/mokamrp/privates/service/impl/WorkEmployeeServiceImpl.java

@@ -32,7 +32,7 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
     @Autowired
     private GroupMapper groupMapper;
 
-    public Object selectWorkEmployeeList(Integer authUserId, WorkEmployeeHandle workEmployee) {
+    public Object selectWorkEmployeeList(String authUserId, WorkEmployeeHandle workEmployee) {
         List<Integer> userCorpIds = userCorpService.getAuthUserCorpIds(authUserId);
         List<Integer> corpIds = new ArrayList<Integer>();
         if (workEmployee.getCorpId() == null) {

src/main/java/com/mokamrp/privates/service/impl/WorkRoomServiceImpl.java

@@ -63,12 +63,16 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
 
         Integer pagesize = handle.getPagesize();
         Integer page = handle.getPage();
-        Page<WorkRoom> pageObj = new Page<>(page, pagesize);
+        Page<WorkRoomVo> pageObj = new Page<>(page, pagesize);
+        System.out.println(page);
+        System.out.println(pagesize);
         Map<String, Object> resMap = new HashMap<String, Object>();
         resMap.put("list", null);
         resMap.put("total", 0);
 
-        QueryWrapper<WorkRoom> obj = getWrapper(handle);
+        QueryWrapper<WorkRoomVo> obj = getWrapper(handle);
+
+        System.out.println(obj);
 
         Integer total = mapperObj.getVoListTotal(obj);
         resMap.put("total", total);
@@ -76,8 +80,8 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
             return resMap;
         }
 
-        List<WorkRoomVo> list = mapperObj.getVoList(pageObj, obj);
-        getCommonList(pageObj, obj);
+        System.out.println("当前数量是"+total);
+        List<WorkRoomVo> list = getCommonList(pageObj, obj);
 
         resMap.put("list", list);
 
@@ -96,9 +100,9 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
         List<Object> headList = Arrays.asList(head);
         Date currentTime = new Date();
 
-        QueryWrapper<WorkRoom> obj = getWrapper(handle);
+        QueryWrapper<WorkRoomVo> obj = getWrapper(handle);
         Integer total = mapperObj.getVoListTotal(obj);
-        Page<WorkRoom> pageObj = new Page<>(1, total);
+        Page<WorkRoomVo> pageObj = new Page<>(1, total);
         List<WorkRoomVo> list = getCommonList(pageObj, obj);
 
         resList.add(headList);
@@ -140,10 +144,13 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
         return;
     }
 
-    private List<WorkRoomVo> getCommonList(Page<WorkRoom> pageObj, QueryWrapper<WorkRoom> room) {
+    private List<WorkRoomVo> getCommonList(Page<WorkRoomVo> pageObj, QueryWrapper<WorkRoomVo> room) {
 
+        System.out.println(pageObj);
         List<WorkRoomVo> list = mapperObj.getVoList(pageObj, room);
 
+        System.out.println("获取数量是"+list.size());
+
         if (list.size() > 0) {
             List<Integer> ids = list.stream().map(WorkRoomVo -> WorkRoomVo.getId()).collect(Collectors.toList());
             HashMap<Integer, HashMap<String, Integer>> dataById = getDataById(ids);
@@ -166,7 +173,7 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
 
     }
 
-    private QueryWrapper<WorkRoom> getWrapper(GetWorkRoomHandle handle) {
+    private QueryWrapper<WorkRoomVo> getWrapper(GetWorkRoomHandle handle) {
         String name = handle.getName();
         Integer corp_id = handle.getCorpId();
         String start_create_time = handle.getStartCreateTime();
@@ -177,7 +184,7 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
         List tag_id = handle.getTagId();
         List<Integer> authCorpIds = handle.getAuthCorpIds();
 
-        QueryWrapper<WorkRoom> obj = new QueryWrapper<WorkRoom>();
+        QueryWrapper<WorkRoomVo> obj = new QueryWrapper<WorkRoomVo>();
 
         obj.in("a.corp_id", authCorpIds);