Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8

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
+  url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface

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

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>

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<SysSendMessageLogE
     @Resource
     private ISysApplicationApiParaDao sysApplicationApiParaDao;
 
+    @Value("${zt.url}")
+    private String url ;
+
     private ISysSendMessageLogDao sysSendMessageLogDao;
 
     @Autowired
@@ -291,7 +295,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(url).
                         header("appId", warningAppCode.toString()).
                         header("apiCode", warningApiCode.toString()).
                         header("publicKey", "ZJYA7v6DubGMm8EdBPGo+Jj9wCpUeCGJEpfBRLiInq4dvDlCe7eDIk+3zDUT+v578prj").

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>

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>

webapp/src/main/java/com/hzya/frame/webapp/web/corsconfig/CorsConfig.java

@@ -10,10 +10,10 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
  * @content
  * @date 2024-09-14 17:10
  */
-@Configuration
+//@Configuration
 public class CorsConfig implements WebMvcConfigurer {
 
-    @Override
+//    @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
                 .allowedOrigins("http://ufidahz.com.cn:9067", "http://localhost:9091", "http://192.168.2.237:9067", "http://192.168.2.187:9091")