From 7409f90e2ffab1f4772e2fd892d8c5ecd8c5294c Mon Sep 17 00:00:00 2001
From: username <email@example.com>
Date: Wed, 18 Sep 2024 10:37:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=B6=88=E6=81=AFurl?=
 =?UTF-8?q?=E6=94=B9=E5=8A=A8=EF=BC=8C=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E5=87=A0=E4=B8=AA=E6=9F=A5=E8=AF=A2=E5=85=B3=E8=81=94=E8=A1=A8?=
 =?UTF-8?q?sql=E8=AF=AD=E5=8F=A5=E8=A1=A5=E5=85=85sts=3D=E2=80=98Y?=
 =?UTF-8?q?=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/SysMessageManageLogEntity.xml              |  4 +++-
 .../sendMessageLog/entity/SysSendMessageLogEntity.xml | 11 ++++++++++-
 .../service/impl/SysSendMessageLogServiceImpl.java    |  2 +-
 .../warningConfig/entity/SysWarningConfigEntity.xml   |  3 ++-
 .../entity/SysWarningInterfaceEntity.xml              |  1 +
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/service/src/main/java/com/hzya/frame/sysnew/messageManageLog/entity/SysMessageManageLogEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/messageManageLog/entity/SysMessageManageLogEntity.xml
index 5c02e0bb..990d106a 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/messageManageLog/entity/SysMessageManageLogEntity.xml
+++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLog/entity/SysMessageManageLogEntity.xml
@@ -566,7 +566,8 @@ where id = #{id}
         a.status AS status,
         a.remark AS remark,
         a.create_time AS createTime,
-        a.modify_time AS modifyTime
+        a.modify_time AS modifyTime,
+        receiveApi.api_name AS receiveApiName
         FROM
         <choose>
             <when test=" status != null and status.trim() != '' and status == 3">
@@ -577,6 +578,7 @@ where id = #{id}
             </otherwise>
         </choose>
         LEFT JOIN sys_application sendApp ON a.send_app = sendApp.id AND sendApp.sts = 'Y'
+        LEFT JOIN sys_application_api receiveApi ON a.receive_code = receiveApi.api_code AND receiveApi.sts = 'Y'
         <trim prefix="where" prefixOverrides="and">
             <if test="ids != null and ids.size>0">
                 AND a.id in
diff --git a/service/src/main/java/com/hzya/frame/sysnew/sendMessageLog/entity/SysSendMessageLogEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/sendMessageLog/entity/SysSendMessageLogEntity.xml
index 5c80f848..b0e9b621 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/sendMessageLog/entity/SysSendMessageLogEntity.xml
+++ b/service/src/main/java/com/hzya/frame/sysnew/sendMessageLog/entity/SysSendMessageLogEntity.xml
@@ -62,7 +62,7 @@
         from sys_send_message_log log
                  LEFT JOIN sys_person p1 ON p1.id = log.recipients_person_id
                  LEFT JOIN sys_person p2 ON p2.id = log.send_person_id
-        where log.id = #{ id } and log.sts='Y'
+        where log.id = #{ id } and log.sts='Y' and p1.sts='Y' and p2.sts='Y'
     </select>
     <!-- 查询 采用==查询 -->
  <select id="entity_list_base" resultMap="get-SysSendMessageLogEntity-result" parameterType = "com.hzya.frame.sysnew.sendMessageLog.entity.SysSendMessageLogEntity">
@@ -96,6 +96,9 @@
             <if test="resultMessage != null and resultMessage != ''"> and log.result_message = #{resultMessage} </if>
             <if test="appId != null and appId != ''" > and app_id = #{appId} </if>
             and log.sts='Y'
+            and p1.sts='Y'
+            and p2.sts='Y'
+            and i.sts='Y'
     </trim>
     <if test=" sort == null or sort == ''.toString() "> order by log.sorts asc</if>
     <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
