orgCode

src/main/java/com/steerinfo/dil/config/RequestFilter.java

@@ -13,8 +13,6 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URLDecoder;
-import java.util.HashMap;
-import java.util.Map;
 
 @Component
 public class RequestFilter implements Filter {
@@ -26,47 +24,56 @@ public class RequestFilter implements Filter {
     @Override
     public void doFilter(ServletRequest request, ServletResponse response,FilterChain chain) throws IOException, ServletException {
        try{
-            HttpServletRequest httpRequest = (HttpServletRequest)request;
-            //获取参数，并校验
-            Cookie[] cookies = httpRequest.getCookies();
-            String userId = httpRequest.getHeader("userId");
-            String userName = httpRequest.getHeader("userName");
-            //获取cookie用户数据
-            for (Cookie cookie : cookies) {
-                if (cookie.getName().equals("userId") && (userId==null || userId.equals(""))) {
-                    userId = cookie.getValue();
-                }else if(cookie.getName().equals("userName")  && (userName==null || userName.equals(""))){
-                    userName = URLDecoder.decode(cookie.getValue(),"utf-8");
-                }else if(!(userId==null || userId.equals("")) && !(userName==null || userName.equals(""))){
-                    //都查到了，退出
-                    break;
-                }
-            }
-            httpRequest.setAttribute("userId",userId);
-            httpRequest.setAttribute("userName", userName);
-            //获取RequestBody数据
-            BufferedReader streamReader = new BufferedReader( new InputStreamReader(request.getInputStream(), "UTF-8"));
-            StringBuilder strBuilder = new StringBuilder();
-            String inputStr;
-            while ((inputStr = streamReader.readLine()) != null) {
-                strBuilder.append(inputStr);
-            }
-            if(strBuilder!=null && !"".equals(strBuilder.toString())){
-                //有请求体则写入userId和userName，保存
-                JSONObject params = JSONObject.parseObject(strBuilder.toString());
-                params.put("userId",userId);
-                params.put("userName",userName);
-                //将新的RequestBody写入新的请求对象保存
-                ServletRequest requestWrapper = new RequestWrapper(httpRequest, params.toJSONString());
-                chain.doFilter(requestWrapper, response);
-            }else{
-                chain.doFilter(request, response);
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            log.error(e.getStackTrace());
-            chain.doFilter(request, response);
-        }
+           HttpServletRequest httpRequest = (HttpServletRequest) request;
+           //获取参数，并校验
+           Cookie[] cookies = httpRequest.getCookies();
+           String userId = httpRequest.getHeader("userid");
+           String userName = httpRequest.getHeader("username");
+           String orgCode = httpRequest.getHeader("orgCode");
+           //获取cookie用户数据
+           if (cookies != null && cookies.length > 0) {
+               for (Cookie cookie : cookies) {
+                   if (cookie.getName().equals("userId") && userId == null) {
+                       userId = cookie.getValue();
+                   } else if (cookie.getName().equals("userName") && userName == null) {
+                       userName = URLDecoder.decode(cookie.getValue(), "utf-8");
+                   } else if (cookie.getName().equals("orgCode") && orgCode == null) {
+                       orgCode = URLDecoder.decode(cookie.getValue(), "utf-8");
+                   } else if (userId != null && userName != null && orgCode != null) {
+                       //都查到了，退出
+                       break;
+                   }
+               }
+           }
+           userName = URLDecoder.decode(userName, "utf-8");
+           orgCode = URLDecoder.decode(orgCode, "utf-8");
+           httpRequest.setAttribute("userId", userId);
+           httpRequest.setAttribute("userName", userName);
+           httpRequest.setAttribute("orgCode", orgCode);
+           //获取RequestBody数据
+           BufferedReader streamReader = new BufferedReader(new InputStreamReader(request.getInputStream(), "UTF-8"));
+           StringBuilder strBuilder = new StringBuilder();
+           String inputStr;
+           while ((inputStr = streamReader.readLine()) != null) {
+               strBuilder.append(inputStr);
+           }
+           if (strBuilder != null && !"".equals(strBuilder.toString())) {
+               //有请求体则写入userId和userName，保存
+               JSONObject params = JSONObject.parseObject(strBuilder.toString());
+               params.put("userId", userId);
+               params.put("userName", userName);
+               params.put("orgCode", orgCode);
+               //将新的RequestBody写入新的请求对象保存
+               ServletRequest requestWrapper = new RequestWrapper(httpRequest, params.toJSONString());
+               chain.doFilter(requestWrapper, response);
+           } else {
+               chain.doFilter(request, response);
+           }
+       } catch (Exception e) {
+           e.printStackTrace();
+           log.error(e.getStackTrace());
+           chain.doFilter(request, response);
+       }
     }
     @Override
     public void init(FilterConfig arg0) throws ServletException {}

src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -103,6 +103,17 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "边输边查车牌号")
+    @GetMapping("/getCapacityByLike")
+    public RESTfulResult getCapacityByLike(String index,String orgCode,@RequestParam(required = false) List<String> id) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("index",index);
+        map.put("orgCode",orgCode);
+        map.put("id",id);
+        List<Map<String, Object>> list = universalMapper.getCapacityByLike(map);
+        return success(list);
+    }
+
     @ApiModelProperty(value = "边输岗位信息")
     @GetMapping("/getJobInfosByLike")
     public RESTfulResult getrmsrmsjobinfosBylike(String index,@RequestParam(required = false) List<String> id) {

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -26,6 +26,8 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getPersonnelByLike(Map<String, Object> map);
 
+    List<Map<String, Object>> getCapacityByLike(Map<String, Object> map);
+
     List<Map<String, Object>> getTransRangeByLike(Map<String, Object> map);
 
     List<Map<String, Object>> getrmsrmsjobinfosBylike(Map<String, Object> map);

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -226,6 +226,33 @@
         </where>
         FETCH NEXT 100 ROWS ONLY
     </select>
+    <select id="getCapacityByLike" resultType="java.util.Map">
+        select * from (
+            SELECT DISTINCT
+            RCA .CAPACITY_ID "id",
+            RCA .CAPACITY_ID "value",
+            RCA .CAPACITY_NUMBER "label"
+            FROM RMS_CAPACITY RCA
+            LEFT JOIN RMS_CAPACITY_CARRIER RCC ON RCA .CAPACITY_ID = RCC .CAPACITY_ID
+            LEFT JOIN RMS_COMPANY RC ON RC .COMPANY_ID = RCC .COMPANY_ID
+            WHERE RCA .DELETED = 0
+            <if test="orgCode!=null and orgCode!=''">
+                AND RC.SSO_CODE = #{orgCode}
+            </if>
+        )
+        <where>
+            <if test="index!=null and index!=''">
+                AND REGEXP_LIKE("label", #{index})
+            </if>
+            <if test="id!=null and id.size>0">
+                AND "id" in
+                <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        FETCH NEXT 100 ROWS ONLY
+    </select>
     <select id="getrmsrmsjobinfosBylike" resultType="java.util.Map">
         select * from(
         select