Merge remote-tracking branch 'origin/master'

uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/entity/BaseCacheUser.java

@@ -1,6 +1,7 @@
 package com.chinaunicom.mall.ebtp.common.base.entity;
 
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 import java.util.Date;
 
@@ -12,6 +13,7 @@ import java.util.Date;
  * @version 1.0
  */
 @Data
+@Accessors(chain = true)
 public class BaseCacheUser {
 
 

uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/service/IBaseCacheUserService.java

@@ -2,19 +2,25 @@ package com.chinaunicom.mall.ebtp.common.base.service;
 
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
 
+import java.util.Collection;
+
 /**
  * 缓存用户service
  * 获取缓存用户信息
  *
  * @author daixc
- * @date 2020/10/16
  * @version 1.0
+ * @date 2020/10/16
  */
 public interface IBaseCacheUserService {
 
     /**
      * 获取缓存用户信息
+     *
      * @return BaseCacheUser 返回缓存用户信息
      */
     BaseCacheUser getCacheUser();
+
+
+    Collection<BaseCacheUser> getUsers();
 }

uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/service/impl/BaseCacheUserServiceImpl.java

@@ -2,26 +2,116 @@ package com.chinaunicom.mall.ebtp.common.base.service.impl;
 
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
 import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService;
+import com.chinaunicom.mall.ebtp.common.util.JsonUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 缓存用户service实现层
  * 获取缓存用户信息
  *
  * @author daixc
- * @date 2020/10/16
  * @version 1.0
+ * @date 2020/10/16
  */
 @Service
+@Slf4j
 public class BaseCacheUserServiceImpl implements IBaseCacheUserService {
 
+    private static final Map<String, BaseCacheUser> USERS = new ConcurrentHashMap<>();
+
+
     @Override
     public BaseCacheUser getCacheUser() {
         BaseCacheUser user = new BaseCacheUser();
-        user.setUserId(1316573977715408898L);
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-        user.setFullName("测试用户");
+        if (attributes != null) {
-        user.setRoleIds("1,2,3");
+            HttpServletRequest request = attributes.getRequest();
-        user.setOrganizationId("844984984648946");
+            String token = request.getHeader("JwtToken");
+            user = USERS.get(token);
+        }
+        log.info(" --------------- 当前用户：" + JsonUtils.objectToJson(user) + " ------------------------------");
         return user;
     }
+
+    @Override
+    public Collection<BaseCacheUser> getUsers() {
+        return USERS.values();
+    }
+
+    static {
+        BaseCacheUser user = new BaseCacheUser()
+                .setUserId(1L)
+                .setFullName("采购经理")
+                .setLoginName("caigou")
+                .setRoleIds("caigou")
+                .setOrganizationId("100")
+                .setOrganizationName("中国联通吉林分公司");
+        USERS.put(String.valueOf(user.getUserId()), user);
+
+        BaseCacheUser user0 = new BaseCacheUser()
+                .setUserId(2L)
+                .setFullName("代理机构管理员")
+                .setLoginName("daili-admin")
+                .setRoleIds("daili-admin")
+                .setOrganizationId("100100")
+                .setOrganizationName("中兴代理公司");
+        USERS.put(String.valueOf(user0.getUserId()), user0);
+
+        BaseCacheUser user1 = new BaseCacheUser()
+                .setUserId(3L)
+                .setFullName("代理机构子管理员")
+                .setLoginName("daili-subadmin")
+                .setRoleIds("daili-subadmin")
+                .setOrganizationId("100100")
+                .setOrganizationName("中兴代理公司");
+        USERS.put(String.valueOf(user1.getUserId()), user1);
+
+        BaseCacheUser user2 = new BaseCacheUser()
+                .setUserId(4L)
+                .setFullName("项目经理1")
+                .setLoginName("daili1")
+                .setRoleIds("daili")
+                .setOrganizationId("100100")
+                .setOrganizationName("中兴代理公司");
+        USERS.put(String.valueOf(user2.getUserId()), user2);
+
+        BaseCacheUser user3 = new BaseCacheUser()
+                .setUserId(5L)
+                .setFullName("项目经理2")
+                .setLoginName("daili2")
+                .setRoleIds("daili")
+                .setOrganizationId("100100")
+                .setOrganizationName("中兴代理公司");
+        USERS.put(String.valueOf(user3.getUserId()), user3);
+
+        for (int i = 0; i < 5; i++) {
+            BaseCacheUser user4 = new BaseCacheUser()
+                    .setUserId(6L + i)
+                    .setFullName("专家" + (i + 1))
+                    .setLoginName("1300000000" + (i + 1))
+                    .setRoleIds("zhuanjia")
+                    .setOrganizationId("666")
+                    .setOrganizationName("专家公司");
+            USERS.put(String.valueOf(user4.getUserId()), user4);
+        }
+
+        for (int i = 0; i < 5; i++) {
+            BaseCacheUser user4 = new BaseCacheUser()
+                    .setUserId(11L + i)
+                    .setFullName("供应商" + (i + 1))
+                    .setLoginName("gys" + (i + 1))
+                    .setRoleIds("gys")
+                    .setOrganizationId("200"+ (i + 1))
+                    .setOrganizationName("供应商公司" + (i + 1));
+            USERS.put(String.valueOf(user4.getUserId()), user4);
+        }
+    }
 }