From f3a8e43aafe1ce10efde91b45bc8605a58ade16b Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Thu, 9 May 2024 11:10:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mdm/mdmModule/entity/MdmModuleEntity.xml  | 28 +++++++++----------
 .../mdmModuleDb/entity/MdmModuleDbEntity.xml  |  5 +---
 .../entity/MdmModuleDbFiledsEntity.xml        |  5 +---
 .../entity/MdmModuleDbFiledsRuleEntity.xml    |  2 --
 .../MdmModuleDbFiledsRuleFilesEntity.xml      |  5 +---
 .../entity/MdmModuleDistributeEntity.xml      |  2 --
 .../MdmModuleDistributeDetailEntity.xml       |  2 --
 .../entity/MdmModuleRoleEntity.xml            |  5 +---
 .../entity/MdmModuleRoleButtonEntity.xml      |  5 +---
 .../entity/MdmModuleUserViewEntity.xml        |  5 +---
 .../entity/MdmModuleViewEntity.xml            |  5 +---
 .../entity/MdmModuleViewDetailEntity.xml      |  5 +---
 .../entity/MdmTableCodeRuleEntity.xml         |  2 --
 .../hzya/frame/mdm/service/IMdmService.java   |  6 ++--
 .../IIntegrationTaskLivingService.java        |  8 ++++++
 .../IntegrationTaskLivingServiceImpl.java     | 28 ++++++++++++++++++-
 .../IIntegrationTaskLivingDetailsService.java |  8 ++++++
 ...tegrationTaskLivingDetailsServiceImpl.java | 24 ++++++++++++++++
 .../service/impl/EntranceServiceImpl.java     | 10 ++-----
 .../aop/AopDynamicRoutingDataSourceInit.java  |  6 ++--
 .../frame/webapp/web/filter/BaseFilter.java   |  2 +-
 .../web/filter/ExceptionOptionFilter.java     |  2 +-
 22 files changed, 99 insertions(+), 71 deletions(-)

diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
index c5e8ba94..0b9db66d 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
@@ -163,7 +163,6 @@
             <if test="modify_time != null">modify_time ,</if>
             <if test="sts != null and sts != ''">sts ,</if>
             <if test="org_id != null and org_id != ''">org_id ,</if>
-            <if test="sorts == null ">sorts,</if>
             <if test="sts == null ">sts,</if>
         </trim>
         )values(
@@ -182,7 +181,6 @@
             <if test="modify_time != null">#{modify_time} ,</if>
             <if test="sts != null and sts != ''">#{sts} ,</if>
             <if test="org_id != null and org_id != ''">#{org_id} ,</if>
-            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module a WHERE a.sts = 'Y' ),</if>
             <if test="sts == null ">'Y',</if>
         </trim>
         )
@@ -267,22 +265,24 @@ where id = #{id}
     <!-- 分页查询列表 采用like格式 -->
     <select id="queryMdm" resultType="com.hzya.frame.mdm.entity.MdmVo" parameterType="com.hzya.frame.mdm.entity.MdmDto">
         select
-            a.id as id,
-            a.mdm_name as mdmName,
-            a.mdm_logo as mdmLogo,
-            a.mdm_code as mdmCode,
-            a.mdm_type as mdmType,
-            sd.column_content as mdmTypeName,
-            a.remark as remark,
-            a.create_time as createTime,
-            a.modify_time as modifyTime,
-            c.view_name as createUserId,
-            m.view_name as modifyUserId
+        a.id as id,
+        a.mdm_name as mdmName,
+        a.mdm_logo as mdmLogo,
+        a.mdm_code as mdmCode,
+        a.mdm_type as mdmType,
+        sd.column_content as mdmTypeName,
+        a.remark as remark,
+        a.create_time as createTime,
+        a.modify_time as modifyTime,
+        d.person_name as createUserId,
+        n.person_name as modifyUserId
         from
-            mdm_module a
+        mdm_module a
         LEFT JOIN sys_dictionaryshop_new sd on sd.column_value = a.mdm_type and sd.tab_name = 'mdm' and sd.column_name = 'mdm_type' and sd.used_sts = '1'
         LEFT JOIN sys_user c on c.id = a.create_user_id and c.sts = 'Y'
