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

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

@@ -200,11 +200,15 @@ public class AMScontroller{
     @LogAround(foreignKeys = {"priceId"},foreignKeyTypes = {"承运合同"})
     @PostMapping("/")
     public  Map<String, Object>  insertTransPrice(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
-        String date = map.get("priceDate").toString();
-        SimpleDateFormat dateTimeFormat = new SimpleDateFormat ("yyyy-MM-dd");
+
+        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());
-        Date date1 = dateTimeFormat.parse(date);
-        map.put("priceDate",date1);
                return  amsFeign.add(map);
     }
 

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

@@ -814,7 +814,7 @@ public class RMScontroller extends BaseRESTfulController {
     @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);
     }
 
@@ -823,6 +823,7 @@ public class RMScontroller extends BaseRESTfulController {
     @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);
     }
 
@@ -837,4 +838,84 @@ public class RMScontroller extends BaseRESTfulController {
     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/feign/RmsFeign.java

@@ -576,5 +576,37 @@ public interface RmsFeign {
 
     @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/resources/application-prod.yml

@@ -45,7 +45,7 @@ openfeign:
 #远程调用
 feign:
   hystrix:
-    enabled: true #开启熔断，熔断时间和feign超时时间必须一致，否则时间短的生效
+    enabled: false #开启熔断，熔断时间和feign超时时间必须一致，否则时间短的生效
   client:
     config:
       default:  #默认配置,连接时间要短，读取时间要长