liyg 2 سال پیش
والد
کامیت
73e58f6475

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

@@ -29,8 +29,8 @@ public class RequestFilter implements Filter {
            Cookie[] cookies = httpRequest.getCookies();
            String userId = httpRequest.getHeader("userid");
            String userName = httpRequest.getHeader("username");
-           String orgCode = httpRequest.getHeader("orgCode");
-           String roleCodes = httpRequest.getHeader("roleCodes");
+           String orgCode = httpRequest.getHeader("orgcode");
+           String roleCodes = httpRequest.getHeader("rolecodes");
            //获取cookie用户数据
            if (cookies != null && cookies.length > 0) {
                for (Cookie cookie : cookies) {
@@ -48,9 +48,11 @@ public class RequestFilter implements Filter {
                    }
                }
            }
-           userName = URLDecoder.decode(userName, "utf-8");
-           orgCode = URLDecoder.decode(orgCode, "utf-8");
-           roleCodes = URLDecoder.decode(roleCodes, "utf-8");
+           try {
+               userName = URLDecoder.decode(userName, "utf-8");
+               orgCode = URLDecoder.decode(orgCode, "utf-8");
+               roleCodes = URLDecoder.decode(roleCodes, "utf-8");
+           }catch (Exception e){}
            httpRequest.setAttribute("userId", userId);
            httpRequest.setAttribute("userName", userName);
            httpRequest.setAttribute("orgCode", orgCode);
@@ -76,6 +78,7 @@ public class RequestFilter implements Filter {
                chain.doFilter(request, response);
            }
        } catch (Exception e) {
+           e.printStackTrace();
            chain.doFilter(request, response);
        }
     }

+ 24 - 0
src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -102,4 +102,28 @@ public class TMSController extends BaseRESTfulController {
                                                  Integer pageSize) {
         return tmsFeign.getTransOrderList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
+
+    @ApiOperation(value="同步进厂")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/syncEnfactoryResult")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"进厂实绩"})
+    public Map<String, Object> syncEnfactoryResult(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.syncEnfactoryResult(map);
+    }
+
+    @ApiOperation(value="同步出厂")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/syncOutfactoryResult")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"出厂实绩"})
+    public Map<String, Object> syncOutfactoryResult(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.syncOutfactoryResult(map);
+    }
+
+    @ApiOperation(value="同步计量")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/syncWeightResult")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"计量实绩"})
+    public Map<String, Object> syncWeightResult(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.syncWeightResult(map);
+    }
 }

+ 8 - 7
src/main/java/com/steerinfo/dil/feign/TmsFeign.java

@@ -46,17 +46,18 @@ public interface TmsFeign {
                                                 @RequestParam  Integer pageNum,
                                                 @RequestParam  Integer pageSize);
 
-    @PostMapping("api/v1/tms/omstransorders/deleteTransOrder")
-    Map<String, Object> deleteTransOrder(@RequestBody(required = false) Map<String, Object> map);
-
-    @PostMapping("api/v1/tms/omstransorders/closeTransOrder")
-    Map<String, Object> closeTransOrder(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/tms/omstransorders/changeTransOrder")
     Map<String, Object> changeTransOrder(Map<String, Object> map);
 
-    @PostMapping("api/v1/tms/omstransorders/closeTransOrderByPlan")
-    Map<String, Object> closeTransOrderByPlan(@RequestBody(required = false) Map<String, Object> map);
+    @PostMapping("api/v1/tms/tmsenfactoryresults/syncEnfactoryResult")
+    Map<String, Object> syncEnfactoryResult(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsoutfactoryresults/syncOutfactoryResult")
+    Map<String, Object> syncOutfactoryResult(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsweightresults/syncWeightResult")
+    Map<String, Object> syncWeightResult(Map<String, Object> map);
 }