From 7409f90e2ffab1f4772e2fd892d8c5ecd8c5294c Mon Sep 17 00:00:00 2001 From: username Date: Wed, 18 Sep 2024 10:37:36 +0800 Subject: [PATCH 1/2] =?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 @@ -577,6 +578,7 @@ where id = #{id} 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' 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' @@ -129,6 +129,7 @@ and config.status like concat('%',#{status},'%') and config.recipient_id_list like concat('%',#{recipientIdList},'%') and config.sts='Y' + and template.sts='Y' order by config.sorts asc order by ${sort} ${order} 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 @@ and i.status like concat('%',#{status},'%') and i.warning_config_id like concat('%',#{warningConfigId},'%') and i.sts='Y' + and app.sts='Y' order by i.sorts asc order by ${sort} ${order} From b038b7e0c276ba0c8b77a853c54114b75b5fe15f Mon Sep 17 00:00:00 2001 From: username Date: Wed, 18 Sep 2024 10:53:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B7=A8=E5=9F=9F=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E3=80=81zt=EF=BC=9Aurl=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buildpackage/src/main/resources/application-zqtlocal.yml | 2 +- .../service/impl/SysSendMessageLogServiceImpl.java | 6 +++++- .../com/hzya/frame/webapp/web/corsconfig/CorsConfig.java | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/buildpackage/src/main/resources/application-zqtlocal.yml b/buildpackage/src/main/resources/application-zqtlocal.yml index ffff00a3..3f1d773b 100644 --- a/buildpackage/src/main/resources/application-zqtlocal.yml +++ b/buildpackage/src/main/resources/application-zqtlocal.yml @@ -36,4 +36,4 @@ cbs8: OA: data_source_code: yc_oa zt: - url: http://127.0.0.1:9082/kangarooDataCenterV3/entranceController/externalCallInterface \ No newline at end of file + url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface \ No newline at end of file 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 b6e8019c..962f48e5 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 @@ -29,6 +29,7 @@ import com.hzya.frame.sysnew.warningInterface.entity.SysWarningInterfaceEntity; import com.hzya.frame.uuid.UUIDUtils; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; @@ -67,6 +68,9 @@ public class SysSendMessageLogServiceImpl extends BaseService