master

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

@@ -2284,4 +2284,11 @@ public class TMSController extends BaseRESTfulController {
         }
         return map;
     }
+
+    @ApiOperation("根据船舶位置查询船舶动态")
+    @PostMapping("/getShipLocationStatus")
+    public Map<String,Object> getShipLocationStatus(String shipLocation){
+        Map<String,Object>map = tmsshipFeign.getShipLocationStatus(shipLocation);
+        return map;
+    }
 }

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

@@ -838,4 +838,11 @@ public class UniversalController extends BaseRESTfulController {
     public List<Map<String, Object>> getSteelWarehouse(){
         return universalMapper.getSteelWarehouse();
     }
+
+
+    @ApiOperation(value = "查询运力联系方式")
+    @GetMapping("/getCapacityTel")
+    public Map<String,Object>getCapacityTel(BigDecimal capacityId){
+        return universalMapper.getCapacityTel(capacityId);
+    }
 }

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

@@ -761,4 +761,8 @@ public interface TmsshipFeign {
     @PostMapping(value =  "api/v1/shipTms/amsshipdeliverynotices/downLoadDeilveryNotice")
     Map<String, Object> downLoadDeilveryNotice(@RequestParam("noticeId") Integer noticeId);
 
+    @ApiOperation("value=查询船舶状态")
+    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/getShipLocationStatus")
+    Map<String, Object> getShipLocationStatus(@RequestParam("shipLocation") String shipLocation);
+
 }

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -192,4 +192,6 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getShipNameMesByLike(Map<String, Object> map);
 
+    //查询运力联系方式
+    Map<String, Object> getCapacityTel(BigDecimal capacityId);
 }

src/main/resources/application-dev.yml

@@ -25,7 +25,7 @@ openfeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
     #url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   TmsshipFeign:
-    url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
+    url: ${TMSSHIPFEIGN_URL:localhost:8003}
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.162:8013}
   WMSFeign:

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -983,4 +983,8 @@
                and DB.RESULT_FOREIGN_SHIP_NAME like #{index}
                and DB.MATERIAL_ID = #{materialId}
     </select>
+    <select id="getCapacityTel" resultType="java.util.Map" parameterType="decimal">
+        SELECT RC.CAPACITY_TEL "capacityTel" FROM RMS_CAPACITY RC
+        WHERE RC.CAPACITY_ID = #{capacityId}
+    </select>
 </mapper>