修改达梦数据库兼容性

hz-pm-api/pom.xml

@@ -175,14 +175,12 @@
             </exclusions>
             <version>1.0.0</version>
         </dependency>
-
-        <!--KingBase-->
         <dependency>
-            <groupId>com.kingbase8</groupId>
-            <artifactId>kingbase8-8.2.0</artifactId>
-            <version>8.2.0</version>
+            <groupId>com.dm</groupId>
+            <artifactId>Dm8JdbcDriver</artifactId>
+            <version>1.8</version>
             <scope>system</scope>
-            <systemPath>${project.basedir}/src/lib/kingbase8-8.2.0.jar</systemPath>
+            <systemPath>${project.basedir}/lib/DmJdbcDriver18.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>com.ningdatech</groupId>

hz-pm-api/src/main/java/com/hz/pm/api/meta/helper/basic/AbstractTagsCache.java

@@ -1,6 +1,5 @@
 package com.hz.pm.api.meta.helper.basic;
 
-import cn.hutool.core.lang.Assert;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.hz.pm.api.meta.assembler.MetaTagAssembler;
@@ -8,6 +7,7 @@ import com.hz.pm.api.meta.helper.TagCache;
 import com.hz.pm.api.meta.model.dto.TagDTO;
 import com.hz.pm.api.meta.model.dto.TagTreeDTO;
 import com.hz.pm.api.meta.service.IMetaTagService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +21,7 @@ import java.util.stream.Collectors;
  * @author liuxinxin
  * @date 2022/12/22 上午11:56
  */
+@Slf4j
 public abstract class AbstractTagsCache implements InitializingBean, TagCache {
 
     protected static final int MAX_LEVEL = 4;
@@ -39,7 +40,10 @@ public abstract class AbstractTagsCache implements InitializingBean, TagCache {
                 .build(key -> {
                     // 查询全部
                     List<TagDTO> tagDTOList = iMetaTagService.queryAll();
-                    Assert.isTrue(CollectionUtils.isNotEmpty(tagDTOList), "MetaTags queryAll is Empty");
+                    if (tagDTOList.isEmpty()) {
+                        log.warn("当前层级对应树不存在：{}", key);
+                        return Collections.emptyList();
+                    }
                     tagDtoMap = buildCateMap(tagDTOList);
                     List<TagDTO> tagInLevel = tagDTOList.stream().filter(tagDto -> {
                         // 只过滤出小于等于level的tag

hz-pm-api/src/main/resources/application-dev.yml

@@ -42,10 +42,10 @@ spring:
       ddl-auto: update
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
-    driverClassName: com.kingbase8.Driver
-    url: jdbc:kingbase8://120.26.44.207:54321/nd_project_management?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
-    username: SYSTEM
-    password: Ndkj1234
+    driverClassName: dm.jdbc.driver.DmDriver
+    url: jdbc:dm://47.98.125.47:5236/HZ_PROJECT_MANAGEMENT?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
+    username: SYSDBA
+    password: SYSDBA
     # 数据源
     hikari:
       # 是客户端等待连接池连接的最大毫秒数

hz-pm-gen/pom.xml

@@ -25,19 +25,12 @@
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
         </dependency>
-        <!--Mysql数据库驱动-->
         <dependency>
-            <groupId>com.kingbase8</groupId>
-            <artifactId>kingbase8-8.2.0</artifactId>
+            <groupId>com.dm</groupId>
+            <artifactId>Dm8JdbcDriver</artifactId>
+            <version>1.8</version>
             <scope>system</scope>
-            <systemPath>${project.basedir}/lib/kingbase8-8.2.0.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>com.kingbase.dialect</groupId>
-            <artifactId>kingbase8-8.2.0</artifactId>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/kingbase8-8.2.0.jar</systemPath>
+            <systemPath>${project.basedir}/lib/DmJdbcDriver18.jar</systemPath>
         </dependency>
     </dependencies>
 </project>

pom.xml

@@ -85,18 +85,6 @@
                 <artifactId>flowable-spring-boot-starter-actuator</artifactId>
                 <version>6.7.2</version>
             </dependency>
-            <!--KingBase-->
-            <dependency>
-                <groupId>com.kingbase8</groupId>
-                <artifactId>kingbase8-8.2.0</artifactId>
-                <version>1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>com.kingbase.dialect</groupId>
-                <artifactId>kingbase8-8.2.0</artifactId>
-                <version>1.0</version>
-            </dependency>
-
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>easyexcel-core</artifactId>
@@ -171,7 +159,6 @@
                 <artifactId>easypoi-base</artifactId>
                 <version>4.2.0</version>
             </dependency>
-
         </dependencies>
     </dependencyManagement>