+        LEFT JOIN sys_person d on d.id = c.person_id and d.sts = 'Y'
         LEFT JOIN sys_user m on m.id = a.modify_user_id and m.sts = 'Y'
+        LEFT JOIN sys_person n on n.id = m.person_id and n.sts = 'Y'
         <trim prefix="where" prefixOverrides="and">
             <if test="id != null and id != ''">and a.id like concat('%',#{id},'%')</if>
             <if test="mdmName != null and mdmName != ''">and a.mdm_name like concat('%',#{mdmName},'%')</if>
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml
index bb1e58d9..8f2e3912 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml
@@ -150,7 +150,6 @@
             <if test="modify_time != null">modify_time ,</if>
             <if test="sts != null and sts != ''">sts ,</if>
             <if test="org_id != null and org_id != ''">org_id ,</if>
-            <if test="sorts == null ">sorts,</if>
             <if test="sts == null ">sts,</if>
         </trim>
         )values(
@@ -167,9 +166,7 @@
             <if test="modify_time != null">#{modify_time} ,</if>
             <if test="sts != null and sts != ''">#{sts} ,</if>
             <if test="org_id != null and org_id != ''">#{org_id} ,</if>
-            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_db a WHERE a.sts =
-                'Y' ),
-            </if>
+
             <if test="sts == null ">'Y',</if>
         </trim>
         )
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml
index 0b770263..dc765548 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml
@@ -174,7 +174,6 @@
             <if test="modify_time != null">modify_time ,</if>
             <if test="sts != null and sts != ''">sts ,</if>
             <if test="org_id != null and org_id != ''">org_id ,</if>
-            <if test="sorts == null ">sorts,</if>
             <if test="sts == null ">sts,</if>
         </trim>
         )values(
@@ -193,9 +192,7 @@
             <if test="modify_time != null">#{modify_time} ,</if>
             <if test="sts != null and sts != ''">#{sts} ,</if>
             <if test="org_id != null and org_id != ''">#{org_id} ,</if>
-            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_db_fileds a WHERE
-                a.sts = 'Y' ),
-            </if>
+
             <if test="sts == null ">'Y',</if>
         </trim>
         )
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.xml
index 2c1a935e..38bfd29c 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.xml
@@ -169,7 +169,6 @@
             <if test="modify_time != null"> modify_time , </if>
             <if test="sts != null and sts != ''"> sts , </if>
             <if test="org_id != null and org_id != ''"> org_id , </if>
-            <if test="sorts == null ">sorts,</if>
     <if test="sts == null ">sts,</if>
   </trim>
   )values(
@@ -190,7 +189,6 @@
             <if test="modify_time != null"> #{modify_time} ,</if>
             <if test="sts != null and sts != ''"> #{sts} ,</if>
             <if test="org_id != null and org_id != ''"> #{org_id} ,</if>
-            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_db_fileds_rule a WHERE a.sts = 'Y' ),</if>
     <if test="sts == null ">'Y',</if>
   </trim>
   )  
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/entity/MdmModuleDbFiledsRuleFilesEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/entity/MdmModuleDbFiledsRuleFilesEntity.xml
index 9a750608..49ad5f82 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/entity/MdmModuleDbFiledsRuleFilesEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/entity/MdmModuleDbFiledsRuleFilesEntity.xml
@@ -152,7 +152,6 @@
             <if test="modify_time != null">modify_time ,</if>
             <if test="sts != null and sts != ''">sts ,</if>
             <if test="org_id != null and org_id != ''">org_id ,</if>
-            <if test="sorts == null ">sorts,</if>
             <if test="sts == null ">sts,</if>
         </trim>
         )values(
@@ -169,9 +168,7 @@
             <if test="modify_time != null">#{modify_time} ,</if>
             <if test="sts != null and sts != ''">#{sts} ,</if>
             <if test="org_id != null and org_id != ''">#{org_id} ,</if>
-            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from
-                mdm_module_db_fileds_rule_files a WHERE a.sts = 'Y' ),
-            </if>
+
             <if test="sts == null ">'Y',</if>
         </trim>
         )
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.xml
index 78643815..cbed7e30 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.xml
@@ -169,7 +169,6 @@
             <if test="org_id != null and org_id != ''"> org_id , </if>
             <if test="addPlug != null and addPlug != ''"> add_plug , </if>
             <if test="deletePlug != null and deletePlug != ''"> delete_plug , </if>
