From 4f30c7f8fb153e3c47dbefe684ebdb8f39fb440d Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Mon, 17 Jun 2024 10:31:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9,?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hzya/frame/mdm/entity/MdmDto.java     |   10 +
 .../mdm/mdmModule/entity/MdmModuleEntity.xml  |   22 +-
 .../mdmModule/service/IMdmModuleService.java  |   46 +
 .../service/impl/MdmModuleServiceImpl.java    |  626 +-
 .../entity/MdmModuleDbFiledsEntity.java       |   10 +
 .../entity/MdmModuleDbFiledsRuleEntity.xml    |    2 +
 .../dao/IMdmModuleDistributeDao.java          |    2 +-
 .../dao/impl/MdmModuleDistributeDaoImpl.java  |    2 +-
 .../entity/MdmModuleDistributeEntity.java     |   13 +-
 .../entity/MdmModuleDistributeEntity.xml      |   34 +-
 .../service/IMdmModuleDistributeService.java  |    2 +-
 .../impl/MdmModuleDistributeServiceImpl.java  |    2 +-
 .../dao/IMdmModuleDistributeDetailDao.java    |    2 +-
 .../MdmModuleDistributeDetailDaoImpl.java     |    2 +-
 .../MdmModuleDistributeDetailEntity.java      |   34 +-
 .../MdmModuleDistributeDetailEntity.xml       |   55 +-
 .../IMdmModuleDistributeDetailService.java    |    2 +-
 .../MdmModuleDistributeDetailServiceImpl.java |    2 +-
 .../entity/MdmModuleSourceEntity.java         |    2 +-
 .../entity/MdmModuleSourceEntity.xml          |    5 +
 .../mdmModuleView/dao/IMdmModuleViewDao.java  |    2 +
 .../dao/impl/MdmModuleViewDaoImpl.java        |   11 +-
 .../entity/MdmModuleViewEntity.java           |    2 +-
 .../entity/MdmModuleViewEntity.xml            |   10 +-
 .../entity/MdmModuleViewButtonEntity.java     |    2 +-
 .../entity/MdmModuleViewDetailEntity.java     |   10 +
 .../hzya/frame/mdm/service/IMdmService.java   |  396 +-
 .../mdm/service/impl/MdmServiceImpl.java      | 5731 +++++------------
 .../frame/serviceUtil/DsDataSourceUtil.java   |   15 +-
 .../sys/dataSource/dao/ISysDataSourceDao.java |   24 -
 .../dao/impl/SysDataSourceDaoImpl.java        |   47 -
 .../entity/SysDataSourceEntity.java           |  168 -
 .../dataSource/entity/SysDataSourceEntity.xml |  484 --
 .../dataSource/entity/SysDataSourceVo.java    |  162 -
 .../service/ISysDataSourceService.java        |   74 -
 .../impl/SysDataSourceServiceImpl.java        |  256 -
 .../dao/ISysApplicationDatabaseDao.java       |    7 +-
 .../impl/SysApplicationDatabaseDaoImpl.java   |   13 +-
 .../entity/SysApplicationDatabaseEntity.java  |   99 +-
 .../entity/SysApplicationDatabaseEntity.xml   |  199 +-
 .../ISysApplicationDatabaseService.java       |    2 +-
 .../SysApplicationDatabaseServiceImpl.java    |    2 +-
 .../impl/SysApplicationServiceImpl.java       |   30 +-
 .../sysnew/login/impl/LoginServiceImpl.java   |    7 +
 .../aop/AopDynamicRoutingDataSourceInit.java  |   15 +-
 45 files changed, 2799 insertions(+), 5844 deletions(-)
 delete mode 100644 service/src/main/java/com/hzya/frame/sys/dataSource/dao/ISysDataSourceDao.java
 delete mode 100644 service/src/main/java/com/hzya/frame/sys/dataSource/dao/impl/SysDataSourceDaoImpl.java
 delete mode 100644 service/src/main/java/com/hzya/frame/sys/dataSource/entity/SysDataSourceEntity.java
 delete mode 100644 service/src/main/java/com/hzya/frame/sys/dataSource/entity/SysDataSourceEntity.xml
 delete mode 100644 service/src/main/java/com/hzya/frame/sys/dataSource/entity/SysDataSourceVo.java
 delete mode 100644 service/src/main/java/com/hzya/frame/sys/dataSource/service/ISysDataSourceService.java
 delete mode 100644 service/src/main/java/com/hzya/frame/sys/dataSource/service/impl/SysDataSourceServiceImpl.java

diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDto.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDto.java
index 01dd7150..93774e10 100644
--- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDto.java
+++ b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDto.java
@@ -25,6 +25,8 @@ public class MdmDto {
     private String id;
     //id
     private String fieldId;
+    //id
+    private String dbId;
     //3、新增4、修改 5、查看
     private String showType;
     //分页
@@ -222,5 +224,13 @@ public class MdmDto {
     public void setFieldId(String fieldId) {
         this.fieldId = fieldId;
     }
+
+    public String getDbId() {
+        return dbId;
+    }
+
+    public void setDbId(String dbId) {
+        this.dbId = dbId;
+    }
 }
 
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 548f0526..7dbd9244 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
@@ -391,14 +391,12 @@ where id = #{id}
             </when>
         </choose>
         PRIMARY KEY (`sorts`,`id`) USING BTREE
-        ) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = #{tableRemark}
+        ) ENGINE = INNODB DEFAULT CHARSET = utf8mb4
+        <if test="tableRemark != null and tableRemark != ''"> COMMENT = #{tableRemark} </if>
     </select>
 
 
 
-
-
-
     <!--通过ID获取数据 -->
     <select id="alterTable" resultType="java.lang.Integer">
         ALTER TABLE ${tableName}
@@ -464,14 +462,14 @@ where id = #{id}
                     <when test="filedType  == '1'.toString()">
                         <choose>
                             <when test="dataType  == '1'.toString()">
-                                MODIFY COLUMN ${enName} bigint(${filedLength}) DEFAULT NULL COMMENT
+                                add COLUMN ${enName} bigint(${filedLength}) DEFAULT NULL COMMENT
                                 #{chName}
                             </when>
                             <when test="dataType  == '3'.toString()">
                                 drop COLUMN ${enName}
                             </when>
                             <otherwise>
-                                add COLUMN ${enName} bigint(${filedLength}) DEFAULT NULL COMMENT
+                                MODIFY COLUMN ${enName} bigint(${filedLength}) DEFAULT NULL COMMENT
                                 #{chName}
                             </otherwise>
                         </choose>
@@ -479,14 +477,14 @@ where id = #{id}
                     <when test="filedType  == '3'.toString()">
                         <choose>
                             <when test="dataType  == '1'.toString()">
-                                MODIFY COLUMN ${enName} varchar(${filedLength}) DEFAULT NULL
+                                add COLUMN ${enName} varchar(${filedLength}) DEFAULT NULL
                                 COMMENT #{chName}
                             </when>
                             <when test="dataType  == '3'.toString()">
                                 drop COLUMN ${enName}
                             </when>
                             <otherwise>
-                                add COLUMN ${enName} varchar(${filedLength}) DEFAULT NULL COMMENT
+                                MODIFY COLUMN ${enName} varchar(${filedLength}) DEFAULT NULL COMMENT
                                 #{chName}
                             </otherwise>
                         </choose>
@@ -495,14 +493,14 @@ where id = #{id}
                     <when test="filedType  == '2'.toString()">
                         <choose>
                             <when test="dataType  == '1'.toString()">
-                                MODIFY COLUMN ${enName} decimal(${filedLength}) DEFAULT NULL COMMENT
+                                add COLUMN ${enName} decimal(${filedLength}) DEFAULT NULL COMMENT
                                 #{chName}
                             </when>
                             <when test="dataType  == '3'.toString()">
                                 drop COLUMN ${enName}
                             </when>
                             <otherwise>
-                                add COLUMN ${enName} decimal(${filedLength}) DEFAULT NULL COMMENT
+                                MODIFY COLUMN ${enName} decimal(${filedLength}) DEFAULT NULL COMMENT
                                 #{chName}
                             </otherwise>
                         </choose>
@@ -510,13 +508,13 @@ where id = #{id}
                     <when test="filedType  == '4'.toString()">
                         <choose>
                             <when test="dataType  == '1'.toString()">
-                                MODIFY COLUMN ${enName} datetime DEFAULT NULL COMMENT #{chName}
+                                add COLUMN ${enName} datetime DEFAULT NULL COMMENT #{chName}
                             </when>
                             <when test="dataType  == '3'.toString()">
                                 drop COLUMN ${enName}
                             </when>
                             <otherwise>
-                                add COLUMN ${enName} datetime DEFAULT NULL COMMENT #{chName}
+                                MODIFY COLUMN ${enName} datetime DEFAULT NULL COMMENT #{chName}
                             </otherwise>
                         </choose>
                     </when>
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/IMdmModuleService.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/IMdmModuleService.java
index bd028fd5..5d45e907 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/IMdmModuleService.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/IMdmModuleService.java
@@ -122,6 +122,14 @@ public interface IMdmModuleService extends IBaseService<MdmModuleEntity, String>
      * @return com.hzya.frame.web.entity.JsonResultEntity
      **/
     JsonResultEntity queryMdmDbField(JSONObject jsonObject);
+    /**
+     * @Author lvleigang
+     * @Description  主数据-数据源-数据表字段明细
+     * @Date 11:43 上午 2024/6/11
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     **/
+    JsonResultEntity queryMdmDbFieldDetail(JSONObject jsonObject);
 
 
     /**
@@ -342,4 +350,42 @@ public interface IMdmModuleService extends IBaseService<MdmModuleEntity, String>
      * @return com.hzya.frame.web.entity.JsonResultEntity
      **/
     JsonResultEntity queryMdmDistributeLogPage(JSONObject jsonObject);
+
+
+    /**
+     * @Author lvleigang
+     * @Description  主数据-数据源-服务获取（只获取主表）
+     * @Date 11:43 上午 2024/6/11
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     **/
+    JsonResultEntity queryMdmService(JSONObject jsonObject);
+
+    /**
+     * @Author lvleigang
+     * @Description  主数据-数据源-服务字段获取（只获取主表）
+     * @Date 11:43 上午 2024/6/11
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     **/
+    JsonResultEntity queryMdmServiceField(JSONObject jsonObject);
+
+
+    /**
+     * @Author lvleigang
+     * @Description  主数据-分发-只获取主表
+     * @Date 11:43 上午 2024/6/11
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     **/
+    JsonResultEntity queryMdmMainDB(JSONObject jsonObject);
+
+    /**
+     * @Author lvleigang
+     * @Description  主数据-数据源-只获取主表字段
+     * @Date 11:43 上午 2024/6/11
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     **/
+    JsonResultEntity queryMdmMainDBField(JSONObject jsonObject);
 }
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java
index 9d41fb30..677329b2 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java
@@ -466,7 +466,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         }
         List<MdmModuleDbEntity> mdmModuleDbEntities = new ArrayList<>();
         List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntities = new ArrayList<>();
-
+        entity.setDataType("1");
         //保存数据表，新建默认字段
         entity.setCreate();
         mdmModuleDbEntities.add(entity);
@@ -477,16 +477,20 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             mdmModuleDbEntity.setMdmId(entity.getMdmId());
             mdmModuleDbEntity.setDbName(entity.getDbName() + "_option_log");
             mdmModuleDbEntity.setDbType("3");
+            mdmModuleDbEntity.setRemark(entity.getRemark()+"操作日志");
             mdmModuleDbEntity.setCreate();
+            mdmModuleDbEntity.setDataType("1");
             mdmModuleDbEntities.add(mdmModuleDbEntity);
             //新增 设置日志表
             setMdmField(mdmModuleDbEntity, mdmModuleDbFiledsEntities);
 
             MdmModuleDbEntity mdmModuleDbEntity1 = new MdmModuleDbEntity();
             mdmModuleDbEntity1.setMdmId(entity.getMdmId());
-            mdmModuleDbEntity1.setDbName(entity.getDbName() + "_option_log");
+            mdmModuleDbEntity1.setDbName(entity.getDbName() + "_send_log");
             mdmModuleDbEntity1.setDbType("4");
+            mdmModuleDbEntity1.setRemark(entity.getRemark()+"下发日志");
             mdmModuleDbEntity1.setCreate();
+            mdmModuleDbEntity1.setDataType("1");
             mdmModuleDbEntities.add(mdmModuleDbEntity1);
             //新增 设置日志表
             setMdmField(mdmModuleDbEntity1, mdmModuleDbFiledsEntities);
@@ -529,30 +533,33 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         id.setViewType("2");
         id.setFiledLength("50");
         id.setCreate();
+        id.setDataType("1");
         mdmModuleDbFiledsEntities.add(id);
 
         if ("1".equals(entity.getDbType())) {
             MdmModuleDbFiledsEntity documentRule = new MdmModuleDbFiledsEntity();
             documentRule.setMdmId(entity.getMdmId());
             documentRule.setDbId(entity.getId());
-            documentRule.setChName("document_rule");
-            documentRule.setEnName("单据规则");
+            documentRule.setEnName("document_rule");
+            documentRule.setChName("单据规则");
             documentRule.setFiledType("3");
             documentRule.setAddType("2");
             documentRule.setUpdateType("1");
             documentRule.setShowType("1");
             documentRule.setQueryType("1");
             documentRule.setListType("1");
-            documentRule.setViewType("1");
+            documentRule.setViewType("2");
             documentRule.setFiledLength("50");
             documentRule.setCreate();
+            documentRule.setDataType("1");
+
             mdmModuleDbFiledsEntities.add(documentRule);
 
             MdmModuleDbFiledsEntity document_rule_num = new MdmModuleDbFiledsEntity();
             document_rule_num.setMdmId(entity.getMdmId());
             document_rule_num.setDbId(entity.getId());
-            document_rule_num.setChName("document_rule_num");
-            document_rule_num.setEnName("单据规则流水号");
+            document_rule_num.setEnName("document_rule_num");
+            document_rule_num.setChName("单据规则流水号");
             document_rule_num.setFiledType("1");
             document_rule_num.setAddType("2");
             document_rule_num.setUpdateType("2");
@@ -562,23 +569,25 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             document_rule_num.setViewType("2");
             document_rule_num.setFiledLength("50");
             document_rule_num.setCreate();
+            document_rule_num.setDataType("1");
             mdmModuleDbFiledsEntities.add(document_rule_num);
         }
         if ("2".equals(entity.getDbType()) || "3".equals(entity.getDbType()) || "4".equals(entity.getDbType())) {
             MdmModuleDbFiledsEntity formmain_id = new MdmModuleDbFiledsEntity();
             formmain_id.setMdmId(entity.getMdmId());
             formmain_id.setDbId(entity.getId());
-            formmain_id.setChName("formmain_id");
-            formmain_id.setEnName("主表id");
+            formmain_id.setEnName("formmain_id");
+            formmain_id.setChName("主表id");
             formmain_id.setFiledType("3");
             formmain_id.setAddType("2");
-            formmain_id.setUpdateType("1");
-            formmain_id.setShowType("1");
-            formmain_id.setQueryType("1");
-            formmain_id.setListType("1");
-            formmain_id.setViewType("1");
+            formmain_id.setUpdateType("2");
+            formmain_id.setShowType("2");
+            formmain_id.setQueryType("2");
+            formmain_id.setListType("2");
+            formmain_id.setViewType("2");
             formmain_id.setFiledLength("50");
             formmain_id.setCreate();
+            formmain_id.setDataType("1");
             mdmModuleDbFiledsEntities.add(formmain_id);
         }
         //写入日志字段：操作人
@@ -586,8 +595,8 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             MdmModuleDbFiledsEntity source_name = new MdmModuleDbFiledsEntity();
             source_name.setMdmId(entity.getMdmId());
             source_name.setDbId(entity.getId());
-            source_name.setChName("source_name");
-            source_name.setEnName("来源名称");
+            source_name.setEnName("source_name");
+            source_name.setChName("来源名称");
             source_name.setFiledType("3");
             source_name.setAddType("2");
             source_name.setUpdateType("2");
@@ -597,13 +606,14 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             source_name.setViewType("2");
             source_name.setFiledLength("255");
             source_name.setCreate();
+            source_name.setDataType("1");
             mdmModuleDbFiledsEntities.add(source_name);
 
             MdmModuleDbFiledsEntity code = new MdmModuleDbFiledsEntity();
             code.setMdmId(entity.getMdmId());
             code.setDbId(entity.getId());
-            code.setChName("code");
-            code.setEnName("编码");
+            code.setEnName("code");
+            code.setChName("编码");
             code.setFiledType("3");
             code.setAddType("1");
             code.setUpdateType("1");
@@ -613,13 +623,14 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             code.setViewType("1");
             code.setFiledLength("255");
             code.setCreate();
+            code.setDataType("1");
             mdmModuleDbFiledsEntities.add(code);
 
             MdmModuleDbFiledsEntity source_data = new MdmModuleDbFiledsEntity();
             source_data.setMdmId(entity.getMdmId());
             source_data.setDbId(entity.getId());
-            source_data.setChName("source_data");
-            source_data.setEnName("源数据");
+            source_data.setEnName("source_data");
+            source_data.setChName("源数据");
             source_data.setFiledType("3");
             source_data.setAddType("1");
             source_data.setUpdateType("1");
@@ -629,13 +640,14 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             source_data.setViewType("1");
             source_data.setFiledLength("255");
             source_data.setCreate();
+            source_data.setDataType("1");
             mdmModuleDbFiledsEntities.add(source_data);
 
             MdmModuleDbFiledsEntity option_type = new MdmModuleDbFiledsEntity();
             option_type.setMdmId(entity.getMdmId());
             option_type.setDbId(entity.getId());
-            option_type.setChName("option_type");
-            option_type.setEnName("操作类型");
+            option_type.setEnName("option_type");
+            option_type.setChName("操作类型");
             option_type.setFiledType("3");
             option_type.setAddType("1");
             option_type.setUpdateType("1");
@@ -645,13 +657,14 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             option_type.setViewType("1");
             option_type.setFiledLength("255");
             option_type.setCreate();
+            option_type.setDataType("1");
             mdmModuleDbFiledsEntities.add(option_type);
 
             MdmModuleDbFiledsEntity option_Name = new MdmModuleDbFiledsEntity();
             option_Name.setMdmId(entity.getMdmId());
             option_Name.setDbId(entity.getId());
-            option_Name.setChName("option_name");
-            option_Name.setEnName("操作人");
+            option_Name.setEnName("option_name");
+            option_Name.setChName("操作人");
             option_Name.setFiledType("3");
             option_Name.setAddType("1");
             option_Name.setUpdateType("1");
@@ -661,6 +674,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             option_Name.setViewType("1");
             option_Name.setFiledLength("255");
             option_Name.setCreate();
+            option_Name.setDataType("1");
             mdmModuleDbFiledsEntities.add(option_Name);
         }
 
@@ -669,8 +683,8 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             MdmModuleDbFiledsEntity target_app = new MdmModuleDbFiledsEntity();
             target_app.setMdmId(entity.getMdmId());
             target_app.setDbId(entity.getId());
-            target_app.setChName("target_app");
-            target_app.setEnName("目标应用");
+            target_app.setEnName("target_app");
+            target_app.setChName("目标应用");
             target_app.setFiledType("3");
             target_app.setAddType("1");
             target_app.setUpdateType("1");
@@ -680,13 +694,14 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             target_app.setViewType("1");
             target_app.setFiledLength("255");
             target_app.setCreate();
+            target_app.setDataType("1");
             mdmModuleDbFiledsEntities.add(target_app);
 
             MdmModuleDbFiledsEntity target_api = new MdmModuleDbFiledsEntity();
             target_api.setMdmId(entity.getMdmId());
             target_api.setDbId(entity.getId());
-            target_api.setChName("target_api");
-            target_api.setEnName("目标api");
+            target_api.setEnName("target_api");
+            target_api.setChName("目标api");
             target_api.setFiledType("3");
             target_api.setAddType("1");
             target_api.setUpdateType("1");
@@ -696,13 +711,14 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             target_api.setViewType("1");
             target_api.setFiledLength("255");
             target_api.setCreate();
+            target_api.setDataType("1");
             mdmModuleDbFiledsEntities.add(target_api);
 
             MdmModuleDbFiledsEntity source_data = new MdmModuleDbFiledsEntity();
             source_data.setMdmId(entity.getMdmId());
             source_data.setDbId(entity.getId());
-            source_data.setChName("source_data");
-            source_data.setEnName("源数据");
+            source_data.setEnName("source_data");
+            source_data.setChName("源数据");
             source_data.setFiledType("3");
             source_data.setAddType("1");
             source_data.setUpdateType("1");
@@ -712,13 +728,14 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             source_data.setViewType("1");
             source_data.setFiledLength("255");
             source_data.setCreate();
+            source_data.setDataType("1");
             mdmModuleDbFiledsEntities.add(source_data);
 
             MdmModuleDbFiledsEntity option_type = new MdmModuleDbFiledsEntity();
             option_type.setMdmId(entity.getMdmId());
             option_type.setDbId(entity.getId());
-            option_type.setChName("option_type");
-            option_type.setEnName("操作类型");
+            option_type.setEnName("option_type");
+            option_type.setChName("操作类型");
             option_type.setFiledType("3");
             option_type.setAddType("1");
             option_type.setUpdateType("1");
@@ -728,14 +745,15 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             option_type.setViewType("1");
             option_type.setFiledLength("255");
             option_type.setCreate();
+            option_type.setDataType("1");
             mdmModuleDbFiledsEntities.add(option_type);
         }
         if ("2".equals(entity.getDbType()) || "1".equals(entity.getDbType())) {
             MdmModuleDbFiledsEntity data_status = new MdmModuleDbFiledsEntity();
             data_status.setMdmId(entity.getMdmId());
             data_status.setDbId(entity.getId());
-            data_status.setChName("data_status");
-            data_status.setEnName("数据状态 Y正常 N删除 F修改");
+            data_status.setEnName("data_status");
+            data_status.setChName("数据状态 Y正常 N删除 F修改");
             data_status.setFiledType("3");
             data_status.setAddType("2");
             data_status.setUpdateType("2");
@@ -745,14 +763,15 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             data_status.setViewType("2");
             data_status.setFiledLength("1");
             data_status.setCreate();
+            data_status.setDataType("1");
             mdmModuleDbFiledsEntities.add(data_status);
         }
         if ("1".equals(entity.getDbType())) {
             MdmModuleDbFiledsEntity add_status = new MdmModuleDbFiledsEntity();
             add_status.setMdmId(entity.getMdmId());
             add_status.setDbId(entity.getId());
-            add_status.setChName("add_status");
-            add_status.setEnName("新增数据状态 0待下发 1已下发");
+            add_status.setEnName("add_status");
+            add_status.setChName("新增数据状态 0待下发 1已下发");
             add_status.setFiledType("3");
             add_status.setAddType("2");
             add_status.setUpdateType("2");
@@ -762,14 +781,15 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             add_status.setViewType("2");
             add_status.setFiledLength("1");
             add_status.setCreate();
+            add_status.setDataType("1");
             mdmModuleDbFiledsEntities.add(add_status);
         }
         if ("1".equals(entity.getDbType())) {
             MdmModuleDbFiledsEntity update_status = new MdmModuleDbFiledsEntity();
             update_status.setMdmId(entity.getMdmId());
             update_status.setDbId(entity.getId());
-            update_status.setChName("update_status");
-            update_status.setEnName("修改数据状态 0待下发 1已下发");
+            update_status.setEnName("update_status");
+            update_status.setChName("修改数据状态 0待下发 1已下发");
             update_status.setFiledType("3");
             update_status.setAddType("2");
             update_status.setUpdateType("2");
@@ -779,6 +799,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             update_status.setViewType("2");
             update_status.setFiledLength("1");
             update_status.setCreate();
+            update_status.setDataType("1");
             mdmModuleDbFiledsEntities.add(update_status);
         }
 
@@ -786,8 +807,8 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             MdmModuleDbFiledsEntity delete_status = new MdmModuleDbFiledsEntity();
             delete_status.setMdmId(entity.getMdmId());
             delete_status.setDbId(entity.getId());
-            delete_status.setChName("delete_status");
-            delete_status.setEnName("删除数据状态 0待下发 1已下发");
+            delete_status.setEnName("delete_status");
+            delete_status.setChName("删除数据状态 0待下发 1已下发");
             delete_status.setFiledType("3");
             delete_status.setAddType("2");
             delete_status.setUpdateType("2");
@@ -797,14 +818,15 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             delete_status.setViewType("2");
             delete_status.setFiledLength("1");
             delete_status.setCreate();
+            delete_status.setDataType("1");
             mdmModuleDbFiledsEntities.add(delete_status);
         }
 
         MdmModuleDbFiledsEntity sorts = new MdmModuleDbFiledsEntity();
         sorts.setMdmId(entity.getMdmId());
         sorts.setDbId(entity.getId());
-        sorts.setChName("sorts");
-        sorts.setEnName("排序");
+        sorts.setEnName("sorts");
+        sorts.setChName("排序");
         sorts.setFiledType("1");
         sorts.setAddType("2");
         sorts.setUpdateType("2");
@@ -814,12 +836,13 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         sorts.setViewType("2");
         sorts.setFiledLength("20");
         sorts.setCreate();
+        sorts.setDataType("1");
         mdmModuleDbFiledsEntities.add(sorts);
         MdmModuleDbFiledsEntity create_user_id = new MdmModuleDbFiledsEntity();
         create_user_id.setMdmId(entity.getMdmId());
         create_user_id.setDbId(entity.getId());
-        create_user_id.setChName("create_user_id");
-        create_user_id.setEnName("创建人id");
+        create_user_id.setEnName("create_user_id");
+        create_user_id.setChName("创建人id");
         create_user_id.setFiledType("3");
         create_user_id.setAddType("2");
         create_user_id.setUpdateType("2");
@@ -829,12 +852,13 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         create_user_id.setViewType("2");
         create_user_id.setFiledLength("50");
         create_user_id.setCreate();
+        create_user_id.setDataType("1");
         mdmModuleDbFiledsEntities.add(create_user_id);
         MdmModuleDbFiledsEntity create_time = new MdmModuleDbFiledsEntity();
         create_time.setMdmId(entity.getMdmId());
         create_time.setDbId(entity.getId());
-        create_time.setChName("create_time");
-        create_time.setEnName("创建时间");
+        create_time.setEnName("create_time");
+        create_time.setChName("创建时间");
         create_time.setFiledType("4");
         create_time.setAddType("2");
         create_time.setUpdateType("2");
@@ -844,12 +868,13 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         create_time.setViewType("2");
         create_time.setFiledLength(null);
         create_time.setCreate();
+        create_time.setDataType("1");
         mdmModuleDbFiledsEntities.add(create_time);
         MdmModuleDbFiledsEntity modify_user_id = new MdmModuleDbFiledsEntity();
         modify_user_id.setMdmId(entity.getMdmId());
         modify_user_id.setDbId(entity.getId());
-        modify_user_id.setChName("modify_user_id");
-        modify_user_id.setEnName("修改人id");
+        modify_user_id.setEnName("modify_user_id");
+        modify_user_id.setChName("修改人id");
         modify_user_id.setFiledType("3");
         modify_user_id.setAddType("2");
         modify_user_id.setUpdateType("2");
@@ -859,12 +884,13 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         modify_user_id.setViewType("2");
         modify_user_id.setFiledLength("50");
         modify_user_id.setCreate();
+        modify_user_id.setDataType("1");
         mdmModuleDbFiledsEntities.add(modify_user_id);
         MdmModuleDbFiledsEntity modify_time = new MdmModuleDbFiledsEntity();
         modify_time.setMdmId(entity.getMdmId());
         modify_time.setDbId(entity.getId());
-        modify_time.setChName("modify_time");
-        modify_time.setEnName("修改时间");
+        modify_time.setEnName("modify_time");
+        modify_time.setChName("修改时间");
         modify_time.setFiledType("4");
         modify_time.setAddType("2");
         modify_time.setUpdateType("2");
@@ -874,12 +900,13 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         modify_time.setViewType("2");
         modify_time.setFiledLength(null);
         modify_time.setCreate();
+        modify_time.setDataType("1");
         mdmModuleDbFiledsEntities.add(modify_time);
         MdmModuleDbFiledsEntity sts = new MdmModuleDbFiledsEntity();
         sts.setMdmId(entity.getMdmId());
         sts.setDbId(entity.getId());
-        sts.setChName("sts");
-        sts.setEnName("状态(Y正常N删除)");
+        sts.setEnName("sts");
+        sts.setChName("状态(Y正常N删除)");
         sts.setFiledType("3");
         sts.setAddType("2");
         sts.setUpdateType("2");
@@ -889,12 +916,13 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         sts.setViewType("2");
         sts.setFiledLength("1");
         sts.setCreate();
+        sts.setDataType("1");
         mdmModuleDbFiledsEntities.add(sts);
         MdmModuleDbFiledsEntity org_id = new MdmModuleDbFiledsEntity();
         org_id.setMdmId(entity.getMdmId());
         org_id.setDbId(entity.getId());
-        org_id.setChName("org_id");
-        org_id.setEnName("组织机构ID");
+        org_id.setEnName("org_id");
+        org_id.setChName("组织机构ID");
         org_id.setFiledType("3");
         org_id.setAddType("2");
         org_id.setUpdateType("2");
@@ -904,12 +932,13 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         org_id.setViewType("2");
         org_id.setFiledLength("50");
         org_id.setCreate();
+        org_id.setDataType("1");
         mdmModuleDbFiledsEntities.add(org_id);
         MdmModuleDbFiledsEntity company_id = new MdmModuleDbFiledsEntity();
         company_id.setMdmId(entity.getMdmId());
         company_id.setDbId(entity.getId());
-        company_id.setChName("company_id");
-        company_id.setEnName("公司id");
+        company_id.setEnName("company_id");
+        company_id.setChName("公司id");
         company_id.setFiledType("3");
         company_id.setAddType("2");
         company_id.setUpdateType("2");
@@ -919,6 +948,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         company_id.setViewType("2");
         company_id.setFiledLength("50");
         company_id.setCreate();
+        company_id.setDataType("1");
         mdmModuleDbFiledsEntities.add(company_id);
     }
 
@@ -943,6 +973,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             return BaseResult.getFailureMessageEntity("系统错误");
         }
         List<MdmModuleDbEntity> mdmModuleDbEntities = new ArrayList<>();
+        entity.setDataType("2");
         mdmModuleDbEntities.add(entity);
         mdmServiceCache.saveOrUpdateMdmModuleDb(entity.getMdmId(), mdmModuleDbEntities);
         Map<String, String> tablename = new HashMap<>();
@@ -965,12 +996,18 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         if (entity == null) {
             return BaseResult.getFailureMessageEntity("系统错误");
         }
+        if (entity.getId() == null || "".equals(entity.getId())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
         if (entity.getMdmId() == null || "".equals(entity.getMdmId())) {
             return BaseResult.getFailureMessageEntity("系统错误");
         }
         if (entity.getDbName() == null || "".equals(entity.getDbName())) {
             return BaseResult.getFailureMessageEntity("系统错误");
         }
+        if (entity.getDbType() == null || "".equals(entity.getDbType())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
 
         MdmQuery mdmQuery = new MdmQuery();
         mdmQuery.setTableName(entity.getDbName());
@@ -1110,12 +1147,56 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             for (int i = 0; i < mdmModuleDbFiledsEntities.size(); i++) {
                 if (entity.getDbId().equals(mdmModuleDbFiledsEntities.get(i).getDbId()) && "1".equals(mdmModuleDbFiledsEntities.get(i).getViewType())) {
                     dbEntities.add(mdmModuleDbFiledsEntities.get(i));
+                    MdmModuleDbFiledsRuleEntity ruleEntity = new MdmModuleDbFiledsRuleEntity();
+                    ruleEntity.setMdmId(mdmModuleDbFiledsEntities.get(i).getMdmId());
+                    ruleEntity.setFiledId(mdmModuleDbFiledsEntities.get(i).getId());
+                    List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRuleEntities = mdmModuleDbFiledsRuleDao.queryBase(ruleEntity);
+                    mdmModuleDbFiledsEntities.get(i).setMdmModuleDbFiledsRules(mdmModuleDbFiledsRuleEntities);
                 }
             }
         }
         return BaseResult.getSuccessMessageEntity("获取数据源表字段成功", dbEntities);
     }
-
+    /**
+     * @param object
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 主数据-数据源-数据表字段明细
+     * @Date 11:43 上午 2024/6/11
+     **/
+    @Override
+    public JsonResultEntity queryMdmDbFieldDetail(JSONObject object) {
+        MdmModuleDbFiledsEntity entity = getData("jsonStr", object, MdmModuleDbFiledsEntity.class);
+        if (entity == null) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        if (entity.getMdmId() == null || "".equals(entity.getMdmId())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        if (entity.getDbId() == null || "".equals(entity.getDbId())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        if (entity.getId() == null || "".equals(entity.getId())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        MdmModuleDbFiledsEntity queryEntity = new MdmModuleDbFiledsEntity();
+        queryEntity.setMdmId(entity.getMdmId());
+        List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntities = mdmServiceCache.queryMdmModuleDbFileds(queryEntity);
+        List<MdmModuleDbFiledsEntity> dbEntities = new ArrayList<>();
+        if (mdmModuleDbFiledsEntities != null && mdmModuleDbFiledsEntities.size() > 0) {
+            for (int i = 0; i < mdmModuleDbFiledsEntities.size(); i++) {
+                if (entity.getId().equals(mdmModuleDbFiledsEntities.get(i).getId())) {
+                    entity = mdmModuleDbFiledsEntities.get(i);
+                    MdmModuleDbFiledsRuleEntity ruleEntity = new MdmModuleDbFiledsRuleEntity();
+                    ruleEntity.setMdmId(entity.getMdmId());
+                    ruleEntity.setFiledId(entity.getId());
+                    List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRuleEntities = mdmModuleDbFiledsRuleDao.queryBase(ruleEntity);
+                    entity.setMdmModuleDbFiledsRules(mdmModuleDbFiledsRuleEntities);
+                }
+            }
+        }
+        return BaseResult.getSuccessMessageEntity("获取数据源表字段成功", entity);
+    }
     /**
      * @param object
      * @return com.hzya.frame.web.entity.JsonResultEntity
@@ -1129,6 +1210,9 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         if (entity == null) {
             return BaseResult.getFailureMessageEntity("系统错误");
         }
+        if (entity.getDbName() == null || "".equals(entity.getDbName())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
         if (entity.getMdmId() == null || "".equals(entity.getMdmId())) {
             return BaseResult.getFailureMessageEntity("系统错误");
         }
@@ -1136,13 +1220,61 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             return BaseResult.getFailureMessageEntity("系统错误");
         }
         if (entity.getEnName() == null || "".equals(entity.getEnName())) {
+            return BaseResult.getFailureMessageEntity("请输入中文名称");
+        }
+        if (entity.getChName() == null || "".equals(entity.getChName())) {
+            return BaseResult.getFailureMessageEntity("请输入英文名称");
+        }
+        if (entity.getFiledType() == null || "".equals(entity.getChName())) {
+            return BaseResult.getFailureMessageEntity("请选择字段类型");
+        }
+        if (entity.getDbType() == null || "".equals(entity.getDbType())) {
             return BaseResult.getFailureMessageEntity("系统错误");
         }
+
+        MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity();
+        mdmModuleDbFiledsEntity.setMdmId(entity.getMdmId());
+        mdmModuleDbFiledsEntity.setSts("Y");
+        List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity);
+        if(mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0){
+            for (int i = 0; i < mdmModuleDbFiledsEntityList.size(); i++) {
+                if(entity.getDbId().equals(mdmModuleDbFiledsEntityList.get(i).getDbId()) && entity.getEnName().equals(mdmModuleDbFiledsEntityList.get(i).getEnName())){
+                    return BaseResult.getFailureMessageEntity("字段已存在，请修改");
+                }
+            }
+        }
         entity.setCreate();
+        if("1".equals(entity.getDbType())){
+            entity.setAddType("1");
+            entity.setUpdateType("1");
+            entity.setShowType("1");
+            entity.setQueryType("1");
+            entity.setListType("1");
+            entity.setViewType("1");
+        }else {
+            entity.setAddType("1");
+            entity.setUpdateType("1");
+            entity.setShowType("1");
+            entity.setQueryType("1");
+            entity.setListType("2");
+            entity.setViewType("1");
+        }
         entity.setDataType("1");
         List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntities = new ArrayList<>();
         mdmModuleDbFiledsEntities.add(entity);
         mdmServiceCache.saveOrUpdateMdmModuleDbFileds(entity.getMdmId(), mdmModuleDbFiledsEntities);
+
+        if (entity.getMdmModuleDbFiledsRules() != null && entity.getMdmModuleDbFiledsRules().size() > 0) {
+            for (int i = 0; i < entity.getMdmModuleDbFiledsRules().size(); i++) {
+                entity.getMdmModuleDbFiledsRules().get(i).setDbId(entity.getDbId());
+                entity.getMdmModuleDbFiledsRules().get(i).setMdmId(entity.getMdmId());
+                entity.getMdmModuleDbFiledsRules().get(i).setFiledId(entity.getId());
+                entity.getMdmModuleDbFiledsRules().get(i).setSts("Y");
+                entity.getMdmModuleDbFiledsRules().get(i).setCreate();
+                mdmModuleDbFiledsRuleDao.save(entity.getMdmModuleDbFiledsRules().get(i));
+            }
+        }
+
         mdmModuleDao.alterTableField(entity);
         return BaseResult.getSuccessMessageEntity("新增字段成功");
     }
@@ -1163,6 +1295,9 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         if (entity.getId() == null || "".equals(entity.getId())) {
             return BaseResult.getFailureMessageEntity("系统错误");
         }
+        if (entity.getDbName() == null || "".equals(entity.getDbName())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
         if (entity.getMdmId() == null || "".equals(entity.getMdmId())) {
             return BaseResult.getFailureMessageEntity("系统错误");
         }
@@ -1170,13 +1305,39 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             return BaseResult.getFailureMessageEntity("系统错误");
         }
         if (entity.getEnName() == null || "".equals(entity.getEnName())) {
-            return BaseResult.getFailureMessageEntity("系统错误");
+            return BaseResult.getFailureMessageEntity("请输入中文名称");
+        }
+        if (entity.getChName() == null || "".equals(entity.getChName())) {
+            return BaseResult.getFailureMessageEntity("请输入英文名称");
+        }
+        if (entity.getFiledType() == null || "".equals(entity.getChName())) {
+            return BaseResult.getFailureMessageEntity("请选择字段类型");
         }
         entity.setUpdate();
         entity.setDataType("2");
         List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntities = new ArrayList<>();
         mdmModuleDbFiledsEntities.add(entity);
         mdmServiceCache.saveOrUpdateMdmModuleDbFileds(entity.getMdmId(), mdmModuleDbFiledsEntities);
+        MdmModuleDbFiledsRuleEntity mdmModuleDbFiledsRuleEntity = new MdmModuleDbFiledsRuleEntity();
+        mdmModuleDbFiledsRuleEntity.setFiledId(entity.getId());
+        mdmModuleDbFiledsRuleEntity.setSts("Y");
+        mdmModuleDbFiledsRuleEntity.setUpdate();
+        mdmModuleDbFiledsRuleDao.logicRemoveMultiCondition(mdmModuleDbFiledsRuleEntity);
+        if (entity.getMdmModuleDbFiledsRules() != null && entity.getMdmModuleDbFiledsRules().size() > 0) {
+            for (int i = 0; i < entity.getMdmModuleDbFiledsRules().size(); i++) {
+                entity.getMdmModuleDbFiledsRules().get(i).setDbId(entity.getDbId());
+                entity.getMdmModuleDbFiledsRules().get(i).setMdmId(entity.getMdmId());
+                entity.getMdmModuleDbFiledsRules().get(i).setFiledId(entity.getId());
+                entity.getMdmModuleDbFiledsRules().get(i).setSts("Y");
+                if (entity.getMdmModuleDbFiledsRules().get(i).getId() != null) {
+                    entity.getMdmModuleDbFiledsRules().get(i).setUpdate();
+                    mdmModuleDbFiledsRuleDao.update(entity.getMdmModuleDbFiledsRules().get(i));
+                } else {
+                    entity.getMdmModuleDbFiledsRules().get(i).setCreate();
+                    mdmModuleDbFiledsRuleDao.save(entity.getMdmModuleDbFiledsRules().get(i));
+                }
+            }
+        }
         mdmModuleDao.alterTableField(entity);
         return BaseResult.getSuccessMessageEntity("修改字段成功");
     }
@@ -1203,9 +1364,15 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         if (entity.getDbId() == null || "".equals(entity.getDbId())) {
             return BaseResult.getFailureMessageEntity("系统错误");
         }
+        if (entity.getDbName() == null || "".equals(entity.getDbName())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
         if (entity.getEnName() == null || "".equals(entity.getEnName())) {
             return BaseResult.getFailureMessageEntity("系统错误");
         }
+        if (entity.getFiledType() == null || "".equals(entity.getFiledType())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
         MdmModuleDbFiledsRuleEntity queryCount = new MdmModuleDbFiledsRuleEntity();
         queryCount.setDbId(entity.getDbId());
         queryCount.setRuleCode("label");
@@ -1214,12 +1381,29 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         if (counts > 0) {
             return BaseResult.getFailureMessageEntity(entity.getEnName() + "已被引用，不允许删除");
         }
+        MdmModuleViewEntity mdmModuleViewEntity = new MdmModuleViewEntity();
+        mdmModuleViewEntity.setMdmId(entity.getMdmId());
+        mdmModuleViewEntity.setViewFiled(entity.getId());
+        mdmModuleViewEntity.setUpIdFiled(entity.getId());
+        Integer countss = mdmModuleViewDao.queryUserMdm(mdmModuleViewEntity);
+        if (countss > 0) {
+            return BaseResult.getFailureMessageEntity(entity.getEnName() + "已被显示引用，不允许删除");
+        }
         entity.setUpdate();
-        entity.setSts("N");
         entity.setDataType("3");
         List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntities = new ArrayList<>();
         mdmModuleDbFiledsEntities.add(entity);
         mdmServiceCache.saveOrUpdateMdmModuleDbFileds(entity.getMdmId(), mdmModuleDbFiledsEntities);
+        MdmModuleDbFiledsRuleEntity mdmModuleDbFiledsRuleEntity = new MdmModuleDbFiledsRuleEntity();
+        mdmModuleDbFiledsRuleEntity.setFiledId(entity.getId());
+        mdmModuleDbFiledsRuleEntity.setSts("Y");
+        mdmModuleDbFiledsRuleEntity.setUpdate();
+        mdmModuleDbFiledsRuleDao.logicRemoveMultiCondition(mdmModuleDbFiledsRuleEntity);
+        MdmModuleViewDetailEntity mdmModuleViewDetailEntity = new MdmModuleViewDetailEntity();
+        mdmModuleViewDetailEntity.setViewFiled(entity.getId());
+        mdmModuleViewDetailEntity.setSts("Y");
+        mdmModuleViewDetailEntity.setUpdate();
+        mdmModuleViewDetailDao.logicRemoveMultiCondition(mdmModuleViewDetailEntity);
         mdmModuleDao.alterTableField(entity);
         return BaseResult.getSuccessMessageEntity("删除字段成功");
     }
@@ -1267,6 +1451,9 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         if (entity.getId() == null || "".equals(entity.getId())) {
             return BaseResult.getFailureMessageEntity("系统错误");
         }
+        if (entity.getDbId() == null || "".equals(entity.getDbId())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
         if (entity.getFieldId() == null || "".equals(entity.getFieldId())) {
             return BaseResult.getFailureMessageEntity("系统错误");
         }
@@ -1281,8 +1468,10 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         mdmModuleDbFiledsRuleDao.logicRemoveMultiCondition(mdmModuleDbFiledsRuleEntity);
         if (entity.getMdmModuleDbFiledsRuleEntities() != null && entity.getMdmModuleDbFiledsRuleEntities().size() > 0) {
             for (int i = 0; i < entity.getMdmModuleDbFiledsRuleEntities().size(); i++) {
+                entity.getMdmModuleDbFiledsRuleEntities().get(i).setDbId(entity.getDbId());
                 entity.getMdmModuleDbFiledsRuleEntities().get(i).setMdmId(entity.getId());
                 entity.getMdmModuleDbFiledsRuleEntities().get(i).setFiledId(entity.getFieldId());
+                entity.getMdmModuleDbFiledsRuleEntities().get(i).setSts("Y");
                 if (entity.getMdmModuleDbFiledsRuleEntities().get(i).getId() != null) {
                     entity.getMdmModuleDbFiledsRuleEntities().get(i).setUpdate();
                     mdmModuleDbFiledsRuleDao.update(entity.getMdmModuleDbFiledsRuleEntities().get(i));
@@ -1312,10 +1501,13 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             return BaseResult.getFailureMessageEntity("系统错误");
         }
         List<MdmModuleViewEntity> moduleViewEntities = mdmModuleViewDao.queryBase(entity);
-        if (moduleViewEntities != null && moduleViewEntities.size() == 1) {
-            return BaseResult.getSuccessMessageEntity("获取显示类型成功", moduleViewEntities.get(0));
-        } else {
+
+        if(moduleViewEntities == null || moduleViewEntities.size() == 0){
+            return BaseResult.getSuccessMessageEntity("获取显示类型成功");
+        }else if (moduleViewEntities != null && moduleViewEntities.size() > 1) {
             return BaseResult.getFailureMessageEntity("获取显示类型失败");
+        } else {
+            return BaseResult.getSuccessMessageEntity("获取显示类型成功", moduleViewEntities.get(0));
         }
     }
 
@@ -1447,28 +1639,19 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity);
             setFiledType(mdmModuleViewVo, mdmModuleDbEntityList, mdmModuleDbFiledsEntityList);
         }
-        //查询数据库设置的字段
-        MdmModuleViewEntity mdmModuleViewEntity = new MdmModuleViewEntity();
-        mdmModuleViewEntity.setMdmId(entity.getId());
-        mdmModuleViewEntity.setSts("Y");
-        List<MdmModuleViewEntity> moduleViewEntityList = mdmModuleViewDao.queryBase(mdmModuleViewEntity);
-        if (moduleViewEntityList != null && moduleViewEntityList.size() == 1) {
-            mdmModuleViewVo.setMdmModuleViewEntity(moduleViewEntityList.get(0));
-            //查询明细
-            MdmModuleViewDetailEntity mdmModuleViewDetailEntity = new MdmModuleViewDetailEntity();
-            mdmModuleViewDetailEntity.setMdmId(entity.getId());
-            mdmModuleViewDetailEntity.setViewId(moduleViewEntityList.get(0).getId());
-            mdmModuleViewDetailEntity.setSts("Y");
-            List<MdmModuleViewDetailEntity> mdmModuleViewDetailEntityList = mdmModuleViewDetailDao.queryBase(mdmModuleViewDetailEntity);
-            setDbFiledType(mdmModuleViewVo, mdmModuleViewDetailEntityList);
-        } else {
-            mdmModuleViewVo.setMdmModuleViewEntity(new MdmModuleViewEntity());
-            mdmModuleViewVo.setDbAddFiled(new ArrayList<>());
-            mdmModuleViewVo.setDbEditFiled(new ArrayList<>());
-            mdmModuleViewVo.setDbShowFiled(new ArrayList<>());
-            mdmModuleViewVo.setDbQueryFiled(new ArrayList<>());
-            mdmModuleViewVo.setDbListFiled(new ArrayList<>());
-        }
+        mdmModuleViewVo.setDbAddFiled(new ArrayList<>());
+        mdmModuleViewVo.setDbEditFiled(new ArrayList<>());
+        mdmModuleViewVo.setDbShowFiled(new ArrayList<>());
+        mdmModuleViewVo.setDbQueryFiled(new ArrayList<>());
+        mdmModuleViewVo.setDbListFiled(new ArrayList<>());
+
+        MdmModuleViewDetailEntity mdmModuleViewDetailEntity = new MdmModuleViewDetailEntity();
+        mdmModuleViewDetailEntity.setMdmId(entity.getId());
+        mdmModuleViewDetailEntity.setSts("Y");
+        List<MdmModuleViewDetailEntity> mdmModuleViewDetailEntityList = mdmModuleViewDetailDao.queryBase(mdmModuleViewDetailEntity);
+        setDbFiledType(mdmModuleViewVo, mdmModuleViewDetailEntityList);
+
+
         return BaseResult.getSuccessMessageEntity("查询视图成功", mdmModuleViewVo);
     }
 
@@ -1488,19 +1671,54 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
                 switch (mdmModuleViewDetailEntityList.get(i).getViewType()) {
                     //1、查询2、列表3、新增4、修改 5、查看
                     case "1":
-                        queryFiled.add(mdmModuleViewDetailEntityList.get(i));
+                        if(mdmModuleViewVo.getQueryFiled() != null && mdmModuleViewVo.getQueryFiled().size() > 0 ){
+                            for (int i1 = 0; i1 < mdmModuleViewVo.getQueryFiled().size(); i1++) {
+                                if(mdmModuleViewVo.getQueryFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())){
+                                    mdmModuleViewDetailEntityList.get(i).setViewName(mdmModuleViewVo.getQueryFiled().get(i1).getName());
+                                    queryFiled.add(mdmModuleViewDetailEntityList.get(i));
+                                }
+                            }
+                        }
                         break;
                     case "2":
-                        listFiled.add(mdmModuleViewDetailEntityList.get(i));
+                        if(mdmModuleViewVo.getListFiled() != null && mdmModuleViewVo.getListFiled().size() > 0 ){
+                            for (int i1 = 0; i1 < mdmModuleViewVo.getListFiled().size(); i1++) {
+                                if(mdmModuleViewVo.getListFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())){
+                                    mdmModuleViewDetailEntityList.get(i).setViewName(mdmModuleViewVo.getListFiled().get(i1).getName());
+                                    listFiled.add(mdmModuleViewDetailEntityList.get(i));
+                                }
+                            }
+                        }
                         break;
                     case "3":
-                        addFiled.add(mdmModuleViewDetailEntityList.get(i));
+                        if(mdmModuleViewVo.getAddFiled() != null && mdmModuleViewVo.getAddFiled().size() > 0 ){
+                            for (int i1 = 0; i1 < mdmModuleViewVo.getAddFiled().size(); i1++) {
+                                if(mdmModuleViewVo.getAddFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())){
+                                    mdmModuleViewDetailEntityList.get(i).setViewName(mdmModuleViewVo.getAddFiled().get(i1).getName());
+                                    addFiled.add(mdmModuleViewDetailEntityList.get(i));
+                                }
+                            }
+                        }
                         break;
                     case "4":
-                        editFiled.add(mdmModuleViewDetailEntityList.get(i));
+                        if(mdmModuleViewVo.getEditFiled() != null && mdmModuleViewVo.getEditFiled().size() > 0 ){
+                            for (int i1 = 0; i1 < mdmModuleViewVo.getEditFiled().size(); i1++) {
+                                if(mdmModuleViewVo.getEditFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())){
+                                    mdmModuleViewDetailEntityList.get(i).setViewName(mdmModuleViewVo.getEditFiled().get(i1).getName());
+                                    editFiled.add(mdmModuleViewDetailEntityList.get(i));
+                                }
+                            }
+                        }
                         break;
                     case "5":
-                        showFiled.add(mdmModuleViewDetailEntityList.get(i));
+                        if(mdmModuleViewVo.getShowFiled() != null && mdmModuleViewVo.getShowFiled().size() > 0 ){
+                            for (int i1 = 0; i1 < mdmModuleViewVo.getShowFiled().size(); i1++) {
+                                if(mdmModuleViewVo.getShowFiled().get(i1).getId().equals(mdmModuleViewDetailEntityList.get(i).getViewFiled())){
+                                    mdmModuleViewDetailEntityList.get(i).setViewName(mdmModuleViewVo.getShowFiled().get(i1).getName());
+                                    showFiled.add(mdmModuleViewDetailEntityList.get(i));
+                                }
+                            }
+                        }
                         break;
                     default:
                 }
@@ -1535,22 +1753,47 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         List<MdmDbFiledVo> listFiled = new ArrayList<>();
         if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() > 0) {
             for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
+                if("3".equals(mdmModuleDbEntityList.get(i).getDbType()) || "4".equals(mdmModuleDbEntityList.get(i).getDbType())){
+                    continue;
+                }
                 if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) {
+
                     for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
                         if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) {
+                            if("document_rule".equals(mdmModuleDbFiledsEntityList.get(i1).getEnName())){
+                                continue;
+                            }
                             if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
                                 //1、主表
-                                addFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-                                editFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-                                showFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-                                queryFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-                                listFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
+                                if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getAddType())){
+                                    addFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
+                                }
+                                if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getUpdateType())){
+                                    editFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
+                                }
+                                if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getShowType())){
+                                    showFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
+                                }
+                                if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getQueryType())){
+                                    queryFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
+                                }
+                                if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getListType())){
+                                    listFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
+                                }
                             } else {
                                 //2、明细
-                                queryFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-                                addFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-                                editFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-                                showFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
+                                if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getQueryType())){
+                                    queryFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
+                                }
+                                if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getAddType())){
+                                    addFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
+                                }
+                                if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getUpdateType())){
+                                    editFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
+                                }
+                                if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getShowType())){
+                                    showFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
+                                }
                             }
                         }
                     }
@@ -1592,13 +1835,10 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             mdmModuleViewDetailDao.logicRemoveMultiCondition(mdmModuleViewDetailEntity);
             if (entity.getDbQueryFiled() != null && entity.getDbQueryFiled().size() > 0) {
                 for (int i = 0; i < entity.getDbQueryFiled().size(); i++) {
-                    if (entity.getDbQueryFiled().get(i).getId() != null) {
-                        entity.getDbQueryFiled().get(i).setUpdate();
-                        mdmModuleViewDetailDao.update(entity.getDbQueryFiled().get(i));
-                    } else {
-                        entity.getDbQueryFiled().get(i).setCreate();
-                        mdmModuleViewDetailDao.save(entity.getDbQueryFiled().get(i));
-                    }
+                    entity.getDbQueryFiled().get(i).setViewType(entity.getViewType());
+                    entity.getDbQueryFiled().get(i).setMdmId(entity.getMdmId());
+                    entity.getDbQueryFiled().get(i).setCreate();
+                    mdmModuleViewDetailDao.save(entity.getDbQueryFiled().get(i));
                 }
             }
 
@@ -1610,13 +1850,10 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             mdmModuleViewDetailDao.logicRemoveMultiCondition(mdmModuleViewDetailEntity);
             if (entity.getDbListFiled() != null && entity.getDbListFiled().size() > 0) {
                 for (int i = 0; i < entity.getDbListFiled().size(); i++) {
-                    if (entity.getDbListFiled().get(i).getId() != null) {
-                        entity.getDbListFiled().get(i).setUpdate();
-                        mdmModuleViewDetailDao.update(entity.getDbListFiled().get(i));
-                    } else {
-                        entity.getDbListFiled().get(i).setCreate();
-                        mdmModuleViewDetailDao.save(entity.getDbListFiled().get(i));
-                    }
+                    entity.getDbListFiled().get(i).setMdmId(entity.getMdmId());
+                    entity.getDbListFiled().get(i).setViewType(entity.getViewType());
+                    entity.getDbListFiled().get(i).setCreate();
+                    mdmModuleViewDetailDao.save(entity.getDbListFiled().get(i));
                 }
             }
 
@@ -1628,13 +1865,10 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             mdmModuleViewDetailDao.logicRemoveMultiCondition(mdmModuleViewDetailEntity);
             if (entity.getDbAddFiled() != null && entity.getDbAddFiled().size() > 0) {
                 for (int i = 0; i < entity.getDbAddFiled().size(); i++) {
-                    if (entity.getDbAddFiled().get(i).getId() != null) {
-                        entity.getDbAddFiled().get(i).setUpdate();
-                        mdmModuleViewDetailDao.update(entity.getDbAddFiled().get(i));
-                    } else {
-                        entity.getDbAddFiled().get(i).setCreate();
-                        mdmModuleViewDetailDao.save(entity.getDbAddFiled().get(i));
-                    }
+                    entity.getDbAddFiled().get(i).setMdmId(entity.getMdmId());
+                    entity.getDbAddFiled().get(i).setViewType(entity.getViewType());
+                    entity.getDbAddFiled().get(i).setCreate();
+                    mdmModuleViewDetailDao.save(entity.getDbAddFiled().get(i));
                 }
             }
 
@@ -1646,13 +1880,10 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             mdmModuleViewDetailDao.logicRemoveMultiCondition(mdmModuleViewDetailEntity);
             if (entity.getDbEditFiled() != null && entity.getDbEditFiled().size() > 0) {
                 for (int i = 0; i < entity.getDbEditFiled().size(); i++) {
-                    if (entity.getDbEditFiled().get(i).getId() != null) {
-                        entity.getDbEditFiled().get(i).setUpdate();
-                        mdmModuleViewDetailDao.update(entity.getDbEditFiled().get(i));
-                    } else {
-                        entity.getDbEditFiled().get(i).setCreate();
-                        mdmModuleViewDetailDao.save(entity.getDbEditFiled().get(i));
-                    }
+                    entity.getDbEditFiled().get(i).setMdmId(entity.getMdmId());
+                    entity.getDbEditFiled().get(i).setViewType(entity.getViewType());
+                    entity.getDbEditFiled().get(i).setCreate();
+                    mdmModuleViewDetailDao.save(entity.getDbEditFiled().get(i));
                 }
             }
 
@@ -1664,13 +1895,10 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             mdmModuleViewDetailDao.logicRemoveMultiCondition(mdmModuleViewDetailEntity);
             if (entity.getDbShowFiled() != null && entity.getDbShowFiled().size() > 0) {
                 for (int i = 0; i < entity.getDbShowFiled().size(); i++) {
-                    if (entity.getDbShowFiled().get(i).getId() != null) {
-                        entity.getDbShowFiled().get(i).setUpdate();
-                        mdmModuleViewDetailDao.update(entity.getDbEditFiled().get(i));
-                    } else {
-                        entity.getDbShowFiled().get(i).setCreate();
-                        mdmModuleViewDetailDao.save(entity.getDbShowFiled().get(i));
-                    }
+                    entity.getDbShowFiled().get(i).setMdmId(entity.getMdmId());
+                    entity.getDbShowFiled().get(i).setViewType(entity.getViewType());
+                    entity.getDbShowFiled().get(i).setCreate();
+                    mdmModuleViewDetailDao.save(entity.getDbShowFiled().get(i));
                 }
             }
 
@@ -1721,6 +1949,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         mdmModuleViewButtonDao.logicRemoveMultiCondition(mdmModuleViewButtonEntity);
         if (entity.getDbButtonFiled() != null && entity.getDbButtonFiled().size() > 0) {
             for (int i = 0; i < entity.getDbButtonFiled().size(); i++) {
+                entity.getDbButtonFiled().get(i).setMdmId(entity.getMdmId());
                 if (entity.getDbButtonFiled().get(i).getId() != null) {
                     entity.getDbButtonFiled().get(i).setUpdate();
                     mdmModuleViewButtonDao.update(entity.getDbButtonFiled().get(i));
@@ -2036,6 +2265,8 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         if (entity.getMdmModuleDistributeDetailEntities() != null && entity.getMdmModuleDistributeDetailEntities().size() > 0) {
             for (int i = 0; i < entity.getMdmModuleDistributeDetailEntities().size(); i++) {
                 entity.getMdmModuleDistributeDetailEntities().get(i).setCreate();
+                entity.getMdmModuleDistributeDetailEntities().get(i).setDistributeId(entity.getId());
+                entity.getMdmModuleDistributeDetailEntities().get(i).setMdmId(entity.getMdmId());
                 mdmModuleDistributeDetailDao.save(entity.getMdmModuleDistributeDetailEntities().get(i));
             }
         }
@@ -2090,6 +2321,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         mdmModuleDistributeDetailDao.logicRemoveMultiCondition(mdmModuleDistributeDetailEntity);
         if (entity.getMdmModuleDistributeDetailEntities() != null && entity.getMdmModuleDistributeDetailEntities().size() > 0) {
             for (int i = 0; i < entity.getMdmModuleDistributeDetailEntities().size(); i++) {
+                entity.getMdmModuleDistributeDetailEntities().get(i).setSts("Y");
                 if (entity.getMdmModuleDistributeDetailEntities().get(i).getId() != null) {
                     entity.getMdmModuleDistributeDetailEntities().get(i).setUpdate();
                     mdmModuleDistributeDetailDao.update(entity.getMdmModuleDistributeDetailEntities().get(i));
@@ -2119,7 +2351,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             return BaseResult.getFailureMessageEntity("系统错误");
         }
         entity.setUpdate();
-        mdmModuleDistributeDao.update(entity);
+        mdmModuleDistributeDao.logicRemoveMultiCondition(entity);
         MdmModuleDistributeDetailEntity mdmModuleDistributeDetailEntity = new MdmModuleDistributeDetailEntity();
         mdmModuleDistributeDetailEntity.setDistributeId(entity.getId());
         mdmModuleDistributeDetailEntity.setUpdate();
@@ -2209,4 +2441,130 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         PageInfo pageInfo = new PageInfo(list);
         return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo);
     }
+
+    /**
+     * @Author lvleigang
+     * @Description  主数据-数据源-服务获取（只获取主表）
+     * @Date 11:43 上午 2024/6/11
+     * @param object
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     **/
+    @Override
+    public JsonResultEntity queryMdmService(JSONObject object) {
+        MdmModuleDbEntity entity = getData("jsonStr", object, MdmModuleDbEntity.class);
+        MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
+        mdmModuleDbEntity.setSts("Y");
+        mdmModuleDbEntity.setDbType("1");
+        List<MdmModuleDbEntity> mdmModuleDbEntities = mdmModuleDbDao.queryBase(mdmModuleDbEntity);
+        return BaseResult.getSuccessMessageEntity("查询数据成功", mdmModuleDbEntities);
+    }
+
+
+    /**
+     * @Author lvleigang
+     * @Description  主数据-数据源-服务字段获取
+     * @Date 11:43 上午 2024/6/11
+     * @param object
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     **/
+    @Override
+    public JsonResultEntity queryMdmServiceField(JSONObject object) {
+        MdmModuleDbFiledsEntity entity = getData("jsonStr", object, MdmModuleDbFiledsEntity.class);
+        if (entity == null) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        if (entity.getDbId() == null || "".equals(entity.getDbId())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        if (entity.getMdmId() == null || "".equals(entity.getMdmId())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity();
+        mdmModuleDbFiledsEntity.setSts("Y");
+        mdmModuleDbFiledsEntity.setMdmId(entity.getMdmId());
+        List<MdmModuleDbFiledsEntity> mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity);
+        List<MdmModuleDbFiledsEntity> list = new ArrayList<>();
+       if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0){
+           for (int i = 0; i < mdmModuleDbEntities.size(); i++) {
+               if(entity.getDbId().equals(mdmModuleDbEntities.get(i).getDbId()) && "1".equals(mdmModuleDbEntities.get(i).getViewType())){
+                   list.add(mdmModuleDbEntities.get(i));
+               }
+           }
+       }
+        return BaseResult.getSuccessMessageEntity("查询数据成功", list);
+    }
+
+    /**
+     * @Author lvleigang
+     * @Description  主数据-分发-只获取主表
+     * @Date 11:43 上午 2024/6/11
+     * @param object
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     **/
+    @Override
+    public JsonResultEntity queryMdmMainDB(JSONObject object) {
+        MdmModuleDbEntity entity = getData("jsonStr", object, MdmModuleDbEntity.class);
+        if (entity == null) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        if (entity.getMdmId() == null || "".equals(entity.getMdmId())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
+        mdmModuleDbEntity.setSts("Y");
+        mdmModuleDbEntity.setMdmId(entity.getMdmId());
+        List<MdmModuleDbEntity> mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
+        List<MdmModuleDbEntity> list = new ArrayList<>();
+        if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0){
+            for (int i = 0; i < mdmModuleDbEntities.size(); i++) {
+                if("1".equals(mdmModuleDbEntities.get(i).getDbType())){
+                    list.add(mdmModuleDbEntities.get(i));
+                }
+            }
+        }
+        return BaseResult.getSuccessMessageEntity("查询数据成功", list);
+    }
+
+    /**
+     * @Author lvleigang
+     * @Description  主数据-数据源-只获取主表字段
+     * @Date 11:43 上午 2024/6/11
+     * @param object
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     **/
+    @Override
+    public JsonResultEntity queryMdmMainDBField(JSONObject object) {
+        MdmModuleDbEntity entity = getData("jsonStr", object, MdmModuleDbEntity.class);
+        if (entity == null) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        if (entity.getMdmId() == null || "".equals(entity.getMdmId())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
+        mdmModuleDbEntity.setSts("Y");
+        mdmModuleDbEntity.setMdmId(entity.getMdmId());
+        List<MdmModuleDbEntity> mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
+
+        MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity();
+        mdmModuleDbFiledsEntity.setSts("Y");
+        mdmModuleDbFiledsEntity.setMdmId(entity.getMdmId());
+        List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntities = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity);
+
+        List<MdmModuleDbFiledsEntity> list = new ArrayList<>();
+        if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0){
+            for (int i = 0; i < mdmModuleDbEntities.size(); i++) {
+                if("1".equals(mdmModuleDbEntities.get(i).getDbType())){
+                    if(mdmModuleDbFiledsEntities != null && mdmModuleDbFiledsEntities.size() > 0){
+                        for (int i1 = 0; i1 < mdmModuleDbFiledsEntities.size(); i1++) {
+                            if(mdmModuleDbEntities.get(i).getId().equals(mdmModuleDbFiledsEntities.get(i1).getDbId()) && "1".equals(mdmModuleDbFiledsEntities.get(i1).getViewType())){
+                                list.add(mdmModuleDbFiledsEntities.get(i1));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return BaseResult.getSuccessMessageEntity("查询数据成功", list);
+    }
 }
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java
index c58963aa..80e26fd1 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java
@@ -45,6 +45,8 @@ public class MdmModuleDbFiledsEntity extends BaseEntity {
    private String companyId;
     /**  数据类型 1、新增 2、修改 */
     private String dataType;
+    /**  类型 1、主表 2、明细 3、操作日志 4、下发日志 */
+    private String dbType;
     /**
      * roletype
      */
@@ -208,5 +210,13 @@ public class MdmModuleDbFiledsEntity extends BaseEntity {
     public void setFieldType(String fieldType) {
         this.fieldType = fieldType;
     }
+
+    public String getDbType() {
+        return dbType;
+    }
+
+    public void setDbType(String dbType) {
+        this.dbType = dbType;
+    }
 }
 
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 7ef687dc..2c2213f8 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
@@ -293,5 +293,7 @@ update mdm_module_db_fileds_rule  set sts= 'N' ,modify_time = #{modify_time},mod
             and sts='Y'
         </trim>
     </select>
+
+
 </mapper>
 
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/IMdmModuleDistributeDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/IMdmModuleDistributeDao.java
index 2e2f90f5..895f30cd 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/IMdmModuleDistributeDao.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/IMdmModuleDistributeDao.java
@@ -7,7 +7,7 @@ import com.hzya.frame.basedao.dao.IBaseDao;
  * 主数据功能应用分发表(mdm_module_distribute: table)表数据库访问层
  *
  * @author makejava
- * @since 2024-06-03 08:47:33
+ * @since 2024-06-14 10:06:36
  */
 public interface IMdmModuleDistributeDao extends IBaseDao<MdmModuleDistributeEntity, String> {
 
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/impl/MdmModuleDistributeDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/impl/MdmModuleDistributeDaoImpl.java
index 3318c2c2..4c029e80 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/impl/MdmModuleDistributeDaoImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/impl/MdmModuleDistributeDaoImpl.java
@@ -8,7 +8,7 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao;
  * 主数据功能应用分发表(MdmModuleDistribute)表数据库访问层
  *
  * @author makejava
- * @since 2024-06-03 08:47:33
+ * @since 2024-06-14 10:06:36
  */
 @Repository(value = "MdmModuleDistributeDaoImpl")
 public class MdmModuleDistributeDaoImpl extends MybatisGenericDao<MdmModuleDistributeEntity, String> implements IMdmModuleDistributeDao{
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java
index 0ce7e336..9b6677b9 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java
@@ -9,7 +9,7 @@ import com.hzya.frame.web.entity.BaseEntity;
  * 主数据功能应用分发表(MdmModuleDistribute)实体类
  *
  * @author makejava
- * @since 2024-06-03 08:47:33
+ * @since 2024-06-14 10:06:36
  */
 public class MdmModuleDistributeEntity extends BaseEntity {
  
@@ -25,8 +25,11 @@ public class MdmModuleDistributeEntity extends BaseEntity {
    private String deleteApi;
   /**  启用停用 0、停用1、启用 */
    private String enabledState;
+  /**  主表ID */
+   private String dbId;
   /**  公司id */
    private String companyId;
+
     private List<MdmModuleDistributeDetailEntity> mdmModuleDistributeDetailEntities;
 
     public String getMdmId() {
@@ -77,6 +80,14 @@ public class MdmModuleDistributeEntity extends BaseEntity {
         this.enabledState = enabledState;
     }
 
+    public String getDbId() {
+        return dbId;
+    }
+
+    public void setDbId(String dbId) {
+        this.dbId = dbId;
+    }
+
     public String getCompanyId() {
         return companyId;
     }
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 82243342..20e5de5b 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
@@ -10,6 +10,7 @@
            <result property="addApi" column="add_api" jdbcType="VARCHAR"/>
            <result property="deleteApi" column="delete_api" jdbcType="VARCHAR"/>
            <result property="enabledState" column="enabled_state" jdbcType="VARCHAR"/>
+           <result property="dbId" column="db_id" jdbcType="VARCHAR"/>
            <result property="sorts" column="sorts" jdbcType="INTEGER"/>
            <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
            <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
@@ -28,6 +29,7 @@
         ,add_api 
         ,delete_api 
         ,enabled_state 
+        ,db_id 
         ,sorts 
         ,create_user_id 
         ,create_time 
@@ -37,6 +39,13 @@
         ,org_id 
         ,company_id 
      </sql>
+
+    <!--通过ID获取数据 -->
+    <select id="entity_get" resultMap="get-MdmModuleDistributeEntity-result">
+        select
+        <include refid="MdmModuleDistributeEntity_Base_Column_List" />
+        from mdm_module_distribute where id = #{ id } and sts='Y'
+    </select>
  <!-- 查询 采用==查询 -->
  <select id="entity_list_base" resultMap="get-MdmModuleDistributeEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleDistribute.entity.MdmModuleDistributeEntity">
     select
@@ -50,6 +59,7 @@
             <if test="addApi != null and addApi != ''"> and add_api = #{addApi} </if>
             <if test="deleteApi != null and deleteApi != ''"> and delete_api = #{deleteApi} </if>
             <if test="enabledState != null and enabledState != ''"> and enabled_state = #{enabledState} </if>
+            <if test="dbId != null and dbId != ''"> and db_id = #{dbId} </if>
             <if test="sorts != null"> and sorts = #{sorts} </if>
             <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
             <if test="create_time != null"> and create_time = #{create_time} </if>
@@ -75,6 +85,7 @@
             <if test="addApi != null and addApi != ''"> and add_api = #{addApi} </if>
             <if test="deleteApi != null and deleteApi != ''"> and delete_api = #{deleteApi} </if>
             <if test="enabledState != null and enabledState != ''"> and enabled_state = #{enabledState} </if>
+            <if test="dbId != null and dbId != ''"> and db_id = #{dbId} </if>
             <if test="sorts != null"> and sorts = #{sorts} </if>
             <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
             <if test="create_time != null"> and create_time = #{create_time} </if>
@@ -102,6 +113,7 @@
             <if test="addApi != null and addApi != ''"> and add_api like concat('%',#{addApi},'%') </if>
             <if test="deleteApi != null and deleteApi != ''"> and delete_api like concat('%',#{deleteApi},'%') </if>
             <if test="enabledState != null and enabledState != ''"> and enabled_state like concat('%',#{enabledState},'%') </if>
+            <if test="dbId != null and dbId != ''"> and db_id like concat('%',#{dbId},'%') </if>
             <if test="sorts != null"> and sorts like concat('%',#{sorts},'%') </if>
             <if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
             <if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
@@ -129,6 +141,7 @@
              <if test="addApi != null and addApi != ''"> or add_api = #{addApi} </if>
              <if test="deleteApi != null and deleteApi != ''"> or delete_api = #{deleteApi} </if>
              <if test="enabledState != null and enabledState != ''"> or enabled_state = #{enabledState} </if>
+             <if test="dbId != null and dbId != ''"> or db_id = #{dbId} </if>
              <if test="sorts != null"> or sorts = #{sorts} </if>
              <if test="create_user_id != null and create_user_id != ''"> or create_user_id = #{create_user_id} </if>
               <if test="create_time != null"> or create_time = #{create_time} </if>
@@ -144,7 +157,7 @@
 </select>
 
 <!--新增所有列-->
-<insert id="entity_insert" parameterType = "com.hzya.frame.mdm.mdmModuleDistribute.entity.MdmModuleDistributeEntity"  >
+<insert id="entity_insert" parameterType = "com.hzya.frame.mdm.mdmModuleDistribute.entity.MdmModuleDistributeEntity" >
     insert into mdm_module_distribute(
   <trim suffix="" suffixOverrides=",">
        <if test="id != null and id != ''"> id , </if>
@@ -154,6 +167,7 @@
             <if test="addApi != null and addApi != ''"> add_api , </if>
             <if test="deleteApi != null and deleteApi != ''"> delete_api , </if>
             <if test="enabledState != null and enabledState != ''"> enabled_state , </if>
+            <if test="dbId != null and dbId != ''"> db_id , </if>
             <if test="sorts != null"> sorts , </if>
             <if test="create_user_id != null and create_user_id != ''"> create_user_id , </if>
             <if test="create_time != null"> create_time , </if>
@@ -162,6 +176,7 @@
             <if test="sts != null and sts != ''"> sts , </if>
             <if test="org_id != null and org_id != ''"> org_id , </if>
             <if test="companyId != null and companyId != ''"> company_id , </if>
+            <if test="sorts == null ">sorts,</if>
     <if test="sts == null ">sts,</if>
   </trim>
   )values(
@@ -173,6 +188,7 @@
             <if test="addApi != null and addApi != ''"> #{addApi} ,</if>
             <if test="deleteApi != null and deleteApi != ''"> #{deleteApi} ,</if>
             <if test="enabledState != null and enabledState != ''"> #{enabledState} ,</if>
+            <if test="dbId != null and dbId != ''"> #{dbId} ,</if>
             <if test="sorts != null"> #{sorts} ,</if>
             <if test="create_user_id != null and create_user_id != ''"> #{create_user_id} ,</if>
             <if test="create_time != null"> #{create_time} ,</if>
@@ -181,24 +197,25 @@
             <if test="sts != null and sts != ''"> #{sts} ,</if>
             <if test="org_id != null and org_id != ''"> #{org_id} ,</if>
             <if test="companyId != null and companyId != ''"> #{companyId} ,</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>
   )  
 </insert>
 <!-- 批量新增 -->
-<insert id="entityInsertBatch"  >
-  insert into mdm_module_distribute(mdm_id, app_id, update_api, add_api, delete_api, enabled_state, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id,  sts) 
+<insert id="entityInsertBatch" >
+  insert into mdm_module_distribute(mdm_id, app_id, update_api, add_api, delete_api, enabled_state, db_id, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id,  sts) 
     values
     <foreach collection="entities" item="entity" separator=",">
-    (#{entity.mdmId},#{entity.appId},#{entity.updateApi},#{entity.addApi},#{entity.deleteApi},#{entity.enabledState},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y')
+    (#{entity.mdmId},#{entity.appId},#{entity.updateApi},#{entity.addApi},#{entity.deleteApi},#{entity.enabledState},#{entity.dbId},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y')
     </foreach>
 </insert>
 <!-- 批量新增或者修改-->
-<insert id="entityInsertOrUpdateBatch"  >
-    insert into mdm_module_distribute(mdm_id, app_id, update_api, add_api, delete_api, enabled_state, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id)
+<insert id="entityInsertOrUpdateBatch" >
+    insert into mdm_module_distribute(mdm_id, app_id, update_api, add_api, delete_api, enabled_state, db_id, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id)
     values
     <foreach collection="entities" item="entity" separator=",">
-    (#{entity.mdmId},#{entity.appId},#{entity.updateApi},#{entity.addApi},#{entity.deleteApi},#{entity.enabledState},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId})
+    (#{entity.mdmId},#{entity.appId},#{entity.updateApi},#{entity.addApi},#{entity.deleteApi},#{entity.enabledState},#{entity.dbId},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId})
     </foreach>
     on duplicate key update
     mdm_id = values(mdm_id),
@@ -207,6 +224,7 @@
     add_api = values(add_api),
     delete_api = values(delete_api),
     enabled_state = values(enabled_state),
+    db_id = values(db_id),
     create_user_id = values(create_user_id),
     create_time = values(create_time),
     modify_user_id = values(modify_user_id),
@@ -224,6 +242,7 @@ update mdm_module_distribute  set
   <if test="addApi != null and addApi != ''"> add_api = #{addApi},</if>
   <if test="deleteApi != null and deleteApi != ''"> delete_api = #{deleteApi},</if>
   <if test="enabledState != null and enabledState != ''"> enabled_state = #{enabledState},</if>
+  <if test="dbId != null and dbId != ''"> db_id = #{dbId},</if>
   <if test="create_user_id != null and create_user_id != ''"> create_user_id = #{create_user_id},</if>
     <if test="create_time != null"> create_time = #{create_time},</if>
     <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id = #{modify_user_id},</if>
@@ -250,6 +269,7 @@ update mdm_module_distribute  set sts= 'N' ,modify_time = #{modify_time},modify_
             <if test="addApi != null and addApi != ''"> and add_api = #{addApi} </if>
             <if test="deleteApi != null and deleteApi != ''"> and delete_api = #{deleteApi} </if>
             <if test="enabledState != null and enabledState != ''"> and enabled_state = #{enabledState} </if>
+            <if test="dbId != null and dbId != ''"> and db_id = #{dbId} </if>
             <if test="sorts != null"> and sorts = #{sorts} </if>
                                                                 <if test="sts != null and sts != ''"> and sts = #{sts} </if>
                          <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/IMdmModuleDistributeService.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/IMdmModuleDistributeService.java
index 577b0e3c..ab9fe2da 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/IMdmModuleDistributeService.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/IMdmModuleDistributeService.java
@@ -6,7 +6,7 @@ import com.hzya.frame.basedao.service.IBaseService;
  * 主数据功能应用分发表(MdmModuleDistribute)表服务接口
  *
  * @author makejava
- * @since 2024-06-03 08:47:33
+ * @since 2024-06-14 10:06:36
  */
 public interface IMdmModuleDistributeService extends IBaseService<MdmModuleDistributeEntity, String>{
 }
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/impl/MdmModuleDistributeServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/impl/MdmModuleDistributeServiceImpl.java
index 24fe61e3..5133bc1a 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/impl/MdmModuleDistributeServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/impl/MdmModuleDistributeServiceImpl.java
@@ -11,7 +11,7 @@ import com.hzya.frame.basedao.service.impl.BaseService;
  * 主数据功能应用分发表(MdmModuleDistribute)表服务实现类
  *
  * @author makejava
- * @since 2024-06-03 08:47:33
+ * @since 2024-06-14 10:06:36
  */
 @Service(value = "mdmModuleDistributeService")
 public class MdmModuleDistributeServiceImpl extends BaseService<MdmModuleDistributeEntity, String> implements IMdmModuleDistributeService {
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/dao/IMdmModuleDistributeDetailDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/dao/IMdmModuleDistributeDetailDao.java
index 2b55a63a..3b39e01d 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/dao/IMdmModuleDistributeDetailDao.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/dao/IMdmModuleDistributeDetailDao.java
@@ -7,7 +7,7 @@ import com.hzya.frame.basedao.dao.IBaseDao;
  * 主数据功能应用分发明细表(mdm_module_distribute_detail: table)表数据库访问层
  *
  * @author makejava
- * @since 2024-06-03 08:48:18
+ * @since 2024-06-14 10:03:50
  */
 public interface IMdmModuleDistributeDetailDao extends IBaseDao<MdmModuleDistributeDetailEntity, String> {
 
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/dao/impl/MdmModuleDistributeDetailDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/dao/impl/MdmModuleDistributeDetailDaoImpl.java
index 68878631..c184298c 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/dao/impl/MdmModuleDistributeDetailDaoImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/dao/impl/MdmModuleDistributeDetailDaoImpl.java
@@ -8,7 +8,7 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao;
  * 主数据功能应用分发明细表(MdmModuleDistributeDetail)表数据库访问层
  *
  * @author makejava
- * @since 2024-06-03 08:48:18
+ * @since 2024-06-14 10:03:50
  */
 @Repository(value = "MdmModuleDistributeDetailDaoImpl")
 public class MdmModuleDistributeDetailDaoImpl extends MybatisGenericDao<MdmModuleDistributeDetailEntity, String> implements IMdmModuleDistributeDetailDao{
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/entity/MdmModuleDistributeDetailEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/entity/MdmModuleDistributeDetailEntity.java
index b0438ba8..18bd952c 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/entity/MdmModuleDistributeDetailEntity.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/entity/MdmModuleDistributeDetailEntity.java
@@ -6,7 +6,7 @@ import com.hzya.frame.web.entity.BaseEntity;
  * 主数据功能应用分发明细表(MdmModuleDistributeDetail)实体类
  *
  * @author makejava
- * @since 2024-06-03 08:48:18
+ * @since 2024-06-14 10:03:50
  */
 public class MdmModuleDistributeDetailEntity extends BaseEntity {
  
@@ -18,12 +18,18 @@ public class MdmModuleDistributeDetailEntity extends BaseEntity {
    private String apiId;
   /**  数据类型 1、新增2、修改3、删除 */
    private String dataType;
+  /**  左括号 */
+   private String leftBracket;
   /**  字段名 */
    private String filedName;
-  /**  对比类型 1、等于  */
+  /**  对比类型 1、等于 2、不等于 3、大于 4、小于 */
    private String compareType;
   /**  目标API字段默认值 */
    private String filedVaule;
+  /**  连接符号 1\and 2\or */
+   private String connectionSymbol;
+  /**  右括号 */
+   private String rightParenthesis;
   /**  公司id */
    private String companyId;
 
@@ -60,6 +66,14 @@ public class MdmModuleDistributeDetailEntity extends BaseEntity {
         this.dataType = dataType;
     }
 
+    public String getLeftBracket() {
+        return leftBracket;
+    }
+
+    public void setLeftBracket(String leftBracket) {
+        this.leftBracket = leftBracket;
+    }
+
     public String getFiledName() {
         return filedName;
     }
@@ -84,6 +98,22 @@ public class MdmModuleDistributeDetailEntity extends BaseEntity {
         this.filedVaule = filedVaule;
     }
 
+    public String getConnectionSymbol() {
+        return connectionSymbol;
+    }
+
+    public void setConnectionSymbol(String connectionSymbol) {
+        this.connectionSymbol = connectionSymbol;
+    }
+
+    public String getRightParenthesis() {
+        return rightParenthesis;
+    }
+
+    public void setRightParenthesis(String rightParenthesis) {
+        this.rightParenthesis = rightParenthesis;
+    }
+
     public String getCompanyId() {
         return companyId;
     }
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 15113e4f..962f618a 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
@@ -8,9 +8,12 @@
            <result property="distributeId" column="distribute_id" jdbcType="VARCHAR"/>
            <result property="apiId" column="api_id" jdbcType="VARCHAR"/>
            <result property="dataType" column="data_type" jdbcType="VARCHAR"/>
+           <result property="leftBracket" column="left_bracket" jdbcType="VARCHAR"/>
            <result property="filedName" column="filed_name" jdbcType="VARCHAR"/>
            <result property="compareType" column="compare_type" jdbcType="VARCHAR"/>
            <result property="filedVaule" column="filed_vaule" jdbcType="VARCHAR"/>
+           <result property="connectionSymbol" column="connection_symbol" jdbcType="VARCHAR"/>
+           <result property="rightParenthesis" column="right_parenthesis" jdbcType="VARCHAR"/>
            <result property="sorts" column="sorts" jdbcType="INTEGER"/>
            <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
            <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
@@ -27,9 +30,12 @@
         ,distribute_id 
         ,api_id 
         ,data_type 
+        ,left_bracket 
         ,filed_name 
         ,compare_type 
         ,filed_vaule 
+        ,connection_symbol 
+        ,right_parenthesis 
         ,sorts 
         ,create_user_id 
         ,create_time 
@@ -39,6 +45,12 @@
         ,org_id 
         ,company_id 
      </sql>
+    <!--通过ID获取数据 -->
+    <select id="entity_get" resultMap="get-MdmModuleDistributeDetailEntity-result">
+        select
+        <include refid="MdmModuleDistributeDetailEntity_Base_Column_List" />
+        from mdm_module_distribute_detail where id = #{ id } and sts='Y'
+    </select>
  <!-- 查询 采用==查询 -->
  <select id="entity_list_base" resultMap="get-MdmModuleDistributeDetailEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleDistributeDetail.entity.MdmModuleDistributeDetailEntity">
     select
@@ -50,9 +62,12 @@
             <if test="distributeId != null and distributeId != ''"> and distribute_id = #{distributeId} </if>
             <if test="apiId != null and apiId != ''"> and api_id = #{apiId} </if>
             <if test="dataType != null and dataType != ''"> and data_type = #{dataType} </if>
+            <if test="leftBracket != null and leftBracket != ''"> and left_bracket = #{leftBracket} </if>
             <if test="filedName != null and filedName != ''"> and filed_name = #{filedName} </if>
             <if test="compareType != null and compareType != ''"> and compare_type = #{compareType} </if>
             <if test="filedVaule != null and filedVaule != ''"> and filed_vaule = #{filedVaule} </if>
+            <if test="connectionSymbol != null and connectionSymbol != ''"> and connection_symbol = #{connectionSymbol} </if>
+            <if test="rightParenthesis != null and rightParenthesis != ''"> and right_parenthesis = #{rightParenthesis} </if>
             <if test="sorts != null"> and sorts = #{sorts} </if>
             <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
             <if test="create_time != null"> and create_time = #{create_time} </if>
@@ -76,9 +91,12 @@
             <if test="distributeId != null and distributeId != ''"> and distribute_id = #{distributeId} </if>
             <if test="apiId != null and apiId != ''"> and api_id = #{apiId} </if>
             <if test="dataType != null and dataType != ''"> and data_type = #{dataType} </if>
+            <if test="leftBracket != null and leftBracket != ''"> and left_bracket = #{leftBracket} </if>
             <if test="filedName != null and filedName != ''"> and filed_name = #{filedName} </if>
             <if test="compareType != null and compareType != ''"> and compare_type = #{compareType} </if>
             <if test="filedVaule != null and filedVaule != ''"> and filed_vaule = #{filedVaule} </if>
+            <if test="connectionSymbol != null and connectionSymbol != ''"> and connection_symbol = #{connectionSymbol} </if>
+            <if test="rightParenthesis != null and rightParenthesis != ''"> and right_parenthesis = #{rightParenthesis} </if>
             <if test="sorts != null"> and sorts = #{sorts} </if>
             <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
             <if test="create_time != null"> and create_time = #{create_time} </if>
@@ -104,9 +122,12 @@
             <if test="distributeId != null and distributeId != ''"> and distribute_id like concat('%',#{distributeId},'%') </if>
             <if test="apiId != null and apiId != ''"> and api_id like concat('%',#{apiId},'%') </if>
             <if test="dataType != null and dataType != ''"> and data_type like concat('%',#{dataType},'%') </if>
+            <if test="leftBracket != null and leftBracket != ''"> and left_bracket like concat('%',#{leftBracket},'%') </if>
             <if test="filedName != null and filedName != ''"> and filed_name like concat('%',#{filedName},'%') </if>
             <if test="compareType != null and compareType != ''"> and compare_type like concat('%',#{compareType},'%') </if>
             <if test="filedVaule != null and filedVaule != ''"> and filed_vaule like concat('%',#{filedVaule},'%') </if>
+            <if test="connectionSymbol != null and connectionSymbol != ''"> and connection_symbol like concat('%',#{connectionSymbol},'%') </if>
+            <if test="rightParenthesis != null and rightParenthesis != ''"> and right_parenthesis like concat('%',#{rightParenthesis},'%') </if>
             <if test="sorts != null"> and sorts like concat('%',#{sorts},'%') </if>
             <if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
             <if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
@@ -132,9 +153,12 @@
              <if test="distributeId != null and distributeId != ''"> or distribute_id = #{distributeId} </if>
              <if test="apiId != null and apiId != ''"> or api_id = #{apiId} </if>
              <if test="dataType != null and dataType != ''"> or data_type = #{dataType} </if>
+             <if test="leftBracket != null and leftBracket != ''"> or left_bracket = #{leftBracket} </if>
              <if test="filedName != null and filedName != ''"> or filed_name = #{filedName} </if>
              <if test="compareType != null and compareType != ''"> or compare_type = #{compareType} </if>
              <if test="filedVaule != null and filedVaule != ''"> or filed_vaule = #{filedVaule} </if>
+             <if test="connectionSymbol != null and connectionSymbol != ''"> or connection_symbol = #{connectionSymbol} </if>
+             <if test="rightParenthesis != null and rightParenthesis != ''"> or right_parenthesis = #{rightParenthesis} </if>
              <if test="sorts != null"> or sorts = #{sorts} </if>
              <if test="create_user_id != null and create_user_id != ''"> or create_user_id = #{create_user_id} </if>
               <if test="create_time != null"> or create_time = #{create_time} </if>
@@ -150,7 +174,7 @@
 </select>
 
 <!--新增所有列-->
-<insert id="entity_insert" parameterType = "com.hzya.frame.mdm.mdmModuleDistributeDetail.entity.MdmModuleDistributeDetailEntity"  >
+<insert id="entity_insert" parameterType = "com.hzya.frame.mdm.mdmModuleDistributeDetail.entity.MdmModuleDistributeDetailEntity" >
     insert into mdm_module_distribute_detail(
   <trim suffix="" suffixOverrides=",">
        <if test="id != null and id != ''"> id , </if>
@@ -158,9 +182,12 @@
             <if test="distributeId != null and distributeId != ''"> distribute_id , </if>
             <if test="apiId != null and apiId != ''"> api_id , </if>
             <if test="dataType != null and dataType != ''"> data_type , </if>
+            <if test="leftBracket != null and leftBracket != ''"> left_bracket , </if>
             <if test="filedName != null and filedName != ''"> filed_name , </if>
             <if test="compareType != null and compareType != ''"> compare_type , </if>
             <if test="filedVaule != null and filedVaule != ''"> filed_vaule , </if>
+            <if test="connectionSymbol != null and connectionSymbol != ''"> connection_symbol , </if>
+            <if test="rightParenthesis != null and rightParenthesis != ''"> right_parenthesis , </if>
             <if test="sorts != null"> sorts , </if>
             <if test="create_user_id != null and create_user_id != ''"> create_user_id , </if>
             <if test="create_time != null"> create_time , </if>
@@ -169,6 +196,7 @@
             <if test="sts != null and sts != ''"> sts , </if>
             <if test="org_id != null and org_id != ''"> org_id , </if>
             <if test="companyId != null and companyId != ''"> company_id , </if>
+            <if test="sorts == null ">sorts,</if>
     <if test="sts == null ">sts,</if>
   </trim>
   )values(
@@ -178,9 +206,12 @@
             <if test="distributeId != null and distributeId != ''"> #{distributeId} ,</if>
             <if test="apiId != null and apiId != ''"> #{apiId} ,</if>
             <if test="dataType != null and dataType != ''"> #{dataType} ,</if>
+            <if test="leftBracket != null and leftBracket != ''"> #{leftBracket} ,</if>
             <if test="filedName != null and filedName != ''"> #{filedName} ,</if>
             <if test="compareType != null and compareType != ''"> #{compareType} ,</if>
             <if test="filedVaule != null and filedVaule != ''"> #{filedVaule} ,</if>
+            <if test="connectionSymbol != null and connectionSymbol != ''"> #{connectionSymbol} ,</if>
+            <if test="rightParenthesis != null and rightParenthesis != ''"> #{rightParenthesis} ,</if>
             <if test="sorts != null"> #{sorts} ,</if>
             <if test="create_user_id != null and create_user_id != ''"> #{create_user_id} ,</if>
             <if test="create_time != null"> #{create_time} ,</if>
@@ -189,33 +220,37 @@
             <if test="sts != null and sts != ''"> #{sts} ,</if>
             <if test="org_id != null and org_id != ''"> #{org_id} ,</if>
             <if test="companyId != null and companyId != ''"> #{companyId} ,</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>
   )  
 </insert>
 <!-- 批量新增 -->
-<insert id="entityInsertBatch"  >
-  insert into mdm_module_distribute_detail(mdm_id, distribute_id, api_id, data_type, filed_name, compare_type, filed_vaule, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id,  sts) 
+<insert id="entityInsertBatch" >
+  insert into mdm_module_distribute_detail(mdm_id, distribute_id, api_id, data_type, left_bracket, filed_name, compare_type, filed_vaule, connection_symbol, right_parenthesis, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id,  sts) 
     values
     <foreach collection="entities" item="entity" separator=",">
-    (#{entity.mdmId},#{entity.distributeId},#{entity.apiId},#{entity.dataType},#{entity.filedName},#{entity.compareType},#{entity.filedVaule},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y')
+    (#{entity.mdmId},#{entity.distributeId},#{entity.apiId},#{entity.dataType},#{entity.leftBracket},#{entity.filedName},#{entity.compareType},#{entity.filedVaule},#{entity.connectionSymbol},#{entity.rightParenthesis},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y')
     </foreach>
 </insert>
 <!-- 批量新增或者修改-->
-<insert id="entityInsertOrUpdateBatch"  >
-    insert into mdm_module_distribute_detail(mdm_id, distribute_id, api_id, data_type, filed_name, compare_type, filed_vaule, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id)
+<insert id="entityInsertOrUpdateBatch" >
+    insert into mdm_module_distribute_detail(mdm_id, distribute_id, api_id, data_type, left_bracket, filed_name, compare_type, filed_vaule, connection_symbol, right_parenthesis, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id)
     values
     <foreach collection="entities" item="entity" separator=",">
-    (#{entity.mdmId},#{entity.distributeId},#{entity.apiId},#{entity.dataType},#{entity.filedName},#{entity.compareType},#{entity.filedVaule},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId})
+    (#{entity.mdmId},#{entity.distributeId},#{entity.apiId},#{entity.dataType},#{entity.leftBracket},#{entity.filedName},#{entity.compareType},#{entity.filedVaule},#{entity.connectionSymbol},#{entity.rightParenthesis},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId})
     </foreach>
     on duplicate key update
     mdm_id = values(mdm_id),
     distribute_id = values(distribute_id),
     api_id = values(api_id),
     data_type = values(data_type),
+    left_bracket = values(left_bracket),
     filed_name = values(filed_name),
     compare_type = values(compare_type),
     filed_vaule = values(filed_vaule),
+    connection_symbol = values(connection_symbol),
+    right_parenthesis = values(right_parenthesis),
     create_user_id = values(create_user_id),
     create_time = values(create_time),
     modify_user_id = values(modify_user_id),
@@ -231,9 +266,12 @@ update mdm_module_distribute_detail  set
   <if test="distributeId != null and distributeId != ''"> distribute_id = #{distributeId},</if>
   <if test="apiId != null and apiId != ''"> api_id = #{apiId},</if>
   <if test="dataType != null and dataType != ''"> data_type = #{dataType},</if>
+  <if test="leftBracket != null and leftBracket != ''"> left_bracket = #{leftBracket},</if>
   <if test="filedName != null and filedName != ''"> filed_name = #{filedName},</if>
   <if test="compareType != null and compareType != ''"> compare_type = #{compareType},</if>
   <if test="filedVaule != null and filedVaule != ''"> filed_vaule = #{filedVaule},</if>
+  <if test="connectionSymbol != null and connectionSymbol != ''"> connection_symbol = #{connectionSymbol},</if>
+  <if test="rightParenthesis != null and rightParenthesis != ''"> right_parenthesis = #{rightParenthesis},</if>
   <if test="create_user_id != null and create_user_id != ''"> create_user_id = #{create_user_id},</if>
     <if test="create_time != null"> create_time = #{create_time},</if>
     <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id = #{modify_user_id},</if>
@@ -258,9 +296,12 @@ update mdm_module_distribute_detail  set sts= 'N' ,modify_time = #{modify_time},
             <if test="distributeId != null and distributeId != ''"> and distribute_id = #{distributeId} </if>
             <if test="apiId != null and apiId != ''"> and api_id = #{apiId} </if>
             <if test="dataType != null and dataType != ''"> and data_type = #{dataType} </if>
+            <if test="leftBracket != null and leftBracket != ''"> and left_bracket = #{leftBracket} </if>
             <if test="filedName != null and filedName != ''"> and filed_name = #{filedName} </if>
             <if test="compareType != null and compareType != ''"> and compare_type = #{compareType} </if>
             <if test="filedVaule != null and filedVaule != ''"> and filed_vaule = #{filedVaule} </if>
+            <if test="connectionSymbol != null and connectionSymbol != ''"> and connection_symbol = #{connectionSymbol} </if>
+            <if test="rightParenthesis != null and rightParenthesis != ''"> and right_parenthesis = #{rightParenthesis} </if>
             <if test="sorts != null"> and sorts = #{sorts} </if>
                                                                 <if test="sts != null and sts != ''"> and sts = #{sts} </if>
                          <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/service/IMdmModuleDistributeDetailService.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/service/IMdmModuleDistributeDetailService.java
index 9b2fb7f8..735d9003 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/service/IMdmModuleDistributeDetailService.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/service/IMdmModuleDistributeDetailService.java
@@ -6,7 +6,7 @@ import com.hzya.frame.basedao.service.IBaseService;
  * 主数据功能应用分发明细表(MdmModuleDistributeDetail)表服务接口
  *
  * @author makejava
- * @since 2024-06-03 08:48:18
+ * @since 2024-06-14 10:03:50
  */
 public interface IMdmModuleDistributeDetailService extends IBaseService<MdmModuleDistributeDetailEntity, String>{
 }
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/service/impl/MdmModuleDistributeDetailServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/service/impl/MdmModuleDistributeDetailServiceImpl.java
index 6dd4b505..8dd367f5 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/service/impl/MdmModuleDistributeDetailServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/service/impl/MdmModuleDistributeDetailServiceImpl.java
@@ -11,7 +11,7 @@ import com.hzya.frame.basedao.service.impl.BaseService;
  * 主数据功能应用分发明细表(MdmModuleDistributeDetail)表服务实现类
  *
  * @author makejava
- * @since 2024-06-03 08:48:18
+ * @since 2024-06-14 10:03:50
  */
 @Service(value = "mdmModuleDistributeDetailService")
 public class MdmModuleDistributeDetailServiceImpl extends BaseService<MdmModuleDistributeDetailEntity, String> implements IMdmModuleDistributeDetailService {
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java
index 84e0358b..30f3c515 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java
@@ -12,7 +12,7 @@ public class MdmModuleSourceEntity extends BaseEntity {
  
   /**  主数据模版ID */
    private String mdmId;
-  /**  来源类型 */
+  /**  来源类型1、插件2、api */
    private String sourceType;
   /**  来源名称 */
    private String sourceName;
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml
index 245446f4..b4625605 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml
@@ -33,6 +33,11 @@
         ,org_id 
         ,company_id 
      </sql>
+    <select id="entity_get" resultMap="get-MdmModuleSourceEntity-result">
+        select
+        <include refid="MdmModuleSourceEntity_Base_Column_List" />
+        from mdm_module_source where sts = 'Y' and  id = #{id}
+    </select>
  <!-- 查询 采用==查询 -->
  <select id="entity_list_base" resultMap="get-MdmModuleSourceEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity">
     select
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/dao/IMdmModuleViewDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/dao/IMdmModuleViewDao.java
index c1daba93..bf04e65d 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/dao/IMdmModuleViewDao.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/dao/IMdmModuleViewDao.java
@@ -1,5 +1,6 @@
 package com.hzya.frame.mdm.mdmModuleView.dao;
 
+import com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity;
 import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity;
 import com.hzya.frame.basedao.dao.IBaseDao; 
 
@@ -11,5 +12,6 @@ import com.hzya.frame.basedao.dao.IBaseDao;
  */
 public interface IMdmModuleViewDao extends IBaseDao<MdmModuleViewEntity, String> {
 
+    Integer queryUserMdm(MdmModuleViewEntity mdmModuleViewEntity);
 }
 
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/dao/impl/MdmModuleViewDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/dao/impl/MdmModuleViewDaoImpl.java
index 453f7b44..cf3aace2 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/dao/impl/MdmModuleViewDaoImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/dao/impl/MdmModuleViewDaoImpl.java
@@ -1,5 +1,6 @@
 package com.hzya.frame.mdm.mdmModuleView.dao.impl;
 
+import com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity;
 import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity;
 import com.hzya.frame.mdm.mdmModuleView.dao.IMdmModuleViewDao;
 import org.springframework.stereotype.Repository;
@@ -12,6 +13,14 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao;
  */
 @Repository(value = "MdmModuleViewDaoImpl")
 public class MdmModuleViewDaoImpl extends MybatisGenericDao<MdmModuleViewEntity, String> implements IMdmModuleViewDao{
- 
+
+
+
+
+    @Override
+    public Integer queryUserMdm(MdmModuleViewEntity mdmModuleViewEntity) {
+        Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "queryUserMdm", mdmModuleViewEntity);
+        return o;
+    }
 }
 
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/entity/MdmModuleViewEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/entity/MdmModuleViewEntity.java
index 83103ab3..e8232cc1 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/entity/MdmModuleViewEntity.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleView/entity/MdmModuleViewEntity.java
@@ -12,7 +12,7 @@ public class MdmModuleViewEntity extends BaseEntity {
  
   /**  主数据模版ID */
    private String mdmId;
-  /**  显示类型 */
+  /**  显示类型 1、树2、列表*/
    private String viewName;
   /**  显示字段 */
    private String viewFiled;
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 0e990f0d..f6af148b 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
@@ -238,6 +238,14 @@ update mdm_module_view  set sts= 'N' ,modify_time = #{modify_time},modify_user_i
 <delete id="entity_delete">
     delete from mdm_module_view where id = #{id}
 </delete>
-
+    <!-- 查询符合条件的数量 -->
+    <select id="queryUserMdm" resultType="Integer" parameterType = "com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity">
+        select  count(1)   from mdm_module_view
+        <trim prefix="where" prefixOverrides="and">
+           and mdm_id = #{mdmId}
+             and (view_filed = #{viewFiled} or up_id_filed = #{upIdFiled})
+            and sts='Y'
+        </trim>
+    </select>
 </mapper>
 
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/entity/MdmModuleViewButtonEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/entity/MdmModuleViewButtonEntity.java
index 6ac2b94f..19949393 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/entity/MdmModuleViewButtonEntity.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewButton/entity/MdmModuleViewButtonEntity.java
@@ -14,7 +14,7 @@ public class MdmModuleViewButtonEntity extends BaseEntity {
    private String mdmId;
   /**  视图id */
    private String viewId;
-  /**  类型1、新建2、重置3、查询4、修改 5、删除 6、查看 */
+  /**  类型1、新建2、重置3、查询4、修改 5、删除 6、查看 7、下发 */
    private String buttonType;
   /**  按钮值 */
    private String buttonValue;
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/entity/MdmModuleViewDetailEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/entity/MdmModuleViewDetailEntity.java
index 8d10318a..5b5295d9 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/entity/MdmModuleViewDetailEntity.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/entity/MdmModuleViewDetailEntity.java
@@ -16,6 +16,8 @@ public class MdmModuleViewDetailEntity extends BaseEntity {
    private String viewId;
   /**  字段 */
    private String viewFiled;
+  /**  字段 */
+   private String viewName;
   /**  类型1、查询2、列表3、新增4、修改 5、查看 */
    private String viewType;
   /**  公司id */
@@ -70,5 +72,13 @@ public class MdmModuleViewDetailEntity extends BaseEntity {
     public void setDataType(String dataType) {
         this.dataType = dataType;
     }
+
+    public String getViewName() {
+        return viewName;
+    }
+
+    public void setViewName(String viewName) {
+        this.viewName = viewName;
+    }
 }
 
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 920a3cd5..ae9ef52c 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
@@ -8,264 +8,56 @@ import com.hzya.frame.web.entity.JsonResultEntity;
  */
 public interface IMdmService {
 
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据列表查询接口分页
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //JsonResultEntity queryMdmPage(JSONObject jsonObject);
+    /**
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 主数据列表显示 树、查询条件、列表字段、按钮
+     * @Date 9:40 上午 2023/10/18
+     **/
+    JsonResultEntity queryMdmShow(JSONObject jsonObject);
+    //
+    /**
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 主数据查询所有字段
+     * @Date 9:40 上午 2023/10/18
+     **/
+    JsonResultEntity queryMdmShowAll(JSONObject jsonObject);
+    /**
+     * @Author lvleigang
+     * @Description  查询模版数据（list 或者 分页）
+     * @Date 1:33 下午 2023/7/12
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     **/
+    JsonResultEntity queryTemplateData(JSONObject jsonObject);
+    /**
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 主数据列表显示 业务数据
+     * @Date 9:40 上午 2023/10/18
+     **/
+    JsonResultEntity queryMdmShowData(JSONObject jsonObject);
     //
     ///**
     // * @param jsonObject
     // * @return com.hzya.frame.web.entity.JsonResultEntity
     // * @Author lvleigang
-    // * @Description 主数据列表查询接口列表
+    // * @Description 主数据业务数据
     // * @Date 9:40 上午 2023/10/18
     // **/
-    //JsonResultEntity queryMdmList(JSONObject jsonObject);
-    //
-    //
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据新增
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //JsonResultEntity addMdm(JSONObject jsonObject);
-    //
-    //
-    //
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据基本信息获取
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //JsonResultEntity queryMdmModule(JSONObject jsonObject);
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据基本信息修改
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //JsonResultEntity doSaveMdmModule(JSONObject jsonObject);
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据设置查询数据源
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //JsonResultEntity queryMdmModuleDb(JSONObject jsonObject);
-    ////
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据设置查询数据源的服务
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //JsonResultEntity queryMdmModuleServer(JSONObject jsonObject);
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据设置查询数据源字段的服务
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //JsonResultEntity queryMdmModuleServerFiled(JSONObject jsonObject);
-    //
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据设置查询主表字段
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //JsonResultEntity queryMdmModuleServerMainFiled(JSONObject jsonObject);
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据设置保存数据源
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //JsonResultEntity saveMdmModuleDb(JSONObject jsonObject);
-    //
-    //
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据设置查询显示信息
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //JsonResultEntity queryMdmModuleView(JSONObject jsonObject);
-    //
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据设置修改显示信息
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //JsonResultEntity doSaveMdmModuleView(JSONObject jsonObject);
-    ////
-    /////**
-    //// * @param jsonObject
-    //// * @return com.hzya.frame.web.entity.JsonResultEntity
-    //// * @Author lvleigang
-    //// * @Description 主数据设置查询权限配置
-    //// * @Date 9:40 上午 2023/10/18
-    //// **/
-    ////JsonResultEntity queryMdmModuleRule(JSONObject jsonObject);
-    ////
-    /////**
-    //// * @param jsonObject
-    //// * @return com.hzya.frame.web.entity.JsonResultEntity
-    //// * @Author lvleigang
-    //// * @Description 主数据设置保存权限配置
-    //// * @Date 9:40 上午 2023/10/18
-    //// **/
-    ////JsonResultEntity doSaveMdmModuleRule(JSONObject jsonObject);
-    ////
-    ////
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据设置查询分发设置
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //JsonResultEntity queryMdmModuleDistribute(JSONObject jsonObject);
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据设置保存分发设置
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //JsonResultEntity doSaveMdmModuleDistribute(JSONObject jsonObject);
-    //
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据设置查询数据来源
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //JsonResultEntity queryMdmModuleSource(JSONObject jsonObject);
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据设置保存数据来源
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //JsonResultEntity doSaveMdmModuleSource(JSONObject jsonObject);
-    //
-    //
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 查询下发日志
-    // * @Date 11:52 上午 2024/3/27
-    // **/
-    //JsonResultEntity querySendEntityPage(JSONObject jsonObject);
-    //
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 获取下发日志
-    // * @Date 2:36 下午 2024/3/27
-    // **/
-    //JsonResultEntity getSendEntity(JSONObject jsonObject);
-    //
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 删除下发日志
-    // * @Date 2:37 下午 2024/3/27
-    // **/
-    //JsonResultEntity deleteSendEntity(JSONObject jsonObject);
-    //
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 查询操作日志
-    // * @Date 11:52 上午 2024/3/27
-    // **/
-    //JsonResultEntity queryOptionEntityPage(JSONObject jsonObject);
-    //
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 获取操作日志
-    // * @Date 2:36 下午 2024/3/27
-    // **/
-    //JsonResultEntity getOptionEntity(JSONObject jsonObject);
-    //
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 删除操作日志
-    // * @Date 2:37 下午 2024/3/27
-    // **/
-    //JsonResultEntity deleteOptionEntity(JSONObject jsonObject);
-    ////
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据列表显示 树、查询条件、列表字段、按钮
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //JsonResultEntity queryMdmShow(JSONObject jsonObject);
-    ////
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据查询所有字段
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //JsonResultEntity queryMdmShowAll(JSONObject jsonObject);
-    ///**
-    // * @Author lvleigang
-    // * @Description  查询模版数据（list 或者 分页）
-    // * @Date 1:33 下午 2023/7/12
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // **/
-    //JsonResultEntity queryTemplateData(JSONObject jsonObject);
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据列表显示 业务数据
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //JsonResultEntity queryMdmShowData(JSONObject jsonObject);
-    ////
-    /////**
-    //// * @param jsonObject
-    //// * @return com.hzya.frame.web.entity.JsonResultEntity
-    //// * @Author lvleigang
-    //// * @Description 主数据业务数据
-    //// * @Date 9:40 上午 2023/10/18
-    //// **/
-    ////JsonResultEntity queryMdmShowDistribute(JSONObject jsonObject);
+    //JsonResultEntity queryMdmShowDistribute(JSONObject jsonObject);
+    /**
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 主数据业务数据树结构
+     * @Date 9:40 上午 2023/10/18
+     **/
+    JsonResultEntity queryMdmShowTreeData(JSONObject jsonObject);
     ///**
     // * @param jsonObject
     // * @return com.hzya.frame.web.entity.JsonResultEntity
@@ -273,67 +65,59 @@ public interface IMdmService {
     // * @Description 主数据业务数据树结构
     // * @Date 9:40 上午 2023/10/18
     // **/
-    //JsonResultEntity queryMdmShowTreeData(JSONObject jsonObject);
-    /////**
-    //// * @param jsonObject
-    //// * @return com.hzya.frame.web.entity.JsonResultEntity
-    //// * @Author lvleigang
-    //// * @Description 主数据业务数据树结构
-    //// * @Date 9:40 上午 2023/10/18
-    //// **/
-    ////JsonResultEntity queryMdmOptionData(JSONObject jsonObject);
-    ////
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据详情 区分类型 新增、修改、查看
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //JsonResultEntity queryMdmShowDetails(JSONObject jsonObject);
-    ////
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据详情数据 区分类型 新增、修改、查看
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //JsonResultEntity queryMdmShowDetailsData(JSONObject jsonObject);
-    ////
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据详情数据修改
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //JsonResultEntity updateMdmShowDetailsData(JSONObject jsonObject);
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据详情数据新增
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //JsonResultEntity saveMdmShowDetailsData(JSONObject jsonObject);
+    //JsonResultEntity queryMdmOptionData(JSONObject jsonObject);
     //
+    /**
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 主数据详情 区分类型 新增、修改、查看
+     * @Date 9:40 上午 2023/10/18
+     **/
+    JsonResultEntity queryMdmShowDetails(JSONObject jsonObject);
+    //
+    /**
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 主数据详情数据 区分类型 新增、修改、查看
+     * @Date 9:40 上午 2023/10/18
+     **/
+    JsonResultEntity queryMdmShowDetailsData(JSONObject jsonObject);
+    //
+    /**
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 主数据详情数据修改
+     * @Date 9:40 上午 2023/10/18
+     **/
+    JsonResultEntity updateMdmShowDetailsData(JSONObject jsonObject);
+    /**
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 主数据详情数据新增
+     * @Date 9:40 上午 2023/10/18
+     **/
+    JsonResultEntity saveMdmShowDetailsData(JSONObject jsonObject);
+
+    /**
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 主数据删除业务数据
+     * @Date 9:40 上午 2023/10/18
+     **/
+    JsonResultEntity deleteMdmShowDetailsData(JSONObject jsonObject);
     ///**
     // * @param jsonObject
     // * @return com.hzya.frame.web.entity.JsonResultEntity
     // * @Author lvleigang
-    // * @Description 主数据删除业务数据
+    // * @Description 处理分发数据
     // * @Date 9:40 上午 2023/10/18
     // **/
-    //JsonResultEntity deleteMdmShowDetailsData(JSONObject jsonObject);
-    /////**
-    //// * @param jsonObject
-    //// * @return com.hzya.frame.web.entity.JsonResultEntity
-    //// * @Author lvleigang
-    //// * @Description 处理分发数据
-    //// * @Date 9:40 上午 2023/10/18
-    //// **/
-    ////JsonResultEntity doMdmDistribute(JSONObject jsonObject);
-    //
+    //JsonResultEntity doMdmDistribute(JSONObject jsonObject);
+
 
 }
diff --git a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
index 30556520..73c99cc4 100644
--- a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
@@ -41,6 +41,7 @@ import com.hzya.frame.mdm.mdmModuleViewButton.dao.IMdmModuleViewButtonDao;
 import com.hzya.frame.mdm.mdmModuleViewButton.entity.MdmModuleViewButtonEntity;
 import com.hzya.frame.mdm.mdmModuleViewDetail.dao.IMdmModuleViewDetailDao;
 import com.hzya.frame.mdm.mdmModuleViewDetail.entity.MdmModuleViewDetailEntity;
+import com.hzya.frame.mdm.mdmTableCodeRule.dao.IMdmTableCodeRuleDao;
 import com.hzya.frame.mdm.mdmTableCodeRule.entity.MdmTableCodeRuleEntity;
 import com.hzya.frame.mdm.service.IMdmService;
 
@@ -78,2767 +79,446 @@ import java.util.Map;
 @Service(value = "mdmService")
 public class MdmServiceImpl implements IMdmService {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Resource
+    private IMdmModuleDao mdmModuleDao;
+    @Resource
+    private IMdmModuleSendLogDao mdmModuleSendLogDao;
+    @Resource
+    private IMdmModuleOptionLogDao mdmModuleOptionLogDao;
+    @Resource
+    private IMdmServiceCache mdmServiceCache;
+    @Resource
+    private ISysMenuConfigDao sysMenuConfigDao;
+    @Resource
+    private ISysButtonConfigDao sysButtonConfigDao;
+    @Resource
+    private ISysPopedomOperateDao sysPopedomOperateDao;
+    @Resource
+    private IMdmModuleDbDao mdmModuleDbDao;
+    @Resource
+    private IMdmModuleDbFiledsDao mdmModuleDbFiledsDao;
+    @Resource
+    private IMdmModuleDbFiledsRuleDao mdmModuleDbFiledsRuleDao;
+    @Resource
+    private IMdmTableCodeRuleDao mdmTableCodeRuleDao;
+    @Resource
+    private IMdmModuleDistributeDao mdmModuleDistributeDao;
+    @Resource
+    private IMdmModuleDistributeDetailDao mdmModuleDistributeDetailDao;
+    @Resource
+    private IMdmModuleViewDao mdmModuleViewDao;
+    @Resource
+    private IMdmModuleViewButtonDao mdmModuleViewButtonDao;
+    @Resource
+    private IMdmModuleViewDetailDao mdmModuleViewDetailDao;
+
+
+    /**
+     * @param object
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 主数据列表显示 树、查询条件、列表字段、按钮
+     * @Date 9:40 上午 2023/10/18
+     **/
+    @Override
+    public JsonResultEntity queryMdmShow(JSONObject object) {
+        MdmDto entity = getData("jsonStr", object, MdmDto.class);
+        if (entity == null) {
+            return BaseResult.getFailureMessageEntity("参数不允许为空");
+        }
+        if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        //查询模版
+        MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
+        if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+
+        //设置模版
+        MdmViewVo mdmViewVo = new MdmViewVo();
+        mdmViewVo.setMdmModuleEntity(mdmModuleEntity);
+        //查询展示类型
+        MdmModuleViewEntity mdmModuleViewEntity = new MdmModuleViewEntity();
+        mdmModuleViewEntity.setMdmId(mdmModuleEntity.getId());
+        mdmModuleViewEntity.setSts("Y");
+        List<MdmModuleViewEntity> moduleViewEntityList = mdmModuleViewDao.queryBase(mdmModuleViewEntity);
+        if (moduleViewEntityList == null || moduleViewEntityList.size() != 1) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        mdmModuleViewEntity = moduleViewEntityList.get(0);
+        mdmViewVo.setMdmModuleViewEntity(mdmModuleViewEntity);
+
+        //查询数据源主表
+        MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
+        mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
+        mdmModuleDbEntity.setSts("Y");
+        List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
+        if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        //查询数据源表下面的字段
+        MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity();
+        mdmModuleDbFiledsEntity.setMdmId(mdmModuleEntity.getId());
+        mdmModuleDbFiledsEntity.setSts("Y");
+        List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity);
+        if (mdmModuleDbFiledsEntityList == null || mdmModuleDbFiledsEntityList.size() == 0) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        //查询字段下的规则
+        MdmModuleDbFiledsRuleEntity mdmModuleDbFiledsRuleEntity = new MdmModuleDbFiledsRuleEntity();
+        mdmModuleDbFiledsRuleEntity.setMdmId(mdmModuleEntity.getId());
+        mdmModuleDbFiledsRuleEntity.setSts("Y");
+        List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRuleEntityList = mdmModuleDbFiledsRuleDao.queryBase(mdmModuleDbFiledsRuleEntity);
+        if (mdmModuleDbFiledsRuleEntityList == null || mdmModuleDbFiledsRuleEntityList.size() == 0) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+
+        //查询设置的查询字段
+        MdmModuleViewDetailEntity mdmModuleViewDetailEntity = new MdmModuleViewDetailEntity();
+        mdmModuleViewDetailEntity.setMdmId(mdmModuleEntity.getId());
+        mdmModuleViewDetailEntity.setSts("Y");
+        List<MdmModuleViewDetailEntity> mdmModuleViewDetailEntities = mdmModuleViewDetailDao.queryBase(mdmModuleViewDetailEntity);
+        if (mdmModuleViewDetailEntities == null || mdmModuleViewDetailEntities.size() == 0) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        List<MdmViewFiledVo> queryList = getFiledByType("1",mdmModuleViewDetailEntities,mdmModuleDbEntityList,mdmModuleDbFiledsEntityList,mdmModuleDbFiledsRuleEntityList);
+        mdmViewVo.setQueryList(queryList);
+        List<MdmViewFiledVo> listList = getFiledByType("2",mdmModuleViewDetailEntities,mdmModuleDbEntityList,mdmModuleDbFiledsEntityList,mdmModuleDbFiledsRuleEntityList);
+        mdmViewVo.setListList(listList);
+        return BaseResult.getSuccessMessageEntity("获取字段成功", mdmViewVo);
+    }
+
+    /**
+     * @Author lvleigang
+     * @Description  根据类型获取字段
+     * @Date 9:18 上午 2024/6/6
+     * @param viewType 类型
+     * @param mdmModuleViewDetailEntities 显示设置的字段
+     * @param mdmModuleDbEntityList 表
+     * @param mdmModuleDbFiledsEntityList 表字段
+     * @param mdmModuleDbFiledsRuleEntityList 字段规则
+     * @return java.util.List<com.hzya.frame.mdm.entity.MdmViewFiledVo>
+     **/
+    private List<MdmViewFiledVo> getFiledByType(String viewType, List<MdmModuleViewDetailEntity> mdmModuleViewDetailEntities, List<MdmModuleDbEntity> mdmModuleDbEntityList, List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList, List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRuleEntityList) {
+        List<MdmViewFiledVo> mdmViewFiledVos = new ArrayList<>();
+        if(mdmModuleViewDetailEntities != null && mdmModuleViewDetailEntities.size() > 0){
+            for (int i = 0; i < mdmModuleViewDetailEntities.size(); i++) {
+                if(viewType.equals(mdmModuleViewDetailEntities.get(i).getViewType())){
+                    //类型一致
+                    MdmViewFiledVo mdmViewFiledVo = new MdmViewFiledVo();
+                    mdmViewFiledVo.setId(mdmModuleViewDetailEntities.get(i).getViewFiled());
+                    for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
+                        if(mdmModuleDbFiledsEntityList.get(i1).getId().equals(mdmModuleViewDetailEntities.get(i).getViewFiled())){
+                            for (int i2 = 0; i2 < mdmModuleDbEntityList.size(); i2++) {
+                                if(mdmModuleDbEntityList.get(i2).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())){
+                                    mdmViewFiledVo.setDbName(mdmModuleDbEntityList.get(i2).getDbName());
+                                    mdmViewFiledVo.setDbType(mdmModuleDbEntityList.get(i2).getDbType());
+                                    mdmViewFiledVo.setMdmId(mdmModuleDbEntityList.get(i2).getMdmId());
+                                    mdmViewFiledVo.setDbId(mdmModuleDbEntityList.get(i2).getId());
+
+                                    break;
+                                }
+                            }
+                            mdmViewFiledVo.setChName(mdmModuleDbFiledsEntityList.get(i1).getChName());
+                            mdmViewFiledVo.setEnName(mdmModuleDbFiledsEntityList.get(i1).getEnName());
+                            mdmViewFiledVo.setFiledType(mdmModuleDbFiledsEntityList.get(i1).getFiledType());
+                            //字段规则
+                            if(mdmModuleDbFiledsRuleEntityList != null && mdmModuleDbFiledsRuleEntityList.size() > 0){
+                                List<MdmModuleDbFiledsRuleEntity> ruleList = new ArrayList<>();
+                                for (int i2 = 0; i2 < mdmModuleDbFiledsRuleEntityList.size(); i2++) {
+                                    if(mdmModuleDbFiledsEntityList.get(i1).getId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getFiledId())){
+                                        ruleList.add(mdmModuleDbFiledsRuleEntityList.get(i2));
+                                    }
+                                }
+                                mdmViewFiledVo.setRuleList(ruleList);
+                            }
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        if(mdmViewFiledVos != null && mdmViewFiledVos.size() > 0){
+            for (int i = 0; i < mdmViewFiledVos.size(); i++) {
+                mdmViewFiledVos.get(i).setSorts(i);
+            }
+        }
+        return mdmViewFiledVos;
+    }
     //
-    //@Resource
-    //private IMdmModuleDao mdmModuleDao;
-    //@Resource
-    //private IMdmModuleSendLogDao mdmModuleSendLogDao;
-    //@Resource
-    //private IMdmModuleOptionLogDao mdmModuleOptionLogDao;
-    //@Resource
-    //private IMdmServiceCache mdmServiceCache;
-    //@Resource
-    //private ISysMenuConfigDao sysMenuConfigDao;
-    //@Resource
-    //private ISysButtonConfigDao sysButtonConfigDao;
-    //@Resource
-    //private ISysPopedomOperateDao sysPopedomOperateDao;
-    //@Resource
-    //private IMdmModuleDbDao mdmModuleDbDao;
-    //@Resource
-    //private IMdmModuleDbFiledsDao mdmModuleDbFiledsDao;
-    //@Resource
-    //private IMdmModuleDbFiledsRuleDao mdmModuleDbFiledsRuleDao;
-    //@Resource
-    //private IMdmModuleDistributeDao mdmModuleDistributeDao;
-    //@Resource
-    //private IMdmModuleDistributeDetailDao mdmModuleDistributeDetailDao;
-    //@Resource
-    //private IMdmModuleViewDao mdmModuleViewDao;
-    //@Resource
-    //private IMdmModuleViewButtonDao mdmModuleViewButtonDao;
-    //@Resource
-    //private IMdmModuleViewDetailDao mdmModuleViewDetailDao;
+    /**
+     * @param object
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 主数据查询所有字段
+     * @Date 9:40 上午 2023/10/18
+     **/
+    @Override
+    public JsonResultEntity queryMdmShowAll(JSONObject object) {
+        MdmDto entity = getData("jsonStr", object, MdmDto.class);
+        if (entity == null) {
+            return BaseResult.getFailureMessageEntity("参数不允许为空");
+        }
+        if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        //查询设置各种类型字段
+        MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
+        //查询模版数据源
+        MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
+        mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
+        mdmModuleDbEntity.setSts("Y");
+        List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
+        List<MdmDbFiledVo> listFiled = new ArrayList<>();
+        if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() > 0) {
+            MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity();
+            mdmModuleDbFiledsEntity.setMdmId(mdmModuleEntity.getId());
+            mdmModuleDbFiledsEntity.setSts("Y");
+            List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity);
+            //
+            if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() > 0) {
+                for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
+                    if("1".equals(mdmModuleDbEntityList.get(i).getDbType()) || "2".equals(mdmModuleDbEntityList.get(i).getDbType())){
+                        if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) {
+                            for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
+                                if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) {
+                                    if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
+                                        //1、主表
+                                        listFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
+                                    } else {
+                                        //2、明细
+                                        listFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return BaseResult.getSuccessMessageEntity("查询视图成功", listFiled);
+    }
     //
     ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
+    // * @param mdmModuleRoleButtonEntities
+    // * @return java.util.List<com.hzya.frame.mdm.entity.MdmViewButtonVo>
     // * @Author lvleigang
-    // * @Description 主数据列表查询接口分页
-    // * @Date 9:40 上午 2023/10/18
+    // * @Description 设置返回按钮
+    // * @Date 4:48 下午 2023/10/26
     // **/
-    //@Override
-    //public JsonResultEntity queryMdmPage(JSONObject object) {
-    //    MdmModuleEntity entity = getData("jsonStr", object, MdmModuleEntity.class);
-    //    //判断分页
-    //    if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) {
-    //        return BaseResult.getFailureMessageEntity("分页查询参数不存在");
+    //private List<MdmViewButtonVo> setButton(List<MdmModuleRoleButtonEntity> mdmModuleRoleButtonEntities) {
+    //    List<MdmViewButtonVo> mdmViewButtonVoList = new ArrayList<>();
+    //    if (mdmModuleRoleButtonEntities != null && mdmModuleRoleButtonEntities.size() > 0) {
+    //        for (int i = 0; i < mdmModuleRoleButtonEntities.size(); i++) {
+    //            mdmViewButtonVoList.add(new MdmViewButtonVo(mdmModuleRoleButtonEntities.get(i).getButtonType(), mdmModuleRoleButtonEntities.get(i).getButtonName()));
+    //        }
     //    }
-    //    PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
-    //    List<MdmModuleEntity> mdmVos = mdmModuleDao.queryMdm(entity);
-    //    PageInfo pageInfo = new PageInfo(mdmVos);
-    //    return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo);
+    //    return mdmViewButtonVoList;
     //}
     //
     ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
+    // * @param allRecords
+    // * @param checkedMeters
+    // * @return java.util.List<com.hzya.frame.mdm.mdmModuleViewDetail.entity.MdmModuleViewDetailEntity>
     // * @Author lvleigang
-    // * @Description 主数据列表查询接口列表
-    // * @Date 9:40 上午 2023/10/18
+    // * @Description 取出重复字段数据
+    // * @Date 4:34 下午 2023/10/26
     // **/
-    //@Override
-    //public JsonResultEntity queryMdmList(JSONObject object) {
-    //    MdmModuleEntity entity = getData("jsonStr", object, MdmModuleEntity.class);
-    //    List<MdmModuleEntity> mdmVos = mdmModuleDao.queryMdm(entity);
-    //    return BaseResult.getSuccessMessageEntity("查询数据成功", mdmVos);
+    //private List<MdmModuleViewDetailEntity> getDolist(List<MdmModuleViewDetailEntity> allRecords, List<MdmModuleUserViewEntity> checkedMeters) {
+    //    List<MdmModuleViewDetailEntity> meterPlan = allRecords.stream()
+    //            .filter(item -> checkedMeters.stream()
+    //                    .map(e -> {
+    //                        if (!Objects.equals(item.getViewFiled(), e.getViewDetailId())) {
+    //                            return null;
+    //                        } else {
+    //                            return item.getViewFiled();
+    //                        }
+    //                    })
+    //                    .collect(Collectors.toList())
+    //                    .contains(item.getViewFiled()))
+    //            .collect(Collectors.toList());
+    //    return meterPlan;
     //}
     //
     ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
+    // * @param mdmModuleDbEntityList           数据源
+    // * @param mdmModuleDbFiledsEntityList     数据源下的字段表
+    // * @param mdmModuleDbFiledsRuleEntityList 数据源字段的规则表
+    // * @param queryList                       需要的字段
+    // * @return java.util.List<com.hzya.frame.mdm.entity.MdmViewFiledVo>
     // * @Author lvleigang
-    // * @Description 主数据新增
-    // * @Date 9:40 上午 2023/10/18
+    // * @Description 根据字段设置返回前台字段
+    // * @Date 4:11 下午 2023/10/26
     // **/
-    //@Override
-    //public JsonResultEntity addMdm(JSONObject object) {
-    //    MdmModuleEntity entity = getData("jsonStr", object, MdmModuleEntity.class);
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    //    }
-    //    if (entity.getMdmName() == null || "".equals(entity.getMdmName())) {
-    //        return BaseResult.getFailureMessageEntity("请先输入主数据名称");
-    //    }
-    //    if (entity.getMdmType() == null || "".equals(entity.getMdmType())) {
-    //        return BaseResult.getFailureMessageEntity("请先选择主数据类型");
-    //    }
-    //    //新增
-    //    entity.setCreate();
-    //    mdmModuleDao.save(entity);
-    //    return BaseResult.getSuccessMessageEntity("保存数据成功", entity);
-    //}
+    //private List<MdmViewFiledVo> setQueryList(List<MdmModuleDbEntity> mdmModuleDbEntityList, List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList, List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRuleEntityList, List<MdmModuleViewDetailEntity> queryList, boolean flag) {
+    //    List<MdmViewFiledVo> mdmViewFiledVos = new ArrayList<>();
     //
-    ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据基本信息获取
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //@Override
-    //public JsonResultEntity queryMdmModule(JSONObject object) {
-    //    MdmModuleEntity entity = getData("jsonStr", object, MdmModuleEntity.class);
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    //使用缓存
-    //    MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
-    //    return BaseResult.getSuccessMessageEntity("查询数据成功", mdmModuleEntity);
-    //}
+    //    if (queryList != null && queryList.size() > 0) {
+    //        for (int i = 0; i < queryList.size(); i++) {
+    //            MdmViewFiledVo mdmViewFiledVo = new MdmViewFiledVo();
+    //            mdmViewFiledVo.setId(queryList.get(i).getViewFiled());//字段id
+    //            mdmViewFiledVo.setSorts(i + 2);//排序
+    //            for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
+    //                if (queryList.get(i).getViewFiled().equals(mdmModuleDbFiledsEntityList.get(i1).getId())) {
+    //                    mdmViewFiledVo.setFiledType(mdmModuleDbFiledsEntityList.get(i1).getFiledType());//英文名
+    //                    mdmViewFiledVo.setEnName(mdmModuleDbFiledsEntityList.get(i1).getEnName());//英文名
+    //                    mdmViewFiledVo.setChName(mdmModuleDbFiledsEntityList.get(i1).getChName());//中文名
+    //                    for (int i2 = 0; i2 < mdmModuleDbEntityList.size(); i2++) {
+    //                        if (mdmModuleDbFiledsEntityList.get(i1).getDbId().equals(mdmModuleDbEntityList.get(i2).getId())) {
+    //                            mdmViewFiledVo.setDbType(mdmModuleDbEntityList.get(i2).getDbType());//类型 1、主表 2、明细
+    //                            mdmViewFiledVo.setMdmId(mdmModuleDbEntityList.get(i2).getMdmId());//主数据模版ID
+    //                            mdmViewFiledVo.setDbId(mdmModuleDbEntityList.get(i2).getId());//模版数据库id
+    //                            mdmViewFiledVo.setDbName(mdmModuleDbEntityList.get(i2).getDbName());//表名
     //
-    ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据基本信息保存
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //@Override
-    //public JsonResultEntity doSaveMdmModule(JSONObject object) {
-    //    MdmModuleEntity entity = getData("jsonStr", object, MdmModuleEntity.class);
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("参数不允许为空");
+    //                            break;
+    //                        }
+    //                    }
+    //                    break;
+    //                }
+    //            }
+    //            //设置字段规则
+    //            List<MdmModuleDbFiledsRuleEntity> ruleList = new ArrayList<>();
+    //            if (mdmModuleDbFiledsRuleEntityList != null && mdmModuleDbFiledsRuleEntityList.size() > 0) {
+    //                for (int i1 = 0; i1 < mdmModuleDbFiledsRuleEntityList.size(); i1++) {
+    //                    if (queryList.get(i).getViewFiled().equals(mdmModuleDbFiledsRuleEntityList.get(i1).getFiledId())) {
+    //                        ruleList.add(mdmModuleDbFiledsRuleEntityList.get(i1));
+    //                    }
+    //                }
+    //            }
+    //            mdmViewFiledVo.setRuleList(ruleList);
+    //            mdmViewFiledVos.add(mdmViewFiledVo);
+    //        }
     //    }
-    //    if (entity.getMdmName() == null || "".equals(entity.getMdmName())) {
-    //        return BaseResult.getFailureMessageEntity("请先输入主数据名称");
-    //    }
-    //    if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
-    //    if(mdmModuleEntity == null ){
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    entity.setId(mdmModuleEntity.getId());
-    //    //修改
-    //    entity.setUpdate();
-    //    mdmServiceCache.updateMdmModuleEntity(entity);
-    //    return BaseResult.getSuccessMessageEntity("修改主数据成功", entity);
-    //}
-    //
-    ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据设置查询数据源
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //@Override
-    //public JsonResultEntity queryMdmModuleDb(JSONObject object) {
-    //    MdmModuleEntity entity = getData("jsonStr", object, MdmModuleEntity.class);
-    //    //判断分页
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    MdmDbVo mdmDbVo = new MdmDbVo();
-    //    //获取主数据
-    //    MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
-    //    //查询设置的规则表
-    //    MdmTableCodeRuleEntity mdmTableCodeRuleEntity = new MdmTableCodeRuleEntity();
-    //    mdmTableCodeRuleEntity.setSts("Y");
-    //    mdmTableCodeRuleEntity.setMdmId(mdmModuleEntity.getId());
-    //    List<MdmTableCodeRuleEntity> mdmTableCodeRuleEntityList = mdmServiceCache.queryMdmTableCodeRuleEntity(mdmTableCodeRuleEntity);
-    //    mdmDbVo.setMdmTableCodeRuleEntityList(mdmTableCodeRuleEntityList);
-    //    //查询数据源表
-    //    MdmModuleDbEntity queryDb = new MdmModuleDbEntity();
-    //    queryDb.setMdmId(mdmModuleEntity.getId());
-    //    queryDb.setSts("Y");
-    //    List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmServiceCache.queryMdmModuleDb(queryDb);
-    //    //数据源字段
-    //    MdmModuleDbFiledsEntity queryDbFiled = new MdmModuleDbFiledsEntity();
-    //    queryDbFiled.setMdmId(mdmModuleEntity.getId());
-    //    queryDbFiled.setSts("Y");
-    //    List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList = mdmServiceCache.queryMdmModuleDbFileds(queryDbFiled);
-    //    //数据源字段规则
-    //    MdmModuleDbFiledsRuleEntity queryDbFiledRule = new MdmModuleDbFiledsRuleEntity();
-    //    queryDbFiledRule.setMdmId(mdmModuleEntity.getId());
-    //    queryDbFiledRule.setSts("Y");
-    //    List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRuleEntityList = mdmServiceCache.queryMdmModuleDbFiledsRule(queryDbFiledRule);
-    //    //组装数据
-    //    setMdmDb(mdmDbVo, mdmModuleDbEntityList, mdmModuleDbFiledsEntityList, mdmModuleDbFiledsRuleEntityList);
-    //    return BaseResult.getSuccessMessageEntity("查询数据成功", mdmDbVo);
-    //}
-    ///**
-    // * @param mdmDbVo                         返回对象
-    // * @param mdmModuleDbEntityList           数据表
-    // * @param mdmModuleDbFiledsEntityList     字段
-    // * @param mdmModuleDbFiledsRuleEntityList 字段属性
-    // * @return void
-    // * @Author lvleigang
-    // * @Description 组装返回数据
-    // * @Date 4:51 下午 2023/10/18
-    // **/
-    //private void setMdmDb(MdmDbVo mdmDbVo, List<MdmModuleDbEntity> mdmModuleDbEntityList, List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList, List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRuleEntityList) {
-    //    //主数据主表
-    //    MdmModuleDbEntity mainMdmModuleDb = new MdmModuleDbEntity();
-    //    //主数据子表
-    //    List<MdmModuleDbEntity> sublistMdmModuleDb = new ArrayList<>();
-    //    //主数据主表字段
-    //    List<MdmModuleDbFiledsEntity> mainMdmModuleDbFileds = new ArrayList<>();
-    //
-    //
+    //    MdmViewFiledVo mdmViewFiledVo = new MdmViewFiledVo();
+    //    mdmViewFiledVo.setSorts(1);//排序
+    //    mdmViewFiledVo.setFiledType("3");
+    //    mdmViewFiledVo.setEnName("document_rule");//英文名
+    //    mdmViewFiledVo.setChName("单据编码");//中文名
+    //    mdmViewFiledVo.setDbType("1");//类型 1、主表 2、明细
     //    if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() > 0) {
     //        for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
     //            if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
-    //                //1、主表 2、明细
-    //                mainMdmModuleDb = mdmModuleDbEntityList.get(i);
-    //                //循环字段表
-    //                if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) {
-    //                    for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
-    //                        if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) {
-    //                            mainMdmModuleDbFileds.add(mdmModuleDbFiledsEntityList.get(i1));
-    //                            List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRules = new ArrayList<>();
-    //                            //循环字段属性
-    //                            if (mdmModuleDbFiledsRuleEntityList != null && mdmModuleDbFiledsRuleEntityList.size() > 0) {
-    //                                for (int i2 = 0; i2 < mdmModuleDbFiledsRuleEntityList.size(); i2++) {
-    //                                    if (mdmModuleDbFiledsEntityList.get(i1).getDbId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getDbId())
-    //                                            && mdmModuleDbFiledsEntityList.get(i1).getId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getFiledId())) {
-    //                                        mdmModuleDbFiledsRules.add(mdmModuleDbFiledsRuleEntityList.get(i2));
-    //                                    }
-    //                                }
-    //                            }
-    //                            mdmModuleDbFiledsEntityList.get(i1).setMdmModuleDbFiledsRules(mdmModuleDbFiledsRules);
-    //                        }
-    //                    }
-    //                }
-    //            } else if ("2".equals(mdmModuleDbEntityList.get(i).getDbType())) {
-    //                //2、明细
-    //                sublistMdmModuleDb.add(mdmModuleDbEntityList.get(i));
-    //                //循环字段表
-    //                if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) {
-    //                    List<MdmModuleDbFiledsEntity> sublistMdmModuleDbFileds = new ArrayList<>();
-    //                    for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
-    //                        if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) {
-    //                            sublistMdmModuleDbFileds.add(mdmModuleDbFiledsEntityList.get(i1));
-    //                            List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRules = new ArrayList<>();
-    //                            //循环字段属性
-    //                            if (mdmModuleDbFiledsRuleEntityList != null && mdmModuleDbFiledsRuleEntityList.size() > 0) {
-    //                                for (int i2 = 0; i2 < mdmModuleDbFiledsRuleEntityList.size(); i2++) {
-    //                                    if (mdmModuleDbFiledsEntityList.get(i1).getDbId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getDbId())
-    //                                            && mdmModuleDbFiledsEntityList.get(i1).getId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getFiledId())) {
-    //                                        mdmModuleDbFiledsRules.add(mdmModuleDbFiledsRuleEntityList.get(i2));
-    //                                    }
-    //                                }
-    //                            }
-    //                            mdmModuleDbFiledsEntityList.get(i1).setMdmModuleDbFiledsRules(mdmModuleDbFiledsRules);
-    //                        }
-    //                    }
-    //                    mdmModuleDbEntityList.get(i).setSublistMdmModuleDbFileds(sublistMdmModuleDbFileds);
-    //                }
+    //                mdmViewFiledVo.setDbName(mdmModuleDbEntityList.get(i).getDbName());//表名
     //            }
     //        }
     //    }
-    //    mainMdmModuleDb.setSublistMdmModuleDbFileds(mainMdmModuleDbFileds);
-    //    mdmDbVo.setMainMdmModuleDb(mainMdmModuleDb);
-    //    mdmDbVo.setSublistMdmModuleDb(sublistMdmModuleDb);
-    //}
-    //
-    ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据设置保存数据源
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //@Override
-    //public JsonResultEntity saveMdmModuleDb(JSONObject object) {
-    //    //判断新增还是修改，保存数据生成表结构
-    //    MdmDto entity = getData("jsonStr", object, MdmDto.class);
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    //    }
-    //    if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    //单据规则校验
-    //    if(entity.getMdmTableCodeRuleEntityList() == null || entity.getMdmTableCodeRuleEntityList().size() == 0){
-    //        return BaseResult.getFailureMessageEntity("请先设置单据规则");
-    //    }
-    //    //主表校验
-    //    if (entity.getMainMdmModuleDb() == null || entity.getMainMdmModuleDb().getDbName() == null || "".equals(entity.getMainMdmModuleDb().getDbName())) {
-    //        return BaseResult.getFailureMessageEntity("请先输入主表名称");
-    //    }
-    //    MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
-    //    //主数据主表
-    //    MdmModuleDbEntity mainMdmModuleDb = entity.getMainMdmModuleDb();
-    //    //主数据主表字段
-    //    List<MdmModuleDbFiledsEntity> mainMdmModuleDbFileds = mainMdmModuleDb.getSublistMdmModuleDbFileds();
-    //    //主数据子表
-    //    List<MdmModuleDbEntity> sublistMdmModuleDb = entity.getSublistMdmModuleDb();
-    //    //单据规则
-    //    List<MdmTableCodeRuleEntity> mdmTableCodeRuleEntities = entity.getMdmTableCodeRuleEntityList();
-    //    // 需要校验表是否存在
-    //    if (checkTable(mainMdmModuleDb.getDbName())) {
-    //        return BaseResult.getFailureMessageEntity("主表表名已经存在");
-    //    }
-    //    if(mainMdmModuleDbFileds == null || mainMdmModuleDbFileds.size() == 0){
-    //        return BaseResult.getFailureMessageEntity("请先设置主表字段");
-    //    }
-    //    //判断明细表
-    //    if (sublistMdmModuleDb != null && sublistMdmModuleDb.size() > 0) {
-    //        for (int i = 0; i < sublistMdmModuleDb.size(); i++) {
-    //            // 需要校验表是否存在
-    //            if (checkTable(sublistMdmModuleDb.get(i).getDbName())) {
-    //                return BaseResult.getFailureMessageEntity("子表" + sublistMdmModuleDb.get(i).getDbName() + "已经存在");
-    //            }
-    //            if (sublistMdmModuleDb.get(i).getSublistMdmModuleDbFileds() == null && sublistMdmModuleDb.get(i).getSublistMdmModuleDbFileds().size() == 0) {
-    //                return BaseResult.getFailureMessageEntity("请先设置子表" + sublistMdmModuleDb.get(i).getDbName() + "的字段");
-    //            }
-    //
-    //        }
-    //    }
-    //    //处理数据
-    //    //分别设置成 数据源 数据源字段 数据源规则表 设置是否新增修改  没有id新增，有ID修改
-    //    List<MdmModuleDbEntity> mdmModuleDbEntities = new ArrayList<>();
-    //    List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntities = new ArrayList<>();
-    //    List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRuleEntities = new ArrayList<>();
-    //
-    //    //主表
-    //    if(mainMdmModuleDb.getId() != null && !"".equals(mainMdmModuleDb.getId())){
-    //        //修改
-    //        mainMdmModuleDb.setDataType("2");
-    //        mainMdmModuleDb.setUpdate();
-    //    }else {
-    //        //新增
-    //        mainMdmModuleDb.setDataType("1");
-    //        mainMdmModuleDb.setMdmId(mdmModuleEntity.getId());
-    //        mainMdmModuleDb.setCreate();
-    //    }
-    //    mainMdmModuleDb.setDbType("1");
-    //    mdmModuleDbEntities.add(mainMdmModuleDb);
-    //    for (int i = 0; i < mdmTableCodeRuleEntities.size(); i++) {
-    //        mdmTableCodeRuleEntities.get(i).setMdmId(mdmModuleEntity.getId());
-    //        mdmTableCodeRuleEntities.get(i).setDbId(mainMdmModuleDb.getId());
-    //        mdmTableCodeRuleEntities.get(i).setCreate();
-    //    }
-    //    for (int i = 0; i < mainMdmModuleDbFileds.size(); i++) {
-    //        if(mainMdmModuleDbFileds.get(i).getId() != null && !"".equals(mainMdmModuleDbFileds.get(i).getId())){
-    //            //修改
-    //            mainMdmModuleDbFileds.get(i).setDataType("2");
-    //            mainMdmModuleDbFileds.get(i).setUpdate();
-    //        }else {
-    //            //新增
-    //            mainMdmModuleDbFileds.get(i).setDataType("1");
-    //            mainMdmModuleDbFileds.get(i).setCreate();
-    //        }
-    //        mainMdmModuleDbFileds.get(i).setMdmId(mdmModuleEntity.getId());
-    //        mainMdmModuleDbFileds.get(i).setDbId(mainMdmModuleDb.getId());
-    //        mainMdmModuleDbFileds.get(i).setAddType("1");
-    //        mainMdmModuleDbFileds.get(i).setUpdateType("1");
-    //        mainMdmModuleDbFileds.get(i).setShowType("1");
-    //        mainMdmModuleDbFileds.get(i).setQueryType("1");
-    //        mainMdmModuleDbFileds.get(i).setListType("1");
-    //        mainMdmModuleDbFileds.get(i).setViewType("1");
-    //        if(mainMdmModuleDbFileds.get(i).getMdmModuleDbFiledsRules() != null && mainMdmModuleDbFileds.get(i).getMdmModuleDbFiledsRules().size() > 0){
-    //            for (int i1 = 0; i1 < mainMdmModuleDbFileds.get(i).getMdmModuleDbFiledsRules().size(); i1++) {
-    //                MdmModuleDbFiledsRuleEntity mdmModuleDbFiledsRuleEntity = mainMdmModuleDbFileds.get(i).getMdmModuleDbFiledsRules().get(i1);
-    //                if(mdmModuleDbFiledsRuleEntity.getId() != null && !"".equals(mdmModuleDbFiledsRuleEntity.getId())){
-    //                    //修改
-    //                    mdmModuleDbFiledsRuleEntity.setDataType("2");
-    //                    mdmModuleDbFiledsRuleEntity.setUpdate();
-    //                }else {
-    //                    //新增
-    //                    mdmModuleDbFiledsRuleEntity.setDataType("1");
-    //                    mdmModuleDbFiledsRuleEntity.setCreate();
-    //                }
-    //                mdmModuleDbFiledsRuleEntities.add(mdmModuleDbFiledsRuleEntity);
-    //            }
-    //        }
-    //        mdmModuleDbFiledsEntities.add(mainMdmModuleDbFileds.get(i));
-    //    }
-    //    if("1".equals(mainMdmModuleDb.getDataType())){
-    //        //新增 设置默认字段
-    //        List<MdmModuleDbFiledsEntity> moduleDbFiledsEntities = getCreateMdm(mdmModuleEntity.getId(),mainMdmModuleDb.getId(),"1");
-    //        mdmModuleDbFiledsEntities.addAll(moduleDbFiledsEntities);
-    //    }
-    //    //明细表
-    //    if(sublistMdmModuleDb != null && sublistMdmModuleDb.size() > 0){
-    //        for (int i = 0; i < sublistMdmModuleDb.size(); i++) {
-    //            MdmModuleDbEntity mdmModuleDbEntity = sublistMdmModuleDb.get(i);
-    //            if(mdmModuleDbEntity.getId() != null && !"".equals(mdmModuleDbEntity.getId())){
-    //                //修改
-    //                mdmModuleDbEntity.setDataType("2");
-    //                mdmModuleDbEntity.setUpdate();
-    //            }else {
-    //                //新增
-    //                mdmModuleDbEntity.setDataType("1");
-    //                mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
-    //                mdmModuleDbEntity.setCreate();
-    //            }
-    //            mainMdmModuleDb.setDbType("2");
-    //            mdmModuleDbEntities.add(mdmModuleDbEntity);
-    //            for (int a = 0; a < mdmModuleDbEntity.getSublistMdmModuleDbFileds().size(); a++) {
-    //                if(mdmModuleDbEntity.getSublistMdmModuleDbFileds().get(a).getId() != null && !"".equals(mdmModuleDbEntity.getSublistMdmModuleDbFileds().get(a).getId())){
-    //                    //修改
-    //                    mdmModuleDbEntity.getSublistMdmModuleDbFileds().get(a).setDataType("2");
-    //                    mdmModuleDbEntity.getSublistMdmModuleDbFileds().get(a).setUpdate();
-    //                }else {
-    //                    //新增
-    //                    mdmModuleDbEntity.getSublistMdmModuleDbFileds().get(a).setDataType("1");
-    //                    mdmModuleDbEntity.getSublistMdmModuleDbFileds().get(a).setCreate();
-    //                }
-    //                mdmModuleDbEntity.getSublistMdmModuleDbFileds().get(a).setMdmId(mdmModuleEntity.getId());
-    //                mdmModuleDbEntity.getSublistMdmModuleDbFileds().get(a).setDbId(mainMdmModuleDb.getId());
-    //                mdmModuleDbEntity.getSublistMdmModuleDbFileds().get(a).setAddType("1");
-    //                mdmModuleDbEntity.getSublistMdmModuleDbFileds().get(a).setUpdateType("1");
-    //                mdmModuleDbEntity.getSublistMdmModuleDbFileds().get(a).setShowType("1");
-    //                mdmModuleDbEntity.getSublistMdmModuleDbFileds().get(a).setQueryType("1");
-    //                mdmModuleDbEntity.getSublistMdmModuleDbFileds().get(a).setListType("1");
-    //                mdmModuleDbEntity.getSublistMdmModuleDbFileds().get(a).setViewType("1");
-    //                if(mdmModuleDbEntity.getSublistMdmModuleDbFileds().get(a).getMdmModuleDbFiledsRules() != null && mdmModuleDbEntity.getSublistMdmModuleDbFileds().get(a).getMdmModuleDbFiledsRules().size() > 0){
-    //                    for (int i1 = 0; i1 < mainMdmModuleDbFileds.get(a).getMdmModuleDbFiledsRules().size(); i1++) {
-    //                        MdmModuleDbFiledsRuleEntity mdmModuleDbFiledsRuleEntity = mainMdmModuleDbFileds.get(a).getMdmModuleDbFiledsRules().get(i1);
-    //                        if(mdmModuleDbFiledsRuleEntity.getId() != null && !"".equals(mdmModuleDbFiledsRuleEntity.getId())){
-    //                            //修改
-    //                            mdmModuleDbFiledsRuleEntity.setDataType("2");
-    //                            mdmModuleDbFiledsRuleEntity.setUpdate();
-    //                        }else {
-    //                            //新增
-    //                            mdmModuleDbFiledsRuleEntity.setDataType("1");
-    //                            mdmModuleDbFiledsRuleEntity.setCreate();
-    //                        }
-    //                        mdmModuleDbFiledsRuleEntities.add(mdmModuleDbFiledsRuleEntity);
-    //                    }
-    //                }
-    //                mdmModuleDbFiledsEntities.add(mdmModuleDbEntity.getSublistMdmModuleDbFileds().get(a));
-    //            }
-    //            if("1".equals(mainMdmModuleDb.getDataType())){
-    //                //新增 设置默认字段
-    //                List<MdmModuleDbFiledsEntity> moduleDbFiledsEntities = getCreateMdm(mdmModuleEntity.getId(),mainMdmModuleDb.getId(),"2");
-    //                mdmModuleDbFiledsEntities.addAll(moduleDbFiledsEntities);
-    //            }
-    //        }
-    //    }
-    //
-    //
-    //    //新增日志表
-    //    if("1".equals(mainMdmModuleDb.getDataType())){
-    //        MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
-    //        mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
-    //        mdmModuleDbEntity.setDbName(mainMdmModuleDb.getDbName()+"_option_log");
-    //        mdmModuleDbEntity.setDbType("3");
-    //        mdmModuleDbEntity.setDataType("1");
-    //        mdmModuleDbEntity.setCreate();
-    //        mdmModuleDbEntities.add(mdmModuleDbEntity);
-    //        //新增 设置日志表
-    //        List<MdmModuleDbFiledsEntity> moduleDbFiledsEntities = getCreateMdm(mdmModuleEntity.getId(),mdmModuleDbEntity.getId(),"3");
-    //        mdmModuleDbFiledsEntities.addAll(moduleDbFiledsEntities);
-    //
-    //        MdmModuleDbEntity mdmModuleDbEntity1 = new MdmModuleDbEntity();
-    //        mdmModuleDbEntity1.setMdmId(mdmModuleEntity.getId());
-    //        mdmModuleDbEntity1.setDbName(mainMdmModuleDb.getDbName()+"_option_log");
-    //        mdmModuleDbEntity1.setDbType("4");
-    //        mdmModuleDbEntity1.setDataType("1");
-    //        mdmModuleDbEntity1.setCreate();
-    //        mdmModuleDbEntities.add(mdmModuleDbEntity1);
-    //        //新增 设置日志表
-    //        List<MdmModuleDbFiledsEntity> moduleDbFiledsEntities1 = getCreateMdm(mdmModuleEntity.getId(),mdmModuleDbEntity1.getId(),"4");
-    //        mdmModuleDbFiledsEntities.addAll(moduleDbFiledsEntities1);
-    //    }
-    //    //保存单据规则
-    //    mdmServiceCache.saveMdmTableCodeRule(mdmModuleEntity.getId(),mdmTableCodeRuleEntities);
-    //    //保存db
-    //    mdmServiceCache.saveMdmModuleDb(mdmModuleEntity.getId(),mdmModuleDbEntities);
-    //    //保存字段
-    //    mdmServiceCache.saveMdmModuleDbFileds(mdmModuleEntity.getId(),mdmModuleDbFiledsEntities);
-    //    //保存规则
-    //    mdmServiceCache.saveMdmModuleDbFiledsRule(mdmModuleEntity.getId(),mdmModuleDbFiledsRuleEntities);
-    //    //创建或者修改表
-    //
-    //    for (int i = 0; i < mdmModuleDbEntities.size(); i++) {
-    //        Map<String, Object> maps = new HashMap<>();
-    //        maps.put("tableName", mdmModuleDbEntities.get(i).getDbName());//表名
-    //        maps.put("tableRemark", mdmModuleDbEntities.get(i).getRemark());//表备注
-    //        List<DbFiledsDto> dbFiledsDtos = new ArrayList<>();
-    //        for (int i1 = 0; i1 < mdmModuleDbFiledsEntities.size(); i1++) {
-    //            if(mdmModuleDbEntities.get(i).getId().equals(mdmModuleDbFiledsEntities.get(i1).getDbId())){
-    //                dbFiledsDtos.add(new DbFiledsDto(mdmModuleDbFiledsEntities.get(i1).getDataType(), mdmModuleDbFiledsEntities.get(i1).getChName(), mdmModuleDbFiledsEntities.get(i1).getEnName(), mdmModuleDbFiledsEntities.get(i1).getFiledType(), mdmModuleDbFiledsEntities.get(i1).getFiledLength()));
-    //            }
-    //        }
-    //        maps.put("databaseFields", dbFiledsDtos);//字段
-    //        if("1".equals(mdmModuleDbEntities.get(i).getDataType())){
-    //            mdmModuleDao.createTable(maps);
-    //        }else {
-    //            Map<String, String> tablename = new HashMap<>();
-    //            tablename.put("tableName", mdmModuleDbEntities.get(i).getDbName());//表名
-    //            tablename.put("tableRemark", mdmModuleDbEntities.get(i).getRemark());//表备注
-    //            mdmModuleDao.alterTableName(tablename);
-    //            mdmModuleDao.alterTable(maps);
-    //        }
-    //    }
-    //    return BaseResult.getSuccessMessageEntity("保存数据源成功");
-    //}
-    //
-    ///**
-    // * @Author lvleigang
-    // * @Description  新建设置默认字段
-    // * @Date 2:06 下午 2024/6/3
-    // * @param mdmId
-    // * @param dbId
-    // * @param type
-    // * @return java.util.List<com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity>
-    // **/
-    //private List<MdmModuleDbFiledsEntity> getCreateMdm(String mdmId, String dbId, String type) {
-    //    List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntities = new ArrayList<>();
-    //    MdmModuleDbFiledsEntity id = new MdmModuleDbFiledsEntity();
-    //    id.setMdmId(mdmId);
-    //    id.setDbId(dbId);
-    //    id.setChName("id");
-    //    id.setEnName("id");
-    //    id.setFiledType("3");
-    //    id.setAddType("2");
-    //    id.setUpdateType("2");
-    //    id.setShowType("2");
-    //    id.setQueryType("2");
-    //    id.setListType("2");
-    //    id.setViewType("2");
-    //    id.setFiledLength("50");
-    //    id.setDataType("1");
-    //    mdmModuleDbFiledsEntities.add(id);
-    //
-    //    if("1".equals(type)){
-    //        MdmModuleDbFiledsEntity documentRule = new MdmModuleDbFiledsEntity();
-    //        documentRule.setMdmId(mdmId);
-    //        documentRule.setDbId(dbId);
-    //        documentRule.setChName("document_rule");
-    //        documentRule.setEnName("单据规则");
-    //        documentRule.setFiledType("3");
-    //        documentRule.setAddType("2");
-    //        documentRule.setUpdateType("1");
-    //        documentRule.setShowType("1");
-    //        documentRule.setQueryType("1");
-    //        documentRule.setListType("1");
-    //        documentRule.setViewType("1");
-    //        documentRule.setFiledLength("50");
-    //        documentRule.setDataType("1");
-    //        mdmModuleDbFiledsEntities.add(documentRule);
-    //    }
-    //
-    //    if("1".equals(type)){
-    //        MdmModuleDbFiledsEntity document_rule_num = new MdmModuleDbFiledsEntity();
-    //        document_rule_num.setMdmId(mdmId);
-    //        document_rule_num.setDbId(dbId);
-    //        document_rule_num.setChName("document_rule_num");
-    //        document_rule_num.setEnName("单据规则流水号");
-    //        document_rule_num.setFiledType("1");
-    //        document_rule_num.setAddType("2");
-    //        document_rule_num.setUpdateType("2");
-    //        document_rule_num.setShowType("2");
-    //        document_rule_num.setQueryType("2");
-    //        document_rule_num.setListType("2");
-    //        document_rule_num.setViewType("2");
-    //        document_rule_num.setFiledLength("50");
-    //        document_rule_num.setDataType("1");
-    //        mdmModuleDbFiledsEntities.add(document_rule_num);
-    //    }
-    //    if("2".equals(type) || "3".equals(type) || "4".equals(type) ){
-    //        MdmModuleDbFiledsEntity formmain_id = new MdmModuleDbFiledsEntity();
-    //        formmain_id.setMdmId(mdmId);
-    //        formmain_id.setDbId(dbId);
-    //        formmain_id.setChName("formmain_id");
-    //        formmain_id.setEnName("主表id");
-    //        formmain_id.setFiledType("3");
-    //        formmain_id.setAddType("2");
-    //        formmain_id.setUpdateType("2");
-    //        formmain_id.setShowType("2");
-    //        formmain_id.setQueryType("2");
-    //        formmain_id.setListType("2");
-    //        formmain_id.setViewType("2");
-    //        formmain_id.setFiledLength("50");
-    //        formmain_id.setDataType("1");
-    //        mdmModuleDbFiledsEntities.add(formmain_id);
-    //    }
-    //    //写入日志字段：操作人
-    //    if("3".equals(type)){
-    //        MdmModuleDbFiledsEntity source_name = new MdmModuleDbFiledsEntity();
-    //        source_name.setMdmId(mdmId);
-    //        source_name.setDbId(dbId);
-    //        source_name.setChName("source_name");
-    //        source_name.setEnName("来源名称");
-    //        source_name.setFiledType("3");
-    //        source_name.setAddType("2");
-    //        source_name.setUpdateType("2");
-    //        source_name.setShowType("2");
-    //        source_name.setQueryType("2");
-    //        source_name.setListType("2");
-    //        source_name.setViewType("2");
-    //        source_name.setFiledLength("50");
-    //        source_name.setDataType("1");
-    //        mdmModuleDbFiledsEntities.add(source_name);
-    //
-    //        MdmModuleDbFiledsEntity code = new MdmModuleDbFiledsEntity();
-    //        code.setMdmId(mdmId);
-    //        code.setDbId(dbId);
-    //        code.setChName("code");
-    //        code.setEnName("编码");
-    //        code.setFiledType("3");
-    //        code.setAddType("2");
-    //        code.setUpdateType("2");
-    //        code.setShowType("2");
-    //        code.setQueryType("2");
-    //        code.setListType("2");
-    //        code.setViewType("2");
-    //        code.setFiledLength("50");
-    //        code.setDataType("1");
-    //        mdmModuleDbFiledsEntities.add(code);
-    //
-    //        MdmModuleDbFiledsEntity source_data = new MdmModuleDbFiledsEntity();
-    //        source_data.setMdmId(mdmId);
-    //        source_data.setDbId(dbId);
-    //        source_data.setChName("source_data");
-    //        source_data.setEnName("源数据");
-    //        source_data.setFiledType("3");
-    //        source_data.setAddType("2");
-    //        source_data.setUpdateType("2");
-    //        source_data.setShowType("2");
-    //        source_data.setQueryType("2");
-    //        source_data.setListType("2");
-    //        source_data.setViewType("2");
-    //        source_data.setFiledLength("255");
-    //        source_data.setDataType("1");
-    //        mdmModuleDbFiledsEntities.add(source_data);
-    //
-    //        MdmModuleDbFiledsEntity option_type = new MdmModuleDbFiledsEntity();
-    //        option_type.setMdmId(mdmId);
-    //        option_type.setDbId(dbId);
-    //        option_type.setChName("option_type");
-    //        option_type.setEnName("操作类型");
-    //        option_type.setFiledType("3");
-    //        option_type.setAddType("2");
-    //        option_type.setUpdateType("2");
-    //        option_type.setShowType("2");
-    //        option_type.setQueryType("2");
-    //        option_type.setListType("2");
-    //        option_type.setViewType("2");
-    //        option_type.setFiledLength("255");
-    //        option_type.setDataType("1");
-    //        mdmModuleDbFiledsEntities.add(option_type);
-    //
-    //        MdmModuleDbFiledsEntity option_Name = new MdmModuleDbFiledsEntity();
-    //        option_Name.setMdmId(mdmId);
-    //        option_Name.setDbId(dbId);
-    //        option_Name.setChName("option_name");
-    //        option_Name.setEnName("操作人");
-    //        option_Name.setFiledType("3");
-    //        option_Name.setAddType("2");
-    //        option_Name.setUpdateType("2");
-    //        option_Name.setShowType("2");
-    //        option_Name.setQueryType("2");
-    //        option_Name.setListType("2");
-    //        option_Name.setViewType("2");
-    //        option_Name.setFiledLength("255");
-    //        option_Name.setDataType("1");
-    //        mdmModuleDbFiledsEntities.add(option_Name);
-    //    }
-    //
-    //    //目标应用、目标api、
-    //    if("4".equals(type)){
-    //        MdmModuleDbFiledsEntity target_app = new MdmModuleDbFiledsEntity();
-    //        target_app.setMdmId(mdmId);
-    //        target_app.setDbId(dbId);
-    //        target_app.setChName("target_app");
-    //        target_app.setEnName("目标应用");
-    //        target_app.setFiledType("1");
-    //        target_app.setAddType("2");
-    //        target_app.setUpdateType("2");
-    //        target_app.setShowType("2");
-    //        target_app.setQueryType("2");
-    //        target_app.setListType("2");
-    //        target_app.setViewType("2");
-    //        target_app.setFiledLength("50");
-    //        target_app.setDataType("1");
-    //        mdmModuleDbFiledsEntities.add(target_app);
-    //
-    //        MdmModuleDbFiledsEntity target_api = new MdmModuleDbFiledsEntity();
-    //        target_api.setMdmId(mdmId);
-    //        target_api.setDbId(dbId);
-    //        target_api.setChName("target_api");
-    //        target_api.setEnName("目标api");
-    //        target_api.setFiledType("1");
-    //        target_api.setAddType("2");
-    //        target_api.setUpdateType("2");
-    //        target_api.setShowType("2");
-    //        target_api.setQueryType("2");
-    //        target_api.setListType("2");
-    //        target_api.setViewType("2");
-    //        target_api.setFiledLength("50");
-    //        target_api.setDataType("1");
-    //        mdmModuleDbFiledsEntities.add(target_api);
-    //
-    //        MdmModuleDbFiledsEntity source_data = new MdmModuleDbFiledsEntity();
-    //        source_data.setMdmId(mdmId);
-    //        source_data.setDbId(dbId);
-    //        source_data.setChName("source_data");
-    //        source_data.setEnName("源数据");
-    //        source_data.setFiledType("3");
-    //        source_data.setAddType("2");
-    //        source_data.setUpdateType("2");
-    //        source_data.setShowType("2");
-    //        source_data.setQueryType("2");
-    //        source_data.setListType("2");
-    //        source_data.setViewType("2");
-    //        source_data.setFiledLength("255");
-    //        source_data.setDataType("1");
-    //        mdmModuleDbFiledsEntities.add(source_data);
-    //
-    //        MdmModuleDbFiledsEntity option_type = new MdmModuleDbFiledsEntity();
-    //        option_type.setMdmId(mdmId);
-    //        option_type.setDbId(dbId);
-    //        option_type.setChName("option_type");
-    //        option_type.setEnName("操作类型");
-    //        option_type.setFiledType("3");
-    //        option_type.setAddType("2");
-    //        option_type.setUpdateType("2");
-    //        option_type.setShowType("2");
-    //        option_type.setQueryType("2");
-    //        option_type.setListType("2");
-    //        option_type.setViewType("2");
-    //        option_type.setFiledLength("255");
-    //        option_type.setDataType("1");
-    //        mdmModuleDbFiledsEntities.add(option_type);
-    //    }
-    //    if("2".equals(type) || "1".equals(type) ) {
-    //        MdmModuleDbFiledsEntity data_status = new MdmModuleDbFiledsEntity();
-    //        data_status.setMdmId(mdmId);
-    //        data_status.setDbId(dbId);
-    //        data_status.setChName("data_status");
-    //        data_status.setEnName("数据状态 Y正常 N删除 F修改");
-    //        data_status.setFiledType("3");
-    //        data_status.setAddType("2");
-    //        data_status.setUpdateType("2");
-    //        data_status.setShowType("2");
-    //        data_status.setQueryType("2");
-    //        data_status.setListType("2");
-    //        data_status.setViewType("2");
-    //        data_status.setFiledLength("1");
-    //        data_status.setDataType("1");
-    //        mdmModuleDbFiledsEntities.add(data_status);
-    //    }
-    //    if("1".equals(type)){
-    //        MdmModuleDbFiledsEntity add_status = new MdmModuleDbFiledsEntity();
-    //        add_status.setMdmId(mdmId);
-    //        add_status.setDbId(dbId);
-    //        add_status.setChName("add_status");
-    //        add_status.setEnName("新增数据状态 0待下发 1已下发");
-    //        add_status.setFiledType("3");
-    //        add_status.setAddType("2");
-    //        add_status.setUpdateType("2");
-    //        add_status.setShowType("2");
-    //        add_status.setQueryType("2");
-    //        add_status.setListType("2");
-    //        add_status.setViewType("2");
-    //        add_status.setFiledLength("1");
-    //        add_status.setDataType("1");
-    //        mdmModuleDbFiledsEntities.add(add_status);
-    //    }
-    //    if("1".equals(type)){
-    //        MdmModuleDbFiledsEntity update_status = new MdmModuleDbFiledsEntity();
-    //        update_status.setMdmId(mdmId);
-    //        update_status.setDbId(dbId);
-    //        update_status.setChName("update_status");
-    //        update_status.setEnName("修改数据状态 0待下发 1已下发");
-    //        update_status.setFiledType("3");
-    //        update_status.setAddType("2");
-    //        update_status.setUpdateType("2");
-    //        update_status.setShowType("2");
-    //        update_status.setQueryType("2");
-    //        update_status.setListType("2");
-    //        update_status.setViewType("2");
-    //        update_status.setFiledLength("1");
-    //        update_status.setDataType("1");
-    //        mdmModuleDbFiledsEntities.add(update_status);
-    //    }
-    //
-    //    if("1".equals(type)){
-    //        MdmModuleDbFiledsEntity delete_status = new MdmModuleDbFiledsEntity();
-    //        delete_status.setMdmId(mdmId);
-    //        delete_status.setDbId(dbId);
-    //        delete_status.setChName("delete_status");
-    //        delete_status.setEnName("删除数据状态 0待下发 1已下发");
-    //        delete_status.setFiledType("3");
-    //        delete_status.setAddType("2");
-    //        delete_status.setUpdateType("2");
-    //        delete_status.setShowType("2");
-    //        delete_status.setQueryType("2");
-    //        delete_status.setListType("2");
-    //        delete_status.setViewType("2");
-    //        delete_status.setFiledLength("1");
-    //        delete_status.setDataType("1");
-    //        mdmModuleDbFiledsEntities.add(delete_status);
-    //    }
-    //
-    //    MdmModuleDbFiledsEntity sorts = new MdmModuleDbFiledsEntity();
-    //    sorts.setMdmId(mdmId);
-    //    sorts.setDbId(dbId);
-    //    sorts.setChName("sorts");
-    //    sorts.setEnName("排序");
-    //    sorts.setFiledType("1");
-    //    sorts.setAddType("2");
-    //    sorts.setUpdateType("2");
-    //    sorts.setShowType("2");
-    //    sorts.setQueryType("2");
-    //    sorts.setListType("2");
-    //    sorts.setViewType("2");
-    //    sorts.setFiledLength("20");
-    //    sorts.setDataType("1");
-    //    mdmModuleDbFiledsEntities.add(sorts);
-    //    MdmModuleDbFiledsEntity create_user_id = new MdmModuleDbFiledsEntity();
-    //    create_user_id.setMdmId(mdmId);
-    //    create_user_id.setDbId(dbId);
-    //    create_user_id.setChName("create_user_id");
-    //    create_user_id.setEnName("创建人id");
-    //    create_user_id.setFiledType("3");
-    //    create_user_id.setAddType("2");
-    //    create_user_id.setUpdateType("2");
-    //    create_user_id.setShowType("2");
-    //    create_user_id.setQueryType("2");
-    //    create_user_id.setListType("2");
-    //    create_user_id.setViewType("2");
-    //    create_user_id.setFiledLength("50");
-    //    create_user_id.setDataType("1");
-    //    mdmModuleDbFiledsEntities.add(create_user_id);
-    //    MdmModuleDbFiledsEntity create_time = new MdmModuleDbFiledsEntity();
-    //    create_time.setMdmId(mdmId);
-    //    create_time.setDbId(dbId);
-    //    create_time.setChName("create_time");
-    //    create_time.setEnName("创建时间");
-    //    create_time.setFiledType("4");
-    //    create_time.setAddType("2");
-    //    create_time.setUpdateType("2");
-    //    create_time.setShowType("2");
-    //    create_time.setQueryType("2");
-    //    create_time.setListType("2");
-    //    create_time.setViewType("2");
-    //    create_time.setFiledLength("50");
-    //    create_time.setDataType("1");
-    //    mdmModuleDbFiledsEntities.add(create_time);
-    //    MdmModuleDbFiledsEntity modify_user_id = new MdmModuleDbFiledsEntity();
-    //    modify_user_id.setMdmId(mdmId);
-    //    modify_user_id.setDbId(dbId);
-    //    modify_user_id.setChName("modify_user_id");
-    //    modify_user_id.setEnName("修改人id");
-    //    modify_user_id.setFiledType("3");
-    //    modify_user_id.setAddType("2");
-    //    modify_user_id.setUpdateType("2");
-    //    modify_user_id.setShowType("2");
-    //    modify_user_id.setQueryType("2");
-    //    modify_user_id.setListType("2");
-    //    modify_user_id.setViewType("2");
-    //    modify_user_id.setFiledLength("50");
-    //    modify_user_id.setDataType("1");
-    //    mdmModuleDbFiledsEntities.add(modify_user_id);
-    //    MdmModuleDbFiledsEntity modify_time = new MdmModuleDbFiledsEntity();
-    //    modify_time.setMdmId(mdmId);
-    //    modify_time.setDbId(dbId);
-    //    modify_time.setChName("modify_time");
-    //    modify_time.setEnName("修改时间");
-    //    modify_time.setFiledType("4");
-    //    modify_time.setAddType("2");
-    //    modify_time.setUpdateType("2");
-    //    modify_time.setShowType("2");
-    //    modify_time.setQueryType("2");
-    //    modify_time.setListType("2");
-    //    modify_time.setViewType("2");
-    //    modify_time.setFiledLength("50");
-    //    modify_time.setDataType("1");
-    //    mdmModuleDbFiledsEntities.add(modify_time);
-    //    MdmModuleDbFiledsEntity sts = new MdmModuleDbFiledsEntity();
-    //    sts.setMdmId(mdmId);
-    //    sts.setDbId(dbId);
-    //    sts.setChName("sts");
-    //    sts.setEnName("状态(Y正常N删除)");
-    //    sts.setFiledType("3");
-    //    sts.setAddType("2");
-    //    sts.setUpdateType("2");
-    //    sts.setShowType("2");
-    //    sts.setQueryType("2");
-    //    sts.setListType("2");
-    //    sts.setViewType("2");
-    //    sts.setFiledLength("1");
-    //    sts.setDataType("1");
-    //    mdmModuleDbFiledsEntities.add(sts);
-    //    MdmModuleDbFiledsEntity org_id = new MdmModuleDbFiledsEntity();
-    //    org_id.setMdmId(mdmId);
-    //    org_id.setDbId(dbId);
-    //    org_id.setChName("org_id");
-    //    org_id.setEnName("组织机构ID");
-    //    org_id.setFiledType("3");
-    //    org_id.setAddType("2");
-    //    org_id.setUpdateType("2");
-    //    org_id.setShowType("2");
-    //    org_id.setQueryType("2");
-    //    org_id.setListType("2");
-    //    org_id.setViewType("2");
-    //    org_id.setFiledLength("50");
-    //    org_id.setDataType("1");
-    //    mdmModuleDbFiledsEntities.add(org_id);
-    //    MdmModuleDbFiledsEntity company_id = new MdmModuleDbFiledsEntity();
-    //    company_id.setMdmId(mdmId);
-    //    company_id.setDbId(dbId);
-    //    company_id.setChName("company_id");
-    //    company_id.setEnName("公司id");
-    //    company_id.setFiledType("3");
-    //    company_id.setAddType("2");
-    //    company_id.setUpdateType("2");
-    //    company_id.setShowType("2");
-    //    company_id.setQueryType("2");
-    //    company_id.setListType("2");
-    //    company_id.setViewType("2");
-    //    company_id.setFiledLength("50");
-    //    company_id.setDataType("1");
-    //    mdmModuleDbFiledsEntities.add(company_id);
-    //    return mdmModuleDbFiledsEntities;
-    //}
-    //
-    //
-    ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据设置查询显示信息
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //@Override
-    //public JsonResultEntity queryMdmModuleView(JSONObject object) {
-    //    MdmModuleEntity entity = getData("jsonStr", object, MdmModuleEntity.class);
-    //    //判断分页
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    MdmModuleViewVo mdmModuleViewVo = new MdmModuleViewVo();
-    //
-    //    MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
-    //    //查询数据库字段
-    //    MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
-    //    mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
-    //    mdmModuleDbEntity.setSts("Y");
-    //    List<MdmModuleDbEntity> mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
-    //    MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity();
-    //    mdmModuleDbFiledsEntity.setMdmId(mdmModuleEntity.getId());
-    //    mdmModuleDbFiledsEntity.setSts("Y");
-    //    List<MdmModuleDbFiledsEntity>  mdmModuleDbFiledsEntities = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity);
-    //
-    //    //设置数据库字段
-    //    setFiledType(mdmModuleViewVo,mdmModuleDbEntities,mdmModuleDbFiledsEntities);
-    //
-    //    MdmModuleViewDetailEntity mdmModuleViewDetailEntity = new MdmModuleViewDetailEntity();
-    //    mdmModuleViewDetailEntity.setMdmId(mdmModuleEntity.getId());
-    //    mdmModuleViewDetailEntity.setSts("Y");
-    //    List<MdmModuleViewDetailEntity>  mdmModuleViewDetailEntities = mdmServiceCache.queryMdmModuleViewDetail(mdmModuleViewDetailEntity);
-    //    setDbFiledType(mdmModuleViewVo,mdmModuleViewDetailEntities);
-    //    MdmModuleViewEntity mdmModuleViewEntity = new MdmModuleViewEntity();
-    //    mdmModuleViewEntity.setMdmId(mdmModuleEntity.getId());
-    //    mdmModuleViewEntity.setSts("Y");
-    //    List<MdmModuleViewEntity>  moduleViewEntities = mdmServiceCache.queryMdmModuleView(mdmModuleViewEntity);
-    //    if(moduleViewEntities != null && moduleViewEntities.size() == 1){
-    //        mdmModuleViewVo.setMdmModuleViewEntity(moduleViewEntities.get(0));
-    //    }
-    //    MdmModuleViewButtonEntity mdmModuleViewButtonEntity = new MdmModuleViewButtonEntity();
-    //    mdmModuleViewButtonEntity.setMdmId(mdmModuleEntity.getId());
-    //    mdmModuleViewButtonEntity.setSts("Y");
-    //    List<MdmModuleViewButtonEntity>  mdmModuleViewButtonEntities = mdmServiceCache.queryMdmModuleViewButton(mdmModuleViewButtonEntity);
-    //    mdmModuleViewVo.setDbButtonFiled(mdmModuleViewButtonEntities);
-    //    return BaseResult.getSuccessMessageEntity("查询视图成功", mdmModuleViewVo);
-    //}
-    //
-    //private void setDbFiledType(MdmModuleViewVo mdmModuleViewVo, List<MdmModuleViewDetailEntity> mdmModuleViewDetailEntityList) {
-    //    //新增
-    //    List<MdmModuleViewDetailEntity> addFiled = new ArrayList<>();
-    //    //修改
-    //    List<MdmModuleViewDetailEntity> editFiled = new ArrayList<>();
-    //    //查看
-    //    List<MdmModuleViewDetailEntity> showFiled = new ArrayList<>();
-    //    //查询
-    //    List<MdmModuleViewDetailEntity> queryFiled = new ArrayList<>();
-    //    //列表
-    //    List<MdmModuleViewDetailEntity> listFiled = new ArrayList<>();
-    //    if (mdmModuleViewDetailEntityList != null && mdmModuleViewDetailEntityList.size() > 0) {
-    //        for (int i = 0; i < mdmModuleViewDetailEntityList.size(); i++) {
-    //            switch (mdmModuleViewDetailEntityList.get(i).getViewType()) {
-    //                //1、查询2、列表3、新增4、修改 5、查看
-    //                case "1":
-    //                    queryFiled.add(mdmModuleViewDetailEntityList.get(i));
-    //                    break;
-    //                case "2":
-    //                    listFiled.add(mdmModuleViewDetailEntityList.get(i));
-    //                    break;
-    //                case "3":
-    //                    addFiled.add(mdmModuleViewDetailEntityList.get(i));
-    //                    break;
-    //                case "4":
-    //                    editFiled.add(mdmModuleViewDetailEntityList.get(i));
-    //                    break;
-    //                case "5":
-    //                    showFiled.add(mdmModuleViewDetailEntityList.get(i));
-    //                    break;
-    //                default:
-    //            }
-    //        }
-    //    }
-    //    mdmModuleViewVo.setDbAddFiled(addFiled);
-    //    mdmModuleViewVo.setDbEditFiled(editFiled);
-    //    mdmModuleViewVo.setDbShowFiled(showFiled);
-    //    mdmModuleViewVo.setDbQueryFiled(queryFiled);
-    //    mdmModuleViewVo.setDbListFiled(listFiled);
-    //}
-    //
-    ///**
-    // * @param mdmModuleViewVo
-    // * @param mdmModuleDbEntityList
-    // * @param mdmModuleDbFiledsEntityList
-    // * @return void
-    // * @Author lvleigang
-    // * @Description 设置对应的字段类型
-    // * @Date 2023/10/25
-    // **/
-    //private void setFiledType(MdmModuleViewVo mdmModuleViewVo, List<MdmModuleDbEntity> mdmModuleDbEntityList, List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList) {
-    //    //新增
-    //    List<MdmDbFiledVo> addFiled = new ArrayList<>();
-    //    //修改
-    //    List<MdmDbFiledVo> editFiled = new ArrayList<>();
-    //    //查看
-    //    List<MdmDbFiledVo> showFiled = new ArrayList<>();
-    //    //查询
-    //    List<MdmDbFiledVo> queryFiled = new ArrayList<>();
-    //    //列表
-    //    List<MdmDbFiledVo> listFiled = new ArrayList<>();
-    //    if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() > 0) {
-    //        for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
-    //
-    //            if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) {
-    //                for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
-    //                    if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) {
-    //                        if("1".equals(mdmModuleDbFiledsEntityList.get(i1).getViewType())){
-    //                            if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
-    //                                //1、主表
-    //                                if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getAddType())) {
-    //                                    addFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-    //                                }
-    //                                if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getUpdateType())) {
-    //                                    editFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-    //                                }
-    //                                if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getShowType())) {
-    //                                    showFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-    //                                }
-    //                                if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getQueryType())) {
-    //                                    queryFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-    //                                }
-    //                                if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getListType())) {
-    //                                    listFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-    //                                }
-    //                            } else if ("2".equals(mdmModuleDbEntityList.get(i).getDbType())){
-    //                                //2、明细
-    //                                if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getAddType())) {
-    //                                    addFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-    //                                }
-    //                                if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getUpdateType())) {
-    //                                    editFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-    //                                }
-    //                                if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getShowType())) {
-    //                                    showFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-    //                                }
-    //                                if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getQueryType())) {
-    //                                    queryFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-    //                                }
-    //                                if ("1".equals(mdmModuleDbFiledsEntityList.get(i1).getListType())) {
-    //                                    listFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-    //                                }
-    //                            }
-    //                        }
-    //                    }
-    //                }
-    //            }
-    //        }
-    //    }
-    //    mdmModuleViewVo.setAddFiled(addFiled);
-    //    mdmModuleViewVo.setEditFiled(editFiled);
-    //    mdmModuleViewVo.setShowFiled(showFiled);
-    //    mdmModuleViewVo.setQueryFiled(queryFiled);
-    //    mdmModuleViewVo.setListFiled(listFiled);
-    //}
-    ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据设置修改显示信息
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //@Override
-    //public JsonResultEntity doSaveMdmModuleView(JSONObject object) {
-    //    MdmModuleViewDto entity = getData("jsonStr", object, MdmModuleViewDto.class);
-    //    //判断是否有数据
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    //    }
-    //    if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    if (entity.getMdmModuleViewEntity() == null) {
-    //        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    //    }
-    //    MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
-    //
-    //    //保存视图
-    //    MdmModuleViewEntity mdmModuleViewEntity = entity.getMdmModuleViewEntity();
-    //    mdmModuleViewEntity.setMdmId(mdmModuleEntity.getId());
-    //    if(mdmModuleViewEntity.getId() != null && !"".equals(mdmModuleViewEntity.getId())){
-    //        mdmModuleViewEntity.setDataType("2");
-    //        mdmModuleViewEntity.setUpdate();
-    //        mdmServiceCache.saveMdmModuleView(mdmModuleEntity.getId(),mdmModuleViewEntity);
-    //    }else {
-    //        mdmModuleViewEntity.setDataType("1");
-    //        mdmModuleViewEntity.setCreate();
-    //        mdmModuleViewDao.save(mdmModuleViewEntity);
-    //    }
-    //    //保存字段
-    //    List<MdmModuleViewDetailEntity> mdmModuleViewDetailEntities = new ArrayList<>();
-    //    //1、查询2、列表3、新增4、修改 5、查看
-    //    saveDbViewFiled(mdmModuleEntity.getId(),mdmModuleViewEntity.getId(),entity.getQueryFiled(),"1",mdmModuleViewDetailEntities);
-    //    saveDbViewFiled(mdmModuleEntity.getId(),mdmModuleViewEntity.getId(),entity.getListFiled(),"2",mdmModuleViewDetailEntities);
-    //    saveDbViewFiled(mdmModuleEntity.getId(),mdmModuleViewEntity.getId(),entity.getAddFiled(),"3",mdmModuleViewDetailEntities);
-    //    saveDbViewFiled(mdmModuleEntity.getId(),mdmModuleViewEntity.getId(),entity.getEditFiled(),"4",mdmModuleViewDetailEntities);
-    //    saveDbViewFiled(mdmModuleEntity.getId(),mdmModuleViewEntity.getId(),entity.getShowFiled(),"5",mdmModuleViewDetailEntities);
-    //    mdmServiceCache.saveMdmModuleViewDetail(mdmModuleEntity.getId(),mdmModuleViewDetailEntities);
-    //    //保存按钮
-    //    List<MdmModuleViewButtonEntity> mdmModuleViewButtonEntities = entity.getDbButtonFiled();
-    //    if(mdmModuleViewButtonEntities != null && mdmModuleViewButtonEntities.size() > 0){
-    //        for (int i = 0; i < mdmModuleViewButtonEntities.size(); i++) {
-    //            mdmModuleViewButtonEntities.get(i).setMdmId(mdmModuleEntity.getId());
-    //            mdmModuleViewButtonEntities.get(i).setViewId(mdmModuleViewEntity.getId());
-    //            if(mdmModuleViewButtonEntities.get(i).getId() != null && !"".equals(mdmModuleViewButtonEntities.get(i).getId())){
-    //                mdmModuleViewButtonEntities.get(i).setDataType("2");
-    //                mdmModuleViewButtonEntities.get(i).setUpdate();
-    //            }else {
-    //                mdmModuleViewButtonEntities.get(i).setDataType("1");
-    //                mdmModuleViewButtonEntities.get(i).setCreate();
-    //            }
-    //        }
-    //        mdmServiceCache.saveMdmModuleViewButton(mdmModuleEntity.getId(),mdmModuleViewButtonEntities);
-    //    }
-    //
-    //    //保存菜单
-    //    //保存按钮
-    //
-    //    if("1".equals(mdmModuleViewEntity.getDataType())){
-    //       //新增
-    //        SysMenuConfigEntity module = new SysMenuConfigEntity();
-    //        module.setCreate();
-    //        module.setFormId(mdmModuleEntity.getId());
-    //        if("1".equals(mdmModuleEntity.getMdmType())){
-    //            //1、档案
-    //            module.setParentMenuId("ea22757e99c144fb9ef381dd322e233c");
-    //        }else {
-    //            //2、单据
-    //            module.setParentMenuId("58714ddb7ec94f5da91df74efada042f");
-    //        }
-    //        module.setMenuName(mdmModuleEntity.getMdmName());
-    //        module.setMenuEnglishName("integrationOptionAdmin" + mdmModuleEntity.getMdmCode());
-    //        module.setMenuIcon(null);//模块图标
-    //        module.setRoute("integrationOptionAdmin/" + mdmModuleEntity.getMdmCode());//路由地址
-    //        module.setMenuPage("integrationOptionV2/index");//一级Layout 二级 ParntView 三级component
-    //        module.setRemark("主数据生成菜单");
-    //        module.setVisibles("0");
-    //        module.setShowType("1");
-    //        JSONObject object1 = new JSONObject();
-    //        object1.put("mdmId", mdmModuleEntity.getId());//主数据id
-    //        object1.put("mdmCode", mdmModuleEntity.getMdmCode());//主数据编码
-    //        object1.put("viewType", mdmModuleViewEntity.getViewName());//1、树 2、列表
-    //        module.setOptions(object1.toString());//菜单mate参数
-    //        sysMenuConfigDao.save(module);
-    //        if(mdmModuleViewButtonEntities != null && mdmModuleViewButtonEntities.size() > 0){
-    //            for (int i = 0; i < mdmModuleViewButtonEntities.size(); i++) {
-    //                if("new".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())){
-    //                    SysButtonConfigEntity xz = new SysButtonConfigEntity();
-    //                    xz.setCode("new");
-    //                    xz.setNameCh("新建");
-    //                    xz.setNameEn("new");
-    //                    xz.setMenuId(module.getId());
-    //                    xz.setIconName("");
-    //                    xz.setStyles("");
-    //                    xz.setBtnFunction("new");
-    //                    xz.setRemark("主数据新建按钮");
-    //                    xz.setCreate();
-    //                    sysButtonConfigDao.save(xz);
-    //                }
-    //                if("resize".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())){
-    //
-    //                    SysButtonConfigEntity cz = new SysButtonConfigEntity();
-    //                    cz.setCode("resize");
-    //                    cz.setNameCh("重置");
-    //                    cz.setNameEn("resize");
-    //                    cz.setMenuId(module.getId());
-    //                    cz.setIconName("");
-    //                    cz.setStyles("");
-    //                    cz.setBtnFunction("resize");
-    //                    cz.setRemark("主数据重置按钮");
-    //                    cz.setCreate();
-    //                    sysButtonConfigDao.save(cz);
-    //                }
-    //                if("search".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
-    //
-    //                    SysButtonConfigEntity cx = new SysButtonConfigEntity();
-    //                    cx.setCode("search");
-    //                    cx.setNameCh("查询");
-    //                    cx.setNameEn("search");
-    //                    cx.setMenuId(module.getId());
-    //                    cx.setIconName("");
-    //                    cx.setStyles("");
-    //                    cx.setBtnFunction("search");
-    //                    cx.setRemark("主数据查询按钮");
-    //                    cx.setCreate();
-    //                    sysButtonConfigDao.save(cx);
-    //                }
-    //                if("edit".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
-    //
-    //                    SysButtonConfigEntity xg = new SysButtonConfigEntity();
-    //                    xg.setCode("edit");
-    //                    xg.setNameCh("修改");
-    //                    xg.setNameEn("edit");
-    //                    xg.setMenuId(module.getId());
-    //                    xg.setIconName("");
-    //                    xg.setStyles("");
-    //                    xg.setBtnFunction("edit");
-    //                    xg.setRemark("主数据修改按钮");
-    //                    xg.setCreate();
-    //                    sysButtonConfigDao.save(xg);
-    //                }
-    //                if("dele".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
-    //
-    //                    SysButtonConfigEntity sc = new SysButtonConfigEntity();
-    //                    sc.setCode("dele");
-    //                    sc.setNameCh("删除");
-    //                    sc.setNameEn("dele");
-    //                    sc.setMenuId(module.getId());
-    //                    sc.setIconName("");
-    //                    sc.setStyles("");
-    //                    sc.setBtnFunction("dele");
-    //                    sc.setRemark("主数据删除按钮");
-    //                    sc.setCreate();
-    //                    sysButtonConfigDao.save(sc);
-    //                }
-    //                if("view".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
-    //
-    //                    SysButtonConfigEntity ck = new SysButtonConfigEntity();
-    //                    ck.setCode("view");
-    //                    ck.setNameCh("查看");
-    //                    ck.setNameEn("view");
-    //                    ck.setMenuId(module.getId());
-    //                    ck.setIconName("");
-    //                    ck.setStyles("");
-    //                    ck.setBtnFunction("view");
-    //                    ck.setRemark("主数据查看按钮");
-    //                    ck.setCreate();
-    //                    sysButtonConfigDao.save(ck);
-    //                }
-    //                if("send".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
-    //                    SysButtonConfigEntity xf = new SysButtonConfigEntity();
-    //                    xf.setCode("send");
-    //                    xf.setNameCh("下发");
-    //                    xf.setNameEn("send");
-    //                    xf.setMenuId(module.getId());
-    //                    xf.setIconName("");
-    //                    xf.setStyles("");
-    //                    xf.setBtnFunction("send");
-    //                    xf.setRemark("主数据下发按钮");
-    //                    xf.setCreate();
-    //                    sysButtonConfigDao.save(xf);
-    //                }
-    //            }
-    //        }
-    //    }else {
-    //        //修改
-    //        //修改菜单 注意因为可能修改显示类型，所以需要修改菜单的属性
-    //        SysMenuConfigEntity module = new SysMenuConfigEntity();
-    //        module.setFormId(mdmModuleEntity.getId());
-    //        module.setSts("Y");
-    //        List<SysMenuConfigEntity> moduleList = sysMenuConfigDao.queryBase(module);
-    //        if (moduleList != null && moduleList.size() == 1) {
-    //            module = moduleList.get(0);
-    //            module.setUpdate();
-    //            module.setMenuName(mdmModuleEntity.getMdmName());
-    //            JSONObject object1 = new JSONObject();
-    //            object1.put("mdmId", mdmModuleEntity.getId());//主数据id
-    //            object1.put("mdmCode", mdmModuleEntity.getMdmCode());//主数据id
-    //            object1.put("viewType", mdmModuleViewEntity.getViewName());//1、树 2、列表
-    //            module.setOptions(object1.toString());//菜单mate参数
-    //            sysMenuConfigDao.update(module);
-    //            //修改按钮
-    //            //1、查询所有按钮
-    //            SysButtonConfigEntity buttonConfigEntity = new SysButtonConfigEntity();
-    //            buttonConfigEntity.setMenuId(module.getId());
-    //            buttonConfigEntity.setSts("Y");
-    //            List<SysButtonConfigEntity> sysButtonConfigEntities = sysButtonConfigDao.queryBase(buttonConfigEntity);
-    //            //1、查询按钮权限
-    //            SysPopedomOperateEntity sysPopedomOperateEntity = new SysPopedomOperateEntity();
-    //            sysPopedomOperateEntity.setMenuId(module.getId());
-    //            sysPopedomOperateEntity.setSts("Y");
-    //            List<SysPopedomOperateEntity> sysPopedomOperateEntities = sysPopedomOperateDao.queryBase(sysPopedomOperateEntity);
-    //            //删除按钮和删除按钮权限
-    //            sysButtonConfigDao.logicRemoveMultiCondition(buttonConfigEntity);
-    //            sysPopedomOperateDao.logicRemoveMultiCondition(sysPopedomOperateEntity);
-    //            //删除处理权限
-    //            doMdmModuleButton(module,mdmModuleViewButtonEntities,sysButtonConfigEntities,sysPopedomOperateEntities);
-    //        }
-    //    }
-    //    return BaseResult.getSuccessMessageEntity("保存显示信息成功");
-    //}
-    //
-    ///**
-    // * @Author lvleigang
-    // * @Description
-    // * @Date 3:29 下午 2024/6/4
-    // * @param module 菜单
-    // * @param mdmModuleViewButtonEntities 主数据按钮
-    // * @param sysButtonConfigEntities 菜单按钮
-    // * @param sysPopedomOperateEntities 按钮权限
-    // * @return void
-    // **/
-    //private void doMdmModuleButton(SysMenuConfigEntity module,List<MdmModuleViewButtonEntity> mdmModuleViewButtonEntities, List<SysButtonConfigEntity> sysButtonConfigEntities, List<SysPopedomOperateEntity> sysPopedomOperateEntities) {
-    //    //循环设置的按钮，再循环菜单的按钮，如果有把原先的修改状态，如果没有新增
-    //    if(mdmModuleViewButtonEntities != null && mdmModuleViewButtonEntities.size() > 0){
-    //        for (int i = 0; i < mdmModuleViewButtonEntities.size(); i++) {
-    //            boolean flag = false;
-    //            if(sysButtonConfigEntities != null && sysButtonConfigEntities.size() > 0){
-    //                for (int i1 = 0; i1 < sysButtonConfigEntities.size(); i1++) {
-    //                    if(mdmModuleViewButtonEntities.get(i).getButtonValue().equals(sysButtonConfigEntities.get(i1).getCode())){
-    //                        flag = true;
-    //                        sysButtonConfigEntities.get(i1).setSts("Y");
-    //                        sysButtonConfigEntities.get(i1).setUpdate();
-    //                        sysButtonConfigDao.update(sysButtonConfigEntities.get(i1));
-    //                        if(sysPopedomOperateEntities != null && sysPopedomOperateEntities.size() > 0){
-    //                            for (int i2 = 0; i2 < sysPopedomOperateEntities.size(); i2++) {
-    //                                if(sysPopedomOperateEntities.get(i2).getOperate().equals(sysButtonConfigEntities.get(i1).getId())){
-    //                                    sysPopedomOperateEntities.get(i2).setSts("Y");
-    //                                    sysPopedomOperateEntities.get(i2).setUpdate();
-    //                                    sysPopedomOperateDao.update(sysPopedomOperateEntities.get(i2));
-    //                                }
-    //                            }
-    //                        }
-    //                        break;
-    //                    }
-    //                }
-    //            }
-    //            //原先没有需要新增
-    //            if(!flag){
-    //                if("new".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())){
-    //                    SysButtonConfigEntity xz = new SysButtonConfigEntity();
-    //                    xz.setCode("new");
-    //                    xz.setNameCh("新建");
-    //                    xz.setNameEn("new");
-    //                    xz.setMenuId(module.getId());
-    //                    xz.setIconName("");
-    //                    xz.setStyles("");
-    //                    xz.setBtnFunction("new");
-    //                    xz.setRemark("主数据新建按钮");
-    //                    xz.setCreate();
-    //                    sysButtonConfigDao.save(xz);
-    //                }
-    //                if("resize".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())){
-    //
-    //                    SysButtonConfigEntity cz = new SysButtonConfigEntity();
-    //                    cz.setCode("resize");
-    //                    cz.setNameCh("重置");
-    //                    cz.setNameEn("resize");
-    //                    cz.setMenuId(module.getId());
-    //                    cz.setIconName("");
-    //                    cz.setStyles("");
-    //                    cz.setBtnFunction("resize");
-    //                    cz.setRemark("主数据重置按钮");
-    //                    cz.setCreate();
-    //                    sysButtonConfigDao.save(cz);
-    //                }
-    //                if("search".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
-    //
-    //                    SysButtonConfigEntity cx = new SysButtonConfigEntity();
-    //                    cx.setCode("search");
-    //                    cx.setNameCh("查询");
-    //                    cx.setNameEn("search");
-    //                    cx.setMenuId(module.getId());
-    //                    cx.setIconName("");
-    //                    cx.setStyles("");
-    //                    cx.setBtnFunction("search");
-    //                    cx.setRemark("主数据查询按钮");
-    //                    cx.setCreate();
-    //                    sysButtonConfigDao.save(cx);
-    //                }
-    //                if("edit".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
-    //
-    //                    SysButtonConfigEntity xg = new SysButtonConfigEntity();
-    //                    xg.setCode("edit");
-    //                    xg.setNameCh("修改");
-    //                    xg.setNameEn("edit");
-    //                    xg.setMenuId(module.getId());
-    //                    xg.setIconName("");
-    //                    xg.setStyles("");
-    //                    xg.setBtnFunction("edit");
-    //                    xg.setRemark("主数据修改按钮");
-    //                    xg.setCreate();
-    //                    sysButtonConfigDao.save(xg);
-    //                }
-    //                if("dele".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
-    //
-    //                    SysButtonConfigEntity sc = new SysButtonConfigEntity();
-    //                    sc.setCode("dele");
-    //                    sc.setNameCh("删除");
-    //                    sc.setNameEn("dele");
-    //                    sc.setMenuId(module.getId());
-    //                    sc.setIconName("");
-    //                    sc.setStyles("");
-    //                    sc.setBtnFunction("dele");
-    //                    sc.setRemark("主数据删除按钮");
-    //                    sc.setCreate();
-    //                    sysButtonConfigDao.save(sc);
-    //                }
-    //                if("view".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
-    //
-    //                    SysButtonConfigEntity ck = new SysButtonConfigEntity();
-    //                    ck.setCode("view");
-    //                    ck.setNameCh("查看");
-    //                    ck.setNameEn("view");
-    //                    ck.setMenuId(module.getId());
-    //                    ck.setIconName("");
-    //                    ck.setStyles("");
-    //                    ck.setBtnFunction("view");
-    //                    ck.setRemark("主数据查看按钮");
-    //                    ck.setCreate();
-    //                    sysButtonConfigDao.save(ck);
-    //                }
-    //                if("send".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
-    //                    SysButtonConfigEntity xf = new SysButtonConfigEntity();
-    //                    xf.setCode("send");
-    //                    xf.setNameCh("下发");
-    //                    xf.setNameEn("send");
-    //                    xf.setMenuId(module.getId());
-    //                    xf.setIconName("");
-    //                    xf.setStyles("");
-    //                    xf.setBtnFunction("send");
-    //                    xf.setRemark("主数据下发按钮");
-    //                    xf.setCreate();
-    //                    sysButtonConfigDao.save(xf);
-    //                }
-    //
-    //
-    //            }
-    //        }
-    //    }
-    //}
-    //
-    ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据设置查询分发设置
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //@Override
-    //public JsonResultEntity queryMdmModuleDistribute(JSONObject object) {
-    //    MdmDto entity = getData("jsonStr", object, MdmDto.class);
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    //    }
-    //    if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
-    //    if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    //查询模块下的应用列表
-    //    MdmModuleDistributeEntity mdmModuleDistributeEntity = new MdmModuleDistributeEntity();
-    //    mdmModuleDistributeEntity.setSts("Y");
-    //    mdmModuleDistributeEntity.setMdmId(mdmModuleEntity.getId());
-    //    List<MdmModuleDistributeEntity> mdmModuleDistributeEntities = mdmServiceCache.queryMdmModuleDistribute(mdmModuleEntity.getId(),mdmModuleDistributeEntity);
-    //    return BaseResult.getSuccessMessageEntity("查询成功", mdmModuleDistributeEntities);
-    //}
-    ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据设置保存分发设置
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //@Override
-    //public JsonResultEntity doSaveMdmModuleDistribute(JSONObject object) {
-    //    MdmDistributeDto entity = getData("jsonStr", object, MdmDistributeDto.class);
-    //    //判断是否有数据
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    //    }
-    //    if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
-    //    if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    mdmServiceCache.saveMdmModuleDistribute(mdmModuleEntity.getId(),entity.getMdmModuleDistributeEntities());
-    //    return BaseResult.getSuccessMessageEntity("保存发布设置成功");
-    //}
-    //
-    ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据设置查询数据来源
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //@Override
-    //public JsonResultEntity queryMdmModuleSource(JSONObject object) {
-    //    MdmDto entity = getData("jsonStr", object, MdmDto.class);
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    //    }
-    //    if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
-    //    if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    //查询模块下的应用列表
-    //    MdmModuleSourceEntity mdmModuleSourceEntity = new MdmModuleSourceEntity();
-    //    mdmModuleSourceEntity.setSts("Y");
-    //    mdmModuleSourceEntity.setMdmId(mdmModuleEntity.getId());
-    //    List<MdmModuleSourceEntity> mdmModuleSourceEntities = mdmServiceCache.queryMdmModuleSource(mdmModuleSourceEntity);
-    //    return BaseResult.getSuccessMessageEntity("查询成功", mdmModuleSourceEntities);
-    //}
-    ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据设置保存数据来源
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //@Override
-    //public JsonResultEntity doSaveMdmModuleSource(JSONObject object) {
-    //    MdmSourceDto entity = getData("jsonStr", object, MdmSourceDto.class);
-    //    //判断是否有数据
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    //    }
-    //    if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
-    //    if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    mdmServiceCache.saveMdmModuleSource(mdmModuleEntity.getId(),entity.getMdmModuleSourceEntities());
-    //    return BaseResult.getSuccessMessageEntity("保存发布设置成功");
-    //}
-    //
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 查询下发日志
-    // * @Date 11:52 上午 2024/3/27
-    // **/
-    //@Override
-    //public JsonResultEntity querySendEntityPage(JSONObject jsonObject) {
-    //    MdmModuleSendLogEntity entity = getData("jsonStr", jsonObject, MdmModuleSendLogEntity.class);
-    //    //判断分页
-    //    if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) {
-    //        return BaseResult.getFailureMessageEntity("分页查询参数不存在");
-    //    }
-    //    if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
-    //    if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
-    //    mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
-    //    mdmModuleDbEntity.setSts("Y");
-    //    List<MdmModuleDbEntity> mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
-    //    if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0 ){
-    //        for (int i = 0; i < mdmModuleDbEntities.size(); i++) {
-    //            if("1".equals(mdmModuleDbEntities.get(i).getDbType())){
-    //                entity.setTableName(mdmModuleDbEntities.get(i).getDbName()+"_send_log");
-    //                break;
-    //            }
-    //        }
-    //    }else {
-    //        return BaseResult.getFailureMessageEntity("请先设置数据源");
-    //    }
-    //    PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
-    //    List<MdmModuleSendLogEntity> list = mdmModuleSendLogDao.queryByLike(entity);
-    //    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 getSendEntity(JSONObject jsonObject) {
-    //    MdmModuleSendLogEntity entity = getData("jsonStr", jsonObject, MdmModuleSendLogEntity.class);
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    //    }
-    //    if (entity.getId() == null || "".equals(entity.getId())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
-    //    if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
-    //    mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
-    //    mdmModuleDbEntity.setSts("Y");
-    //    List<MdmModuleDbEntity> mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
-    //    if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0 ){
-    //        for (int i = 0; i < mdmModuleDbEntities.size(); i++) {
-    //            if("1".equals(mdmModuleDbEntities.get(i).getDbType())){
-    //                entity.setTableName(mdmModuleDbEntities.get(i).getDbName()+"_send_log");
-    //                break;
-    //            }
-    //        }
-    //    }else {
-    //        return BaseResult.getFailureMessageEntity("请先设置数据源");
-    //    }
-    //    entity = mdmModuleSendLogDao.get(entity.getId());
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("获取日志失败");
-    //    }
-    //    return BaseResult.getSuccessMessageEntity("获取日志成功", entity);
-    //}
-    //
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 删除下发日志
-    // * @Date 2:37 下午 2024/3/27
-    // **/
-    //@Override
-    //public JsonResultEntity deleteSendEntity(JSONObject jsonObject) {
-    //    MdmModuleSendLogEntity entity = getData("jsonStr", jsonObject, MdmModuleSendLogEntity.class);
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    //    }
-    //    if (entity.getId() == null || "".equals(entity.getId())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
-    //    if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
-    //    mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
-    //    mdmModuleDbEntity.setSts("Y");
-    //    List<MdmModuleDbEntity> mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
-    //    if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0 ){
-    //        for (int i = 0; i < mdmModuleDbEntities.size(); i++) {
-    //            if("1".equals(mdmModuleDbEntities.get(i).getDbType())){
-    //                entity.setTableName(mdmModuleDbEntities.get(i).getDbName()+"_send_log");
-    //                break;
-    //            }
-    //        }
-    //    }else {
-    //        return BaseResult.getFailureMessageEntity("请先设置数据源");
-    //    }
-    //    entity.setUpdate();
-    //    mdmModuleSendLogDao.logicRemove(entity);
-    //    return BaseResult.getSuccessMessageEntity("删除日志成功");
-    //}
-    //
-    //
-    //
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 查询操作日志
-    // * @Date 11:52 上午 2024/3/27
-    // **/
-    //@Override
-    //public JsonResultEntity queryOptionEntityPage(JSONObject jsonObject) {
-    //    MdmModuleOptionLogEntity entity = getData("jsonStr", jsonObject, MdmModuleOptionLogEntity.class);
-    //    //判断分页
-    //    if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) {
-    //        return BaseResult.getFailureMessageEntity("分页查询参数不存在");
-    //    }
-    //    if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
-    //    if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
-    //    mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
-    //    mdmModuleDbEntity.setSts("Y");
-    //    List<MdmModuleDbEntity> mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
-    //    if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0 ){
-    //        for (int i = 0; i < mdmModuleDbEntities.size(); i++) {
-    //            if("1".equals(mdmModuleDbEntities.get(i).getDbType())){
-    //                entity.setTableName(mdmModuleDbEntities.get(i).getDbName()+"_option_log");
-    //                break;
-    //            }
-    //        }
-    //    }else {
-    //        return BaseResult.getFailureMessageEntity("请先设置数据源");
-    //    }
-    //    PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
-    //    List<MdmModuleOptionLogEntity> list = mdmModuleOptionLogDao.queryByLike(entity);
-    //    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 getOptionEntity(JSONObject jsonObject) {
-    //    MdmModuleOptionLogEntity entity = getData("jsonStr", jsonObject, MdmModuleOptionLogEntity.class);
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    //    }
-    //    if (entity.getId() == null || "".equals(entity.getId())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
-    //    if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
-    //    mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
-    //    mdmModuleDbEntity.setSts("Y");
-    //    List<MdmModuleDbEntity> mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
-    //    if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0 ){
-    //        for (int i = 0; i < mdmModuleDbEntities.size(); i++) {
-    //            if("1".equals(mdmModuleDbEntities.get(i).getDbType())){
-    //                entity.setTableName(mdmModuleDbEntities.get(i).getDbName()+"_option_log");
-    //                break;
-    //            }
-    //        }
-    //    }else {
-    //        return BaseResult.getFailureMessageEntity("请先设置数据源");
-    //    }
-    //    entity = mdmModuleOptionLogDao.get(entity.getId());
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("获取日志失败");
-    //    }
-    //    return BaseResult.getSuccessMessageEntity("获取日志成功", entity);
-    //}
-    //
-    ///**
-    // * @param jsonObject
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 删除操作日志
-    // * @Date 2:37 下午 2024/3/27
-    // **/
-    //@Override
-    //public JsonResultEntity deleteOptionEntity(JSONObject jsonObject) {
-    //    MdmModuleOptionLogEntity entity = getData("jsonStr", jsonObject, MdmModuleOptionLogEntity.class);
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    //    }
-    //    if (entity.getId() == null || "".equals(entity.getId())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
-    //    if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
-    //    mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
-    //    mdmModuleDbEntity.setSts("Y");
-    //    List<MdmModuleDbEntity> mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
-    //    if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0 ){
-    //        for (int i = 0; i < mdmModuleDbEntities.size(); i++) {
-    //            if("1".equals(mdmModuleDbEntities.get(i).getDbType())){
-    //                entity.setTableName(mdmModuleDbEntities.get(i).getDbName()+"_option_log");
-    //                break;
-    //            }
-    //        }
-    //    }else {
-    //        return BaseResult.getFailureMessageEntity("请先设置数据源");
-    //    }
-    //    entity.setUpdate();
-    //    mdmModuleOptionLogDao.logicRemove(entity);
-    //    return BaseResult.getSuccessMessageEntity("删除日志成功");
-    //}
-    ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据设置查询数据源的服务
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //@Override
-    //public JsonResultEntity queryMdmModuleServer(JSONObject object) {
-    //    MdmModuleDbEntity entity = getData("jsonStr", object, MdmModuleDbEntity.class);
-    //    //判断分页
-    //    if (entity == null) {
-    //        entity = new MdmModuleDbEntity();
-    //    }
-    //    //查询数据源表
-    //    entity.setSts("Y");
-    //    List<MdmModuleDbEntity> allDb = mdmModuleDbDao.queryByLike(entity);
-    //    List<MdmModuleDbEntity> mdmModuleDbEntityList = new ArrayList<>();
-    //    if(allDb != null && allDb.size() > 0){
-    //        for (int i = 0; i < allDb.size(); i++) {
-    //            if("1".equals(allDb.get(i).getDbType()) || "2".equals(allDb.get(i).getDbType() )){
-    //                mdmModuleDbEntityList.add(allDb.get(i));
-    //            }
-    //        }
-    //    }
-    //    return BaseResult.getSuccessMessageEntity("查询数据成功", mdmModuleDbEntityList);
-    //}
-    //
-    ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据设置查询数据源的服务的字段
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //@Override
-    //public JsonResultEntity queryMdmModuleServerFiled(JSONObject object) {
-    //    MdmModuleDbEntity entity = getData("jsonStr", object, MdmModuleDbEntity.class);
-    //    //判断分页
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    //    }
-    //    if (entity.getDbName() == null || "".equals(entity.getDbName())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    //查询数据源表
-    //    entity.setSts("Y");
-    //    List<MdmModuleDbEntity> dblist = mdmModuleDbDao.queryBase(entity);
-    //    if (dblist != null && dblist.size() == 1) {
-    //        MdmModuleDbFiledsEntity queryDbFiled = new MdmModuleDbFiledsEntity();
-    //        queryDbFiled.setSts("Y");
-    //        queryDbFiled.setDbId(dblist.get(0).getId());
-    //        queryDbFiled.setViewType("1");
-    //        List<MdmModuleDbFiledsEntity> list = mdmModuleDbFiledsDao.queryBase(queryDbFiled);
-    //        MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity();
-    //        mdmModuleDbFiledsEntity.setChName("id");
-    //        mdmModuleDbFiledsEntity.setEnName("id");
-    //        list.add(0, mdmModuleDbFiledsEntity);
-    //        return BaseResult.getSuccessMessageEntity("查询数据成功", list);
-    //    } else {
-    //        return BaseResult.getFailureMessageEntity("服务不存在");
-    //    }
-    //}
-    ////
-    ////
-    ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据设置查询主表字段
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //@Override
-    //public JsonResultEntity queryMdmModuleServerMainFiled(JSONObject object) {
-    //    MdmModuleDbEntity entity = getData("jsonStr", object, MdmModuleDbEntity.class);
-    //    //判断分页
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    //    }
-    //    if (entity.getMdmId() == null || "".equals(entity.getMdmId())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    //查询数据源表
-    //    entity.setSts("Y");
-    //    entity.setDbType("1");
-    //    List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmModuleDbDao.queryBase(entity);
-    //    if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() == 1) {
-    //        MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity();
-    //        mdmModuleDbFiledsEntity.setSts("Y");
-    //        mdmModuleDbFiledsEntity.setViewType("1");
-    //        mdmModuleDbFiledsEntity.setDbId(mdmModuleDbEntityList.get(0).getId());
-    //        List<MdmModuleDbFiledsEntity> list = mdmModuleDbFiledsDao.queryBase(mdmModuleDbFiledsEntity);
-    //        return BaseResult.getSuccessMessageEntity("查询数据成功", list);
-    //    } else if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() == 0) {
-    //        return BaseResult.getFailureMessageEntity("请先配置数据源");
-    //    } else {
-    //        return BaseResult.getFailureMessageEntity("查询数据失败");
-    //    }
-    //}
-    //
-    //
-    //
-    ////
-    /////**
-    //// * @param entity
-    //// * @param mainMdmModuleDb
-    //// * @param mainMdmModuleDbFileds
-    //// * @return void
-    //// * @Author lvleigang
-    //// * @Description 设置保存主表和字段以及字段的属性
-    //// * @Date 10:34 上午 2023/10/19
-    //// **/
-    ////private void setMainTable(MdmDto entity, MdmModuleDbEntity mainMdmModuleDb, List<MdmModuleDbFiledsEntity> mainMdmModuleDbFileds) {
-    ////    //先保存或修改主表数据
-    ////    mainMdmModuleDb.setMdmId(entity.getId());
-    ////    mainMdmModuleDb.setDbType("1");
-    ////    boolean flag = false;
-    ////
-    ////    if (mainMdmModuleDb.getId() != null && !"".equals(mainMdmModuleDb.getId())) {
-    ////        mainMdmModuleDb.setSts("Y");
-    ////        mainMdmModuleDb.setModify_user_id(StpUtil.getLoginIdAsString());
-    ////        mainMdmModuleDb.setModify_time(new Date());
-    ////        mdmModuleDbDao.update(mainMdmModuleDb);
-    ////        //删除规则表
-    ////        MdmModuleDbFiledsRuleEntity delectFiledsRule = new MdmModuleDbFiledsRuleEntity();
-    ////        delectFiledsRule.setMdmId(entity.getId());
-    ////        delectFiledsRule.setModify_user_id(StpUtil.getLoginIdAsString());
-    ////        delectFiledsRule.setModify_time(new Date());
-    ////        mdmModuleDbFiledsRuleDao.logicRemoveMultiCondition(delectFiledsRule);
-    ////    } else {
-    ////        flag = true;
-    ////        mainMdmModuleDb.setId(UUIDUtils.getUUID());
-    ////        mainMdmModuleDb.setSts("Y");
-    ////        mainMdmModuleDb.setCreate_user_id(StpUtil.getLoginIdAsString());
-    ////        mainMdmModuleDb.setModify_user_id(StpUtil.getLoginIdAsString());
-    ////        mainMdmModuleDb.setCreate_time(new Date());
-    ////        mainMdmModuleDb.setModify_time(new Date());
-    ////        mdmModuleDbDao.save(mainMdmModuleDb);
-    ////    }
-    ////    List<DbFiledsDto> dbFiledsDtos = new ArrayList<>();
-    ////
-    ////    //保存主表字段 因为字段不允许删除，所以不用先删除再新增
-    ////    if (mainMdmModuleDbFileds != null && mainMdmModuleDbFileds.size() > 0) {
-    ////        for (int i = 0; i < mainMdmModuleDbFileds.size(); i++) {
-    ////            MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = mainMdmModuleDbFileds.get(i);
-    ////            mdmModuleDbFiledsEntity.setMdmId(entity.getId());
-    ////            mdmModuleDbFiledsEntity.setDbId(mainMdmModuleDb.getId());
-    ////            if (mdmModuleDbFiledsEntity.getId() != null && !"".equals(mdmModuleDbFiledsEntity.getId())) {
-    ////                DbFiledsDto dbFiledsDto = new DbFiledsDto("1", mdmModuleDbFiledsEntity.getChName(), mdmModuleDbFiledsEntity.getEnName(), mdmModuleDbFiledsEntity.getFiledType(), mdmModuleDbFiledsEntity.getFiledLength());
-    ////                dbFiledsDtos.add(dbFiledsDto);
-    ////
-    ////                mdmModuleDbFiledsEntity.setSts("Y");
-    ////                mdmModuleDbFiledsEntity.setModify_user_id(StpUtil.getLoginIdAsString());
-    ////                mdmModuleDbFiledsEntity.setModify_time(new Date());
-    ////                mdmModuleDbFiledsDao.update(mdmModuleDbFiledsEntity);
-    ////            } else {
-    ////                DbFiledsDto dbFiledsDto = new DbFiledsDto("2", mdmModuleDbFiledsEntity.getChName(), mdmModuleDbFiledsEntity.getEnName(), mdmModuleDbFiledsEntity.getFiledType(), mdmModuleDbFiledsEntity.getFiledLength());
-    ////                dbFiledsDtos.add(dbFiledsDto);
-    ////                mdmModuleDbFiledsEntity.setId(UUIDUtils.getUUID());
-    ////                mdmModuleDbFiledsEntity.setSts("Y");
-    ////                mdmModuleDbFiledsEntity.setCreate_user_id(StpUtil.getLoginIdAsString());
-    ////                mdmModuleDbFiledsEntity.setModify_user_id(StpUtil.getLoginIdAsString());
-    ////                mdmModuleDbFiledsEntity.setCreate_time(new Date());
-    ////                mdmModuleDbFiledsEntity.setModify_time(new Date());
-    ////                mdmModuleDbFiledsDao.save(mdmModuleDbFiledsEntity);
-    ////            }
-    ////            //修改或保存属性
-    ////            List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRules = mdmModuleDbFiledsEntity.getMdmModuleDbFiledsRules();
-    ////            if (mdmModuleDbFiledsRules != null && mdmModuleDbFiledsRules.size() > 0) {
-    ////                for (int a = 0; a < mdmModuleDbFiledsRules.size(); a++) {
-    ////                    MdmModuleDbFiledsRuleEntity mdmModuleDbFiledsRuleEntity = mdmModuleDbFiledsRules.get(a);
-    ////                    mdmModuleDbFiledsRuleEntity.setMdmId(entity.getId());
-    ////                    mdmModuleDbFiledsRuleEntity.setDbId(mainMdmModuleDb.getId());
-    ////                    mdmModuleDbFiledsRuleEntity.setFiledId(mdmModuleDbFiledsEntity.getId());
-    ////                    if (mdmModuleDbFiledsRuleEntity.getId() != null && !"".equals(mdmModuleDbFiledsRuleEntity.getId())) {
-    ////                        mdmModuleDbFiledsRuleEntity.setSts("Y");
-    ////                        mdmModuleDbFiledsRuleEntity.setModify_user_id(StpUtil.getLoginIdAsString());
-    ////                        mdmModuleDbFiledsRuleEntity.setModify_time(new Date());
-    ////                        mdmModuleDbFiledsRuleDao.update(mdmModuleDbFiledsRuleEntity);
-    ////                    } else {
-    ////                        mdmModuleDbFiledsRuleEntity.setId(UUIDUtils.getUUID());
-    ////                        mdmModuleDbFiledsRuleEntity.setSts("Y");
-    ////                        mdmModuleDbFiledsRuleEntity.setCreate_user_id(StpUtil.getLoginIdAsString());
-    ////                        mdmModuleDbFiledsRuleEntity.setModify_user_id(StpUtil.getLoginIdAsString());
-    ////                        mdmModuleDbFiledsRuleEntity.setCreate_time(new Date());
-    ////                        mdmModuleDbFiledsRuleEntity.setModify_time(new Date());
-    ////                        mdmModuleDbFiledsRuleDao.save(mdmModuleDbFiledsRuleEntity);
-    ////                    }
-    ////                }
-    ////            }
-    ////        }
-    ////    }
-    ////    if (flag) {
-    ////        //新增
-    ////        Map<String, Object> maps = new HashMap<>();
-    ////        maps.put("dbType", "1");//表类型
-    ////        maps.put("tableName", mainMdmModuleDb.getDbName());//表名
-    ////        maps.put("tableRemark", mainMdmModuleDb.getRemark());//表备注
-    ////        maps.put("databaseFields", dbFiledsDtos);//字段
-    ////        mdmModuleDao.createTable(maps);
-    ////        Map<String, Object> mapsDistribute = new HashMap<>();
-    ////        mapsDistribute.put("tableName", mainMdmModuleDb.getDbName() + "_distribute");//表名
-    ////        List<DbFiledsDto> distribute = getDistribute();
-    ////        maps.put("databaseFields", distribute);//字段
-    ////        mapsDistribute.put("tableRemark", mainMdmModuleDb.getRemark() + "分发表");//表备注
-    ////        mdmModuleDao.createTableDistribute(mapsDistribute);
-    ////    } else {
-    ////        //修改
-    ////        Map<String, String> tablename = new HashMap<>();
-    ////        tablename.put("tableName", mainMdmModuleDb.getDbName());//表名
-    ////        tablename.put("tableRemark", mainMdmModuleDb.getRemark());//表备注
-    ////        mdmModuleDao.alterTableName(tablename);
-    ////        Map<String, Object> maps = new HashMap<>();
-    ////        maps.put("tableName", mainMdmModuleDb.getDbName());//表名
-    ////        maps.put("tableRemark", mainMdmModuleDb.getRemark());//表备注
-    ////        maps.put("databaseFields", dbFiledsDtos);//字段
-    ////        mdmModuleDao.alterTable(maps);
-    ////    }
-    ////}
-    ////
-    /////**
-    //// * @param
-    //// * @return java.util.List<com.hzya.frame.mdm.entity.DbFiledsDto>
-    //// * @Author lvleigang
-    //// * @Description 设置分发表字段
-    //// * @Date 8:49 上午 2023/11/9
-    //// **/
-    ////private List<DbFiledsDto> getDistribute() {
-    ////    List<DbFiledsDto> dbFiledsDtos = new ArrayList<>();
-    ////    dbFiledsDtos.add(new DbFiledsDto("1", "数据id", "formmain_id", "3", "50"));
-    ////    dbFiledsDtos.add(new DbFiledsDto("1", "应用id", "app_id", "3", "50"));
-    ////    dbFiledsDtos.add(new DbFiledsDto("1", "状态1、发送成功 2、发送中 3、发送失败", "status", "3", "50"));
-    ////    dbFiledsDtos.add(new DbFiledsDto("1", "描述", "msg", "3", "50"));
-    ////    return dbFiledsDtos;
-    ////}
-    ////
-    ///**
-    // * @param tableName
-    // * @return java.lang.Long
-    // * @Author lvleigang
-    // * @Description 校验表是否存在
-    // * @Date 3:58 下午 2023/7/11
-    // **/
-    //private boolean checkTable(String tableName) {
-    //    Map<String, String> maps = new HashMap<>();
-    //    maps.put("tableName", tableName);
-    //    Integer i = mdmModuleDao.checkTable(maps);
-    //    if (i != null && i > 0) {
-    //        return true;
-    //    }
-    //    return false;
-    //}
-    ////
-    /////**
-    //// * @param object
-    //// * @return com.hzya.frame.web.entity.JsonResultEntity
-    //// * @Author lvleigang
-    //// * @Description 主数据设置查询显示信息
-    //// * @Date 9:40 上午 2023/10/18
-    //// **/
-    ////@Override
-    ////public JsonResultEntity queryMdmModuleView(JSONObject object) {
-    ////    MdmDto entity = getData("jsonStr", object, MdmDto.class);
-    ////    if (entity == null) {
-    ////        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    ////    }
-    ////    if (entity.getId() == null || "".equals(entity.getId())) {
-    ////        return BaseResult.getFailureMessageEntity("系统错误");
-    ////    }
-    ////    MdmModuleViewVo mdmModuleViewVo = new MdmModuleViewVo();
-    ////    //查询设置各种类型字段
-    ////    //查询模版数据源
-    ////    MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
-    ////    mdmModuleDbEntity.setMdmId(entity.getId());
-    ////    mdmModuleDbEntity.setSts("Y");
-    ////    List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmModuleDbDao.queryBase(mdmModuleDbEntity);
-    ////    if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() > 0) {
-    ////        MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity();
-    ////        mdmModuleDbFiledsEntity.setMdmId(entity.getId());
-    ////        mdmModuleDbFiledsEntity.setSts("Y");
-    ////        List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList = mdmModuleDbFiledsDao.queryBase(mdmModuleDbFiledsEntity);
-    ////        setFiledType(mdmModuleViewVo, mdmModuleDbEntityList, mdmModuleDbFiledsEntityList);
-    ////    }
-    ////    //查询数据库设置的字段
-    ////    MdmModuleViewEntity mdmModuleViewEntity = new MdmModuleViewEntity();
-    ////    mdmModuleViewEntity.setMdmId(entity.getId());
-    ////    mdmModuleViewEntity.setSts("Y");
-    ////    List<MdmModuleViewEntity> moduleViewEntityList = mdmModuleViewDao.queryBase(mdmModuleViewEntity);
-    ////    if (moduleViewEntityList != null && moduleViewEntityList.size() == 1) {
-    ////        mdmModuleViewVo.setMdmModuleViewEntity(moduleViewEntityList.get(0));
-    ////        //查询明细
-    ////        MdmModuleViewDetailEntity mdmModuleViewDetailEntity = new MdmModuleViewDetailEntity();
-    ////        mdmModuleViewDetailEntity.setMdmId(entity.getId());
-    ////        mdmModuleViewDetailEntity.setViewId(moduleViewEntityList.get(0).getId());
-    ////        mdmModuleViewDetailEntity.setSts("Y");
-    ////        List<MdmModuleViewDetailEntity> mdmModuleViewDetailEntityList = mdmModuleViewDetailDao.queryBase(mdmModuleViewDetailEntity);
-    ////        setDbFiledType(mdmModuleViewVo, mdmModuleViewDetailEntityList);
-    ////    } else {
-    ////        mdmModuleViewVo.setMdmModuleViewEntity(new MdmModuleViewEntity());
-    ////        mdmModuleViewVo.setDbAddFiled(new ArrayList<>());
-    ////        mdmModuleViewVo.setDbEditFiled(new ArrayList<>());
-    ////        mdmModuleViewVo.setDbShowFiled(new ArrayList<>());
-    ////        mdmModuleViewVo.setDbQueryFiled(new ArrayList<>());
-    ////        mdmModuleViewVo.setDbListFiled(new ArrayList<>());
-    ////    }
-    ////    return BaseResult.getSuccessMessageEntity("查询视图成功", mdmModuleViewVo);
-    ////}
-    ////
-    ////private void setDbFiledType(MdmModuleViewVo mdmModuleViewVo, List<MdmModuleViewDetailEntity> mdmModuleViewDetailEntityList) {
-    ////    //新增
-    ////    List<MdmModuleViewDetailEntity> addFiled = new ArrayList<>();
-    ////    //修改
-    ////    List<MdmModuleViewDetailEntity> editFiled = new ArrayList<>();
-    ////    //查看
-    ////    List<MdmModuleViewDetailEntity> showFiled = new ArrayList<>();
-    ////    //查询
-    ////    List<MdmModuleViewDetailEntity> queryFiled = new ArrayList<>();
-    ////    //列表
-    ////    List<MdmModuleViewDetailEntity> listFiled = new ArrayList<>();
-    ////    if (mdmModuleViewDetailEntityList != null && mdmModuleViewDetailEntityList.size() > 0) {
-    ////        for (int i = 0; i < mdmModuleViewDetailEntityList.size(); i++) {
-    ////            switch (mdmModuleViewDetailEntityList.get(i).getViewType()) {
-    ////                //1、查询2、列表3、新增4、修改 5、查看
-    ////                case "1":
-    ////                    queryFiled.add(mdmModuleViewDetailEntityList.get(i));
-    ////                    break;
-    ////                case "2":
-    ////                    listFiled.add(mdmModuleViewDetailEntityList.get(i));
-    ////                    break;
-    ////                case "3":
-    ////                    addFiled.add(mdmModuleViewDetailEntityList.get(i));
-    ////                    break;
-    ////                case "4":
-    ////                    editFiled.add(mdmModuleViewDetailEntityList.get(i));
-    ////                    break;
-    ////                case "5":
-    ////                    showFiled.add(mdmModuleViewDetailEntityList.get(i));
-    ////                    break;
-    ////                default:
-    ////            }
-    ////        }
-    ////    }
-    ////    mdmModuleViewVo.setDbAddFiled(addFiled);
-    ////    mdmModuleViewVo.setDbEditFiled(editFiled);
-    ////    mdmModuleViewVo.setDbShowFiled(showFiled);
-    ////    mdmModuleViewVo.setDbQueryFiled(queryFiled);
-    ////    mdmModuleViewVo.setDbListFiled(listFiled);
-    ////}
-    ////
-    /////**
-    //// * @param mdmModuleViewVo
-    //// * @param mdmModuleDbEntityList
-    //// * @param mdmModuleDbFiledsEntityList
-    //// * @return void
-    //// * @Author lvleigang
-    //// * @Description 设置对应的字段类型
-    //// * @Date 2023/10/25
-    //// **/
-    ////private void setFiledType(MdmModuleViewVo mdmModuleViewVo, List<MdmModuleDbEntity> mdmModuleDbEntityList, List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList) {
-    ////    //新增
-    ////    List<MdmDbFiledVo> addFiled = new ArrayList<>();
-    ////    //修改
-    ////    List<MdmDbFiledVo> editFiled = new ArrayList<>();
-    ////    //查看
-    ////    List<MdmDbFiledVo> showFiled = new ArrayList<>();
-    ////    //查询
-    ////    List<MdmDbFiledVo> queryFiled = new ArrayList<>();
-    ////    //列表
-    ////    List<MdmDbFiledVo> listFiled = new ArrayList<>();
-    ////    if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() > 0) {
-    ////        for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
-    ////            if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) {
-    ////                for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
-    ////                    if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) {
-    ////                        if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
-    ////                            //1、主表
-    ////                            addFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-    ////                            editFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-    ////                            showFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-    ////                            queryFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-    ////                            listFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-    ////                        } else {
-    ////                            //2、明细
-    ////                            queryFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-    ////                            addFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-    ////                            editFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-    ////                            showFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-    ////                        }
-    ////                    }
-    ////                }
-    ////            }
-    ////        }
-    ////    }
-    ////    mdmModuleViewVo.setAddFiled(addFiled);
-    ////    mdmModuleViewVo.setEditFiled(editFiled);
-    ////    mdmModuleViewVo.setShowFiled(showFiled);
-    ////    mdmModuleViewVo.setQueryFiled(queryFiled);
-    ////    mdmModuleViewVo.setListFiled(listFiled);
-    ////}
-    ////
-    ////
-    //
-    ////
-    ///**
-    // * @param mdmDbFiledVoList
-    // * @param type
-    // * @return void
-    // * @Author lvleigang
-    // * @Description 保存数据
-    // * @Date 1:37 下午 2023/10/25
-    // **/
-    //private void saveDbViewFiled(String mdmID, String viewid, List<MdmDbFiledVo> mdmDbFiledVoList, String type,List<MdmModuleViewDetailEntity> mdmModuleViewDetailEntities) {
-    //    if (mdmDbFiledVoList != null && mdmDbFiledVoList.size() > 0) {
-    //        for (int i = 0; i < mdmDbFiledVoList.size(); i++) {
-    //            MdmModuleViewDetailEntity mdmModuleViewDetailEntity = new MdmModuleViewDetailEntity();
-    //            mdmModuleViewDetailEntity.setCreate();
-    //            mdmModuleViewDetailEntity.setMdmId(mdmID);
-    //            mdmModuleViewDetailEntity.setViewId(viewid);
-    //            mdmModuleViewDetailEntity.setViewFiled(mdmDbFiledVoList.get(i).getId());
-    //            mdmModuleViewDetailEntity.setViewType(type);
-    //            mdmModuleViewDetailEntity.setDataType("1");
-    //            mdmModuleViewDetailEntities.add(mdmModuleViewDetailEntity);
-    //        }
-    //    }
-    //}
-    ////
-    /////**
-    //// * @param object
-    //// * @return com.hzya.frame.web.entity.JsonResultEntity
-    //// * @Author lvleigang
-    //// * @Description 主数据设置查询权限配置
-    //// * @Date 9:40 上午 2023/10/18
-    //// **/
-    ////@Override
-    ////public JsonResultEntity queryMdmModuleRule(JSONObject object) {
-    ////    MdmDto entity = getData("jsonStr", object, MdmDto.class);
-    ////    if (entity == null) {
-    ////        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    ////    }
-    ////    if (entity.getId() == null || "".equals(entity.getId())) {
-    ////        return BaseResult.getFailureMessageEntity("系统错误");
-    ////    }
-    ////    //查询模块下的角色列表
-    ////    MdmModuleRoleEntity mdmModuleRoleEntity = new MdmModuleRoleEntity();
-    ////    mdmModuleRoleEntity.setSts("Y");
-    ////    mdmModuleRoleEntity.setMdmId(entity.getId());
-    ////    List<MdmModuleRoleEntity> mdmModuleRoleEntities = mdmModuleRoleDao.queryBase(mdmModuleRoleEntity);
-    ////    if (mdmModuleRoleEntities != null && mdmModuleRoleEntities.size() > 0) {
-    ////        MdmModuleRoleButtonEntity mdmModuleRoleButtonEntity = new MdmModuleRoleButtonEntity();
-    ////        mdmModuleRoleButtonEntity.setSts("Y");
-    ////        mdmModuleRoleButtonEntity.setMdmId(entity.getId());
-    ////        List<MdmModuleRoleButtonEntity> mdmModuleRoleButtonEntities = mdmModuleRoleButtonDao.queryBase(mdmModuleRoleButtonEntity);
-    ////        if (mdmModuleRoleButtonEntities != null && mdmModuleRoleButtonEntities.size() > 0) {
-    ////            for (int i = 0; i < mdmModuleRoleEntities.size(); i++) {
-    ////                List<MdmModuleRoleButtonEntity> list = new ArrayList<>();
-    ////                for (int i1 = 0; i1 < mdmModuleRoleButtonEntities.size(); i1++) {
-    ////                    if (mdmModuleRoleEntities.get(i).getRoleId().equals(mdmModuleRoleButtonEntities.get(i1).getRoleId())) {
-    ////                        list.add(mdmModuleRoleButtonEntities.get(i1));
-    ////                    }
-    ////                }
-    ////                mdmModuleRoleEntities.get(i).setMdmModuleRoleButtonEntities(list);
-    ////            }
-    ////        }
-    ////    }
-    ////    return BaseResult.getSuccessMessageEntity("查询成功", mdmModuleRoleEntities);
-    ////}
-    ////
-    /////**
-    //// * @param object
-    //// * @return com.hzya.frame.web.entity.JsonResultEntity
-    //// * @Author lvleigang
-    //// * @Description 主数据设置保存权限配置
-    //// * @Date 9:40 上午 2023/10/18
-    //// **/
-    ////@Override
-    ////public JsonResultEntity doSaveMdmModuleRule(JSONObject object) {
-    ////    MdmRoleDto entity = getData("jsonStr", object, MdmRoleDto.class);
-    ////    if (entity == null) {
-    ////        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    ////    }
-    ////    if (entity.getId() == null || "".equals(entity.getId())) {
-    ////        return BaseResult.getFailureMessageEntity("系统错误");
-    ////    }
-    ////    //查询菜单
-    ////    Module module = new Module();
-    ////    module.setFormId(entity.getId());
-    ////    List<Module> moduleList = moduleMapper.entity_list_base(module);
-    ////    if (moduleList != null && moduleList.size() == 1) {
-    ////        module = moduleList.get(0);
-    ////    } else {
-    ////        return BaseResult.getFailureMessageEntity("菜单错误请检查菜单");
-    ////    }
-    ////    //先删除
-    ////    RoleModule roleModule = new RoleModule();
-    ////    roleModule.setSts("Y");
-    ////    roleModule.setUpdate();
-    ////    roleModule.setModuleId(module.getId());
-    ////    roleModuleMapper.entity_logicDelete_Multi_Condition(roleModule);
-    ////    MdmModuleRoleEntity mdmModuleRoleEntity = new MdmModuleRoleEntity();
-    ////    mdmModuleRoleEntity.setMdmId(entity.getId());
-    ////    mdmModuleRoleEntity.setSts("Y");
-    ////    mdmModuleRoleEntity.setModify_user_id(StpUtil.getLoginIdAsString());
-    ////    mdmModuleRoleEntity.setModify_time(new Date());
-    ////    mdmModuleRoleDao.logicRemoveMultiCondition(mdmModuleRoleEntity);
-    ////    MdmModuleRoleButtonEntity mdmModuleRoleButtonEntity = new MdmModuleRoleButtonEntity();
-    ////    mdmModuleRoleButtonEntity.setMdmId(entity.getId());
-    ////    mdmModuleRoleButtonEntity.setSts("Y");
-    ////    mdmModuleRoleButtonEntity.setModify_user_id(StpUtil.getLoginIdAsString());
-    ////    mdmModuleRoleButtonEntity.setModify_time(new Date());
-    ////    mdmModuleRoleButtonDao.logicRemoveMultiCondition(mdmModuleRoleButtonEntity);
-    ////
-    ////    if (entity.getMdmModuleRoleEntities() != null && entity.getMdmModuleRoleEntities().size() > 0) {
-    ////        for (int i = 0; i < entity.getMdmModuleRoleEntities().size(); i++) {
-    ////
-    ////            MdmModuleRoleEntity moduleRoleEntity = entity.getMdmModuleRoleEntities().get(i);
-    ////            moduleRoleEntity.setMdmId(entity.getId());
-    ////            moduleRoleEntity.setSts("Y");
-    ////            moduleRoleEntity.setModify_user_id(StpUtil.getLoginIdAsString());
-    ////            moduleRoleEntity.setModify_time(new Date());
-    ////            if (moduleRoleEntity.getId() != null && !"".equals(moduleRoleEntity.getId())) {
-    ////                //修改
-    ////                mdmModuleRoleDao.update(moduleRoleEntity);
-    ////            } else {
-    ////                //新增
-    ////                moduleRoleEntity.setId(UUIDUtils.getUUID());
-    ////                moduleRoleEntity.setCreate_user_id(StpUtil.getLoginIdAsString());
-    ////                moduleRoleEntity.setCreate_time(new Date());
-    ////                mdmModuleRoleDao.save(moduleRoleEntity);
-    ////            }
-    ////            if (moduleRoleEntity.getMdmModuleRoleButtonEntities() != null && moduleRoleEntity.getMdmModuleRoleButtonEntities().size() > 0) {
-    ////                for (int i1 = 0; i1 < moduleRoleEntity.getMdmModuleRoleButtonEntities().size(); i1++) {
-    ////                    MdmModuleRoleButtonEntity moduleRoleButtonEntity = moduleRoleEntity.getMdmModuleRoleButtonEntities().get(i1);
-    ////                    moduleRoleButtonEntity.setMdmId(entity.getId());
-    ////                    moduleRoleButtonEntity.setSts("Y");
-    ////                    moduleRoleButtonEntity.setModify_user_id(StpUtil.getLoginIdAsString());
-    ////                    moduleRoleButtonEntity.setModify_time(new Date());
-    ////                    moduleRoleButtonEntity.setModuleRoleId(moduleRoleEntity.getRoleId());
-    ////                    moduleRoleButtonEntity.setRoleId(moduleRoleEntity.getRoleId());
-    ////                    if (moduleRoleButtonEntity.getId() != null && !"".equals(moduleRoleButtonEntity.getId())) {
-    ////                        //修改
-    ////                        mdmModuleRoleButtonDao.update(moduleRoleButtonEntity);
-    ////                    } else {
-    ////                        //新增
-    ////                        moduleRoleButtonEntity.setId(UUIDUtils.getUUID());
-    ////                        moduleRoleButtonEntity.setCreate_user_id(StpUtil.getLoginIdAsString());
-    ////                        moduleRoleButtonEntity.setCreate_time(new Date());
-    ////                        mdmModuleRoleButtonDao.save(moduleRoleButtonEntity);
-    ////                    }
-    ////                }
-    ////            }
-    ////            //再添加
-    ////            RoleModule saveRole = new RoleModule();
-    ////            saveRole.setCreate();
-    ////            saveRole.setRoleId(moduleRoleEntity.getRoleId());
-    ////            saveRole.setModuleId(module.getId());
-    ////            roleModuleMapper.entity_insert(saveRole);
-    ////        }
-    ////    }
-    ////    return BaseResult.getSuccessMessageEntity("保存成功");
-    ////}
-    ////
-    //
-    ////
-    //
-    ////
-    ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据列表显示 树、查询条件、列表字段、按钮
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //@Override
-    //public JsonResultEntity queryMdmShow(JSONObject object) {
-    //    MdmDto entity = getData("jsonStr", object, MdmDto.class);
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    //    }
-    //    if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    //查询模版
-    //    MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
-    //    if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //
-    //    //设置模版
-    //    MdmViewVo mdmViewVo = new MdmViewVo();
-    //    mdmViewVo.setMdmModuleEntity(mdmModuleEntity);
-    //    //查询展示类型
-    //    MdmModuleViewEntity mdmModuleViewEntity = new MdmModuleViewEntity();
-    //    mdmModuleViewEntity.setMdmId(mdmModuleEntity.getId());
-    //    mdmModuleViewEntity.setSts("Y");
-    //    List<MdmModuleViewEntity> moduleViewEntityList = mdmServiceCache.queryMdmModuleView(mdmModuleViewEntity);
-    //    if (moduleViewEntityList == null || moduleViewEntityList.size() != 1) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    mdmModuleViewEntity = moduleViewEntityList.get(0);
-    //    mdmViewVo.setMdmModuleViewEntity(mdmModuleViewEntity);
-    //
-    //    //查询数据源主表
-    //    MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
-    //    mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
-    //    mdmModuleDbEntity.setSts("Y");
-    //    List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
-    //    if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    //查询数据源表下面的字段
-    //    MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity();
-    //    mdmModuleDbFiledsEntity.setMdmId(mdmModuleEntity.getId());
-    //    mdmModuleDbFiledsEntity.setSts("Y");
-    //    List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity);
-    //    if (mdmModuleDbFiledsEntityList == null || mdmModuleDbFiledsEntityList.size() == 0) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    //查询字段下的规则
-    //    MdmModuleDbFiledsRuleEntity mdmModuleDbFiledsRuleEntity = new MdmModuleDbFiledsRuleEntity();
-    //    mdmModuleDbFiledsRuleEntity.setMdmId(mdmModuleEntity.getId());
-    //    mdmModuleDbFiledsRuleEntity.setSts("Y");
-    //    List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRuleEntityList = mdmServiceCache.queryMdmModuleDbFiledsRule(mdmModuleDbFiledsRuleEntity);
-    //    if (mdmModuleDbFiledsRuleEntityList == null || mdmModuleDbFiledsRuleEntityList.size() == 0) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //
-    //    //查询设置的查询字段
-    //    MdmModuleViewDetailEntity mdmModuleViewDetailEntity = new MdmModuleViewDetailEntity();
-    //    mdmModuleViewDetailEntity.setMdmId(mdmModuleEntity.getId());
-    //    mdmModuleViewDetailEntity.setSts("Y");
-    //    List<MdmModuleViewDetailEntity> mdmModuleViewDetailEntities = mdmServiceCache.queryMdmModuleViewDetail(mdmModuleViewDetailEntity);
-    //    if (mdmModuleViewDetailEntities == null || mdmModuleViewDetailEntities.size() == 0) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    List<MdmViewFiledVo> queryList = getFiledByType("1",mdmModuleViewDetailEntities,mdmModuleDbEntityList,mdmModuleDbFiledsEntityList,mdmModuleDbFiledsRuleEntityList);
-    //    mdmViewVo.setQueryList(queryList);
-    //    List<MdmViewFiledVo> listList = getFiledByType("2",mdmModuleViewDetailEntities,mdmModuleDbEntityList,mdmModuleDbFiledsEntityList,mdmModuleDbFiledsRuleEntityList);
-    //    mdmViewVo.setListList(listList);
-    //    return BaseResult.getSuccessMessageEntity("获取字段成功", mdmViewVo);
-    //}
-    //
-    ///**
-    // * @Author lvleigang
-    // * @Description  根据类型获取字段
-    // * @Date 9:18 上午 2024/6/6
-    // * @param viewType 类型
-    // * @param mdmModuleViewDetailEntities 显示设置的字段
-    // * @param mdmModuleDbEntityList 表
-    // * @param mdmModuleDbFiledsEntityList 表字段
-    // * @param mdmModuleDbFiledsRuleEntityList 字段规则
-    // * @return java.util.List<com.hzya.frame.mdm.entity.MdmViewFiledVo>
-    // **/
-    //private List<MdmViewFiledVo> getFiledByType(String viewType, List<MdmModuleViewDetailEntity> mdmModuleViewDetailEntities, List<MdmModuleDbEntity> mdmModuleDbEntityList, List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList, List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRuleEntityList) {
-    //    List<MdmViewFiledVo> mdmViewFiledVos = new ArrayList<>();
-    //    if(mdmModuleViewDetailEntities != null && mdmModuleViewDetailEntities.size() > 0){
-    //        for (int i = 0; i < mdmModuleViewDetailEntities.size(); i++) {
-    //            if(viewType.equals(mdmModuleViewDetailEntities.get(i).getViewType())){
-    //                //类型一致
-    //                MdmViewFiledVo mdmViewFiledVo = new MdmViewFiledVo();
-    //                mdmViewFiledVo.setId(mdmModuleViewDetailEntities.get(i).getViewFiled());
-    //                for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
-    //                    if(mdmModuleDbFiledsEntityList.get(i1).getId().equals(mdmModuleViewDetailEntities.get(i).getViewFiled())){
-    //                        for (int i2 = 0; i2 < mdmModuleDbEntityList.size(); i2++) {
-    //                            if(mdmModuleDbEntityList.get(i2).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())){
-    //                                mdmViewFiledVo.setDbName(mdmModuleDbEntityList.get(i2).getDbName());
-    //                                mdmViewFiledVo.setDbType(mdmModuleDbEntityList.get(i2).getDbType());
-    //                                mdmViewFiledVo.setMdmId(mdmModuleDbEntityList.get(i2).getMdmId());
-    //                                mdmViewFiledVo.setDbId(mdmModuleDbEntityList.get(i2).getId());
-    //
-    //                                break;
-    //                            }
-    //                        }
-    //                        mdmViewFiledVo.setChName(mdmModuleDbFiledsEntityList.get(i1).getChName());
-    //                        mdmViewFiledVo.setEnName(mdmModuleDbFiledsEntityList.get(i1).getEnName());
-    //                        mdmViewFiledVo.setFiledType(mdmModuleDbFiledsEntityList.get(i1).getFiledType());
-    //                        //字段规则
-    //                        if(mdmModuleDbFiledsRuleEntityList != null && mdmModuleDbFiledsRuleEntityList.size() > 0){
-    //                            List<MdmModuleDbFiledsRuleEntity> ruleList = new ArrayList<>();
-    //                            for (int i2 = 0; i2 < mdmModuleDbFiledsRuleEntityList.size(); i2++) {
-    //                                if(mdmModuleDbFiledsEntityList.get(i1).getId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getFiledId())){
-    //                                    ruleList.add(mdmModuleDbFiledsRuleEntityList.get(i2));
-    //                                }
-    //                            }
-    //                            mdmViewFiledVo.setRuleList(ruleList);
-    //                        }
-    //                        break;
-    //                    }
-    //                }
-    //            }
-    //        }
-    //    }
-    //    if(mdmViewFiledVos != null && mdmViewFiledVos.size() > 0){
-    //        for (int i = 0; i < mdmViewFiledVos.size(); i++) {
-    //            mdmViewFiledVos.get(i).setSorts(i);
-    //        }
+    //    List<MdmModuleDbFiledsRuleEntity> msgRule = new ArrayList<>();
+    //    MdmModuleDbFiledsRuleEntity msgRuleTitie = new MdmModuleDbFiledsRuleEntity();
+    //    msgRuleTitie.setFormName("optionRuleForm");
+    //    msgRuleTitie.setRuleCode("title");
+    //    msgRuleTitie.setRuleName("显示名");
+    //    msgRuleTitie.setRuleType("2");
+    //    msgRuleTitie.setRuleValue("单据编码");
+    //    MdmModuleDbFiledsRuleEntity msgRulerow = new MdmModuleDbFiledsRuleEntity();
+    //    msgRulerow.setFormName("optionRuleForm");
+    //    msgRulerow.setRuleCode("row");
+    //    msgRulerow.setRuleName("宽度");
+    //    msgRulerow.setRuleType("2");
+    //    msgRulerow.setRuleValue("12");
+    //    MdmModuleDbFiledsRuleEntity msgRuletype = new MdmModuleDbFiledsRuleEntity();
+    //    msgRuletype.setFormName("optionRuleForm");
+    //    msgRuletype.setRuleCode("type");
+    //    msgRuletype.setRuleName("数据类型");
+    //    msgRuletype.setRuleType("2");
+    //    msgRuletype.setRuleValue("input");
+    //    MdmModuleDbFiledsRuleEntity msgRulerequired = new MdmModuleDbFiledsRuleEntity();
+    //    msgRulerequired.setFormName("optionRuleForm");
+    //    msgRulerequired.setRuleCode("required");
+    //    msgRulerequired.setRuleName("必填");
+    //    msgRulerequired.setRuleType("2");
+    //    MdmModuleDbFiledsRuleEntity withs = new MdmModuleDbFiledsRuleEntity();
+    //    withs.setFormName("optionRuleForm");
+    //    withs.setRuleCode("width");
+    //    withs.setRuleName("宽度");
+    //    withs.setRuleType("2");
+    //    withs.setRuleValue("200");
+    //    msgRule.add(withs);
+    //    msgRule.add(msgRulerequired);
+    //    msgRule.add(msgRuletype);
+    //    msgRule.add(msgRulerow);
+    //    msgRule.add(msgRuleTitie);
+    //    mdmViewFiledVo.setRuleList(msgRule);
+    //    mdmViewFiledVos.add(0, mdmViewFiledVo);
+    //
+    //    //添加分发数量
+    //    if (flag) {
+    //        addFfsl(mdmModuleDbEntityList, mdmViewFiledVos);
     //    }
     //    return mdmViewFiledVos;
     //}
-    ////
-    ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据查询所有字段
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //@Override
-    //public JsonResultEntity queryMdmShowAll(JSONObject object) {
-    //    MdmDto entity = getData("jsonStr", object, MdmDto.class);
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    //    }
-    //    if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    //查询设置各种类型字段
-    //    MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
-    //    //查询模版数据源
-    //    MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
-    //    mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
-    //    mdmModuleDbEntity.setSts("Y");
-    //    List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
-    //    List<MdmDbFiledVo> listFiled = new ArrayList<>();
+    //
+    //private void addFfsl(List<MdmModuleDbEntity> mdmModuleDbEntityList, List<MdmViewFiledVo> mdmViewFiledVos) {
+    //
+    //    MdmViewFiledVo mdmViewFiledVo = new MdmViewFiledVo();
+    //    mdmViewFiledVo.setSorts(1);//排序
+    //    mdmViewFiledVo.setFiledType("1");
+    //    mdmViewFiledVo.setEnName("qwqwasdasdzxasda");//英文名
+    //    mdmViewFiledVo.setChName("分发数量");//中文名
+    //    mdmViewFiledVo.setDbType("1");//类型 1、主表 2、明细
     //    if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() > 0) {
-    //        MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity();
-    //        mdmModuleDbFiledsEntity.setMdmId(mdmModuleEntity.getId());
-    //        mdmModuleDbFiledsEntity.setSts("Y");
-    //        List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity);
-    //        //
-    //        if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() > 0) {
-    //            for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
-    //                if("1".equals(mdmModuleDbEntityList.get(i).getDbType()) || "2".equals(mdmModuleDbEntityList.get(i).getDbType())){
-    //                    if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) {
-    //                        for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
-    //                            if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) {
-    //                                if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
-    //                                    //1、主表
-    //                                    listFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-    //                                } else {
-    //                                    //2、明细
-    //                                    listFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName()));
-    //                                }
-    //                            }
-    //                        }
-    //                    }
-    //                }
+    //        for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
+    //            if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
+    //                mdmViewFiledVo.setDbName(mdmModuleDbEntityList.get(i).getDbName());//表名
     //            }
     //        }
     //    }
-    //    return BaseResult.getSuccessMessageEntity("查询视图成功", listFiled);
+    //    List<MdmModuleDbFiledsRuleEntity> msgRule = new ArrayList<>();
+    //    MdmModuleDbFiledsRuleEntity msgRuleTitie = new MdmModuleDbFiledsRuleEntity();
+    //    msgRuleTitie.setFormName("optionRuleForm");
+    //    msgRuleTitie.setRuleCode("title");
+    //    msgRuleTitie.setRuleName("显示名");
+    //    msgRuleTitie.setRuleType("2");
+    //    msgRuleTitie.setRuleValue("分发数量");
+    //    MdmModuleDbFiledsRuleEntity msgRulerow = new MdmModuleDbFiledsRuleEntity();
+    //    msgRulerow.setFormName("optionRuleForm");
+    //    msgRulerow.setRuleCode("row");
+    //    msgRulerow.setRuleName("宽度");
+    //    msgRulerow.setRuleType("2");
+    //    msgRulerow.setRuleValue("6");
+    //    MdmModuleDbFiledsRuleEntity msgRuletype = new MdmModuleDbFiledsRuleEntity();
+    //    msgRuletype.setFormName("optionRuleForm");
+    //    msgRuletype.setRuleCode("type");
+    //    msgRuletype.setRuleName("数据类型");
+    //    msgRuletype.setRuleType("2");
+    //    msgRuletype.setRuleValue("input");
+    //    MdmModuleDbFiledsRuleEntity msgRulerequired = new MdmModuleDbFiledsRuleEntity();
+    //    msgRulerequired.setFormName("optionRuleForm");
+    //    msgRulerequired.setRuleCode("required");
+    //    msgRulerequired.setRuleName("必填");
+    //    msgRulerequired.setRuleType("2");
+    //    msgRule.add(msgRulerequired);
+    //    msgRule.add(msgRuletype);
+    //    msgRule.add(msgRulerow);
+    //    msgRule.add(msgRuleTitie);
+    //    mdmViewFiledVo.setRuleList(msgRule);
+    //    mdmViewFiledVos.add(mdmViewFiledVo);
     //}
-    ////
-    /////**
-    //// * @param mdmModuleRoleButtonEntities
-    //// * @return java.util.List<com.hzya.frame.mdm.entity.MdmViewButtonVo>
-    //// * @Author lvleigang
-    //// * @Description 设置返回按钮
-    //// * @Date 4:48 下午 2023/10/26
-    //// **/
-    ////private List<MdmViewButtonVo> setButton(List<MdmModuleRoleButtonEntity> mdmModuleRoleButtonEntities) {
-    ////    List<MdmViewButtonVo> mdmViewButtonVoList = new ArrayList<>();
-    ////    if (mdmModuleRoleButtonEntities != null && mdmModuleRoleButtonEntities.size() > 0) {
-    ////        for (int i = 0; i < mdmModuleRoleButtonEntities.size(); i++) {
-    ////            mdmViewButtonVoList.add(new MdmViewButtonVo(mdmModuleRoleButtonEntities.get(i).getButtonType(), mdmModuleRoleButtonEntities.get(i).getButtonName()));
-    ////        }
-    ////    }
-    ////    return mdmViewButtonVoList;
-    ////}
-    ////
-    /////**
-    //// * @param allRecords
-    //// * @param checkedMeters
-    //// * @return java.util.List<com.hzya.frame.mdm.mdmModuleViewDetail.entity.MdmModuleViewDetailEntity>
-    //// * @Author lvleigang
-    //// * @Description 取出重复字段数据
-    //// * @Date 4:34 下午 2023/10/26
-    //// **/
-    ////private List<MdmModuleViewDetailEntity> getDolist(List<MdmModuleViewDetailEntity> allRecords, List<MdmModuleUserViewEntity> checkedMeters) {
-    ////    List<MdmModuleViewDetailEntity> meterPlan = allRecords.stream()
-    ////            .filter(item -> checkedMeters.stream()
-    ////                    .map(e -> {
-    ////                        if (!Objects.equals(item.getViewFiled(), e.getViewDetailId())) {
-    ////                            return null;
-    ////                        } else {
-    ////                            return item.getViewFiled();
-    ////                        }
-    ////                    })
-    ////                    .collect(Collectors.toList())
-    ////                    .contains(item.getViewFiled()))
-    ////            .collect(Collectors.toList());
-    ////    return meterPlan;
-    ////}
-    ////
-    /////**
-    //// * @param mdmModuleDbEntityList           数据源
-    //// * @param mdmModuleDbFiledsEntityList     数据源下的字段表
-    //// * @param mdmModuleDbFiledsRuleEntityList 数据源字段的规则表
-    //// * @param queryList                       需要的字段
-    //// * @return java.util.List<com.hzya.frame.mdm.entity.MdmViewFiledVo>
-    //// * @Author lvleigang
-    //// * @Description 根据字段设置返回前台字段
-    //// * @Date 4:11 下午 2023/10/26
-    //// **/
-    ////private List<MdmViewFiledVo> setQueryList(List<MdmModuleDbEntity> mdmModuleDbEntityList, List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList, List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRuleEntityList, List<MdmModuleViewDetailEntity> queryList, boolean flag) {
-    ////    List<MdmViewFiledVo> mdmViewFiledVos = new ArrayList<>();
-    ////
-    ////    if (queryList != null && queryList.size() > 0) {
-    ////        for (int i = 0; i < queryList.size(); i++) {
-    ////            MdmViewFiledVo mdmViewFiledVo = new MdmViewFiledVo();
-    ////            mdmViewFiledVo.setId(queryList.get(i).getViewFiled());//字段id
-    ////            mdmViewFiledVo.setSorts(i + 2);//排序
-    ////            for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
-    ////                if (queryList.get(i).getViewFiled().equals(mdmModuleDbFiledsEntityList.get(i1).getId())) {
-    ////                    mdmViewFiledVo.setFiledType(mdmModuleDbFiledsEntityList.get(i1).getFiledType());//英文名
-    ////                    mdmViewFiledVo.setEnName(mdmModuleDbFiledsEntityList.get(i1).getEnName());//英文名
-    ////                    mdmViewFiledVo.setChName(mdmModuleDbFiledsEntityList.get(i1).getChName());//中文名
-    ////                    for (int i2 = 0; i2 < mdmModuleDbEntityList.size(); i2++) {
-    ////                        if (mdmModuleDbFiledsEntityList.get(i1).getDbId().equals(mdmModuleDbEntityList.get(i2).getId())) {
-    ////                            mdmViewFiledVo.setDbType(mdmModuleDbEntityList.get(i2).getDbType());//类型 1、主表 2、明细
-    ////                            mdmViewFiledVo.setMdmId(mdmModuleDbEntityList.get(i2).getMdmId());//主数据模版ID
-    ////                            mdmViewFiledVo.setDbId(mdmModuleDbEntityList.get(i2).getId());//模版数据库id
-    ////                            mdmViewFiledVo.setDbName(mdmModuleDbEntityList.get(i2).getDbName());//表名
-    ////
-    ////                            break;
-    ////                        }
-    ////                    }
-    ////                    break;
-    ////                }
-    ////            }
-    ////            //设置字段规则
-    ////            List<MdmModuleDbFiledsRuleEntity> ruleList = new ArrayList<>();
-    ////            if (mdmModuleDbFiledsRuleEntityList != null && mdmModuleDbFiledsRuleEntityList.size() > 0) {
-    ////                for (int i1 = 0; i1 < mdmModuleDbFiledsRuleEntityList.size(); i1++) {
-    ////                    if (queryList.get(i).getViewFiled().equals(mdmModuleDbFiledsRuleEntityList.get(i1).getFiledId())) {
-    ////                        ruleList.add(mdmModuleDbFiledsRuleEntityList.get(i1));
-    ////                    }
-    ////                }
-    ////            }
-    ////            mdmViewFiledVo.setRuleList(ruleList);
-    ////            mdmViewFiledVos.add(mdmViewFiledVo);
-    ////        }
-    ////    }
-    ////    MdmViewFiledVo mdmViewFiledVo = new MdmViewFiledVo();
-    ////    mdmViewFiledVo.setSorts(1);//排序
-    ////    mdmViewFiledVo.setFiledType("3");
-    ////    mdmViewFiledVo.setEnName("document_rule");//英文名
-    ////    mdmViewFiledVo.setChName("单据编码");//中文名
-    ////    mdmViewFiledVo.setDbType("1");//类型 1、主表 2、明细
-    ////    if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() > 0) {
-    ////        for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
-    ////            if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
-    ////                mdmViewFiledVo.setDbName(mdmModuleDbEntityList.get(i).getDbName());//表名
-    ////            }
-    ////        }
-    ////    }
-    ////    List<MdmModuleDbFiledsRuleEntity> msgRule = new ArrayList<>();
-    ////    MdmModuleDbFiledsRuleEntity msgRuleTitie = new MdmModuleDbFiledsRuleEntity();
-    ////    msgRuleTitie.setFormName("optionRuleForm");
-    ////    msgRuleTitie.setRuleCode("title");
-    ////    msgRuleTitie.setRuleName("显示名");
-    ////    msgRuleTitie.setRuleType("2");
-    ////    msgRuleTitie.setRuleValue("单据编码");
-    ////    MdmModuleDbFiledsRuleEntity msgRulerow = new MdmModuleDbFiledsRuleEntity();
-    ////    msgRulerow.setFormName("optionRuleForm");
-    ////    msgRulerow.setRuleCode("row");
-    ////    msgRulerow.setRuleName("宽度");
-    ////    msgRulerow.setRuleType("2");
-    ////    msgRulerow.setRuleValue("12");
-    ////    MdmModuleDbFiledsRuleEntity msgRuletype = new MdmModuleDbFiledsRuleEntity();
-    ////    msgRuletype.setFormName("optionRuleForm");
-    ////    msgRuletype.setRuleCode("type");
-    ////    msgRuletype.setRuleName("数据类型");
-    ////    msgRuletype.setRuleType("2");
-    ////    msgRuletype.setRuleValue("input");
-    ////    MdmModuleDbFiledsRuleEntity msgRulerequired = new MdmModuleDbFiledsRuleEntity();
-    ////    msgRulerequired.setFormName("optionRuleForm");
-    ////    msgRulerequired.setRuleCode("required");
-    ////    msgRulerequired.setRuleName("必填");
-    ////    msgRulerequired.setRuleType("2");
-    ////    MdmModuleDbFiledsRuleEntity withs = new MdmModuleDbFiledsRuleEntity();
-    ////    withs.setFormName("optionRuleForm");
-    ////    withs.setRuleCode("width");
-    ////    withs.setRuleName("宽度");
-    ////    withs.setRuleType("2");
-    ////    withs.setRuleValue("200");
-    ////    msgRule.add(withs);
-    ////    msgRule.add(msgRulerequired);
-    ////    msgRule.add(msgRuletype);
-    ////    msgRule.add(msgRulerow);
-    ////    msgRule.add(msgRuleTitie);
-    ////    mdmViewFiledVo.setRuleList(msgRule);
-    ////    mdmViewFiledVos.add(0, mdmViewFiledVo);
-    ////
-    ////    //添加分发数量
-    ////    if (flag) {
-    ////        addFfsl(mdmModuleDbEntityList, mdmViewFiledVos);
-    ////    }
-    ////    return mdmViewFiledVos;
-    ////}
-    ////
-    ////private void addFfsl(List<MdmModuleDbEntity> mdmModuleDbEntityList, List<MdmViewFiledVo> mdmViewFiledVos) {
-    ////
-    ////    MdmViewFiledVo mdmViewFiledVo = new MdmViewFiledVo();
-    ////    mdmViewFiledVo.setSorts(1);//排序
-    ////    mdmViewFiledVo.setFiledType("1");
-    ////    mdmViewFiledVo.setEnName("qwqwasdasdzxasda");//英文名
-    ////    mdmViewFiledVo.setChName("分发数量");//中文名
-    ////    mdmViewFiledVo.setDbType("1");//类型 1、主表 2、明细
-    ////    if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() > 0) {
-    ////        for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
-    ////            if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
-    ////                mdmViewFiledVo.setDbName(mdmModuleDbEntityList.get(i).getDbName());//表名
-    ////            }
-    ////        }
-    ////    }
-    ////    List<MdmModuleDbFiledsRuleEntity> msgRule = new ArrayList<>();
-    ////    MdmModuleDbFiledsRuleEntity msgRuleTitie = new MdmModuleDbFiledsRuleEntity();
-    ////    msgRuleTitie.setFormName("optionRuleForm");
-    ////    msgRuleTitie.setRuleCode("title");
-    ////    msgRuleTitie.setRuleName("显示名");
-    ////    msgRuleTitie.setRuleType("2");
-    ////    msgRuleTitie.setRuleValue("分发数量");
-    ////    MdmModuleDbFiledsRuleEntity msgRulerow = new MdmModuleDbFiledsRuleEntity();
-    ////    msgRulerow.setFormName("optionRuleForm");
-    ////    msgRulerow.setRuleCode("row");
-    ////    msgRulerow.setRuleName("宽度");
-    ////    msgRulerow.setRuleType("2");
-    ////    msgRulerow.setRuleValue("6");
-    ////    MdmModuleDbFiledsRuleEntity msgRuletype = new MdmModuleDbFiledsRuleEntity();
-    ////    msgRuletype.setFormName("optionRuleForm");
-    ////    msgRuletype.setRuleCode("type");
-    ////    msgRuletype.setRuleName("数据类型");
-    ////    msgRuletype.setRuleType("2");
-    ////    msgRuletype.setRuleValue("input");
-    ////    MdmModuleDbFiledsRuleEntity msgRulerequired = new MdmModuleDbFiledsRuleEntity();
-    ////    msgRulerequired.setFormName("optionRuleForm");
-    ////    msgRulerequired.setRuleCode("required");
-    ////    msgRulerequired.setRuleName("必填");
-    ////    msgRulerequired.setRuleType("2");
-    ////    msgRule.add(msgRulerequired);
-    ////    msgRule.add(msgRuletype);
-    ////    msgRule.add(msgRulerow);
-    ////    msgRule.add(msgRuleTitie);
-    ////    mdmViewFiledVo.setRuleList(msgRule);
-    ////    mdmViewFiledVos.add(mdmViewFiledVo);
-    ////}
-    ////
+    //
+    /**
+     * @param object
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 主数据列表显示 业务数据
+     * @Date 9:40 上午 2023/10/18
+     **/
+    @Override
+    public JsonResultEntity queryMdmShowData(JSONObject object) {
+        MdmQuery entity = getData("jsonStr", object, MdmQuery.class);
+        if (entity == null) {
+            return BaseResult.getFailureMessageEntity("参数不允许为空");
+        }
+        //判断分页
+        if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) {
+            return BaseResult.getFailureMessageEntity("分页查询参数不存在");
+        }
+        PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
+        List<HashMap<String, Object>> businessResult = mdmModuleDao.queryMdmShowData(entity);
+        PageInfo pageInfo = new PageInfo(businessResult);
+        return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo);
+    }
+    //
     ///**
     // * @param object
     // * @return com.hzya.frame.web.entity.JsonResultEntity
@@ -2847,653 +527,7 @@ public class MdmServiceImpl implements IMdmService {
     // * @Date 9:40 上午 2023/10/18
     // **/
     //@Override
-    //public JsonResultEntity queryMdmShowData(JSONObject object) {
-    //    MdmQuery entity = getData("jsonStr", object, MdmQuery.class);
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    //    }
-    //    //判断分页
-    //    if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) {
-    //        return BaseResult.getFailureMessageEntity("分页查询参数不存在");
-    //    }
-    //    PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
-    //    List<HashMap<String, Object>> businessResult = mdmModuleDao.queryMdmShowData(entity);
-    //    PageInfo pageInfo = new PageInfo(businessResult);
-    //    return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo);
-    //}
-    ////
-    /////**
-    //// * @param object
-    //// * @return com.hzya.frame.web.entity.JsonResultEntity
-    //// * @Author lvleigang
-    //// * @Description 主数据列表显示 业务数据
-    //// * @Date 9:40 上午 2023/10/18
-    //// **/
-    ////@Override
-    ////public JsonResultEntity queryMdmShowDistribute(JSONObject object) {
-    ////    MdmDto entity = getData("jsonStr", object, MdmDto.class);
-    ////    if (entity == null) {
-    ////        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    ////    }
-    ////    if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
-    ////        return BaseResult.getFailureMessageEntity("系统错误");
-    ////    }
-    ////    if (entity.getId() == null || "".equals(entity.getId())) {
-    ////        return BaseResult.getFailureMessageEntity("系统错误");
-    ////    }
-    ////    //查询模版
-    ////    MdmModuleEntity mdmModuleEntity = new MdmModuleEntity();
-    ////    mdmModuleEntity.setMdmCode(entity.getMdmCode());
-    ////    mdmModuleEntity.setSts("Y");
-    ////    List<MdmModuleEntity> mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity);
-    ////    if (mdmModuleEntities == null || mdmModuleEntities.size() != 1) {
-    ////        return BaseResult.getFailureMessageEntity("系统错误");
-    ////    }
-    ////
-    ////    //查询数据源主表
-    ////    MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
-    ////    mdmModuleDbEntity.setMdmId(mdmModuleEntities.get(0).getId());
-    ////    mdmModuleDbEntity.setDbType("1");
-    ////    mdmModuleDbEntity.setSts("Y");
-    ////    List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmModuleDbDao.queryBase(mdmModuleDbEntity);
-    ////    if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) {
-    ////        return BaseResult.getFailureMessageEntity("系统错误");
-    ////    }
-    ////    mdmModuleDbEntity = mdmModuleDbEntityList.get(0);
-    ////    Map<String, Object> queryData = new HashMap<>();
-    ////    queryData.put("tableName", mdmModuleDbEntity.getDbName() + "_distribute");//表名
-    ////    queryData.put("id", entity.getId());//字段
-    ////    List<MdmDistributeVo> datas = mdmModuleDbDao.getServiceByDistributeIdNoCase(queryData);
-    ////    List<MdmDistributeVo> returnData = new ArrayList<>();
-    ////
-    ////    //查询分发表
-    ////    MdmModuleDistributeEntity mdmModuleDistributeEntity = new MdmModuleDistributeEntity();
-    ////    mdmModuleDistributeEntity.setMdmId(mdmModuleEntities.get(0).getId());
-    ////    mdmModuleDistributeEntity.setSts("Y");
-    ////    List<MdmModuleDistributeEntity> mdmModuleDistributeEntities = mdmModuleDistributeDao.queryBase(mdmModuleDistributeEntity);
-    ////    if (datas != null && datas.size() > 0) {
-    ////        if (mdmModuleDistributeEntities != null && mdmModuleDistributeEntities.size() > 0) {
-    ////            for (int i = 0; i < mdmModuleDistributeEntities.size(); i++) {
-    ////                boolean flag = false;
-    ////                for (int i1 = 0; i1 < datas.size(); i1++) {
-    ////                    if (datas.get(i1).getAppId().equals(mdmModuleDistributeEntities.get(i).getAppId())) {
-    ////                        flag = true;
-    ////                        break;
-    ////                    }
-    ////                }
-    ////                if (!flag) {
-    ////                    MdmDistributeVo mdmDistributeVo = new MdmDistributeVo();
-    ////                    mdmDistributeVo.setAppId(mdmModuleDistributeEntities.get(i).getAppId());
-    ////                    mdmDistributeVo.setStatus("4");
-    ////                    mdmDistributeVo.setMsg("未发送");
-    ////                    returnData.add(mdmDistributeVo);
-    ////                }
-    ////            }
-    ////        }
-    ////        returnData.addAll(datas);
-    ////    } else {
-    ////        if (mdmModuleDistributeEntities != null && mdmModuleDistributeEntities.size() > 0) {
-    ////            for (int i = 0; i < mdmModuleDistributeEntities.size(); i++) {
-    ////                MdmDistributeVo mdmDistributeVo = new MdmDistributeVo();
-    ////                mdmDistributeVo.setAppId(mdmModuleDistributeEntities.get(i).getAppId());
-    ////                mdmDistributeVo.setStatus("4");
-    ////                mdmDistributeVo.setMsg("未发送");
-    ////                returnData.add(mdmDistributeVo);
-    ////            }
-    ////        }
-    ////    }
-    ////    return BaseResult.getSuccessMessageEntity("查询数据成功", returnData);
-    ////}
-    ////
-    ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 查询数据（list 或者 分页）
-    // * @Date 1:33 下午 2023/7/12
-    // **/
-    //@Override
-    //public JsonResultEntity queryTemplateData(JSONObject object) {
-    //    MdmDto entity = getData("jsonStr", object, MdmDto.class);
-    //    //校验是否有servecr传参
-    //    if (!checkStr(entity.getTableName())) {
-    //        return BaseResult.getFailureMessageEntity("请先传递服务名");
-    //    }
-    //    if (!checkStr(entity.getValue())) {
-    //        return BaseResult.getFailureMessageEntity("请先传递存储字段");
-    //    }
-    //    if (!checkStr(entity.getLabel())) {
-    //        return BaseResult.getFailureMessageEntity("请先传递显示字段");
-    //    }
-    //    if (entity.getPageNum() != null && entity.getPageSize() != null) {
-    //        PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
-    //        List<HashMap<String, Object>> mapList = mdmModuleDao.querySelectData(entity);
-    //        PageInfo pageInfo = new PageInfo(mapList);
-    //        return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo);
-    //    } else {
-    //        List<HashMap<String, Object>> mapList = mdmModuleDao.querySelectData(entity);
-    //        return BaseResult.getSuccessMessageEntity("查询数据成功", mapList);
-    //    }
-    //}
-    ////
-    ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 业务数据树形结构，数据查询
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //@Override
-    //public JsonResultEntity queryMdmShowTreeData(JSONObject object) {
-    //    MdmDto entity = getData("jsonStr", object, MdmDto.class);
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    //    }
-    //    //if (entity.getTableName() == null || "".equals(entity.getTableName())) {
-    //    //    return BaseResult.getFailureMessageEntity("系统错误");
-    //    //}
-    //    if (entity.getLabel() == null || "".equals(entity.getLabel())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    if (entity.getUpId() == null || "".equals(entity.getUpId())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //
-    //    }
-    //    //查询模版
-    //    MdmModuleEntity  mdmModuleEntities = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
-    //    if (mdmModuleEntities == null ) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    //查询数据源主表
-    //    MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
-    //    mdmModuleDbEntity.setMdmId(mdmModuleEntities.getId());
-    //    mdmModuleDbEntity.setSts("Y");
-    //    List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
-    //    if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
-    //        if("1".equals(mdmModuleDbEntityList.get(i).getDbType())){
-    //            mdmModuleDbEntity = mdmModuleDbEntityList.get(i);
-    //            break;
-    //        }
-    //    }
-    //    entity.setTableName(mdmModuleDbEntity.getDbName());
-    //
-    //
-    //
-    //    if (checkStr(entity.getId())) {
-    //        if (!checkStr(entity.getValue())) {
-    //            return BaseResult.getFailureMessageEntity("请先传递存储字段");
-    //        }
-    //        if (entity.getId().contains(",")) {
-    //            String[] strArray = entity.getId().split(",");  // 使用逗号和空格作为分隔符
-    //            entity.setIds(strArray);
-    //            List<HashMap<String, Object>> mapList = mdmModuleDao.queryTemplateDataMore(entity);
-    //            if (mapList == null || mapList.size() == 0) {
-    //                List<HashMap<String, Object>> returnList = new ArrayList<>();
-    //                return BaseResult.getSuccessMessageEntity("查询数据成功", returnList);
-    //            }
-    //            List<HashMap<String, Object>> returnList = gettochilder(strArray, 0, mapList);
-    //            return BaseResult.getSuccessMessageEntity("查询数据成功", returnList);
-    //        } else {
-    //            HashMap<String, Object> mapList = mdmModuleDao.queryTemplateDataOne(entity);
-    //            if (mapList == null || mapList.size() == 0) {
-    //                List<HashMap<String, Object>> returnList = new ArrayList<>();
-    //                return BaseResult.getSuccessMessageEntity("查询数据成功", returnList);
-    //            }
-    //            List<HashMap<String, Object>> returnList = new ArrayList<>();
-    //            returnList.add(mapList);
-    //            return BaseResult.getSuccessMessageEntity("查询数据成功", returnList);
-    //        }
-    //    } else {
-    //        List<HashMap<String, Object>> mapList = mdmModuleDao.queryDataAll(entity);
-    //        List<HashMap<String, Object>> returnList = new ArrayList<>();
-    //
-    //        if (mapList != null && mapList.size() > 0) {
-    //            for (int i = 0; i < mapList.size(); i++) {
-    //                //默认为根
-    //                if (mapList.get(i).get(entity.getUpId()) == null || "".equals(mapList.get(i).get(entity.getUpId()))) {
-    //                    List<HashMap<String, Object>> children = getchilder(mapList.get(i).get("qsdfg").toString(), mapList, entity);
-    //                    HashMap<String, Object> re = new HashMap<>();
-    //                    re.put("id", mapList.get(i).get("qsdfg"));
-    //                    re.put("label", mapList.get(i).get(entity.getLabel()));
-    //                    re.put("upID", mapList.get(i).get(entity.getUpId()));
-    //                    if (children != null && children.size() > 0) {
-    //                        re.put("children", children);
-    //                    }
-    //                    returnList.add(re);
-    //                }
-    //            }
-    //        }
-    //        return BaseResult.getSuccessMessageEntity("查询数据成功", returnList);
-    //    }
-    //}
-    ////
-    //private List<HashMap<String, Object>> gettochilder(String[] strArray, int i, List<HashMap<String, Object>> mapList) {
-    //    List<HashMap<String, Object>> maps = new ArrayList<>();
-    //    for (int i1 = 0; i1 < mapList.size(); i1++) {
-    //        if (strArray[i].equals(mapList.get(i1).get("id").toString())) {
-    //            if (strArray.length >= (i + 2)) {
-    //                mapList.get(i1).put("children", gettochilder(strArray, i + 1, mapList));
-    //            }
-    //            maps.add(mapList.get(i1));
-    //            break;
-    //        }
-    //    }
-    //    return maps;
-    //}
-    ////
-    ////private HashMap<String, Object> getFathers(List<HashMap<String, Object>> mapListAll, HashMap<String, Object> mapList, MdmDto entity) {
-    ////    if (mapList.get("upID") == null) {
-    ////        return mapList;
-    ////    }
-    ////    HashMap<String, Object> retList = new HashMap<>();
-    ////    if (mapListAll != null && mapListAll.size() > 0) {
-    ////        for (int i = 0; i < mapListAll.size(); i++) {
-    ////            //等于上级id的时候
-    ////            if (mapListAll.get(i).get("qsdfg").equals(mapList.get("upID"))) {
-    ////                retList.put("id", mapListAll.get(i).get("qsdfg"));
-    ////                retList.put("label", mapListAll.get(i).get(entity.getLabel()));
-    ////                retList.put("upID", mapListAll.get(i).get(entity.getUpId()));
-    ////                List<HashMap<String, Object>> returnList = new ArrayList<>();
-    ////                returnList.add(mapList);
-    ////                retList.put("children", returnList);
-    ////                break;
-    ////            }
-    ////        }
-    ////    }
-    ////    HashMap<String, Object> a = getFathers(mapListAll, retList, entity);
-    ////    return a;
-    ////}
-    ////
-    //private List<HashMap<String, Object>> getchilder(String stringObjectHashMap, List<HashMap<String, Object>> mapList, MdmDto entity) {
-    //    List<HashMap<String, Object>> returnList = new ArrayList<>();
-    //    if (mapList != null && mapList.size() > 0) {
-    //        for (int i = 0; i < mapList.size(); i++) {
-    //            //等于上级id的时候
-    //            if (stringObjectHashMap.equals(mapList.get(i).get(entity.getUpId()))) {
-    //                List<HashMap<String, Object>> children = getchilder(mapList.get(i).get(entity.getUpId()) + "," + mapList.get(i).get("qsdfg"), mapList, entity);
-    //                HashMap<String, Object> re = new HashMap<>();
-    //                re.put("id", mapList.get(i).get("qsdfg"));
-    //                re.put("label", mapList.get(i).get(entity.getLabel()));
-    //                re.put("upID", mapList.get(i).get(entity.getUpId()));
-    //                if (children != null && children.size() > 0) {
-    //                    re.put("children", children);
-    //                }
-    //                returnList.add(re);
-    //            }
-    //        }
-    //    }
-    //    return returnList;
-    //}
-    ////
-    ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据详情 区分类型 新增、修改、查看
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //@Override
-    //public JsonResultEntity queryMdmShowDetails(JSONObject object) {
-    //    MdmDto entity = getData("jsonStr", object, MdmDto.class);
-    //    if (entity == null) {
-    //        return BaseResult.getFailureMessageEntity("参数不允许为空");
-    //    }
-    //    if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    if (entity.getShowType() == null || "".equals(entity.getShowType())) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    //查询模版
-    //    //List<MdmModuleEntity> mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity);
-    //    MdmModuleEntity mdmModuleEntities = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
-    //    if (mdmModuleEntities == null) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    MdmDetailViewVo mdmViewVo = new MdmDetailViewVo();
-    //    mdmViewVo.setMdmModuleEntity(mdmModuleEntities);
-    //
-    //    //查询数据源主表
-    //    MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
-    //    mdmModuleDbEntity.setMdmId(mdmModuleEntities.getId());
-    //    mdmModuleDbEntity.setSts("Y");
-    //    List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
-    //    if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    //查询数据源表下面的字段
-    //    MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity();
-    //    mdmModuleDbFiledsEntity.setMdmId(mdmModuleEntities.getId());
-    //    mdmModuleDbFiledsEntity.setSts("Y");
-    //    List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity);
-    //    if (mdmModuleDbFiledsEntityList == null || mdmModuleDbFiledsEntityList.size() == 0) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    //查询字段下的规则
-    //    MdmModuleDbFiledsRuleEntity mdmModuleDbFiledsRuleEntity = new MdmModuleDbFiledsRuleEntity();
-    //    mdmModuleDbFiledsRuleEntity.setMdmId(mdmModuleEntities.getId());
-    //    mdmModuleDbFiledsRuleEntity.setSts("Y");
-    //    List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRuleEntityList = mdmServiceCache.queryMdmModuleDbFiledsRule(mdmModuleDbFiledsRuleEntity);
-    //    if (mdmModuleDbFiledsRuleEntityList == null || mdmModuleDbFiledsRuleEntityList.size() == 0) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    MdmModuleViewDetailEntity mdmModuleViewDetailEntity = new MdmModuleViewDetailEntity();
-    //    mdmModuleViewDetailEntity.setMdmId(mdmModuleEntities.getId());
-    //    mdmModuleViewDetailEntity.setSts("Y");
-    //    mdmModuleViewDetailEntity.setViewType(entity.getShowType());//设置显示字段类型
-    //    List<MdmModuleViewDetailEntity> queryAll = mdmModuleViewDetailDao.queryBase(mdmModuleViewDetailEntity);
-    //    List<MdmModuleViewDetailEntity> mdmModuleViewDetailEntityList = new ArrayList<>();
-    //    if(queryAll != null && queryAll.size() > 0){
-    //        for (int i = 0; i < queryAll.size(); i++) {
-    //            if(entity.getShowType().equals(queryAll.get(i).getViewType())){
-    //                mdmModuleViewDetailEntityList.add(queryAll.get(i));
-    //            }
-    //        }
-    //    }
-    //    //组装数据
-    //    assembleMdmShowDetails(mdmViewVo, mdmModuleDbEntityList, mdmModuleDbFiledsEntityList, mdmModuleDbFiledsRuleEntityList, mdmModuleViewDetailEntityList, entity.getShowType());
-    //    return BaseResult.getSuccessMessageEntity("获取字段成功", mdmViewVo);
-    //}
-    //
-    ///**
-    // * @param mdmViewVo                       返回对象
-    // * @param mdmModuleDbEntityList           数据源表
-    // * @param mdmModuleDbFiledsEntityList     数据源字段
-    // * @param mdmModuleDbFiledsRuleEntityList 数据源字段规则
-    // * @param mdmModuleViewDetailEntityList   数据源显示字段
-    // * @return void
-    // * @Author lvleigang
-    // * @Description 组装显示字段
-    // * @Date 9:10 上午 2023/11/6
-    // **/
-    //private void assembleMdmShowDetails(MdmDetailViewVo mdmViewVo, List<MdmModuleDbEntity> mdmModuleDbEntityList, List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList, List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRuleEntityList, List<MdmModuleViewDetailEntity> mdmModuleViewDetailEntityList, String showType) {
-    //    //主数据主表
-    //    MdmModuleDbEntity mainMdmModuleDb = new MdmModuleDbEntity();
-    //    List<MdmModuleDbFiledsEntity> mainMdmModuleDbFileds = new ArrayList<>();
-    //    //主数据子表
-    //    List<MdmModuleDbEntity> sublistMdmModuleDb = new ArrayList<>();
-    //
-    //    if (mdmModuleViewDetailEntityList != null && mdmModuleViewDetailEntityList.size() > 0) {
-    //        //先循环数据源表，设置出数据字段
-    //        for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
-    //            if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
-    //                //1、主表 2、明细
-    //                mainMdmModuleDb = mdmModuleDbEntityList.get(i);
-    //                //循环字段表
-    //                if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) {
-    //                    for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
-    //                        if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) {
-    //                            for (int b = 0; b < mdmModuleViewDetailEntityList.size(); b++) {
-    //                                if (mdmModuleViewDetailEntityList.get(b).getViewFiled().equals(mdmModuleDbFiledsEntityList.get(i1).getId())) {
-    //                                    mainMdmModuleDbFileds.add(mdmModuleDbFiledsEntityList.get(i1));
-    //                                    List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRules = new ArrayList<>();
-    //                                    //循环字段属性
-    //                                    if (mdmModuleDbFiledsRuleEntityList != null && mdmModuleDbFiledsRuleEntityList.size() > 0) {
-    //                                        for (int i2 = 0; i2 < mdmModuleDbFiledsRuleEntityList.size(); i2++) {
-    //                                            if (mdmModuleDbFiledsEntityList.get(i1).getDbId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getDbId())
-    //                                                    && mdmModuleDbFiledsEntityList.get(i1).getId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getFiledId())) {
-    //                                                mdmModuleDbFiledsRules.add(mdmModuleDbFiledsRuleEntityList.get(i2));
-    //                                            }
-    //                                        }
-    //                                    }
-    //                                    mdmModuleDbFiledsEntityList.get(i1).setMdmModuleDbFiledsRules(mdmModuleDbFiledsRules);
-    //                                }
-    //                            }
-    //                        }
-    //                    }
-    //                }
-    //            } else if ("2".equals(mdmModuleDbEntityList.get(i).getDbType())) {
-    //                //2、明细
-    //                sublistMdmModuleDb.add(mdmModuleDbEntityList.get(i));
-    //                //循环字段表
-    //                if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) {
-    //                    List<MdmModuleDbFiledsEntity> sublistMdmModuleDbFileds = new ArrayList<>();
-    //                    for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
-    //                        if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) {
-    //                            for (int b = 0; b < mdmModuleViewDetailEntityList.size(); b++) {
-    //                                if (mdmModuleViewDetailEntityList.get(b).getViewFiled().equals(mdmModuleDbFiledsEntityList.get(i1).getId())) {
-    //                                    sublistMdmModuleDbFileds.add(mdmModuleDbFiledsEntityList.get(i1));
-    //                                    List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRules = new ArrayList<>();
-    //                                    //循环字段属性
-    //                                    if (mdmModuleDbFiledsRuleEntityList != null && mdmModuleDbFiledsRuleEntityList.size() > 0) {
-    //                                        for (int i2 = 0; i2 < mdmModuleDbFiledsRuleEntityList.size(); i2++) {
-    //                                            if (mdmModuleDbFiledsEntityList.get(i1).getDbId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getDbId())
-    //                                                    && mdmModuleDbFiledsEntityList.get(i1).getId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getFiledId())) {
-    //                                                mdmModuleDbFiledsRules.add(mdmModuleDbFiledsRuleEntityList.get(i2));
-    //                                            }
-    //                                        }
-    //                                    }
-    //                                    mdmModuleDbFiledsEntityList.get(i1).setMdmModuleDbFiledsRules(mdmModuleDbFiledsRules);
-    //                                }
-    //                            }
-    //
-    //                        }
-    //                    }
-    //                    mdmModuleDbEntityList.get(i).setSublistMdmModuleDbFileds(sublistMdmModuleDbFileds);
-    //                }
-    //            }
-    //        }
-    //        mainMdmModuleDb.setSublistMdmModuleDbFileds(mainMdmModuleDbFileds);
-    //        mdmViewVo.setMainMdmModuleDb(mainMdmModuleDb);
-    //        //主数据子表
-    //        List<MdmModuleDbEntity> mdmModuleDb = new ArrayList<>();
-    //        if (sublistMdmModuleDb != null && sublistMdmModuleDb.size() > 0) {
-    //            for (int i = 0; i < sublistMdmModuleDb.size(); i++) {
-    //                if (sublistMdmModuleDb.get(i).getSublistMdmModuleDbFileds() != null && sublistMdmModuleDb.get(i).getSublistMdmModuleDbFileds().size() > 0) {
-    //                    mdmModuleDb.add(sublistMdmModuleDb.get(i));
-    //                }
-    //            }
-    //        }
-    //        //if ("5".equals(showType)) {
-    //        //    MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
-    //        //    mdmModuleDbEntity.setDbName(mainMdmModuleDb.getDbName() + "_distribute");
-    //        //    mdmModuleDbEntity.setRemark(mainMdmModuleDb.getRemark() + "分发表");
-    //        //    mdmModuleDbEntity.setDbType("2");
-    //        //    List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList1 = getDistributeRole();
-    //        //    mdmModuleDbEntity.setSublistMdmModuleDbFileds(mdmModuleDbFiledsEntityList1);
-    //        //    mdmModuleDb.add(mdmModuleDbEntity);
-    //        //}
-    //        mdmViewVo.setSublistMdmModuleDb(mdmModuleDb);
-    //
-    //    } else {
-    //        mdmViewVo.setMainMdmModuleDb(mainMdmModuleDb);
-    //        mdmViewVo.setSublistMdmModuleDb(sublistMdmModuleDb);
-    //    }
-    //}
-    ////
-    ////private List<MdmModuleDbFiledsEntity> getDistributeRole() {
-    ////    List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList = new ArrayList<>();
-    ////    //app
-    ////    MdmModuleDbFiledsEntity appFiled = new MdmModuleDbFiledsEntity();
-    ////    appFiled.setChName("应用");
-    ////    appFiled.setEnName("app_id");
-    ////    appFiled.setFiledLength("50");
-    ////    appFiled.setFiledType("3");
-    ////    List<MdmModuleDbFiledsRuleEntity> appRule = new ArrayList<>();
-    ////    MdmModuleDbFiledsRuleEntity appRuleTitie = new MdmModuleDbFiledsRuleEntity();
-    ////    appRuleTitie.setFormName("optionRuleForm");
-    ////    appRuleTitie.setRuleCode("title");
-    ////    appRuleTitie.setRuleName("显示名");
-    ////    appRuleTitie.setRuleType("2");
-    ////    appRuleTitie.setRuleValue("应用");
-    ////    MdmModuleDbFiledsRuleEntity appRulerow = new MdmModuleDbFiledsRuleEntity();
-    ////    appRulerow.setFormName("optionRuleForm");
-    ////    appRulerow.setRuleCode("row");
-    ////    appRulerow.setRuleName("宽度");
-    ////    appRulerow.setRuleType("2");
-    ////    appRulerow.setRuleValue("6");
-    ////    MdmModuleDbFiledsRuleEntity appRuletype = new MdmModuleDbFiledsRuleEntity();
-    ////    appRuletype.setFormName("optionRuleForm");
-    ////    appRuletype.setRuleCode("type");
-    ////    appRuletype.setRuleName("数据类型");
-    ////    appRuletype.setRuleType("2");
-    ////    appRuletype.setRuleValue("select");
-    ////    MdmModuleDbFiledsRuleEntity appRulerequired = new MdmModuleDbFiledsRuleEntity();
-    ////    appRulerequired.setFormName("optionRuleForm");
-    ////    appRulerequired.setRuleCode("required");
-    ////    appRulerequired.setRuleName("必填");
-    ////    appRulerequired.setRuleType("2");
-    ////    MdmModuleDbFiledsRuleEntity appRuleservice = new MdmModuleDbFiledsRuleEntity();
-    ////    appRuleservice.setFormName("typeOptionRuleForm");
-    ////    appRuleservice.setRuleCode("service");
-    ////    appRuleservice.setRuleName("服务名称");
-    ////    appRuleservice.setRuleType("2");
-    ////    appRuleservice.setRuleValue("sys_application");
-    ////    MdmModuleDbFiledsRuleEntity appRulelabel = new MdmModuleDbFiledsRuleEntity();
-    ////    appRulelabel.setFormName("typeOptionRuleForm");
-    ////    appRulelabel.setRuleCode("label");
-    ////    appRulelabel.setRuleName("label");
-    ////    appRulelabel.setRuleType("2");
-    ////    appRulelabel.setRuleValue("name");
-    ////    MdmModuleDbFiledsRuleEntity appRulevalue = new MdmModuleDbFiledsRuleEntity();
-    ////    appRulevalue.setFormName("typeOptionRuleForm");
-    ////    appRulevalue.setRuleCode("value");
-    ////    appRulevalue.setRuleName("value");
-    ////    appRulevalue.setRuleType("2");
-    ////    appRulevalue.setRuleValue("id");
-    ////    appRule.add(appRulevalue);
-    ////    appRule.add(appRulelabel);
-    ////    appRule.add(appRuleservice);
-    ////    appRule.add(appRulerequired);
-    ////    appRule.add(appRuletype);
-    ////    appRule.add(appRulerow);
-    ////    appRule.add(appRuleTitie);
-    ////    appFiled.setMdmModuleDbFiledsRules(appRule);
-    ////    mdmModuleDbFiledsEntityList.add(appFiled);
-    ////
-    ////
-    ////    //status
-    ////    MdmModuleDbFiledsEntity statusFiled = new MdmModuleDbFiledsEntity();
-    ////    statusFiled.setChName("状态");
-    ////    statusFiled.setEnName("status");
-    ////    statusFiled.setFiledLength("50");
-    ////    statusFiled.setFiledType("3");
-    ////    List<MdmModuleDbFiledsRuleEntity> statusRule = new ArrayList<>();
-    ////    MdmModuleDbFiledsRuleEntity statusRuleTitie = new MdmModuleDbFiledsRuleEntity();
-    ////    statusRuleTitie.setFormName("optionRuleForm");
-    ////    statusRuleTitie.setRuleCode("title");
-    ////    statusRuleTitie.setRuleName("显示名");
-    ////    statusRuleTitie.setRuleType("2");
-    ////    statusRuleTitie.setRuleValue("状态");
-    ////    MdmModuleDbFiledsRuleEntity statusRulerow = new MdmModuleDbFiledsRuleEntity();
-    ////    statusRulerow.setFormName("optionRuleForm");
-    ////    statusRulerow.setRuleCode("row");
-    ////    statusRulerow.setRuleName("宽度");
-    ////    statusRulerow.setRuleType("2");
-    ////    statusRulerow.setRuleValue("6");
-    ////    MdmModuleDbFiledsRuleEntity statusRuletype = new MdmModuleDbFiledsRuleEntity();
-    ////    statusRuletype.setFormName("optionRuleForm");
-    ////    statusRuletype.setRuleCode("type");
-    ////    statusRuletype.setRuleName("数据类型");
-    ////    statusRuletype.setRuleType("2");
-    ////    statusRuletype.setRuleValue("input");
-    ////    MdmModuleDbFiledsRuleEntity statusRulerequired = new MdmModuleDbFiledsRuleEntity();
-    ////    statusRulerequired.setFormName("optionRuleForm");
-    ////    statusRulerequired.setRuleCode("required");
-    ////    statusRulerequired.setRuleName("必填");
-    ////    statusRulerequired.setRuleType("2");
-    ////    statusRule.add(statusRulerequired);
-    ////    statusRule.add(statusRuletype);
-    ////    statusRule.add(statusRulerow);
-    ////    statusRule.add(statusRuleTitie);
-    ////    statusFiled.setMdmModuleDbFiledsRules(statusRule);
-    ////    mdmModuleDbFiledsEntityList.add(statusFiled);
-    ////
-    ////
-    ////    //msg
-    ////    MdmModuleDbFiledsEntity msgFiled = new MdmModuleDbFiledsEntity();
-    ////    msgFiled.setChName("描述");
-    ////    msgFiled.setEnName("msg");
-    ////    msgFiled.setFiledLength("200");
-    ////    msgFiled.setFiledType("3");
-    ////    List<MdmModuleDbFiledsRuleEntity> msgRule = new ArrayList<>();
-    ////    MdmModuleDbFiledsRuleEntity msgRuleTitie = new MdmModuleDbFiledsRuleEntity();
-    ////    msgRuleTitie.setFormName("optionRuleForm");
-    ////    msgRuleTitie.setRuleCode("title");
-    ////    msgRuleTitie.setRuleName("显示名");
-    ////    msgRuleTitie.setRuleType("2");
-    ////    msgRuleTitie.setRuleValue("描述");
-    ////    MdmModuleDbFiledsRuleEntity msgRulerow = new MdmModuleDbFiledsRuleEntity();
-    ////    msgRulerow.setFormName("optionRuleForm");
-    ////    msgRulerow.setRuleCode("row");
-    ////    msgRulerow.setRuleName("宽度");
-    ////    msgRulerow.setRuleType("2");
-    ////    msgRulerow.setRuleValue("6");
-    ////    MdmModuleDbFiledsRuleEntity msgRuletype = new MdmModuleDbFiledsRuleEntity();
-    ////    msgRuletype.setFormName("optionRuleForm");
-    ////    msgRuletype.setRuleCode("type");
-    ////    msgRuletype.setRuleName("数据类型");
-    ////    msgRuletype.setRuleType("2");
-    ////    msgRuletype.setRuleValue("input");
-    ////    MdmModuleDbFiledsRuleEntity msgRulerequired = new MdmModuleDbFiledsRuleEntity();
-    ////    msgRulerequired.setFormName("optionRuleForm");
-    ////    msgRulerequired.setRuleCode("required");
-    ////    msgRulerequired.setRuleName("必填");
-    ////    msgRulerequired.setRuleType("2");
-    ////    msgRule.add(msgRulerequired);
-    ////    msgRule.add(msgRuletype);
-    ////    msgRule.add(msgRulerow);
-    ////    msgRule.add(msgRuleTitie);
-    ////    msgFiled.setMdmModuleDbFiledsRules(msgRule);
-    ////    mdmModuleDbFiledsEntityList.add(msgFiled);
-    ////    return mdmModuleDbFiledsEntityList;
-    ////}
-    ////
-    /////**
-    //// * @param object
-    //// * @return com.hzya.frame.web.entity.JsonResultEntity
-    //// * @Author lvleigang
-    //// * @Description 查询数据（list 或者 分页）
-    //// * @Date 1:33 下午 2023/7/12
-    //// **/
-    ////@Override
-    ////public JsonResultEntity queryMdmOptionData(JSONObject object) {
-    ////    ModuleDto entity = getData("jsonStr", object, ModuleDto.class);
-    ////    //校验是否有servecr传参
-    ////    if (!checkStr(entity.getService())) {
-    ////        return BaseResult.getFailureMessageEntity("请先传递服务名");
-    ////    }
-    ////    if (!checkStr(entity.getValue())) {
-    ////        return BaseResult.getFailureMessageEntity("请先传递存储字段");
-    ////    }
-    ////    if (!checkStr(entity.getLabel())) {
-    ////        return BaseResult.getFailureMessageEntity("请先传递显示字段");
-    ////    }
-    ////    //查询数据源主表
-    ////    MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
-    ////    mdmModuleDbEntity.setId(entity.getId());
-    ////    mdmModuleDbEntity.setSts("Y");
-    ////    List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmModuleDbDao.queryBase(mdmModuleDbEntity);
-    ////    if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) {
-    ////        return BaseResult.getFailureMessageEntity("系统错误");
-    ////    }
-    ////    entity.setTableName(mdmModuleDbEntityList.get(0).getDbName());
-    ////    if (entity.getPageNum() != null && entity.getPageSize() != null) {
-    ////        PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
-    ////        List<HashMap<String, Object>> mapList = mdmModuleDao.queryTemplateData(entity);
-    ////        PageInfo pageInfo = new PageInfo(mapList);
-    ////        return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo);
-    ////    } else {
-    ////        List<HashMap<String, Object>> mapList = mdmModuleDao.queryTemplateData(entity);
-    ////        return BaseResult.getSuccessMessageEntity("查询数据成功", mapList);
-    ////    }
-    ////}
-    ////
-    ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据详情数据 区分类型 新增、修改、查看
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //@Override
-    //public JsonResultEntity queryMdmShowDetailsData(JSONObject object) {
+    //public JsonResultEntity queryMdmShowDistribute(JSONObject object) {
     //    MdmDto entity = getData("jsonStr", object, MdmDto.class);
     //    if (entity == null) {
     //        return BaseResult.getFailureMessageEntity("参数不允许为空");
@@ -3505,146 +539,853 @@ public class MdmServiceImpl implements IMdmService {
     //        return BaseResult.getFailureMessageEntity("系统错误");
     //    }
     //    //查询模版
-    //
-    //    MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
-    //    if (mdmModuleEntity == null ) {
+    //    MdmModuleEntity mdmModuleEntity = new MdmModuleEntity();
+    //    mdmModuleEntity.setMdmCode(entity.getMdmCode());
+    //    mdmModuleEntity.setSts("Y");
+    //    List<MdmModuleEntity> mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity);
+    //    if (mdmModuleEntities == null || mdmModuleEntities.size() != 1) {
     //        return BaseResult.getFailureMessageEntity("系统错误");
     //    }
+    //
+    //    //查询数据源主表
+    //    MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
+    //    mdmModuleDbEntity.setMdmId(mdmModuleEntities.get(0).getId());
+    //    mdmModuleDbEntity.setDbType("1");
+    //    mdmModuleDbEntity.setSts("Y");
+    //    List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmModuleDbDao.queryBase(mdmModuleDbEntity);
+    //    if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) {
+    //        return BaseResult.getFailureMessageEntity("系统错误");
+    //    }
+    //    mdmModuleDbEntity = mdmModuleDbEntityList.get(0);
+    //    Map<String, Object> queryData = new HashMap<>();
+    //    queryData.put("tableName", mdmModuleDbEntity.getDbName() + "_distribute");//表名
+    //    queryData.put("id", entity.getId());//字段
+    //    List<MdmDistributeVo> datas = mdmModuleDbDao.getServiceByDistributeIdNoCase(queryData);
+    //    List<MdmDistributeVo> returnData = new ArrayList<>();
+    //
+    //    //查询分发表
+    //    MdmModuleDistributeEntity mdmModuleDistributeEntity = new MdmModuleDistributeEntity();
+    //    mdmModuleDistributeEntity.setMdmId(mdmModuleEntities.get(0).getId());
+    //    mdmModuleDistributeEntity.setSts("Y");
+    //    List<MdmModuleDistributeEntity> mdmModuleDistributeEntities = mdmModuleDistributeDao.queryBase(mdmModuleDistributeEntity);
+    //    if (datas != null && datas.size() > 0) {
+    //        if (mdmModuleDistributeEntities != null && mdmModuleDistributeEntities.size() > 0) {
+    //            for (int i = 0; i < mdmModuleDistributeEntities.size(); i++) {
+    //                boolean flag = false;
+    //                for (int i1 = 0; i1 < datas.size(); i1++) {
+    //                    if (datas.get(i1).getAppId().equals(mdmModuleDistributeEntities.get(i).getAppId())) {
+    //                        flag = true;
+    //                        break;
+    //                    }
+    //                }
+    //                if (!flag) {
+    //                    MdmDistributeVo mdmDistributeVo = new MdmDistributeVo();
+    //                    mdmDistributeVo.setAppId(mdmModuleDistributeEntities.get(i).getAppId());
+    //                    mdmDistributeVo.setStatus("4");
+    //                    mdmDistributeVo.setMsg("未发送");
+    //                    returnData.add(mdmDistributeVo);
+    //                }
+    //            }
+    //        }
+    //        returnData.addAll(datas);
+    //    } else {
+    //        if (mdmModuleDistributeEntities != null && mdmModuleDistributeEntities.size() > 0) {
+    //            for (int i = 0; i < mdmModuleDistributeEntities.size(); i++) {
+    //                MdmDistributeVo mdmDistributeVo = new MdmDistributeVo();
+    //                mdmDistributeVo.setAppId(mdmModuleDistributeEntities.get(i).getAppId());
+    //                mdmDistributeVo.setStatus("4");
+    //                mdmDistributeVo.setMsg("未发送");
+    //                returnData.add(mdmDistributeVo);
+    //            }
+    //        }
+    //    }
+    //    return BaseResult.getSuccessMessageEntity("查询数据成功", returnData);
+    //}
+    //
+    /**
+     * @param object
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 查询数据（list 或者 分页）
+     * @Date 1:33 下午 2023/7/12
+     **/
+    @Override
+    public JsonResultEntity queryTemplateData(JSONObject object) {
+        MdmDto entity = getData("jsonStr", object, MdmDto.class);
+        //校验是否有servecr传参
+        if (!checkStr(entity.getTableName())) {
+            return BaseResult.getFailureMessageEntity("请先传递服务名");
+        }
+        if (!checkStr(entity.getValue())) {
+            return BaseResult.getFailureMessageEntity("请先传递存储字段");
+        }
+        if (!checkStr(entity.getLabel())) {
+            return BaseResult.getFailureMessageEntity("请先传递显示字段");
+        }
+        if (entity.getPageNum() != null && entity.getPageSize() != null) {
+            PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
+            List<HashMap<String, Object>> mapList = mdmModuleDao.querySelectData(entity);
+            PageInfo pageInfo = new PageInfo(mapList);
+            return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo);
+        } else {
+            List<HashMap<String, Object>> mapList = mdmModuleDao.querySelectData(entity);
+            return BaseResult.getSuccessMessageEntity("查询数据成功", mapList);
+        }
+    }
+    //
+    /**
+     * @param object
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 业务数据树形结构，数据查询
+     * @Date 9:40 上午 2023/10/18
+     **/
+    @Override
+    public JsonResultEntity queryMdmShowTreeData(JSONObject object) {
+        MdmDto entity = getData("jsonStr", object, MdmDto.class);
+        if (entity == null) {
+            return BaseResult.getFailureMessageEntity("参数不允许为空");
+        }
+        //if (entity.getTableName() == null || "".equals(entity.getTableName())) {
+        //    return BaseResult.getFailureMessageEntity("系统错误");
+        //}
+        if (entity.getLabel() == null || "".equals(entity.getLabel())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        if (entity.getUpId() == null || "".equals(entity.getUpId())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+
+        }
+        //查询模版
+        MdmModuleEntity  mdmModuleEntities = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
+        if (mdmModuleEntities == null ) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        //查询数据源主表
+        MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
+        mdmModuleDbEntity.setMdmId(mdmModuleEntities.getId());
+        mdmModuleDbEntity.setSts("Y");
+        List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
+        if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
+            if("1".equals(mdmModuleDbEntityList.get(i).getDbType())){
+                mdmModuleDbEntity = mdmModuleDbEntityList.get(i);
+                break;
+            }
+        }
+        entity.setTableName(mdmModuleDbEntity.getDbName());
+
+
+
+        if (checkStr(entity.getId())) {
+            if (!checkStr(entity.getValue())) {
+                return BaseResult.getFailureMessageEntity("请先传递存储字段");
+            }
+            if (entity.getId().contains(",")) {
+                String[] strArray = entity.getId().split(",");  // 使用逗号和空格作为分隔符
+                entity.setIds(strArray);
+                List<HashMap<String, Object>> mapList = mdmModuleDao.queryTemplateDataMore(entity);
+                if (mapList == null || mapList.size() == 0) {
+                    List<HashMap<String, Object>> returnList = new ArrayList<>();
+                    return BaseResult.getSuccessMessageEntity("查询数据成功", returnList);
+                }
+                List<HashMap<String, Object>> returnList = gettochilder(strArray, 0, mapList);
+                return BaseResult.getSuccessMessageEntity("查询数据成功", returnList);
+            } else {
+                HashMap<String, Object> mapList = mdmModuleDao.queryTemplateDataOne(entity);
+                if (mapList == null || mapList.size() == 0) {
+                    List<HashMap<String, Object>> returnList = new ArrayList<>();
+                    return BaseResult.getSuccessMessageEntity("查询数据成功", returnList);
+                }
+                List<HashMap<String, Object>> returnList = new ArrayList<>();
+                returnList.add(mapList);
+                return BaseResult.getSuccessMessageEntity("查询数据成功", returnList);
+            }
+        } else {
+            List<HashMap<String, Object>> mapList = mdmModuleDao.queryDataAll(entity);
+            List<HashMap<String, Object>> returnList = new ArrayList<>();
+
+            if (mapList != null && mapList.size() > 0) {
+                for (int i = 0; i < mapList.size(); i++) {
+                    //默认为根
+                    if (mapList.get(i).get(entity.getUpId()) == null || "".equals(mapList.get(i).get(entity.getUpId()))) {
+                        List<HashMap<String, Object>> children = getchilder(mapList.get(i).get("qsdfg").toString(), mapList, entity);
+                        HashMap<String, Object> re = new HashMap<>();
+                        re.put("id", mapList.get(i).get("qsdfg"));
+                        re.put("label", mapList.get(i).get(entity.getLabel()));
+                        re.put("upID", mapList.get(i).get(entity.getUpId()));
+                        if (children != null && children.size() > 0) {
+                            re.put("children", children);
+                        }
+                        returnList.add(re);
+                    }
+                }
+            }
+            return BaseResult.getSuccessMessageEntity("查询数据成功", returnList);
+        }
+    }
+    //
+    private List<HashMap<String, Object>> gettochilder(String[] strArray, int i, List<HashMap<String, Object>> mapList) {
+        List<HashMap<String, Object>> maps = new ArrayList<>();
+        for (int i1 = 0; i1 < mapList.size(); i1++) {
+            if (strArray[i].equals(mapList.get(i1).get("id").toString())) {
+                if (strArray.length >= (i + 2)) {
+                    mapList.get(i1).put("children", gettochilder(strArray, i + 1, mapList));
+                }
+                maps.add(mapList.get(i1));
+                break;
+            }
+        }
+        return maps;
+    }
+    //
+    //private HashMap<String, Object> getFathers(List<HashMap<String, Object>> mapListAll, HashMap<String, Object> mapList, MdmDto entity) {
+    //    if (mapList.get("upID") == null) {
+    //        return mapList;
+    //    }
+    //    HashMap<String, Object> retList = new HashMap<>();
+    //    if (mapListAll != null && mapListAll.size() > 0) {
+    //        for (int i = 0; i < mapListAll.size(); i++) {
+    //            //等于上级id的时候
+    //            if (mapListAll.get(i).get("qsdfg").equals(mapList.get("upID"))) {
+    //                retList.put("id", mapListAll.get(i).get("qsdfg"));
+    //                retList.put("label", mapListAll.get(i).get(entity.getLabel()));
+    //                retList.put("upID", mapListAll.get(i).get(entity.getUpId()));
+    //                List<HashMap<String, Object>> returnList = new ArrayList<>();
+    //                returnList.add(mapList);
+    //                retList.put("children", returnList);
+    //                break;
+    //            }
+    //        }
+    //    }
+    //    HashMap<String, Object> a = getFathers(mapListAll, retList, entity);
+    //    return a;
+    //}
+    //
+    private List<HashMap<String, Object>> getchilder(String stringObjectHashMap, List<HashMap<String, Object>> mapList, MdmDto entity) {
+        List<HashMap<String, Object>> returnList = new ArrayList<>();
+        if (mapList != null && mapList.size() > 0) {
+            for (int i = 0; i < mapList.size(); i++) {
+                //等于上级id的时候
+                if (stringObjectHashMap.equals(mapList.get(i).get(entity.getUpId()))) {
+                    List<HashMap<String, Object>> children = getchilder(mapList.get(i).get(entity.getUpId()) + "," + mapList.get(i).get("qsdfg"), mapList, entity);
+                    HashMap<String, Object> re = new HashMap<>();
+                    re.put("id", mapList.get(i).get("qsdfg"));
+                    re.put("label", mapList.get(i).get(entity.getLabel()));
+                    re.put("upID", mapList.get(i).get(entity.getUpId()));
+                    if (children != null && children.size() > 0) {
+                        re.put("children", children);
+                    }
+                    returnList.add(re);
+                }
+            }
+        }
+        return returnList;
+    }
+    //
+    /**
+     * @param object
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 主数据详情 区分类型 新增、修改、查看
+     * @Date 9:40 上午 2023/10/18
+     **/
+    @Override
+    public JsonResultEntity queryMdmShowDetails(JSONObject object) {
+        MdmDto entity = getData("jsonStr", object, MdmDto.class);
+        if (entity == null) {
+            return BaseResult.getFailureMessageEntity("参数不允许为空");
+        }
+        if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        if (entity.getShowType() == null || "".equals(entity.getShowType())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        //查询模版
+        //List<MdmModuleEntity> mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity);
+        MdmModuleEntity mdmModuleEntities = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
+        if (mdmModuleEntities == null) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        MdmDetailViewVo mdmViewVo = new MdmDetailViewVo();
+        mdmViewVo.setMdmModuleEntity(mdmModuleEntities);
+
+        //查询数据源主表
+        MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
+        mdmModuleDbEntity.setMdmId(mdmModuleEntities.getId());
+        mdmModuleDbEntity.setSts("Y");
+        List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
+        if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        //查询数据源表下面的字段
+        MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity();
+        mdmModuleDbFiledsEntity.setMdmId(mdmModuleEntities.getId());
+        mdmModuleDbFiledsEntity.setSts("Y");
+        List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity);
+        if (mdmModuleDbFiledsEntityList == null || mdmModuleDbFiledsEntityList.size() == 0) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        //查询字段下的规则
+        MdmModuleDbFiledsRuleEntity mdmModuleDbFiledsRuleEntity = new MdmModuleDbFiledsRuleEntity();
+        mdmModuleDbFiledsRuleEntity.setMdmId(mdmModuleEntities.getId());
+        mdmModuleDbFiledsRuleEntity.setSts("Y");
+        List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRuleEntityList = mdmModuleDbFiledsRuleDao.queryBase(mdmModuleDbFiledsRuleEntity);
+        if (mdmModuleDbFiledsRuleEntityList == null || mdmModuleDbFiledsRuleEntityList.size() == 0) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        MdmModuleViewDetailEntity mdmModuleViewDetailEntity = new MdmModuleViewDetailEntity();
+        mdmModuleViewDetailEntity.setMdmId(mdmModuleEntities.getId());
+        mdmModuleViewDetailEntity.setSts("Y");
+        mdmModuleViewDetailEntity.setViewType(entity.getShowType());//设置显示字段类型
+        List<MdmModuleViewDetailEntity> queryAll = mdmModuleViewDetailDao.queryBase(mdmModuleViewDetailEntity);
+        List<MdmModuleViewDetailEntity> mdmModuleViewDetailEntityList = new ArrayList<>();
+        if(queryAll != null && queryAll.size() > 0){
+            for (int i = 0; i < queryAll.size(); i++) {
+                if(entity.getShowType().equals(queryAll.get(i).getViewType())){
+                    mdmModuleViewDetailEntityList.add(queryAll.get(i));
+                }
+            }
+        }
+        //组装数据
+        assembleMdmShowDetails(mdmViewVo, mdmModuleDbEntityList, mdmModuleDbFiledsEntityList, mdmModuleDbFiledsRuleEntityList, mdmModuleViewDetailEntityList, entity.getShowType());
+        return BaseResult.getSuccessMessageEntity("获取字段成功", mdmViewVo);
+    }
+
+    /**
+     * @param mdmViewVo                       返回对象
+     * @param mdmModuleDbEntityList           数据源表
+     * @param mdmModuleDbFiledsEntityList     数据源字段
+     * @param mdmModuleDbFiledsRuleEntityList 数据源字段规则
+     * @param mdmModuleViewDetailEntityList   数据源显示字段
+     * @return void
+     * @Author lvleigang
+     * @Description 组装显示字段
+     * @Date 9:10 上午 2023/11/6
+     **/
+    private void assembleMdmShowDetails(MdmDetailViewVo mdmViewVo, List<MdmModuleDbEntity> mdmModuleDbEntityList, List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList, List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRuleEntityList, List<MdmModuleViewDetailEntity> mdmModuleViewDetailEntityList, String showType) {
+        //主数据主表
+        MdmModuleDbEntity mainMdmModuleDb = new MdmModuleDbEntity();
+        List<MdmModuleDbFiledsEntity> mainMdmModuleDbFileds = new ArrayList<>();
+        //主数据子表
+        List<MdmModuleDbEntity> sublistMdmModuleDb = new ArrayList<>();
+
+        if (mdmModuleViewDetailEntityList != null && mdmModuleViewDetailEntityList.size() > 0) {
+            //先循环数据源表，设置出数据字段
+            for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
+                if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
+                    //1、主表 2、明细
+                    mainMdmModuleDb = mdmModuleDbEntityList.get(i);
+                    //循环字段表
+                    if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) {
+                        for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
+                            if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) {
+                                for (int b = 0; b < mdmModuleViewDetailEntityList.size(); b++) {
+                                    if (mdmModuleViewDetailEntityList.get(b).getViewFiled().equals(mdmModuleDbFiledsEntityList.get(i1).getId())) {
+                                        mainMdmModuleDbFileds.add(mdmModuleDbFiledsEntityList.get(i1));
+                                        List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRules = new ArrayList<>();
+                                        //循环字段属性
+                                        if (mdmModuleDbFiledsRuleEntityList != null && mdmModuleDbFiledsRuleEntityList.size() > 0) {
+                                            for (int i2 = 0; i2 < mdmModuleDbFiledsRuleEntityList.size(); i2++) {
+                                                if (mdmModuleDbFiledsEntityList.get(i1).getDbId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getDbId())
+                                                        && mdmModuleDbFiledsEntityList.get(i1).getId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getFiledId())) {
+                                                    mdmModuleDbFiledsRules.add(mdmModuleDbFiledsRuleEntityList.get(i2));
+                                                }
+                                            }
+                                        }
+                                        mdmModuleDbFiledsEntityList.get(i1).setMdmModuleDbFiledsRules(mdmModuleDbFiledsRules);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } else if ("2".equals(mdmModuleDbEntityList.get(i).getDbType())) {
+                    //2、明细
+                    sublistMdmModuleDb.add(mdmModuleDbEntityList.get(i));
+                    //循环字段表
+                    if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) {
+                        List<MdmModuleDbFiledsEntity> sublistMdmModuleDbFileds = new ArrayList<>();
+                        for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
+                            if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) {
+                                for (int b = 0; b < mdmModuleViewDetailEntityList.size(); b++) {
+                                    if (mdmModuleViewDetailEntityList.get(b).getViewFiled().equals(mdmModuleDbFiledsEntityList.get(i1).getId())) {
+                                        sublistMdmModuleDbFileds.add(mdmModuleDbFiledsEntityList.get(i1));
+                                        List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRules = new ArrayList<>();
+                                        //循环字段属性
+                                        if (mdmModuleDbFiledsRuleEntityList != null && mdmModuleDbFiledsRuleEntityList.size() > 0) {
+                                            for (int i2 = 0; i2 < mdmModuleDbFiledsRuleEntityList.size(); i2++) {
+                                                if (mdmModuleDbFiledsEntityList.get(i1).getDbId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getDbId())
+                                                        && mdmModuleDbFiledsEntityList.get(i1).getId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getFiledId())) {
+                                                    mdmModuleDbFiledsRules.add(mdmModuleDbFiledsRuleEntityList.get(i2));
+                                                }
+                                            }
+                                        }
+                                        mdmModuleDbFiledsEntityList.get(i1).setMdmModuleDbFiledsRules(mdmModuleDbFiledsRules);
+                                    }
+                                }
+
+                            }
+                        }
+                        mdmModuleDbEntityList.get(i).setSublistMdmModuleDbFileds(sublistMdmModuleDbFileds);
+                    }
+                }
+            }
+            mainMdmModuleDb.setSublistMdmModuleDbFileds(mainMdmModuleDbFileds);
+            mdmViewVo.setMainMdmModuleDb(mainMdmModuleDb);
+            //主数据子表
+            List<MdmModuleDbEntity> mdmModuleDb = new ArrayList<>();
+            if (sublistMdmModuleDb != null && sublistMdmModuleDb.size() > 0) {
+                for (int i = 0; i < sublistMdmModuleDb.size(); i++) {
+                    if (sublistMdmModuleDb.get(i).getSublistMdmModuleDbFileds() != null && sublistMdmModuleDb.get(i).getSublistMdmModuleDbFileds().size() > 0) {
+                        mdmModuleDb.add(sublistMdmModuleDb.get(i));
+                    }
+                }
+            }
+            //if ("5".equals(showType)) {
+            //    MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
+            //    mdmModuleDbEntity.setDbName(mainMdmModuleDb.getDbName() + "_distribute");
+            //    mdmModuleDbEntity.setRemark(mainMdmModuleDb.getRemark() + "分发表");
+            //    mdmModuleDbEntity.setDbType("2");
+            //    List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList1 = getDistributeRole();
+            //    mdmModuleDbEntity.setSublistMdmModuleDbFileds(mdmModuleDbFiledsEntityList1);
+            //    mdmModuleDb.add(mdmModuleDbEntity);
+            //}
+            mdmViewVo.setSublistMdmModuleDb(mdmModuleDb);
+
+        } else {
+            mdmViewVo.setMainMdmModuleDb(mainMdmModuleDb);
+            mdmViewVo.setSublistMdmModuleDb(sublistMdmModuleDb);
+        }
+    }
+    //
+    //private List<MdmModuleDbFiledsEntity> getDistributeRole() {
+    //    List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList = new ArrayList<>();
+    //    //app
+    //    MdmModuleDbFiledsEntity appFiled = new MdmModuleDbFiledsEntity();
+    //    appFiled.setChName("应用");
+    //    appFiled.setEnName("app_id");
+    //    appFiled.setFiledLength("50");
+    //    appFiled.setFiledType("3");
+    //    List<MdmModuleDbFiledsRuleEntity> appRule = new ArrayList<>();
+    //    MdmModuleDbFiledsRuleEntity appRuleTitie = new MdmModuleDbFiledsRuleEntity();
+    //    appRuleTitie.setFormName("optionRuleForm");
+    //    appRuleTitie.setRuleCode("title");
+    //    appRuleTitie.setRuleName("显示名");
+    //    appRuleTitie.setRuleType("2");
+    //    appRuleTitie.setRuleValue("应用");
+    //    MdmModuleDbFiledsRuleEntity appRulerow = new MdmModuleDbFiledsRuleEntity();
+    //    appRulerow.setFormName("optionRuleForm");
+    //    appRulerow.setRuleCode("row");
+    //    appRulerow.setRuleName("宽度");
+    //    appRulerow.setRuleType("2");
+    //    appRulerow.setRuleValue("6");
+    //    MdmModuleDbFiledsRuleEntity appRuletype = new MdmModuleDbFiledsRuleEntity();
+    //    appRuletype.setFormName("optionRuleForm");
+    //    appRuletype.setRuleCode("type");
+    //    appRuletype.setRuleName("数据类型");
+    //    appRuletype.setRuleType("2");
+    //    appRuletype.setRuleValue("select");
+    //    MdmModuleDbFiledsRuleEntity appRulerequired = new MdmModuleDbFiledsRuleEntity();
+    //    appRulerequired.setFormName("optionRuleForm");
+    //    appRulerequired.setRuleCode("required");
+    //    appRulerequired.setRuleName("必填");
+    //    appRulerequired.setRuleType("2");
+    //    MdmModuleDbFiledsRuleEntity appRuleservice = new MdmModuleDbFiledsRuleEntity();
+    //    appRuleservice.setFormName("typeOptionRuleForm");
+    //    appRuleservice.setRuleCode("service");
+    //    appRuleservice.setRuleName("服务名称");
+    //    appRuleservice.setRuleType("2");
+    //    appRuleservice.setRuleValue("sys_application");
+    //    MdmModuleDbFiledsRuleEntity appRulelabel = new MdmModuleDbFiledsRuleEntity();
+    //    appRulelabel.setFormName("typeOptionRuleForm");
+    //    appRulelabel.setRuleCode("label");
+    //    appRulelabel.setRuleName("label");
+    //    appRulelabel.setRuleType("2");
+    //    appRulelabel.setRuleValue("name");
+    //    MdmModuleDbFiledsRuleEntity appRulevalue = new MdmModuleDbFiledsRuleEntity();
+    //    appRulevalue.setFormName("typeOptionRuleForm");
+    //    appRulevalue.setRuleCode("value");
+    //    appRulevalue.setRuleName("value");
+    //    appRulevalue.setRuleType("2");
+    //    appRulevalue.setRuleValue("id");
+    //    appRule.add(appRulevalue);
+    //    appRule.add(appRulelabel);
+    //    appRule.add(appRuleservice);
+    //    appRule.add(appRulerequired);
+    //    appRule.add(appRuletype);
+    //    appRule.add(appRulerow);
+    //    appRule.add(appRuleTitie);
+    //    appFiled.setMdmModuleDbFiledsRules(appRule);
+    //    mdmModuleDbFiledsEntityList.add(appFiled);
+    //
+    //
+    //    //status
+    //    MdmModuleDbFiledsEntity statusFiled = new MdmModuleDbFiledsEntity();
+    //    statusFiled.setChName("状态");
+    //    statusFiled.setEnName("status");
+    //    statusFiled.setFiledLength("50");
+    //    statusFiled.setFiledType("3");
+    //    List<MdmModuleDbFiledsRuleEntity> statusRule = new ArrayList<>();
+    //    MdmModuleDbFiledsRuleEntity statusRuleTitie = new MdmModuleDbFiledsRuleEntity();
+    //    statusRuleTitie.setFormName("optionRuleForm");
+    //    statusRuleTitie.setRuleCode("title");
+    //    statusRuleTitie.setRuleName("显示名");
+    //    statusRuleTitie.setRuleType("2");
+    //    statusRuleTitie.setRuleValue("状态");
+    //    MdmModuleDbFiledsRuleEntity statusRulerow = new MdmModuleDbFiledsRuleEntity();
+    //    statusRulerow.setFormName("optionRuleForm");
+    //    statusRulerow.setRuleCode("row");
+    //    statusRulerow.setRuleName("宽度");
+    //    statusRulerow.setRuleType("2");
+    //    statusRulerow.setRuleValue("6");
+    //    MdmModuleDbFiledsRuleEntity statusRuletype = new MdmModuleDbFiledsRuleEntity();
+    //    statusRuletype.setFormName("optionRuleForm");
+    //    statusRuletype.setRuleCode("type");
+    //    statusRuletype.setRuleName("数据类型");
+    //    statusRuletype.setRuleType("2");
+    //    statusRuletype.setRuleValue("input");
+    //    MdmModuleDbFiledsRuleEntity statusRulerequired = new MdmModuleDbFiledsRuleEntity();
+    //    statusRulerequired.setFormName("optionRuleForm");
+    //    statusRulerequired.setRuleCode("required");
+    //    statusRulerequired.setRuleName("必填");
+    //    statusRulerequired.setRuleType("2");
+    //    statusRule.add(statusRulerequired);
+    //    statusRule.add(statusRuletype);
+    //    statusRule.add(statusRulerow);
+    //    statusRule.add(statusRuleTitie);
+    //    statusFiled.setMdmModuleDbFiledsRules(statusRule);
+    //    mdmModuleDbFiledsEntityList.add(statusFiled);
+    //
+    //
+    //    //msg
+    //    MdmModuleDbFiledsEntity msgFiled = new MdmModuleDbFiledsEntity();
+    //    msgFiled.setChName("描述");
+    //    msgFiled.setEnName("msg");
+    //    msgFiled.setFiledLength("200");
+    //    msgFiled.setFiledType("3");
+    //    List<MdmModuleDbFiledsRuleEntity> msgRule = new ArrayList<>();
+    //    MdmModuleDbFiledsRuleEntity msgRuleTitie = new MdmModuleDbFiledsRuleEntity();
+    //    msgRuleTitie.setFormName("optionRuleForm");
+    //    msgRuleTitie.setRuleCode("title");
+    //    msgRuleTitie.setRuleName("显示名");
+    //    msgRuleTitie.setRuleType("2");
+    //    msgRuleTitie.setRuleValue("描述");
+    //    MdmModuleDbFiledsRuleEntity msgRulerow = new MdmModuleDbFiledsRuleEntity();
+    //    msgRulerow.setFormName("optionRuleForm");
+    //    msgRulerow.setRuleCode("row");
+    //    msgRulerow.setRuleName("宽度");
+    //    msgRulerow.setRuleType("2");
+    //    msgRulerow.setRuleValue("6");
+    //    MdmModuleDbFiledsRuleEntity msgRuletype = new MdmModuleDbFiledsRuleEntity();
+    //    msgRuletype.setFormName("optionRuleForm");
+    //    msgRuletype.setRuleCode("type");
+    //    msgRuletype.setRuleName("数据类型");
+    //    msgRuletype.setRuleType("2");
+    //    msgRuletype.setRuleValue("input");
+    //    MdmModuleDbFiledsRuleEntity msgRulerequired = new MdmModuleDbFiledsRuleEntity();
+    //    msgRulerequired.setFormName("optionRuleForm");
+    //    msgRulerequired.setRuleCode("required");
+    //    msgRulerequired.setRuleName("必填");
+    //    msgRulerequired.setRuleType("2");
+    //    msgRule.add(msgRulerequired);
+    //    msgRule.add(msgRuletype);
+    //    msgRule.add(msgRulerow);
+    //    msgRule.add(msgRuleTitie);
+    //    msgFiled.setMdmModuleDbFiledsRules(msgRule);
+    //    mdmModuleDbFiledsEntityList.add(msgFiled);
+    //    return mdmModuleDbFiledsEntityList;
+    //}
+    //
+    ///**
+    // * @param object
+    // * @return com.hzya.frame.web.entity.JsonResultEntity
+    // * @Author lvleigang
+    // * @Description 查询数据（list 或者 分页）
+    // * @Date 1:33 下午 2023/7/12
+    // **/
+    //@Override
+    //public JsonResultEntity queryMdmOptionData(JSONObject object) {
+    //    ModuleDto entity = getData("jsonStr", object, ModuleDto.class);
+    //    //校验是否有servecr传参
+    //    if (!checkStr(entity.getService())) {
+    //        return BaseResult.getFailureMessageEntity("请先传递服务名");
+    //    }
+    //    if (!checkStr(entity.getValue())) {
+    //        return BaseResult.getFailureMessageEntity("请先传递存储字段");
+    //    }
+    //    if (!checkStr(entity.getLabel())) {
+    //        return BaseResult.getFailureMessageEntity("请先传递显示字段");
+    //    }
     //    //查询数据源主表
     //    MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
-    //    mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
-    //    mdmModuleDbEntity.setSts("Y");
-    //    List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
-    //    if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    String tablename = null;
-    //    JSONObject jsonObject = new JSONObject();
-    //    for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
-    //        //查询数据
-    //        Map<String, Object> queryData = new HashMap<>();
-    //        queryData.put("tableName", mdmModuleDbEntityList.get(i).getDbName());//表名
-    //        if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
-    //            queryData.put("detailFlag", false);//是否明细
-    //            queryData.put("id", entity.getId());//字段
-    //            HashMap<String, Object> datas = mdmModuleDbDao.getServiceDataById(queryData);
-    //            jsonObject.put(mdmModuleDbEntityList.get(i).getDbName(), datas);
-    //            tablename = mdmModuleDbEntityList.get(i).getDbName() + "_distribute";
-    //        } else {
-    //            queryData.put("detailFlag", true);//是否明细
-    //            queryData.put("id", entity.getId());//字段
-    //            List<HashMap<String, Object>> datas = mdmModuleDbDao.getServiceByFormmainId(queryData);
-    //            jsonObject.put(mdmModuleDbEntityList.get(i).getDbName(), datas);
-    //        }
-    //    }
-    //    if (tablename != null && !"".equals(tablename)) {
-    //        Map<String, Object> queryData = new HashMap<>();
-    //        queryData.put("tableName", tablename);//表名
-    //        queryData.put("id", entity.getId());//字段
-    //        List<HashMap<String, Object>> datas = mdmModuleDbDao.getServiceByDistributeId(queryData);
-    //        jsonObject.put(tablename, datas);
-    //    }
-    //
-    //
-    //    return BaseResult.getSuccessMessageEntity("获取数据成功", jsonObject);
-    //}
-    ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据详情数据修改
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //@Override
-    //public JsonResultEntity updateMdmShowDetailsData(JSONObject object) {
-    //    JSONObject jsonObject = getstrObj("jsonStr", object);
-    //    //校验是否有servecr传参
-    //    if (!checkData(jsonObject, "mdmCode")) {
-    //        return BaseResult.getFailureMessageEntity("请先传递服务名");
-    //    }
-    //    if (!checkData(jsonObject, "data")) {
-    //        return BaseResult.getFailureMessageEntity("请先传递要修改的数据");
-    //    }
-    //    JSONObject saveData = jsonObject.getJSONObject("data");
-    //    //校验唯一
-    //    MdmModuleEntity mdmModuleEntity = new MdmModuleEntity();
-    //    mdmModuleEntity.setMdmCode(jsonObject.getLong("mdmCode"));
-    //    mdmModuleEntity.setSts("Y");
-    //    List<MdmModuleEntity> mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity);
-    //    if (mdmModuleEntities == null || mdmModuleEntities.size() != 1) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    mdmModuleEntity = mdmModuleEntities.get(0);
-    //    MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
-    //    mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
+    //    mdmModuleDbEntity.setId(entity.getId());
     //    mdmModuleDbEntity.setSts("Y");
     //    List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmModuleDbDao.queryBase(mdmModuleDbEntity);
     //    if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) {
     //        return BaseResult.getFailureMessageEntity("系统错误");
     //    }
-    //    String res = checkDataOnly(jsonObject.getInteger("mdmCode"), saveData, true, mdmModuleEntity, mdmModuleDbEntityList);
-    //
-    //    if (res == null || "".equals(res)) {
-    //        return BaseResult.getSuccessMessageEntity("修改数据成功");
+    //    entity.setTableName(mdmModuleDbEntityList.get(0).getDbName());
+    //    if (entity.getPageNum() != null && entity.getPageSize() != null) {
+    //        PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
+    //        List<HashMap<String, Object>> mapList = mdmModuleDao.queryTemplateData(entity);
+    //        PageInfo pageInfo = new PageInfo(mapList);
+    //        return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo);
     //    } else {
-    //        return BaseResult.getFailureMessageEntity(res);
+    //        List<HashMap<String, Object>> mapList = mdmModuleDao.queryTemplateData(entity);
+    //        return BaseResult.getSuccessMessageEntity("查询数据成功", mapList);
     //    }
     //}
     //
+    /**
+     * @param object
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 主数据详情数据 区分类型 新增、修改、查看
+     * @Date 9:40 上午 2023/10/18
+     **/
+    @Override
+    public JsonResultEntity queryMdmShowDetailsData(JSONObject object) {
+        MdmDto entity = getData("jsonStr", object, MdmDto.class);
+        if (entity == null) {
+            return BaseResult.getFailureMessageEntity("参数不允许为空");
+        }
+        if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        if (entity.getId() == null || "".equals(entity.getId())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        //查询模版
+
+        MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
+        if (mdmModuleEntity == null ) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        //查询数据源主表
+        MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
+        mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
+        mdmModuleDbEntity.setSts("Y");
+        List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
+        if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        String tablename = null;
+        JSONObject jsonObject = new JSONObject();
+        for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
+            //查询数据
+            Map<String, Object> queryData = new HashMap<>();
+            queryData.put("tableName", mdmModuleDbEntityList.get(i).getDbName());//表名
+            if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
+                queryData.put("detailFlag", false);//是否明细
+                queryData.put("id", entity.getId());//字段
+                HashMap<String, Object> datas = mdmModuleDbDao.getServiceDataById(queryData);
+                jsonObject.put(mdmModuleDbEntityList.get(i).getDbName(), datas);
+                tablename = mdmModuleDbEntityList.get(i).getDbName() + "_distribute";
+            } else {
+                queryData.put("detailFlag", true);//是否明细
+                queryData.put("id", entity.getId());//字段
+                List<HashMap<String, Object>> datas = mdmModuleDbDao.getServiceByFormmainId(queryData);
+                jsonObject.put(mdmModuleDbEntityList.get(i).getDbName(), datas);
+            }
+        }
+        if (tablename != null && !"".equals(tablename)) {
+            Map<String, Object> queryData = new HashMap<>();
+            queryData.put("tableName", tablename);//表名
+            queryData.put("id", entity.getId());//字段
+            List<HashMap<String, Object>> datas = mdmModuleDbDao.getServiceByDistributeId(queryData);
+            jsonObject.put(tablename, datas);
+        }
+
+
+        return BaseResult.getSuccessMessageEntity("获取数据成功", jsonObject);
+    }
+    /**
+     * @param object
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 主数据详情数据修改
+     * @Date 9:40 上午 2023/10/18
+     **/
+    @Override
+    public JsonResultEntity updateMdmShowDetailsData(JSONObject object) {
+        JSONObject jsonObject = getstrObj("jsonStr", object);
+        //校验是否有servecr传参
+        if (!checkData(jsonObject, "mdmCode")) {
+            return BaseResult.getFailureMessageEntity("请先传递服务名");
+        }
+        if (!checkData(jsonObject, "data")) {
+            return BaseResult.getFailureMessageEntity("请先传递要修改的数据");
+        }
+        JSONObject saveData = jsonObject.getJSONObject("data");
+        //校验唯一
+        MdmModuleEntity mdmModuleEntity = new MdmModuleEntity();
+        mdmModuleEntity.setMdmCode(jsonObject.getLong("mdmCode"));
+        mdmModuleEntity.setSts("Y");
+        List<MdmModuleEntity> mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity);
+        if (mdmModuleEntities == null || mdmModuleEntities.size() != 1) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        mdmModuleEntity = mdmModuleEntities.get(0);
+        MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
+        mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
+        mdmModuleDbEntity.setSts("Y");
+        List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmModuleDbDao.queryBase(mdmModuleDbEntity);
+        if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        String res = checkDataOnly(jsonObject.getInteger("mdmCode"), saveData, true, mdmModuleEntity, mdmModuleDbEntityList);
+
+        if (res == null || "".equals(res)) {
+            return BaseResult.getSuccessMessageEntity("修改数据成功");
+        } else {
+            return BaseResult.getFailureMessageEntity(res);
+        }
+    }
+
+
+    /**
+     * @param object
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 主数据详情数据新增
+     * @Date 9:40 上午 2023/10/18
+     **/
+    @Override
+    public JsonResultEntity saveMdmShowDetailsData(JSONObject object) {
+        JSONObject jsonObject = getstrObj("jsonStr", object);
+        //校验是否有servecr传参
+        if (!checkData(jsonObject, "mdmCode")) {
+            return BaseResult.getFailureMessageEntity("请先传递服务名");
+        }
+        if (!checkData(jsonObject, "data")) {
+            return BaseResult.getFailureMessageEntity("请先传递要修改的数据");
+        }
+        JSONObject saveData = jsonObject.getJSONObject("data");
+        //校验唯一
+        MdmModuleEntity mdmModuleEntity = new MdmModuleEntity();
+        mdmModuleEntity.setMdmCode(jsonObject.getLong("mdmCode"));
+        mdmModuleEntity.setSts("Y");
+        List<MdmModuleEntity> mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity);
+        if (mdmModuleEntities == null || mdmModuleEntities.size() != 1) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        mdmModuleEntity = mdmModuleEntities.get(0);
+        MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
+        mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
+        mdmModuleDbEntity.setSts("Y");
+        List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmModuleDbDao.queryBase(mdmModuleDbEntity);
+        if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        String res = checkDataOnly(jsonObject.getInteger("mdmCode"), saveData, false, mdmModuleEntity, mdmModuleDbEntityList);
+
+        if (res == null || "".equals(res)) {
+            return BaseResult.getSuccessMessageEntity("保存数据成功");
+        } else {
+            return BaseResult.getFailureMessageEntity(res);
+        }
+    }
+    //
+    //
+    /**
+     * @param object
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 主数据详情数据修改
+     * @Date 9:40 上午 2023/10/18
+     **/
+    @Override
+    public JsonResultEntity deleteMdmShowDetailsData(JSONObject object) {
+        JSONObject jsonObject = getstrObj("jsonStr", object);
+        //校验是否有servecr传参
+        if (!checkData(jsonObject, "mdmCode")) {
+            return BaseResult.getFailureMessageEntity("请先传递服务名");
+        }
+        if (!checkData(jsonObject, "id")) {
+            return BaseResult.getFailureMessageEntity("请先传递要删除的数据");
+        }
+        //校验唯一
+        MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(jsonObject.getLong("mdmCode"));
+        if (mdmModuleEntity == null ) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
+        mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
+        mdmModuleDbEntity.setSts("Y");
+        List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
+        if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
+            if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
+
+                //查询视图，如果树形，删除下级及子集
+                //查询展示类型
+                MdmModuleViewEntity mdmModuleViewEntity = new MdmModuleViewEntity();
+                mdmModuleViewEntity.setMdmId(mdmModuleEntity.getId());
+                mdmModuleViewEntity.setSts("Y");
+                List<MdmModuleViewEntity> moduleViewEntityList = mdmModuleViewDao.queryBase(mdmModuleViewEntity);
+                if (moduleViewEntityList == null || moduleViewEntityList.size() != 1) {
+                    return BaseResult.getFailureMessageEntity("系统错误");
+                }
+                mdmModuleViewEntity = moduleViewEntityList.get(0);
+
+
+                //删除自己
+                FormmainDeleteDto formmainDeleteDto = new FormmainDeleteDto();
+                formmainDeleteDto.setId(jsonObject.getString("id"));
+                formmainDeleteDto.setLoginId(StpUtil.getLoginIdAsString());
+                formmainDeleteDto.setTableName(mdmModuleDbEntityList.get(i).getDbName());
+                if (mdmModuleViewEntity != null && mdmModuleViewEntity.getViewName() != null && "1".equals(mdmModuleViewEntity.getViewName()) &&
+                        mdmModuleViewEntity.getUpIdFiled() != null && !"".equals(mdmModuleViewEntity.getUpIdFiled())) {
+                    formmainDeleteDto.setUpIdFiled(mdmModuleViewEntity.getUpIdFiled());
+
+                    Map<String, Object> queryData = new HashMap<>();
+                    queryData.put("tableName", mdmModuleDbEntityList.get(i).getDbName());//表名
+                    queryData.put("detailFlag", false);//是否明细
+                    queryData.put("id", jsonObject.getString("id"));//字段
+                    HashMap<String, Object> datas = mdmModuleDbDao.getServiceDataById(queryData);
+                    String upValue = null;
+                    if (datas != null && datas.get(mdmModuleViewEntity.getUpIdFiled()) != null) {
+                        upValue = datas.get(mdmModuleViewEntity.getUpIdFiled()).toString();
+                    }
+                    if (upValue != null) {
+                        formmainDeleteDto.setUpIdFiledValue(upValue + "," + jsonObject.getString("id"));
+                    } else {
+                        formmainDeleteDto.setUpIdFiledValue(jsonObject.getString("id"));
+                    }
+                    mdmModuleDao.deleteChilder(formmainDeleteDto);
+                }
+                mdmModuleDao.deleteTemplateById(formmainDeleteDto);
+
+            } else {
+                //删除明细
+                FormmainDeleteDto formmainDeleteDto = new FormmainDeleteDto();
+                formmainDeleteDto.setFormmain_id(jsonObject.getString("id"));
+                formmainDeleteDto.setLoginId(StpUtil.getLoginIdAsString());
+                formmainDeleteDto.setTableName(mdmModuleDbEntityList.get(i).getDbName());
+                mdmModuleDao.deleteTemplateById(formmainDeleteDto);
+            }
+        }
+        return BaseResult.getSuccessMessageEntity("删除数据成功");
+    }
+    //
     //
     ///**
     // * @param object
     // * @return com.hzya.frame.web.entity.JsonResultEntity
     // * @Author lvleigang
-    // * @Description 主数据详情数据新增
+    // * @Description 处理分发数据
     // * @Date 9:40 上午 2023/10/18
     // **/
     //@Override
-    //public JsonResultEntity saveMdmShowDetailsData(JSONObject object) {
-    //    JSONObject jsonObject = getstrObj("jsonStr", object);
-    //    //校验是否有servecr传参
-    //    if (!checkData(jsonObject, "mdmCode")) {
-    //        return BaseResult.getFailureMessageEntity("请先传递服务名");
-    //    }
-    //    if (!checkData(jsonObject, "data")) {
-    //        return BaseResult.getFailureMessageEntity("请先传递要修改的数据");
-    //    }
-    //    JSONObject saveData = jsonObject.getJSONObject("data");
-    //    //校验唯一
-    //    MdmModuleEntity mdmModuleEntity = new MdmModuleEntity();
-    //    mdmModuleEntity.setMdmCode(jsonObject.getLong("mdmCode"));
-    //    mdmModuleEntity.setSts("Y");
-    //    List<MdmModuleEntity> mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity);
-    //    if (mdmModuleEntities == null || mdmModuleEntities.size() != 1) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    mdmModuleEntity = mdmModuleEntities.get(0);
-    //    MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
-    //    mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
-    //    mdmModuleDbEntity.setSts("Y");
-    //    List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmModuleDbDao.queryBase(mdmModuleDbEntity);
-    //    if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
-    //    }
-    //    String res = checkDataOnly(jsonObject.getInteger("mdmCode"), saveData, false, mdmModuleEntity, mdmModuleDbEntityList);
-    //
-    //    if (res == null || "".equals(res)) {
-    //        return BaseResult.getSuccessMessageEntity("保存数据成功");
-    //    } else {
-    //        return BaseResult.getFailureMessageEntity(res);
-    //    }
-    //}
-    ////
-    ////
-    ///**
-    // * @param object
-    // * @return com.hzya.frame.web.entity.JsonResultEntity
-    // * @Author lvleigang
-    // * @Description 主数据详情数据修改
-    // * @Date 9:40 上午 2023/10/18
-    // **/
-    //@Override
-    //public JsonResultEntity deleteMdmShowDetailsData(JSONObject object) {
+    //public JsonResultEntity doMdmDistribute(JSONObject object) {
     //    JSONObject jsonObject = getstrObj("jsonStr", object);
     //    //校验是否有servecr传参
     //    if (!checkData(jsonObject, "mdmCode")) {
@@ -3653,572 +1394,474 @@ public class MdmServiceImpl implements IMdmService {
     //    if (!checkData(jsonObject, "id")) {
     //        return BaseResult.getFailureMessageEntity("请先传递要删除的数据");
     //    }
-    //    //校验唯一
-    //    MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(jsonObject.getLong("mdmCode"));
-    //    if (mdmModuleEntity == null ) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
+    //    if (!checkData(jsonObject, "appID")) {
+    //        return BaseResult.getFailureMessageEntity("请先传递要删除的数据");
     //    }
-    //    MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
-    //    mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
-    //    mdmModuleDbEntity.setSts("Y");
-    //    List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
-    //    if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) {
-    //        return BaseResult.getFailureMessageEntity("系统错误");
+    //    if (!checkData(jsonObject, "dataType")) {
+    //        return BaseResult.getFailureMessageEntity("请先传递要删除的数据");
     //    }
-    //    for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
-    //        if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
+    //    if("2".equals(jsonObject.getString("dataType"))){
+    //        boolean flag = false;
+    //        //1、根据服务名查询分发数据
+    //        MdmModuleEntity mdmModuleEntity = new MdmModuleEntity();
+    //        mdmModuleEntity.setMdmCode(jsonObject.getInteger("mdmCode"));
+    //        mdmModuleEntity.setSts("Y");
+    //        List<MdmModuleEntity> mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity);
+    //        if (mdmModuleEntities != null && mdmModuleEntities.size() == 1) {
+    //            MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
+    //            mdmModuleDbEntity.setMdmId(mdmModuleEntities.get(0).getId());
+    //            mdmModuleDbEntity.setDbType("1");
+    //            mdmModuleDbEntity.setSts("Y");
+    //            List<MdmModuleDbEntity> mdmModuleDbEntities =  mdmModuleDbDao.queryBase(mdmModuleDbEntity);
+    //            if (mdmModuleDbEntities != null && mdmModuleDbEntities.size() == 1) {
+    //                mdmModuleDbEntity = mdmModuleDbEntities.get(0);
+    //            }
+    //            MdmModuleDistributeEntity mdmModuleDistributeEntity = new MdmModuleDistributeEntity();
+    //            mdmModuleDistributeEntity.setAppId(jsonObject.getString("appID"));
+    //            mdmModuleDistributeEntity.setMdmId(mdmModuleEntities.get(0).getId());
+    //            List<MdmModuleDistributeEntity> mdmModuleDistributeEntities = mdmModuleDistributeDao.queryBase(mdmModuleDistributeEntity);
+    //            if (mdmModuleDistributeEntities != null && mdmModuleDistributeEntities.size() == 1) {
+    //                if (mdmModuleDistributeEntities.get(0).getAddType() != null && "1".equals(mdmModuleDistributeEntities.get(0).getAddType())) {
+    //                    //2、查找插件
+    //                    if (mdmModuleDistributeEntities.get(0).getAddPlug() != null && !"".equals(mdmModuleDistributeEntities.get(0).getAddPlug())) {
+    //                        //2、查找插件
+    //                        SysApplicationPluginEntity sysApplicationPluginEntity = sysApplicationPluginDao.get(mdmModuleDistributeEntities.get(0).getAddPlug());
+    //                        if(sysApplicationPluginEntity.getPluginCode() != null && !"".equals(sysApplicationPluginEntity.getPluginCode())){
+    //                            //3、调用插件
+    //                            PluginBaseEntity pluginBaseEntity = PluginUtils.getPluginsById(sysApplicationPluginEntity.getPluginCode());
+    //                            try {
+    //                                JsonResultEntity s = pluginBaseEntity.executeBusiness(jsonObject);
+    //                                flag = true;
+    //                            } catch (Exception e) {
+    //                                logger.error("插件处理失败"+e.getMessage());
+    //                            }
+    //                        }
+    //                    }
+    //                } else {
+    //                    //TODO 连线
+    //                    flag = true;
+    //                }
+    //            }
+    //            if(mdmModuleDbEntity.getDbName()!= null && !"".equals(mdmModuleDbEntity.getDbName())) {
+    //                MdmDistributeEntity mdmDistributeEntity = new MdmDistributeEntity();
+    //                mdmDistributeEntity.setCreate();
+    //                mdmDistributeEntity.setTableName(mdmModuleDbEntity.getDbName()+"_distribute");
+    //                mdmDistributeEntity.setFormmainId(jsonObject.getString("id"));
+    //                mdmDistributeEntity.setAppId(jsonObject.getString("appID"));
+    //                mdmDistributeEntity.setStatus("1");
+    //                mdmDistributeEntity.setMsg("发送成功");
+    //                if (!flag) {
+    //                    mdmDistributeEntity.setStatus("3");
+    //                    mdmDistributeEntity.setMsg("发送失败");
+    //                }
+    //                mdmModuleDao.saveDistribute(mdmDistributeEntity);
+    //                return BaseResult.getSuccessMessageEntity("下发数据成功");
     //
-    //            //查询视图，如果树形，删除下级及子集
-    //            //查询展示类型
-    //            MdmModuleViewEntity mdmModuleViewEntity = new MdmModuleViewEntity();
-    //            mdmModuleViewEntity.setMdmId(mdmModuleEntity.getId());
-    //            mdmModuleViewEntity.setSts("Y");
-    //            List<MdmModuleViewEntity> moduleViewEntityList = mdmServiceCache.queryMdmModuleView(mdmModuleViewEntity);
-    //            if (moduleViewEntityList == null || moduleViewEntityList.size() != 1) {
+    //            }else {
     //                return BaseResult.getFailureMessageEntity("系统错误");
     //            }
-    //            mdmModuleViewEntity = moduleViewEntityList.get(0);
-    //
-    //
-    //            //删除自己
-    //            FormmainDeleteDto formmainDeleteDto = new FormmainDeleteDto();
-    //            formmainDeleteDto.setId(jsonObject.getString("id"));
-    //            formmainDeleteDto.setLoginId(StpUtil.getLoginIdAsString());
-    //            formmainDeleteDto.setTableName(mdmModuleDbEntityList.get(i).getDbName());
-    //            if (mdmModuleViewEntity != null && mdmModuleViewEntity.getViewName() != null && "1".equals(mdmModuleViewEntity.getViewName()) &&
-    //                    mdmModuleViewEntity.getUpIdFiled() != null && !"".equals(mdmModuleViewEntity.getUpIdFiled())) {
-    //                formmainDeleteDto.setUpIdFiled(mdmModuleViewEntity.getUpIdFiled());
-    //
-    //                Map<String, Object> queryData = new HashMap<>();
-    //                queryData.put("tableName", mdmModuleDbEntityList.get(i).getDbName());//表名
-    //                queryData.put("detailFlag", false);//是否明细
-    //                queryData.put("id", jsonObject.getString("id"));//字段
-    //                HashMap<String, Object> datas = mdmModuleDbDao.getServiceDataById(queryData);
-    //                String upValue = null;
-    //                if (datas != null && datas.get(mdmModuleViewEntity.getUpIdFiled()) != null) {
-    //                    upValue = datas.get(mdmModuleViewEntity.getUpIdFiled()).toString();
-    //                }
-    //                if (upValue != null) {
-    //                    formmainDeleteDto.setUpIdFiledValue(upValue + "," + jsonObject.getString("id"));
-    //                } else {
-    //                    formmainDeleteDto.setUpIdFiledValue(jsonObject.getString("id"));
-    //                }
-    //                mdmModuleDao.deleteChilder(formmainDeleteDto);
-    //            }
-    //            mdmModuleDao.deleteTemplateById(formmainDeleteDto);
-    //
-    //        } else {
-    //            //删除明细
-    //            FormmainDeleteDto formmainDeleteDto = new FormmainDeleteDto();
-    //            formmainDeleteDto.setFormmain_id(jsonObject.getString("id"));
-    //            formmainDeleteDto.setLoginId(StpUtil.getLoginIdAsString());
-    //            formmainDeleteDto.setTableName(mdmModuleDbEntityList.get(i).getDbName());
-    //            mdmModuleDao.deleteTemplateById(formmainDeleteDto);
+    //        }else {
+    //            return BaseResult.getFailureMessageEntity("系统错误");
     //        }
-    //    }
-    //    return BaseResult.getSuccessMessageEntity("删除数据成功");
-    //}
-    ////
-    ////
-    /////**
-    //// * @param object
-    //// * @return com.hzya.frame.web.entity.JsonResultEntity
-    //// * @Author lvleigang
-    //// * @Description 处理分发数据
-    //// * @Date 9:40 上午 2023/10/18
-    //// **/
-    ////@Override
-    ////public JsonResultEntity doMdmDistribute(JSONObject object) {
-    ////    JSONObject jsonObject = getstrObj("jsonStr", object);
-    ////    //校验是否有servecr传参
-    ////    if (!checkData(jsonObject, "mdmCode")) {
-    ////        return BaseResult.getFailureMessageEntity("请先传递服务名");
-    ////    }
-    ////    if (!checkData(jsonObject, "id")) {
-    ////        return BaseResult.getFailureMessageEntity("请先传递要删除的数据");
-    ////    }
-    ////    if (!checkData(jsonObject, "appID")) {
-    ////        return BaseResult.getFailureMessageEntity("请先传递要删除的数据");
-    ////    }
-    ////    if (!checkData(jsonObject, "dataType")) {
-    ////        return BaseResult.getFailureMessageEntity("请先传递要删除的数据");
-    ////    }
-    ////    if("2".equals(jsonObject.getString("dataType"))){
-    ////        boolean flag = false;
-    ////        //1、根据服务名查询分发数据
-    ////        MdmModuleEntity mdmModuleEntity = new MdmModuleEntity();
-    ////        mdmModuleEntity.setMdmCode(jsonObject.getInteger("mdmCode"));
-    ////        mdmModuleEntity.setSts("Y");
-    ////        List<MdmModuleEntity> mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity);
-    ////        if (mdmModuleEntities != null && mdmModuleEntities.size() == 1) {
-    ////            MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
-    ////            mdmModuleDbEntity.setMdmId(mdmModuleEntities.get(0).getId());
-    ////            mdmModuleDbEntity.setDbType("1");
-    ////            mdmModuleDbEntity.setSts("Y");
-    ////            List<MdmModuleDbEntity> mdmModuleDbEntities =  mdmModuleDbDao.queryBase(mdmModuleDbEntity);
-    ////            if (mdmModuleDbEntities != null && mdmModuleDbEntities.size() == 1) {
-    ////                mdmModuleDbEntity = mdmModuleDbEntities.get(0);
-    ////            }
-    ////            MdmModuleDistributeEntity mdmModuleDistributeEntity = new MdmModuleDistributeEntity();
-    ////            mdmModuleDistributeEntity.setAppId(jsonObject.getString("appID"));
-    ////            mdmModuleDistributeEntity.setMdmId(mdmModuleEntities.get(0).getId());
-    ////            List<MdmModuleDistributeEntity> mdmModuleDistributeEntities = mdmModuleDistributeDao.queryBase(mdmModuleDistributeEntity);
-    ////            if (mdmModuleDistributeEntities != null && mdmModuleDistributeEntities.size() == 1) {
-    ////                if (mdmModuleDistributeEntities.get(0).getAddType() != null && "1".equals(mdmModuleDistributeEntities.get(0).getAddType())) {
-    ////                    //2、查找插件
-    ////                    if (mdmModuleDistributeEntities.get(0).getAddPlug() != null && !"".equals(mdmModuleDistributeEntities.get(0).getAddPlug())) {
-    ////                        //2、查找插件
-    ////                        SysApplicationPluginEntity sysApplicationPluginEntity = sysApplicationPluginDao.get(mdmModuleDistributeEntities.get(0).getAddPlug());
-    ////                        if(sysApplicationPluginEntity.getPluginCode() != null && !"".equals(sysApplicationPluginEntity.getPluginCode())){
-    ////                            //3、调用插件
-    ////                            PluginBaseEntity pluginBaseEntity = PluginUtils.getPluginsById(sysApplicationPluginEntity.getPluginCode());
-    ////                            try {
-    ////                                JsonResultEntity s = pluginBaseEntity.executeBusiness(jsonObject);
-    ////                                flag = true;
-    ////                            } catch (Exception e) {
-    ////                                logger.error("插件处理失败"+e.getMessage());
-    ////                            }
-    ////                        }
-    ////                    }
-    ////                } else {
-    ////                    //TODO 连线
-    ////                    flag = true;
-    ////                }
-    ////            }
-    ////            if(mdmModuleDbEntity.getDbName()!= null && !"".equals(mdmModuleDbEntity.getDbName())) {
-    ////                MdmDistributeEntity mdmDistributeEntity = new MdmDistributeEntity();
-    ////                mdmDistributeEntity.setCreate();
-    ////                mdmDistributeEntity.setTableName(mdmModuleDbEntity.getDbName()+"_distribute");
-    ////                mdmDistributeEntity.setFormmainId(jsonObject.getString("id"));
-    ////                mdmDistributeEntity.setAppId(jsonObject.getString("appID"));
-    ////                mdmDistributeEntity.setStatus("1");
-    ////                mdmDistributeEntity.setMsg("发送成功");
-    ////                if (!flag) {
-    ////                    mdmDistributeEntity.setStatus("3");
-    ////                    mdmDistributeEntity.setMsg("发送失败");
-    ////                }
-    ////                mdmModuleDao.saveDistribute(mdmDistributeEntity);
-    ////                return BaseResult.getSuccessMessageEntity("下发数据成功");
-    ////
-    ////            }else {
-    ////                return BaseResult.getFailureMessageEntity("系统错误");
-    ////            }
-    ////        }else {
-    ////            return BaseResult.getFailureMessageEntity("系统错误");
-    ////        }
-    ////    }else {
-    ////        if (!checkData(jsonObject, "distributeID")) {
-    ////            return BaseResult.getFailureMessageEntity("请先传递分发数据");
-    ////        }
-    ////        boolean flag = false;
-    ////        //1、根据服务名查询分发数据
-    ////        MdmModuleEntity mdmModuleEntity = new MdmModuleEntity();
-    ////        mdmModuleEntity.setMdmCode(jsonObject.getInteger("mdmCode"));
-    ////        mdmModuleEntity.setSts("Y");
-    ////        List<MdmModuleEntity> mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity);
-    ////        if (mdmModuleEntities != null && mdmModuleEntities.size() == 1) {
-    ////            MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
-    ////            mdmModuleDbEntity.setMdmId(mdmModuleEntities.get(0).getId());
-    ////            mdmModuleDbEntity.setDbType("1");
-    ////            mdmModuleDbEntity.setSts("Y");
-    ////            List<MdmModuleDbEntity> mdmModuleDbEntities =  mdmModuleDbDao.queryBase(mdmModuleDbEntity);
-    ////            if (mdmModuleDbEntities != null && mdmModuleDbEntities.size() == 1) {
-    ////                mdmModuleDbEntity = mdmModuleDbEntities.get(0);
-    ////            }
-    ////            MdmModuleDistributeEntity mdmModuleDistributeEntity = new MdmModuleDistributeEntity();
-    ////            mdmModuleDistributeEntity.setAppId(jsonObject.getString("appID"));
-    ////            mdmModuleDistributeEntity.setMdmId(mdmModuleEntities.get(0).getId());
-    ////            List<MdmModuleDistributeEntity> mdmModuleDistributeEntities = mdmModuleDistributeDao.queryBase(mdmModuleDistributeEntity);
-    ////            if (mdmModuleDistributeEntities != null && mdmModuleDistributeEntities.size() == 1) {
-    ////                if (mdmModuleDistributeEntities.get(0).getDeleteType() != null && "1".equals(mdmModuleDistributeEntities.get(0).getDeleteType())) {
-    ////                    //2、查找插件
-    ////                    if (mdmModuleDistributeEntities.get(0).getDeletePlug() != null && !"".equals(mdmModuleDistributeEntities.get(0).getDeletePlug())) {
-    ////                        //2、查找插件
-    ////                        SysApplicationPluginEntity sysApplicationPluginEntity = sysApplicationPluginDao.get(mdmModuleDistributeEntities.get(0).getDeletePlug());
-    ////                        if(sysApplicationPluginEntity.getPluginCode() != null && !"".equals(sysApplicationPluginEntity.getPluginCode())){
-    ////                            //3、调用插件
-    ////                            PluginBaseEntity pluginBaseEntity = PluginUtils.getPluginsById(sysApplicationPluginEntity.getPluginCode());
-    ////                            try {
-    ////                                JsonResultEntity s = pluginBaseEntity.executeBusiness(jsonObject);
-    ////                                flag = true;
-    ////                            } catch (Exception e) {
-    ////                                logger.error("插件处理失败"+e.getMessage());
-    ////                            }
-    ////                        }
-    ////                    }
-    ////                } else {
-    ////                    //TODO 连线
-    ////                    flag = true;
-    ////                }
-    ////            }
-    ////            if(mdmModuleDbEntity.getDbName()!= null && !"".equals(mdmModuleDbEntity.getDbName())) {
-    ////                //删除数据
-    ////                MdmDistributeEntity mdmDistributeEntity = new MdmDistributeEntity();
-    ////                mdmDistributeEntity.setId(jsonObject.getString("distributeID"));
-    ////                mdmDistributeEntity.setTableName(mdmModuleDbEntity.getDbName()+"_distribute");
-    ////                mdmDistributeEntity.setFormmainId(jsonObject.getString("id"));
-    ////                mdmDistributeEntity.setAppId(jsonObject.getString("appID"));
-    ////                mdmDistributeEntity.setStatus("1");
-    ////                mdmDistributeEntity.setMsg("删除成功");
-    ////                if (!flag) {
-    ////                    mdmDistributeEntity.setStatus("3");
-    ////                    mdmDistributeEntity.setMsg("删除失败");
-    ////                }
-    ////                mdmModuleDao.updateDistribute(mdmDistributeEntity);
-    ////                return BaseResult.getSuccessMessageEntity("删除数据成功");
-    ////
-    ////            }else {
-    ////                return BaseResult.getFailureMessageEntity("系统错误");
-    ////            }
-    ////        }else {
-    ////            return BaseResult.getFailureMessageEntity("系统错误");
-    ////        }
-    ////    }
-    ////
-    ////}
-    ////
-    ///**
-    // * @param mdmCode
-    // * @param saveData
-    // * @param mdmModuleEntity
-    // * @param mdmModuleDbEntityList
-    // * @param flag                  修改 新增
-    // * @return java.lang.String
-    // * @Author lvleigang
-    // * @Description 校验数据
-    // * @Date 11:20 上午 2023/11/6
-    // **/
-    //private String checkDataOnly(Integer mdmCode, JSONObject saveData, boolean flag, MdmModuleEntity mdmModuleEntity, List<MdmModuleDbEntity> mdmModuleDbEntityList) {
-    //    StringBuffer str = new StringBuffer();
-    //
-    //    //查询字段
-    //    //查询字段下的必填规则
-    //    MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity();
-    //    mdmModuleDbFiledsEntity.setMdmId(mdmModuleEntity.getId());
-    //    mdmModuleDbFiledsEntity.setSts("Y");
-    //    mdmModuleDbFiledsEntity.setRoletype("required");
-    //    mdmModuleDbFiledsEntity.setRoleValue("true");
-    //    List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList = mdmModuleDbFiledsDao.queryBase(mdmModuleDbFiledsEntity);
-    //
-    //    if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) {
-    //        for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
-    //            if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
-    //                JSONObject jsonObject = saveData.getJSONObject(mdmModuleDbEntityList.get(i).getDbName());
-    //                for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
-    //                    if (mdmModuleDbFiledsEntityList.get(i1).getDbId().equals(mdmModuleDbEntityList.get(i).getId())) {
-    //                        if (jsonObject.get(mdmModuleDbFiledsEntityList.get(i1).getEnName()) == null || "".equals(jsonObject.getString(mdmModuleDbFiledsEntityList.get(i1).getEnName()))) {
-    //                            if (str.toString() != null && !"".equals(str.toString())) {
-    //                                str.append("；");
-    //                            }
-    //                            str.append(mdmModuleDbEntityList.get(i).getRemark() + "的" + mdmModuleDbFiledsEntityList.get(i1).getChName() + "不为空");
-    //                        }
-    //                    }
-    //                }
-    //            } else {
-    //                JSONArray jsonArray = saveData.getJSONArray(mdmModuleDbEntityList.get(i).getDbName());
-    //                if (jsonArray != null && jsonArray.size() > 0) {
-    //                    for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
-    //                        if (mdmModuleDbFiledsEntityList.get(i1).getDbId().equals(mdmModuleDbEntityList.get(i).getId())) {
-    //                            for (int i2 = 0; i2 < jsonArray.size(); i2++) {
-    //                                JSONObject jsonObject = jsonArray.getJSONObject(i2);
-    //                                if (jsonObject.get(mdmModuleDbFiledsEntityList.get(i1).getEnName()) == null || "".equals(jsonObject.getString(mdmModuleDbFiledsEntityList.get(i1).getEnName()))) {
-    //                                    if (str.toString() != null && !"".equals(str.toString())) {
-    //                                        str.append("；");
-    //                                    }
-    //                                    str.append(mdmModuleDbEntityList.get(i).getRemark() + "的" + mdmModuleDbFiledsEntityList.get(i1).getChName() + "不为空");
-    //                                    break;
-    //                                }
-    //                            }
-    //                        }
-    //                    }
-    //                }
-    //            }
+    //    }else {
+    //        if (!checkData(jsonObject, "distributeID")) {
+    //            return BaseResult.getFailureMessageEntity("请先传递分发数据");
     //        }
-    //    }
-    //
-    //    if (str == null || "".equals(str.toString())) {
-    //        //校验数据
-    //        MdmModuleDbFiledsEntity onlyFiledsEntity = new MdmModuleDbFiledsEntity();
-    //        onlyFiledsEntity.setMdmId(mdmModuleEntity.getId());
-    //        onlyFiledsEntity.setSts("Y");
-    //        onlyFiledsEntity.setRoletype("fieldsSole");
-    //        onlyFiledsEntity.setRoleValue("true");
-    //
-    //        List<MdmModuleDbFiledsEntity> onlyEntityList = mdmModuleDbFiledsDao.queryBase(onlyFiledsEntity);
-    //
-    //        if (onlyEntityList != null && onlyEntityList.size() > 0) {
-    //            for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
-    //                if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
-    //                    JSONObject jsonObject = saveData.getJSONObject(mdmModuleDbEntityList.get(i).getDbName());
-    //                    for (int i1 = 0; i1 < onlyEntityList.size(); i1++) {
-    //                        if (onlyEntityList.get(i1).getDbId().equals(mdmModuleDbEntityList.get(i).getId())) {
-    //                            //校验唯一
-    //                            Map<String, String> map = new HashMap<>();
-    //                            map.put("tableName", mdmModuleDbEntityList.get(i).getDbName());
-    //                            if (flag) {
-    //                                map.put("id", jsonObject.getString("id"));
-    //                            }
-    //                            map.put("filedName", onlyEntityList.get(i1).getEnName());
-    //                            map.put("filedValue", jsonObject.getString(onlyEntityList.get(i1).getEnName()));
-    //                            Integer count = mdmModuleDao.checkData(map);
-    //                            if (count > 0) {
-    //                                if (str.toString() != null && !"".equals(str.toString())) {
-    //                                    str.append("；");
-    //                                }
-    //                                str.append(mdmModuleDbEntityList.get(i).getRemark() + "的" + mdmModuleDbFiledsEntityList.get(i1).getChName() + "已存在");
+    //        boolean flag = false;
+    //        //1、根据服务名查询分发数据
+    //        MdmModuleEntity mdmModuleEntity = new MdmModuleEntity();
+    //        mdmModuleEntity.setMdmCode(jsonObject.getInteger("mdmCode"));
+    //        mdmModuleEntity.setSts("Y");
+    //        List<MdmModuleEntity> mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity);
+    //        if (mdmModuleEntities != null && mdmModuleEntities.size() == 1) {
+    //            MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
+    //            mdmModuleDbEntity.setMdmId(mdmModuleEntities.get(0).getId());
+    //            mdmModuleDbEntity.setDbType("1");
+    //            mdmModuleDbEntity.setSts("Y");
+    //            List<MdmModuleDbEntity> mdmModuleDbEntities =  mdmModuleDbDao.queryBase(mdmModuleDbEntity);
+    //            if (mdmModuleDbEntities != null && mdmModuleDbEntities.size() == 1) {
+    //                mdmModuleDbEntity = mdmModuleDbEntities.get(0);
+    //            }
+    //            MdmModuleDistributeEntity mdmModuleDistributeEntity = new MdmModuleDistributeEntity();
+    //            mdmModuleDistributeEntity.setAppId(jsonObject.getString("appID"));
+    //            mdmModuleDistributeEntity.setMdmId(mdmModuleEntities.get(0).getId());
+    //            List<MdmModuleDistributeEntity> mdmModuleDistributeEntities = mdmModuleDistributeDao.queryBase(mdmModuleDistributeEntity);
+    //            if (mdmModuleDistributeEntities != null && mdmModuleDistributeEntities.size() == 1) {
+    //                if (mdmModuleDistributeEntities.get(0).getDeleteType() != null && "1".equals(mdmModuleDistributeEntities.get(0).getDeleteType())) {
+    //                    //2、查找插件
+    //                    if (mdmModuleDistributeEntities.get(0).getDeletePlug() != null && !"".equals(mdmModuleDistributeEntities.get(0).getDeletePlug())) {
+    //                        //2、查找插件
+    //                        SysApplicationPluginEntity sysApplicationPluginEntity = sysApplicationPluginDao.get(mdmModuleDistributeEntities.get(0).getDeletePlug());
+    //                        if(sysApplicationPluginEntity.getPluginCode() != null && !"".equals(sysApplicationPluginEntity.getPluginCode())){
+    //                            //3、调用插件
+    //                            PluginBaseEntity pluginBaseEntity = PluginUtils.getPluginsById(sysApplicationPluginEntity.getPluginCode());
+    //                            try {
+    //                                JsonResultEntity s = pluginBaseEntity.executeBusiness(jsonObject);
+    //                                flag = true;
+    //                            } catch (Exception e) {
+    //                                logger.error("插件处理失败"+e.getMessage());
     //                            }
     //                        }
     //                    }
     //                } else {
-    //                    JSONArray jsonArray = saveData.getJSONArray(mdmModuleDbEntityList.get(i).getDbName());
-    //                    if (jsonArray != null && jsonArray.size() > 0) {
-    //                        for (int i1 = 0; i1 < onlyEntityList.size(); i1++) {
-    //                            if (onlyEntityList.get(i1).getDbId().equals(mdmModuleDbEntityList.get(i).getId())) {
-    //                                for (int i2 = 0; i2 < jsonArray.size(); i2++) {
-    //                                    JSONObject jsonObject = jsonArray.getJSONObject(i2);
-    //
-    //                                    //校验唯一
-    //                                    Map<String, String> map = new HashMap<>();
-    //                                    map.put("tableName", mdmModuleDbEntityList.get(i).getDbName());
-    //                                    if (flag) {
-    //                                        map.put("id", jsonObject.getString("id"));
-    //                                    }
-    //                                    map.put("filedName", onlyEntityList.get(i1).getEnName());
-    //                                    map.put("filedValue", jsonObject.getString(onlyEntityList.get(i1).getEnName()));
-    //                                    Integer count = mdmModuleDao.checkData(map);
-    //                                    if (count > 0) {
-    //                                        if (str.toString() != null && !"".equals(str.toString())) {
-    //                                            str.append("；");
-    //                                        }
-    //                                        str.append(mdmModuleDbEntityList.get(i).getRemark() + "的" + mdmModuleDbFiledsEntityList.get(i1).getChName() + "已存在");
-    //                                        break;
-    //                                    }
-    //                                }
-    //                            }
-    //                        }
-    //                    }
+    //                    //TODO 连线
+    //                    flag = true;
     //                }
     //            }
+    //            if(mdmModuleDbEntity.getDbName()!= null && !"".equals(mdmModuleDbEntity.getDbName())) {
+    //                //删除数据
+    //                MdmDistributeEntity mdmDistributeEntity = new MdmDistributeEntity();
+    //                mdmDistributeEntity.setId(jsonObject.getString("distributeID"));
+    //                mdmDistributeEntity.setTableName(mdmModuleDbEntity.getDbName()+"_distribute");
+    //                mdmDistributeEntity.setFormmainId(jsonObject.getString("id"));
+    //                mdmDistributeEntity.setAppId(jsonObject.getString("appID"));
+    //                mdmDistributeEntity.setStatus("1");
+    //                mdmDistributeEntity.setMsg("删除成功");
+    //                if (!flag) {
+    //                    mdmDistributeEntity.setStatus("3");
+    //                    mdmDistributeEntity.setMsg("删除失败");
+    //                }
+    //                mdmModuleDao.updateDistribute(mdmDistributeEntity);
+    //                return BaseResult.getSuccessMessageEntity("删除数据成功");
+    //
+    //            }else {
+    //                return BaseResult.getFailureMessageEntity("系统错误");
+    //            }
+    //        }else {
+    //            return BaseResult.getFailureMessageEntity("系统错误");
     //        }
     //    }
     //
-    //
-    //    //保存数据
-    //    if (str == null || "".equals(str.toString())) {
-    //        String id = UUIDUtils.getUUID();
-    //        for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
-    //            if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
-    //                JSONObject jsonObject = saveData.getJSONObject(mdmModuleDbEntityList.get(i).getDbName());
-    //                //保存数据
-    //                MdmDataDto mdmDataDto = new MdmDataDto();
-    //                mdmDataDto.setTableName(mdmModuleDbEntityList.get(i).getDbName());
-    //                MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity1 = new MdmModuleDbFiledsEntity();
-    //                mdmModuleDbFiledsEntity1.setMdmId(mdmModuleEntity.getId());
-    //                mdmModuleDbFiledsEntity1.setDbId(mdmModuleDbEntityList.get(i).getId());
-    //                mdmModuleDbFiledsEntity1.setSts("Y");
-    //                List<MdmModuleDbFiledsEntity> fileds = mdmModuleDbFiledsDao.queryBase(mdmModuleDbFiledsEntity1);
-    //                //查询单据规则
-    //                MdmTableCodeRuleEntity mdmTableCodeRuleEntity = new MdmTableCodeRuleEntity();
-    //                mdmTableCodeRuleEntity.setMdmId(mdmModuleEntity.getId());
-    //                mdmTableCodeRuleEntity.setDbId(mdmModuleDbEntityList.get(i).getId());
-    //                mdmTableCodeRuleEntity.setSts("Y");
-    //                List<MdmTableCodeRuleEntity> allMdmTableCodeRuleEntities = mdmServiceCache.queryMdmTableCodeRuleEntity(mdmTableCodeRuleEntity);
-    //                List<MdmTableCodeRuleEntity> mdmTableCodeRuleEntities = new ArrayList<>();
-    //                if(allMdmTableCodeRuleEntities != null && allMdmTableCodeRuleEntities.size() > 0){
-    //                    for (int i1 = 0; i1 < allMdmTableCodeRuleEntities.size(); i1++) {
-    //                        if(mdmModuleDbEntityList.get(i).getId().equals(allMdmTableCodeRuleEntities.get(i1).getDbId())){
-    //                            mdmTableCodeRuleEntities.add(allMdmTableCodeRuleEntities.get(i1));
-    //                        }
-    //                    }
-    //                }
-    //                StringBuffer document_rule = new StringBuffer();
-    //                Integer document_rule_num = 0;
-    //                if (mdmTableCodeRuleEntities != null && mdmTableCodeRuleEntities.size() > 0) {
-    //                    for (int i1 = 0; i1 < mdmTableCodeRuleEntities.size(); i1++) {
-    //                        //1、连接符号 2、字符串 3、日期 4、流水号
-    //                        if ("1".equals(mdmTableCodeRuleEntities.get(i1).getDbType())) {
-    //                            document_rule.append("-");
-    //                        } else if ("2".equals(mdmTableCodeRuleEntities.get(i1).getDbType())) {
-    //                            document_rule.append(mdmTableCodeRuleEntities.get(i1).getDbValue());
-    //                        } else if ("3".equals(mdmTableCodeRuleEntities.get(i1).getDbType())) {
-    //                            SimpleDateFormat sdf = new SimpleDateFormat(mdmTableCodeRuleEntities.get(i1).getDbValue());//要转换的时间格式
-    //                            String stra = sdf.format(new Date());
-    //                            document_rule.append(stra);
-    //                        } else if ("4".equals(mdmTableCodeRuleEntities.get(i1).getDbType())) {
-    //                            document_rule_num = mdmTableCodeRuleEntities.get(i1).getDbValue().length();
-    //                        }
-    //                    }
-    //                }
-    //                List<MdmDataFiledDto> mdmDataFiledDtos = new ArrayList<>();
-    //                for (int i1 = 0; i1 < fileds.size(); i1++) {
-    //                    if (jsonObject.get(fileds.get(i1).getEnName()) != null) {
-    //                        MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto();
-    //                        mdmDataFiledDto.setFiledsName(fileds.get(i1).getEnName());
-    //                        mdmDataFiledDto.setFiledsValue(jsonObject.getString(fileds.get(i1).getEnName()));
-    //                        mdmDataFiledDtos.add(mdmDataFiledDto);
-    //                    }
-    //                }
-    //                MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto();
-    //                mdmDataFiledDto.setFiledsName("logid");
-    //                mdmDataFiledDto.setFiledsValue(StpUtil.getLoginIdAsString());
-    //                mdmDataFiledDtos.add(mdmDataFiledDto);
-    //                mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos);
-    //                if (flag) {
-    //                    mdmDataDto.setId(jsonObject.getString("id"));
-    //                    id = jsonObject.getString("id");
-    //                    int a = mdmModuleDao.updateForm(mdmDataDto);
-    //                } else {
-    //
-    //                    mdmDataDto.setDbType(mdmModuleDbEntityList.get(i).getDbType());
-    //                    mdmDataDto.setDocumentRule(document_rule.toString());
-    //                    mdmDataDto.setDocumentRuleNum(document_rule_num);
-    //                    MdmDataFiledDto ids = new MdmDataFiledDto();
-    //                    ids.setFiledsName("id");
-    //                    ids.setFiledsValue(id);
-    //                    mdmDataFiledDtos.add(ids);
-    //                    mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos);
-    //                    int a = mdmModuleDao.saveForm(mdmDataDto);
-    //                }
-    //            }
-    //        }
-    //
-    //        for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
-    //            if ("2".equals(mdmModuleDbEntityList.get(i).getDbType())) {
-    //                //删除明细
-    //                FormmainDeleteDto formmainDeleteDto = new FormmainDeleteDto();
-    //                formmainDeleteDto.setFormmain_id(id);
-    //                formmainDeleteDto.setLoginId(StpUtil.getLoginIdAsString());
-    //                formmainDeleteDto.setTableName(mdmModuleDbEntityList.get(i).getDbName());
-    //                mdmModuleDao.deleteTemplateById(formmainDeleteDto);
-    //
-    //                JSONArray jsonArray = saveData.getJSONArray(mdmModuleDbEntityList.get(i).getDbName());
-    //                if (jsonArray != null && jsonArray.size() > 0) {
-    //                    MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity1 = new MdmModuleDbFiledsEntity();
-    //                    mdmModuleDbFiledsEntity1.setMdmId(mdmModuleEntity.getId());
-    //                    mdmModuleDbFiledsEntity1.setSts("Y");
-    //                    List<MdmModuleDbFiledsEntity> allfileds = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity1);
-    //                    List<MdmModuleDbFiledsEntity> fileds = new ArrayList<>();
-    //                    if(allfileds != null && allfileds.size() > 0){
-    //                        for (int i1 = 0; i1 < allfileds.size(); i1++) {
-    //                            if(mdmModuleDbEntityList.get(i).getId().equals(allfileds.get(i1).getDbId())){
-    //                                fileds.add(allfileds.get(i1));
-    //                            }
-    //                        }
-    //                    }
-    //
-    //                    for (int i2 = 0; i2 < jsonArray.size(); i2++) {
-    //                        JSONObject jsonObject = jsonArray.getJSONObject(i2);
-    //                        //保存数据
-    //                        MdmDataDto mdmDataDto = new MdmDataDto();
-    //                        mdmDataDto.setTableName(mdmModuleDbEntityList.get(i).getDbName());
-    //                        List<MdmDataFiledDto> mdmDataFiledDtos = new ArrayList<>();
-    //                        for (int i1 = 0; i1 < fileds.size(); i1++) {
-    //                            MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto();
-    //                            mdmDataFiledDto.setFiledsName(fileds.get(i1).getEnName());
-    //                            mdmDataFiledDto.setFiledsValue(jsonObject.getString(fileds.get(i1).getEnName()));
-    //                            mdmDataFiledDtos.add(mdmDataFiledDto);
-    //                        }
-    //                        MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto();
-    //                        mdmDataFiledDto.setFiledsName("logid");
-    //                        mdmDataFiledDto.setFiledsValue(StpUtil.getLoginIdAsString());
-    //                        mdmDataFiledDtos.add(mdmDataFiledDto);
-    //
-    //                        MdmDataFiledDto formain_id = new MdmDataFiledDto();
-    //                        formain_id.setFiledsName("formmain_id");
-    //                        formain_id.setFiledsValue(id);
-    //                        mdmDataFiledDtos.add(formain_id);
-    //
-    //                        mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos);
-    //                        if (jsonObject.getString("id") != null) {
-    //                            MdmDataFiledDto sts = new MdmDataFiledDto();
-    //                            sts.setFiledsName("sts");
-    //                            sts.setFiledsValue("Y");
-    //                            mdmDataFiledDtos.add(sts);
-    //                            mdmDataDto.setId(jsonObject.getString("id"));
-    //                            int a = mdmModuleDao.updateForm(mdmDataDto);
-    //                        } else {
-    //                            MdmDataFiledDto ids = new MdmDataFiledDto();
-    //                            ids.setFiledsName("id");
-    //                            ids.setFiledsValue(UUIDUtils.getUUID());
-    //                            mdmDataFiledDtos.add(ids);
-    //                            mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos);
-    //                            mdmDataDto.setDbType(mdmModuleDbEntityList.get(i).getDbType());
-    //                            int a = mdmModuleDao.saveForm(mdmDataDto);
-    //                        }
-    //                    }
-    //                }
-    //            }
-    //        }
-    //    }
-    //    return str.toString();
     //}
     //
-    //
-    ///**
-    // * @param jsonObject
-    // * @return boolean
-    // * @Author lvleigang
-    // * @Description 校验是否有值
-    // * @Date 2:20 下午 2023/7/10
-    // **/
-    //private boolean checkData(JSONObject jsonObject, String key) {
-    //    if (jsonObject != null
-    //            && jsonObject.getString(key) != null
-    //            && !"".equals(jsonObject.getString(key))) {
-    //        return true;
-    //    }
-    //    return false;
-    //}
-    //
-    //protected <T> T getData(String key, JSONObject jsonObject, Class<T> clz) {
-    //    if (checkStr(jsonObject.getString(key))) {
-    //        return jsonObject.getJSONObject(key).toJavaObject(clz);
-    //    }
-    //    return null;
-    //}
-    //
-    ///**
-    // * @param key
-    // * @param object
-    // * @return com.alibaba.fastjson.JSONObject
-    // * @Author lvleigang
-    // * @Description 获取对象转换成jsonobj
-    // * @Date 11:51 下午 2023/7/10
-    // **/
-    //protected JSONObject getstrObj(String key, JSONObject object) {
-    //    if (checkStr(object.getString(key))) {
-    //        return object.getJSONObject(key);
-    //    }
-    //    return new JSONObject();
-    //}
-    //
-    ///**
-    // * @param str
-    // * @return void
-    // * @Author lvleigang
-    // * @Description 校验字符串
-    // * @Date 11:41 上午 2022/12/7
-    // **/
-    //protected Boolean checkStr(String str) {
-    //    Boolean flag = true;
-    //    if (str == null || "".equals(str)) {
-    //        flag = false;
-    //    }
-    //    return flag;
-    //}
-    //
-    ///**
-    // * @param str
-    // * @return void
-    // * @Author lvleigang
-    // * @Description 校验字符串
-    // * @Date 11:41 上午 2022/12/7
-    // **/
-    //protected Boolean checkInt(Integer str) {
-    //    Boolean flag = true;
-    //    if (str == null) {
-    //        flag = false;
-    //    }
-    //    return flag;
-    //}
+    /**
+     * @param mdmCode
+     * @param saveData
+     * @param mdmModuleEntity
+     * @param mdmModuleDbEntityList
+     * @param flag                  修改 新增
+     * @return java.lang.String
+     * @Author lvleigang
+     * @Description 校验数据
+     * @Date 11:20 上午 2023/11/6
+     **/
+    private String checkDataOnly(Integer mdmCode, JSONObject saveData, boolean flag, MdmModuleEntity mdmModuleEntity, List<MdmModuleDbEntity> mdmModuleDbEntityList) {
+        StringBuffer str = new StringBuffer();
+
+        //查询字段
+        //查询字段下的必填规则
+        MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity();
+        mdmModuleDbFiledsEntity.setMdmId(mdmModuleEntity.getId());
+        mdmModuleDbFiledsEntity.setSts("Y");
+        mdmModuleDbFiledsEntity.setRoletype("required");
+        mdmModuleDbFiledsEntity.setRoleValue("true");
+        List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntityList = mdmModuleDbFiledsDao.queryBase(mdmModuleDbFiledsEntity);
+
+        if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) {
+            for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
+                if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
+                    JSONObject jsonObject = saveData.getJSONObject(mdmModuleDbEntityList.get(i).getDbName());
+                    for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
+                        if (mdmModuleDbFiledsEntityList.get(i1).getDbId().equals(mdmModuleDbEntityList.get(i).getId())) {
+                            if (jsonObject.get(mdmModuleDbFiledsEntityList.get(i1).getEnName()) == null || "".equals(jsonObject.getString(mdmModuleDbFiledsEntityList.get(i1).getEnName()))) {
+                                if (str.toString() != null && !"".equals(str.toString())) {
+                                    str.append("；");
+                                }
+                                str.append(mdmModuleDbEntityList.get(i).getRemark() + "的" + mdmModuleDbFiledsEntityList.get(i1).getChName() + "不为空");
+                            }
+                        }
+                    }
+                } else {
+                    JSONArray jsonArray = saveData.getJSONArray(mdmModuleDbEntityList.get(i).getDbName());
+                    if (jsonArray != null && jsonArray.size() > 0) {
+                        for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) {
+                            if (mdmModuleDbFiledsEntityList.get(i1).getDbId().equals(mdmModuleDbEntityList.get(i).getId())) {
+                                for (int i2 = 0; i2 < jsonArray.size(); i2++) {
+                                    JSONObject jsonObject = jsonArray.getJSONObject(i2);
+                                    if (jsonObject.get(mdmModuleDbFiledsEntityList.get(i1).getEnName()) == null || "".equals(jsonObject.getString(mdmModuleDbFiledsEntityList.get(i1).getEnName()))) {
+                                        if (str.toString() != null && !"".equals(str.toString())) {
+                                            str.append("；");
+                                        }
+                                        str.append(mdmModuleDbEntityList.get(i).getRemark() + "的" + mdmModuleDbFiledsEntityList.get(i1).getChName() + "不为空");
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if (str == null || "".equals(str.toString())) {
+            //校验数据
+            MdmModuleDbFiledsEntity onlyFiledsEntity = new MdmModuleDbFiledsEntity();
+            onlyFiledsEntity.setMdmId(mdmModuleEntity.getId());
+            onlyFiledsEntity.setSts("Y");
+            onlyFiledsEntity.setRoletype("fieldsSole");
+            onlyFiledsEntity.setRoleValue("true");
+
+            List<MdmModuleDbFiledsEntity> onlyEntityList = mdmModuleDbFiledsDao.queryBase(onlyFiledsEntity);
+
+            if (onlyEntityList != null && onlyEntityList.size() > 0) {
+                for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
+                    if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
+                        JSONObject jsonObject = saveData.getJSONObject(mdmModuleDbEntityList.get(i).getDbName());
+                        for (int i1 = 0; i1 < onlyEntityList.size(); i1++) {
+                            if (onlyEntityList.get(i1).getDbId().equals(mdmModuleDbEntityList.get(i).getId())) {
+                                //校验唯一
+                                Map<String, String> map = new HashMap<>();
+                                map.put("tableName", mdmModuleDbEntityList.get(i).getDbName());
+                                if (flag) {
+                                    map.put("id", jsonObject.getString("id"));
+                                }
+                                map.put("filedName", onlyEntityList.get(i1).getEnName());
+                                map.put("filedValue", jsonObject.getString(onlyEntityList.get(i1).getEnName()));
+                                Integer count = mdmModuleDao.checkData(map);
+                                if (count > 0) {
+                                    if (str.toString() != null && !"".equals(str.toString())) {
+                                        str.append("；");
+                                    }
+                                    str.append(mdmModuleDbEntityList.get(i).getRemark() + "的" + mdmModuleDbFiledsEntityList.get(i1).getChName() + "已存在");
+                                }
+                            }
+                        }
+                    } else {
+                        JSONArray jsonArray = saveData.getJSONArray(mdmModuleDbEntityList.get(i).getDbName());
+                        if (jsonArray != null && jsonArray.size() > 0) {
+                            for (int i1 = 0; i1 < onlyEntityList.size(); i1++) {
+                                if (onlyEntityList.get(i1).getDbId().equals(mdmModuleDbEntityList.get(i).getId())) {
+                                    for (int i2 = 0; i2 < jsonArray.size(); i2++) {
+                                        JSONObject jsonObject = jsonArray.getJSONObject(i2);
+
+                                        //校验唯一
+                                        Map<String, String> map = new HashMap<>();
+                                        map.put("tableName", mdmModuleDbEntityList.get(i).getDbName());
+                                        if (flag) {
+                                            map.put("id", jsonObject.getString("id"));
+                                        }
+                                        map.put("filedName", onlyEntityList.get(i1).getEnName());
+                                        map.put("filedValue", jsonObject.getString(onlyEntityList.get(i1).getEnName()));
+                                        Integer count = mdmModuleDao.checkData(map);
+                                        if (count > 0) {
+                                            if (str.toString() != null && !"".equals(str.toString())) {
+                                                str.append("；");
+                                            }
+                                            str.append(mdmModuleDbEntityList.get(i).getRemark() + "的" + mdmModuleDbFiledsEntityList.get(i1).getChName() + "已存在");
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+
+        //保存数据
+        if (str == null || "".equals(str.toString())) {
+            String id = UUIDUtils.getUUID();
+            for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
+                if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
+                    JSONObject jsonObject = saveData.getJSONObject(mdmModuleDbEntityList.get(i).getDbName());
+                    //保存数据
+                    MdmDataDto mdmDataDto = new MdmDataDto();
+                    mdmDataDto.setTableName(mdmModuleDbEntityList.get(i).getDbName());
+                    MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity1 = new MdmModuleDbFiledsEntity();
+                    mdmModuleDbFiledsEntity1.setMdmId(mdmModuleEntity.getId());
+                    mdmModuleDbFiledsEntity1.setDbId(mdmModuleDbEntityList.get(i).getId());
+                    mdmModuleDbFiledsEntity1.setSts("Y");
+                    List<MdmModuleDbFiledsEntity> fileds = mdmModuleDbFiledsDao.queryBase(mdmModuleDbFiledsEntity1);
+                    //查询单据规则
+                    MdmTableCodeRuleEntity mdmTableCodeRuleEntity = new MdmTableCodeRuleEntity();
+                    mdmTableCodeRuleEntity.setMdmId(mdmModuleEntity.getId());
+                    mdmTableCodeRuleEntity.setDbId(mdmModuleDbEntityList.get(i).getId());
+                    mdmTableCodeRuleEntity.setSts("Y");
+                    List<MdmTableCodeRuleEntity> allMdmTableCodeRuleEntities = mdmTableCodeRuleDao.queryBase(mdmTableCodeRuleEntity);
+                    List<MdmTableCodeRuleEntity> mdmTableCodeRuleEntities = new ArrayList<>();
+                    if(allMdmTableCodeRuleEntities != null && allMdmTableCodeRuleEntities.size() > 0){
+                        for (int i1 = 0; i1 < allMdmTableCodeRuleEntities.size(); i1++) {
+                            if(mdmModuleDbEntityList.get(i).getId().equals(allMdmTableCodeRuleEntities.get(i1).getDbId())){
+                                mdmTableCodeRuleEntities.add(allMdmTableCodeRuleEntities.get(i1));
+                            }
+                        }
+                    }
+                    StringBuffer document_rule = new StringBuffer();
+                    Integer document_rule_num = 0;
+                    if (mdmTableCodeRuleEntities != null && mdmTableCodeRuleEntities.size() > 0) {
+                        for (int i1 = 0; i1 < mdmTableCodeRuleEntities.size(); i1++) {
+                            //1、连接符号 2、字符串 3、日期 4、流水号
+                            if ("1".equals(mdmTableCodeRuleEntities.get(i1).getDbType())) {
+                                document_rule.append("-");
+                            } else if ("2".equals(mdmTableCodeRuleEntities.get(i1).getDbType())) {
+                                document_rule.append(mdmTableCodeRuleEntities.get(i1).getDbValue());
+                            } else if ("3".equals(mdmTableCodeRuleEntities.get(i1).getDbType())) {
+                                SimpleDateFormat sdf = new SimpleDateFormat(mdmTableCodeRuleEntities.get(i1).getDbValue());//要转换的时间格式
+                                String stra = sdf.format(new Date());
+                                document_rule.append(stra);
+                            } else if ("4".equals(mdmTableCodeRuleEntities.get(i1).getDbType())) {
+                                document_rule_num = mdmTableCodeRuleEntities.get(i1).getDbValue().length();
+                            }
+                        }
+                    }
+                    List<MdmDataFiledDto> mdmDataFiledDtos = new ArrayList<>();
+                    for (int i1 = 0; i1 < fileds.size(); i1++) {
+                        if (jsonObject.get(fileds.get(i1).getEnName()) != null) {
+                            MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto();
+                            mdmDataFiledDto.setFiledsName(fileds.get(i1).getEnName());
+                            mdmDataFiledDto.setFiledsValue(jsonObject.getString(fileds.get(i1).getEnName()));
+                            mdmDataFiledDtos.add(mdmDataFiledDto);
+                        }
+                    }
+                    MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto();
+                    mdmDataFiledDto.setFiledsName("logid");
+                    mdmDataFiledDto.setFiledsValue(StpUtil.getLoginIdAsString());
+                    mdmDataFiledDtos.add(mdmDataFiledDto);
+                    mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos);
+                    if (flag) {
+                        mdmDataDto.setId(jsonObject.getString("id"));
+                        id = jsonObject.getString("id");
+                        int a = mdmModuleDao.updateForm(mdmDataDto);
+                    } else {
+
+                        mdmDataDto.setDbType(mdmModuleDbEntityList.get(i).getDbType());
+                        mdmDataDto.setDocumentRule(document_rule.toString());
+                        mdmDataDto.setDocumentRuleNum(document_rule_num);
+                        MdmDataFiledDto ids = new MdmDataFiledDto();
+                        ids.setFiledsName("id");
+                        ids.setFiledsValue(id);
+                        mdmDataFiledDtos.add(ids);
+                        mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos);
+                        int a = mdmModuleDao.saveForm(mdmDataDto);
+                    }
+                }
+            }
+
+            for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
+                if ("2".equals(mdmModuleDbEntityList.get(i).getDbType())) {
+                    //删除明细
+                    FormmainDeleteDto formmainDeleteDto = new FormmainDeleteDto();
+                    formmainDeleteDto.setFormmain_id(id);
+                    formmainDeleteDto.setLoginId(StpUtil.getLoginIdAsString());
+                    formmainDeleteDto.setTableName(mdmModuleDbEntityList.get(i).getDbName());
+                    mdmModuleDao.deleteTemplateById(formmainDeleteDto);
+
+                    JSONArray jsonArray = saveData.getJSONArray(mdmModuleDbEntityList.get(i).getDbName());
+                    if (jsonArray != null && jsonArray.size() > 0) {
+                        MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity1 = new MdmModuleDbFiledsEntity();
+                        mdmModuleDbFiledsEntity1.setMdmId(mdmModuleEntity.getId());
+                        mdmModuleDbFiledsEntity1.setSts("Y");
+                        List<MdmModuleDbFiledsEntity> allfileds = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity1);
+                        List<MdmModuleDbFiledsEntity> fileds = new ArrayList<>();
+                        if(allfileds != null && allfileds.size() > 0){
+                            for (int i1 = 0; i1 < allfileds.size(); i1++) {
+                                if(mdmModuleDbEntityList.get(i).getId().equals(allfileds.get(i1).getDbId())){
+                                    fileds.add(allfileds.get(i1));
+                                }
+                            }
+                        }
+
+                        for (int i2 = 0; i2 < jsonArray.size(); i2++) {
+                            JSONObject jsonObject = jsonArray.getJSONObject(i2);
+                            //保存数据
+                            MdmDataDto mdmDataDto = new MdmDataDto();
+                            mdmDataDto.setTableName(mdmModuleDbEntityList.get(i).getDbName());
+                            List<MdmDataFiledDto> mdmDataFiledDtos = new ArrayList<>();
+                            for (int i1 = 0; i1 < fileds.size(); i1++) {
+                                MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto();
+                                mdmDataFiledDto.setFiledsName(fileds.get(i1).getEnName());
+                                mdmDataFiledDto.setFiledsValue(jsonObject.getString(fileds.get(i1).getEnName()));
+                                mdmDataFiledDtos.add(mdmDataFiledDto);
+                            }
+                            MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto();
+                            mdmDataFiledDto.setFiledsName("logid");
+                            mdmDataFiledDto.setFiledsValue(StpUtil.getLoginIdAsString());
+                            mdmDataFiledDtos.add(mdmDataFiledDto);
+
+                            MdmDataFiledDto formain_id = new MdmDataFiledDto();
+                            formain_id.setFiledsName("formmain_id");
+                            formain_id.setFiledsValue(id);
+                            mdmDataFiledDtos.add(formain_id);
+
+                            mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos);
+                            if (jsonObject.getString("id") != null) {
+                                MdmDataFiledDto sts = new MdmDataFiledDto();
+                                sts.setFiledsName("sts");
+                                sts.setFiledsValue("Y");
+                                mdmDataFiledDtos.add(sts);
+                                mdmDataDto.setId(jsonObject.getString("id"));
+                                int a = mdmModuleDao.updateForm(mdmDataDto);
+                            } else {
+                                MdmDataFiledDto ids = new MdmDataFiledDto();
+                                ids.setFiledsName("id");
+                                ids.setFiledsValue(UUIDUtils.getUUID());
+                                mdmDataFiledDtos.add(ids);
+                                mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos);
+                                mdmDataDto.setDbType(mdmModuleDbEntityList.get(i).getDbType());
+                                int a = mdmModuleDao.saveForm(mdmDataDto);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return str.toString();
+    }
+
+
+    /**
+     * @param jsonObject
+     * @return boolean
+     * @Author lvleigang
+     * @Description 校验是否有值
+     * @Date 2:20 下午 2023/7/10
+     **/
+    private boolean checkData(JSONObject jsonObject, String key) {
+        if (jsonObject != null
+                && jsonObject.getString(key) != null
+                && !"".equals(jsonObject.getString(key))) {
+            return true;
+        }
+        return false;
+    }
+
+    protected <T> T getData(String key, JSONObject jsonObject, Class<T> clz) {
+        if (checkStr(jsonObject.getString(key))) {
+            return jsonObject.getJSONObject(key).toJavaObject(clz);
+        }
+        return null;
+    }
+
+    /**
+     * @param key
+     * @param object
+     * @return com.alibaba.fastjson.JSONObject
+     * @Author lvleigang
+     * @Description 获取对象转换成jsonobj
+     * @Date 11:51 下午 2023/7/10
+     **/
+    protected JSONObject getstrObj(String key, JSONObject object) {
+        if (checkStr(object.getString(key))) {
+            return object.getJSONObject(key);
+        }
+        return new JSONObject();
+    }
+
+    /**
+     * @param str
+     * @return void
+     * @Author lvleigang
+     * @Description 校验字符串
+     * @Date 11:41 上午 2022/12/7
+     **/
+    protected Boolean checkStr(String str) {
+        Boolean flag = true;
+        if (str == null || "".equals(str)) {
+            flag = false;
+        }
+        return flag;
+    }
+
 }
diff --git a/service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java b/service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java
index 693c62e5..b88c5880 100644
--- a/service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java
+++ b/service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java
@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
 import com.baomidou.dynamic.datasource.exception.CannotFindDataSourceException;
 import com.hzya.frame.datasource.DataSourceUtilProperties;
-import com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity;
+import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity;
 import com.hzya.frame.sysnew.application.entity.SysApplicationDatasourceDto;
 import com.hzya.frame.util.AESUtil;
 import org.slf4j.Logger;
@@ -24,21 +24,20 @@ public class DsDataSourceUtil {
     @Resource
     private DataSource dataSource;
 
-    public void addDataSource(SysDataSourceEntity sysDataSourceVo) throws Exception {
+    public void addDataSource(SysApplicationDatabaseEntity sysDataSourceVo) throws Exception {
         DynamicRoutingDataSource ds = (DynamicRoutingDataSource) dataSource;
         JSONObject defaultDataSourceProperties = new JSONObject();
         defaultDataSourceProperties.put("datasource_code", sysDataSourceVo.getSourceCode());
         defaultDataSourceProperties.put("source_url", sysDataSourceVo.getSourceUrl());
         defaultDataSourceProperties.put("source_type", sysDataSourceVo.getSourceTypeName());
         defaultDataSourceProperties.put("login_name", sysDataSourceVo.getLoginName());
-        defaultDataSourceProperties.put("password", sysDataSourceVo.getPassword());
+        defaultDataSourceProperties.put("password", AESUtil.decrypt(sysDataSourceVo.getPassword()));
         defaultDataSourceProperties.put("db_name", sysDataSourceVo.getDbName());
         logger.info("***初始化数据源-{}：*********", sysDataSourceVo.getSourceName());
         DruidDataSource dataSource = createDefaultDataSource(defaultDataSourceProperties);
         ds.addDataSource(sysDataSourceVo.getSourceCode(), dataSource);
         logger.info("***初始化数据源-{}成功：*********", sysDataSourceVo.getSourceName());
     }
-
     /**
      * @param code
      * @return boolean
@@ -57,16 +56,16 @@ public class DsDataSourceUtil {
     }
 
     /**
-     * @param sysDataSourceVo
+     * @param sysApplicationDatabaseEntity
      * @return boolean
      * @Author lvleigang
      * @Description 修改数据源
      * @Date 11:40 上午 2023/9/6
      **/
-    public void editDataSource(SysDataSourceEntity sysDataSourceVo) throws Exception {
+    public void editDataSource(SysApplicationDatabaseEntity sysApplicationDatabaseEntity) throws Exception {
         //先删除后添加
-        removeDataSource(sysDataSourceVo.getSourceCode());
-        addDataSource(sysDataSourceVo);
+        removeDataSource(sysApplicationDatabaseEntity.getSourceCode());
+        addDataSource(sysApplicationDatabaseEntity);
     }
 
 
diff --git a/service/src/main/java/com/hzya/frame/sys/dataSource/dao/ISysDataSourceDao.java b/service/src/main/java/com/hzya/frame/sys/dataSource/dao/ISysDataSourceDao.java
deleted file mode 100644
index acfcaf47..00000000
--- a/service/src/main/java/com/hzya/frame/sys/dataSource/dao/ISysDataSourceDao.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.hzya.frame.sys.dataSource.dao;
-
-import com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity;
-import com.hzya.frame.basedao.dao.IBaseDao;
-import com.hzya.frame.sys.dataSource.entity.SysDataSourceVo;
-
-import java.util.List;
-
-/**
- * 数据源表(sys_data_source: table)表数据库访问层
- *
- * @author makejava
- * @since 2023-09-05 16:07:01
- */
-public interface ISysDataSourceDao extends IBaseDao<SysDataSourceEntity, String> {
-
-    List<SysDataSourceVo> queryVoList(SysDataSourceEntity entity);
-    int queryVoList_COUNT(SysDataSourceEntity entity);
-
-    Integer entity_count_not_id(SysDataSourceEntity checkEntity);
-
-    List<SysDataSourceVo> queryDSBase(SysDataSourceEntity entity);
-}
-
diff --git a/service/src/main/java/com/hzya/frame/sys/dataSource/dao/impl/SysDataSourceDaoImpl.java b/service/src/main/java/com/hzya/frame/sys/dataSource/dao/impl/SysDataSourceDaoImpl.java
deleted file mode 100644
index 0f9948f1..00000000
--- a/service/src/main/java/com/hzya/frame/sys/dataSource/dao/impl/SysDataSourceDaoImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.hzya.frame.sys.dataSource.dao.impl;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity;
-import com.hzya.frame.sys.dataSource.dao.ISysDataSourceDao;
-import com.hzya.frame.sys.dataSource.entity.SysDataSourceVo;
-import org.springframework.stereotype.Repository;
-import com.hzya.frame.basedao.dao.MybatisGenericDao;
-
-import java.util.List;
-
-/**
- * 数据源表(SysDataSource)表数据库访问层
- *
- * @author makejava
- * @since 2023-09-05 16:07:03
- */
-@Repository(value = "SysDataSourceDaoImpl")
-public class SysDataSourceDaoImpl extends MybatisGenericDao<SysDataSourceEntity, String> implements ISysDataSourceDao{
-
-
-    @DS("master")
-    @Override
-    public List<SysDataSourceVo> queryVoList(SysDataSourceEntity entity) {
-        List<SysDataSourceVo> o = (List<SysDataSourceVo>) super.selectList(getSqlIdPrifx() + "queryVoList", entity);
-        return o;
-    }
-    @Override
-    public int queryVoList_COUNT(SysDataSourceEntity entity) {
-        int o = (int) super.selectOne(getSqlIdPrifx() + "queryVoList_COUNT", entity);
-        return o;
-    }
-
-    @Override
-    public Integer entity_count_not_id(SysDataSourceEntity entity) {
-        Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "entity_count_not_id", entity);
-        return o;
-    }
-
-    @DS("master")
-    @Override
-    public List<SysDataSourceVo> queryDSBase(SysDataSourceEntity entity) {
-        List<SysDataSourceVo> o = (List<SysDataSourceVo>) super.selectList(getSqlIdPrifx() + "queryDSBase", entity);
-        return o;
-    }
-}
-
diff --git a/service/src/main/java/com/hzya/frame/sys/dataSource/entity/SysDataSourceEntity.java b/service/src/main/java/com/hzya/frame/sys/dataSource/entity/SysDataSourceEntity.java
deleted file mode 100644
index d830b13b..00000000
--- a/service/src/main/java/com/hzya/frame/sys/dataSource/entity/SysDataSourceEntity.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package com.hzya.frame.sys.dataSource.entity;
-
-import java.util.Date;
-import com.hzya.frame.web.entity.BaseEntity;
-/**
- * 数据源表(SysDataSource)实体类
- *
- * @author makejava
- * @since 2023-09-05 16:07:06
- */
-public class SysDataSourceEntity extends BaseEntity {
- 
-  /**  数据源唯一编码 */
-   private String sourceCode;
-  /**  数据源名称 */
-   private String sourceName;
-  /**  ip */
-   private String sourceIp;
-  /**  端口 */
-   private String sourcePort;
-  /**  数据库名称 */
-   private String dbName;
-  /**  数据源类型 1oracle 2sqlsever 3mysql */
-   private String sourceType;
-  /**  登录名 */
-   private String loginName;
-  /**  密码 */
-   private String password;
-  /**  选择oracle下服务名称 */
-   private String serviceName;
-  /**  使用状态1启用0锁定 */
-   private Integer useState;
-  /**  数据源状态 1校验成功0校验失败 */
-   private String dataState;
-
-    public String getSourceCode() {
-        return sourceCode;
-    }
-
-    public void setSourceCode(String sourceCode) {
-        this.sourceCode = sourceCode;
-    }
-
-    public String getSourceName() {
-        return sourceName;
-    }
-
-    public void setSourceName(String sourceName) {
-        this.sourceName = sourceName;
-    }
-
-    public String getSourceIp() {
-        return sourceIp;
-    }
-
-    public void setSourceIp(String sourceIp) {
-        this.sourceIp = sourceIp;
-    }
-
-    public String getSourcePort() {
-        return sourcePort;
-    }
-
-    public void setSourcePort(String sourcePort) {
-        this.sourcePort = sourcePort;
-    }
-
-    public String getDbName() {
-        return dbName;
-    }
-
-    public void setDbName(String dbName) {
-        this.dbName = dbName;
-    }
-
-    public String getSourceType() {
-        return sourceType;
-    }
-
-    public void setSourceType(String sourceType) {
-        this.sourceType = sourceType;
-    }
-
-    public String getLoginName() {
-        return loginName;
-    }
-
-    public void setLoginName(String loginName) {
-        this.loginName = loginName;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getServiceName() {
-        return serviceName;
-    }
-
-    public void setServiceName(String serviceName) {
-        this.serviceName = serviceName;
-    }
-
-    public Integer getUseState() {
-        return useState;
-    }
-
-    public void setUseState(Integer useState) {
-        this.useState = useState;
-    }
-    public String getSourceUrl() {
-        StringBuffer sourceUrl = new StringBuffer();
-        if(sourceType != null){
-            switch (sourceType) {
-                case "1": //oracle
-                    //jdbc:oracle:thin:@60.204.132.91:1521:ORCL
-                    sourceUrl.append("jdbc:oracle:thin:@").append(sourceIp).append(":").append(sourcePort).append(":").append(serviceName);
-                    break;
-                case "2": //sqlsever
-                    //jdbc:sqlserver://221.12.175.82:1433;DatabaseName=U8CLOUD;encrypt=false;trustServerCertificate=true
-                    sourceUrl.append("jdbc:jtds:sqlserver://").append(sourceIp).append(":").append(sourcePort).append("/").append(dbName).append(";encrypt=false;trustServerCertificate=true");
-                    break;
-                case "3": //mysql
-                    //jdbc:mysql://hzya.ufyct.com:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
-                    sourceUrl.append("jdbc:mysql://").append(sourceIp).append(":").append(sourcePort).append("/").append(dbName).append("?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true");
-                    break;
-                case "4": //dm
-                    //jdbc:dm://hzya.ufyct.com:9040?schema=businesscenter&characterEncoding=UTF-8
-                    sourceUrl.append("jdbc:dm://").append(sourceIp).append(":").append(sourcePort).append("?schema=").append(dbName).append("&characterEncoding=UTF-8");
-                    break;
-                default:
-            }
-        }
-        return sourceUrl.toString();
-    }
-    public String getSourceTypeName() {
-        String  sourceTypeName = null;
-        if(sourceType != null){
-            switch (sourceType) {
-                case "1": //oracle
-                    sourceTypeName = "oracle";
-                    break;
-                case "2": //sqlsever
-                    sourceTypeName = "sqlServer";
-                    break;
-                case "3": //mysql
-                    sourceTypeName = "mysql";
-                    break;
-                default:
-            }
-        }
-
-        return sourceTypeName;
-    }
-
-    public String getDataState() {
-        return dataState;
-    }
-
-    public void setDataState(String dataState) {
-        this.dataState = dataState;
-    }
-}
-
diff --git a/service/src/main/java/com/hzya/frame/sys/dataSource/entity/SysDataSourceEntity.xml b/service/src/main/java/com/hzya/frame/sys/dataSource/entity/SysDataSourceEntity.xml
deleted file mode 100644
index 54bbc98d..00000000
--- a/service/src/main/java/com/hzya/frame/sys/dataSource/entity/SysDataSourceEntity.xml
+++ /dev/null
@@ -1,484 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hzya.frame.sys.dataSource.dao.impl.SysDataSourceDaoImpl">
-
-    <resultMap id="get-SysDataSourceEntity-result" type="com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity">
-        <result property="id" column="id" jdbcType="VARCHAR"/>
-        <result property="sourceCode" column="source_code" jdbcType="VARCHAR"/>
-        <result property="sourceName" column="source_name" jdbcType="VARCHAR"/>
-        <result property="sourceIp" column="source_ip" jdbcType="VARCHAR"/>
-        <result property="sourcePort" column="source_port" jdbcType="VARCHAR"/>
-        <result property="dbName" column="db_name" jdbcType="VARCHAR"/>
-        <result property="sourceType" column="source_type" jdbcType="VARCHAR"/>
-        <result property="loginName" column="login_name" jdbcType="VARCHAR"/>
-        <result property="password" column="password" jdbcType="VARCHAR"/>
-        <result property="serviceName" column="service_name" jdbcType="VARCHAR"/>
-        <result property="useState" column="use_state" jdbcType="INTEGER"/>
-        <result property="dataState" column="data_state" jdbcType="INTEGER"/>
-        <result property="sorts" column="sorts" jdbcType="INTEGER"/>
-        <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
-        <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
-        <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
-        <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
-        <result property="sts" column="sts" jdbcType="VARCHAR"/>
-        <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
-    </resultMap>
-    <!-- 查询的字段-->
-    <sql id="SysDataSourceEntity_Base_Column_List">
-        id
-       ,source_code 
-        ,source_name 
-        ,source_ip 
-        ,source_port 
-        ,db_name 
-        ,source_type 
-        ,login_name 
-        ,password 
-        ,service_name 
-        ,use_state 
-        ,data_state
-        ,sorts
-        ,create_user_id 
-        ,create_time 
-        ,modify_user_id 
-        ,modify_time 
-        ,sts 
-        ,org_id 
-     </sql>
-    <!-- 查询 采用==查询 -->
-    <select id="entity_list_base" resultMap="get-SysDataSourceEntity-result"
-            parameterType="com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity">
-        select
-        <include refid="SysDataSourceEntity_Base_Column_List"/>
-        from sys_data_source
-        <trim prefix="where" prefixOverrides="and">
-            <if test="id != null and id != ''">and id = #{id}</if>
-            <if test="sourceCode != null and sourceCode != ''">and source_code = #{sourceCode}</if>
-            <if test="sourceName != null and sourceName != ''">and source_name = #{sourceName}</if>
-            <if test="sourceIp != null and sourceIp != ''">and source_ip = #{sourceIp}</if>
-            <if test="sourcePort != null and sourcePort != ''">and source_port = #{sourcePort}</if>
-            <if test="dbName != null and dbName != ''">and db_name = #{dbName}</if>
-            <if test="sourceType != null and sourceType != ''">and source_type = #{sourceType}</if>
-            <if test="loginName != null and loginName != ''">and login_name = #{loginName}</if>
-            <if test="password != null and password != ''">and password = #{password}</if>
-            <if test="serviceName != null and serviceName != ''">and service_name = #{serviceName}</if>
-            <if test="useState != null">and use_state = #{useState}</if>
-            <if test="dataState != null">and data_state = #{dataState}</if>
-            <if test="sorts != null">and sorts = #{sorts}</if>
-            <if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
-            <if test="create_time != null">and create_time = #{create_time}</if>
-            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
-            <if test="modify_time != null">and modify_time = #{modify_time}</if>
-            <if test="sts != null and sts != ''">and sts = #{sts}</if>
-            <if test="org_id != null and org_id != ''">and org_id = #{org_id}</if>
-            and sts='Y'
-        </trim>
-        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
-        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-    </select>
-
-    <!-- 查询 采用==查询 -->
-    <select id="entity_count_not_id" resultType="Integer"
-            parameterType="com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity">
-        select
-        count(1)
-        from sys_data_source
-        <trim prefix="where" prefixOverrides="and">
-            <if test="id != null and id != ''">and id != #{id}</if>
-            <if test="sourceCode != null and sourceCode != ''">and source_code = #{sourceCode}</if>
-            <if test="sourceName != null and sourceName != ''">and source_name = #{sourceName}</if>
-            <if test="sourceIp != null and sourceIp != ''">and source_ip = #{sourceIp}</if>
-            <if test="sourcePort != null and sourcePort != ''">and source_port = #{sourcePort}</if>
-            <if test="dbName != null and dbName != ''">and db_name = #{dbName}</if>
-            <if test="sourceType != null and sourceType != ''">and source_type = #{sourceType}</if>
-            <if test="loginName != null and loginName != ''">and login_name = #{loginName}</if>
-            <if test="password != null and password != ''">and password = #{password}</if>
-            <if test="serviceName != null and serviceName != ''">and service_name = #{serviceName}</if>
-            <if test="useState != null">and use_state = #{useState}</if>
-            <if test="dataState != null">and data_state = #{dataState}</if>
-            <if test="sorts != null">and sorts = #{sorts}</if>
-            <if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
-            <if test="create_time != null">and create_time = #{create_time}</if>
-            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
-            <if test="modify_time != null">and modify_time = #{modify_time}</if>
-            <if test="sts != null and sts != ''">and sts = #{sts}</if>
-            <if test="org_id != null and org_id != ''">and org_id = #{org_id}</if>
-            and sts='Y'
-        </trim>
-    </select>
-
-    <!-- 查询符合条件的数量 -->
-    <select id="entity_count" resultType="Integer"
-            parameterType="com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity">
-        select count(1) from sys_data_source
-        <trim prefix="where" prefixOverrides="and">
-            <if test="id != null and id != ''">and id = #{id}</if>
-            <if test="sourceCode != null and sourceCode != ''">and source_code = #{sourceCode}</if>
-            <if test="sourceName != null and sourceName != ''">and source_name = #{sourceName}</if>
-            <if test="sourceIp != null and sourceIp != ''">and source_ip = #{sourceIp}</if>
-            <if test="sourcePort != null and sourcePort != ''">and source_port = #{sourcePort}</if>
-            <if test="dbName != null and dbName != ''">and db_name = #{dbName}</if>
-            <if test="sourceType != null and sourceType != ''">and source_type = #{sourceType}</if>
-            <if test="loginName != null and loginName != ''">and login_name = #{loginName}</if>
-            <if test="password != null and password != ''">and password = #{password}</if>
-            <if test="serviceName != null and serviceName != ''">and service_name = #{serviceName}</if>
-            <if test="useState != null">and use_state = #{useState}</if>
-            <if test="dataState != null">and data_state = #{dataState}</if>
-            <if test="sorts != null">and sorts = #{sorts}</if>
-            <if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
-            <if test="create_time != null">and create_time = #{create_time}</if>
-            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
-            <if test="modify_time != null">and modify_time = #{modify_time}</if>
-            <if test="sts != null and sts != ''">and sts = #{sts}</if>
-            <if test="org_id != null and org_id != ''">and org_id = #{org_id}</if>
-            and sts='Y'
-        </trim>
-        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
-        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-    </select>
-
-    <!-- 分页查询列表 采用like格式 -->
-    <select id="entity_list_like" resultMap="get-SysDataSourceEntity-result"
-            parameterType="com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity">
-        select
-        <include refid="SysDataSourceEntity_Base_Column_List"/>
-        from sys_data_source
-        <trim prefix="where" prefixOverrides="and">
-            <if test="id != null and id != ''">and id like concat('%',#{id},'%')</if>
-            <if test="sourceCode != null and sourceCode != ''">and source_code like concat('%',#{sourceCode},'%')</if>
-            <if test="sourceName != null and sourceName != ''">and source_name like concat('%',#{sourceName},'%')</if>
-            <if test="sourceIp != null and sourceIp != ''">and source_ip like concat('%',#{sourceIp},'%')</if>
-            <if test="sourcePort != null and sourcePort != ''">and source_port like concat('%',#{sourcePort},'%')</if>
-            <if test="dbName != null and dbName != ''">and db_name like concat('%',#{dbName},'%')</if>
-            <if test="sourceType != null and sourceType != ''">and source_type like concat('%',#{sourceType},'%')</if>
-            <if test="loginName != null and loginName != ''">and login_name like concat('%',#{loginName},'%')</if>
-            <if test="password != null and password != ''">and password like concat('%',#{password},'%')</if>
-            <if test="serviceName != null and serviceName != ''">and service_name like concat('%',#{serviceName},'%')
-            </if>
-            <if test="useState != null">and use_state like concat('%',#{useState},'%')</if>
-            <if test="dataState != null">and data_state like concat('%',#{dataState},'%')</if>
-            <if test="sorts != null">and sorts like concat('%',#{sorts},'%')</if>
-            <if test="create_user_id != null and create_user_id != ''">and create_user_id like
-                concat('%',#{create_user_id},'%')
-            </if>
-            <if test="create_time != null">and create_time like concat('%',#{create_time},'%')</if>
-            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id like
-                concat('%',#{modify_user_id},'%')
-            </if>
-            <if test="modify_time != null">and modify_time like concat('%',#{modify_time},'%')</if>
-            <if test="sts != null and sts != ''">and sts like concat('%',#{sts},'%')</if>
-            <if test="org_id != null and org_id != ''">and org_id like concat('%',#{org_id},'%')</if>
-            and sts='Y'
-        </trim>
-        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
-        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-    </select>
-
-
-    <!-- 分页查询列表 采用like格式 -->
-    <select id="queryVoList" resultType="com.hzya.frame.sys.dataSource.entity.SysDataSourceVo"
-            parameterType="com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity">
-        select
-        id,
-        source_code as sourceCode,
-        source_name as sourceName,
-        source_ip as sourceIp,
-        source_port as sourcePort,
-        db_name as dbName,
-        source_type as sourceType,
-        login_name as loginName,
-        password as password,
-        service_name as serviceName,
-        use_state as useState,
-        data_state as dataState
-        from sys_data_source
-        <trim prefix="where" prefixOverrides="and">
-            <if test="id != null and id != ''">and id like concat('%',#{id},'%')</if>
-            <if test="sourceCode != null and sourceCode != ''">and source_code like concat('%',#{sourceCode},'%')</if>
-            <if test="sourceName != null and sourceName != ''">and source_name like concat('%',#{sourceName},'%')</if>
-            <if test="sourceIp != null and sourceIp != ''">and source_ip like concat('%',#{sourceIp},'%')</if>
-            <if test="sourcePort != null and sourcePort != ''">and source_port like concat('%',#{sourcePort},'%')</if>
-            <if test="dbName != null and dbName != ''">and db_name like concat('%',#{dbName},'%')</if>
-            <if test="sourceType != null and sourceType != ''">and source_type like concat('%',#{sourceType},'%')</if>
-            <if test="loginName != null and loginName != ''">and login_name like concat('%',#{loginName},'%')</if>
-            <if test="password != null and password != ''">and password like concat('%',#{password},'%')</if>
-            <if test="serviceName != null and serviceName != ''">and service_name like concat('%',#{serviceName},'%')
-            </if>
-            <if test="useState != null">and use_state like concat('%',#{useState},'%')</if>
-            <if test="dataState != null">and data_state like concat('%',#{dataState},'%')</if>
-            <if test="sorts != null">and sorts like concat('%',#{sorts},'%')</if>
-            <if test="create_user_id != null and create_user_id != ''">and create_user_id like
-                concat('%',#{create_user_id},'%')
-            </if>
-            <if test="create_time != null">and create_time like concat('%',#{create_time},'%')</if>
-            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id like
-                concat('%',#{modify_user_id},'%')
-            </if>
-            <if test="modify_time != null">and modify_time like concat('%',#{modify_time},'%')</if>
-            <if test="sts != null and sts != ''">and sts like concat('%',#{sts},'%')</if>
-            <if test="org_id != null and org_id != ''">and org_id like concat('%',#{org_id},'%')</if>
-            and sts='Y'
-        </trim>
-        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
-        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-    </select>
-    <select id="queryDSBase" resultType="com.hzya.frame.sys.dataSource.entity.SysDataSourceVo"
-            parameterType="com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity">
-        select
-        id,
-        source_code as sourceCode,
-        source_name as sourceName,
-        source_ip as sourceIp,
-        source_port as sourcePort,
-        db_name as dbName,
-        source_type as sourceType,
-        login_name as loginName,
-        password as password,
-        service_name as serviceName,
-        use_state as useState,
-        data_state as dataState
-        from sys_data_source
-        <trim prefix="where" prefixOverrides="and">
-            <if test="id != null and id != ''">and id = #{id}</if>
-            <if test="sourceCode != null and sourceCode != ''">and source_code = #{sourceCode}</if>
-            <if test="sourceName != null and sourceName != ''">and source_name = #{sourceName}</if>
-            <if test="sourceIp != null and sourceIp != ''">and source_ip = #{sourceIp}</if>
-            <if test="sourcePort != null and sourcePort != ''">and source_port = #{sourcePort}</if>
-            <if test="dbName != null and dbName != ''">and db_name = #{dbName}</if>
-            <if test="sourceType != null and sourceType != ''">and source_type = #{sourceType}</if>
-            <if test="loginName != null and loginName != ''">and login_name = #{loginName}</if>
-            <if test="password != null and password != ''">and password = #{password}</if>
-            <if test="serviceName != null and serviceName != ''">and service_name = #{serviceName}</if>
-            <if test="useState != null">and use_state = #{useState}</if>
-            <if test="dataState != null">and data_state = #{dataState}</if>
-            <if test="sorts != null">and sorts = #{sorts}</if>
-            <if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
-            <if test="create_time != null">and create_time = #{create_time}</if>
-            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
-            <if test="modify_time != null">and modify_time = #{modify_time}</if>
-            <if test="sts != null and sts != ''">and sts = #{sts}</if>
-            <if test="org_id != null and org_id != ''">and org_id = #{org_id}</if>
-            and sts='Y'
-        </trim>
-    </select>
-
-
-    <!-- 分页查询列表 采用like格式 -->
-    <select id="queryVoList_COUNT" resultType="int" parameterType="com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity">
-        select
-        count(*)
-        from sys_data_source
-        <trim prefix="where" prefixOverrides="and">
-            <if test="id != null and id != ''">and id like concat('%',#{id},'%')</if>
-            <if test="sourceCode != null and sourceCode != ''">and source_code like concat('%',#{sourceCode},'%')</if>
-            <if test="sourceName != null and sourceName != ''">and source_name like concat('%',#{sourceName},'%')</if>
-            <if test="sourceIp != null and sourceIp != ''">and source_ip like concat('%',#{sourceIp},'%')</if>
-            <if test="sourcePort != null and sourcePort != ''">and source_port like concat('%',#{sourcePort},'%')</if>
-            <if test="dbName != null and dbName != ''">and db_name like concat('%',#{dbName},'%')</if>
-            <if test="sourceType != null and sourceType != ''">and source_type like concat('%',#{sourceType},'%')</if>
-            <if test="loginName != null and loginName != ''">and login_name like concat('%',#{loginName},'%')</if>
-            <if test="password != null and password != ''">and password like concat('%',#{password},'%')</if>
-            <if test="serviceName != null and serviceName != ''">and service_name like concat('%',#{serviceName},'%')
-            </if>
-            <if test="useState != null">and use_state like concat('%',#{useState},'%')</if>
-            <if test="dataState != null">and data_state like concat('%',#{dataState},'%')</if>
-            <if test="sorts != null">and sorts like concat('%',#{sorts},'%')</if>
-            <if test="create_user_id != null and create_user_id != ''">and create_user_id like
-                concat('%',#{create_user_id},'%')
-            </if>
-            <if test="create_time != null">and create_time like concat('%',#{create_time},'%')</if>
-            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id like
-                concat('%',#{modify_user_id},'%')
-            </if>
-            <if test="modify_time != null">and modify_time like concat('%',#{modify_time},'%')</if>
-            <if test="sts != null and sts != ''">and sts like concat('%',#{sts},'%')</if>
-            <if test="org_id != null and org_id != ''">and org_id like concat('%',#{org_id},'%')</if>
-            and sts='Y'
-        </trim>
-    </select>
-
-    <!-- 查询列表 字段采用or格式 -->
-    <select id="SysDataSourceentity_list_or" resultMap="get-SysDataSourceEntity-result"
-            parameterType="com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity">
-        select
-        <include refid="SysDataSourceEntity_Base_Column_List"/>
-        from sys_data_source
-        <trim prefix="where" prefixOverrides="and">
-            <if test="id != null and id != ''">or id = #{id}</if>
-            <if test="sourceCode != null and sourceCode != ''">or source_code = #{sourceCode}</if>
-            <if test="sourceName != null and sourceName != ''">or source_name = #{sourceName}</if>
-            <if test="sourceIp != null and sourceIp != ''">or source_ip = #{sourceIp}</if>
-            <if test="sourcePort != null and sourcePort != ''">or source_port = #{sourcePort}</if>
-            <if test="dbName != null and dbName != ''">or db_name = #{dbName}</if>
-            <if test="sourceType != null and sourceType != ''">or source_type = #{sourceType}</if>
-            <if test="loginName != null and loginName != ''">or login_name = #{loginName}</if>
-            <if test="password != null and password != ''">or password = #{password}</if>
-            <if test="serviceName != null and serviceName != ''">or service_name = #{serviceName}</if>
-            <if test="useState != null">or use_state = #{useState}</if>
-            <if test="dataState != null">or data_state = #{dataState}</if>
-            <if test="sorts != null">or sorts = #{sorts}</if>
-            <if test="create_user_id != null and create_user_id != ''">or create_user_id = #{create_user_id}</if>
-            <if test="create_time != null">or create_time = #{create_time}</if>
-            <if test="modify_user_id != null and modify_user_id != ''">or modify_user_id = #{modify_user_id}</if>
-            <if test="modify_time != null">or modify_time = #{modify_time}</if>
-            <if test="sts != null and sts != ''">or sts = #{sts}</if>
-            <if test="org_id != null and org_id != ''">or org_id = #{org_id}</if>
-            and sts='Y'
-        </trim>
-        <if test=" sort == null or sort == ''.toString()  ">order by sorts asc</if>
-        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-    </select>
-
-    <!--新增所有列-->
-    <insert id="entity_insert" parameterType="com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity" keyProperty="id"
-            useGeneratedKeys="true">
-        insert into sys_data_source(
-        <trim suffix="" suffixOverrides=",">
-            <if test="id != null and id != ''">id ,</if>
-            <if test="sourceCode != null and sourceCode != ''">source_code ,</if>
-            <if test="sourceName != null and sourceName != ''">source_name ,</if>
-            <if test="sourceIp != null and sourceIp != ''">source_ip ,</if>
-            <if test="sourcePort != null and sourcePort != ''">source_port ,</if>
-            <if test="dbName != null and dbName != ''">db_name ,</if>
-            <if test="sourceType != null and sourceType != ''">source_type ,</if>
-            <if test="loginName != null and loginName != ''">login_name ,</if>
-            <if test="password != null and password != ''">password ,</if>
-            <if test="serviceName != null and serviceName != ''">service_name ,</if>
-            <if test="useState != null">use_state ,</if>
-            <if test="dataState != null">data_state ,</if>
-            <if test="sorts != null">sorts ,</if>
-            <if test="create_user_id != null and create_user_id != ''">create_user_id ,</if>
-            <if test="create_time != null">create_time ,</if>
-            <if test="modify_user_id != null and modify_user_id != ''">modify_user_id ,</if>
-            <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(
-        <trim suffix="" suffixOverrides=",">
-            <if test="id != null and id != ''">#{id} ,</if>
-            <if test="sourceCode != null and sourceCode != ''">#{sourceCode} ,</if>
-            <if test="sourceName != null and sourceName != ''">#{sourceName} ,</if>
-            <if test="sourceIp != null and sourceIp != ''">#{sourceIp} ,</if>
-            <if test="sourcePort != null and sourcePort != ''">#{sourcePort} ,</if>
-            <if test="dbName != null and dbName != ''">#{dbName} ,</if>
-            <if test="sourceType != null and sourceType != ''">#{sourceType} ,</if>
-            <if test="loginName != null and loginName != ''">#{loginName} ,</if>
-            <if test="password != null and password != ''">#{password} ,</if>
-            <if test="serviceName != null and serviceName != ''">#{serviceName} ,</if>
-            <if test="useState != null">#{useState} ,</if>
-            <if test="dataState != null">#{dataState} ,</if>
-            <if test="sorts != null">#{sorts} ,</if>
-            <if test="create_user_id != null and create_user_id != ''">#{create_user_id} ,</if>
-            <if test="create_time != null">#{create_time} ,</if>
-            <if test="modify_user_id != null and modify_user_id != ''">#{modify_user_id} ,</if>
-            <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 sys_data_source a WHERE a.sts
-                = 'Y' ),
-            </if>
-            <if test="sts == null ">'Y',</if>
-        </trim>
-        )
-    </insert>
-    <!-- 批量新增 -->
-    <insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into sys_data_source(source_code, source_name, source_ip, source_port, db_name, source_type, login_name,
-        password, service_name, use_state, data_state, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id,
-        sts)
-        values
-        <foreach collection="entities" item="entity" separator=",">
-            (#{entity.sourceCode},#{entity.sourceName},#{entity.sourceIp},#{entity.sourcePort},#{entity.dbName},#{entity.sourceType},#{entity.loginName},#{entity.password},#{entity.serviceName},#{entity.useState},#{entity.dataState},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},
-            'Y')
-        </foreach>
-    </insert>
-    <!-- 批量新增或者修改-->
-    <insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into sys_data_source(source_code, source_name, source_ip, source_port, db_name, source_type, login_name,
-        password, service_name, use_state, data_state, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id)
-        values
-        <foreach collection="entities" item="entity" separator=",">
-            (#{entity.sourceCode},#{entity.sourceName},#{entity.sourceIp},#{entity.sourcePort},#{entity.dbName},#{entity.sourceType},#{entity.loginName},#{entity.password},#{entity.serviceName},#{entity.useState},#{entity.dataState},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id})
-        </foreach>
-        on duplicate key update
-        source_code = values(source_code),
-        source_name = values(source_name),
-        source_ip = values(source_ip),
-        source_port = values(source_port),
-        db_name = values(db_name),
-        source_type = values(source_type),
-        login_name = values(login_name),
-        password = values(password),
-        service_name = values(service_name),
-        use_state = values(use_state),
-        data_state = values(data_state),
-        sorts = values(sorts),
-        create_user_id = values(create_user_id),
-        create_time = values(create_time),
-        modify_user_id = values(modify_user_id),
-        modify_time = values(modify_time),
-        sts = values(sts),
-        org_id = values(org_id)
-    </insert>
-    <!--通过主键修改方法-->
-    <update id="entity_update" parameterType="com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity">
-        update sys_data_source set
-        <trim suffix="" suffixOverrides=",">
-            <if test="sourceCode != null and sourceCode != ''">source_code = #{sourceCode},</if>
-            <if test="sourceName != null and sourceName != ''">source_name = #{sourceName},</if>
-            <if test="sourceIp != null and sourceIp != ''">source_ip = #{sourceIp},</if>
-            <if test="sourcePort != null and sourcePort != ''">source_port = #{sourcePort},</if>
-            <if test="dbName != null and dbName != ''">db_name = #{dbName},</if>
-            <if test="sourceType != null and sourceType != ''">source_type = #{sourceType},</if>
-            <if test="loginName != null and loginName != ''">login_name = #{loginName},</if>
-            <if test="password != null and password != ''">password = #{password},</if>
-            <if test="serviceName != null and serviceName != ''">service_name = #{serviceName},</if>
-            <if test="useState != null">use_state = #{useState},</if>
-            <if test="dataState != null">data_state = #{dataState},</if>
-            <if test="sorts != null">sorts = #{sorts},</if>
-            <if test="create_user_id != null and create_user_id != ''">create_user_id = #{create_user_id},</if>
-            <if test="create_time != null">create_time = #{create_time},</if>
-            <if test="modify_user_id != null and modify_user_id != ''">modify_user_id = #{modify_user_id},</if>
-            <if test="modify_time != null">modify_time = #{modify_time},</if>
-            <if test="sts != null and sts != ''">sts = #{sts},</if>
-            <if test="org_id != null and org_id != ''">org_id = #{org_id},</if>
-        </trim>
-        where id = #{id}
-    </update>
-    <!-- 逻辑删除 -->
-    <update id="entity_logicDelete" parameterType="com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity">
-update sys_data_source  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
-where id = #{id}
-</update>
-    <!-- 多条件逻辑删除 -->
-    <update id="entity_logicDelete_Multi_Condition"
-            parameterType="com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity">
-        update sys_data_source set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
-        <trim prefix="where" prefixOverrides="and">
-            <if test="id != null and id != ''">and id = #{id}</if>
-            <if test="sourceCode != null and sourceCode != ''">and source_code = #{sourceCode}</if>
-            <if test="sourceName != null and sourceName != ''">and source_name = #{sourceName}</if>
-            <if test="sourceIp != null and sourceIp != ''">and source_ip = #{sourceIp}</if>
-            <if test="sourcePort != null and sourcePort != ''">and source_port = #{sourcePort}</if>
-            <if test="dbName != null and dbName != ''">and db_name = #{dbName}</if>
-            <if test="sourceType != null and sourceType != ''">and source_type = #{sourceType}</if>
-            <if test="loginName != null and loginName != ''">and login_name = #{loginName}</if>
-            <if test="password != null and password != ''">and password = #{password}</if>
-            <if test="serviceName != null and serviceName != ''">and service_name = #{serviceName}</if>
-            <if test="useState != null">and use_state = #{useState}</if>
-            <if test="dataState != null">and data_state = #{dataState}</if>
-            <if test="sorts != null">and sorts = #{sorts}</if>
-            <if test="sts != null and sts != ''">and sts = #{sts}</if>
-            and sts='Y'
-        </trim>
-    </update>
-    <!--通过主键删除-->
-    <delete id="entity_delete">
-    delete from sys_data_source where id = #{id}
-</delete>
-
-</mapper>
-
diff --git a/service/src/main/java/com/hzya/frame/sys/dataSource/entity/SysDataSourceVo.java b/service/src/main/java/com/hzya/frame/sys/dataSource/entity/SysDataSourceVo.java
deleted file mode 100644
index ed00d0d2..00000000
--- a/service/src/main/java/com/hzya/frame/sys/dataSource/entity/SysDataSourceVo.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package com.hzya.frame.sys.dataSource.entity;
-
-
-import com.hzya.frame.web.exception.BaseSystemException;
-
-public class SysDataSourceVo   {
-
-    /** 主键ID */
-    private String id;
-  /**  数据源编码 */
-   private String sourceCode;
-  /**  数据源名称 */
-   private String sourceName;
-  /**  ip */
-   private String sourceIp;
-  /**  端口 */
-   private String sourcePort;
-  /**  数据库名称 */
-   private String dbName;
-  /**  数据源类型 1oracle 2sqlsever 3mysql 4dm*/
-   private String sourceType;
-  /**  登录名 */
-   private String loginName;
-  /**  密码 */
-   private String password;
-  /**  选择oracle下服务名称 */
-   private String serviceName;
-  /**  使用状态1启用0锁定 */
-   private Integer useState;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getSourceCode() {
-        return sourceCode;
-    }
-
-    public void setSourceCode(String sourceCode) {
-        this.sourceCode = sourceCode;
-    }
-
-    public String getSourceName() {
-        return sourceName;
-    }
-
-    public void setSourceName(String sourceName) {
-        this.sourceName = sourceName;
-    }
-
-    public String getSourceIp() {
-        return sourceIp;
-    }
-
-    public void setSourceIp(String sourceIp) {
-        this.sourceIp = sourceIp;
-    }
-
-    public String getSourcePort() {
-        return sourcePort;
-    }
-
-    public void setSourcePort(String sourcePort) {
-        this.sourcePort = sourcePort;
-    }
-
-    public String getDbName() {
-        return dbName;
-    }
-
-    public void setDbName(String dbName) {
-        this.dbName = dbName;
-    }
-
-    public String getSourceType() {
-        return sourceType;
-    }
-
-    public void setSourceType(String sourceType) {
-        this.sourceType = sourceType;
-    }
-
-    public String getLoginName() {
-        return loginName;
-    }
-
-    public void setLoginName(String loginName) {
-        this.loginName = loginName;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getServiceName() {
-        return serviceName;
-    }
-
-    public void setServiceName(String serviceName) {
-        this.serviceName = serviceName;
-    }
-
-    public Integer getUseState() {
-        return useState;
-    }
-
-    public void setUseState(Integer useState) {
-        this.useState = useState;
-    }
-
-    public String getSourceUrl() {
-        StringBuffer sourceUrl = new StringBuffer();
-        switch (sourceType) {
-            case "1": //oracle
-                //jdbc:oracle:thin:@60.204.132.91:1521:ORCL
-                sourceUrl.append("jdbc:oracle:thin:@").append(sourceIp).append(":").append(sourcePort).append(":").append(serviceName);
-                break;
-            case "2": //sqlsever
-                //jdbc:sqlserver://221.12.175.82:1433;DatabaseName=U8CLOUD;encrypt=false;trustServerCertificate=true
-                sourceUrl.append("jdbc:jtds:sqlserver://").append(sourceIp).append(":").append(sourcePort).append("/").append(dbName).append(";encrypt=false;trustServerCertificate=true");
-                break;
-            case "3": //mysql
-                //jdbc:mysql://hzya.ufyct.com:9096/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false
-                sourceUrl.append("jdbc:mysql://").append(sourceIp).append(":").append(sourcePort).append("/").append(dbName).append("?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false");
-                break;
-            case "4": //dm
-                //jdbc:dm://hzya.ufyct.com:9040?schema=businesscenter&characterEncoding=UTF-8
-                sourceUrl.append("jdbc:dm://").append(sourceIp).append(":").append(sourcePort).append("?schema=").append(dbName).append("&characterEncoding=UTF-8");
-                break;
-            default:
-        }
-        return sourceUrl.toString();
-    }
-    public String getSourceTypeName() {
-        String  sourceTypeName = null;
-        switch (sourceType) {
-            case "1": //oracle
-                sourceTypeName = "oracle";
-                break;
-            case "2": //sqlsever
-                sourceTypeName = "sqlServer";
-                break;
-            case "3": //mysql
-                sourceTypeName = "mysql";
-                break;
-            case "4": //mysql
-                sourceTypeName = "dm";
-                break;
-            default:
-        }
-        return sourceTypeName;
-    }
-}
-
diff --git a/service/src/main/java/com/hzya/frame/sys/dataSource/service/ISysDataSourceService.java b/service/src/main/java/com/hzya/frame/sys/dataSource/service/ISysDataSourceService.java
deleted file mode 100644
index 841841a5..00000000
--- a/service/src/main/java/com/hzya/frame/sys/dataSource/service/ISysDataSourceService.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.hzya.frame.sys.dataSource.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity;
-import com.hzya.frame.basedao.service.IBaseService;
-import com.hzya.frame.web.entity.JsonResultEntity;
-
-/**
- * 数据源表(SysDataSource)表服务接口
- *
- * @author makejava
- * @since 2023-09-05 16:07:10
- */
-public interface ISysDataSourceService extends IBaseService<SysDataSourceEntity, String>{
-    /**
-     * @param jsonObject
-     * @return com.hzya.frame.web.entity.JsonResultEntity
-     * @Author lvleigang
-     * @Description 查询列表
-     * @Date 2:18 下午 2023/7/17
-     **/
-    JsonResultEntity queryList(JSONObject jsonObject);
-    /**
-     * @param jsonObject
-     * @return com.hzya.frame.web.entity.JsonResultEntity
-     * @Author lvleigang
-     * @Description 查询列表
-     * @Date 2:18 下午 2023/7/17
-     **/
-    JsonResultEntity queryPage(JSONObject jsonObject);
-    /**
-     * @param jsonObject
-     * @return com.hzya.frame.web.entity.JsonResultEntity
-     * @Author lvleigang
-     * @Description 获取数据
-     * @Date 2:18 下午 2023/7/17
-     **/
-    JsonResultEntity queryEntity(JSONObject jsonObject);
-
-    /**
-     * @param jsonObject
-     * @return com.hzya.frame.web.entity.JsonResultEntity
-     * @Author lvleigang
-     * @Description 新增数据
-     * @Date 2:18 下午 2023/7/17
-     **/
-    JsonResultEntity addEntity(JSONObject jsonObject);
-
-    /**
-     * @param jsonObject
-     * @return com.hzya.frame.web.entity.JsonResultEntity
-     * @Author lvleigang
-     * @Description 修改数据
-     * @Date 2:18 下午 2023/7/17
-     **/
-    JsonResultEntity editEntity(JSONObject jsonObject);
-
-    /**
-     * @param jsonObject
-     * @return com.hzya.frame.web.entity.JsonResultEntity
-     * @Author lvleigang
-     * @Description 删除数据
-     * @Date 2:18 下午 2023/7/17
-     **/
-    JsonResultEntity deleteEntity(JSONObject jsonObject);
-    /**
-     * @Author lvleigang
-     * @Description  数据源测试接口 测试当前页面数据源是否配置正确
-     * @Date 2:08 下午 2023/9/23
-     * @param jsonObject
-     * @return
-     **/
-    JsonResultEntity testDatabase(JSONObject jsonObject);
-}
diff --git a/service/src/main/java/com/hzya/frame/sys/dataSource/service/impl/SysDataSourceServiceImpl.java b/service/src/main/java/com/hzya/frame/sys/dataSource/service/impl/SysDataSourceServiceImpl.java
deleted file mode 100644
index 504cca64..00000000
--- a/service/src/main/java/com/hzya/frame/sys/dataSource/service/impl/SysDataSourceServiceImpl.java
+++ /dev/null
@@ -1,256 +0,0 @@
-package com.hzya.frame.sys.dataSource.service.impl;
-
-import cn.dev33.satoken.stp.StpUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hzya.frame.serviceUtil.DsDataSourceUtil;
-import com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity;
-import com.hzya.frame.sys.dataSource.dao.ISysDataSourceDao;
-import com.hzya.frame.sys.dataSource.entity.SysDataSourceVo;
-import com.hzya.frame.sys.dataSource.service.ISysDataSourceService;
-import com.hzya.frame.sysnew.application.entity.SysApplicationDatasourceDto;
-import com.hzya.frame.util.AESUtil;
-import com.hzya.frame.uuid.UUIDUtils;
-import com.hzya.frame.web.entity.BaseResult;
-import com.hzya.frame.web.entity.JsonResultEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.annotation.Resource;
-import com.hzya.frame.basedao.service.impl.BaseService;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 数据源表(SysDataSource)表服务实现类
- *
- * @author makejava
- * @since 2023-09-05 16:07:13
- */
-@Service(value = "sysDataSourceService")
-public class SysDataSourceServiceImpl extends BaseService<SysDataSourceEntity, String> implements ISysDataSourceService {
-     
-    private ISysDataSourceDao sysDataSourceDao;
-    @Resource
-    private DsDataSourceUtil dsDataSourceUtil;
-
-    @Autowired
-	public void setSysDataSourceDao(ISysDataSourceDao dao) {
-		this.sysDataSourceDao = dao;
-		this.dao = dao;
-	}
-	/**
-	 * @param object
-	 * @return com.hzya.frame.web.entity.JsonResultEntity
-	 * @Author lvleigang
-	 * @Description 查询列表
-	 * @Date 2:18 下午 2023/7/17
-	 **/
-	@Override
-	public JsonResultEntity queryList(JSONObject object) {
-		SysDataSourceEntity entity = getData("jsonStr", object, SysDataSourceEntity.class);
-		List<SysDataSourceVo> sysDataSourceEntities = sysDataSourceDao.queryVoList(entity);
-		return BaseResult.getSuccessMessageEntity("查询数据成功", sysDataSourceEntities);
-	}
-
-	/**
-	 * @param object
-	 * @return com.hzya.frame.web.entity.JsonResultEntity
-	 * @Author lvleigang
-	 * @Description 查询列表
-	 * @Date 2:18 下午 2023/7/17
-	 **/
-	@Override
-	public JsonResultEntity queryPage(JSONObject object) {
-		SysDataSourceEntity entity = getData("jsonStr", object, SysDataSourceEntity.class);
-		//判断分页
-		if(entity == null || entity.getPageNum() == null || entity.getPageSize() == null){
-			return BaseResult.getFailureMessageEntity("分页查询参数不存在");
-		}
-		PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
-		List<SysDataSourceVo> sysDataSourceEntities = sysDataSourceDao.queryVoList(entity);
-		if(sysDataSourceEntities != null && sysDataSourceEntities.size() > 0){
-			for (int i = 0; i < sysDataSourceEntities.size(); i++) {
-				sysDataSourceEntities.get(i).setPassword(AESUtil.decrypt(sysDataSourceEntities.get(i).getPassword()));
-			}
-		}
-		PageInfo pageInfo = new PageInfo(sysDataSourceEntities);
-		return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo);
-	}
-
-	/**
-	 * @param object
-	 * @return com.hzya.frame.web.entity.JsonResultEntity
-	 * @Author lvleigang
-	 * @Description 获取数据
-	 * @Date 2:18 下午 2023/7/17
-	 **/
-	@Override
-	public JsonResultEntity queryEntity(JSONObject object) {
-		SysDataSourceEntity entity = getData("jsonStr", object, SysDataSourceEntity.class);
-		//判断分页
-		if(entity == null || entity.getId() == null || "".equals(entity.getId())){
-			return BaseResult.getFailureMessageEntity("请先传递请求主键");
-		}
-		SysDataSourceEntity sysDataSourceEntity = sysDataSourceDao.queryOne(entity);
-		sysDataSourceEntity.setPassword(AESUtil.decrypt(sysDataSourceEntity.getPassword()));
-		return BaseResult.getSuccessMessageEntity("查询数据成功", sysDataSourceEntity);
-	}
-
-	/**
-	 * @param object
-	 * @return com.hzya.frame.web.entity.JsonResultEntity
-	 * @Author lvleigang
-	 * @Description 新增数据
-	 * @Date 2:18 下午 2023/7/17
-	 **/
-	@Override
-	public JsonResultEntity addEntity(JSONObject object) {
-		SysDataSourceEntity entity = getData("jsonStr", object, SysDataSourceEntity.class);
-		if(entity == null){
-			return BaseResult.getFailureMessageEntity("参数不允许为空");
-		}
-		if(entity.getSourceName() == null || "".equals(entity.getSourceName())){
-			return BaseResult.getFailureMessageEntity("请先输入数据源名称");
-		}
-		if(entity.getSourceCode() == null || "".equals(entity.getSourceCode())){
-			return BaseResult.getFailureMessageEntity("请先输入数据源编码");
-		}
-		SysDataSourceEntity checkEntity = new SysDataSourceEntity();
-		checkEntity.setSts("Y");
-		checkEntity.setSourceCode(entity.getSourceCode());
-		int checkCount = sysDataSourceDao.getCount(checkEntity);
-		if(checkCount > 0){
-			return BaseResult.getFailureMessageEntity("数据源编码已存在");
-		}
-		setCreate(entity);
-		if(entity.getUseState() == 1){
-			try {
-				dsDataSourceUtil.addDataSource(entity);
-				entity.setDataState("1");
-			} catch (Exception e) {
-				entity.setDataState("0");
-				//return BaseResult.getFailureMessageEntity("初始化数据源失败,请检查数据源配置是否正确");
-			}
-		}
-		entity.setPassword(AESUtil.encrypt(entity.getPassword()));
-		sysDataSourceDao.save(entity);
-		return BaseResult.getSuccessMessageEntity("保存数据源成功",entity.getId());
-	}
-	private void setCreate(SysDataSourceEntity entity) {
-		entity.setId(UUIDUtils.getUUID());
-		entity.setSts("Y");
-		entity.setCreate_user_id(StpUtil.getLoginIdAsString());
-		entity.setModify_user_id(StpUtil.getLoginIdAsString());
-		entity.setCreate_time(new Date());
-		entity.setModify_time(new Date());
-	}
-	/**
-	 * @param object
-	 * @return com.hzya.frame.web.entity.JsonResultEntity
-	 * @Author lvleigang
-	 * @Description 修改数据
-	 * @Date 2:18 下午 2023/7/17
-	 **/
-	@Override
-	public JsonResultEntity editEntity(JSONObject object) {
-		SysDataSourceEntity entity = getData("jsonStr", object, SysDataSourceEntity.class);
-		if(entity == null){
-			return BaseResult.getFailureMessageEntity("参数不允许为空");
-		}
-		if(entity.getId() == null || "".equals(entity.getId())){
-			return BaseResult.getFailureMessageEntity("系统错误");
-		}
-		if(entity.getSourceName() == null || "".equals(entity.getSourceName())){
-			return BaseResult.getFailureMessageEntity("请先输入数据源名称");
-		}
-		if(entity.getSourceCode() == null || "".equals(entity.getSourceCode())){
-			return BaseResult.getFailureMessageEntity("请先输入数据源编码");
-		}
-		SysDataSourceEntity checkEntity = new SysDataSourceEntity();
-		checkEntity.setSts("Y");
-		checkEntity.setId(entity.getId());
-		checkEntity.setSourceCode(entity.getSourceCode());
-		int checkCount = sysDataSourceDao.entity_count_not_id(checkEntity);
-		if(checkCount > 0){
-			return BaseResult.getFailureMessageEntity("接口编码已存在");
-		}
-		entity.setModify_user_id(StpUtil.getLoginIdAsString());
-		entity.setModify_time(new Date());
-		entity.setSts("Y");
-		if(entity.getUseState() == 1){
-			try {
-				dsDataSourceUtil.editDataSource(entity);
-			} catch (Exception e) {
-				//return BaseResult.getSuccessMessageEntity("修改数据源失败，请检查数据源配置是否正确");
-			}
-		}else {
-			try {
-				dsDataSourceUtil.removeDataSource(entity.getSourceCode());
-			} catch (Exception e) {
-				return BaseResult.getSuccessMessageEntity("修改数据源失败");
-			}
-		}
-		if(entity.getPassword() != null ){
-			entity.setPassword(AESUtil.encrypt(entity.getPassword()));
-		}
-		sysDataSourceDao.update(entity);
-		return BaseResult.getSuccessMessageEntity("修改数据源成功",entity.getId());
-
-	}
-	/**
-	 * @param object
-	 * @return
-	 * @Author lvleigang
-	 * @Description 数据源测试接口 测试当前页面数据源是否配置正确
-	 * @Date 2:08 下午 2023/9/23
-	 **/
-	@Override
-	public JsonResultEntity testDatabase(JSONObject object) {
-		SysDataSourceEntity entity = getData("jsonStr", object, SysDataSourceEntity.class);
-		if (entity == null) {
-			return BaseResult.getFailureMessageEntity("系统错误");
-		}
-		SysApplicationDatasourceDto sysApplicationDatasourceDto = new SysApplicationDatasourceDto();
-		sysApplicationDatasourceDto.setSourceType(entity.getSourceType());
-		sysApplicationDatasourceDto.setSourceUrl(entity.getSourceUrl());
-		sysApplicationDatasourceDto.setLoginName(entity.getLoginName());
-		sysApplicationDatasourceDto.setPassword(entity.getPassword());
-		if (dsDataSourceUtil.testConnection(sysApplicationDatasourceDto)) {
-			return BaseResult.getSuccessMessageEntity("测试连接数据源成功",true);
-		} else {
-			return BaseResult.getSuccessMessageEntity("测试连接数据源失败",false);
-		}
-	}
-	/**
-	 * @param object
-	 * @return com.hzya.frame.web.entity.JsonResultEntity
-	 * @Author lvleigang
-	 * @Description 删除数据
-	 * @Date 2:18 下午 2023/7/17
-	 **/
-	@Override
-	public JsonResultEntity deleteEntity(JSONObject object) {
-		SysDataSourceEntity entity = getData("jsonStr", object, SysDataSourceEntity.class);
-		//判断编码是否重复
-		if (entity == null) {
-			return BaseResult.getFailureMessageEntity("请先填写内容");
-		}
-		if (entity.getId() == null || "".equals(entity.getId())) {
-			return BaseResult.getFailureMessageEntity("请先选择数据");
-		}
-		SysDataSourceEntity deleteEntity = sysDataSourceDao.queryOne(entity);
-		//删除主表和明细表
-		entity.setModify_user_id(StpUtil.getLoginIdAsString());
-		entity.setModify_time(new Date());
-		entity.setSts("Y");
-		try {
-			dsDataSourceUtil.removeDataSource(deleteEntity.getSourceCode());
-		} catch (Exception e) {
-			return BaseResult.getSuccessMessageEntity("删除数据源失败");
-		}
-		sysDataSourceDao.logicRemoveMultiCondition(entity);
-		return BaseResult.getSuccessMessageEntity("删除成功");
-	}
-}
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/database/dao/ISysApplicationDatabaseDao.java b/service/src/main/java/com/hzya/frame/sysnew/application/database/dao/ISysApplicationDatabaseDao.java
index 110ab6e0..14806c32 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/database/dao/ISysApplicationDatabaseDao.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/database/dao/ISysApplicationDatabaseDao.java
@@ -1,15 +1,18 @@
 package com.hzya.frame.sysnew.application.database.dao;
 
 import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity;
-import com.hzya.frame.basedao.dao.IBaseDao; 
+import com.hzya.frame.basedao.dao.IBaseDao;
+
+import java.util.List;
 
 /**
  * 数据源表(sys_application_database: table)表数据库访问层
  *
  * @author makejava
- * @since 2023-09-25 11:46:27
+ * @since 2024-06-16 21:49:26
  */
 public interface ISysApplicationDatabaseDao extends IBaseDao<SysApplicationDatabaseEntity, String> {
 
+    List<SysApplicationDatabaseEntity> queryDSBase(SysApplicationDatabaseEntity entity);
 }
 
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/database/dao/impl/SysApplicationDatabaseDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/database/dao/impl/SysApplicationDatabaseDaoImpl.java
index 332f2092..6b523995 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/database/dao/impl/SysApplicationDatabaseDaoImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/database/dao/impl/SysApplicationDatabaseDaoImpl.java
@@ -1,17 +1,26 @@
 package com.hzya.frame.sysnew.application.database.dao.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity;
 import com.hzya.frame.sysnew.application.database.dao.ISysApplicationDatabaseDao;
 import org.springframework.stereotype.Repository;
 import com.hzya.frame.basedao.dao.MybatisGenericDao;
+
+import java.util.List;
+
 /**
  * 数据源表(SysApplicationDatabase)表数据库访问层
  *
  * @author makejava
- * @since 2023-09-25 11:46:31
+ * @since 2024-06-16 21:49:30
  */
 @Repository(value = "SysApplicationDatabaseDaoImpl")
 public class SysApplicationDatabaseDaoImpl extends MybatisGenericDao<SysApplicationDatabaseEntity, String> implements ISysApplicationDatabaseDao{
- 
+    @DS("master")
+    @Override
+    public List<SysApplicationDatabaseEntity> queryDSBase(SysApplicationDatabaseEntity entity) {
+        List<SysApplicationDatabaseEntity> o = (List<SysApplicationDatabaseEntity>) super.selectList(getSqlIdPrifx() + "queryDSBase", entity);
+        return o;
+    }
 }
 
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/database/entity/SysApplicationDatabaseEntity.java b/service/src/main/java/com/hzya/frame/sysnew/application/database/entity/SysApplicationDatabaseEntity.java
index 03aa04df..a7817419 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/database/entity/SysApplicationDatabaseEntity.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/database/entity/SysApplicationDatabaseEntity.java
@@ -6,22 +6,30 @@ import com.hzya.frame.web.entity.BaseEntity;
  * 数据源表(SysApplicationDatabase)实体类
  *
  * @author makejava
- * @since 2023-09-25 11:46:34
+ * @since 2024-06-16 21:49:31
  */
 public class SysApplicationDatabaseEntity extends BaseEntity {
  
   /**  应用id */
    private String appId;
+  /**  数据源唯一编码 */
+   private String sourceCode;
+  /**  数据源名称 */
+   private String sourceName;
   /**  数据源类型（1、oracle 2、sqlServer3、mysql） */
    private String sourceType;
-  /**  实例地址 */
-   private String sourceUrl;
-  /**  账户 */
+  /**  ip */
+   private String sourceIp;
+  /**  端口 */
+   private String sourcePort;
+  /**  登录名 */
    private String loginName;
   /**  密码 */
    private String password;
   /**  库名 */
    private String dbName;
+  /**  选择oracle下服务名称 */
+   private String serviceName;
   /**  数据源是否启用（1、开启 2、关闭） */
    private String dbStatus;
 
@@ -34,6 +42,22 @@ public class SysApplicationDatabaseEntity extends BaseEntity {
         this.appId = appId;
     }
 
+    public String getSourceCode() {
+        return sourceCode;
+    }
+
+    public void setSourceCode(String sourceCode) {
+        this.sourceCode = sourceCode;
+    }
+
+    public String getSourceName() {
+        return sourceName;
+    }
+
+    public void setSourceName(String sourceName) {
+        this.sourceName = sourceName;
+    }
+
     public String getSourceType() {
         return sourceType;
     }
@@ -42,12 +66,20 @@ public class SysApplicationDatabaseEntity extends BaseEntity {
         this.sourceType = sourceType;
     }
 
-    public String getSourceUrl() {
-        return sourceUrl;
+    public String getSourceIp() {
+        return sourceIp;
     }
 
-    public void setSourceUrl(String sourceUrl) {
-        this.sourceUrl = sourceUrl;
+    public void setSourceIp(String sourceIp) {
+        this.sourceIp = sourceIp;
+    }
+
+    public String getSourcePort() {
+        return sourcePort;
+    }
+
+    public void setSourcePort(String sourcePort) {
+        this.sourcePort = sourcePort;
     }
 
     public String getLoginName() {
@@ -74,6 +106,14 @@ public class SysApplicationDatabaseEntity extends BaseEntity {
         this.dbName = dbName;
     }
 
+    public String getServiceName() {
+        return serviceName;
+    }
+
+    public void setServiceName(String serviceName) {
+        this.serviceName = serviceName;
+    }
+
     public String getDbStatus() {
         return dbStatus;
     }
@@ -81,6 +121,49 @@ public class SysApplicationDatabaseEntity extends BaseEntity {
     public void setDbStatus(String dbStatus) {
         this.dbStatus = dbStatus;
     }
+    public String getSourceUrl() {
+        StringBuffer sourceUrl = new StringBuffer();
+        if(sourceType != null){
+            switch (sourceType) {
+                case "1": //oracle
+                    //jdbc:oracle:thin:@60.204.132.91:1521:ORCL
+                    sourceUrl.append("jdbc:oracle:thin:@").append(sourceIp).append(":").append(sourcePort).append(":").append(serviceName);
+                    break;
+                case "2": //sqlsever
+                    //jdbc:sqlserver://221.12.175.82:1433;DatabaseName=U8CLOUD;encrypt=false;trustServerCertificate=true
+                    sourceUrl.append("jdbc:jtds:sqlserver://").append(sourceIp).append(":").append(sourcePort).append("/").append(dbName).append(";encrypt=false;trustServerCertificate=true");
+                    break;
+                case "3": //mysql
+                    //jdbc:mysql://hzya.ufyct.com:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
+                    sourceUrl.append("jdbc:mysql://").append(sourceIp).append(":").append(sourcePort).append("/").append(dbName).append("?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true");
+                    break;
+                case "4": //dm
+                    //jdbc:dm://hzya.ufyct.com:9040?schema=businesscenter&characterEncoding=UTF-8
+                    sourceUrl.append("jdbc:dm://").append(sourceIp).append(":").append(sourcePort).append("?schema=").append(dbName).append("&characterEncoding=UTF-8");
+                    break;
+                default:
+            }
+        }
+        return sourceUrl.toString();
+    }
+    public String getSourceTypeName() {
+        String  sourceTypeName = null;
+        if(sourceType != null){
+            switch (sourceType) {
+                case "1": //oracle
+                    sourceTypeName = "oracle";
+                    break;
+                case "2": //sqlsever
+                    sourceTypeName = "sqlServer";
+                    break;
+                case "3": //mysql
+                    sourceTypeName = "mysql";
+                    break;
+                default:
+            }
+        }
 
+        return sourceTypeName;
+    }
 }
 
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/database/entity/SysApplicationDatabaseEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/application/database/entity/SysApplicationDatabaseEntity.xml
index 67637941..2b51b38e 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/database/entity/SysApplicationDatabaseEntity.xml
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/database/entity/SysApplicationDatabaseEntity.xml
@@ -5,44 +5,46 @@
     <resultMap id="get-SysApplicationDatabaseEntity-result" type="com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity" >
        <result property="id" column="id" jdbcType="VARCHAR"/>
            <result property="appId" column="app_id" jdbcType="VARCHAR"/>
+           <result property="sourceCode" column="source_code" jdbcType="VARCHAR"/>
+           <result property="sourceName" column="source_name" jdbcType="VARCHAR"/>
            <result property="sourceType" column="source_type" jdbcType="VARCHAR"/>
-           <result property="sourceUrl" column="source_url" jdbcType="VARCHAR"/>
+           <result property="sourceIp" column="source_ip" jdbcType="VARCHAR"/>
+           <result property="sourcePort" column="source_port" jdbcType="VARCHAR"/>
            <result property="loginName" column="login_name" jdbcType="VARCHAR"/>
            <result property="password" column="password" jdbcType="VARCHAR"/>
            <result property="dbName" column="db_name" jdbcType="VARCHAR"/>
+           <result property="serviceName" column="service_name" jdbcType="VARCHAR"/>
            <result property="dbStatus" column="db_status" jdbcType="VARCHAR"/>
            <result property="sorts" column="sorts" jdbcType="INTEGER"/>
-           <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
-           <result property="sts" column="sts" jdbcType="VARCHAR"/>
-           <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
-           <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
+           <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
+           <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
+           <result property="sts" column="sts" jdbcType="VARCHAR"/>
+           <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
         </resultMap>
     <!-- 查询的字段-->
     <sql id = "SysApplicationDatabaseEntity_Base_Column_List">
         id
        ,app_id 
+        ,source_code 
+        ,source_name 
         ,source_type 
-        ,source_url 
+        ,source_ip 
+        ,source_port 
         ,login_name 
         ,password 
         ,db_name 
+        ,service_name 
         ,db_status 
         ,sorts 
-        ,org_id 
-        ,sts 
-        ,create_time 
         ,create_user_id 
-        ,modify_time 
+        ,create_time 
         ,modify_user_id 
+        ,modify_time 
+        ,sts 
+        ,org_id 
      </sql>
-    <!--通过ID获取数据 -->
-    <select id="entity_get" resultMap="get-SysApplicationDatabaseEntity-result">
-        select
-        <include refid="SysApplicationDatabaseEntity_Base_Column_List" />
-        from sys_application_database where sts = 'Y' and  id = #{id}
-    </select>
  <!-- 查询 采用==查询 -->
  <select id="entity_list_base" resultMap="get-SysApplicationDatabaseEntity-result" parameterType = "com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity">
     select
@@ -51,19 +53,23 @@
     <trim prefix="where" prefixOverrides="and"> 
         <if test="id != null and id != ''"> and id = #{id} </if>
             <if test="appId != null and appId != ''"> and app_id = #{appId} </if>
+            <if test="sourceCode != null and sourceCode != ''"> and source_code = #{sourceCode} </if>
+            <if test="sourceName != null and sourceName != ''"> and source_name = #{sourceName} </if>
             <if test="sourceType != null and sourceType != ''"> and source_type = #{sourceType} </if>
-            <if test="sourceUrl != null and sourceUrl != ''"> and source_url = #{sourceUrl} </if>
+            <if test="sourceIp != null and sourceIp != ''"> and source_ip = #{sourceIp} </if>
+            <if test="sourcePort != null and sourcePort != ''"> and source_port = #{sourcePort} </if>
             <if test="loginName != null and loginName != ''"> and login_name = #{loginName} </if>
             <if test="password != null and password != ''"> and password = #{password} </if>
             <if test="dbName != null and dbName != ''"> and db_name = #{dbName} </if>
+            <if test="serviceName != null and serviceName != ''"> and service_name = #{serviceName} </if>
             <if test="dbStatus != null and dbStatus != ''"> and db_status = #{dbStatus} </if>
             <if test="sorts != null"> and sorts = #{sorts} </if>
-            <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
-            <if test="sts != null and sts != ''"> and sts = #{sts} </if>
-            <if test="create_time != null"> and create_time = #{create_time} </if>
             <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
-            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
+            <if test="create_time != null"> and create_time = #{create_time} </if>
             <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
+            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
+            <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
             and sts='Y'
     </trim>
     <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
@@ -76,19 +82,23 @@
     <trim prefix="where" prefixOverrides="and"> 
         <if test="id != null and id != ''"> and id = #{id} </if>
             <if test="appId != null and appId != ''"> and app_id = #{appId} </if>
+            <if test="sourceCode != null and sourceCode != ''"> and source_code = #{sourceCode} </if>
+            <if test="sourceName != null and sourceName != ''"> and source_name = #{sourceName} </if>
             <if test="sourceType != null and sourceType != ''"> and source_type = #{sourceType} </if>
-            <if test="sourceUrl != null and sourceUrl != ''"> and source_url = #{sourceUrl} </if>
+            <if test="sourceIp != null and sourceIp != ''"> and source_ip = #{sourceIp} </if>
+            <if test="sourcePort != null and sourcePort != ''"> and source_port = #{sourcePort} </if>
             <if test="loginName != null and loginName != ''"> and login_name = #{loginName} </if>
             <if test="password != null and password != ''"> and password = #{password} </if>
             <if test="dbName != null and dbName != ''"> and db_name = #{dbName} </if>
+            <if test="serviceName != null and serviceName != ''"> and service_name = #{serviceName} </if>
             <if test="dbStatus != null and dbStatus != ''"> and db_status = #{dbStatus} </if>
             <if test="sorts != null"> and sorts = #{sorts} </if>
-            <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
-            <if test="sts != null and sts != ''"> and sts = #{sts} </if>
-            <if test="create_time != null"> and create_time = #{create_time} </if>
             <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
-            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
+            <if test="create_time != null"> and create_time = #{create_time} </if>
             <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
+            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
+            <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
             and sts='Y'
     </trim>
     <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
@@ -103,19 +113,23 @@
     <trim prefix="where" prefixOverrides="and"> 
         <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
             <if test="appId != null and appId != ''"> and app_id like concat('%',#{appId},'%') </if>
+            <if test="sourceCode != null and sourceCode != ''"> and source_code like concat('%',#{sourceCode},'%') </if>
+            <if test="sourceName != null and sourceName != ''"> and source_name like concat('%',#{sourceName},'%') </if>
             <if test="sourceType != null and sourceType != ''"> and source_type like concat('%',#{sourceType},'%') </if>
-            <if test="sourceUrl != null and sourceUrl != ''"> and source_url like concat('%',#{sourceUrl},'%') </if>
+            <if test="sourceIp != null and sourceIp != ''"> and source_ip like concat('%',#{sourceIp},'%') </if>
+            <if test="sourcePort != null and sourcePort != ''"> and source_port like concat('%',#{sourcePort},'%') </if>
             <if test="loginName != null and loginName != ''"> and login_name like concat('%',#{loginName},'%') </if>
             <if test="password != null and password != ''"> and password like concat('%',#{password},'%') </if>
             <if test="dbName != null and dbName != ''"> and db_name like concat('%',#{dbName},'%') </if>
+            <if test="serviceName != null and serviceName != ''"> and service_name like concat('%',#{serviceName},'%') </if>
             <if test="dbStatus != null and dbStatus != ''"> and db_status like concat('%',#{dbStatus},'%') </if>
             <if test="sorts != null"> and sorts like concat('%',#{sorts},'%') </if>
-            <if test="org_id != null and org_id != ''"> and org_id like concat('%',#{org_id},'%') </if>
-            <if test="sts != null and sts != ''"> and sts like concat('%',#{sts},'%') </if>
-            <if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
             <if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
-            <if test="modify_time != null"> and modify_time like concat('%',#{modify_time},'%') </if>
+            <if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
             <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id like concat('%',#{modify_user_id},'%') </if>
+            <if test="modify_time != null"> and modify_time like concat('%',#{modify_time},'%') </if>
+            <if test="sts != null and sts != ''"> and sts like concat('%',#{sts},'%') </if>
+            <if test="org_id != null and org_id != ''"> and org_id like concat('%',#{org_id},'%') </if>
             and sts='Y'
     </trim>
     <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
@@ -130,19 +144,23 @@
     <trim prefix="where" prefixOverrides="and"> 
          <if test="id != null and id != ''"> or id = #{id} </if>
              <if test="appId != null and appId != ''"> or app_id = #{appId} </if>
+             <if test="sourceCode != null and sourceCode != ''"> or source_code = #{sourceCode} </if>
+             <if test="sourceName != null and sourceName != ''"> or source_name = #{sourceName} </if>
              <if test="sourceType != null and sourceType != ''"> or source_type = #{sourceType} </if>
-             <if test="sourceUrl != null and sourceUrl != ''"> or source_url = #{sourceUrl} </if>
+             <if test="sourceIp != null and sourceIp != ''"> or source_ip = #{sourceIp} </if>
+             <if test="sourcePort != null and sourcePort != ''"> or source_port = #{sourcePort} </if>
              <if test="loginName != null and loginName != ''"> or login_name = #{loginName} </if>
              <if test="password != null and password != ''"> or password = #{password} </if>
              <if test="dbName != null and dbName != ''"> or db_name = #{dbName} </if>
+             <if test="serviceName != null and serviceName != ''"> or service_name = #{serviceName} </if>
              <if test="dbStatus != null and dbStatus != ''"> or db_status = #{dbStatus} </if>
              <if test="sorts != null"> or sorts = #{sorts} </if>
-             <if test="org_id != null and org_id != ''"> or org_id = #{org_id} </if>
-              <if test="sts != null and sts != ''"> or sts = #{sts} </if>
-             <if test="create_time != null"> or create_time = #{create_time} </if>
-              <if test="create_user_id != null and create_user_id != ''"> or create_user_id = #{create_user_id} </if>
-              <if test="modify_time != null"> or modify_time = #{modify_time} </if>
+             <if test="create_user_id != null and create_user_id != ''"> or create_user_id = #{create_user_id} </if>
+              <if test="create_time != null"> or create_time = #{create_time} </if>
               <if test="modify_user_id != null and modify_user_id != ''"> or modify_user_id = #{modify_user_id} </if>
+              <if test="modify_time != null"> or modify_time = #{modify_time} </if>
+              <if test="sts != null and sts != ''"> or sts = #{sts} </if>
+             <if test="org_id != null and org_id != ''"> or org_id = #{org_id} </if>
              and sts='Y'
     </trim>
     <if test=" sort == null or sort == ''.toString()  "> order by sorts asc</if>
@@ -155,19 +173,23 @@
   <trim suffix="" suffixOverrides=",">
        <if test="id != null and id != ''"> id , </if>
             <if test="appId != null and appId != ''"> app_id , </if>
+            <if test="sourceCode != null and sourceCode != ''"> source_code , </if>
+            <if test="sourceName != null and sourceName != ''"> source_name , </if>
             <if test="sourceType != null and sourceType != ''"> source_type , </if>
-            <if test="sourceUrl != null and sourceUrl != ''"> source_url , </if>
+            <if test="sourceIp != null and sourceIp != ''"> source_ip , </if>
+            <if test="sourcePort != null and sourcePort != ''"> source_port , </if>
             <if test="loginName != null and loginName != ''"> login_name , </if>
             <if test="password != null and password != ''"> password , </if>
             <if test="dbName != null and dbName != ''"> db_name , </if>
+            <if test="serviceName != null and serviceName != ''"> service_name , </if>
             <if test="dbStatus != null and dbStatus != ''"> db_status , </if>
             <if test="sorts != null"> sorts , </if>
-            <if test="org_id != null and org_id != ''"> org_id , </if>
-            <if test="sts != null and sts != ''"> sts , </if>
-            <if test="create_time != null"> create_time , </if>
             <if test="create_user_id != null and create_user_id != ''"> create_user_id , </if>
-            <if test="modify_time != null"> modify_time , </if>
+            <if test="create_time != null"> create_time , </if>
             <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id , </if>
+            <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>
@@ -175,19 +197,23 @@
  <trim suffix="" suffixOverrides=",">
        <if test="id != null and id != ''"> #{id} ,</if>
             <if test="appId != null and appId != ''"> #{appId} ,</if>
+            <if test="sourceCode != null and sourceCode != ''"> #{sourceCode} ,</if>
+            <if test="sourceName != null and sourceName != ''"> #{sourceName} ,</if>
             <if test="sourceType != null and sourceType != ''"> #{sourceType} ,</if>
-            <if test="sourceUrl != null and sourceUrl != ''"> #{sourceUrl} ,</if>
+            <if test="sourceIp != null and sourceIp != ''"> #{sourceIp} ,</if>
+            <if test="sourcePort != null and sourcePort != ''"> #{sourcePort} ,</if>
             <if test="loginName != null and loginName != ''"> #{loginName} ,</if>
             <if test="password != null and password != ''"> #{password} ,</if>
             <if test="dbName != null and dbName != ''"> #{dbName} ,</if>
+            <if test="serviceName != null and serviceName != ''"> #{serviceName} ,</if>
             <if test="dbStatus != null and dbStatus != ''"> #{dbStatus} ,</if>
             <if test="sorts != null"> #{sorts} ,</if>
-            <if test="org_id != null and org_id != ''"> #{org_id} ,</if>
-            <if test="sts != null and sts != ''"> #{sts} ,</if>
-            <if test="create_time != null"> #{create_time} ,</if>
             <if test="create_user_id != null and create_user_id != ''"> #{create_user_id} ,</if>
-            <if test="modify_time != null"> #{modify_time} ,</if>
+            <if test="create_time != null"> #{create_time} ,</if>
             <if test="modify_user_id != null and modify_user_id != ''"> #{modify_user_id} ,</if>
+            <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 sys_application_database a WHERE a.sts = 'Y' ),</if>
     <if test="sts == null ">'Y',</if>
   </trim>
@@ -195,52 +221,58 @@
 </insert>
 <!-- 批量新增 -->
 <insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
-  insert into sys_application_database(app_id, source_type, source_url, login_name, password, db_name, db_status, sorts, org_id, sts, create_time, create_user_id, modify_time, modify_user_id,  sts) 
+  insert into sys_application_database(app_id, source_code, source_name, source_type, source_ip, source_port, login_name, password, db_name, service_name, db_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id,  sts) 
     values
     <foreach collection="entities" item="entity" separator=",">
-    (#{entity.appId},#{entity.sourceType},#{entity.sourceUrl},#{entity.loginName},#{entity.password},#{entity.dbName},#{entity.dbStatus},#{entity.sorts},#{entity.org_id},#{entity.sts},#{entity.create_time},#{entity.create_user_id},#{entity.modify_time},#{entity.modify_user_id}, 'Y')
+    (#{entity.appId},#{entity.sourceCode},#{entity.sourceName},#{entity.sourceType},#{entity.sourceIp},#{entity.sourcePort},#{entity.loginName},#{entity.password},#{entity.dbName},#{entity.serviceName},#{entity.dbStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}, 'Y')
     </foreach>
 </insert>
 <!-- 批量新增或者修改-->
 <insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-    insert into sys_application_database(app_id, source_type, source_url, login_name, password, db_name, db_status, sorts, org_id, sts, create_time, create_user_id, modify_time, modify_user_id)
+    insert into sys_application_database(app_id, source_code, source_name, source_type, source_ip, source_port, login_name, password, db_name, service_name, db_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id)
     values
     <foreach collection="entities" item="entity" separator=",">
-    (#{entity.appId},#{entity.sourceType},#{entity.sourceUrl},#{entity.loginName},#{entity.password},#{entity.dbName},#{entity.dbStatus},#{entity.sorts},#{entity.org_id},#{entity.sts},#{entity.create_time},#{entity.create_user_id},#{entity.modify_time},#{entity.modify_user_id})
+    (#{entity.appId},#{entity.sourceCode},#{entity.sourceName},#{entity.sourceType},#{entity.sourceIp},#{entity.sourcePort},#{entity.loginName},#{entity.password},#{entity.dbName},#{entity.serviceName},#{entity.dbStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id})
     </foreach>
     on duplicate key update
     app_id = values(app_id),
+    source_code = values(source_code),
+    source_name = values(source_name),
     source_type = values(source_type),
-    source_url = values(source_url),
+    source_ip = values(source_ip),
+    source_port = values(source_port),
     login_name = values(login_name),
     password = values(password),
     db_name = values(db_name),
+    service_name = values(service_name),
     db_status = values(db_status),
-    sorts = values(sorts),
-    org_id = values(org_id),
-    sts = values(sts),
-    create_time = values(create_time),
     create_user_id = values(create_user_id),
+    create_time = values(create_time),
+    modify_user_id = values(modify_user_id),
     modify_time = values(modify_time),
-    modify_user_id = values(modify_user_id)</insert>
+    sts = values(sts),
+    org_id = values(org_id)</insert>
 <!--通过主键修改方法-->
 <update id="entity_update" parameterType = "com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity" >
 update sys_application_database  set
 <trim suffix="" suffixOverrides=",">
   <if test="appId != null and appId != ''"> app_id = #{appId},</if>
+  <if test="sourceCode != null and sourceCode != ''"> source_code = #{sourceCode},</if>
+  <if test="sourceName != null and sourceName != ''"> source_name = #{sourceName},</if>
   <if test="sourceType != null and sourceType != ''"> source_type = #{sourceType},</if>
-  <if test="sourceUrl != null and sourceUrl != ''"> source_url = #{sourceUrl},</if>
+  <if test="sourceIp != null and sourceIp != ''"> source_ip = #{sourceIp},</if>
+  <if test="sourcePort != null and sourcePort != ''"> source_port = #{sourcePort},</if>
   <if test="loginName != null and loginName != ''"> login_name = #{loginName},</if>
   <if test="password != null and password != ''"> password = #{password},</if>
   <if test="dbName != null and dbName != ''"> db_name = #{dbName},</if>
+  <if test="serviceName != null and serviceName != ''"> service_name = #{serviceName},</if>
   <if test="dbStatus != null and dbStatus != ''"> db_status = #{dbStatus},</if>
-  <if test="sorts != null"> sorts = #{sorts},</if>
-  <if test="org_id != null and org_id != ''"> org_id = #{org_id},</if>
-    <if test="sts != null and sts != ''"> sts = #{sts},</if>
-  <if test="create_time != null"> create_time = #{create_time},</if>
-    <if test="create_user_id != null and create_user_id != ''"> create_user_id = #{create_user_id},</if>
-    <if test="modify_time != null"> modify_time = #{modify_time},</if>
+  <if test="create_user_id != null and create_user_id != ''"> create_user_id = #{create_user_id},</if>
+    <if test="create_time != null"> create_time = #{create_time},</if>
     <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id = #{modify_user_id},</if>
+    <if test="modify_time != null"> modify_time = #{modify_time},</if>
+    <if test="sts != null and sts != ''"> sts = #{sts},</if>
+  <if test="org_id != null and org_id != ''"> org_id = #{org_id},</if>
   </trim>
 where id = #{id}
 </update>
@@ -255,21 +287,52 @@ update sys_application_database  set sts= 'N' ,modify_time = #{modify_time},modi
  <trim prefix="where" prefixOverrides="and"> 
         <if test="id != null and id != ''"> and id = #{id} </if>
             <if test="appId != null and appId != ''"> and app_id = #{appId} </if>
+            <if test="sourceCode != null and sourceCode != ''"> and source_code = #{sourceCode} </if>
+            <if test="sourceName != null and sourceName != ''"> and source_name = #{sourceName} </if>
             <if test="sourceType != null and sourceType != ''"> and source_type = #{sourceType} </if>
-            <if test="sourceUrl != null and sourceUrl != ''"> and source_url = #{sourceUrl} </if>
+            <if test="sourceIp != null and sourceIp != ''"> and source_ip = #{sourceIp} </if>
+            <if test="sourcePort != null and sourcePort != ''"> and source_port = #{sourcePort} </if>
             <if test="loginName != null and loginName != ''"> and login_name = #{loginName} </if>
             <if test="password != null and password != ''"> and password = #{password} </if>
             <if test="dbName != null and dbName != ''"> and db_name = #{dbName} </if>
+            <if test="serviceName != null and serviceName != ''"> and service_name = #{serviceName} </if>
             <if test="dbStatus != null and dbStatus != ''"> and db_status = #{dbStatus} </if>
             <if test="sorts != null"> and sorts = #{sorts} </if>
-                         <if test="sts != null and sts != ''"> and sts = #{sts} </if>
-                                                                and sts='Y'
+                                                                <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+                         and sts='Y'
     </trim>
 </update>
 <!--通过主键删除-->
 <delete id="entity_delete">
     delete from sys_application_database where id = #{id}
 </delete>
-
+    <!-- 查询 采用==查询 -->
+    <select id="queryDSBase" resultMap="get-SysApplicationDatabaseEntity-result" parameterType = "com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity">
+        select
+        <include refid="SysApplicationDatabaseEntity_Base_Column_List" />
+        from sys_application_database
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''"> and id = #{id} </if>
+            <if test="appId != null and appId != ''"> and app_id = #{appId} </if>
+            <if test="sourceCode != null and sourceCode != ''"> and source_code = #{sourceCode} </if>
+            <if test="sourceName != null and sourceName != ''"> and source_name = #{sourceName} </if>
+            <if test="sourceType != null and sourceType != ''"> and source_type = #{sourceType} </if>
+            <if test="sourceIp != null and sourceIp != ''"> and source_ip = #{sourceIp} </if>
+            <if test="sourcePort != null and sourcePort != ''"> and source_port = #{sourcePort} </if>
+            <if test="loginName != null and loginName != ''"> and login_name = #{loginName} </if>
+            <if test="password != null and password != ''"> and password = #{password} </if>
+            <if test="dbName != null and dbName != ''"> and db_name = #{dbName} </if>
+            <if test="serviceName != null and serviceName != ''"> and service_name = #{serviceName} </if>
+            <if test="dbStatus != null and dbStatus != ''"> and db_status = #{dbStatus} </if>
+            <if test="sorts != null"> and sorts = #{sorts} </if>
+            <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
+            <if test="create_time != null"> and create_time = #{create_time} </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
+            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
+            <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
+            and sts='Y'
+        </trim>
+    </select>
 </mapper>
 
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/database/service/ISysApplicationDatabaseService.java b/service/src/main/java/com/hzya/frame/sysnew/application/database/service/ISysApplicationDatabaseService.java
index 9f4ad126..c1d3776b 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/database/service/ISysApplicationDatabaseService.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/database/service/ISysApplicationDatabaseService.java
@@ -6,7 +6,7 @@ import com.hzya.frame.basedao.service.IBaseService;
  * 数据源表(SysApplicationDatabase)表服务接口
  *
  * @author makejava
- * @since 2023-09-25 11:46:39
+ * @since 2024-06-16 21:49:32
  */
 public interface ISysApplicationDatabaseService extends IBaseService<SysApplicationDatabaseEntity, String>{
 }
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/database/service/impl/SysApplicationDatabaseServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/database/service/impl/SysApplicationDatabaseServiceImpl.java
index 1f799bc6..881a9151 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/database/service/impl/SysApplicationDatabaseServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/database/service/impl/SysApplicationDatabaseServiceImpl.java
@@ -11,7 +11,7 @@ import com.hzya.frame.basedao.service.impl.BaseService;
  * 数据源表(SysApplicationDatabase)表服务实现类
  *
  * @author makejava
- * @since 2023-09-25 11:46:42
+ * @since 2024-06-16 21:49:33
  */
 @Service(value = "sysApplicationDatabaseService")
 public class SysApplicationDatabaseServiceImpl extends BaseService<SysApplicationDatabaseEntity, String> implements ISysApplicationDatabaseService {
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
index 5775b7fc..2c90c614 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
@@ -551,14 +551,19 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
      **/
     @Override
     public JsonResultEntity testDatabase(JSONObject object) {
-        SysApplicationDatasourceDto entity = getData("jsonStr", object, SysApplicationDatasourceDto.class);
+        SysApplicationDatabaseEntity entity = getData("jsonStr", object, SysApplicationDatabaseEntity.class);
         if (entity == null) {
             return BaseResult.getFailureMessageEntity("系统错误");
         }
-        if (dsDataSourceUtil.testConnection(entity)) {
-            return BaseResult.getSuccessMessageEntity("测试连接数据源成功");
+        SysApplicationDatasourceDto sysApplicationDatasourceDto = new SysApplicationDatasourceDto();
+        sysApplicationDatasourceDto.setSourceType(entity.getSourceType());
+        sysApplicationDatasourceDto.setSourceUrl(entity.getSourceUrl());
+        sysApplicationDatasourceDto.setLoginName(entity.getLoginName());
+        sysApplicationDatasourceDto.setPassword(entity.getPassword());
+        if (dsDataSourceUtil.testConnection(sysApplicationDatasourceDto)) {
+            return BaseResult.getSuccessMessageEntity("测试连接数据源成功",true);
         } else {
-            return BaseResult.getFailureMessageEntity("测试连接数据源失败,请检查数据源配置是否正确");
+            return BaseResult.getSuccessMessageEntity("测试连接数据源失败",false);
         }
     }
 
@@ -573,7 +578,8 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
         sysApplicationDatabaseDao.logicRemoveMultiCondition(detailEntity);
         SysApplicationDatabaseEntity databaseEntity = entity.getDatabaseEntity();
         if (databaseEntity != null) {
-            databaseEntity.setAppId(entity.getId());
+            databaseEntity.setPassword(AESUtil.encrypt(databaseEntity.getPassword()));
+            databaseEntity.setSts("Y");
             databaseEntity.setSts("Y");
             databaseEntity.setDbStatus(entity.getDbStatus());
             databaseEntity.setModify_user_id(StpUtil.getLoginIdAsString());
@@ -581,6 +587,19 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
             if (databaseEntity.getId() != null && !"".equals(databaseEntity.getId())) {
                 //修改
                 sysApplicationDatabaseDao.update(databaseEntity);
+                if("1".equals(databaseEntity.getDbStatus())){
+                    try {
+                        dsDataSourceUtil.editDataSource(databaseEntity);
+                    } catch (Exception e) {
+                        //return BaseResult.getSuccessMessageEntity("修改数据源失败，请检查数据源配置是否正确");
+                    }
+                }else {
+                    try {
+                        dsDataSourceUtil.removeDataSource(databaseEntity.getSourceCode());
+                    } catch (Exception e) {
+                        //return BaseResult.getSuccessMessageEntity("修改数据源失败");
+                    }
+                }
             } else {
                 //新增
                 databaseEntity.setId(UUIDUtils.getUUID());
@@ -1442,6 +1461,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
 
         if (list != null && list.size() > 0) {
             sysApplicationDatabaseEntity = list.get(0);
+            sysApplicationDatabaseEntity.setPassword(AESUtil.decrypt(sysApplicationDatabaseEntity.getPassword()));
         } else {
             sysApplicationDatabaseEntity = null;
         }
diff --git a/service/src/main/java/com/hzya/frame/sysnew/login/impl/LoginServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/login/impl/LoginServiceImpl.java
index 48fb1f2c..bef5714c 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/login/impl/LoginServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/login/impl/LoginServiceImpl.java
@@ -3,6 +3,8 @@ package com.hzya.frame.sysnew.login.impl;
 import cn.dev33.satoken.stp.SaTokenInfo;
 import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.sysnew.application.dao.ISysApplicationDao;
+import com.hzya.frame.sysnew.application.entity.SysApplicationEntity;
 import com.hzya.frame.sysnew.login.ILoginService;
 import com.hzya.frame.sysnew.organ.dao.ISysOrganDao;
 import com.hzya.frame.sysnew.organ.entity.SysOrganEntity;
@@ -37,6 +39,8 @@ public class LoginServiceImpl implements ILoginService {
     @Resource
     private ISysOrganDao sysOrganDao;
 
+    @Resource
+    private ISysApplicationDao sysApplicationDao;
     @Resource
     private InterfaceCache interfaceCache;
     /**
@@ -111,6 +115,9 @@ public class LoginServiceImpl implements ILoginService {
         res.put("token", token);
         res.put("userInfo", sysUserEntity);
         res.put("company", sysOrganEntities);
+
+
+        //切换数据源查询
         return BaseResult.getSuccessMessageEntity("登录成功", res);
     }
 
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 390c1f15..9952517e 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
@@ -6,9 +6,8 @@ import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.exception.CannotFindDataSourceException;
 import com.hzya.frame.datasource.DataSourceUtilProperties;
-import com.hzya.frame.sys.dataSource.dao.ISysDataSourceDao;
-import com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity;
-import com.hzya.frame.sys.dataSource.entity.SysDataSourceVo;
+import com.hzya.frame.sysnew.application.database.dao.ISysApplicationDatabaseDao;
+import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity;
 import com.hzya.frame.util.AESUtil;
 import com.hzya.frame.web.entity.BaseEntity;
 import com.hzya.frame.web.exception.BaseSystemException;
@@ -38,7 +37,7 @@ public class AopDynamicRoutingDataSourceInit {
     @Resource
     private DataSource dataSource;
     @Resource
-    private ISysDataSourceDao sysDataSourceDao;
+    private ISysApplicationDatabaseDao sysApplicationDatabaseDao;
 
 
     @Before("@annotation(dsAnnotation)")
@@ -64,12 +63,12 @@ public class AopDynamicRoutingDataSourceInit {
             dsDatasource = ds.getDataSource(dsValue);
         } catch (CannotFindDataSourceException exception) {
             //logger.info("beforeDynamicRoutingDataSourceInitMethod:根据ds获取dsDatasource失败！异常信息：" + "exception.getMessage()" + " 执行初始化数据源：" + dsValue);
-            SysDataSourceEntity entity = new SysDataSourceEntity();
+            SysApplicationDatabaseEntity entity = new SysApplicationDatabaseEntity();
             entity.setSts("Y");
-            entity.setUseState(1);
-            entity.setDataState("1");
+            entity.setDbStatus("1");
             entity.setSourceCode(dsValue);
-            List<SysDataSourceVo> sysDataSourceEntities = sysDataSourceDao.queryDSBase(entity);
+            entity.setDataSourceCode("master");
+            List<SysApplicationDatabaseEntity> sysDataSourceEntities = sysApplicationDatabaseDao.queryDSBase(entity);
             //logger.info("beforeDynamicRoutingDataSourceInitMethod:根据dsValue获取数据源信息查询结果 sysDataSourceEntities.size:" + sysDataSourceEntities.size());
             if (sysDataSourceEntities != null && sysDataSourceEntities.size() > 0) {
                 for (int i = 0; i < sysDataSourceEntities.size(); i++) {