From 5a63afd7d83977e3e183086302fee845c51d9d31 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Thu, 7 Nov 2024 10:03:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AC=E5=8F=91=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mdm/service/impl/MdmServiceImpl.java      |  3 +-
 .../impl/SysApplicationServiceImpl.java       | 35 +++++++++++++++----
 .../entity/SysMessageManageLogEntity.java     |  9 +++++
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/base-service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java b/base-service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
index b5d7e716..8550e8cb 100644
--- a/base-service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
+++ b/base-service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
@@ -2111,7 +2111,8 @@ public class MdmServiceImpl implements IMdmService {
             return BaseResult.getSuccessMessageEntity("发送成功");
         } else {
             saveMdmModuleSendLogEntity(mdmModuleEntity.getMdmCode(), mdmModuleDistributeEntity.getId(), "2", "转发失败:"+jsonResultEntity.getAttribute(), dbname, object.getString("id"), sysApplicationEntity.getName(), sysApplicationEntity.getId(), apiEntity.getApiName(), apiEntity.getId(), object.toJSONString(), type);
-            return BaseResult.getFailureMessageEntity("发送错误:" + jsonResultEntity.getAttribute());
+            JSONObject object1 = JSONObject.parseObject(jsonResultEntity.getAttribute().toString());
+            return BaseResult.getFailureMessageEntity("发送错误:" +object1.getString("msg"));
         }
     }
 
diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java b/base-service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
index da9db62f..acacbfee 100644
--- a/base-service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
+++ b/base-service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
@@ -125,7 +125,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
     @Resource
     private ApplicationCache applicationCache;
 
-    @Value("${savefile.tomcatpath}")
+    @Value("${savefile.tomcatpath:}")
     public String TOMCATPATH;
     //多线程请求加锁 HttpRequest 构造方法是静态的
     private final Object lock = new Object();