-            <if test="sorts == null ">sorts,</if>
     <if test="sts == null ">sts,</if>
   </trim>
   )values(
@@ -190,7 +189,6 @@
             <if test="org_id != null and org_id != ''"> #{org_id} ,</if>
             <if test="addPlug != null and addPlug != ''"> #{addPlug} ,</if>
             <if test="deletePlug != null and deletePlug != ''"> #{deletePlug} ,</if>
-            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_distribute a WHERE a.sts = 'Y' ),</if>
     <if test="sts == null ">'Y',</if>
   </trim>
   )  
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/entity/MdmModuleDistributeDetailEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/entity/MdmModuleDistributeDetailEntity.xml
index 325c175e..91bbf427 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/entity/MdmModuleDistributeDetailEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/entity/MdmModuleDistributeDetailEntity.xml
@@ -204,7 +204,6 @@
             <if test="sts != null and sts != ''"> sts , </if>
             <if test="org_id != null and org_id != ''"> org_id , </if>
             <if test="coordinate != null and coordinate != ''"> coordinate , </if>
-            <if test="sorts == null ">sorts,</if>
     <if test="sts == null ">sts,</if>
   </trim>
   )values(
@@ -230,7 +229,6 @@
             <if test="sts != null and sts != ''"> #{sts} ,</if>
             <if test="org_id != null and org_id != ''"> #{org_id} ,</if>
             <if test="coordinate != null and coordinate != ''"> #{coordinate} ,</if>
-            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_distribute_detail a WHERE a.sts = 'Y' ),</if>
     <if test="sts == null ">'Y',</if>
   </trim>
   )  
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/entity/MdmModuleRoleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/entity/MdmModuleRoleEntity.xml
index aed8c808..33e1458a 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/entity/MdmModuleRoleEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/entity/MdmModuleRoleEntity.xml
@@ -136,7 +136,6 @@
             <if test="modify_time != null">modify_time ,</if>
             <if test="sts != null and sts != ''">sts ,</if>
             <if test="org_id != null and org_id != ''">org_id ,</if>
-            <if test="sorts == null ">sorts,</if>
             <if test="sts == null ">sts,</if>
         </trim>
         )values(
@@ -151,9 +150,7 @@
             <if test="modify_time != null">#{modify_time} ,</if>
             <if test="sts != null and sts != ''">#{sts} ,</if>
             <if test="org_id != null and org_id != ''">#{org_id} ,</if>
-            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_role a WHERE a.sts
-                = 'Y' ),
-            </if>
+
             <if test="sts == null ">'Y',</if>
         </trim>
         )
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/entity/MdmModuleRoleButtonEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/entity/MdmModuleRoleButtonEntity.xml
index 5830309d..cd3513cb 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/entity/MdmModuleRoleButtonEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/entity/MdmModuleRoleButtonEntity.xml
@@ -167,7 +167,6 @@
             <if test="modify_time != null">modify_time ,</if>
             <if test="sts != null and sts != ''">sts ,</if>
             <if test="org_id != null and org_id != ''">org_id ,</if>
-            <if test="sorts == null ">sorts,</if>
             <if test="sts == null ">sts,</if>
         </trim>
         )values(
@@ -185,9 +184,7 @@
             <if test="modify_time != null">#{modify_time} ,</if>
             <if test="sts != null and sts != ''">#{sts} ,</if>
             <if test="org_id != null and org_id != ''">#{org_id} ,</if>
-            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_role_button a
-                WHERE a.sts = 'Y' ),
-            </if>
+
             <if test="sts == null ">'Y',</if>
         </trim>
         )
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/entity/MdmModuleUserViewEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/entity/MdmModuleUserViewEntity.xml
index ed59ddb5..4625f156 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/entity/MdmModuleUserViewEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/entity/MdmModuleUserViewEntity.xml
@@ -146,7 +146,6 @@
             <if test="modify_time != null">modify_time ,</if>
             <if test="sts != null and sts != ''">sts ,</if>
             <if test="org_id != null and org_id != ''">org_id ,</if>
-            <if test="sorts == null ">sorts,</if>
             <if test="sts == null ">sts,</if>
         </trim>
         )values(
@@ -162,9 +161,7 @@
             <if test="modify_time != null">#{modify_time} ,</if>
             <if test="sts != null and sts != ''">#{sts} ,</if>
             <if test="org_id != null and org_id != ''">#{org_id} ,</if>
-            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_user_view a WHERE
-                a.sts = 'Y' ),
-            </if>
+
             <if test="sts == null ">'Y',</if>
         </trim>
         )
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/entity/MdmModuleViewEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/entity/MdmModuleViewEntity.xml
index c9f3e025..f9e2717c 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/entity/MdmModuleViewEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/entity/MdmModuleViewEntity.xml
@@ -150,7 +150,6 @@
             <if test="modify_time != null">modify_time ,</if>
             <if test="sts != null and sts != ''">sts ,</if>
             <if test="org_id != null and org_id != ''">org_id ,</if>
-            <if test="sorts == null ">sorts,</if>
             <if test="sts == null ">sts,</if>
         </trim>
         )values(
@@ -167,9 +166,7 @@
             <if test="modify_time != null">#{modify_time} ,</if>
             <if test="sts != null and sts != ''">#{sts} ,</if>
             <if test="org_id != null and org_id != ''">#{org_id} ,</if>
-            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_view a WHERE a.sts
-                = 'Y' ),
-            </if>
+
             <if test="sts == null ">'Y',</if>
         </trim>
         )
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/entity/MdmModuleViewDetailEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/entity/MdmModuleViewDetailEntity.xml
index 1c2617c6..4728615a 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/entity/MdmModuleViewDetailEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/entity/MdmModuleViewDetailEntity.xml
@@ -151,7 +151,6 @@
             <if test="modify_time != null">modify_time ,</if>
             <if test="sts != null and sts != ''">sts ,</if>
             <if test="org_id != null and org_id != ''">org_id ,</if>
-            <if test="sorts == null ">sorts,</if>
             <if test="sts == null ">sts,</if>
         </trim>
         )values(
@@ -168,9 +167,7 @@
             <if test="modify_time != null">#{modify_time} ,</if>
             <if test="sts != null and sts != ''">#{sts} ,</if>
             <if test="org_id != null and org_id != ''">#{org_id} ,</if>
-            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_view_detail a
-                WHERE a.sts = 'Y' ),
-            </if>
+
             <if test="sts == null ">'Y',</if>
         </trim>
         )
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmTableCodeRule/entity/MdmTableCodeRuleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmTableCodeRule/entity/MdmTableCodeRuleEntity.xml
index 9f5c3cc8..759eaf5f 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmTableCodeRule/entity/MdmTableCodeRuleEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmTableCodeRule/entity/MdmTableCodeRuleEntity.xml
@@ -155,7 +155,6 @@
             <if test="sts != null and sts != ''"> sts , </if>
             <if test="org_id != null and org_id != ''"> org_id , </if>
             <if test="dbValue != null and dbValue != ''"> db_value , </if>
-            <if test="sorts == null ">sorts,</if>
     <if test="sts == null ">sts,</if>
   </trim>
   )values(
@@ -174,7 +173,6 @@
             <if test="sts != null and sts != ''"> #{sts} ,</if>
             <if test="org_id != null and org_id != ''"> #{org_id} ,</if>
             <if test="dbValue != null and dbValue != ''"> #{dbValue} ,</if>
-            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_table_code_rule a WHERE a.sts = 'Y' ),</if>
     <if test="sts == null ">'Y',</if>
   </trim>
   )  
diff --git a/service/src/main/java/com/hzya/frame/mdm/service/IMdmService.java b/service/src/main/java/com/hzya/frame/mdm/service/IMdmService.java
index dcc8ec74..6a3e4754 100644
--- a/service/src/main/java/com/hzya/frame/mdm/service/IMdmService.java
+++ b/service/src/main/java/com/hzya/frame/mdm/service/IMdmService.java
@@ -67,7 +67,7 @@ public interface IMdmService {
      * @param jsonObject
      * @return com.hzya.frame.web.entity.JsonResultEntity
      * @Author lvleigang
-     * @Description 主数据设置查询数据源的服务
+     * @Description 主数据设置查询数据源字段的服务
      * @Date 9:40 上午 2023/10/18
      **/
     JsonResultEntity queryMdmModuleServerFiled(JSONObject jsonObject);
@@ -164,7 +164,7 @@ public interface IMdmService {
     JsonResultEntity queryMdmShowAll(JSONObject jsonObject);
     /**
      * @Author lvleigang
-     * @Description  查询数据（list 或者 分页）
+     * @Description  查询模版数据（list 或者 分页）
      * @Date 1:33 下午 2023/7/12
      * @param jsonObject
      * @return com.hzya.frame.web.entity.JsonResultEntity
@@ -183,7 +183,7 @@ public interface IMdmService {
      * @param jsonObject
      * @return com.hzya.frame.web.entity.JsonResultEntity
      * @Author lvleigang
-     * @Description 主数据列表显示 业务数据
+     * @Description 主数据业务数据
      * @Date 9:40 上午 2023/10/18
      **/
     JsonResultEntity queryMdmShowDistribute(JSONObject jsonObject);
diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/service/IIntegrationTaskLivingService.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/service/IIntegrationTaskLivingService.java
index fbb19bf5..da9906dc 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/service/IIntegrationTaskLivingService.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/service/IIntegrationTaskLivingService.java
@@ -23,4 +23,12 @@ public interface IIntegrationTaskLivingService extends IBaseService<IntegrationT
     JsonResultEntity queryEntityPage(JSONObject jsonObject);
 
 
+    /**
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 获取任务
+     * @Date 2:36 下午 2024/3/27
+     **/
+    JsonResultEntity getEntity(JSONObject jsonObject);
 }
diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/service/impl/IntegrationTaskLivingServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/service/impl/IntegrationTaskLivingServiceImpl.java
index e1f21736..92bc7c6d 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/service/impl/IntegrationTaskLivingServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/service/impl/IntegrationTaskLivingServiceImpl.java
@@ -3,6 +3,7 @@ package com.hzya.frame.sysnew.integtationTaskLiving.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.hzya.frame.sysnew.integtationTask.IIntegrationTaskCacheableService;
 import com.hzya.frame.sysnew.integtationTask.entity.IntegrationTaskEntity;
 import com.hzya.frame.sysnew.integtationTaskLiving.entity.IntegrationTaskLivingEntity;
 import com.hzya.frame.sysnew.integtationTaskLiving.dao.IIntegrationTaskLivingDao;
@@ -26,7 +27,9 @@ import java.util.List;
 public class IntegrationTaskLivingServiceImpl extends BaseService<IntegrationTaskLivingEntity, String> implements IIntegrationTaskLivingService {
      
     private IIntegrationTaskLivingDao integrationTaskLivingDao;
-    
+
+	@Resource
+	private IIntegrationTaskCacheableService iIntegrationTaskCacheableService;
     @Autowired
 	public void setIntegrationTaskLivingDao(IIntegrationTaskLivingDao dao) {
 		this.integrationTaskLivingDao = dao;
@@ -52,4 +55,27 @@ public class IntegrationTaskLivingServiceImpl extends BaseService<IntegrationTas
 		PageInfo pageInfo = new PageInfo(list);
 		return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo);
 	}
+
+	/**
+	 * @param jsonObject
+	 * @return com.hzya.frame.web.entity.JsonResultEntity
+	 * @Author lvleigang
+	 * @Description 获取任务实例
+	 * @Date 2:36 下午 2024/3/27
+	 **/
+	@Override
+	public JsonResultEntity getEntity(JSONObject jsonObject) {
+		IntegrationTaskLivingEntity entity = getData("jsonStr", jsonObject, IntegrationTaskLivingEntity.class);
+		if (entity == null) {
+			return BaseResult.getFailureMessageEntity("参数不允许为空");
+		}
+		if (entity.getId() == null || "".equals(entity.getId())) {
+			return BaseResult.getFailureMessageEntity("系统错误");
+		}
+		entity = iIntegrationTaskCacheableService.getIntegrationTaskLivingEntity(entity.getId());
+		if (entity == null) {
+			return BaseResult.getFailureMessageEntity("获取任务实例失败");
+		}
+		return BaseResult.getSuccessMessageEntity("获取任务实例成功", entity);
+	}
 }
diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/IIntegrationTaskLivingDetailsService.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/IIntegrationTaskLivingDetailsService.java
index 32e1ff10..49393331 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/IIntegrationTaskLivingDetailsService.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/IIntegrationTaskLivingDetailsService.java
@@ -22,4 +22,12 @@ public interface IIntegrationTaskLivingDetailsService extends IBaseService<Integ
     JsonResultEntity queryEntityPage(JSONObject jsonObject);
 
 
