修改

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

@@ -0,0 +1,28 @@
+package com.steerinfo.dil.controller;
+
+
+import com.steerinfo.dil.feign.DzFeign;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import org.omg.CORBA.OBJ_ADAPTER;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@RequestMapping("${api.version}/dz")
+@RestController
+public class DzController extends BaseRESTfulController {
+
+    @Autowired
+    DzFeign dzFeign;
+
+    @PostMapping("/getDzData")
+    public Map<String,Object> getDzData(@RequestBody Map<String, Object> map) {
+        return dzFeign.getDzData(map);
+    }
+
+
+}

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

@@ -891,4 +891,24 @@ public class TMSController extends BaseRESTfulController {
     public Map<String,Object> insertTmsTransitOrder(@RequestBody Map<String,Object> map) {
         return tmsFeign.insertTmsTransitOrder(map);
     }
+
+    @ApiOperation("导入通行登记单")
+    @PostMapping("/importTrasitOrder")
+    public RESTfulResult importTrasitOrder(@RequestBody MultipartFile file,
+                                       String userId,
+                                       String userName) throws Exception {
+        Map<String, Object> map = new HashMap<>();
+        //获取Excel中包含的对象数组
+        List<Map<String, Object>> list = ExcelToolUtils.getExcelList(file, 0);
+        map.put("list", list);
+        for (Map<String, Object> item : list) {
+            //校验行
+            if(item.get("车牌号") == null  || item.get("通行卡类型") == null || item.get("开始时间") == null || item.get("结束时间") == null){
+                throw new Exception("单元格数据异常，请检查模板或数据是否正确!");
+            }
+        }
+        map.put("userId",userId);
+        map.put("userName",userName);
+        return tmsFeign.importTrasitOrder(map);
+    }
 }

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

@@ -0,0 +1,48 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
+
+@FeignClient(name = "ANTAI-DZ-API", url = "${openfeign.DzFeign.url}")
+public interface DzFeign {
+    @PostMapping("/api/v1/dz/test/getUnloadDetails")
+    Map<String, Object> getUnloadDetails(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getUnUploadOrder")
+    Map<String, Object> getUnUploadOrder();
+
+    @PostMapping("/api/v1/dz/test/getCapacityDetails")
+    Map<String, Object> getCapacityDetails(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getTransOrderDz")
+    List<Map<String, Object>> getTransOrderDz();
+
+    @PostMapping("/api/v1/dz/test/getTransResult")
+    Map<String,Object> getTransResult(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getTransResultList")
+    List<Map<String, Object>> getTransResultList(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getSignList")
+    List<Map<String, Object>> getSignList(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getInnerCode")
+    Map<String,Object> getInnerCode(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getProductionResultList")
+    List<Map<String, Object>> getProductionResultList(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/restartWeightResult")
+    int restartWeightResult(@RequestBody List<String> ysddList);
+
+    @PostMapping("/api/v1/dz/test/getErrorRequirement")
+    Map<String,Object> getErrorRequirement( @RequestBody Map<String,Object> map);
+
+
+    @PostMapping("/api/v1/dz/test/getDzData")
+    Map<String, Object> getDzData(Map<String, Object> map);
+}

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

@@ -308,6 +308,9 @@ public interface TmsFeign {
 
     @PostMapping(value = "api/v1/tms/tmstransitorders/insertTmsTransitOrder")
     Map<String, Object> insertTmsTransitOrder(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/tmstransitorders/importTrasitOrder")
+    RESTfulResult importTrasitOrder(Map<String, Object> map);
 }
 
 

src/main/resources/application-prod.yml

@@ -45,6 +45,9 @@ openfeign:
   REPORTFeign:
     url: ${REPORTFEIGN_URL:172.16.90.202:8000}
 #    url: ${REPORTFEIGN_URL:localhost:8055}
+  DzFeign:
+    url: ${DZFEIGN_URL:172.16.90.202:8000}
+#    url: ${DZFEIGN_URL:localhost:8056}
 
 
 #远程调用