diff --git a/hz-pm-api/pom.xml b/hz-pm-api/pom.xml index b62a2db..9f968da 100644 --- a/hz-pm-api/pom.xml +++ b/hz-pm-api/pom.xml @@ -175,14 +175,12 @@ 1.0.0 - - - com.kingbase8 - kingbase8-8.2.0 - 8.2.0 + com.dm + Dm8JdbcDriver + 1.8 system - ${project.basedir}/src/lib/kingbase8-8.2.0.jar + ${project.basedir}/lib/DmJdbcDriver18.jar com.ningdatech diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/meta/helper/basic/AbstractTagsCache.java b/hz-pm-api/src/main/java/com/hz/pm/api/meta/helper/basic/AbstractTagsCache.java index 5fc7f1a..0d56774 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/meta/helper/basic/AbstractTagsCache.java +++ b/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 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 tagInLevel = tagDTOList.stream().filter(tagDto -> { // 只过滤出小于等于level的tag diff --git a/hz-pm-api/src/main/resources/application-dev.yml b/hz-pm-api/src/main/resources/application-dev.yml index 7dd3b85..6ccc1ab 100644 --- a/hz-pm-api/src/main/resources/application-dev.yml +++ b/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: # 是客户端等待连接池连接的最大毫秒数 diff --git a/hz-pm-gen/lib/kingbase8-8.2.0.jar b/hz-pm-gen/lib/kingbase8-8.2.0.jar deleted file mode 100644 index 390ae26..0000000 Binary files a/hz-pm-gen/lib/kingbase8-8.2.0.jar and /dev/null differ diff --git a/hz-pm-gen/pom.xml b/hz-pm-gen/pom.xml index f7a1d34..b663810 100644 --- a/hz-pm-gen/pom.xml +++ b/hz-pm-gen/pom.xml @@ -25,19 +25,12 @@ org.freemarker freemarker - - com.kingbase8 - kingbase8-8.2.0 + com.dm + Dm8JdbcDriver + 1.8 system - ${project.basedir}/lib/kingbase8-8.2.0.jar - - - - com.kingbase.dialect - kingbase8-8.2.0 - system - ${project.basedir}/lib/kingbase8-8.2.0.jar + ${project.basedir}/lib/DmJdbcDriver18.jar diff --git a/pom.xml b/pom.xml index 334e5f3..3bcfdbc 100644 --- a/pom.xml +++ b/pom.xml @@ -85,18 +85,6 @@ flowable-spring-boot-starter-actuator 6.7.2 - - - com.kingbase8 - kingbase8-8.2.0 - 1.0 - - - com.kingbase.dialect - kingbase8-8.2.0 - 1.0 - - com.alibaba easyexcel-core @@ -171,7 +159,6 @@ easypoi-base 4.2.0 - diff --git a/font/simsun.ttc b/resources/font/simsun.ttc similarity index 100% rename from font/simsun.ttc rename to resources/font/simsun.ttc diff --git a/kingbasesql/FLW_EV_DATABASECHANGELOGLOCK.sql b/resources/kingbasesql/FLW_EV_DATABASECHANGELOGLOCK.sql similarity index 100% rename from kingbasesql/FLW_EV_DATABASECHANGELOGLOCK.sql rename to resources/kingbasesql/FLW_EV_DATABASECHANGELOGLOCK.sql diff --git a/kingbasesql/act_ge_bytearray.sql b/resources/kingbasesql/act_ge_bytearray.sql similarity index 100% rename from kingbasesql/act_ge_bytearray.sql rename to resources/kingbasesql/act_ge_bytearray.sql diff --git a/kingbasesql/deploy.sql b/resources/kingbasesql/deploy.sql similarity index 100% rename from kingbasesql/deploy.sql rename to resources/kingbasesql/deploy.sql diff --git a/kingbasesql/flw_ev_databasechangelog.sql b/resources/kingbasesql/flw_ev_databasechangelog.sql similarity index 100% rename from kingbasesql/flw_ev_databasechangelog.sql rename to resources/kingbasesql/flw_ev_databasechangelog.sql diff --git a/kingbasesql/nd_purchase.sql b/resources/kingbasesql/nd_purchase.sql similarity index 100% rename from kingbasesql/nd_purchase.sql rename to resources/kingbasesql/nd_purchase.sql diff --git a/kingbasesql/nd_wlfow_org_models.sql b/resources/kingbasesql/nd_wlfow_org_models.sql similarity index 100% rename from kingbasesql/nd_wlfow_org_models.sql rename to resources/kingbasesql/nd_wlfow_org_models.sql diff --git a/kingbasesql/nd_wlfow_org_models_historys.sql b/resources/kingbasesql/nd_wlfow_org_models_historys.sql similarity index 100% rename from kingbasesql/nd_wlfow_org_models_historys.sql rename to resources/kingbasesql/nd_wlfow_org_models_historys.sql diff --git a/kingbasesql/project.sql b/resources/kingbasesql/project.sql similarity index 100% rename from kingbasesql/project.sql rename to resources/kingbasesql/project.sql diff --git a/kingbasesql/wflow_cc_tasks.sql b/resources/kingbasesql/wflow_cc_tasks.sql similarity index 100% rename from kingbasesql/wflow_cc_tasks.sql rename to resources/kingbasesql/wflow_cc_tasks.sql diff --git a/kingbasesql/wflow_departments.sql b/resources/kingbasesql/wflow_departments.sql similarity index 100% rename from kingbasesql/wflow_departments.sql rename to resources/kingbasesql/wflow_departments.sql diff --git a/kingbasesql/wflow_model_groups.sql b/resources/kingbasesql/wflow_model_groups.sql similarity index 100% rename from kingbasesql/wflow_model_groups.sql rename to resources/kingbasesql/wflow_model_groups.sql diff --git a/kingbasesql/wflow_model_historys.sql b/resources/kingbasesql/wflow_model_historys.sql similarity index 100% rename from kingbasesql/wflow_model_historys.sql rename to resources/kingbasesql/wflow_model_historys.sql diff --git a/kingbasesql/wflow_model_perms.sql b/resources/kingbasesql/wflow_model_perms.sql similarity index 100% rename from kingbasesql/wflow_model_perms.sql rename to resources/kingbasesql/wflow_model_perms.sql diff --git a/kingbasesql/wflow_models.sql b/resources/kingbasesql/wflow_models.sql similarity index 100% rename from kingbasesql/wflow_models.sql rename to resources/kingbasesql/wflow_models.sql diff --git a/kingbasesql/wflow_notifys.sql b/resources/kingbasesql/wflow_notifys.sql similarity index 100% rename from kingbasesql/wflow_notifys.sql rename to resources/kingbasesql/wflow_notifys.sql diff --git a/kingbasesql/wflow_roles.sql b/resources/kingbasesql/wflow_roles.sql similarity index 100% rename from kingbasesql/wflow_roles.sql rename to resources/kingbasesql/wflow_roles.sql diff --git a/kingbasesql/wflow_user_agents.sql b/resources/kingbasesql/wflow_user_agents.sql similarity index 100% rename from kingbasesql/wflow_user_agents.sql rename to resources/kingbasesql/wflow_user_agents.sql diff --git a/kingbasesql/wflow_user_departments.sql b/resources/kingbasesql/wflow_user_departments.sql similarity index 100% rename from kingbasesql/wflow_user_departments.sql rename to resources/kingbasesql/wflow_user_departments.sql diff --git a/kingbasesql/wflow_user_roles.sql b/resources/kingbasesql/wflow_user_roles.sql similarity index 100% rename from kingbasesql/wflow_user_roles.sql rename to resources/kingbasesql/wflow_user_roles.sql diff --git a/kingbasesql/wflow_users.sql b/resources/kingbasesql/wflow_users.sql similarity index 100% rename from kingbasesql/wflow_users.sql rename to resources/kingbasesql/wflow_users.sql diff --git a/kingbasesql/wflowother.sql b/resources/kingbasesql/wflowother.sql similarity index 100% rename from kingbasesql/wflowother.sql rename to resources/kingbasesql/wflowother.sql diff --git a/template/丽水市2023年数字化项目年度计划编辑表(空).xls b/resources/template/丽水市2023年数字化项目年度计划编辑表(空).xls similarity index 100% rename from template/丽水市2023年数字化项目年度计划编辑表(空).xls rename to resources/template/丽水市2023年数字化项目年度计划编辑表(空).xls diff --git a/template/丽水市2023年数字化项目年度计划编辑表.xls b/resources/template/丽水市2023年数字化项目年度计划编辑表.xls similarity index 100% rename from template/丽水市2023年数字化项目年度计划编辑表.xls rename to resources/template/丽水市2023年数字化项目年度计划编辑表.xls