修改

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

@@ -43,6 +43,16 @@ public class OTMSController {
         return tmsTruckFeign.getInTransitTransportation(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
     }
 
+    @PostMapping("/getHaveAbnormalTruckOrderInfo")
+    public RESTfulResult getHaveAbnormalTruckOrderInfo(@RequestBody(required=false)   Map<String,Object> mapValue,
+                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                    @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
+                                                    @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
+    )
+    {
+        return tmsTruckFeign.getHaveAbnormalTruckOrderInfo(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
+    }
+
     @ApiOperation("查询在途运输")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -51,8 +61,8 @@ public class OTMSController {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer")
     })
     @PostMapping("/getFinishTruckOrderInfo")
-    public RESTfulResult getFinishTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
-                                                 @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+    public RESTfulResult getFinishTruckOrderInfo(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                 @RequestParam(required = false,defaultValue = "468",name = "apiId")Integer apiId,
                                                  @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
                                                  @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
     ){
@@ -78,5 +88,36 @@ public class OTMSController {
         return tmsTruckFeign.addTmstruckReceiptResult(mapValue,num,orderNumber,resultArrivalAddress,imgcount3,imgcount4);
     }
 
+    @PostMapping(value = "/selectWarnSwitch")
+    public RESTfulResult selectWarnSwitch(){
+        return tmsTruckFeign.selectWarnSwitch();
+    }
+
+    /**是否开启运输报警状态
+     * warnSwitchaddTmstruckTotalResult
+     * @param
+     * @returninTransitOrderMileage
+     */
+    @ApiOperation(value="是否开启运输报警状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "warnSwitch", value = "运输报警状态", required = false, dataType = "String")
+    })
+    @PostMapping(value = "/inTransitWarn")
+    public RESTfulResult inTransitWarn(@RequestParam String warnSwitch,@RequestParam String radio){
+        return tmsTruckFeign.inTransitWarn(warnSwitch,radio);
+    }
+
+    @PostMapping("/getTransportAbnormalInfo")
+    public RESTfulResult getTransportAbnormalInfo(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  @RequestParam(name = "apiId",defaultValue = "472") Integer apiId,
+                                                  @RequestParam(name = "pageNum") Integer pageNum,
+                                                  @RequestParam(name = "orderNumbers") String orderNumbers,
+                                                  @RequestParam(name = "pageSize") Integer pageSize){
+        mapValue=mapValue!=null?mapValue:new HashMap<>();
+        mapValue.put("orderNumbers",orderNumbers);
+        return tmsTruckFeign.getTransportAbnormalInfo(mapValue,apiId,pageNum,pageSize);
+    }
+
+
 
 }

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

@@ -0,0 +1,41 @@
+package com.steerinfo.dil.controller;
+
+
+import com.steerinfo.dil.feign.TmsTruckFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@RestController
+@RequestMapping("apis")
+public class ZhongJiaoXingLuContoller {
+
+    private TmsTruckFeign tmsTruckFeign;
+
+    //偏离预警回调示例
+    @PostMapping("/abnormalLineWarn")
+    public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception {
+        tmsTruckFeign.abnormalLineWarn(data);
+
+        return "success";
+    }
+    //停车预警回调示例
+    @PostMapping("/parkWarn")
+    public String parkWarn(@RequestParam(value = "data") String data) throws Exception {
+        tmsTruckFeign.parkWarn(data);
+        return "success";
+    }
+    //离线预警回调示例
+    @PostMapping("/offLineWarn")
+    public String offLineWarn(@RequestParam(value = "data") String data) throws Exception {
+
+        tmsTruckFeign.offLineWarn(data);
+        return "success";
+    }
+
+
+}

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

@@ -556,6 +556,30 @@ public interface TmsTruckFeign {
                                                  @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
                                                  @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
     );
+
+    @PostMapping(value = "/api/v1/truckTms/pathDisplay/selectWarnSwitch")
+    public RESTfulResult selectWarnSwitch();
+
+    @PostMapping(value = "/api/v1/truckTms/pathDisplay/inTransitWarn")
+    public RESTfulResult inTransitWarn(@RequestParam String warnSwitch,@RequestParam String radio);
+
+    @PostMapping("/api/v1/truckTms/pathDisplay/offLineWarn")
+    public String offLineWarn(@RequestParam(value = "data") String data) throws Exception;
+    @PostMapping("/api/v1/truckTms/pathDisplay/parkWarn")
+    public String parkWarn(@RequestParam(value = "data",required = false) String data) throws Exception;
+    @PostMapping("/api/v1/truckTms/pathDisplay/abnormalLineWarn")
+    public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception;
+
+    @PostMapping("/api/v1/truckTms/pathDisplay/getHaveAbnormalTruckOrderInfo")
+    public RESTfulResult getHaveAbnormalTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
+                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                    @RequestParam(required = false,name = "pageNum")Integer pageNum,
+                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize);
+    @PostMapping("/api/v1/truckTms/pathDisplay/getTransportAbnormalInfo")
+    public RESTfulResult getTransportAbnormalInfo(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  @RequestParam(name = "apiId",defaultValue = "472") Integer apiId,
+                                                  @RequestParam(name = "pageNum") Integer pageNum,
+                                                  @RequestParam(name = "pageSize") Integer pageSize);
 }
 
 

src/main/resources/application-dev.yml

@@ -28,7 +28,7 @@ openfeign:
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.162:8013}
   WMSFeign:
-    url: ${WMSFEIGN_URL:localhost:8012}
+    url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
@@ -38,8 +38,8 @@ openfeign:
 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\24390\Desktop\work\a
+  path: /shared
 
 server:
   port: 8019

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
@@ -23,7 +23,7 @@ eureka:
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
 
 genxml:
-  pth: com/a
+  pth: com/agit
 cache:
   level: 2
 redis: