Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.steerinfo.dil.annotaion.LogAround;
 import com.steerinfo.dil.feign.AmsFeign;
 import com.steerinfo.framework.controller.RESTfulResult;
@@ -7,10 +8,16 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
+import org.apache.tools.ant.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -25,7 +32,7 @@ public class AMScontroller{
     @Autowired
     AmsFeign amsFeign;
 
-    @ApiOperation(value="展示订单详情")
+    @ApiOperation(value="展示采购订单详情")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -73,6 +80,100 @@ public class AMScontroller{
         return amsFeign.purchaseOrderDelete(map);
     }
 
+
+    @ApiOperation(value = "采购需求新增接口", notes = "采购需求新增接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/purchaseRequirementAdd")
+    @LogAround(foreignKeys = {"transRequirementId"},foreignKeyTypes = {"采购需求"})
+    public Map<String, Object> purchaseRequirementAdd(@RequestBody(required = false) Map<String ,Object> map) {
+        return amsFeign.purchaseRequirementAdd(map);
+    }
+
+    @ApiOperation(value = "采购需求修改接口", notes = "采购需求修改接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/purchaseRequirementUpdate")
+    @LogAround(foreignKeys = {"transRequirementId"},foreignKeyTypes = {"采购需求"})
+    public Map<String, Object> purchaseRequirementUpdate(@RequestBody(required = false) Map<String ,Object> map) {
+        return amsFeign.purchaseRequirementUpdate(map);
+    }
+
+    @ApiOperation(value = "采购需求修改状态接口", notes = "采购需求修改状态接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/purchaseRequirementChange")
+    @LogAround(foreignKeys = {"transRequirementId"},foreignKeyTypes = {"采购需求"})
+    public Map<String, Object> purchaseRequirementChange(@RequestBody(required = false) Map<String ,Object> map) {
+        return amsFeign.purchaseRequirementChange(map);
+    }
+
+    @ApiOperation(value="展示采购需求详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getPurchaseRequirementList")
+    Map<String, Object> getPurchaseRequirementList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize
+    ){
+        return amsFeign.getPurchaseRequirementList(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    }
+
+    @ApiOperation(value="展示采购计划详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getPurchasePlanList")
+    Map<String, Object> getPurchasePlanList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize
+    ){
+        return amsFeign.getPurchasePlanList(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    }
+
+    @ApiOperation(value = "采购计划新增接口", notes = "采购计划新增接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/purchasePlanAdd")
+    @LogAround(foreignKeys = {"transPlanId"},foreignKeyTypes = {"采购计划"})
+    public Map<String, Object> purchasePlanAdd(@RequestBody(required = false) Map<String ,Object> map) {
+        return amsFeign.purchasePlanAdd(map);
+    }
+
+
+    @ApiOperation(value = "采购计划修改接口", notes = "采购计划修改接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/purchasePlanUpdate")
+    @LogAround(foreignKeys = {"transPlanId"},foreignKeyTypes = {"采购计划"})
+    public Map<String, Object> purchasePlanUpdate(@RequestBody(required = false) Map<String ,Object> map) {
+        return amsFeign.purchasePlanUpdate(map);
+    }
+
+    @ApiOperation(value = "采购计划修改状态接口", notes = "采购计划修改状态接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/purchasePlanChange")
+    @LogAround(foreignKeys = {"transPlanId"},foreignKeyTypes = {"采购计划"})
+    public Map<String, Object> purchasePlanChange(@RequestBody(required = false) Map<String ,Object> map) {
+        return amsFeign.purchasePlanChange(map);
+    }
+
     @ApiOperation(value="同步销售订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/saleOrderSync")
@@ -80,4 +181,53 @@ public class AMScontroller{
     public Map<String, Object> saleOrderSync(@RequestBody(required = false) Map<String ,Object> map) {
         return amsFeign.saleOrderSync(map);
     }
+
+    @ApiOperation(value="承运合同")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getAmsTransPriceList")
+    public Map<String, Object> getAmsTransPriceList(@RequestBody(required = false) Map<String ,Object> map,Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize) {
+        return amsFeign.list(map==null ?new HashMap<>():map,apiId,pageNum,pageSize);
+    }
+    @ApiOperation(value="新增承运合同")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"priceId"},foreignKeyTypes = {"承运合同"})
+    @PostMapping("/")
+    public  Map<String, Object>  insertTransPrice(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
+
+        if (!map.isEmpty()){
+            if (!map.get("priceDate").toString().isEmpty()){
+                SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
+                Date priceDate = simpleDateFormat.parse(map.get("priceDate").toString());
+                map.put("priceDate",priceDate);
+            }
+        }
+        map.put("insertUsername",map.get("userName").toString());
+               return  amsFeign.add(map);
+    }
+
+    @ApiOperation(value="修改承运合同")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/{id}")
+    @LogAround(foreignKeys = {"priceId"},foreignKeyTypes = {"承运合同"})
+    public Map<String, Object> purchaseOrderUpdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map){
+        map.put("updateUsername",map.get("userName").toString());
+        return amsFeign.update(id,map);
+    }
+
+    @ApiOperation(value="承运合同逻辑删除")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/logicdelete")
+    @LogAround(foreignKeys = {"priceId"},foreignKeyTypes = {"承运合同"})
+    public Map<String, Object> purchaseOrderLogicDelete(@RequestBody(required = false) Map<String, Object> map){
+        return amsFeign.logicdelete(map);
+    }
+
+
 }

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

@@ -1,4 +1,5 @@
 package com.steerinfo.dil.controller;
+
 import com.steerinfo.dil.annotaion.LogAround;
 import com.steerinfo.dil.annotaion.RequestLimit;
 import com.steerinfo.dil.feign.RmsFeign;
@@ -15,57 +16,61 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 @RestController
 @RequestMapping("${api.version}/rms")
 public class RMScontroller extends BaseRESTfulController {
     @Autowired
     RmsFeign rmsFeign;
 
-    @ApiOperation(value="查询所有作业环节")
+    @ApiOperation(value = "查询所有作业环节")
     @PostMapping("/getStepTypeList")
-    public Map<String, Object> getStepTypeList(){
-        return  rmsFeign.getStepTypeList();
+    public Map<String, Object> getStepTypeList() {
+        return rmsFeign.getStepTypeList();
     }
 
-    @ApiOperation(value="查询运输路线")
+    @ApiOperation(value = "查询运输路线")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "249", required = false, dataType = "Integer"),
     })
     @PostMapping(value = "/getLineList")
-    public Map<String, Object> getLineList(@RequestBody(required = false) Map<String,Object> mapValue,
+    public Map<String, Object> getLineList(@RequestBody(required = false) Map<String, Object> mapValue,
                                            Integer pageNum,
                                            Integer pageSize,
-                                           Integer apiId){
-        return rmsFeign.getLineList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
+                                           Integer apiId) {
+        return rmsFeign.getLineList(mapValue == null ? new HashMap<>() : mapValue, pageNum, pageSize, apiId);
     }
 
-    @ApiOperation(value="新增运输路线")
+    @ApiOperation(value = "新增运输路线")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "运输路线", required = false, dataType = "Map"),
     })
     @PostMapping("/insertLine")
-    @LogAround(foreignKeys = {"lineId"},foreignKeyTypes = {"运输路线"})
-    public Map<String, Object> insertLine(@RequestBody(required = false) Map<String,Object> mapVal){
+    @LogAround(foreignKeys = {"lineId"}, foreignKeyTypes = {"运输路线"})
+    public Map<String, Object> insertLine(@RequestBody(required = false) Map<String, Object> mapVal) {
         return rmsFeign.insertLine(mapVal);
     }
 
-    @ApiOperation(value="删除运输路线")
+    @ApiOperation(value = "删除运输路线")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "运输路线", required = false, dataType = "Map"),
     })
     @PostMapping("/deleteLine")
-    @LogAround(foreignKeys = {"lineId"},foreignKeyTypes = {"运输路线"})
-    public Map<String, Object> deleteLine(@RequestBody(required = false) Map<String,Object> mapVal){
+    @LogAround(foreignKeys = {"lineId"}, foreignKeyTypes = {"运输路线"})
+    public Map<String, Object> deleteLine(@RequestBody(required = false) Map<String, Object> mapVal) {
         return rmsFeign.deleteLine(mapVal);
     }
 
-    @ApiOperation(value="根据id查询线路详情", notes="")
+    @ApiOperation(value = "根据id查询线路详情", notes = "")
     @ApiImplicitParam(name = "rmsLineStep", value = "rmsLineStep", required = true, dataType = "rmsLineStep")
     @PostMapping(value = "/getRmsLineStep/{id}")
-    public Map<String, Object> getRmsLineStep(@PathVariable("id") BigDecimal id){
+    public Map<String, Object> getRmsLineStep(@PathVariable("id") BigDecimal id) {
         return rmsFeign.getRmsLineStep(id);
     }
 
@@ -79,50 +84,50 @@ public class RMScontroller extends BaseRESTfulController {
                                                    Integer apiId,
                                                    String con) {
 
-        return rmsFeign.getMaterialTypeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        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) {
+    @LogAround(foreignKeys = {"materialTypeId"}, foreignKeyTypes = "物资类型", description = "新增物资类型")
+    public RESTfulResult insertMaterialType(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.insertMaterialType(map);
     }
 
-    @ApiOperation(value="删除物资类型")
+    @ApiOperation(value = "删除物资类型")
     @ApiImplicitParam(name = "rmsMaterialType", value = "rmsMaterialType", required = true, dataType = "rmsMaterialType")
     @PostMapping(value = "/deleteMaterialType")
-    @LogAround(foreignKeys = {"materialTypeId"},foreignKeyTypes = "物资类型",description = "删除物资类型")
-    public RESTfulResult deleteMaterialType(@RequestBody(required = false) Map<String,Object> map){
+    @LogAround(foreignKeys = {"materialTypeId"}, foreignKeyTypes = "物资类型", description = "删除物资类型")
+    public RESTfulResult deleteMaterialType(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.deleteMaterialType(map);
     }
 
-    @ApiOperation(value="同步物资类型")
+    @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){
+    @LogAround(foreignKeys = {"materialTypeId"}, foreignKeyTypes = "物资类型", description = "修改物资类型")
+    public Map<String, Object> syncMaterialType(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.syncMaterialType(map);
     }
 
-    @ApiOperation(value="更新物资类型")
+    @ApiOperation(value = "更新物资类型")
     @ApiImplicitParam(name = "rmsMaterialType", value = "rmsMaterialType", required = true, dataType = "rmsMaterialType")
     @PostMapping(value = "/updateMaterialType")
-    @LogAround(foreignKeys = {"materialTypeId"},foreignKeyTypes = "物资类型",description = "修改物资类型")
-    public Map<String, Object> updateMaterialType(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"materialTypeId"}, foreignKeyTypes = "物资类型", description = "修改物资类型")
+    public Map<String, Object> updateMaterialType(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.updateMaterialType(map);
     }
 
-    @ApiOperation(value="根据id查询物资类型信息", notes="")
+    @ApiOperation(value = "根据id查询物资类型信息", notes = "")
     @ApiImplicitParam(name = "rmsMaterialType", value = "rmsMaterialType", required = true, dataType = "rmsMaterialType")
     @PostMapping(value = "/getMaterialTypeById/{id}")
-    public Map<String, Object> getMaterialTypeById(@PathVariable("id") BigDecimal id){
+    public Map<String, Object> getMaterialTypeById(@PathVariable("id") BigDecimal id) {
         return rmsFeign.getMaterialTypeById(id);
     }
 
 
     //====================物资
-    @ApiOperation(value="获取物资列表")
+    @ApiOperation(value = "获取物资列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -131,52 +136,55 @@ public class RMScontroller extends BaseRESTfulController {
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/getMaterialList")
-    public Map<String, Object> getMaterialList(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getMaterialList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize
-    ){
-        return   rmsFeign.getMaterialList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    ) {
+        return rmsFeign.getMaterialList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
-    @ApiOperation(value="新增物资", notes="根据rmsMaterial对象创建")
+
+    @ApiOperation(value = "新增物资", notes = "根据rmsMaterial对象创建")
     @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
     @PostMapping(value = "/insertMaterial")
-    @LogAround(foreignKeys = {"materialId"},foreignKeyTypes = {"物资"},description = "新增物资")
-    public Map<String, Object> insertMaterial(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"materialId"}, foreignKeyTypes = {"物资"}, description = "新增物资")
+    public Map<String, Object> insertMaterial(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.insertMaterial(map);
     }
-    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
+
+    @ApiOperation(value = "删除", notes = "根据rmsCarrier对象创建")
     @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
     @PostMapping(value = "/deleteMaterial")
-    @LogAround(foreignKeys = {"materialId"},foreignKeyTypes = {"物资"},description = "删除物资")
-    public Map<String, Object> deleteMaterial(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"materialId"}, foreignKeyTypes = {"物资"}, description = "删除物资")
+    public Map<String, Object> deleteMaterial(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.deleteMaterial(map);
     }
 
-    @ApiOperation(value="更新物资", notes="根据rmsMaterial对象创建")
+    @ApiOperation(value = "更新物资", notes = "根据rmsMaterial对象创建")
     @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
     @PostMapping(value = "/updateMaterial")
-    @LogAround(foreignKeys = {"materialId"},foreignKeyTypes = {"物资"},description = "修改物资")
-    public Map<String, Object> updateMaterial(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"materialId"}, foreignKeyTypes = {"物资"}, description = "修改物资")
+    public Map<String, Object> updateMaterial(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.updateMaterial(map);
     }
-    @ApiOperation(value="根据id查询原料信息", notes="根据rmsCarrier对象创建")
+
+    @ApiOperation(value = "根据id查询原料信息", notes = "根据rmsCarrier对象创建")
     @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
     @PostMapping(value = "/getMaterialById/{id}")
-    public Map<String, Object> getMaterialById(@PathVariable("id") BigDecimal id){
+    public Map<String, Object> getMaterialById(@PathVariable("id") BigDecimal id) {
         return rmsFeign.getMaterialById(id);
     }
 
-    @ApiOperation(value="同步物资", notes="根据rmsMaterial对象创建")
+    @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){
+    @LogAround(foreignKeys = {"materialId"}, foreignKeyTypes = {"物资"}, description = "同步物资")
+    public Map<String, Object> syncMaterial(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.syncMaterial(map);
     }
 
     //====================作业点
-    @ApiOperation(value="获取作业点列表")
+    @ApiOperation(value = "获取作业点列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -185,44 +193,54 @@ public class RMScontroller extends BaseRESTfulController {
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/getOperationPointList")
-    public Map<String, Object> getOperationPointList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize
-    ){
-        return   rmsFeign.getOperationPointList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    public Map<String, Object> getOperationPointList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize
+    ) {
+        return rmsFeign.getOperationPointList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
-    @ApiOperation(value="新增作业点", notes="根据rmsOperationPoint对象创建")
+
+    @ApiOperation(value = "新增作业点", notes = "根据rmsOperationPoint对象创建")
     @ApiImplicitParam(name = "rmsOperationPoint", value = "详细实体rmsOperationPoint", required = true, dataType = "rmsOperationPoint")
     @PostMapping(value = "/insertOperationPoint")
-    @LogAround(foreignKeys = {"operationPointId"},foreignKeyTypes = {"作业点"},description = "新增作业点")
-    public Map<String, Object> insertOperationPoint(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"operationPointId"}, foreignKeyTypes = {"作业点"}, description = "新增作业点")
+    public Map<String, Object> insertOperationPoint(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.insertOperationPoint(map);
     }
-    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
+
+    @ApiOperation(value = "删除", notes = "根据rmsCarrier对象创建")
     @ApiImplicitParam(name = "rmsOperationPoint", value = "详细实体rmsOperationPoint", required = true, dataType = "rmsOperationPoint")
     @PostMapping(value = "/deleteOperationPoint")
-    @LogAround(foreignKeys = {"operationPointId"},foreignKeyTypes = {"作业点"},description = "删除作业点")
-    public Map<String, Object> deleteOperationPoint(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"operationPointId"}, foreignKeyTypes = {"作业点"}, description = "删除作业点")
+    public Map<String, Object> deleteOperationPoint(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.deleteOperationPoint(map);
     }
 
-    @ApiOperation(value="更新作业点", notes="根据rmsOperationPoint对象创建")
+    @ApiOperation(value = "更新作业点", notes = "根据rmsOperationPoint对象创建")
     @ApiImplicitParam(name = "rmsOperationPoint", value = "详细实体rmsOperationPoint", required = true, dataType = "rmsOperationPoint")
     @PostMapping(value = "/updateOperationPoint")
-    @LogAround(foreignKeys = {"operationPointId"},foreignKeyTypes = {"作业点"},description = "修改作业点")
-    public Map<String, Object> updateOperationPoint(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"operationPointId"}, foreignKeyTypes = {"作业点"}, description = "修改作业点")
+    public Map<String, Object> updateOperationPoint(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.updateOperationPoint(map);
     }
-    @ApiOperation(value="根据id查询原料信息", notes="根据rmsCarrier对象创建")
+
+    @ApiOperation(value = "根据id查询原料信息", notes = "根据rmsCarrier对象创建")
     @ApiImplicitParam(name = "rmsOperationPoint", value = "详细实体rmsOperationPoint", required = true, dataType = "rmsOperationPoint")
     @PostMapping(value = "/getOperationPointById/{id}")
-    public Map<String, Object> getOperationPointById(@PathVariable("id") BigDecimal id){
+    public Map<String, Object> getOperationPointById(@PathVariable("id") BigDecimal id) {
         return rmsFeign.getOperationPointById(id);
     }
+    @ApiOperation(value = "更新作业点同步作业点", notes = "根据rmsOperationPoint对象创建")
+    @ApiImplicitParam(name = "rmsOperationPoint", value = "详细实体rmsOperationPoint", required = true, dataType = "rmsOperationPoint")
+    @PostMapping(value = "/syncOperationPoint")
+    @LogAround(foreignKeys = {"operationPointId"}, foreignKeyTypes = {"作业点"}, description = "同步作业点")
+    public Map<String, Object> syncOperationPoint(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.syncOperationPoint(map);
+    }
 
     //============人员信息
-    @ApiOperation(value="获取人员信息列表")
+    @ApiOperation(value = "获取人员信息列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -232,57 +250,58 @@ public class RMScontroller extends BaseRESTfulController {
     })
 
     @PostMapping("/getPersonnelList")
-    public Map<String, Object> getPersonnelList(@RequestBody(required = false) Map<String,Object> mapVal,
+    public Map<String, Object> getPersonnelList(@RequestBody(required = false) Map<String, Object> mapVal,
                                                 Integer apiId,
                                                 Integer pageNum,
                                                 Integer pageSize,
                                                 String con
-    ){
+    ) {
 
-        return   rmsFeign.getPersonnelList(mapVal==null?new HashMap<>():mapVal, apiId, pageNum, pageSize,con);
+        return rmsFeign.getPersonnelList(mapVal == null ? new HashMap<>() : mapVal, apiId, pageNum, pageSize, con);
     }
-    @ApiOperation(value="新增人员信息", notes="根据rmsMaterial对象创建")
+
+    @ApiOperation(value = "新增人员信息", notes = "根据rmsMaterial对象创建")
     @ApiImplicitParam(name = "rmsPersonnel", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
     @PostMapping(value = "/insertPersonnel")
-    @LogAround(foreignKeys = {"personnelId"},foreignKeyTypes = {"人员"})
-    public Map<String, Object> insertPersonnel(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"personnelId"}, foreignKeyTypes = {"人员"})
+    public Map<String, Object> insertPersonnel(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.insertPersonnel(map);
     }
-    @ApiOperation(value="删除", notes="根据rmsPersonnel对象创建")
+
+    @ApiOperation(value = "删除", notes = "根据rmsPersonnel对象创建")
     @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
     @PostMapping(value = "/deletePersonnel")
-    @LogAround(foreignKeys = {"personnelId"},foreignKeyTypes = {"人员"})
-    public Map<String, Object> deletePersonnel(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"personnelId"}, foreignKeyTypes = {"人员"})
+    public Map<String, Object> deletePersonnel(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.deletePersonnel(map);
     }
 
-    @ApiOperation(value="更新人员信息", notes="根据rmsMaterial对象创建")
+    @ApiOperation(value = "更新人员信息", notes = "根据rmsMaterial对象创建")
     @ApiImplicitParam(name = "rmsPersonnel", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
     @PostMapping(value = "/updatePersonnel")
-    @LogAround(foreignKeys = {"personnelId"},foreignKeyTypes = {"人员"})
-    public Map<String, Object> updatePersonnel(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"personnelId"}, foreignKeyTypes = {"人员"})
+    public Map<String, Object> updatePersonnel(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.updatePersonnel(map);
     }
 
-    @ApiOperation(value="根据id更新详细人员信息", notes="根据rmsPersonnel对象创建")
+    @ApiOperation(value = "根据id更新详细人员信息", notes = "根据rmsPersonnel对象创建")
     @ApiImplicitParam(name = "rmsPersonnel", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
     @PostMapping(value = "/getPersonnelById/{personnelId}")
-    public Map<String, Object> getPersonnelById(@PathVariable("personnelId")BigDecimal personnelId){
+    public Map<String, Object> getPersonnelById(@PathVariable("personnelId") BigDecimal personnelId) {
         return rmsFeign.getPersonnelById(personnelId);
     }
 
-    @ApiOperation(value="根据id更新详细人员信息", notes="根据rmsPersonnel对象创建")
+    @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){
+    @LogAround(foreignKeys = {"personnelId"}, foreignKeyTypes = {"人员"})
+    public Map<String, Object> syncPersonnel(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.syncPersonnel(map);
     }
 
 
-
     //================公司
-    @ApiOperation(value="展示公司信息")
+    @ApiOperation(value = "展示公司信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -291,82 +310,88 @@ public class RMScontroller extends BaseRESTfulController {
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/getCompanyList")
-    public Map<String, Object> getCompanyList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize
-    ){
-        return   rmsFeign.getCompanyList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    public Map<String, Object> getCompanyList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize
+    ) {
+        return rmsFeign.getCompanyList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
-    @ApiOperation(value="新增公司信息", notes="根据rmsCompany对象创建")
+
+    @ApiOperation(value = "新增公司信息", notes = "根据rmsCompany对象创建")
     @ApiImplicitParam(name = "rmsCompany", value = "详细实体rmsCompany", required = true, dataType = "rmsCompany")
     @PostMapping(value = "/insertCompany")
-    @LogAround(foreignKeys = {"companyId"},foreignKeyTypes = "公司",description = "新增公司单位")
-    public Map<String, Object> insertCompany(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"companyId"}, foreignKeyTypes = "公司", description = "新增公司单位")
+    public Map<String, Object> insertCompany(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.insertCompany(map);
     }
-    @ApiOperation(value="删除")
+
+    @ApiOperation(value = "删除")
     @ApiImplicitParam(name = "公司id", value = "id", required = true, dataType = "int")
     @PostMapping(value = "/deleteCompany")
-    @LogAround(foreignKeys = {"companyId"},foreignKeyTypes = "公司",description = "删除公司单位")
-    public Map<String, Object> deleteCompany(@RequestBody Map<String,Object> map){
+    @LogAround(foreignKeys = {"companyId"}, foreignKeyTypes = "公司", description = "删除公司单位")
+    public Map<String, Object> deleteCompany(@RequestBody Map<String, Object> map) {
         return rmsFeign.deleteCompany(map);
     }
 
-    @ApiOperation(value="更新公司信息", notes="根据rmsCompany对象创建")
+    @ApiOperation(value = "更新公司信息", notes = "根据rmsCompany对象创建")
     @ApiImplicitParam(name = "rmsCompany", value = "详细实体rmsCompany", required = true, dataType = "rmsCompany")
     @PostMapping(value = "/updateCompany")
-    @LogAround(foreignKeys = {"companyId"},foreignKeyTypes = "公司",description = "修改公司单位")
-    public Map<String, Object> updateCompany(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"companyId"}, foreignKeyTypes = "公司", description = "修改公司单位")
+    public Map<String, Object> updateCompany(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.updateCompany(map);
     }
-    @ApiOperation(value="根据id查询公司信息", notes="根据rmsCompany对象创建")
+
+    @ApiOperation(value = "根据id查询公司信息", notes = "根据rmsCompany对象创建")
     @ApiImplicitParam(name = "公司id", value = "id", required = true, dataType = "int")
     @PostMapping(value = "/getCompanyById/{id}")
-    public Map<String, Object> getCompanyById(@PathVariable("id")BigDecimal id){
+    public Map<String, Object> getCompanyById(@PathVariable("id") BigDecimal id) {
         return rmsFeign.getCompanyById(id);
     }
 
-    @ApiOperation(value="同步公司", notes="根据rmsCompany对象创建")
+    @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){
+    @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对象创建")
+    @ApiOperation(value = "新增运力信息", notes = "根据rmsCapacity对象创建")
     @ApiImplicitParam(name = "rmsCapacity", value = "详细实体rmsCapacity", required = true, dataType = "rmsCapacity")
     @PostMapping(value = "/insertCapacity")
-    @LogAround(foreignKeys = {"capacityId"},foreignKeyTypes = {"运力"})
-    public Map<String, Object> insertCapacity(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"capacityId"}, foreignKeyTypes = {"运力"})
+    public Map<String, Object> insertCapacity(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.insertCapacity(map);
     }
-    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
+
+    @ApiOperation(value = "删除", notes = "根据rmsCarrier对象创建")
     @ApiImplicitParam(name = "运力id", value = "id", required = true, dataType = "int")
     @PostMapping(value = "/deleteCapacity")
-    @LogAround(foreignKeys = {"capacityId"},foreignKeyTypes = {"运力"})
-    public Map<String, Object> deleteCapacity(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"capacityId"}, foreignKeyTypes = {"运力"})
+    public Map<String, Object> deleteCapacity(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.deleteCapacity(map);
     }
 
-    @ApiOperation(value="获取运力详细信息", notes="根据url的id来获取详细信息")
+    @ApiOperation(value = "获取运力详细信息", notes = "根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
     @PostMapping(value = "/getCapacityById")
-    public Map<String,Object> getCapacityById(@RequestBody Map<String, Object> map){
+    public Map<String, Object> getCapacityById(@RequestBody Map<String, Object> map) {
         return rmsFeign.getCapacityById(map);
     }
-    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCapacity信息来更新详细信息")
+
+    @ApiOperation(value = "更新详细信息", notes = "根据url的id来指定更新对象，并根据传过来的rmsCapacity信息来更新详细信息")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Short"),
             @ApiImplicitParam(name = "rmsCapacity", value = "详细实体rmsCapacity", required = true, dataType = "RmsCapacity")
     })
-    @PostMapping(value = "/updateCapacity", produces  = "application/json;charset=UTF-8")
-    @LogAround(foreignKeys = {"capacityId"},foreignKeyTypes = {"运力"})
-    public Map<String, Object> updateCapacity( @RequestBody Map<String, Object> map){
+    @PostMapping(value = "/updateCapacity", produces = "application/json;charset=UTF-8")
+    @LogAround(foreignKeys = {"capacityId"}, foreignKeyTypes = {"运力"})
+    public Map<String, Object> updateCapacity(@RequestBody Map<String, Object> map) {
         return rmsFeign.updateCapacity(map);
     }
+
     @PostMapping("/getCapacityList")
     @ApiOperation(value = "模糊查询运力")
     public Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -376,30 +401,31 @@ public class RMScontroller extends BaseRESTfulController {
                                                String con,
                                                String carrierSSOId) {
 
-        return rmsFeign.getCapacityList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,carrierSSOId);
+        return rmsFeign.getCapacityList(mapValue == null ? new HashMap<>() : mapValue, pageNum, pageSize, apiId, con, carrierSSOId);
     }
 
 
-    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
+    @ApiOperation(value = "删除", notes = "根据rmsCarrier对象创建")
     @ApiImplicitParam(name = "仓库id", value = "id", required = true, dataType = "int")
     @PostMapping(value = "/deleteWarehouse/{id}")
-    public Map<String, Object> deleteWarehouse(@PathVariable("id")BigDecimal id){
+    public Map<String, Object> deleteWarehouse(@PathVariable("id") BigDecimal id) {
         return rmsFeign.deleteWarehouse(id);
     }
 
-    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCarDriver信息来更新详细信息")
+    @ApiOperation(value = "更新详细信息", notes = "根据url的id来指定更新对象，并根据传过来的rmsCarDriver信息来更新详细信息")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
             @ApiImplicitParam(name = "rmsWarehouse", value = "详细实体rmsWarehouse", required = true, dataType = "RmsWarehouse")
     })
-    @PostMapping(value = "/updateWarehouse", produces  = "application/json;charset=UTF-8")
-    public Map<String, Object> updateWarehouse( @RequestBody Map<String, Object> map){
+    @PostMapping(value = "/updateWarehouse", produces = "application/json;charset=UTF-8")
+    public Map<String, Object> updateWarehouse(@RequestBody Map<String, Object> map) {
         return rmsFeign.updateWarehouse(map);
     }
-    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+
+    @ApiOperation(value = "获取详细信息", notes = "根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
     @PostMapping(value = "/getWarehouseById/{id}")
-    public Map<String, Object> getWarehouseById(@PathVariable("id") BigDecimal id){
+    public Map<String, Object> getWarehouseById(@PathVariable("id") BigDecimal id) {
         return rmsFeign.getWarehouseById(id);
     }
 
@@ -411,31 +437,32 @@ public class RMScontroller extends BaseRESTfulController {
                                                 Integer apiId,
                                                 String con) {
 
-        return rmsFeign.getWarehouseList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return rmsFeign.getWarehouseList(mapValue == null ? new HashMap<>() : mapValue, pageNum, pageSize, apiId, con);
     }
-    @ApiOperation(value="展示司机排班信息", notes="分页查询")
+
+    @ApiOperation(value = "展示司机排班信息", notes = "分页查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "apiId", value = "196", required = false, dataType = "BigDecimal"),
     })
     @PostMapping(value = "/getDriverCapacityList")
-    public Map<String, Object> getDriverCapacityList(@RequestBody(required = false) Map<String,Object> mapValue,
+    public Map<String, Object> getDriverCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                      Integer pageNum,
                                                      Integer pageSize,
-                                                     Integer apiId){
+                                                     Integer apiId) {
         return rmsFeign.getDriverCapacityList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
-    @ApiOperation(value="创建", notes="根据RmsDriverCapacity对象创建")
+    @ApiOperation(value = "创建", notes = "根据RmsDriverCapacity对象创建")
     @ApiImplicitParam(name = "rmsDriverCapacity", value = "详细实体rmsDriverCapacity", required = true, dataType = "RmsDriverCapacity")
     @PostMapping(value = "/insertDriverCapacity")
-    public Map<String, Object> insertDriverCapacity(@RequestBody(required = false) Map<String, Object> map ){
+    public Map<String, Object> insertDriverCapacity(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.insertDriverCapacity(map);
     }
 
 
-    @ApiOperation(value="展示门岗信息")
+    @ApiOperation(value = "展示门岗信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -445,50 +472,55 @@ public class RMScontroller extends BaseRESTfulController {
     })
 
     @PostMapping("/getGatepostList")
-    public Map<String, Object> getGatepostList(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getGatepostList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
                                                String con
-    ){
-        return   rmsFeign.getGatepostList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+    ) {
+        return rmsFeign.getGatepostList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
     }
-    @ApiOperation(value="新增门岗信息", notes="根据rmsGatepost对象创建")
+
+    @ApiOperation(value = "新增门岗信息", notes = "根据rmsGatepost对象创建")
     @ApiImplicitParam(name = "rmsGatepost", value = "详细实体rmsGatepost", required = true, dataType = "rmsGatepost")
     @PostMapping(value = "/insertGatepost")
-    public Map<String, Object> insertGatepost(@RequestBody(required = false) Map<String, Object> map){
+    public Map<String, Object> insertGatepost(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.insertGatepost(map);
     }
-    @ApiOperation(value="删除", notes="根据rmsGatepost对象创建")
+
+    @ApiOperation(value = "删除", notes = "根据rmsGatepost对象创建")
     @ApiImplicitParam(name = "门岗id", value = "id", required = true, dataType = "int")
     @PostMapping(value = "/deleteGatepost/{id}")
-    public Map<String, Object> deleteGatepost(@PathVariable("id")BigDecimal id){
+    public Map<String, Object> deleteGatepost(@PathVariable("id") BigDecimal id) {
         return rmsFeign.deleteGatepost(id);
     }
 
-    @ApiOperation(value="更新门岗信息", notes="根据rmsGatepost对象创建")
+    @ApiOperation(value = "更新门岗信息", notes = "根据rmsGatepost对象创建")
     @ApiImplicitParam(name = "rmsGatepost", value = "详细实体rmsGatepost", required = true, dataType = "rmsGatepost")
     @PostMapping(value = "/updateGatepost")
-    public Map<String, Object> updateGatepost(@RequestBody(required = false) Map<String, Object> map){
+    public Map<String, Object> updateGatepost(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.updateGatepost(map);
     }
-    @ApiOperation(value="根据id查询门岗信息", notes="根据rmsGatepost对象创建")
+
+    @ApiOperation(value = "根据id查询门岗信息", notes = "根据rmsGatepost对象创建")
     @ApiImplicitParam(name = "门岗id", value = "id", required = true, dataType = "int")
     @PostMapping(value = "/getGatepostById/{id}")
-    public Map<String, Object> getGatepostById(@PathVariable("id")BigDecimal id){
+    public Map<String, Object> getGatepostById(@PathVariable("id") BigDecimal id) {
         return rmsFeign.getGatepostById(id);
     }
-    @ApiOperation(value="根据id查询门岗规则信息", notes="根据rmsGatepost对象创建")
+
+    @ApiOperation(value = "根据id查询门岗规则信息", notes = "根据rmsGatepost对象创建")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "门岗id", value = "id", required = true, dataType = "int")
     })
     @PostMapping(value = "/getGatepostRulesById/{id}")
-    public Map<String, Object> getGatepostRulesById(@PathVariable("id")BigDecimal id,
-                                                    Integer apiId){
-        return rmsFeign.getGatepostRulesById(id,apiId);
+    public Map<String, Object> getGatepostRulesById(@PathVariable("id") BigDecimal id,
+                                                    Integer apiId) {
+        return rmsFeign.getGatepostRulesById(id, apiId);
     }
-    @ApiOperation(value="展示门岗规则信息")
+
+    @ApiOperation(value = "展示门岗规则信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -498,35 +530,37 @@ public class RMScontroller extends BaseRESTfulController {
     })
 
     @PostMapping("/getGatepostRulesList")
-    public Map<String, Object> getGatepostRulesList(@RequestBody(required=false) Map<String,Object> mapValue,
+    public Map<String, Object> getGatepostRulesList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                     Integer apiId,
                                                     Integer pageNum,
                                                     Integer pageSize,
                                                     String con
-    ){
-        return   rmsFeign.getGatepostRulesList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+    ) {
+        return rmsFeign.getGatepostRulesList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
     }
 
-    @ApiOperation(value="删除", notes="根据rulesId删除")
+    @ApiOperation(value = "删除", notes = "根据rulesId删除")
     @ApiImplicitParam(name = "门岗规则id", value = "rulesId", required = true, dataType = "int")
     @PostMapping(value = "/deleteGatepostRules/{rulesId}")
     public Map<String, Object> deleteGatepostRules(@PathVariable("rulesId") BigDecimal rulesId) {
         return rmsFeign.deleteGatepostRules(rulesId);
     }
-    @ApiOperation(value="新增门岗规则")
+
+    @ApiOperation(value = "新增门岗规则")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "门岗规则", required = false, dataType = "Map"),
     })
     @PostMapping("/insertGatepostRule")
-    public Map<String, Object> insertGatepostRule(@RequestBody(required = false) Map<String,Object> mapValue){
+    public Map<String, Object> insertGatepostRule(@RequestBody(required = false) Map<String, Object> mapValue) {
         return rmsFeign.insertGatepostRule(mapValue);
     }
-    @ApiOperation(value="获取门岗名")
+
+    @ApiOperation(value = "获取门岗名")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "门岗id", value = "gatepostId", required = true, dataType = "int")
     })
     @PostMapping("/getGatepostName/{gatepostId}")
-    public Map<String, Object> getGatepostName(@PathVariable("gatepostId") BigDecimal gatepostId){
+    public Map<String, Object> getGatepostName(@PathVariable("gatepostId") BigDecimal gatepostId) {
         return rmsFeign.getGatepostName(gatepostId);
     }
 
@@ -548,7 +582,7 @@ public class RMScontroller extends BaseRESTfulController {
 
     @GetMapping("getTransportTypeId")
     @ApiOperation(value = "运输类型下拉")
-    public Map<String,Object> getTransportTypeId(){
+    public Map<String, Object> getTransportTypeId() {
         return rmsFeign.getTransportTypeId();
     }
 
@@ -566,7 +600,7 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getNoticeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
     }
 
-    @ApiOperation(value="新增公告信息", notes="根据DilNotice对象创建")
+    @ApiOperation(value = "新增公告信息", notes = "根据DilNotice对象创建")
     @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "DilNotice")
     @PostMapping(value = "/insertNotice")
     public Map<String, Object> insertNotice(@RequestBody(required = false) Map<String, Object> map) {
@@ -575,12 +609,12 @@ public class RMScontroller extends BaseRESTfulController {
 
     @ApiOperation(value = "更新公告信息", notes = "根据dilNotice对象创建")
     @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "dilNotice")
-    @PostMapping(value = "/updateNotice", produces  = "application/json;charset=UTF-8")
+    @PostMapping(value = "/updateNotice", produces = "application/json;charset=UTF-8")
     public Map<String, Object> updateNotice(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.updateNotice(map);
     }
 
-    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiOperation(value = "删除", notes = "根据url的id来指定删除对象")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
     @PostMapping(value = "/deleteNotice/{id}")//BigDecimal
     public Map<String, Object> deleteNotice(@PathVariable("id") BigDecimal id) {
@@ -588,11 +622,10 @@ public class RMScontroller extends BaseRESTfulController {
     }
 
 
-
-    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiOperation(value = "获取详细信息", notes = "根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "公告id", value = "ID", required = true, dataType = "BigDecimal")
     @PostMapping(value = "/getNoticeById/{id}")
-    public Map<String, Object> getNoticeById(@PathVariable("id") BigDecimal id){
+    public Map<String, Object> getNoticeById(@PathVariable("id") BigDecimal id) {
         return rmsFeign.getNoticeById(id);
     }
 
@@ -609,10 +642,10 @@ public class RMScontroller extends BaseRESTfulController {
 
     @PostMapping(value = "/getOilPriceResultList")
     public Map<String, Object> getOilPriceResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                             Integer apiId,
-                                             Integer pageNum,
-                                             Integer pageSize,
-                                             String con
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     String con
     ) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
@@ -620,7 +653,7 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getOilPriceResultList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
     }
 
-    @ApiOperation(value="新增油价信息", notes="根据DilNotice对象创建")
+    @ApiOperation(value = "新增油价信息", notes = "根据DilNotice对象创建")
     @ApiImplicitParam(name = "addOilPrice", value = "详细实体dilNotice", required = true, dataType = "DilNotice")
     @PostMapping(value = "/insertOilPrice")
     public Map<String, Object> insertOilPrice(@RequestBody(required = false) Map<String, Object> map) {
@@ -633,131 +666,256 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.updateOilPrice(mapValue);
     }
 
-    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiOperation(value = "删除", notes = "根据url的id来指定删除对象")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
     @PostMapping(value = "/deleteOilPrice/{id}")//BigDecimal
     public Map<String, Object> deleteOilPrice(@PathVariable("id") BigDecimal id) {
         return rmsFeign.deleteOilPrice(id);
     }
 
-    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiOperation(value = "获取详细信息", notes = "根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "公告id", value = "ID", required = true, dataType = "BigDecimal")
     @PostMapping(value = "/getOilPriceById/{id}")
-    public Map<String, Object> getOilPriceById(@PathVariable("id") BigDecimal id){
+    public Map<String, Object> getOilPriceById(@PathVariable("id") BigDecimal id) {
         return rmsFeign.getOilPriceById(id);
     }
 
     //根据运力id查询公司
     @PostMapping(value = "getCarrierNameById/{id}")
-    public Map<String,Object> getCarrierNameById(@PathVariable("id") BigDecimal id){
+    public Map<String, Object> getCarrierNameById(@PathVariable("id") BigDecimal id) {
         return rmsFeign.getCarrierNameById(id);
     }
-   //根据司机id查询公司
-   @PostMapping(value = "getCarrierNameByDriverId/{id}")
-   public Map<String,Object> getCarrierNameByDriverId(@PathVariable("id") BigDecimal id){
-       return rmsFeign.getCarrierNameByDriverId(id);
-   }
+
+    //根据司机id查询公司
+    @PostMapping(value = "getCarrierNameByDriverId/{id}")
+    public Map<String, Object> getCarrierNameByDriverId(@PathVariable("id") BigDecimal id) {
+        return rmsFeign.getCarrierNameByDriverId(id);
+    }
 
 
-    @ApiOperation(value="创建", notes="添加油品名称")
+    @ApiOperation(value = "创建", notes = "添加油品名称")
     @ApiImplicitParam(name = "oilTypeName", value = "油品名称", required = true, dataType = "String")
     @PostMapping(value = "/addOilType")
-    public Map<String, Object> addOilType(String oilTypeName){
+    public Map<String, Object> addOilType(String oilTypeName) {
         return rmsFeign.addOilType(oilTypeName);
     }
 
-    @ApiOperation(value="创建", notes="查询油品名称")
+    @ApiOperation(value = "创建", notes = "查询油品名称")
     @PostMapping(value = "/oilNameSelect")
-    public Map<String, Object> oilNameSelect(){
+    public Map<String, Object> oilNameSelect() {
         return rmsFeign.oilNameSelect();
     }
 
     @ApiOperation("解除公司和车辆的绑定关系")
     @PostMapping("/deleteCapacityCarrier")
-    public RESTfulResult deleteCapacityCarrier(@RequestBody(required = false) Map<String,Object> map){
-        return rmsFeign.deleteCapacityCarrier(map!=null?map:new HashMap<>());
+    public RESTfulResult deleteCapacityCarrier(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.deleteCapacityCarrier(map != null ? map : new HashMap<>());
     }
 
 
     @ApiOperation("渲染运力修改数据")
     @PostMapping("/getCapacityInfoById/{id}")
-    public Map<String, Object> getCapacityInfoById(@PathVariable("id") Integer id){
+    public Map<String, Object> getCapacityInfoById(@PathVariable("id") Integer id) {
         return rmsFeign.getCapacityInfoById(id);
     }
 
     @ApiOperation(value = "查询运力类型")
     @PostMapping("/getCapacityType")
-    public Map<String, Object> getCapacityType(@RequestBody(required = false) Map<String,Object> map,
-                                            Integer apiId,
-                                            Integer pageNum,
-                                            Integer pageSize) {
-        if(map==null){
-           map=new HashMap<>();
+    public Map<String, Object> getCapacityType(@RequestBody(required = false) Map<String, Object> map,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize) {
+        if (map == null) {
+            map = new HashMap<>();
         }
-        return rmsFeign.getCapacityType(map,apiId,pageNum,pageSize);
+        return rmsFeign.getCapacityType(map, apiId, pageNum, pageSize);
     }
 
-    @ApiOperation(value="新增运力类型")
+    @ApiOperation(value = "新增运力类型")
     @PostMapping(value = "/insertCapacityType")
-    @LogAround(foreignKeys = {"capacityTypeId"},foreignKeyTypes = {"运力类型"})
-    public Map<String, Object> insertCapacityType(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"capacityTypeId"}, foreignKeyTypes = {"运力类型"})
+    public Map<String, Object> insertCapacityType(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.insertCapacityType(map);
     }
 
-    @ApiOperation(value="删除运力类型")
+    @ApiOperation(value = "删除运力类型")
     @PostMapping(value = "/deleteCapacityType")
-    @LogAround(foreignKeys = {"capacityTypeId"},foreignKeyTypes = {"运力类型"})
-    public Map<String, Object> deleteCapacityType(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"capacityTypeId"}, foreignKeyTypes = {"运力类型"})
+    public Map<String, Object> deleteCapacityType(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.deleteCapacityType(map);
     }
 
     @ApiOperation(value = "查询运输范围")
     @PostMapping("/getTransRangeList")
-    public Map<String, Object> getTransRangeList(@RequestBody(required = false) Map<String,Object> map,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize) {
-        if(map==null){
-            map=new HashMap<>();
+    public Map<String, Object> getTransRangeList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        if (map == null) {
+            map = new HashMap<>();
         }
-        return rmsFeign.getTransRangeList(map,apiId,pageNum,pageSize);
+        return rmsFeign.getTransRangeList(map, apiId, pageNum, pageSize);
     }
 
-    @ApiOperation(value="新增运输范围")
+    @ApiOperation(value = "新增运输范围")
     @PostMapping(value = "/insertTransRange")
-    @LogAround(foreignKeys = {"transRangeId"},foreignKeyTypes = "运输范围")
-    public Map<String, Object> insertTransRange(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"transRangeId"}, foreignKeyTypes = "运输范围")
+    public Map<String, Object> insertTransRange(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.insertTransRange(map);
     }
 
     @PostMapping(value = "/test")
-    @LogAround(foreignKeys = {"orderId"},foreignKeyTypes = {"运输订单"},description = "测试日志功能")
-    public RESTfulResult test(@RequestBody(required = false) Map<String, Object> map){
-        return success(map,"测试成功！");
+    @LogAround(foreignKeys = {"orderId"}, foreignKeyTypes = {"运输订单"}, description = "测试日志功能")
+    public RESTfulResult test(@RequestBody(required = false) Map<String, Object> map) {
+        return success(map, "测试成功！");
     }
 
     @ApiOperation(value = "新增集装箱数据")
     @PostMapping("insetShipContainer")
-    public Map<String,Object> insetShipContainer(@RequestBody(required = false) Map<String,Object> map) {
+    public Map<String, Object> insetShipContainer(@RequestBody(required = false) Map<String, Object> map) {
 
-                return rmsFeign.insetShipContainer(map);
+        return rmsFeign.insetShipContainer(map);
     }
 
     @ApiOperation(value = "修改集装箱数据")
     @PostMapping("updateShipContainer")
-    public Map<String,Object> updateShipContainer(@RequestBody List<Map<String,Object>> mapList) {
+    public Map<String, Object> updateShipContainer(@RequestBody List<Map<String, Object>> mapList) {
         return rmsFeign.updateShipContainer(mapList);
     }
 
     @ApiOperation("查询集装箱数据")
     @PostMapping("getShippingContainer")
-    public Map<String,Object> getShippingContainer(@RequestBody(required = false) Map<String,Object> map,
-                                                   @RequestParam(required = false) Integer apiId,
-                                                   @RequestParam(required = false) Integer pageNum,
-                                                   @RequestParam(required = false) Integer pageSize){
-        if(map==null){
-            map=new HashMap<>();
+    public Map<String, Object> getShippingContainer(@RequestBody(required = false) Map<String, Object> map,
+                                                    @RequestParam(required = false) Integer apiId,
+                                                    @RequestParam(required = false) Integer pageNum,
+                                                    @RequestParam(required = false) Integer pageSize) {
+        if (map == null) {
+            map = new HashMap<>();
         }
-        return rmsFeign.getShippingContainer(map,apiId,pageNum,pageSize);
+        return rmsFeign.getShippingContainer(map, apiId, pageNum, pageSize);
+    }
+
+    //   ========================= 岗位信息维护
+    @ApiOperation(value = "岗位信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getrmsrmsjobinfos")
+    public Map<String, Object> getAmsTransPriceList(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize) {
+        return rmsFeign.list(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+    @ApiOperation(value="新增岗位信息")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"jobId"},foreignKeyTypes = {"岗位信息"})
+    @PostMapping("/add")
+    public  Map<String, Object>  insertTransPrice(@RequestBody(required = false) Map<String, Object> map) {
+        map.put("insertUsername",  map.get("userName").toString());
+        return  rmsFeign.add(map);
+    }
+
+    @ApiOperation(value="修改岗位信息")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/{id}")
+    @LogAround(foreignKeys = {"jobId"},foreignKeyTypes = {"岗位信息"})
+    public Map<String, Object> purchaseOrderUpdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map){
+        map.put("updateUsername", map.get("userName").toString());
+        return rmsFeign.update(id,map);
+    }
+
+    @ApiOperation(value="岗位信息逻辑删除")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/logicdelete")
+    @LogAround(foreignKeys = {"jobId"},foreignKeyTypes = {"岗位信息"})
+    public Map<String, Object> purchaseOrderLogicDelete(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.logicdelete(map);
+    }
+    @PostMapping(value = "/readExcel")
+    public RESTfulResult readExcel(MultipartFile file){
+        return rmsFeign.readExcel(file);
+    }
+    //   ========================= 提取比例维护
+    @ApiOperation(value = "提取比例")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getrmsextractscales")
+    public Map<String, Object> getextractscalelist(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize) {
+        return rmsFeign.extractscalelist(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+    @ApiOperation(value="新增提取比例")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"scaleId"},foreignKeyTypes = {"提取比例"})
+    @PostMapping("/addextractscale")
+    public  Map<String, Object> insertExtractscale(@RequestBody(required = false) Map<String, Object> map) {
+        map.put("insertUsername",  map.get("userName").toString());
+        return  rmsFeign.addExtractscale(map);
+    }
+
+    @ApiOperation(value="提取比例逻辑删除")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/extractscalelogicdelete")
+    @LogAround(foreignKeys = {"scaleId"},foreignKeyTypes = {"提取比例"})
+    public Map<String, Object> ExtractscaleLogicDelete(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.Extractscalelogicdelete(map);
+    }
+
+    @ApiOperation(value="修改提取比例")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/extractscale/{id}")
+    @LogAround(foreignKeys = {"scaleId"},foreignKeyTypes = {"提取比例"})
+    public Map<String, Object> ExtractscaleUpdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map){
+        map.put("updateUsername", map.get("userName").toString());
+        return rmsFeign.Extractscaleupdate(id,map);
+    }
+
+    //   ========================= 计算公式
+
+    @ApiOperation(value = "计算公式")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getformula")
+    public Map<String, Object> geteformulalist(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize) {
+        return rmsFeign.FormulaList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+    @ApiOperation(value="新增计算公式")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"formulaId"},foreignKeyTypes = {"计算公式"})
+    @PostMapping("/addformula")
+    public  Map<String, Object> insertformula(@RequestBody(required = false) Map<String, Object> map) {
+        map.put("insertUsername",  map.get("userName").toString());
+        return  rmsFeign.addFormula(map);
+    }
+
+    @ApiOperation(value="计算公式逻辑删除")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/formulalogicdelete")
+    @LogAround(foreignKeys = {"formulaId"},foreignKeyTypes = {"计算公式"})
+    public Map<String, Object> formulaLogicDelete(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.Formulalogicdelete(map);
+    }
+
+    @ApiOperation(value="修改计算公式")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/formulaupadete/{id}")
+    @LogAround(foreignKeys = {"formulaId"},foreignKeyTypes = {"计算公式"})
+    public Map<String, Object> formulaUpdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map){
+        map.put("updateUsername", map.get("userName").toString());
+        return rmsFeign.Formulaupdate(id,map);
     }
 }

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

@@ -52,17 +52,21 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "边输边查物资类型")
     @GetMapping("/getMaterialTypeByLike")
-    public RESTfulResult getMaterialTypeByLike(String index) {
-        List<Map<String, Object>> list = universalMapper.getMaterialTypeByLike(index == null ? "" : index);
+    public RESTfulResult getMaterialTypeByLike(String index,String id) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("index",index);
+        map.put("id",id);
+        List<Map<String, Object>> list = universalMapper.getMaterialTypeByLike(map);
         return success(list);
     }
 
     @ApiModelProperty(value = "边输边查公司单位")
     @GetMapping("/getCompanyMesByLike")
-    public RESTfulResult getCompanyMesByLike(String index,String companyType) {
+    public RESTfulResult getCompanyMesByLike(String index,String companyType,String id) {
         Map<String,Object> map = new HashMap<>();
         map.put("index",index);
         map.put("companyType",companyType);
+        map.put("id",id);
         List<Map<String, Object>> list = universalMapper.getCompanyMesByLike(map);
         return success(list);
     }
@@ -70,26 +74,31 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "边输边查环保标准")
     @GetMapping("/getEmissionStandardByLike")
-    public RESTfulResult getEmissionStandardByLike(String index) {
-        List<Map<String, Object>> list = universalMapper.getEmissionStandardByLike(index == null ? "" : index);
+    public RESTfulResult getEmissionStandardByLike(String index,String id) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("index",index);
+        map.put("id",id);
+        List<Map<String, Object>> list = universalMapper.getEmissionStandardByLike(map);
         return success(list);
     }
 
     @ApiModelProperty(value = "边输边查作业点")
     @GetMapping("/getOperationPointByLike")
-    public RESTfulResult getOperationPointByLike(String index,String operationPointType) {
+    public RESTfulResult getOperationPointByLike(String index,String operationPointType,String id) {
         Map<String,Object> map = new HashMap<>();
         map.put("index",index);
         map.put("operationPointType",operationPointType);
+        map.put("id",id);
         List<Map<String, Object>> list = universalMapper.getOperationPointByLike(map);
         return success(list);
     }
 
     @ApiModelProperty(value = "边输边查人员")
     @GetMapping("/getPersonnelByLike")
-    public RESTfulResult getPersonnelByLike(String index) {
+    public RESTfulResult getPersonnelByLike(String index,String id) {
         Map<String,Object> map = new HashMap<>();
         map.put("index",index);
+        map.put("id",id);
         List<Map<String, Object>> list = universalMapper.getPersonnelByLike(map);
         return success(list);
     }

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

@@ -1,9 +1,11 @@
 package com.steerinfo.dil.feign;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
@@ -34,6 +36,50 @@ public interface AmsFeign {
                                      @RequestParam  Integer pageSize
     );
 
+    @PostMapping(value = "api/v1/ams/amstransrequirements/purchaseRequirementAdd")
+    Map<String, Object> purchaseRequirementAdd(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/purchaseRequirementUpdate")
+    Map<String, Object> purchaseRequirementUpdate(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/purchaseRequirementChange")
+    Map<String, Object> purchaseRequirementChange(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/getPurchaseRequirementList")
+    Map<String, Object> getPurchaseRequirementList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   @RequestParam  Integer apiId,
+                                                   @RequestParam  Integer pageNum,
+                                                   @RequestParam  Integer pageSize);
+
+    @PostMapping(value = "api/v1/ams/amstransplans/getPurchasePlanList")
+    Map<String, Object> getPurchasePlanList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   @RequestParam  Integer apiId,
+                                                   @RequestParam  Integer pageNum,
+                                                   @RequestParam  Integer pageSize);
+
+    @PostMapping(value = "api/v1/ams/amstransplans/purchasePlanAdd")
+    Map<String, Object> purchasePlanAdd(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransplans/purchasePlanUpdate")
+    Map<String, Object> purchasePlanUpdate(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransplans/purchasePlanChange")
+    Map<String, Object> purchasePlanChange(Map<String, Object> map);
+
     @PostMapping("api/v1/ams/amsorders/saleOrderSync")
     Map<String, Object> saleOrderSync(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/ams/amstransprices/getAmsTransPriceList")
+        Map<String, Object> list(@RequestBody(required = false) Map<String, Object> map,@RequestParam  Integer apiId,
+                             @RequestParam  Integer pageNum,
+                             @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/ams/amstransprices/")
+    Map<String, Object> add(@RequestBody(required = false) Map<String, Object> map);
+
+    @PutMapping("api/v1/ams/amstransprices/{id}")
+    Map<String, Object> update(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+
+    @PutMapping("api/v1/ams/amstransprices/logicdelete")
+    Map<String, Object> logicdelete(@RequestBody(required = false) Map<String, Object> map);
 }

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

@@ -1,4 +1,5 @@
 package com.steerinfo.dil.feign;
+
 import com.steerinfo.dil.annotaion.LogAround;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
@@ -21,16 +22,16 @@ public interface RmsFeign {
     Map<String, Object> getStepTypeList();
 
     @PostMapping("/api/v1/rms/rmslines/insertLine")
-    Map<String, Object> insertLine(@RequestBody(required = false) Map<String,Object> mapVal);
+    Map<String, Object> insertLine(@RequestBody(required = false) Map<String, Object> mapVal);
 
     @PostMapping("/api/v1/rms/rmslines/deleteLine")
-    Map<String, Object> deleteLine(@RequestBody(required = false) Map<String,Object> mapVal);
+    Map<String, Object> deleteLine(@RequestBody(required = false) Map<String, Object> mapVal);
 
     @PostMapping(value = "/api/v1/rms/rmslines/getLineList")
-    Map<String, Object> getLineList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                        @RequestParam("pageNum") Integer pageNum,
-                                        @RequestParam("pageSize")Integer pageSize,
-                                        @RequestParam("apiId")Integer apiId);
+    Map<String, Object> getLineList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                    @RequestParam("pageNum") Integer pageNum,
+                                    @RequestParam("pageSize") Integer pageSize,
+                                    @RequestParam("apiId") Integer apiId);
 
     @PostMapping("api/v1/rms/rmslines/getRmsLineStep/{id}")
     Map<String, Object> getRmsLineStep(@PathVariable("id") BigDecimal id);
@@ -46,12 +47,15 @@ public interface RmsFeign {
     //修改司机信息
     @PostMapping(value = "api/v1/rms/rmscardriver/updateCarDriver")
     Map<String, Object> updateCarDriver(Map<String, Object> map);
+
     //通过id查询司机信息
     @PostMapping(value = "api/v1/rms/rmscardriver/getCarDriverById/{id}")
     Map<String, Object> getCarDriverById(@PathVariable("id") BigDecimal id);
+
     //删除司机信息
     @PostMapping(value = "api/v1/rms/rmscardriver/deleteCarDriver/{id}")
     Map<String, Object> deleteCarDriver(@PathVariable("id") BigDecimal id);
+
     //模糊查询司机
     @PostMapping(value = "/api/v1/rms/rmscardriver/getCarDriverList")
     Map<String, Object> getCarDriverList(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -68,17 +72,22 @@ public interface RmsFeign {
                                             @RequestParam Integer pageSize,
                                             @RequestParam Integer apiId,
                                             @RequestParam String con);
+
     //新增物资种类
     @PostMapping("api/v1/rms/rmsmaterialtype/insertMaterialType")
     RESTfulResult insertMaterialType(@RequestBody(required = false) Map<String, Object> map);
+
     //删除物资种类
     @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);
+
     //查询物资种类id
     @PostMapping(value = "api/v1/rms/rmsmaterialtype/getMaterialTypeById/{id}")
     Map<String, Object> getMaterialTypeById(@PathVariable("id") BigDecimal id);
@@ -86,82 +95,105 @@ public interface RmsFeign {
     //==============物资
     //查询物资List
     @PostMapping(value = "api/v1/rms/rmsmaterial/getMaterialList")
-    Map<String,Object> getMaterialList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                       @RequestParam("apiId") Integer apiId,
-                                       @RequestParam("pageNum") Integer pageNum,
-                                       @RequestParam("pageSize") Integer pageSize);
+    Map<String, Object> getMaterialList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize);
+
     //新增物资
     @PostMapping(value = "api/v1/rms/rmsmaterial/insertMaterial")
     Map<String, Object> insertMaterial(@RequestBody(required = false) Map<String, Object> map);
+
     //删除物资
     @PostMapping(value = "api/v1/rms/rmsmaterial/deleteMaterial")
     Map<String, Object> deleteMaterial(@RequestBody(required = false) Map<String, Object> map);
+
     //更新物资信息
     @PostMapping(value = "api/v1/rms/rmsmaterial/updateMaterial")
     Map<String, Object> updateMaterial(@RequestBody(required = false) Map<String, Object> map);
+
     //查询物资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
     @PostMapping(value = "api/v1/rms/rmsoperationpoint/getOperationPointList")
-    Map<String,Object> getOperationPointList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                       @RequestParam("apiId") Integer apiId,
-                                       @RequestParam("pageNum") Integer pageNum,
-                                       @RequestParam("pageSize") Integer pageSize);
+    Map<String, Object> getOperationPointList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize);
+
     //新增作业点
     @PostMapping(value = "api/v1/rms/rmsoperationpoint/insertOperationPoint")
     Map<String, Object> insertOperationPoint(@RequestBody(required = false) Map<String, Object> map);
+
     //删除作业点
     @PostMapping(value = "api/v1/rms/rmsoperationpoint/deleteOperationPoint")
     Map<String, Object> deleteOperationPoint(@RequestBody(required = false) Map<String, Object> map);
+
     //更新作业点信息
     @PostMapping(value = "api/v1/rms/rmsoperationpoint/updateOperationPoint")
     Map<String, Object> updateOperationPoint(@RequestBody(required = false) Map<String, Object> map);
+
+    //同步作业点信息
+    @PostMapping(value = "api/v1/rms/rmsoperationpoint/syncOperationPoint")
+    Map<String, Object> syncOperationPoint(@RequestBody(required = false) Map<String, Object> map);
+
     //查询作业点ID
     @PostMapping(value = "api/v1/rms/rmsoperationpoint/getOperationPointById/{id}")
     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,
+    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")
     Map<String, Object> deletePersonnel(@RequestBody(required = false) Map<String, Object> map);
+
     @PostMapping(value = "api/v1/rms/rmspersonnel/updatePersonnel")
     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/syncPersonnel")
     Map<String, Object> syncPersonnel(@RequestBody(required = false) Map<String, Object> map);
 
     //============公司
     //展示公司列表
     @PostMapping(value = "api/v1/rms/rmscompany/getCompanyList")
-    Map<String,Object>   getCompanyList (@RequestBody(required = false) Map<String,Object> mapValue,
-                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize);
+    Map<String, Object> getCompanyList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                       @RequestParam("apiId") Integer apiId,
+                                       @RequestParam("pageNum") Integer pageNum,
+                                       @RequestParam("pageSize") Integer pageSize);
+
     //新增公司
     @PostMapping(value = "api/v1/rms/rmscompany/insertCompany")
     Map<String, Object> insertCompany(@RequestBody(required = false) Map<String, Object> map);
+
     //删除公司
     @PostMapping(value = "api/v1/rms/rmscompany/deleteCompany")
-    Map<String, Object> deleteCompany(@RequestBody(required = false)  Map<String,Object> map);
+    Map<String, Object> deleteCompany(@RequestBody(required = false) Map<String, Object> map);
+
     //更新公司
     @PostMapping(value = "api/v1/rms/rmscompany/updateCompany")
     Map<String, Object> updateCompany(@RequestBody(required = false) Map<String, Object> map);
+
     //    根据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);
@@ -171,9 +203,11 @@ public interface RmsFeign {
     //新增运力
     @PostMapping(value = "api/v1/rms/rmscapacity/insertCapacity")
     Map<String, Object> insertCapacity(@RequestBody(required = false) Map<String, Object> map);
+
     //删除运力
     @PostMapping(value = "api/v1/rms/rmscapacity/deleteCapacity")
     Map<String, Object> deleteCapacity(@RequestBody(required = false) Map<String, Object> map);
+
     //修改运力
     @PostMapping(value = "api/v1/rms/rmscapacity/updateCapacity")
     Map<String, Object> updateCapacity(Map<String, Object> map);
@@ -190,17 +224,19 @@ public interface RmsFeign {
 
     //根据id获取运力详细信息
     @PostMapping(value = "api/v1/rms/rmscapacity/getCapacityById")
-    Map<String,Object> getCapacityById(@RequestBody Map<String, Object> map);
+    Map<String, Object> getCapacityById(@RequestBody Map<String, Object> map);
 
     //==============仓库
     //新增仓库
     @PostMapping(value = "api/v1/rms/rmswarehouse/insertWarehouse")
     Map<String, Object> insertWarehouse(@RequestBody(required = false) Map<String, Object> map);
+
     //删除仓库
     @PostMapping(value = "api/v1/rms/rmswarehouse/deleteWarehouse/{id}")
     Map<String, Object> deleteWarehouse(@PathVariable("id") BigDecimal id);
+
     //修改仓库
-    @PostMapping(value="api/v1/rms/rmswarehouse/updateWarehouse")
+    @PostMapping(value = "api/v1/rms/rmswarehouse/updateWarehouse")
     Map<String, Object> updateWarehouse(Map<String, Object> map);
     //根据id获取原料仓库详细信息
 
@@ -243,54 +279,61 @@ public interface RmsFeign {
     //================作业点
     //获取门岗信息列表
     @PostMapping(value = "api/v1/rms/rmsgatepost/getGatepostList")
-    Map<String,Object>     getGatepostList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                           @RequestParam("apiId") Integer apiId,
-                                           @RequestParam("pageNum") Integer pageNum,
-                                           @RequestParam("pageSize") Integer pageSize,
-                                           @RequestParam String con);
+    Map<String, Object> getGatepostList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize,
+                                        @RequestParam String con);
+
     //新增门岗
     @PostMapping(value = "api/v1/rms/rmsgatepost/insertGatepost")
-    Map<String,Object> insertGatepost(@RequestBody(required = false) Map<String,Object> map);
+    Map<String, Object> insertGatepost(@RequestBody(required = false) Map<String, Object> map);
+
     //删除门岗
     @PostMapping(value = "api/v1/rms/rmsgatepost/deleteGatepost/{id}")
     Map<String, Object> deleteGatepost(@PathVariable("id") BigDecimal id);
+
     //    更新门岗信息
     @PostMapping(value = "api/v1/rms/rmsgatepost/updateGatepost")
     Map<String, Object> updateGatepost(@RequestBody(required = false) Map<String, Object> map);
+
     //    根据id获取门岗信息
     @PostMapping(value = "api/v1/rms/rmsgatepost/getGatepostById/{id}")
     Map<String, Object> getGatepostById(@PathVariable("id") BigDecimal id);
+
     //    根据id获取门岗规则信息
     @PostMapping(value = "api/v1/rms/rmsgatepost/getGatepostRulesById/{id}")
-    Map<String, Object> getGatepostRulesById(@PathVariable("id") BigDecimal id,@RequestParam("apiId") Integer apiId);
+    Map<String, Object> getGatepostRulesById(@PathVariable("id") BigDecimal id, @RequestParam("apiId") Integer apiId);
+
     //    展示门岗规则信息
     @PostMapping(value = "api/v1/rms/rmsgatepost/getGatepostRulesList")
-    Map<String, Object> getGatepostRulesList(@RequestBody(required = false) Map<String,Object> mapValue,
+    Map<String, Object> getGatepostRulesList(@RequestBody(required = false) Map<String, Object> mapValue,
                                              @RequestParam("apiId") Integer apiId,
                                              @RequestParam("pageNum") Integer pageNum,
                                              @RequestParam("pageSize") Integer pageSize,
                                              @RequestParam String con);
 
     //    根据规则Id删除规则
-    @PostMapping(value ="api/v1/rms/rmsgatepost/deleteGatepostRules/{rulesId}")
+    @PostMapping(value = "api/v1/rms/rmsgatepost/deleteGatepostRules/{rulesId}")
     Map<String, Object> deleteGatepostRules(@RequestParam("rulesId") BigDecimal rulesId);
+
     //    新增门岗规则
-    @PostMapping(value ="api/v1/rms/rmsgatepost/insertGatepostRule")
+    @PostMapping(value = "api/v1/rms/rmsgatepost/insertGatepostRule")
     Map<String, Object> insertGatepostRule(@RequestBody(required = false) Map<String, Object> mapValue);
-    //    根据门岗id获取门岗名
-    @PostMapping(value ="api/v1/rms/rmsgatepost/getGatepostName/{gatepostId}")
-    Map<String,Object> getGatepostName(@PathVariable("gatepostId")BigDecimal gatepostId);
 
+    //    根据门岗id获取门岗名
+    @PostMapping(value = "api/v1/rms/rmsgatepost/getGatepostName/{gatepostId}")
+    Map<String, Object> getGatepostName(@PathVariable("gatepostId") BigDecimal gatepostId);
 
 
     //******************************************下拉框*******************************
     @GetMapping(value = "api/v1/rms/rmscapacity/getCapacityTypeId")
     Map<String, Object> getCapacityTypeId();
 
-    @GetMapping(value = "api/v1/rms/rmswarehouse/getWarehouseTypeId" )
+    @GetMapping(value = "api/v1/rms/rmswarehouse/getWarehouseTypeId")
     Map<String, Object> getWarehouseTypeId();
 
-    @GetMapping(value= "api/v1/rms/rmswarehouse/getPortId")
+    @GetMapping(value = "api/v1/rms/rmswarehouse/getPortId")
     Map<String, Object> getPortId();
 
     @GetMapping(value = "api/v1/rms/rmscapacity/getCarrierId")
@@ -301,12 +344,15 @@ public interface RmsFeign {
 //    根据id下拉获取运力列表
     @GetMapping(value = "/api/v1/rms/rmscapacity/getCapacityId")
     Map<String, Object> getCapacityId();
+
     //    根据id下拉框获取原料类型
     @GetMapping(value = "api/v1/rms/rmsmaterial/getMaterialTypeId")
     Map<String, Object> getMaterialTypeId();
+
     //    根据id下拉框获取计量类型
     @GetMapping(value = "api/v1/rms/rmsmaterial/getUnitOfMeasureId")
     Map<String, Object> getUnitOfMeasureId();
+
     //    根据id下拉框获取托运人
     @GetMapping(value = "api/v1/rms/rmspersonnel/getShipperId")
     Map<String, Object> getShipperId();
@@ -321,11 +367,11 @@ public interface RmsFeign {
 
     //运输类型下拉框
     @GetMapping(value = "api/v1/rms/rmscardriver/getTransportTypeId")
-    Map<String,Object> getTransportTypeId();
+    Map<String, Object> getTransportTypeId();
+
     //    根据id下拉框获取车辆类型
     @GetMapping(value = "api/v1/rms/rmsgatepost/getVehicleTypeId")
-    Map<String,Object> getVehicleTypeId();
-
+    Map<String, Object> getVehicleTypeId();
 
 
     @PostMapping(value = "/api/v1/rms/dilnotices/getNoticeList")
@@ -334,9 +380,10 @@ public interface RmsFeign {
                                       @RequestParam("pageNum") Integer pageNum,
                                       @RequestParam("pageSize") Integer pageSize,
                                       @RequestParam("con") String con);
+
     //新增公告
     @PostMapping(value = "api/v1/rms/dilnotices/insertNotice")
-    Map<String,Object> insertNotice(@RequestBody(required = false) Map<String,Object> map);
+    Map<String, Object> insertNotice(@RequestBody(required = false) Map<String, Object> map);
 
     //删除公告
     @PostMapping(value = "api/v1/rms/dilnotices/deleteNotice/{id}")
@@ -354,13 +401,14 @@ public interface RmsFeign {
     //油价
     @PostMapping(value = "/api/v1/rms/rmsoilprice/getOilPriceResultList")
     Map<String, Object> getOilPriceResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                      @RequestParam("apiId") Integer apiId,
-                                      @RequestParam("pageNum") Integer pageNum,
-                                      @RequestParam("pageSize") Integer pageSize,
-                                      @RequestParam("con") String con);
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("con") String con);
+
     //新增油价
     @PostMapping(value = "api/v1/rms/rmsoilprice/insertOilPrice")
-    Map<String,Object> insertOilPrice(@RequestBody(required = false) Map<String,Object> map);
+    Map<String, Object> insertOilPrice(@RequestBody(required = false) Map<String, Object> map);
 
     //删除油价
     @PostMapping(value = "api/v1/rms/rmsoilprice/deleteOilPrice/{id}")
@@ -379,8 +427,7 @@ public interface RmsFeign {
 
     //公告下拉框,须摸清实现原理
     @GetMapping(value = "api/v1/rms/dilnotices/getNoticeTypeId")
-    Map<String,Object> getNoticeTypeId();
-
+    Map<String, Object> getNoticeTypeId();
 
 
     // 新增人员权限
@@ -390,25 +437,26 @@ public interface RmsFeign {
     // 查询SSO主键和机构编码
     @PostMapping(value = "api/v1/rms/rmspersonnel/getShipperMap")
     Map<String, Object> getShipperMap(@RequestParam Integer shipperId);
+
     //根据运力id查询承运商名称
     @PostMapping(value = "api/v1/rms/rmscarrier/getCarrierNameById/{id}")
-    Map<String,Object> getCarrierNameById(@PathVariable("id") BigDecimal id);
+    Map<String, Object> getCarrierNameById(@PathVariable("id") BigDecimal id);
 
     //根据司机id查询承运商名称
     @PostMapping(value = "api/v1/rms/rmscardriver/getCarrierNameByDriverId/{id}")
-    Map<String,Object> getCarrierNameByDriverId(@PathVariable("id") BigDecimal id);
+    Map<String, Object> getCarrierNameByDriverId(@PathVariable("id") BigDecimal id);
 
-    @ApiOperation(value="新增组织结构实绩")
+    @ApiOperation(value = "新增组织结构实绩")
     @PostMapping(value = "api/v1/rms/rmsshipper/addShipperResult")
-    Map<String,Object>  addShipperResult(@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> addShipperResult(@RequestBody(required = false) Map<String, Object> map);
 
-    @ApiOperation(value="修改组织结构实绩")
+    @ApiOperation(value = "修改组织结构实绩")
     @PostMapping(value = "api/v1/rms/rmsshipper/updateShipperResult")
-    Map<String,Object>  updateShipperResult(@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> updateShipperResult(@RequestBody(required = false) Map<String, Object> map);
 
-    @ApiOperation(value="修改组织结构实绩")
+    @ApiOperation(value = "修改组织结构实绩")
     @PostMapping(value = "api/v1/rms/rmsshipper/deleteShipperResult")
-    Map<String,Object>  deleteShipperResult(@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> deleteShipperResult(@RequestBody(required = false) Map<String, Object> map);
 
     @ApiOperation(value = "根据carrierSSOId查询承运商")
     @PostMapping(value = "api/v1/rms/rmscapacity/getCarrierNameBySSOId")
@@ -422,17 +470,17 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmspersonnel/isInHere")
     Integer isInHere(@RequestParam String personnelJobNumber);
 
-    @ApiOperation(value="创建", notes="添加油品名称")
+    @ApiOperation(value = "创建", notes = "添加油品名称")
     @PostMapping(value = "api/v1/rms/rmsoilprice/addOilType")
     Map<String, Object> addOilType(@RequestParam String oilTypeName);
 
-    @ApiOperation(value="创建", notes="查询油品名称")
+    @ApiOperation(value = "创建", notes = "查询油品名称")
     @PostMapping(value = "api/v1/rms/rmsoilprice/oilNameSelect")
     Map<String, Object> oilNameSelect();
 
     @ApiOperation("解除承运商和车辆的绑定关系")
     @PostMapping("api/v1/rms/rmscapacity/deleteCapacityCarrier")
-    public RESTfulResult deleteCapacityCarrier(@RequestBody(required = false) Map<String,Object> map);
+    public RESTfulResult deleteCapacityCarrier(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/rms/rmsmaterialtype/getInwardContractMaterial")
     RESTfulResult getInwardContractMaterial(@RequestBody(required = false) Map<String, Object> map,
@@ -442,9 +490,8 @@ public interface RmsFeign {
                                             @RequestParam String con);
 
 
-
     @PostMapping("api/v1/rms/rmscapacity/getCapacityInfoById/{id}")
-    Map<String,Object> getCapacityInfoById(@PathVariable("id") Integer id);
+    Map<String, Object> getCapacityInfoById(@PathVariable("id") Integer id);
 
     @PostMapping("api/v1/rms/rmscargodeps/getCargoDep")
     Map<String, Object> getCargoDep(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -454,13 +501,13 @@ public interface RmsFeign {
                                     @RequestParam("con") String con);
 
     @PostMapping("api/v1/rms/rmscargodeps/deleteCargoDep")
-    Map<String,Object> deleteCargoDep(@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> deleteCargoDep(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/rms/rmscargodeps/updateCargoDep")
-    Map<String, Object> updateCargoDep(@RequestBody(required = false) Map<String,Object> map);
+    Map<String, Object> updateCargoDep(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/rms/rmscargodeps/insertCargoDep")
-    Map<String, Object> insertCargoDep(@RequestBody(required = false) Map<String,Object> map);
+    Map<String, Object> insertCargoDep(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/rms/rmscargodeps/getCargoDepById/{id}")
     Map<String, Object> getCargoDepById(@PathVariable("id") BigDecimal id);
@@ -471,10 +518,10 @@ public interface RmsFeign {
 
     //运力类型
     @PostMapping(value = "/api/v1/rms/rmscapacitytype/getCapacityType")
-    Map<String, Object> getCapacityType(@RequestBody(required = false) Map<String,Object> map,
-                                                       @RequestParam("apiId") Integer apiId,
-                                                       @RequestParam("pageNum") Integer pageNum,
-                                                       @RequestParam("pageSize") Integer pageSize);
+    Map<String, Object> getCapacityType(@RequestBody(required = false) Map<String, Object> map,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize);
 
     @PostMapping(value = "api/v1/rms/rmscapacitytype/insertCapacityType")
     Map<String, Object> insertCapacityType(@RequestBody(required = false) Map<String, Object> map);
@@ -484,14 +531,15 @@ public interface RmsFeign {
 
     //运输范围
     @PostMapping(value = "/api/v1/rms/rmstransrange/getTransRangeList")
-    Map<String, Object> getTransRangeList(@RequestBody(required = false) Map<String,Object> map,
-                                        @RequestParam("apiId") Integer apiId,
-                                        @RequestParam("pageNum") Integer pageNum,
-                                        @RequestParam("pageSize") Integer pageSize);
+    Map<String, Object> getTransRangeList(@RequestBody(required = false) Map<String, Object> map,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize);
 
 
     /**
      * 集装箱的相关方法
+     *
      * @param map
      * @return
      */
@@ -502,7 +550,7 @@ public interface RmsFeign {
     Map<String, Object> insetShipContainer(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping(value = "api/v1/rms/rmsShipContainer/updateShipContainer")
-    Map<String, Object> updateShipContainer(@RequestBody(required = false)List<Map<String, Object>> mapList);
+    Map<String, Object> updateShipContainer(@RequestBody(required = false) List<Map<String, Object>> mapList);
 
     @PostMapping(value = "api/v1/rms/rmsShipContainer/getShippingContainer")
     Map<String, Object> getShippingContainer(@RequestBody(required = false) Map<String, Object> map,
@@ -511,5 +559,54 @@ public interface RmsFeign {
                                              @RequestParam(value = "pageSize") Integer pageSize);
 
 
+    //==================岗位信息
+    @PostMapping("api/v1/rms/rmsjobinfos/getrmsrmsjobinfos")
+    Map<String, Object> list(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
+                             @RequestParam Integer pageNum,
+                             @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/rms/rmsjobinfos/add")
+    Map<String, Object> add(@RequestBody(required = false) Map<String, Object> map);
+
+    @PutMapping("api/v1/rms/rmsjobinfos/{id}")
+    Map<String, Object> update(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+
+    @PutMapping("api/v1/rms/rmsjobinfos/logicdelete")
+    Map<String, Object> logicdelete(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmsjobinfos/readExcel",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    RESTfulResult readExcel(MultipartFile file);
+
+    //==================提取比例
+    @PostMapping("api/v1/rms/rmsextractscales/getrmsextractscales")
+    Map<String, Object> extractscalelist(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
+                             @RequestParam Integer pageNum,
+                             @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/rms/rmsextractscales/add")
+    Map<String, Object> addExtractscale(@RequestBody(required = false) Map<String, Object> map);
+
+    @PutMapping("api/v1/rms/rmsextractscales/logicdelete")
+    Map<String, Object> Extractscalelogicdelete(@RequestBody(required = false) Map<String, Object> map);
+
+    @PutMapping("api/v1/rms/rmsextractscales/{id}")
+    Map<String, Object> Extractscaleupdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+
+    //==================计算公式
+
+    @PostMapping("api/v1/rms/rmsformulas/getformula")
+    Map<String, Object> FormulaList(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/rms/rmsformulas/add")
+    Map<String, Object> addFormula(@RequestBody(required = false) Map<String, Object> map);
+
+    @PutMapping("api/v1/rms/rmsformulas/logicdelete")
+    Map<String, Object> Formulalogicdelete(@RequestBody(required = false) Map<String, Object> map);
+
+    @PutMapping("api/v1/rms/rmsformulas/{id}")
+    Map<String, Object> Formulaupdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
 
 }
+

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

@@ -18,9 +18,9 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getCompanyMesByLike(Map<String, Object> map);
 
-    List<Map<String, Object>> getMaterialTypeByLike(String index);
+    List<Map<String, Object>> getMaterialTypeByLike(Map<String, Object> map);
 
-    List<Map<String, Object>> getEmissionStandardByLike(String index);
+    List<Map<String, Object>> getEmissionStandardByLike(Map<String, Object> map);
 
     List<Map<String, Object>> getOperationPointByLike(Map<String, Object> map);
 

src/main/java/com/steerinfo/dil/util/DateUtils.java

@@ -0,0 +1,281 @@
+package com.steerinfo.dil.util;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+public class DateUtils {
+    /**
+     * 日期转换为字符串 格式自定义
+     *
+     * @param date
+     * @param timeformat
+     * @return
+     */
+    public static String dateStr(Date date, String timeformat) {
+        if (date == null) {
+            return "";
+        }
+        String str = new SimpleDateFormat(timeformat).format(date);
+        return str;
+    }
+
+    public static String dateStr(Date date) {
+        if (date == null) {
+            return "";
+        }
+        String str = new SimpleDateFormat("yyyy-mm-dd").format(date);
+        return str;
+    }
+    /**
+     * 字符串转换为日期 格式自定义
+     *
+     * @param date
+     * @param date
+     * @return
+     */
+    public static Date StrDate(String date) {
+        SimpleDateFormat dateTimeFormat = new SimpleDateFormat ("yyyy-MM-dd");
+        String str = new SimpleDateFormat("yyyy-mm-dd").format(date);
+        try {
+            Date date1 = dateTimeFormat.parse(date);
+            return date1;
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    /**
+     * 时间戳转标准时间
+     *
+     * @param stap   时间戳
+     * @return
+     */
+    public static String stampToDate(String stap){
+        String time;
+        try {
+            if (stap == null || stap.length() == 0) {
+                time = null;
+            } else {
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                Date date = null;
+                try {
+                	long lt = new Long(stap);
+                	date = new Date(lt);
+                }
+                catch(Exception e) {
+                	date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(stap);
+                }
+                time = simpleDateFormat.format(date);
+            }
+        } catch (Exception e) {
+            time = null;
+            e.printStackTrace();
+        }
+        return time;
+    }
+
+    /**
+     * 时间序列偏移量 偏移量自定义
+     *
+     * @param time
+     * @param offsetinfo 偏移量
+     * @return
+     */
+    public static Date offsetDate(Date time,String offsetinfo) {
+        String[] offsetinfoarray = offsetinfo.split(",");
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(time);
+        for (int i =0;i < offsetinfoarray.length;i++){
+            if(offsetinfoarray[i] != null && !"".equals(offsetinfoarray[i])){
+                String timegran = offsetinfoarray[i].substring(0, offsetinfoarray[i].length() - 2);
+                int offset = Integer.parseInt(offsetinfoarray[i].substring(offsetinfoarray[i].length() - 2));
+                switch (timegran){
+                    case "ss":
+                        cal.add(Calendar.SECOND, offset);
+                        break;
+                    case "mm":
+                        cal.add(Calendar.MINUTE, offset);
+                        break;
+                    case "HH":
+                        cal.add(Calendar.HOUR, offset);
+                        break;
+                    case "dd":
+                        cal.add(Calendar.DATE, offset);
+                        break;
+                    case "MM":
+                        cal.add(Calendar.MONTH, offset);
+                        break;
+                    case "yyyy":
+                        cal.add(Calendar.YEAR, offset);
+                        break;
+                }
+            }
+        }
+        return cal.getTime();
+    }
+
+    public static List<String> getMonitortime(String timegran, String time, String starttime) {
+        List<String> list = new ArrayList<String>();
+        if("YEAR".equals(timegran)){
+            list.add(time);
+        }
+        else{
+            try {
+                Date d1 = new SimpleDateFormat("yyyy-MM-dd").parse(starttime);//定义开始日期
+                Date d2 = new SimpleDateFormat("yyyy-MM-dd").parse((Integer.parseInt(time) + 1) + "-01-01");//定义结束日期
+                Calendar dd = Calendar.getInstance();//定义日期实例
+                dd.setTime(d1);//设置日期起始时间
+                while(dd.getTime().before(d2)) {//判断是否到结束日期
+                    if ("MONTH".equals(timegran)) {
+                        list.add(dateStr(dd.getTime(), "yyyy-MM"));
+                        dd.add(Calendar.MONTH, 1);
+                    }
+                    else{
+                        list.add(dateStr(dd.getTime(), "yyyy-MM-dd"));
+                        dd.add(Calendar.DAY_OF_YEAR, 1);
+                    }
+                }
+            }
+            catch (ParseException e){
+                e.printStackTrace();
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 自动补全日期并返回新日期 偏移量自定义
+     *
+     * @param time 时间
+     * @param interval 偏移量
+     * @return
+     */
+    public static String changeTime(String time,int interval){
+        Calendar dd = Calendar.getInstance();
+        try{
+            if(time.length() == 4){
+                Date d = new SimpleDateFormat("yyyy-MM-dd").parse(time+"-01-01");
+                dd.setTime(d);
+                dd.add(Calendar.YEAR, interval);
+            }
+            if(time.length() == 7){
+                Date d = new SimpleDateFormat("yyyy-MM-dd").parse(time+"-01");
+                dd.setTime(d);
+                dd.add(Calendar.MONTH, interval);
+            }
+            if(time.length() == 10){
+                Date d = new SimpleDateFormat("yyyy-MM-dd").parse(time);
+                dd.setTime(d);
+                dd.add(Calendar.DATE, interval);
+            }
+        }
+        catch (ParseException e){
+            e.printStackTrace();
+        }
+        return dateStr(dd.getTime(), "yyyy-MM-dd");
+    }
+    /**
+     * 获取现在时间
+     * @Param timeformat 时间格式
+     * @return（String）格式自定义
+     */
+    public static String getCurrentTime(String timeformat){
+        Date time = new Date();
+        return dateStr(time, timeformat);
+    }
+
+    /**
+     * 获取现在时间
+     * @Param timeformat 时间格式
+     * @return（Date）格式自定义
+     */
+    public static Date getCurrentTimetoDate(String timeformat) {
+        try {
+            Date date = new java.sql.Date(new Date().getTime());
+            String datestr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date);
+            Date time = new SimpleDateFormat(timeformat).parse(datestr);
+            return time;
+        }
+        catch (ParseException e){
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 将"yyyy-MM-dd"转换为 格式自定义
+     *
+     * @param date
+     * @param timeformat
+     * @return
+     */
+    public static String dateToString(String date, String timeformat) {
+        String Strtime = "";
+        try {
+            if(date != null && !"".equals(date)) {
+                Date parse = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(date + " 00:00:00");
+                Strtime = new SimpleDateFormat(timeformat).format(parse);
+            }
+        }
+        catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return Strtime;
+    }
+    /**
+     * 判断某天是否是该月的第一天
+     * @param  date
+     * @return
+     */
+    public static boolean isFirstDayOfMonth(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        System.out.println(calendar.get(Calendar.MONTH));
+        return calendar.get(Calendar.DAY_OF_MONTH) == 1;
+    }
+    public static String getDate(){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date dt = null;
+        String reStr = null;
+        try {
+            dt = sdf.parse(DateUtils.dateStr(new Date(),"yyyy-MM-dd"));
+            Calendar rightNow = Calendar.getInstance();
+            rightNow.setTime(dt);
+            rightNow.add(Calendar.DAY_OF_MONTH, -3);
+            Date dt1 = rightNow.getTime();
+             reStr = sdf.format(dt1);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return reStr ;
+    }
+
+    /**
+     * 根据月份得到当月天数
+     * @param date
+     * @return
+     * @throws ParseException
+     */
+    public static int getDaysOfMonth(String date) throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(sdf.parse(date));
+        return calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
+    }
+    /**
+     * 根据月份得到当月天数
+     * @param date
+     * @return
+     * @throws ParseException
+     */
+    public static int getDaysOfMonth(Date date) throws ParseException {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        return calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
+    }
+}

src/main/resources/application-dev.yml

@@ -51,7 +51,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:localhost:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:localhost:8060}
+    url: ${RMSFEIGN_URL:172.16.90.214:8060}
   IntegrationFeign:
     url: ${INTEGRATIONFEIGN_URL:localhost:8066}
   OTMSFeign:
@@ -61,7 +61,7 @@ openfeign:
 #远程调用
 feign:
   hystrix:
-    enabled: true #开启熔断，熔断时间和feign超时时间必须一致，否则时间短的生效
+    enabled: false #开启熔断，熔断时间和feign超时时间必须一致，否则时间短的生效
   client:
     config:
       default:  #默认配置,连接时间要短，读取时间要长

src/main/resources/application-prod.yml

@@ -25,7 +25,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.214:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:172.16.90.214:8079}
   BmsFeign:
     url: ${BMSFEIGN_URL:172.16.90.214:8078}
   TmsFeign:
@@ -35,7 +35,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.90.214:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:localhost:8060}
+    url: ${RMSFEIGN_URL:172.16.90.214:8060}
   IntegrationFeign:
     url: ${INTEGRATIONFEIGN_URL:172.16.90.214:8066}
   OTMSFeign:
@@ -45,7 +45,7 @@ openfeign:
 #远程调用
 feign:
   hystrix:
-    enabled: true #开启熔断，熔断时间和feign超时时间必须一致，否则时间短的生效
+    enabled: false #开启熔断，熔断时间和feign超时时间必须一致，否则时间短的生效
   client:
     config:
       default:  #默认配置,连接时间要短，读取时间要长

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

@@ -106,25 +106,34 @@
 
     <!--  边输边查公司  -->
     <select id="getCompanyMesByLike" resultType="java.util.Map">
-        select
+        select * from(
+            select
             RC.COMPANY_ID "companyId",
             RC.COMPANY_NAME "companyName",
+            RC.COMPANY_TYPE "companyType",
             RC.SSO_ID "ssoId",
             RC.SSO_CODE "ssoCode",
             RC.COMPANY_ID "id",
             RC.COMPANY_ID "value",
             RC.COMPANY_NAME "label"
-        from RMS_COMPANY RC
-        where DELETED = 0
-        <if test="companyType!=null and companyType!=''">
-         AND   RC.COMPANY_TYPE = #{companyType}
-        </if>
-        <if test="index!=null and index!=''">
-        AND   REGEXP_LIKE(RC.COMPANY_NAME, #{index})
-        </if>
+            from RMS_COMPANY RC
+            where DELETED = 0
+        )
+        <where>
+            <if test="companyType!=null and companyType!=''">
+                AND   "companyType" = #{companyType}
+            </if>
+            <if test="index!=null and index!=''">
+                AND   REGEXP_LIKE("label", #{index})
+            </if>
+            <if test="id!=null">
+                OR   "id" = #{id}
+            </if>
+        </where>
         FETCH NEXT 100 ROWS ONLY
     </select>
     <select id="getMaterialTypeByLike" resultType="java.util.Map">
+        select * from(
         select
         MATERIAL_TYPE_ID "materialTypeId",
         MATERIAL_TYPE_NAME "materialTypeName",
@@ -133,40 +142,65 @@
         MATERIAL_TYPE_NAME "label"
         from RMS_MATERIAL_TYPE
         where DELETED = 0
-        <if test="index!=null and index!=''">
-            AND   REGEXP_LIKE(MATERIAL_TYPE_NAME, #{index})
-        </if>
+        )
+        <where>
+            <if test="index!=null and index!=''">
+                AND   REGEXP_LIKE("label", #{index})
+            </if>
+            <if test="id!=null">
+                OR   "id" = #{id}
+            </if>
+        </where>
         FETCH NEXT 100 ROWS ONLY
     </select>
     <select id="getEmissionStandardByLike" resultType="java.util.Map">
+        select * from (
         select
-            EMISSION_STANDARD_ID "emissionStandardId",
-            EMISSION_STANDARD_NAME "emissionStandardName",
-            EMISSION_STANDARD_ID "id",
-            EMISSION_STANDARD_ID "value",
-            EMISSION_STANDARD_NAME "label"
+        EMISSION_STANDARD_ID "emissionStandardId",
+        EMISSION_STANDARD_NAME "emissionStandardName",
+        EMISSION_STANDARD_ID "id",
+        EMISSION_STANDARD_ID "value",
+        EMISSION_STANDARD_NAME "label"
         from RMS_EMISSION_STANDARD
         where DELETED = 0
-        <if test="index!=null and index!=''">
-            AND   REGEXP_LIKE(EMISSION_STANDARD_NAME, #{index})
-        </if>
+        )
+        <where>
+            <if test="index!=null and index!=''">
+                AND   REGEXP_LIKE("label", #{index})
+            </if>
+            <if test="id!=null">
+                OR   "id" = #{id}
+            </if>
+        </where>
         FETCH NEXT 100 ROWS ONLY
     </select>
     <select id="getOperationPointByLike" resultType="java.util.Map">
+        select * from (
         select
         OPERATION_POINT_ID "operationPointId",
         OPERATION_POINT_NAME "operationPointName",
+        OPERATION_POINT_TYPE "operationPointType",
         OPERATION_POINT_ID "id",
         OPERATION_POINT_ID "value",
         OPERATION_POINT_NAME "label"
         from RMS_OPERATION_POINT
         where DELETED = 0
-        <if test="index!=null and index!=''">
-            AND   REGEXP_LIKE(OPERATION_POINT_NAME, #{index})
-        </if>
+        )
+        <where>
+            <if test="operationPointType!=null and operationPointType!=''">
+                AND   REGEXP_LIKE("operationPointType", #{operationPointType})
+            </if>
+            <if test="index!=null and index!=''">
+                AND   REGEXP_LIKE("label", #{index})
+            </if>
+            <if test="id!=null">
+                OR   "id" = #{id}
+            </if>
+        </where>
         FETCH NEXT 100 ROWS ONLY
     </select>
     <select id="getPersonnelByLike" resultType="java.util.Map">
+        select * from (
         select
         PERSONNEL_ID "personnelId",
         PERSONNEL_NAME "personnelName",
@@ -175,9 +209,15 @@
         PERSONNEL_NAME "label"
         from RMS_PERSONNEL
         where DELETED = 0
-        <if test="index!=null and index!=''">
-            AND   REGEXP_LIKE(PERSONNEL_NAME, #{index})
-        </if>
+        )
+        <where>
+            <if test="index!=null and index!=''">
+                AND   REGEXP_LIKE("label", #{index})
+            </if>
+              <if test="id!=null">
+                OR   "id" = #{id}
+            </if>
+        </where>
         FETCH NEXT 100 ROWS ONLY
     </select>
 </mapper>

src/main/resources/log4j.properties

@@ -1,8 +1,7 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,stdout,RUNNING,errorfile
+log4j.rootCategory=DEBUG,stdout,RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Threshold = INFO
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
 
@@ -21,7 +20,7 @@ log4j.appender.RUNNING = org.apache.log4j.DailyRollingFileAppender
 log4j.appender.RUNNING.File =/logs/log/running.log
 log4j.appender.RUNNING.Append = true
 log4j.appender.RUNNING.Threshold = INFO
-log4j.appender.RUNNING.DatePattern='.'yyyy-MM-dd.
+log4j.appender.RUNNING.DatePattern='.'yyyy-MM-dd
 log4j.appender.RUNNING.layout = org.apache.log4j.PatternLayout
 log4j.appender.RUNNING.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n