From c7f46fb7f351ea9a52dca846f7609ff52e04512e Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 21 Mar 2025 11:22:41 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20CMDB=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=94=B9=E6=88=90=E6=A8=A1=E5=9E=8B=E5=B1=82?=
 =?UTF-8?q?=E7=BA=A7=E5=8F=AF=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1349157963399168]CMDB应用清单改成模型层级可配置 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1349157963399168
---
 .../deploy/dao/mapper/DeployAppConfigMapper.java   |  6 +++---
 .../deploy/dao/mapper/DeployAppConfigMapper.xml    | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.java b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.java
index 0e546135..1b408ff1 100644
--- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.java
+++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.java
@@ -178,7 +178,7 @@ public interface DeployAppConfigMapper extends IDeployAppConfigCrossoverMapper {
 
     int checkDeployAppConfigEnvDBSchemaIsRepeat(DeployAppConfigEnvDBConfigVo configVo);
 
-    int getAppModuleCountBySystemIdAndEnvId(@Param("appSystemId") Long appSystemId, @Param("envId") Long envId);
+//    int getAppModuleCountBySystemIdAndEnvId(@Param("appSystemId") Long appSystemId, @Param("envId") Long envId);
 
     /**
      * 查询发布应用配置DB库下的无模块无环境、无模块同环境、同模块无环境、同模块同环境且发布没配置的数据库的数量
@@ -198,11 +198,11 @@ public interface DeployAppConfigMapper extends IDeployAppConfigCrossoverMapper {
 
     List<Long> getHasEnvAppSystemIdListByAppSystemIdList(List<Long> idList);
 
-    List<Long> getDeployAppEnvIdListByAppSystemId(Long appSystemId);
+//    List<Long> getDeployAppEnvIdListByAppSystemId(Long appSystemId);
 
     List<Long> getDeployAppHasAuthorityAppSystemIdListByAppSystemIdList(@Param("appSystemIdSet") Set<Long> appSystemIdSet);
 
-    List<DeployAppModuleVo> getAppModuleListBySystemIdAndEnvId(@Param("appSystemId") Long appSystemId, @Param("envId") Long envId);
+//    List<DeployAppModuleVo> getAppModuleListBySystemIdAndEnvId(@Param("appSystemId") Long appSystemId, @Param("envId") Long envId);
 
     List<DeployAppModuleVo> getDeployHasNotConfigAppModuleListByAppSystemIdAndAppModuleId(@Param("appSystemId") Long appSystemId, @Param("appModuleId") Long appModuleId);
 
diff --git a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml
index 26461827..ff298cd5 100644
--- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml
+++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml
@@ -465,7 +465,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         )
     </select>
 
-    <select id="getDeployAppEnvIdListByAppSystemId" parameterType="java.lang.Long"
+    <!--<select id="getDeployAppEnvIdListByAppSystemId" parameterType="java.lang.Long"
             resultType="long" useCache="false">
         (
         SELECT
@@ -496,7 +496,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             </if>
         </where>
         )
-    </select>
+    </select>-->
 
     <resultMap id="deployAppModuleEnvMap" type="neatlogic.framework.deploy.dto.app.DeployAppModuleEnvVo">
         <result column="appModuleId" property="id"/>
@@ -886,7 +886,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
     </select>
 
     <sql id="searchAppConfigEnvInstance">
-        FROM @{DATA_SCHEMA}.`scence_appinstance_ip_port_env_appmodule` a
+        FROM @{DATA_SCHEMA}.`scence_appinstance_env_appmodule_appsystem` a
         WHERE
         (( a.`app_module_id` IS NULL AND a.`env_id` IS NULL )
         OR ( a.`app_module_id` IS NULL AND a.`env_id` = #{envId} )
@@ -1304,7 +1304,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
           and `env_id` = #{envId}
     </select>
 
-    <select id="getAppModuleListBySystemIdAndEnvId"
+    <!--<select id="getAppModuleListBySystemIdAndEnvId"
             resultType="neatlogic.framework.deploy.dto.app.DeployAppModuleVo" useCache="false">
         (SELECT sieaa.app_module_id        as id,
                 sieaa.app_module_name      as name,
@@ -1323,7 +1323,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             WHERE dace.app_system_id = #{appSystemId}
               AND dace.env_id = #{envId}
         )
-    </select>
+    </select>-->
 
     <select id="getDeployHasNotConfigAppModuleListByAppSystemIdAndAppModuleId"
             resultType="neatlogic.framework.deploy.dto.app.DeployAppModuleVo" useCache="false">
@@ -1370,7 +1370,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         )
     </select>
 
-    <select id="getAppModuleCountBySystemIdAndEnvId" resultType="java.lang.Integer" useCache="false">
+    <!--<select id="getAppModuleCountBySystemIdAndEnvId" resultType="java.lang.Integer" useCache="false">
         select count(a.app_module_id)
         from ((SELECT sieaa.app_module_id
                FROM @{DATA_SCHEMA}.scence_ipobject_env_appmodule_appsystem sieaa
@@ -1386,7 +1386,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                     AND dace.env_id = #{envId}
               )) a
 
-    </select>
+    </select>-->
 
     <select id="getAppEnvAutoConfigBySystemIdAndModuleIdAndEnvId"
             resultMap="appEnvAutoConfigMap" useCache="false">
-- 
Gitee