12.17 9:44 rms解决缺失

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

@@ -419,7 +419,12 @@ public class RMScontroller {
     public Map<String, Object> deleteTruckCalculate(@PathVariable("id")BigDecimal id){
         return rmsFeign.deleteTruckCalculate(id);
     }
-
+    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
+    @ApiImplicitParam(name = "汽车衡物资中间表id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/deleteTruckCalculateMaterial/{id}")
+    public Map<String, Object> deleteTruckCalculateMaterial(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteTruckCalculateMaterial(id);
+    }
     @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCarDriver信息来更新详细信息")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
@@ -436,7 +441,15 @@ public class RMScontroller {
     public Map<String,Object> getTruckCalculateById(@PathVariable("id") BigDecimal id){
         return rmsFeign.getTruckCalculateById(id);
     }
-
+    @PostMapping("/getCalculateOfMaterialList")
+    @ApiOperation(value="根据id查询汽车横下的物资表")
+    public Map<String,Object> getCalculateOfMaterialList(@RequestBody(required = false)Map<String, Object> mapValue,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         Integer apiId,
+                                                         BigDecimal truckCalculateId){
+        return rmsFeign.getCalculateOfMaterialList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,truckCalculateId);
+    }
 
     @PostMapping("/getTruckCalculateList")
     @ApiOperation(value = "模糊查询汽车衡")
@@ -448,13 +461,11 @@ public class RMScontroller {
 
         return rmsFeign.getTruckCalculateList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
-
-    @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="根据rmsWarehouse对象创建")
+    @ApiImplicitParam(name = "rmsTruckCalculateMaterial", value = "详细实体rmsTruckCalculateMaterial", required = true, dataType = "rmsTruckCalculateMaterial")
+    @PostMapping(value = "/insertTruckCalculateOfMaterial")
+    public Map<String, Object> insertTruckCalculateOfMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertTruckCalculateOfMaterial(map);
     }
     @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
     @ApiImplicitParam(name = "仓库id", value = "id", required = true, dataType = "int")

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

@@ -215,14 +215,16 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmscapacity/getCapacityById/{id}")
     Map<String,Object> getCapacityById(@PathVariable("id") BigDecimal id);
 
-
-    ;
     //新增汽车衡
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/insertTruckCalculate")
     Map<String, Object> insertTruckCalculate(@RequestBody(required = false) Map<String, Object> map);
+
+    //新增汽车衡下的物资
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/insertTruckCalculateOfMaterial")
+    Map<String, Object> insertTruckCalculateOfMaterial(@RequestBody(required = false) Map<String, Object> map);
     //更新汽车衡
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/updateTruckCalculate")
-    Map<String, Object> updateTruckCalculate(Map<String, Object> map);
+    Map<String, Object> updateTruckCalculate(@RequestBody Map<String, Object> map);
     //根据id查询汽车衡
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/getTruckCalculateById/{id}")
 
@@ -232,6 +234,10 @@ public interface RmsFeign {
     //根据id删除汽车衡
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/deleteTruckCalculate/{id}")
     Map<String, Object> deleteTruckCalculate(@PathVariable("id") BigDecimal id);
+
+    //根据id删除汽车衡与物资中间表
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/deleteTruckCalculateMaterial/{id}")
+    Map<String, Object> deleteTruckCalculateMaterial(@PathVariable("id") BigDecimal id);
     //模糊查询汽车衡
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/getTruckCalculateList")
     Map<String, Object> getTruckCalculateList(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -239,6 +245,13 @@ public interface RmsFeign {
                                               @RequestParam Integer pageSize,
                                               @RequestParam Integer apiId,
                                               @RequestParam String con);
+    //汽车衡物资展示表
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/getCalculateOfMaterialList")
+    Map<String, Object> getCalculateOfMaterialList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize,
+                                                   @RequestParam Integer apiId,
+                                                   @RequestParam BigDecimal truckCalculateId);
 
     //新增仓库
     @PostMapping(value = "api/v1/rms/rmswarehouse/insertWarehouse")

src/main/resources/bootstrap.yml

@@ -23,33 +23,65 @@ eureka:
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
 
 
+
 openfeign:
-  ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-  AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
-  BmsshipFeign:
-    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
-  BmstrainFeign:
-    url: ${BMSTRAINFEIGN_URL:172.16.33.162:8005}
-  BmstruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
-  QmsTruckFeign:
-    url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
-  TmsTrainFeign:
-    url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
-  TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
-  TmsshipFeign:
-    url: ${TMSSHIPFEIGN_URL:localhost:8003}
-  WMSHFeign:
-    url: ${WMSHFEIGN_URL:172.16.33.162:8013}
-  WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.162:8012}
-  OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
-  RmsFeign:
-    url: ${RMSFEIGN_HRL:localhost:8014}
+
+  #正式环境
+#  ColumnDataFeign:
+#    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8083}
+#  AmsFeign:
+#    url: ${AMSFEIGN_URL:172.16.33.162:8079}
+#  BmsshipFeign:
+#    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8078}
+#  BmstrainFeign:
+#    url: ${BMSTRAINFEIGN_URL:172.16.33.162:8077}
+#  BmstruckFeign:
+#    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8076}
+#  QmsTruckFeign:
+#    url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8047}
+#  TmsTrainFeign:
+#    url: ${TMSTRAINFEIGN_URL:172.16.33.162:8086}
+#  TmsTruckFeign:
+#    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8088}
+#  TmsshipFeign:
+#    url: ${TMSSHIPFEIGN_URL:172.16.33.162:8090}
+#  WMSHFeign:
+#    url: ${WMSHFEIGN_URL:172.16.33.162:8070}
+#  WMSFeign:
+#    url: ${WMSFEIGN_URL:172.16.33.162:8093}
+#  OMSFeign:
+#    url: ${OMSFEIGN_URL:172.16.33.162:8095}
+#  RmsFeign:
+#    url: ${RMSFEIGN_HRL:172.16.33.162:8060}
+
+#测试环境
+    ColumnDataFeign:
+      url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+    AmsFeign:
+      url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    BmsshipFeign:
+      url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
+    BmstrainFeign:
+      url: ${BMSTRAINFEIGN_URL:172.16.33.162:8005}
+    BmstruckFeign:
+      url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
+    QmsTruckFeign:
+      url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
+    TmsTrainFeign:
+      url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
+    TmsTruckFeign:
+      url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    TmsshipFeign:
+      url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
+    WMSHFeign:
+      url: ${WMSHFEIGN_URL:172.16.33.162:8013}
+    WMSFeign:
+      url: ${WMSFEIGN_URL:172.16.33.162:8012}
+    OMSFeign:
+      url: ${OMSFEIGN_URL:172.16.33.162:8016}
+    RmsFeign:
+      url: ${RMSFEIGN_HRL:172.16.33.162:8014}
+
 
 genxml:
   pth: com/a