修改厂外

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

@@ -5,6 +5,8 @@ import com.steerinfo.dil.feign.TmsTruckFeign;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -41,6 +43,22 @@ public class OTMSController {
         return tmsTruckFeign.getInTransitTransportation(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
     }
 
+    @ApiOperation("查询在途运输")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @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,
+                                                 @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
+                                                 @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
+    ){
+        return tmsTruckFeign.getFinishTruckOrderInfo(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
+    }
+
     @PostMapping(value = "/addtmstruckArrivalResult")
     public RESTfulResult addtmstruckArrivalResult(@RequestParam("orderNumber") String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress, MultipartFile file){
         return tmsTruckFeign.addtmstruckArrivalResult(orderNumber,resultArrivalAddress,file);
@@ -59,4 +77,6 @@ public class OTMSController {
         }
         return tmsTruckFeign.addTmstruckReceiptResult(mapValue,num,orderNumber,resultArrivalAddress,imgcount3,imgcount4);
     }
+
+
 }

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

@@ -538,7 +538,12 @@ public interface TmsTruckFeign {
 
 //    @PostMapping(value = "/api/v1/truckTms/pathDisplay/addTmstruckReceiptResult", headers = "content-type=multipart/form-data",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
 //    public  RESTfulResult addTmstruckReceiptResult(@RequestPart("file")MultipartRequest request,@RequestParam("num") Integer num,@RequestParam("orderNumber")  String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress,@RequestParam("imgcount3") Integer imgcount3, @RequestParam("imgcount4")Integer imgcount4);
-
+    @PostMapping("/api/v1/truckTms/pathDisplay/getFinishTruckOrderInfo")
+    public RESTfulResult getFinishTruckOrderInfo(@RequestBody 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
+    );
 }
 
 

src/main/resources/application-prod.yml

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