Redeem пре 1 година
родитељ
комит
26f329519d

+ 8 - 0
src/main/java/com/steerinfo/dil/config/RequestFilter.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.steerinfo.dil.aspect.LogAspect;
 import com.steerinfo.dil.mapper.BackgroundProcessingMapper;
+import com.steerinfo.dil.util.DisposeRoleData;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +19,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URLDecoder;
+import java.util.List;
 import java.util.Map;
 
 @Component
@@ -31,6 +33,9 @@ public class RequestFilter implements Filter {
     @Resource
     private BackgroundProcessingMapper backgroundProcessingMapper;
 
+    @Resource
+    private DisposeRoleData disposeRoleData;
+
     @Override
     public void doFilter(ServletRequest request, ServletResponse response,FilterChain chain) throws IOException, ServletException {
        try{
@@ -88,6 +93,8 @@ public class RequestFilter implements Filter {
            httpRequest.setAttribute("roleCodes", roleCodesObject);
            //Object dilCompanyListObject = JSONObject.parse(dilCompanyList);
            Object dilCompanyListObject =  backgroundProcessingMapper.getCompanyList(userId);
+           Object roleFinalList = disposeRoleData.disposeRoleData(roleCodesObject,dilCompanyListObject);
+           httpRequest.setAttribute("roleFinalList",roleFinalList);
            httpRequest.setAttribute("dilCompanyList",dilCompanyListObject);
            Object rootCompanyMapObject = JSONObject.parse(rootCompanyMap);
            httpRequest.setAttribute("rootCompanyMap",rootCompanyMapObject);
@@ -107,6 +114,7 @@ public class RequestFilter implements Filter {
                params.put("orgCode", orgCode);
                params.put("roleCodes",roleCodesObject);
                params.put("dilCompanyList",dilCompanyListObject);
+               params.put("roleFinalList",roleFinalList);
                params.put("rootCompanyMap",rootCompanyMapObject);
                params.put("accessToken",accessToken);
                params.put("urlFlag",urlFlag);

+ 1 - 1
src/main/java/com/steerinfo/dil/config/SessionInterceptor.java

@@ -72,7 +72,7 @@ public class SessionInterceptor extends HandlerInterceptorAdapter {
                     redisUtil.put( methodName+userId, count);
                 }else{
                     //超出访问次数
-                    log.info("访问"+methodName+"方法过快,用户  ===> " + userId + " 且在   " + seconds + " 秒内超过最大限制  ===> " + maxCount + " 次数达到    ====> " + count);
+                    //log.info("访问"+methodName+"方法过快,用户  ===> " + userId + " 且在   " + seconds + " 秒内超过最大限制  ===> " + maxCount + " 次数达到    ====> " + count);
                     response.setCharacterEncoding("UTF-8");
                     response.setContentType("application/json; charset=utf-8");
                     RESTfulResult result =new RESTfulResult("500", "访问过快,请稍后再试", "访问过快,请稍后再试");

+ 32 - 0
src/main/java/com/steerinfo/dil/util/DisposeRoleData.java

@@ -0,0 +1,32 @@
+package com.steerinfo.dil.util;
+
+
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class DisposeRoleData {
+
+    private  static List<String> list = Arrays.asList("businessCompany","approveBusinessCompany","admin","siji","chengYunShang");
+
+
+    public List<String> disposeRoleData(Object roleCodes,Object companyList) {
+        //转数组
+        List<String> roleCodeList = (List<String>) roleCodes;
+        //
+        List<String> roleFinalList = new ArrayList<>();
+        //转数组对象
+        List<Map<String,Object>> companyListMap = (List<Map<String,Object>>) companyList;
+        //遍历数组
+        for(String roleCode : roleCodeList) {
+            if(list.contains(roleCode)) {
+                roleFinalList.add(roleCode);
+            }
+        }
+        return roleFinalList;
+    }
+}