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

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

@@ -924,6 +924,18 @@ public class UniversalController extends BaseRESTfulController {
         return 1;
     }
 
+    @ApiOperation("删除计量实绩")
+    @PostMapping("/linkageDeleteTransportOrder")
+    public int linkageDeleteTransportOrder(@RequestBody(required = false)List<Map<String,Object>>mapList ){
+        try {
+            return universalService.linkageDeleteTransportOrder(mapList);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return 1;
+    }
+
+
     @ApiModelProperty(value = "获取仓库月台")
     @GetMapping("/getSteelWarehouse")
     public List<Map<String, Object>> getSteelWarehouse(){

src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -288,4 +288,24 @@ public class UniversalServiceImpl implements UniversalService {
     }
 
 
+    public int linkageDeleteTransportOrder(List<Map<String, Object>> mapList) throws IOException{
+        String URL = "http://172.16.33.166:8066/api/v1/join/tmstruckweightresult/linkageDeleteTransportOrder";
+        String jsonData = null;
+        String jsonString= JSON.toJSONString(mapList);
+        jsonData = HTTPRequestUtils.send(URL, jsonString,"utf-8");
+        if(!"null".equals(jsonData)){
+            System.out.println(jsonData);
+            HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);
+            String code = (String) hashMap.get("code");
+            System.out.println(hashMap.get("code"));
+            if("SUCCESS".equals(code)){
+                return 1;
+            }else{
+                return 0;
+            }
+        }else{
+            System.out.println("补录委托失败：" + jsonData);
+            return 0;
+        }
+    }
 }

src/main/resources/application-prod.yml

@@ -14,7 +14,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+    url: ${AMSFEIGN_URL:localhost:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmstrainFeign:
@@ -26,7 +26,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
   WMSHFeign: