diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
index fdd74683..fb69aba5 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
@@ -1682,7 +1682,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
SysApplicationApiAuthDetailEntity sysApplicationApiAuthDetailEntity = getApiAuthDetailByAppIdApiIdTripartiteSystemId(receiveApp.getId(), receiveApi.getId(), sysApplicationApiAuthEntity.getId());
if (sysApplicationApiAuthDetailEntity == null) {
- saveLog(sendApp, receiveApp, receiveApi, oldbodys,null, oldheaderMap,null, null, oldquerys,null, null, jrff, fsqsj, fshsj,false);
+ saveLog(sendApp, receiveApp, receiveApi, oldbodys,null, oldheaderMap,null, null, oldquerys,null, null,false);
return BaseResult.getFailureMessageEntity(receiveApi.getApiName()+"未授权给"+sendApp.getName()+"，请联系管理员");
}
SysExtensionApiEntity sysExtensionApiEntity = new SysExtensionApiEntity();
@@ -1806,7 +1806,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
}
logger.info("保存日志开始");
- saveLog(sendApp, receiveApp, receiveApi, oldbodys,bodys, oldheaderMap,headerMap, headers, oldquerys,querys, body.toString(), jrff, fsqsj, fshsj,true);
+ saveLog(sendApp, receiveApp, receiveApi, oldbodys,bodys, oldheaderMap,headerMap, headers, oldquerys,querys, body.toString(),true);
logger.info("保存日志结束");
if (flag) {
if (JSONUtil.isTypeJSON(body.toString())) {
@@ -1866,7 +1866,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
}
}
logger.info("保存日志开始");
- saveLog(sendApp, receiveApp, receiveApi, oldbodys,bodys, oldheaderMap,headerMap, headers, oldquerys,querys, body.toString(), jrff, fsqsj, fshsj,true);
+ saveLog(sendApp, receiveApp, receiveApi, oldbodys,bodys, oldheaderMap,headerMap, headers, oldquerys,querys, body.toString(), true);
logger.info("保存日志结束");
if (flag) {
return BaseResult.getSuccessMessageEntity("转发成功", body);
@@ -1940,7 +1940,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
Map<String, String> oldheaderMap,Map<String, String> headerMap,
Map<String, String> headers,
String oldquerys,String querys,
- String body, long jrff, long fsqsj, long fshsj,boolean flag) {
+ String body,boolean flag) {
SysMessageManageLogEntity sysMessageManageLogEntity = new SysMessageManageLogEntity();
//messageManageId 消息主表主键
//theme 消息主题
@@ -1965,12 +1965,12 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
//status 状态（1、待发送 2、发送中3、发送成功 4、发送失败,5、系统异常（根据三个参数查出来多个））
//{"ResCode":0,"Success":true,"ResMsg":"登录成功,token有效时间为10分钟","Data":"123123"}
List<String> st = Arrays.asList(new String[]{"8000060000"});
+ //{"traceId":"E-O.hzhhsp88.1008-20240429175201-54231d","errorDescription":"success","dataId":"662f6dc22cf56a00010643c7","extraData":"662f6dc22cf56a00010643ce","errorMessage":"OK","errorCode":0}
+ List<String> fx = Arrays.asList(new String[]{"800009"});
//{"orderNo":"DB1003108862178","ErrorCode":"","ResultString":"success","ResultInt":0}
List<String> rs = Arrays.asList(new String[]{"8000080005", "8000080000", "8000080002", "8000080004"});
//{"status":"success","data":"[{\\"pk_corp\\":\\"1015\\",\\"unitcode\\":\\"3401\\",\\"unitname\\":\\"hjx建设银行有限公司\\",\\"createdate\\":\\"2023-01-01\\",\\"deptattr\\":\\"1\\",\\"deptname\\":\\"API新增部门02\\",\\"deptcode\\":\\"DEV02\\",\\"pk_deptdoc\\":\\"1015A210000000001QJ7\\"}]","taskNumber":"202309110119"}
List<String> ss = Arrays.asList(new String[]{"8000160014", "8000160015", "8000160016", "8000160017", "8000160021", "8000160022", "8000160023", "8000160018", "8000160019", "8000160020", "8000160025", "8000160026", "8000160027", "8000160029", "8000160030"});
- sysMessageManageLogEntity.setStatus("4");//返回信息
- sysMessageManageLogEntity.setRemark("转发失败");//返回信息
if(!flag){
sysMessageManageLogEntity.setStatus("4");//返回信息
sysMessageManageLogEntity.setRemark("API未授权，请联系管理员");//返回信息
@@ -1980,18 +1980,37 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
String checkdata = cheackdatas.getString("Success");
if(checkdata != null && "true".equals(checkdata)){
sysMessageManageLogEntity.setStatus("3");//返回信息
- sysMessageManageLogEntity.setRemark("转发成功");//返回信息
+ sysMessageManageLogEntity.setRemark("成功");//返回信息
+ }else {
+ sysMessageManageLogEntity.setStatus("4");//返回信息
+ sysMessageManageLogEntity.setRemark(cheackdatas.getString("ResMsg"));//返回信息
}
}
} else if (rs.contains(receiveApi.getApiCode().toString())) {
if (JSONUtil.isTypeJSON(body)) {
JSONObject cheackdatas = JSONObject.parseObject(body);
- String checkdata = cheackdatas.getString("ResultString");
- if(checkdata != null && "success".equals(checkdata)){
+ String checkdata = cheackdatas.getString("ResultInt");
+ if(checkdata != null && "0".equals(checkdata)){
sysMessageManageLogEntity.setStatus("3");//返回信息
- sysMessageManageLogEntity.setRemark("转发成功");//返回信息
+ sysMessageManageLogEntity.setRemark("成功");//返回信息
+ }else {
+ sysMessageManageLogEntity.setStatus("4");//返回信息
+ sysMessageManageLogEntity.setRemark(cheackdatas.getString("ResultString"));//返回信息
+ }
+ }
+ } else if (fx.contains(receiveApp.getAppId())) {
+ if (JSONUtil.isTypeJSON(body)) {
+ JSONObject cheackdatas = JSONObject.parseObject(body);
+ String checkdata = cheackdatas.getString("errorMessage");
+ if(checkdata != null && ("success".equals(checkdata) || "OK".equals(checkdata))){
+ sysMessageManageLogEntity.setStatus("3");//返回信息
+ sysMessageManageLogEntity.setRemark("成功");//返回信息
+
+ }else {
+ sysMessageManageLogEntity.setStatus("4");//返回信息
+ sysMessageManageLogEntity.setRemark(cheackdatas.getString("errorMessage"));//返回信息
}
}
} else if (ss.contains(receiveApi.getApiCode().toString())) {
@@ -2000,13 +2019,16 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
String checkdata = cheackdatas.getString("status");
if(checkdata != null && "success".equals(checkdata)){
sysMessageManageLogEntity.setStatus("3");//返回信息
- sysMessageManageLogEntity.setRemark("转发成功");//返回信息
+ sysMessageManageLogEntity.setRemark("成功");//返回信息
+ }else {
+ sysMessageManageLogEntity.setStatus("4");//返回信息
+ sysMessageManageLogEntity.setRemark(cheackdatas.getString("errormsg"));//返回信息
}
}
} else {
sysMessageManageLogEntity.setStatus("3");//返回信息
- sysMessageManageLogEntity.setRemark("转发成功");//返回信息
+ sysMessageManageLogEntity.setRemark("成功");//返回信息
}
//remark 备注