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

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

@@ -2591,4 +2591,48 @@ public class TMSController extends BaseRESTfulController {
         return tmsshipFeign.updateThreeSectionDetails(mapVal);
     }
 
+    @PostMapping("/addPleaseResult")
+    public Map<String,Object> addPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return tmsshipFeign.addPleaseResult(mapVal);
+    }
+
+    @PostMapping("/editPleaseResult")
+    public Map<String,Object> editPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return tmsshipFeign.editPleaseResult(mapVal);
+    }
+
+    @PostMapping("/getAllPleaseResult")
+    public Map<String,Object> getAllPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                 @RequestParam Integer pageNum,
+                                                 @RequestParam Integer pageSize,
+                                                 @RequestParam Integer apiId,
+                                                  String con,
+                                                  String startTime,
+                                                  String endTime){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return tmsshipFeign.getAllPleaseResult(mapVal,pageNum,pageSize,apiId,con,startTime,endTime);
+    }
+
+    @PostMapping("/getPleaseResult/{resultId}")
+    public Map<String,Object> getPleaseResult(@PathVariable("resultId") BigDecimal resultId){
+        return tmsshipFeign.getPleaseResult(resultId);
+    }
+
+    @PostMapping("/getRealNumber")
+    public Map<String,Object> getRealNumber(@RequestBody(required = false) Map<String, Object> map){
+        return tmsshipFeign.getRealNumber(map);
+    }
+
+    @PostMapping("/getWagonWork")
+    public Map<String,Object> getWagonWork(@RequestBody(required = false) Map<String, Object> map){
+        return tmsshipFeign.getWagonWork(map);
+    }
 }

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

@@ -74,11 +74,14 @@ public class WMSHController extends BaseRESTfulController {
                                                   Integer pageNum,
                                                   Integer pageSize,
                                                   Integer apiId,
-                                                  String con) {
+                                                  String con,
+                                            String activeName,
+                                            String startTime,
+                                            String endTime) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return wmshFeign.getUnLockPortStock(mapValue, pageNum, pageSize, apiId,con);
+        return wmshFeign.getUnLockPortStock(mapValue, pageNum, pageSize, apiId,con,activeName,startTime,endTime);
     }
 
 

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

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -826,4 +827,29 @@ public interface TmsshipFeign {
 
     @PostMapping(value =  "api/v1/shipTms/dilbatchs/getNoticeContactNumberByPerson")
     Map<String, Object> getNoticeContactNumberByPerson(@RequestParam("personName") String personName);
+
+
+    @PostMapping("/api/v1/shipTms/tmsshiptotalresults/addPleaseResult")
+    Map<String,Object> addPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal);
+
+    @PostMapping("/api/v1/shipTms/tmsshiptotalresults/editPleaseResult")
+    Map<String,Object> editPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal);
+
+    @PostMapping("/api/v1/shipTms/tmsshiptotalresults/getAllPleaseResult")
+    Map<String,Object> getAllPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam String con,
+                                          @RequestParam String startTime,
+                                          @RequestParam String endTime);
+
+    @PostMapping(value = "/api/v1/shipTms/tmsshiptotalresults/getPleaseResult/{resultId}")
+    Map<String, Object> getPleaseResult(@PathVariable("resultId") BigDecimal resultId);
+
+    @PostMapping(value = "/api/v1/shipTms/tmsshiptotalresults/getRealNumber")
+    Map<String, Object> getRealNumber(Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/shipTms/shipdynamics/getWagonWork")
+    Map<String, Object> getWagonWork(Map<String, Object> map);
 }

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

@@ -140,7 +140,10 @@ public interface WMSHFeign {
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize,
                                           @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("con") String con);
+                                          @RequestParam("con") String con ,
+                                     @RequestParam("activeName")String activeName,
+                                     @RequestParam("startTime")String startTime,
+                                     @RequestParam("endTime")String endTime);
 
     @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/selectLoadResult")
     Map<String,Object> selectLoadResult(@RequestBody(required = false) Map<String, Object> mapValue,