+    /**
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 获取任务
+     * @Date 2:36 下午 2024/3/27
+     **/
+    JsonResultEntity getEntity(JSONObject jsonObject);
 }
diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/impl/IntegrationTaskLivingDetailsServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/impl/IntegrationTaskLivingDetailsServiceImpl.java
index 70c0d746..365a712d 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/impl/IntegrationTaskLivingDetailsServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/impl/IntegrationTaskLivingDetailsServiceImpl.java
@@ -52,4 +52,28 @@ public class IntegrationTaskLivingDetailsServiceImpl extends BaseService<Integra
 		PageInfo pageInfo = new PageInfo(list);
 		return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo);
 	}
+
+
+	/**
+	 * @param jsonObject
+	 * @return com.hzya.frame.web.entity.JsonResultEntity
+	 * @Author lvleigang
+	 * @Description 获取任务日志
+	 * @Date 2:36 下午 2024/3/27
+	 **/
+	@Override
+	public JsonResultEntity getEntity(JSONObject jsonObject) {
+		IntegrationTaskLivingDetailsEntity entity = getData("jsonStr", jsonObject, IntegrationTaskLivingDetailsEntity.class);
+		if (entity == null) {
+			return BaseResult.getFailureMessageEntity("参数不允许为空");
+		}
+		if (entity.getId() == null || "".equals(entity.getId())) {
+			return BaseResult.getFailureMessageEntity("系统错误");
+		}
+		entity = integrationTaskLivingDetailsDao.get(entity.getId());
+		if (entity == null) {
+			return BaseResult.getFailureMessageEntity("获取任务日志失败");
+		}
+		return BaseResult.getSuccessMessageEntity("获取任务日志成功", entity);
+	}
 }
diff --git a/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java b/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java
index d14cce66..2651c378 100644
--- a/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java
+++ b/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java
@@ -75,15 +75,11 @@ public class EntranceServiceImpl implements IEntranceService {
         }
         //获取类下面的方法
         Method[] methods = object.getClass().getMethods();
