Redeem 9 mēneši atpakaļ
vecāks
revīzija
04c4c71a69

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

@@ -37,7 +37,7 @@ public class SessionInterceptor extends HandlerInterceptorAdapter {
         String requestUrl = "" + request.getRequestURL();
         if (!requestUrl.contains("/api/v1/bp/bpLogin")
                 && !requestUrl.contains("/api/v1/ams/dispatch")
-                && !requestUrl.contains("/api/v1/report/updateOperateDaily")
+                && !requestUrl.contains("/api/v1/report")
                 && !requestUrl.contains("/api/v1/uc/")
                 && !requestUrl.contains("/api/v1/systemfiles/")
                 && !requestUrl.contains("/api/v1/rms/insertPersonnel")

+ 6 - 0
src/main/java/com/steerinfo/dil/controller/ReportController.java

@@ -179,4 +179,10 @@ public class ReportController {
     Map<String, Object> matchImport(@RequestBody Map<String,Object> map) {
         return reportFeign.matchImport(map);
     }
+
+    @ApiOperation("syncCountData")
+    @PostMapping("syncCountData")
+    Map<String, Object> syncCountData(@RequestBody Map<String,Object> map) {
+        return reportFeign.syncCountData(map);
+    }
 }

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

@@ -216,14 +216,14 @@ public class TMSController extends BaseRESTfulController {
 
     @ApiOperation(value = "审批计时")
     @PostMapping(value = "/approveTimeResult")
-    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"计"})
+    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"计"})
     public Map<String, Object> approveTimeResult(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.approveTimeResult(map);
     }
 
     @ApiOperation(value = "计时复报")
     @PostMapping(value = "/resendTimeResult")
-    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"计"})
+    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"计时复报"})
     public Map<String, Object> resendTimeResult(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.resendTimeResult(map);
     }

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

@@ -98,4 +98,7 @@ public interface ReportFeign {
 
     @PostMapping(value = "api/v1/report/reportDaily/matchImport")
     Map<String, Object> matchImport(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/report/reportDaily/syncCountData")
+    Map<String, Object> syncCountData(Map<String, Object> map);
 }

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

@@ -34,8 +34,8 @@ openfeign:
     url: ${AMSFEIGN_URL:172.16.90.202:8079}
 #      url: ${AMSFEIGN_URL:localhost:8079}
   TmsFeign:
-#    url: ${TMSFEIGN_URL:172.16.90.202:8086}
-    url: ${TMSFEIGN_URL:localhost:8086}
+    url: ${TMSFEIGN_URL:172.16.90.202:8086}
+#    url: ${TMSFEIGN_URL:localhost:8086}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.202:8093}
   RmsFeign:
@@ -48,8 +48,8 @@ openfeign:
   WebSocketFeign:
     url: ${WEBSOCKETFEIGN_URL:172.16.90.214:80}
   REPORTFeign:
-#    url: ${REPORTFEIGN_URL:172.16.90.202:8055}
-      url: ${REPORTFEIGN_URL:localhost:8055}
+    url: ${REPORTFEIGN_URL:172.16.90.202:8055}
+#      url: ${REPORTFEIGN_URL:localhost:8055}
   TmiFeigh:
     url: ${TMI_URL:172.16.90.202:8018}
 #    url: ${TMI_URL:localhost:8018}