@@ -168,6 +171,12 @@
             <if test="resultMessage != null and resultMessage != ''"> and log.result_message like concat('%',#{resultMessage},'%') </if>
             <if test="appId != null and appId != ''">and i.app_id like concat('%',#{appId},'%') </if>
             and log.sts='Y'
+            and i.sts='Y'
+            and config.sts='Y'
+            and template.sts='Y'
+            and p1.sts='Y'
+            and p2.sts='Y'
+            and app.sts='Y'
     </trim>
     <if test=" sort == null or sort == ''.toString() "> order by log.sorts asc</if>
     <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
diff --git a/service/src/main/java/com/hzya/frame/sysnew/sendMessageLog/service/impl/SysSendMessageLogServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/sendMessageLog/service/impl/SysSendMessageLogServiceImpl.java
index 0b9b850c..b6e8019c 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/sendMessageLog/service/impl/SysSendMessageLogServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/sendMessageLog/service/impl/SysSendMessageLogServiceImpl.java
@@ -291,7 +291,7 @@ public class SysSendMessageLogServiceImpl extends BaseService<SysSendMessageLogE
                         logger.error("未找到该应用类型");
                         break;
                 }
-                String result = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface").
+                String result = HttpRequest.post("http://ufidahz.com.cn:9067/kangarooDataCenterV3/entranceController/externalCallInterface").
                         header("appId", warningAppCode.toString()).
                         header("apiCode", warningApiCode.toString()).
                         header("publicKey", "ZJYA7v6DubGMm8EdBPGo+Jj9wCpUeCGJEpfBRLiInq4dvDlCe7eDIk+3zDUT+v578prj").
diff --git a/service/src/main/java/com/hzya/frame/sysnew/warningConfig/entity/SysWarningConfigEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/warningConfig/entity/SysWarningConfigEntity.xml
index eeb0bcea..ac4fcc10 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/warningConfig/entity/SysWarningConfigEntity.xml
+++ b/service/src/main/java/com/hzya/frame/sysnew/warningConfig/entity/SysWarningConfigEntity.xml
@@ -48,7 +48,7 @@
              ,template.template_name
         from sys_warning_config config
         LEFT JOIN sys_message_template template ON template.id = config.message_template_id
-        where config.id = #{ id } and config.sts='Y'
+        where config.id = #{ id } AND config.sts='Y' AND template.sts='Y'
     </select>
  <!-- 查询 采用==查询 -->
  <select id="entity_list_base" resultMap="get-SysWarningConfigEntity-result" parameterType = "com.hzya.frame.sysnew.warningConfig.entity.SysWarningConfigEntity">
@@ -129,6 +129,7 @@
             <if test="status != null and status != ''"> and config.status like concat('%',#{status},'%') </if>
             <if test="recipientIdList != null and recipientIdList != ''"> and config.recipient_id_list like concat('%',#{recipientIdList},'%') </if>
             and config.sts='Y'
+            and template.sts='Y'
     </trim>
     <if test=" sort == null or sort == ''.toString() "> order by config.sorts asc</if>
     <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
diff --git a/service/src/main/java/com/hzya/frame/sysnew/warningInterface/entity/SysWarningInterfaceEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/warningInterface/entity/SysWarningInterfaceEntity.xml
index f22c6755..f43f9f82 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/warningInterface/entity/SysWarningInterfaceEntity.xml
+++ b/service/src/main/java/com/hzya/frame/sysnew/warningInterface/entity/SysWarningInterfaceEntity.xml
@@ -130,6 +130,7 @@
             <if test="status != null and status != ''"> and i.status like concat('%',#{status},'%') </if>
             <if test="warningConfigId != null and warningConfigId != ''"> and i.warning_config_id like concat('%',#{warningConfigId},'%') </if>
             and i.sts='Y'
+            and app.sts='Y'
     </trim>
     <if test=" sort == null or sort == ''.toString() "> order by i.sorts asc</if>
     <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>