Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -1991,14 +1991,20 @@ public class TMSController extends BaseRESTfulController {
         return tmsshipFeign.getShipNameList(state);
     }
 
-    @ApiOperation(value = "国产矿物流导入")
+    @ApiOperation(value = "国产矿导入")
     @PostMapping(value = "/importDomesticLoadResult")
     public Map<String, Object> importDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue) {
         return tmsTrainFeign.importDomesticLoadResult(mapValue);
     }
 
+    @ApiOperation(value = "进口矿导入")
+    @PostMapping(value = "/importImportedLoadResult")
+    public Map<String, Object> importImportedLoadResult(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return tmsTrainFeign.importImportedLoadResult(mapValue);
+    }
+
 
-    @ApiOperation(value = "国产矿物流新增装车")
+    @ApiOperation(value = "国产矿新增/海港-老区轨道衡新增装车")
     @PostMapping(value = "/addDomesticLoadResult")
     public Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue) {
         return tmsTrainFeign.addDomesticLoadResult(mapValue);

src/main/java/com/steerinfo/dil/feign/TmsTrainFeign.java

@@ -235,10 +235,14 @@ public interface TmsTrainFeign {
             @RequestParam("loadingId")Integer loadingId,
             @RequestParam("unloadingId")Integer unloadingId);
 
-    @ApiOperation(value = "国产矿物流导入")
+    @ApiOperation(value = "国产矿导入")
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/importDomesticLoadResult")
     Map<String, Object> importDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue);
 
+    @ApiOperation(value = "进口矿导入")
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/importImportedLoadResult")
+    Map<String, Object> importImportedLoadResult(@RequestBody(required = false) Map<String, Object> mapValue);
+
     @ApiOperation(value = "国产矿物流新增装车")
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/addDomesticLoadResult")
     Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue);

src/main/resources/application-prod.yml

@@ -42,7 +42,7 @@ piction:
   # path: /usr/share/nginx/html/image
   #  path: /test/data/nginx/html/image
   # path: C:\Users\24390\Desktop\work\a
-#  path: /shared
-  path: C:\Users\zx\Pictures\test
+  path: /shared
+  # path: C:\Users\zx\Pictures\test
 server:
   port: 8080