修改bug

epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   pli-power-base-server:
     container_name: pli-power-base-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/pli-power-base-server:version_placeholder
+    image: 192.168.12.12:5000/epmet-cloud-master/pli-power-base-server:version_placeholder
     ports:
       - "8201:8201"
     network_mode: host # 使用现有网络

epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml

@@ -310,18 +310,18 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_pli_power?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://192.168.12.51:3306/epmet_pli_power?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet_pli_power</spring.datasource.druid.username>
-                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>EpmEt_rds@cAOxiAn!</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.12.12</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.12.12:8848</nacos.server-addr>
                 <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml

@@ -189,6 +189,7 @@
 	        STRUCT_LEVEL = #{structLevel}
 	    AND
 	        TAG_CATEGORY = #{tagCategory}
+	    and del_flag = '0'
     </select>
     <select id="querylistPosition"
             resultType="com.epmet.plugin.power.dto.axis.result.PowerAxisListPositionResultDTO">
@@ -205,6 +206,7 @@
 	            CATEGORY_CODE = #{code}
 	        and
 	            AGENCY_ID = #{agencyId}
+	        and del_flag = '0'
     </select>
 
     <select id="listParentTreeByLevel"