diff --git a/src/main/java/net/htjs/pt4/zzsxt/controller/xxgl/xmkpgl/fybx/FybxController.java b/src/main/java/net/htjs/pt4/zzsxt/controller/xxgl/xmkpgl/fybx/FybxController.java index d88911a..f18069f 100644 --- a/src/main/java/net/htjs/pt4/zzsxt/controller/xxgl/xmkpgl/fybx/FybxController.java +++ b/src/main/java/net/htjs/pt4/zzsxt/controller/xxgl/xmkpgl/fybx/FybxController.java @@ -4,6 +4,7 @@ package net.htjs.pt4.zzsxt.controller.xxgl.xmkpgl.fybx; import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.http.HttpRequest; import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONArray; @@ -168,16 +169,31 @@ public class FybxController extends BaseController { Map xtcsMap = new HashMap<>(); xtcsMap.put("CSMC", "FYBX_TS_URL"); - Map xycsMap = iBoKpsqService.selectZZSGL_XT_CSSZ(xtcsMap); - String apiUrl = MapUtil.getStr(xycsMap, "CSZ"); +// Map xycsMap = iBoKpsqService.selectZZSGL_XT_CSSZ(xtcsMap); +// String apiUrl = MapUtil.getStr(xycsMap, "CSZ"); +// 90d0fbd91d437658d2bdbf66f3ca4f61 +// 97835d6a607e1b83cf08f11a90dcb16820e5e8a3 + String token = getToken(); + + String apiUrl = "http://127.0.0.1:8989/taxshare/api/jxApi/fydjbx"; for (int i = 0; i < dataList.size(); i++) { JSONObject data = dataList.getJSONObject(i); JSONObject reqData = this.packageRequestData(data); String param = JSONUtil.toJsonStr(reqData); log.info("请求路径及参数:\n\t{} \n\t{}", apiUrl, param); - String result = HttpClientUtil.postRequest(apiUrl, param, "json", "utf-8", 0, 0); - JSONObject resultJson = JSONUtil.parseObj(result); - log.info("返回结果:{}", JSONUtil.toJsonPrettyStr(resultJson)); + String res = HttpRequest.post(apiUrl) + .header("X-Access-Token", token) + .body(param) + .execute().body(); + cn.hutool.json.JSONObject resObj = JSONUtil.parseObj(res); + if(!"200".equals(resObj.getStr("code"))){ + throw new RuntimeException(res); + } + + log.info("返回结果:{}", JSONUtil.toJsonPrettyStr(resObj)); + +// String result = HttpClientUtil.postRequest(apiUrl, param, "json", "utf-8", 0, 0); +// JSONObject resultJson = JSONUtil.parseObj(result); Map updateMap = new HashMap(); updateMap.put("FYID", data.get("FYID")); @@ -190,6 +206,22 @@ public class FybxController extends BaseController { return getResult(mapModel, code, msg, callback); } + private String getToken(){ + //获取token + cn.hutool.json.JSONObject tokenJsonObReq = new cn.hutool.json.JSONObject(); + tokenJsonObReq.put("app_key","90d0fbd91d437658d2bdbf66f3ca4f61"); + tokenJsonObReq.put("app_secret","97835d6a607e1b83cf08f11a90dcb16820e5e8a3"); + String post = HttpRequest.post("http://127.0.0.1:8989/taxshare/api/comApi/getToken") + .header("Content-Type", "application/json") + .body(tokenJsonObReq).execute().body(); +// String post = HttpUtil.post("https://f7-demo.jchl.com/taxshare/api/comApi/getToken", tokenJsonObReq); + cn.hutool.json.JSONObject tokenJsonObjRes = JSONUtil.parseObj(post); + + String token = tokenJsonObjRes.getJSONObject("result").getStr("token"); + + return token; + } + private JSONObject packageRequestData(JSONObject data) throws SaveException { JSONObject fydj = new JSONObject(); fydj.put("djbh", data.get("DJBH")); // 单据编号 @@ -209,6 +241,7 @@ public class FybxController extends BaseController { fydj.put("qysh", data.get("KHSH")); // 客户税号 fydj.put("qymc", data.get("KHMC")); // 客户名称 fydj.put("zw", data.get("ZW")); // 职位 + fydj.put("phone", data.get("PHONE")); // 手机号 Map queryFydjmxMap = new HashMap(); queryFydjmxMap.put("FYID", data.get("FYID"));