From 7da77854e6940fa2c37e49fbed8c506026d8497f Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Mon, 14 Apr 2025 16:10:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B2=A1=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ExpensePluginServiceImpl.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/grp/service/impl/ExpensePluginServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/grp/service/impl/ExpensePluginServiceImpl.java index 8aaf364e..b09ab0b4 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/grp/service/impl/ExpensePluginServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/grp/service/impl/ExpensePluginServiceImpl.java @@ -1,17 +1,20 @@ package com.hzya.frame.plugin.grp.service.impl; import cn.hutool.core.lang.Assert; +import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.grpU8.nxproof.oerdjml.entity.OerDjmlEntity; import com.hzya.frame.grpU8.nxproof.oerdjml.service.IOerDjmlExtService; import com.hzya.frame.grpU8.nxproof.oerdjml.service.IOerDjmlService; import com.hzya.frame.plugin.grp.service.IExpensePluginService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; /** * @Description grp报销单 @@ -24,7 +27,8 @@ public class ExpensePluginServiceImpl implements IExpensePluginService { private IOerDjmlExtService oerDjmlExtService; @Autowired private IOerDjmlService oerDjmlService; - + @Value("${zt.url}") + private String interfaceUrl; Logger logger = LoggerFactory.getLogger(IExpensePluginService.class); /** * 执行插件 @@ -45,10 +49,15 @@ public class ExpensePluginServiceImpl implements IExpensePluginService { logger.info("准备开始组装参数"); String param = oerDjmlExtService.saveExpensePrePlugin(json); logger.info("OA单据组装好准备保存GRP的参数:{}",param); - JSONObject paramJSON = new JSONObject(); - paramJSON.put("jsonStr",param); - JsonResultEntity resultEntity = (JsonResultEntity) oerDjmlService.handleOerDjml(paramJSON); - logger.info("保存GRPU8响应参数:{}",JSONObject.toJSON(resultEntity)); - return resultEntity; + String result = HttpRequest.post(interfaceUrl) + .header("appId","800042")// grp应用 + .header("apiCode","8000420043")//报销单接口 + .header("publicKey","ZJYAcDv1SMgN1oUwzfpV5byfUaN78sVw+L+DB9XTT30aS8hCe7eDIk+3zDUT+v578prj")//OA应用key + .header("secretKey","ZLQWG13Z30FoeuCgi6/Uc41XF6oLO63550OAa6ggXUmtOZj5MgQNZMjVgL/M4BRkj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=")//OA应用密钥 + .body(param).execute().body(); + // JsonResultEntity resultEntity = (JsonResultEntity) oerDjmlService.handleOerDjml(paramJSON); + // logger.info("保存GRPU8响应参数:{}",JSONObject.toJSON(resultEntity)); + logger.info("保存GRPU8响应参数:{}",result); + return BaseResult.getSuccessMessageEntity(result); } }