-        logger.info("methodsLength:" + methods.length);
         if (methods == null || methods.length == 0) {
-            logger.info("当前methods:" + methods + "methodsLength = " + methods.length);
+            logger.error("当前service:" + service + "serviceMethod = " + serviceMethod+"未找到");
             return BaseResult.getFailureMessageEntity(service + "未找到" + serviceMethod + "方法");
-        } else {
-            logger.error("当前methods1:" + methods + "methodsLength = " + methods.length);
         }
         for (Method m : methods) {
-            //logger.info("当前mnAME:" + m.getName() + "   :serviceMethod = " + serviceMethod.trim());
             if (null != m) {
                 if (m.getName().equals(serviceMethod.trim())) {
                     if (m.getName().startsWith("thirdInterface")) {//TODO 后续可能要加强校验规则
@@ -131,15 +127,13 @@ public class EntranceServiceImpl implements IEntranceService {
                             return BaseResult.getFailureMessageEntity("token无效");
                         }
                     }
-                    logger.info("m.getNameEquals成功");
                     JSONObject jsonObject = new JSONObject();
                     if (!ObjectUtils.isEmpty(body)) {
                         jsonObject.put("jsonStr", body);
                     }
                     JsonResultEntity jsonResultEntity;
                     try {
-                        logger.info("invoke开始>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
-                        logger.info("请求的参数：jsonObject：" + jsonObject.toJSONString());
+                        logger.info("invoke开始>>>>>>>>>>>>>>>>>>>>>>>>>>>>请求的参数：jsonObject：" + jsonObject.toJSONString());
                         jsonResultEntity = (JsonResultEntity) m.invoke(object, jsonObject);
                         logger.info("invoke结束>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
                         return jsonResultEntity;
diff --git a/webapp/src/main/java/com/hzya/frame/webapp/web/aop/AopDynamicRoutingDataSourceInit.java b/webapp/src/main/java/com/hzya/frame/webapp/web/aop/AopDynamicRoutingDataSourceInit.java
index 84bcd7c1..17a238dd 100644
--- a/webapp/src/main/java/com/hzya/frame/webapp/web/aop/AopDynamicRoutingDataSourceInit.java
+++ b/webapp/src/main/java/com/hzya/frame/webapp/web/aop/AopDynamicRoutingDataSourceInit.java
@@ -43,7 +43,7 @@ public class AopDynamicRoutingDataSourceInit {
 
     @Before("@annotation(dsAnnotation)")
     public void beforeDynamicRoutingDataSourceInitMethod(JoinPoint joinPoint, DS dsAnnotation) {
-        logger.info("beforeDynamicRoutingDataSourceInitMethod:拦截所有使用ds注解的方法，根据ds的value值初始化数据源！");
+        //logger.info("beforeDynamicRoutingDataSourceInitMethod:拦截所有使用ds注解的方法，根据ds的value值初始化数据源！");
         String dsValue = dsAnnotation.value();
         if (dsValue != null && !"".equals(dsValue) && dsValue.contains("#")) {
             Object[] args = joinPoint.getArgs();
@@ -63,13 +63,13 @@ public class AopDynamicRoutingDataSourceInit {
         try {
             dsDatasource = ds.getDataSource(dsValue);
         } catch (CannotFindDataSourceException exception) {
-            logger.info("beforeDynamicRoutingDataSourceInitMethod:根据ds获取dsDatasource失败！异常信息：" + "exception.getMessage()" + " 执行初始化数据源：" + dsValue);
+            //logger.info("beforeDynamicRoutingDataSourceInitMethod:根据ds获取dsDatasource失败！异常信息：" + "exception.getMessage()" + " 执行初始化数据源：" + dsValue);
             SysDataSourceEntity entity = new SysDataSourceEntity();
             entity.setSts("Y");
             entity.setUseState(1);
             entity.setSourceCode(dsValue);
             List<SysDataSourceVo> sysDataSourceEntities = sysDataSourceDao.queryDSBase(entity);
-            logger.info("beforeDynamicRoutingDataSourceInitMethod:根据dsValue获取数据源信息查询结果 sysDataSourceEntities.size:" + sysDataSourceEntities.size());
+            //logger.info("beforeDynamicRoutingDataSourceInitMethod:根据dsValue获取数据源信息查询结果 sysDataSourceEntities.size:" + sysDataSourceEntities.size());
             if (sysDataSourceEntities != null && sysDataSourceEntities.size() > 0) {
                 for (int i = 0; i < sysDataSourceEntities.size(); i++) {
                     JSONObject defaultDataSourceProperties = new JSONObject();
diff --git a/webapp/src/main/java/com/hzya/frame/webapp/web/filter/BaseFilter.java b/webapp/src/main/java/com/hzya/frame/webapp/web/filter/BaseFilter.java
index 8d62574e..39cab232 100644
--- a/webapp/src/main/java/com/hzya/frame/webapp/web/filter/BaseFilter.java
+++ b/webapp/src/main/java/com/hzya/frame/webapp/web/filter/BaseFilter.java
@@ -42,7 +42,7 @@ public class BaseFilter implements Filter {
     @Override
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
 
-        logger.info("第二过滤器：验证权限");
+        //logger.info("第二过滤器：验证权限");
         HttpServletResponseWrapper wrapper = new HttpServletResponseWrapper((HttpServletResponse) servletResponse);
         HttpServletRequest request = (HttpServletRequest) servletRequest;
         String requestURI = request.getRequestURI();
diff --git a/webapp/src/main/java/com/hzya/frame/webapp/web/filter/ExceptionOptionFilter.java b/webapp/src/main/java/com/hzya/frame/webapp/web/filter/ExceptionOptionFilter.java
index b7bdbb56..e0181002 100644
--- a/webapp/src/main/java/com/hzya/frame/webapp/web/filter/ExceptionOptionFilter.java
+++ b/webapp/src/main/java/com/hzya/frame/webapp/web/filter/ExceptionOptionFilter.java
@@ -24,7 +24,7 @@ public class ExceptionOptionFilter implements Filter {
     @Override
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws IOException, ServletException {
         try {
-            LOGGER.info("第一过滤器：处理异常Filter");
+            //LOGGER.info("第一过滤器：处理异常Filter");
             filterChain.doFilter(request, response);
         } catch (Exception e) {
             e.printStackTrace();