@@ -1954,17 +1954,29 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
                     if(sysMessageManageLogEntity.getStatus() != null && "3".equals(sysMessageManageLogEntity.getStatus())){
                         return BaseResult.getSuccessMessageEntity("转发成功", jsonObject);
                     }else {
-                        return BaseResult.getFailureMessageEntity("转发失败", jsonObject);
+                        if(sysMessageManageLogEntity.getReturnMsg()!= null&& !"".equals(sysMessageManageLogEntity.getReturnMsg())){
+                            return BaseResult.getFailureMessageEntity("转发失败："+sysMessageManageLogEntity.getReturnMsg(), jsonObject);
+                        }else {
+                            return BaseResult.getFailureMessageEntity("转发失败", jsonObject);
+                        }
                     }
                 } else {
                     if(sysMessageManageLogEntity.getStatus() != null && "3".equals(sysMessageManageLogEntity.getStatus())){
                         return BaseResult.getSuccessMessageEntity("转发成功", body);
                     }else {
-                        return BaseResult.getFailureMessageEntity("转发失败", body);
+                        if(sysMessageManageLogEntity.getReturnMsg()!= null&& !"".equals(sysMessageManageLogEntity.getReturnMsg())){
+                            return BaseResult.getFailureMessageEntity("转发失败："+sysMessageManageLogEntity.getReturnMsg(), body);
+                        }else {
+                            return BaseResult.getFailureMessageEntity("转发失败", body);
+                        }
                     }
                 }
             } else {
-                return BaseResult.getFailureMessageEntity("转发失败", body);
+                if(sysMessageManageLogEntity.getReturnMsg()!= null&& !"".equals(sysMessageManageLogEntity.getReturnMsg())){
+                    return BaseResult.getFailureMessageEntity("转发失败："+sysMessageManageLogEntity.getReturnMsg(), body);
+                }else {
+                    return BaseResult.getFailureMessageEntity("转发失败", body);
+                }
             }
 
         } else {//GET
@@ -2036,13 +2048,21 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
                     if(sysMessageManageLogEntity.getStatus() != null && "3".equals(sysMessageManageLogEntity.getStatus())){
                         return BaseResult.getSuccessMessageEntity("转发成功", jsonObject);
                     }else {
-                        return BaseResult.getFailureMessageEntity("转发失败", jsonObject);
+                        if(sysMessageManageLogEntity.getReturnMsg()!= null&& !"".equals(sysMessageManageLogEntity.getReturnMsg())){
+                            return BaseResult.getFailureMessageEntity("转发失败："+sysMessageManageLogEntity.getReturnMsg(), jsonObject);
+                        }else {
+                            return BaseResult.getFailureMessageEntity("转发失败", jsonObject);
+                        }
                     }
                 } else {
                     if(sysMessageManageLogEntity.getStatus() != null && "3".equals(sysMessageManageLogEntity.getStatus())){
                         return BaseResult.getSuccessMessageEntity("转发成功", body);
                     }else {
-                        return BaseResult.getFailureMessageEntity("转发失败", body);
+                        if(sysMessageManageLogEntity.getReturnMsg()!= null&& !"".equals(sysMessageManageLogEntity.getReturnMsg())){
+                            return BaseResult.getFailureMessageEntity("转发失败："+sysMessageManageLogEntity.getReturnMsg(), body);
+                        }else {
+                            return BaseResult.getFailureMessageEntity("转发失败", body);
+                        }
                     }
                 }
             } else {
@@ -2599,6 +2619,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
                                 sysMessageManageLogEntity.setStatus("4");//返回信息
                                 if (receiveApi.getReturnMsg() != null && !"".equals(receiveApi.getReturnMsg())) {
                                     String returnMsg = cheackdatas.getString(receiveApi.getReturnMsg());
+                                    sysMessageManageLogEntity.setReturnMsg(returnMsg);//返回信息
                                     sysMessageManageLogEntity.setRemark("接口调用失败,返回值错误，返回信息如下：" + returnMsg);//返回信息
                                 } else {
                                     sysMessageManageLogEntity.setRemark("接口调用失败,返回值错误");//返回信息
@@ -2609,6 +2630,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
                             sysMessageManageLogEntity.setStatus("4");//返回信息
                             if (receiveApi.getReturnMsg() != null && !"".equals(receiveApi.getReturnMsg())) {
                                 String returnMsg = cheackdatas.getString(receiveApi.getReturnMsg());
+                                sysMessageManageLogEntity.setReturnMsg(returnMsg);//返回信息
                                 sysMessageManageLogEntity.setRemark("接口调用失败,返回值错误，返回信息如下：" + returnMsg);//返回信息
                             } else {
                                 sysMessageManageLogEntity.setRemark("接口调用失败,返回值错误");//返回信息
@@ -2625,6 +2647,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
                     if (JSONUtil.isTypeJSON(body)) {
                         JSONObject cheackdatas = JSONObject.parseObject(body);
                         String checkdata = cheackdatas.getString(receiveApi.getReturnMsg());
+                        sysMessageManageLogEntity.setReturnMsg(checkdata);//返回信息
                         sysMessageManageLogEntity.setRemark("接口调用失败,api返回信息字段未配置，返回信息如下：" + checkdata);//返回信息
                     } else {
                         sysMessageManageLogEntity.setRemark("接口调用失败,返回格式错误，不是JSON");//返回信息
diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/messageManageLog/entity/SysMessageManageLogEntity.java b/base-service/src/main/java/com/hzya/frame/sysnew/messageManageLog/entity/SysMessageManageLogEntity.java
index 67bb5e5a..191aa706 100644
--- a/base-service/src/main/java/com/hzya/frame/sysnew/messageManageLog/entity/SysMessageManageLogEntity.java
+++ b/base-service/src/main/java/com/hzya/frame/sysnew/messageManageLog/entity/SysMessageManageLogEntity.java
@@ -41,6 +41,7 @@ public class SysMessageManageLogEntity extends BaseEntity {
    private String status;
   /**  备注 */
    private String remark;
+   private String returnMsg;
     /** 返回解析类型 */
     private String returnType;
     /** 失败状态（1、需要重新发送 2、不需要重新发送） */
@@ -206,5 +207,13 @@ public class SysMessageManageLogEntity extends BaseEntity {
     public void setSendAppName(String sendAppName) {
         this.sendAppName = sendAppName;
     }
+
+    public String getReturnMsg() {
+        return returnMsg;
+    }
+
+    public void setReturnMsg(String returnMsg) {
+        this.returnMsg = returnMsg;
+    }
 }