dengpan 1 рік тому
батько
коміт
c107b6f230

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

@@ -34,6 +34,7 @@ public class RequestFilter implements Filter {
            String roleCodes = httpRequest.getHeader("rolecodes");
            String dilCompanyList = httpRequest.getHeader("dilCompanyList");
            String rootCompanyMap = httpRequest.getHeader("rootCompanyMap");
+           String accessToken = httpRequest.getHeader("accessToken");
            //获取cookie用户数据
            if (cookies != null && cookies.length > 0) {
                for (Cookie cookie : cookies) {
@@ -49,6 +50,8 @@ public class RequestFilter implements Filter {
                        dilCompanyList = URLDecoder.decode(cookie.getValue(),"utf-8");
                    } else if (cookie.getName().equals("rootCompanyMap") && rootCompanyMap == null) {
                        rootCompanyMap = URLDecoder.decode(cookie.getValue(),"utf-8");
+                   } else if (cookie.getName().equals("accessToken") && accessToken == null) {
+                       accessToken = URLDecoder.decode(cookie.getValue(), "utf-8");
                    }
                    else if (userId != null && userName != null && orgCode != null && roleCodes != null && dilCompanyList != null && rootCompanyMap != null) {
                        //都查到了,退出
@@ -88,6 +91,7 @@ public class RequestFilter implements Filter {
                params.put("roleCodes",roleCodes);
                params.put("dilCompanyList",dilCompanyListObject);
                params.put("rootCompanyMap",rootCompanyMapObject);
+               params.put("accessToken",accessToken);
                //将新的RequestBody写入新的请求对象保存
                ServletRequest requestWrapper = new RequestWrapper(httpRequest, params.toJSONString());
                chain.doFilter(requestWrapper, response);

+ 9 - 0
src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -719,4 +719,13 @@ public class AMScontroller {
         return amsFeign.getamsproductionordersyncs(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
 
     }
+
+    @ApiOperation(value = "查询发运通知单修改需要内容", notes = "查询发运通知单修改需要内容")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/getUpdateDlivDirno")
+    public RESTfulResult getUpdateDlivDirno(@RequestBody Map<String, Object> map) {
+        return amsFeign.getUpdateDlivDirno(map);
+    }
 }

+ 3 - 0
src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -264,4 +264,7 @@ public interface AmsFeign {
                                  @RequestParam Integer pageNum,
                                  @RequestParam Integer pageSize);
 
+    @PostMapping(value = "api/v1/ams/amstransrequirements/getUpdateDlivDirno")
+    public RESTfulResult getUpdateDlivDirno(@RequestBody Map<String, Object> map);
+
 }

+ 1 - 1
src/main/resources/application-prod.yml

@@ -55,7 +55,7 @@ feign:
     config:
       default:  #默认配置,连接时间要短,读取时间要长
         connectTimeout: 1000 #单位毫秒
-        readTimeout: 15000 #单位毫秒
+        readTimeout: 30000 #单位毫秒
 #熔断器
 hystrix:
   command: