'dev终'

pom.xml

@@ -112,9 +112,9 @@
 <!--                <artifactId>generator-maven-plugin</artifactId>-->
 <!--                <version>3.0</version>-->
 <!--                <configuration>-->
-<!--                    <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>-->
-<!--                    <user>dil</user>-->
-<!--                    <password>Dil123789</password>-->
+<!--            <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>-->
+<!--            <user>dagang</user>-->
+<!--            <password>root123</password>-->
 <!--                    &lt;!&ndash;包名&ndash;&gt;-->
 <!--                    <targetPackage>com.steerinfo.dil</targetPackage>-->
 <!--                    <tables>-->

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

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 @RestController
 @RequestMapping("${api.version}/rms")
@@ -850,6 +851,11 @@ public class RMScontroller {
     public Map<String, Object> getOilPriceById(@PathVariable("id") BigDecimal id){
         return rmsFeign.getOilPriceById(id);
     }
+
+
+
+
+
 //*******************************下拉框************************
 
     @GetMapping("getNoticeTypeId")
@@ -859,8 +865,24 @@ public class RMScontroller {
     }
 
 
+
+    @GetMapping("getPortType")
+    @ApiOperation(value = "得到港口类型Id")
+    public Map<String,Object> getPortType(){
+        return rmsFeign.getPortType();
+    }
+
+    @ApiOperation(value="新增原料仓库信息", notes="根据rmsWarehouse对象创建")
+    @ApiImplicitParam(name = "rmsWarehouse", value = "详细实体rmsWarehouse", required = true, dataType = "rmsWarehouse")
+    @PostMapping(value = "/insertWarehouse")
+    public Map<String, Object> insertWarehouse(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertWarehouse(map);
+    }
+
+
+
     //展示收货客户信息
-    @ApiOperation(value = "获取公告信息", notes = "分页查询")
+    @ApiOperation(value = "获取收货客户信息", notes = "分页查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -868,8 +890,6 @@ public class RMScontroller {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
-
-
     @PostMapping(value = "/getConsigneeList")
     public Map<String, Object> getConsigneeList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                      Integer apiId,
@@ -881,19 +901,21 @@ public class RMScontroller {
         return rmsFeign.getConsigneeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
     }
 
-    @GetMapping("getPortType")
-    @ApiOperation(value = "得到港口类型Id")
-    public Map<String,Object> getPortType(){
-        return rmsFeign.getPortType();
-    }
+    /*
+     *边写边搜索承运商
+     * */
+    @ApiOperation(value="根据用户输入输出承运商", notes="模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "con",value = "用户输入的承运商名", required = false, dataType = "String")
+    })
+    @PostMapping("/getCarrierName")
+    public Map<String,Object> getCarrierName(@RequestParam(value ="state") String state){
+        return  rmsFeign.getCarrierName(state);
 
-    @ApiOperation(value="新增原料仓库信息", notes="根据rmsWarehouse对象创建")
-    @ApiImplicitParam(name = "rmsWarehouse", value = "详细实体rmsWarehouse", required = true, dataType = "rmsWarehouse")
-    @PostMapping(value = "/insertWarehouse")
-    public Map<String, Object> insertWarehouse(@RequestBody(required = false) Map<String, Object> map) {
-        return rmsFeign.insertWarehouse(map);
     }
 
+
+
     //港口
     @PostMapping("/insertPort")
     public Map<String, Object> insertPort(@RequestBody(required = false) Map<String, Object> map) {
@@ -926,4 +948,5 @@ public class RMScontroller {
     public Map<String, Object> deletePortYard(@PathVariable("warehouseId") BigDecimal warehouseId) {
         return rmsFeign.deletePortYard(warehouseId);
     }
+
 }

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

@@ -461,6 +461,13 @@ public interface RmsFeign {
                                             @RequestParam("pageSize") Integer pageSize,
                                             @RequestParam("con") String con);
 
+
+
+  //边输入边搜索承运商
+    @PostMapping(value = "/api/v1/rms/rmscardriver/getCarrierName")
+    Map<String, Object> getCarrierName(@RequestParam(value = "state")String state);
+
+
     //港口
     @PostMapping(value = "api/v1/rms/rmsPort/insertPort")
     Map<String,Object> insertPort(@RequestBody(required = false) Map<String,Object> map);

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

@@ -766,6 +766,4 @@ public interface TmsshipFeign {
     @PostMapping(value = "/api/v1/shipTms/dilbatchs/getShipNameList")
     Map<String, Object> getShipNameList(@RequestParam(value = "state")String state);
 
-
-
 }

src/main/resources/bootstrap.yml

@@ -26,6 +26,7 @@ eureka:
 openfeign:
 #  正式环境
 
+<<<<<<< HEAD
 #    ColumnDataFeign:
 #      url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
 #    AmsFeign: