修改

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

@@ -32,13 +32,13 @@ public class AMScontroller{
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
-    @PostMapping(value = "/getOrderList")
-    Map<String, Object> getOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+    @PostMapping(value = "/getPurchaseOrderList")
+    Map<String, Object> getPurchaseOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
                                      Integer apiId,
                                      Integer pageNum,
                                      Integer pageSize
     ){
-        return amsFeign.getOrderList(mapValue,apiId,pageNum,pageSize);
+        return amsFeign.getPurchaseOrderList(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
     }
 
     @ApiOperation(value="新增采购订单")

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

@@ -81,12 +81,14 @@ public class RMScontroller extends BaseRESTfulController {
 
         return rmsFeign.getMaterialTypeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
+
     @ApiOperation("新增物资类型")
     @PostMapping("/insertMaterialType")
     @LogAround(foreignKeys = {"materialTypeId"},foreignKeyTypes = "物资类型",description = "新增物资类型")
     public RESTfulResult insertMaterialType(@RequestBody(required = false) Map<String,Object> map) {
         return rmsFeign.insertMaterialType(map);
     }
+
     @ApiOperation(value="删除物资类型")
     @ApiImplicitParam(name = "rmsMaterialType", value = "rmsMaterialType", required = true, dataType = "rmsMaterialType")
     @PostMapping(value = "/deleteMaterialType")
@@ -94,6 +96,15 @@ public class RMScontroller extends BaseRESTfulController {
     public RESTfulResult deleteMaterialType(@RequestBody(required = false) Map<String,Object> map){
         return rmsFeign.deleteMaterialType(map);
     }
+
+    @ApiOperation(value="同步物资类型")
+    @ApiImplicitParam(name = "rmsMaterialType", value = "rmsMaterialType", required = true, dataType = "rmsMaterialType")
+    @PostMapping(value = "/syncMaterialType")
+    @LogAround(foreignKeys = {"materialTypeId"},foreignKeyTypes = "物资类型",description = "修改物资类型")
+    public Map<String, Object> syncMaterialType(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.syncMaterialType(map);
+    }
+
     @ApiOperation(value="更新物资类型")
     @ApiImplicitParam(name = "rmsMaterialType", value = "rmsMaterialType", required = true, dataType = "rmsMaterialType")
     @PostMapping(value = "/updateMaterialType")
@@ -101,6 +112,7 @@ public class RMScontroller extends BaseRESTfulController {
     public Map<String, Object> updateMaterialType(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.updateMaterialType(map);
     }
+
     @ApiOperation(value="根据id查询物资类型信息", notes="")
     @ApiImplicitParam(name = "rmsMaterialType", value = "rmsMaterialType", required = true, dataType = "rmsMaterialType")
     @PostMapping(value = "/getMaterialTypeById/{id}")
@@ -145,7 +157,7 @@ public class RMScontroller extends BaseRESTfulController {
     @ApiOperation(value="更新物资", notes="根据rmsMaterial对象创建")
     @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
     @PostMapping(value = "/updateMaterial")
-    @LogAround(foreignKeys = {"operationPointId"},foreignKeyTypes = {"物资"},description = "修改物资")
+    @LogAround(foreignKeys = {"materialId"},foreignKeyTypes = {"物资"},description = "修改物资")
     public Map<String, Object> updateMaterial(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.updateMaterial(map);
     }
@@ -156,6 +168,13 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getMaterialById(id);
     }
 
+    @ApiOperation(value="同步物资", notes="根据rmsMaterial对象创建")
+    @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
+    @PostMapping(value = "/syncMaterial")
+    @LogAround(foreignKeys = {"materialId"},foreignKeyTypes = {"物资"},description = "同步物资")
+    public Map<String, Object> syncMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.syncMaterial(map);
+    }
 
     //====================作业点
     @ApiOperation(value="获取作业点列表")
@@ -253,6 +272,14 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getPersonnelById(personnelId);
     }
 
+    @ApiOperation(value="根据id更新详细人员信息", notes="根据rmsPersonnel对象创建")
+    @ApiImplicitParam(name = "rmsPersonnel", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
+    @PostMapping(value = "/syncPersonnel")
+    @LogAround(foreignKeys = {"personnelId"},foreignKeyTypes = {"人员"})
+    public Map<String, Object> syncPersonnel(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.syncPersonnel(map);
+    }
+
 
 
     //================公司
@@ -301,6 +328,14 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getCompanyById(id);
     }
 
+    @ApiOperation(value="同步公司", notes="根据rmsCompany对象创建")
+    @ApiImplicitParam(name = "rmsCompany", value = "详细实体rmsCompany", required = true, dataType = "rmsCompany")
+    @PostMapping(value = "/syncCompany")
+    @LogAround(foreignKeys = {"companyId"},foreignKeyTypes = {"公司"},description = "同步公司")
+    public Map<String, Object> syncCompany(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.syncCompany(map);
+    }
+
     //运力
     @ApiOperation(value="新增运力信息", notes="根据rmsCapacity对象创建")
     @ApiImplicitParam(name = "rmsCapacity", value = "详细实体rmsCapacity", required = true, dataType = "rmsCapacity")

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

@@ -18,8 +18,8 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amsorders/purchaseOrderSync")
     Map<String, Object> purchaseOrderSync(@RequestBody(required = false) Map<String, Object> map);
 
-    @PostMapping("/getOrderList")
-    Map<String, Object> getOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+    @PostMapping("api/v1/ams/amsorders/getPurchaseOrderList")
+    Map<String, Object> getPurchaseOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
                                      @RequestParam  Integer apiId,
                                      @RequestParam  Integer pageNum,
                                      @RequestParam  Integer pageSize

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

@@ -74,6 +74,8 @@ public interface RmsFeign {
     //删除物资种类
     @PostMapping(value = "api/v1/rms/rmsmaterialtype/deleteMaterialType")
     RESTfulResult deleteMaterialType(@RequestBody(required = false) Map<String, Object> map);
+    @PostMapping(value = "api/v1/rms/rmsmaterialtype/syncMaterialType")
+    Map<String, Object> syncMaterialType(@RequestBody(required = false) Map<String, Object> map);
     //更新物资种类
     @PostMapping(value = "api/v1/rms/rmsmaterialtype/updateMaterialType")
     Map<String, Object> updateMaterialType(@RequestBody(required = false) Map<String, Object> map);
@@ -101,7 +103,8 @@ public interface RmsFeign {
     //查询物资ID
     @PostMapping(value = "api/v1/rms/rmsmaterial/getMaterialById/{id}")
     Map<String, Object> getMaterialById(@PathVariable("id") BigDecimal id);
-
+    @PostMapping(value = "api/v1/rms/rmsmaterial/syncMaterial")
+    Map<String, Object> syncMaterial(@RequestBody(required = false) Map<String, Object> map);
 
     //==============作业点
     //查询作业点List
@@ -124,6 +127,12 @@ public interface RmsFeign {
     Map<String, Object> getOperationPointById(@PathVariable("id") BigDecimal id);
 
     //人员管理
+    @PostMapping(value = "/api/v1/rms/rmspersonnel/getPersonnelList")
+    Map<String, Object> getPersonnelList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                         @RequestParam("apiId")Integer apiId,
+                                         @RequestParam("pageNum") Integer pageNum,
+                                         @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("con") String con);
     @PostMapping(value = "api/v1/rms/rmspersonnel/insertPersonnel")
     Map<String, Object> insertPersonnel(@RequestBody(required = false) Map<String, Object> map);
     @PostMapping(value = "api/v1/rms/rmspersonnel/deletePersonnel")
@@ -132,12 +141,9 @@ public interface RmsFeign {
     Map<String, Object> updatePersonnel(@RequestBody(required = false) Map<String, Object> map);
     @PostMapping(value = "api/v1/rms/rmspersonnel/getPersonnelById/{personnelId}")
     Map<String, Object> getPersonnelById(@PathVariable("personnelId") BigDecimal personnelId);
-    @PostMapping(value = "/api/v1/rms/rmspersonnel/getPersonnelList")
-    Map<String, Object> getPersonnelList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                         @RequestParam("apiId")Integer apiId,
-                                         @RequestParam("pageNum") Integer pageNum,
-                                         @RequestParam("pageSize") Integer pageSize,
-                                         @RequestParam("con") String con);
+    @PostMapping(value = "api/v1/rms/rmspersonnel/syncPersonnel")
+    Map<String, Object> syncPersonnel(@RequestBody(required = false) Map<String, Object> map);
+
     //============公司
     //展示公司列表
     @PostMapping(value = "api/v1/rms/rmscompany/getCompanyList")
@@ -157,6 +163,9 @@ public interface RmsFeign {
     //    根据id获取供应商信息
     @PostMapping(value = "api/v1/rms/rmscompany/getCompanyById/{id}")
     Map<String, Object> getCompanyById(@PathVariable("id") BigDecimal id);
+    //同步公司
+    @PostMapping(value = "api/v1/rms/rmscompany/syncCompany")
+    Map<String, Object> syncCompany(@RequestBody(required = false) Map<String, Object> map);
 
 
     //===========运力