diff --git a/src/main/java/com/qs/serve/common/util/BirHttpUtil.java b/src/main/java/com/qs/serve/common/util/BirHttpUtil.java index d23b1512..6983d4cf 100644 --- a/src/main/java/com/qs/serve/common/util/BirHttpUtil.java +++ b/src/main/java/com/qs/serve/common/util/BirHttpUtil.java @@ -95,6 +95,44 @@ public class BirHttpUtil { return r; } + public static R post(String action,Object query){ + String baseUrl = getBaseUrl(); + String url = baseUrl+"/"+action; + + HashMap hearders = new HashMap<>(); + HttpServletRequest request = ServletUtils.getRequest(); + String tenant = request.getHeader(GySysConst.TENANT_PROP); + String token = request.getHeader(GySysConst.AUTHORIZATION_PROP); + hearders.put(GySysConst.TENANT_PROP,tenant); + hearders.put(GySysConst.AUTHORIZATION_PROP,token); + //自动封装翻页参数 +// if(!url.contains("?")){ +// url += "?"; +// } +// if(PageUtil.getPageSize()!=null){ +// url += "&pageSize="+PageUtil.getPageSize(); +// } +// if(PageUtil.getPageNum()!=null){ +// url += "&pageNum="+PageUtil.getPageNum(); +// } + url = url.replace("//","/"); + url = url.replace("http:/","http://"); + url = url.replace("https:/","https://"); + log.debug("请求BIR中转URL:{}",url); + String json = JsonUtil.objectToJson(query); + log.debug("请求BIR中转Query:{}",json); + String result = HttpUtil.doPost(url,json,hearders); + log.debug("请求BIR中转URL:{}\n数据返回:{}",url,result); + JSONObject object = JSON.parseObject(result); + Integer status = object.getInteger("status"); + String msg = object.getString("msg"); + Object data = object.get("data"); + R r = R.ok(data); + r.setStatus(status); + r.setMsg(msg); + return r; + } + public static TbsCostSubItem.CostCenterTranStr buildCostCenter(String centerType, String centerId, String centerName, String supplierCode){ try { Map map = new HashMap<>(); diff --git a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java index 0e12fa7a..76783bc5 100644 --- a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java +++ b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java @@ -147,11 +147,11 @@ public class BirRoiRateController { * @return */ @RepeatSubmit - @GetMapping("/costYearMonthV2") + @PostMapping("/costYearMonthV2") public R> getCostRoiOfYearMonthV2(@RequestBody BirBudgetTargetSo query){ boolean isRestBir = BirHttpUtil.isRestBir(); if(isRestBir){ - return BirHttpUtil.get("/bir/roiRate/costYearMonthV2",query); + return BirHttpUtil.post("/bir/roiRate/costYearMonthV2",query); } List list = birBudgetTargetService.listVo(query); return R.ok(list);