From 6d97d3a0eba1e23474e6e5ca0dbf9ac36f138f44 Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Mon, 26 Sep 2022 09:16:28 +0800 Subject: [PATCH] =?UTF-8?q?wql=E6=95=B4=E5=90=88=E5=88=B0system=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nladmin-system/pom.xml | 20 ++++-- .../src/main/java/org/nl/AppRun.java | 2 +- .../config/thread/ThreadPoolExecutorUtil.java | 2 +- .../nl/modules/common/utils/StringUtils.java | 2 +- .../service/impl/StageImageServiceImpl.java | 6 +- .../service/impl/StageServiceImpl.java | 6 +- .../nl/modules/quartz/utils/ExecutionJob.java | 2 +- .../modules/quartz/utils/QuartzRunnable.java | 2 +- .../service/impl/CodeDetailServiceImpl.java | 6 +- .../system/service/impl/DeptServiceImpl.java | 4 +- .../service/impl/GenCodeServiceImpl.java | 6 +- .../service/impl/GridFieldServiceImpl.java | 6 +- .../system/service/impl/GridServiceImpl.java | 6 +- .../system/service/impl/ParamServiceImpl.java | 6 +- .../system/service/impl/RoleServiceImpl.java | 2 +- .../java/org/nl/modules/system/wql/sys.xls | Bin 259072 -> 259072 bytes .../main/java/org/nl/modules}/wql/WQL.java | 12 ++-- .../java/org/nl/modules}/wql/WQLCore.java | 14 ++-- .../org/nl/modules}/wql/core/DataType.java | 6 +- .../java/org/nl/modules}/wql/core/ERROR.java | 6 +- .../modules}/wql/core/bean/ConnectBean.java | 2 +- .../modules}/wql/core/bean/DataTypeBean.java | 4 +- .../nl/modules}/wql/core/bean/ErrorBean.java | 2 +- .../modules}/wql/core/bean/ParameterBean.java | 2 +- .../nl/modules}/wql/core/bean/ResultBean.java | 4 +- .../nl/modules}/wql/core/bean/TableBean.java | 2 +- .../nl/modules}/wql/core/bean/WQLData.java | 6 +- .../modules}/wql/core/bean/WQLDataField.java | 2 +- .../org/nl/modules/wql/core/bean/WQLJava.java | 10 +++ .../nl/modules}/wql/core/bean/WQLModule.java | 8 +-- .../modules}/wql/core/bean/WQLModuleBean.java | 2 +- .../nl/modules}/wql/core/bean/WQLObject.java | 14 ++-- .../wql/core/bean/WQLObjectField.java | 2 +- .../wql/core/bean/WQLRowSetDynaClass.java | 8 +-- .../modules}/wql/core/bean/XLSTableRow.java | 2 +- .../wql/core/content/BaseContext.java | 2 +- .../wql/core/content/HttpContext.java | 6 +- .../wql/core/content/ServiceContext.java | 2 +- .../nl/modules}/wql/core/db/DBConnBean.java | 2 +- .../nl/modules}/wql/core/db/DBConnection.java | 6 +- .../org/nl/modules}/wql/core/db/DBPool.java | 12 ++-- .../nl/modules/wql/core/db/DBPoolJBoss.java | 5 ++ .../nl/modules}/wql/core/db/DBPoolSpring.java | 6 +- .../nl/modules}/wql/core/db/DBPoolTomcat.java | 14 ++-- .../modules}/wql/core/db/DBPoolWeblogic.java | 14 ++-- .../modules}/wql/core/db/DBPoolWebsphere.java | 12 ++-- .../nl/modules}/wql/core/engine/Syntax.java | 19 +++--- .../modules}/wql/core/engine/WQLEngine.java | 16 ++--- .../nl/modules}/wql/core/engine/WQLFun.java | 42 +++++------- .../modules}/wql/core/engine/object/WO.java | 34 +++++----- .../modules}/wql/core/engine/object/WP.java | 38 ++++------- .../modules}/wql/core/engine/syntax/IWQL.java | 13 ++-- .../wql/core/engine/syntax/wqlAssign.java | 8 +-- .../wql/core/engine/syntax/wqlCALLJAVA.java | 15 ++--- .../wql/core/engine/syntax/wqlCALLPROC.java | 17 +++-- .../wql/core/engine/syntax/wqlCALLWQL.java | 13 ++-- .../wql/core/engine/syntax/wqlDELETE.java | 19 +++--- .../wql/core/engine/syntax/wqlDUMP.java | 4 +- .../wql/core/engine/syntax/wqlERROR.java | 8 +-- .../wql/core/engine/syntax/wqlEXECSQL.java | 19 +++--- .../wql/core/engine/syntax/wqlIF.java | 31 +++++---- .../wql/core/engine/syntax/wqlINSERT.java | 19 +++--- .../wql/core/engine/syntax/wqlLOOP.java | 12 ++-- .../wql/core/engine/syntax/wqlPAGEQUERY.java | 4 +- .../wql/core/engine/syntax/wqlQUERY.java | 4 +- .../wql/core/engine/syntax/wqlSELECT.java | 19 +++--- .../wql/core/engine/syntax/wqlUPDATE.java | 21 +++--- .../modules}/wql/exception/WDKException.java | 2 +- .../org/nl/modules}/wql/util/Calculate.java | 2 +- .../org/nl/modules}/wql/util/CallBack.java | 2 +- .../nl/modules}/wql/util/MethodFactory.java | 2 +- .../wql/util/SpringContextHolder.java | 3 +- .../nl/modules}/wql/util/WQLCalculator.java | 5 +- .../nl/modules}/wql/util/WQLFilterGroup.java | 14 ++-- .../nl/modules}/wql/util/WQLFilterRule.java | 2 +- .../org/nl/modules}/wql/util/WqlUtil.java | 4 +- .../src/main/java/org/nl/start/Init.java | 2 +- nladmin-wql/pom.xml | 63 ------------------ .../java/org/nl/wql/core/bean/WQLJava.java | 10 --- .../java/org/nl/wql/core/db/DBPoolJBoss.java | 5 -- pom.xml | 1 - 81 files changed, 333 insertions(+), 426 deletions(-) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/WQL.java (98%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/WQLCore.java (98%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/DataType.java (97%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/ERROR.java (91%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/bean/ConnectBean.java (97%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/bean/DataTypeBean.java (95%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/bean/ErrorBean.java (96%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/bean/ParameterBean.java (93%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/bean/ResultBean.java (99%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/bean/TableBean.java (97%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/bean/WQLData.java (99%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/bean/WQLDataField.java (98%) create mode 100644 nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLJava.java rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/bean/WQLModule.java (99%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/bean/WQLModuleBean.java (97%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/bean/WQLObject.java (99%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/bean/WQLObjectField.java (97%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/bean/WQLRowSetDynaClass.java (98%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/bean/XLSTableRow.java (98%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/content/BaseContext.java (96%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/content/HttpContext.java (98%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/content/ServiceContext.java (96%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/db/DBConnBean.java (95%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/db/DBConnection.java (98%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/db/DBPool.java (97%) create mode 100644 nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPoolJBoss.java rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/db/DBPoolSpring.java (97%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/db/DBPoolTomcat.java (96%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/db/DBPoolWeblogic.java (98%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/db/DBPoolWebsphere.java (98%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/engine/Syntax.java (95%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/engine/WQLEngine.java (98%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/engine/WQLFun.java (99%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/engine/object/WO.java (96%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/engine/object/WP.java (98%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/engine/syntax/IWQL.java (93%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/engine/syntax/wqlAssign.java (95%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/engine/syntax/wqlCALLJAVA.java (91%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/engine/syntax/wqlCALLPROC.java (95%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/engine/syntax/wqlCALLWQL.java (90%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/engine/syntax/wqlDELETE.java (95%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/engine/syntax/wqlDUMP.java (93%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/engine/syntax/wqlERROR.java (88%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/engine/syntax/wqlEXECSQL.java (94%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/engine/syntax/wqlIF.java (95%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/engine/syntax/wqlINSERT.java (95%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/engine/syntax/wqlLOOP.java (92%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/engine/syntax/wqlPAGEQUERY.java (93%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/engine/syntax/wqlQUERY.java (93%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/engine/syntax/wqlSELECT.java (99%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/core/engine/syntax/wqlUPDATE.java (95%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/exception/WDKException.java (96%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/util/Calculate.java (99%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/util/CallBack.java (97%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/util/MethodFactory.java (99%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/util/SpringContextHolder.java (99%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/util/WQLCalculator.java (99%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/util/WQLFilterGroup.java (99%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/util/WQLFilterRule.java (99%) rename {nladmin-wql/src/main/java/org/nl => nladmin-system/src/main/java/org/nl/modules}/wql/util/WqlUtil.java (99%) delete mode 100644 nladmin-wql/pom.xml delete mode 100644 nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLJava.java delete mode 100644 nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolJBoss.java diff --git a/nladmin-system/pom.xml b/nladmin-system/pom.xml index b9b2c9943..78d2e5638 100644 --- a/nladmin-system/pom.xml +++ b/nladmin-system/pom.xml @@ -20,6 +20,20 @@ + + + + com.hynnet + jxl + 2.6.12.1 + + + + commons-beanutils + commons-beanutils-core + 1.8.0 + + org.aspectj aspectjweaver @@ -57,12 +71,6 @@ 2.5.14 - - org.nl - nladmin-wql - 2.7 - - com.oracle.database.jdbc ojdbc5 diff --git a/nladmin-system/src/main/java/org/nl/AppRun.java b/nladmin-system/src/main/java/org/nl/AppRun.java index fcbe866e9..2fa3edd13 100644 --- a/nladmin-system/src/main/java/org/nl/AppRun.java +++ b/nladmin-system/src/main/java/org/nl/AppRun.java @@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaIgnore; import com.alicp.jetcache.anno.config.EnableCreateCacheAnnotation; import com.alicp.jetcache.anno.config.EnableMethodCache; import io.swagger.annotations.Api; -import org.nl.wql.util.SpringContextHolder; +import org.nl.modules.wql.util.SpringContextHolder; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; diff --git a/nladmin-system/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java b/nladmin-system/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java index 81d494e82..3f5880cff 100644 --- a/nladmin-system/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java +++ b/nladmin-system/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java @@ -16,7 +16,7 @@ package org.nl.config.thread; -import org.nl.wql.util.SpringContextHolder; +import org.nl.modules.wql.util.SpringContextHolder; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; diff --git a/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java b/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java index dd86ed652..269c7f5db 100644 --- a/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java @@ -24,7 +24,7 @@ import net.dreamlu.mica.ip2region.core.IpInfo; import nl.basjes.parse.useragent.UserAgent; import nl.basjes.parse.useragent.UserAgentAnalyzer; import org.nl.modules.common.config.ElAdminProperties; -import org.nl.wql.util.SpringContextHolder; +import org.nl.modules.wql.util.SpringContextHolder; import javax.servlet.http.HttpServletRequest; import java.net.InetAddress; diff --git a/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageImageServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageImageServiceImpl.java index e193fbd14..09ab23b3f 100644 --- a/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageImageServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageImageServiceImpl.java @@ -10,9 +10,9 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.logicflow.service.StageImageService; import org.nl.modules.logicflow.service.dto.StageImageDto; -import org.nl.wql.core.bean.ResultBean; -import org.nl.wql.core.bean.WQLObject; -import org.nl.wql.util.WqlUtil; +import org.nl.modules.wql.core.bean.ResultBean; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.modules.wql.util.WqlUtil; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java index 938b07f0a..d37abd98b 100644 --- a/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java @@ -10,9 +10,9 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.logicflow.service.StageService; import org.nl.modules.logicflow.service.dto.StageDto; -import org.nl.wql.core.bean.ResultBean; -import org.nl.wql.core.bean.WQLObject; -import org.nl.wql.util.WqlUtil; +import org.nl.modules.wql.core.bean.ResultBean; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.modules.wql.util.WqlUtil; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java b/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java index 3cc8f6985..0ea11bfea 100644 --- a/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java +++ b/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java @@ -24,7 +24,7 @@ import org.nl.modules.quartz.domain.QuartzJob; import org.nl.modules.quartz.domain.QuartzLog; import org.nl.modules.quartz.repository.QuartzLogRepository; import org.nl.modules.quartz.service.QuartzJobService; -import org.nl.wql.util.SpringContextHolder; +import org.nl.modules.wql.util.SpringContextHolder; import org.quartz.JobExecutionContext; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.quartz.QuartzJobBean; diff --git a/nladmin-system/src/main/java/org/nl/modules/quartz/utils/QuartzRunnable.java b/nladmin-system/src/main/java/org/nl/modules/quartz/utils/QuartzRunnable.java index f64c82e87..e2ef49bad 100644 --- a/nladmin-system/src/main/java/org/nl/modules/quartz/utils/QuartzRunnable.java +++ b/nladmin-system/src/main/java/org/nl/modules/quartz/utils/QuartzRunnable.java @@ -17,7 +17,7 @@ package org.nl.modules.quartz.utils; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; -import org.nl.wql.util.SpringContextHolder; +import org.nl.modules.wql.util.SpringContextHolder; import org.springframework.util.ReflectionUtils; import java.lang.reflect.Method; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/CodeDetailServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/CodeDetailServiceImpl.java index 937d2a317..c9339208b 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/CodeDetailServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/CodeDetailServiceImpl.java @@ -6,9 +6,9 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.system.service.CodeDetailService; -import org.nl.wql.core.bean.ResultBean; -import org.nl.wql.core.bean.WQLObject; -import org.nl.wql.util.WqlUtil; +import org.nl.modules.wql.core.bean.ResultBean; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.modules.wql.util.WqlUtil; import org.springframework.cache.annotation.CacheConfig; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java index e297ae4cc..b4fd7b8b1 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java @@ -36,8 +36,8 @@ import org.nl.modules.system.service.DeptService; import org.nl.modules.system.service.dto.DeptDto; import org.nl.modules.system.service.dto.DeptQueryCriteria; import org.nl.modules.system.service.mapstruct.DeptMapper; -import org.nl.wql.core.bean.WQLObject; -import org.nl.wql.util.SpringContextHolder; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.modules.wql.util.SpringContextHolder; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.Sort; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java index 37b7ceb75..f0cb78b74 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java @@ -9,9 +9,9 @@ import lombok.RequiredArgsConstructor; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.system.service.GenCodeService; -import org.nl.wql.core.bean.ResultBean; -import org.nl.wql.core.bean.WQLObject; -import org.nl.wql.util.WqlUtil; +import org.nl.modules.wql.core.bean.ResultBean; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.modules.wql.util.WqlUtil; import org.springframework.cache.annotation.CacheConfig; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridFieldServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridFieldServiceImpl.java index 8bae7ac23..192b5a11c 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridFieldServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridFieldServiceImpl.java @@ -11,9 +11,9 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.system.service.GridFieldService; import org.nl.modules.system.service.dto.GridFieldDto; -import org.nl.wql.WQL; -import org.nl.wql.core.bean.WQLObject; -import org.nl.wql.util.WqlUtil; +import org.nl.modules.wql.WQL; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.modules.wql.util.WqlUtil; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridServiceImpl.java index 81147f2f7..d89d8ca96 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridServiceImpl.java @@ -10,9 +10,9 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.system.service.GridService; import org.nl.modules.system.service.dto.GridDto; -import org.nl.wql.core.bean.ResultBean; -import org.nl.wql.core.bean.WQLObject; -import org.nl.wql.util.WqlUtil; +import org.nl.modules.wql.core.bean.ResultBean; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.modules.wql.util.WqlUtil; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java index 49b2f1785..d06cb1ccd 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java @@ -13,9 +13,9 @@ import org.nl.modules.common.utils.FileUtil; import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.system.service.ParamService; import org.nl.modules.system.service.dto.ParamDto; -import org.nl.wql.core.bean.ResultBean; -import org.nl.wql.core.bean.WQLObject; -import org.nl.wql.util.WqlUtil; +import org.nl.modules.wql.core.bean.ResultBean; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.modules.wql.util.WqlUtil; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/RoleServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/RoleServiceImpl.java index db05c018a..7a9613236 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/RoleServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/RoleServiceImpl.java @@ -34,7 +34,7 @@ import org.nl.modules.system.service.dto.RoleSmallDto; import org.nl.modules.system.service.dto.UserDto; import org.nl.modules.system.service.mapstruct.RoleMapper; import org.nl.modules.system.service.mapstruct.RoleSmallMapper; -import org.nl.wql.WQL; +import org.nl.modules.wql.WQL; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.Page; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/wql/sys.xls b/nladmin-system/src/main/java/org/nl/modules/system/wql/sys.xls index 0c030451741970818d9b4cb0fca3108e1c737459..d253ff1325f777c0a146ef1dfe7fed1be89468ea 100644 GIT binary patch delta 21886 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%0D5$_$dq1S@5Nr7|N!@kYs?Qy1IJ|1uvR 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 aWxmG7q5RuEtkJx%@waGW`3=6@_P+qJd?^k9 delta 21373 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 diff --git a/nladmin-wql/src/main/java/org/nl/wql/WQL.java b/nladmin-system/src/main/java/org/nl/modules/wql/WQL.java similarity index 98% rename from nladmin-wql/src/main/java/org/nl/wql/WQL.java rename to nladmin-system/src/main/java/org/nl/modules/wql/WQL.java index 491cd7bf0..f7502ea39 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/WQL.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/WQL.java @@ -1,14 +1,14 @@ -package org.nl.wql; +package org.nl.modules.wql; + +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONArray; +import org.nl.modules.wql.core.bean.ResultBean; +import org.nl.modules.wql.core.engine.object.WO; import java.util.HashMap; import java.util.Iterator; import java.util.Set; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import org.nl.wql.core.bean.ResultBean; -import org.nl.wql.core.engine.object.WO; - public class WQL { /** * 根据WQL的文件名获取WQL的运行对象 diff --git a/nladmin-wql/src/main/java/org/nl/wql/WQLCore.java b/nladmin-system/src/main/java/org/nl/modules/wql/WQLCore.java similarity index 98% rename from nladmin-wql/src/main/java/org/nl/wql/WQLCore.java rename to nladmin-system/src/main/java/org/nl/modules/wql/WQLCore.java index b2701763f..22e50fccb 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/WQLCore.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/WQLCore.java @@ -1,4 +1,4 @@ -package org.nl.wql; +package org.nl.modules.wql; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; @@ -6,12 +6,12 @@ import com.alibaba.fastjson.JSONObject; import jxl.Sheet; import jxl.Workbook; import lombok.extern.slf4j.Slf4j; -import org.nl.wql.core.bean.*; -import org.nl.wql.core.db.DBConnBean; -import org.nl.wql.core.engine.WQLEngine; -import org.nl.wql.core.engine.object.WO; -import org.nl.wql.util.SpringContextHolder; -import org.nl.wql.util.WqlUtil; +import org.nl.modules.wql.core.bean.*; +import org.nl.modules.wql.core.db.DBConnBean; +import org.nl.modules.wql.core.engine.WQLEngine; +import org.nl.modules.wql.core.engine.object.WO; +import org.nl.modules.wql.util.SpringContextHolder; +import org.nl.modules.wql.util.WqlUtil; import org.springframework.core.io.Resource; import org.springframework.core.io.support.ResourcePatternResolver; import org.springframework.util.ClassUtils; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/DataType.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/DataType.java similarity index 97% rename from nladmin-wql/src/main/java/org/nl/wql/core/DataType.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/DataType.java index e35059cee..e97497b0c 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/DataType.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/DataType.java @@ -10,12 +10,12 @@ * 文件版本：v1.0 * *******************************************************/ -package org.nl.wql.core; +package org.nl.modules.wql.core; + +import org.nl.modules.wql.core.bean.DataTypeBean; import java.util.HashMap; -import org.nl.wql.core.bean.DataTypeBean; - public class DataType { public static String ORACLE = "ORACLE"; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/ERROR.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/ERROR.java similarity index 91% rename from nladmin-wql/src/main/java/org/nl/wql/core/ERROR.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/ERROR.java index 65239e798..f72f6cd19 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/ERROR.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/ERROR.java @@ -1,9 +1,9 @@ -package org.nl.wql.core; +package org.nl.modules.wql.core; + +import org.nl.modules.wql.core.engine.Syntax; import java.util.HashMap; -import org.nl.wql.core.engine.Syntax; - public class ERROR { public static HashMap ERR = new HashMap(); diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/bean/ConnectBean.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ConnectBean.java similarity index 97% rename from nladmin-wql/src/main/java/org/nl/wql/core/bean/ConnectBean.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ConnectBean.java index 94c794d67..ae38d60be 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/bean/ConnectBean.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ConnectBean.java @@ -1,4 +1,4 @@ -package org.nl.wql.core.bean;//package org.nl.module.wql.core.bean; +package org.nl.modules.wql.core.bean;//package org.nl.module.wql.core.bean; // //import java.sql.Connection; // diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/bean/DataTypeBean.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/DataTypeBean.java similarity index 95% rename from nladmin-wql/src/main/java/org/nl/wql/core/bean/DataTypeBean.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/bean/DataTypeBean.java index 8fa35a41a..6a3f8cbb5 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/bean/DataTypeBean.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/DataTypeBean.java @@ -1,6 +1,6 @@ -package org.nl.wql.core.bean; +package org.nl.modules.wql.core.bean; -import org.nl.wql.core.DataType; +import org.nl.modules.wql.core.DataType; public class DataTypeBean { diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/bean/ErrorBean.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ErrorBean.java similarity index 96% rename from nladmin-wql/src/main/java/org/nl/wql/core/bean/ErrorBean.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ErrorBean.java index 070a2408a..6f4203767 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/bean/ErrorBean.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ErrorBean.java @@ -10,7 +10,7 @@ * 文件版本：v1.0 * *******************************************************/ -package org.nl.wql.core.bean; +package org.nl.modules.wql.core.bean; public class ErrorBean { diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/bean/ParameterBean.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ParameterBean.java similarity index 93% rename from nladmin-wql/src/main/java/org/nl/wql/core/bean/ParameterBean.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ParameterBean.java index 8186fdd0d..07cc0d5e0 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/bean/ParameterBean.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ParameterBean.java @@ -1,4 +1,4 @@ -package org.nl.wql.core.bean; +package org.nl.modules.wql.core.bean; /** * SQL参数 diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/bean/ResultBean.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ResultBean.java similarity index 99% rename from nladmin-wql/src/main/java/org/nl/wql/core/bean/ResultBean.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ResultBean.java index 0abe11b92..62bb50fc1 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/bean/ResultBean.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ResultBean.java @@ -10,7 +10,7 @@ * 文件版本：v1.0 * *******************************************************/ -package org.nl.wql.core.bean; +package org.nl.modules.wql.core.bean; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; @@ -20,7 +20,7 @@ import org.apache.commons.beanutils.BasicDynaBean; import org.apache.commons.beanutils.BasicDynaClass; import org.apache.commons.beanutils.DynaProperty; import org.apache.commons.beanutils.RowSetDynaClass; -import org.nl.wql.util.WqlUtil; +import org.nl.modules.wql.util.WqlUtil; import java.beans.IntrospectionException; import java.beans.PropertyDescriptor; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/bean/TableBean.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/TableBean.java similarity index 97% rename from nladmin-wql/src/main/java/org/nl/wql/core/bean/TableBean.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/bean/TableBean.java index dac29c9cd..ff3b8a8fa 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/bean/TableBean.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/TableBean.java @@ -1,4 +1,4 @@ -package org.nl.wql.core.bean; +package org.nl.modules.wql.core.bean; /** * excel中读取的表的说明 * @author Administrator diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLData.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLData.java similarity index 99% rename from nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLData.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLData.java index 34a17061f..6ce499f7d 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLData.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLData.java @@ -1,11 +1,11 @@ -package org.nl.wql.core.bean; +package org.nl.modules.wql.core.bean; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.apache.commons.beanutils.BasicDynaBean; import org.apache.commons.beanutils.DynaProperty; -import org.nl.wql.exception.WDKException; -import org.nl.wql.util.WqlUtil; +import org.nl.modules.wql.exception.WDKException; +import org.nl.modules.wql.util.WqlUtil; import java.util.ArrayList; import java.util.Collections; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLDataField.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLDataField.java similarity index 98% rename from nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLDataField.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLDataField.java index 6d9f4831e..9881b69c2 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLDataField.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLDataField.java @@ -1,4 +1,4 @@ -package org.nl.wql.core.bean; +package org.nl.modules.wql.core.bean; import java.io.Serializable; diff --git a/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLJava.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLJava.java new file mode 100644 index 000000000..63a111a08 --- /dev/null +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLJava.java @@ -0,0 +1,10 @@ +package org.nl.modules.wql.core.bean; + +import org.nl.modules.wql.core.engine.object.WO; + +import java.util.HashMap; + + +public abstract class WQLJava { + abstract public HashMap process(WO wo, HashMap inMap); +} \ No newline at end of file diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLModule.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLModule.java similarity index 99% rename from nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLModule.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLModule.java index 7c7e5bd76..5b279c353 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLModule.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLModule.java @@ -1,10 +1,10 @@ -package org.nl.wql.core.bean; +package org.nl.modules.wql.core.bean; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; -import org.nl.wql.WQL; -import org.nl.wql.WQLCore; +import org.nl.modules.wql.WQL; +import org.nl.modules.wql.WQLCore; import java.io.Serializable; import java.util.ArrayList; @@ -53,7 +53,7 @@ public class WQLModule implements Serializable,Cloneable{ * * @return */ - public static HashMap getWQLModuleMap(){ + public static HashMap getWQLModuleMap(){ return WQLCore.moduleMap; } diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLModuleBean.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLModuleBean.java similarity index 97% rename from nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLModuleBean.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLModuleBean.java index dd7ff2715..df36faba9 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLModuleBean.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLModuleBean.java @@ -1,4 +1,4 @@ -package org.nl.wql.core.bean; +package org.nl.modules.wql.core.bean; import com.alibaba.fastjson.JSONObject; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLObject.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLObject.java similarity index 99% rename from nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLObject.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLObject.java index 9a1e73755..32a23d9f4 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLObject.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLObject.java @@ -1,16 +1,16 @@ -package org.nl.wql.core.bean; +package org.nl.modules.wql.core.bean; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.apache.commons.beanutils.BasicDynaBean; -import org.nl.wql.WQLCore; -import org.nl.wql.core.content.BaseContext; -import org.nl.wql.core.engine.WQLFun; -import org.nl.wql.core.engine.object.WO; -import org.nl.wql.exception.WDKException; -import org.nl.wql.util.WqlUtil; +import org.nl.modules.wql.WQLCore; +import org.nl.modules.wql.core.content.BaseContext; +import org.nl.modules.wql.core.engine.WQLFun; +import org.nl.modules.wql.core.engine.object.WO; +import org.nl.modules.wql.exception.WDKException; +import org.nl.modules.wql.util.WqlUtil; import java.io.Serializable; import java.util.*; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLObjectField.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLObjectField.java similarity index 97% rename from nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLObjectField.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLObjectField.java index de1f77d18..6afa8e78b 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLObjectField.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLObjectField.java @@ -1,4 +1,4 @@ -package org.nl.wql.core.bean;//package org.nl.wql.core.bean; +package org.nl.modules.wql.core.bean;//package org.nl.wql.core.bean; // //public class WQLObjectField { // private String cnname; //字段中文名称 diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLRowSetDynaClass.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLRowSetDynaClass.java similarity index 98% rename from nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLRowSetDynaClass.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLRowSetDynaClass.java index 84c7a7b11..94376de63 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLRowSetDynaClass.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLRowSetDynaClass.java @@ -1,12 +1,12 @@ -package org.nl.wql.core.bean; +package org.nl.modules.wql.core.bean; + +import org.apache.commons.beanutils.DynaBean; +import org.apache.commons.beanutils.RowSetDynaClass; import java.lang.reflect.Method; import java.sql.ResultSet; import java.sql.SQLException; -import org.apache.commons.beanutils.DynaBean; -import org.apache.commons.beanutils.RowSetDynaClass; - public class WQLRowSetDynaClass extends RowSetDynaClass { /** diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/bean/XLSTableRow.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/XLSTableRow.java similarity index 98% rename from nladmin-wql/src/main/java/org/nl/wql/core/bean/XLSTableRow.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/bean/XLSTableRow.java index 3e87a206d..bc43a6378 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/bean/XLSTableRow.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/XLSTableRow.java @@ -1,4 +1,4 @@ -package org.nl.wql.core.bean; +package org.nl.modules.wql.core.bean; import java.io.Serializable; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/content/BaseContext.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/content/BaseContext.java similarity index 96% rename from nladmin-wql/src/main/java/org/nl/wql/core/content/BaseContext.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/content/BaseContext.java index 101b4bb4f..a5641a0d6 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/content/BaseContext.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/content/BaseContext.java @@ -1,4 +1,4 @@ -package org.nl.wql.core.content; +package org.nl.modules.wql.core.content; public abstract class BaseContext { public static final String CONTEXTNAME_HTTP = "http"; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/content/HttpContext.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/content/HttpContext.java similarity index 98% rename from nladmin-wql/src/main/java/org/nl/wql/core/content/HttpContext.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/content/HttpContext.java index a5f4489c2..94b73a33f 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/content/HttpContext.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/content/HttpContext.java @@ -1,11 +1,11 @@ -package org.nl.wql.core.content; +package org.nl.modules.wql.core.content; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; import java.util.Map.Entry; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; public class HttpContext extends BaseContext { private HashMap parameters = new HashMap(); diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/content/ServiceContext.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/content/ServiceContext.java similarity index 96% rename from nladmin-wql/src/main/java/org/nl/wql/core/content/ServiceContext.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/content/ServiceContext.java index 8c4696ed3..c9dc82f85 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/content/ServiceContext.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/content/ServiceContext.java @@ -1,4 +1,4 @@ -package org.nl.wql.core.content; +package org.nl.modules.wql.core.content; import java.util.HashMap; import java.util.Iterator; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/db/DBConnBean.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBConnBean.java similarity index 95% rename from nladmin-wql/src/main/java/org/nl/wql/core/db/DBConnBean.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBConnBean.java index ecea681e7..9b3b357e0 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/db/DBConnBean.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBConnBean.java @@ -1,4 +1,4 @@ -package org.nl.wql.core.db; +package org.nl.modules.wql.core.db; public class DBConnBean { private String drivers; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/db/DBConnection.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBConnection.java similarity index 98% rename from nladmin-wql/src/main/java/org/nl/wql/core/db/DBConnection.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBConnection.java index 56399cce3..4fd809981 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/db/DBConnection.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBConnection.java @@ -1,8 +1,8 @@ -package org.nl.wql.core.db; +package org.nl.modules.wql.core.db; import lombok.extern.slf4j.Slf4j; -import org.nl.wql.WQLCore; -import org.nl.wql.util.SpringContextHolder; +import org.nl.modules.wql.WQLCore; +import org.nl.modules.wql.util.SpringContextHolder; import org.springframework.jdbc.datasource.DataSourceUtils; import javax.sql.DataSource; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/db/DBPool.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPool.java similarity index 97% rename from nladmin-wql/src/main/java/org/nl/wql/core/db/DBPool.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPool.java index 82b4880b2..9456b8426 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/db/DBPool.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPool.java @@ -1,5 +1,9 @@ -package org.nl.wql.core.db; +package org.nl.modules.wql.core.db; +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.wql.WQLCore; + +import javax.transaction.UserTransaction; import java.sql.Connection; import java.sql.Driver; import java.sql.DriverManager; @@ -7,12 +11,6 @@ import java.sql.SQLException; import java.util.Hashtable; import java.util.Vector; -import javax.transaction.UserTransaction; - - -import lombok.extern.slf4j.Slf4j; -import org.nl.wql.WQLCore; - @Slf4j public class DBPool { private static DBPool instance; //唯一实例 diff --git a/nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPoolJBoss.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPoolJBoss.java new file mode 100644 index 000000000..975fac2ab --- /dev/null +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPoolJBoss.java @@ -0,0 +1,5 @@ +package org.nl.modules.wql.core.db; + +public class DBPoolJBoss { + +} \ No newline at end of file diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolSpring.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPoolSpring.java similarity index 97% rename from nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolSpring.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPoolSpring.java index 816853699..c77bde98b 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolSpring.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPoolSpring.java @@ -1,8 +1,8 @@ -package org.nl.wql.core.db; +package org.nl.modules.wql.core.db; import lombok.extern.slf4j.Slf4j; -import org.nl.wql.WQLCore; -import org.nl.wql.util.SpringContextHolder; +import org.nl.modules.wql.WQLCore; +import org.nl.modules.wql.util.SpringContextHolder; import org.springframework.jdbc.datasource.DataSourceUtils; import javax.naming.Context; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolTomcat.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPoolTomcat.java similarity index 96% rename from nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolTomcat.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPoolTomcat.java index 036873b55..4a53d87e3 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolTomcat.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPoolTomcat.java @@ -9,22 +9,20 @@ * 1、2014-06-24 10:50:08 yumeng 创建v1.0 * *******************************************************/ -package org.nl.wql.core.db; +package org.nl.modules.wql.core.db; -import java.sql.Connection; -import java.sql.SQLException; +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.wql.WQLCore; import javax.naming.Context; import javax.naming.InitialContext; import javax.transaction.UserTransaction; - - -import lombok.extern.slf4j.Slf4j; -import org.nl.wql.WQLCore; +import java.sql.Connection; +import java.sql.SQLException; @Slf4j public class DBPoolTomcat { - private static DBPoolTomcat instance; // 唯一实例 + private static DBPoolTomcat instance; // 唯一实例 private static boolean Useful; //联结池是否可用 /** diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolWeblogic.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPoolWeblogic.java similarity index 98% rename from nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolWeblogic.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPoolWeblogic.java index 2e081e75c..0df37c29b 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolWeblogic.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPoolWeblogic.java @@ -1,17 +1,15 @@ -package org.nl.wql.core.db; +package org.nl.modules.wql.core.db; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Hashtable; +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.wql.WQLCore; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.transaction.UserTransaction; - - -import lombok.extern.slf4j.Slf4j; -import org.nl.wql.WQLCore; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Hashtable; @Slf4j diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolWebsphere.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPoolWebsphere.java similarity index 98% rename from nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolWebsphere.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPoolWebsphere.java index 8c08257af..17aadd47f 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolWebsphere.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPoolWebsphere.java @@ -1,15 +1,13 @@ -package org.nl.wql.core.db; +package org.nl.modules.wql.core.db; -import java.sql.Connection; -import java.sql.SQLException; +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.wql.WQLCore; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.transaction.UserTransaction; - - -import lombok.extern.slf4j.Slf4j; -import org.nl.wql.WQLCore; +import java.sql.Connection; +import java.sql.SQLException; @Slf4j public class DBPoolWebsphere { diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/engine/Syntax.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/Syntax.java similarity index 95% rename from nladmin-wql/src/main/java/org/nl/wql/core/engine/Syntax.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/engine/Syntax.java index 94b12c02e..adff4844c 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/engine/Syntax.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/Syntax.java @@ -10,21 +10,20 @@ * 文件版本：v1.0 * *******************************************************/ -package org.nl.wql.core.engine; +package org.nl.modules.wql.core.engine; + +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.wql.core.engine.object.WO; +import org.nl.modules.wql.core.engine.syntax.IWQL; +import org.nl.modules.wql.core.engine.syntax.wqlAssign; +import org.nl.modules.wql.core.engine.syntax.wqlDUMP; +import org.nl.modules.wql.core.engine.syntax.wqlERROR; import java.util.ArrayList; import java.util.Iterator; import java.util.Stack; -import lombok.extern.slf4j.Slf4j; -import org.nl.wql.core.engine.object.WO; -import org.nl.wql.core.engine.syntax.IWQL; -import org.nl.wql.core.engine.syntax.wqlAssign; -import org.nl.wql.core.engine.syntax.wqlDUMP; -import org.nl.wql.core.engine.syntax.wqlERROR; - - /** * 语法解析核心类 * @author Administrator @@ -103,7 +102,7 @@ public class Syntax { } /////////////////////考虑运算符的对象化 - public boolean exec(WO wo,ArrayList list){ + public boolean exec(WO wo, ArrayList list){ boolean isSuccess = false; this.wo = wo; String cmd = ""; //当前命令域，如果遇到endxxx，则该命令域置空 diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/engine/WQLEngine.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/WQLEngine.java similarity index 98% rename from nladmin-wql/src/main/java/org/nl/wql/core/engine/WQLEngine.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/engine/WQLEngine.java index 1434ff2fc..11a126357 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/engine/WQLEngine.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/WQLEngine.java @@ -1,15 +1,15 @@ -package org.nl.wql.core.engine; +package org.nl.modules.wql.core.engine; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; -import org.nl.wql.WQL; -import org.nl.wql.WQLCore; -import org.nl.wql.core.DataType; -import org.nl.wql.core.bean.*; -import org.nl.wql.core.db.DBConnBean; -import org.nl.wql.core.engine.object.WO; -import org.nl.wql.util.WqlUtil; +import org.nl.modules.wql.WQL; +import org.nl.modules.wql.WQLCore; +import org.nl.modules.wql.core.DataType; +import org.nl.modules.wql.core.bean.*; +import org.nl.modules.wql.core.db.DBConnBean; +import org.nl.modules.wql.core.engine.object.WO; +import org.nl.modules.wql.util.WqlUtil; import java.util.ArrayList; import java.util.Iterator; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/engine/WQLFun.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/WQLFun.java similarity index 99% rename from nladmin-wql/src/main/java/org/nl/wql/core/engine/WQLFun.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/engine/WQLFun.java index 8e2842519..757b61b0d 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/engine/WQLFun.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/WQLFun.java @@ -1,24 +1,4 @@ -package org.nl.wql.core.engine; - -import java.io.File; -import java.lang.reflect.Field; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Enumeration; -import java.util.HashSet; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.Random; -import java.util.Set; -import java.util.TreeMap; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; +package org.nl.modules.wql.core.engine; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; @@ -27,15 +7,25 @@ import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.beanutils.RowSetDynaClass; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; -import org.nl.wql.util.WqlUtil; +import org.nl.modules.wql.WQLCore; +import org.nl.modules.wql.core.DataType; +import org.nl.modules.wql.util.Calculate; +import org.nl.modules.wql.util.MethodFactory; +import org.nl.modules.wql.util.WqlUtil; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import org.nl.wql.WQLCore; -import org.nl.wql.core.DataType; -import org.nl.wql.util.Calculate; -import org.nl.wql.util.MethodFactory; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import java.io.File; +import java.lang.reflect.Field; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; @Slf4j public class WQLFun { diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/engine/object/WO.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/object/WO.java similarity index 96% rename from nladmin-wql/src/main/java/org/nl/wql/core/engine/object/WO.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/engine/object/WO.java index ae3862e59..be3675850 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/engine/object/WO.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/object/WO.java @@ -10,25 +10,25 @@ * 文件版本：v1.0 * *******************************************************/ -package org.nl.wql.core.engine.object; +package org.nl.modules.wql.core.engine.object; import cn.hutool.core.util.StrUtil; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; -import org.nl.wql.WQLCore; -import org.nl.wql.core.DataType; -import org.nl.wql.core.bean.ErrorBean; -import org.nl.wql.core.bean.ResultBean; -import org.nl.wql.core.bean.XLSTableRow; -import org.nl.wql.core.content.BaseContext; -import org.nl.wql.core.content.HttpContext; -import org.nl.wql.core.db.DBConnBean; -import org.nl.wql.core.db.DBConnection; -import org.nl.wql.core.engine.Syntax; -import org.nl.wql.exception.WDKException; -import org.nl.wql.util.SpringContextHolder; -import org.nl.wql.util.WqlUtil; +import org.nl.modules.wql.WQLCore; +import org.nl.modules.wql.core.DataType; +import org.nl.modules.wql.core.bean.ErrorBean; +import org.nl.modules.wql.core.bean.ResultBean; +import org.nl.modules.wql.core.bean.XLSTableRow; +import org.nl.modules.wql.core.content.BaseContext; +import org.nl.modules.wql.core.content.HttpContext; +import org.nl.modules.wql.core.db.DBConnBean; +import org.nl.modules.wql.core.db.DBConnection; +import org.nl.modules.wql.core.engine.Syntax; +import org.nl.modules.wql.exception.WDKException; +import org.nl.modules.wql.util.SpringContextHolder; +import org.nl.modules.wql.util.WqlUtil; import javax.servlet.http.HttpServletRequest; import java.io.Serializable; @@ -58,13 +58,13 @@ public class WO implements Serializable, Cloneable { DBConnBean dbb = new DBConnBean(); dbb.setDrivers(""); - if (StrUtil.containsAnyIgnoreCase(rawJdbcUrl,DataType.MYSQL)){ + if (StrUtil.containsAnyIgnoreCase(rawJdbcUrl, DataType.MYSQL)){ dbb.setDbtype("mysql"); } - if (StrUtil.containsAnyIgnoreCase(rawJdbcUrl,DataType.ORACLE)){ + if (StrUtil.containsAnyIgnoreCase(rawJdbcUrl, DataType.ORACLE)){ dbb.setDbtype("oracle"); } - if (StrUtil.containsAnyIgnoreCase(rawJdbcUrl,DataType.MSSQL) || StrUtil.containsAnyIgnoreCase(rawJdbcUrl,"sqlserver")){ + if (StrUtil.containsAnyIgnoreCase(rawJdbcUrl, DataType.MSSQL) || StrUtil.containsAnyIgnoreCase(rawJdbcUrl,"sqlserver")){ dbb.setDbtype("mssql"); } if (StrUtil.isNotEmpty(dbb.getDbtype()))this.dbtype=dbb.getDbtype(); diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/engine/object/WP.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/object/WP.java similarity index 98% rename from nladmin-wql/src/main/java/org/nl/wql/core/engine/object/WP.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/engine/object/WP.java index 4564bc29b..91c73ea41 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/engine/object/WP.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/object/WP.java @@ -10,36 +10,26 @@ * 文件版本：v1.0 * *******************************************************/ -package org.nl.wql.core.engine.object; - -import java.io.Serializable; -import java.sql.CallableStatement; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +package org.nl.modules.wql.core.engine.object; import lombok.extern.slf4j.Slf4j; import org.apache.commons.beanutils.BasicDynaBean; import org.apache.commons.beanutils.DynaProperty; import org.apache.commons.beanutils.RowSetDynaClass; +import org.nl.modules.wql.core.DataType; +import org.nl.modules.wql.core.bean.ErrorBean; +import org.nl.modules.wql.core.bean.ParameterBean; +import org.nl.modules.wql.core.bean.ResultBean; +import org.nl.modules.wql.core.bean.WQLRowSetDynaClass; +import org.nl.modules.wql.core.engine.Syntax; +import org.nl.modules.wql.core.engine.WQLFun; +import org.nl.modules.wql.util.WqlUtil; - -import org.nl.wql.core.DataType; -import org.nl.wql.core.bean.ErrorBean; -import org.nl.wql.core.bean.ParameterBean; -import org.nl.wql.core.bean.ResultBean; -import org.nl.wql.core.bean.WQLRowSetDynaClass; -import org.nl.wql.core.engine.Syntax; -import org.nl.wql.core.engine.WQLFun; -import org.nl.wql.util.WqlUtil; +import java.io.Serializable; +import java.sql.*; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * 关于WP对象的设计说明： diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/IWQL.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/IWQL.java similarity index 93% rename from nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/IWQL.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/IWQL.java index 8acbef881..b77640f7e 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/IWQL.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/IWQL.java @@ -1,14 +1,13 @@ -package org.nl.wql.core.engine.syntax; +package org.nl.modules.wql.core.engine.syntax; + +import org.nl.modules.wql.core.engine.WQLFun; +import org.nl.modules.wql.core.engine.object.WO; +import org.nl.modules.wql.util.WqlUtil; import java.util.ArrayList; import java.util.Stack; -import org.nl.wql.core.engine.WQLFun; -import org.nl.wql.core.engine.object.WO; -import org.nl.wql.util.WqlUtil; - - public abstract class IWQL { protected WO wo; protected String cmdLine; @@ -54,7 +53,7 @@ public abstract class IWQL { * @param cmdLine 指令参数 * @param wqllist 所有指令的内容，字符串或指令对象 */ - public void setWQL(WO wo,String cmdLine,ArrayList wqllist){ + public void setWQL(WO wo, String cmdLine, ArrayList wqllist){ this.wo = wo; this.cmdLine = cmdLine; this.list = wqllist; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlAssign.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlAssign.java similarity index 95% rename from nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlAssign.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlAssign.java index 05813d8f7..85babae4a 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlAssign.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlAssign.java @@ -1,10 +1,10 @@ -package org.nl.wql.core.engine.syntax; +package org.nl.modules.wql.core.engine.syntax; import lombok.extern.slf4j.Slf4j; -import org.nl.wql.core.engine.Syntax; -import org.nl.wql.util.WQLCalculator; -import org.nl.wql.util.WqlUtil; +import org.nl.modules.wql.core.engine.Syntax; +import org.nl.modules.wql.util.WQLCalculator; +import org.nl.modules.wql.util.WqlUtil; /** diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlCALLJAVA.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlCALLJAVA.java similarity index 91% rename from nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlCALLJAVA.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlCALLJAVA.java index 7f40cde27..77e4bd59d 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlCALLJAVA.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlCALLJAVA.java @@ -1,16 +1,15 @@ -package org.nl.wql.core.engine.syntax; +package org.nl.modules.wql.core.engine.syntax; +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.wql.WQLCore; +import org.nl.modules.wql.core.bean.WQLJava; +import org.nl.modules.wql.util.WqlUtil; + import java.util.HashMap; import java.util.Iterator; import java.util.Set; - -import lombok.extern.slf4j.Slf4j; -import org.nl.wql.WQLCore; -import org.nl.wql.core.bean.WQLJava; -import org.nl.wql.util.WqlUtil; - /** * 关于calljava的说明 * 1、被调用的java文件必须放在wql_root的java文件夹中 @@ -20,7 +19,7 @@ import org.nl.wql.util.WqlUtil; * */ @Slf4j -public class wqlCALLJAVA extends IWQL{ +public class wqlCALLJAVA extends IWQL { // private WO wo; // private String cmdLine; // private ArrayList wqllist; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlCALLPROC.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlCALLPROC.java similarity index 95% rename from nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlCALLPROC.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlCALLPROC.java index dd07cfce6..e4c259729 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlCALLPROC.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlCALLPROC.java @@ -1,4 +1,10 @@ -package org.nl.wql.core.engine.syntax; +package org.nl.modules.wql.core.engine.syntax; + +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.wql.core.DataType; +import org.nl.modules.wql.core.bean.ErrorBean; +import org.nl.modules.wql.core.engine.WQLFun; +import org.nl.modules.wql.util.WqlUtil; import java.sql.ResultSet; import java.sql.SQLException; @@ -6,13 +12,6 @@ import java.sql.Types; import java.util.ArrayList; import java.util.Iterator; - -import lombok.extern.slf4j.Slf4j; -import org.nl.wql.core.DataType; -import org.nl.wql.core.bean.ErrorBean; -import org.nl.wql.core.engine.WQLFun; -import org.nl.wql.util.WqlUtil; - /** * 关于CALLPROC的语法说明 * 1、存储过程的输入输出参数均为varchar类型，如需其他类型请在各自存储过程中转换 @@ -21,7 +20,7 @@ import org.nl.wql.util.WqlUtil; * */ @Slf4j -public class wqlCALLPROC extends IWQL{ +public class wqlCALLPROC extends IWQL { // private WO wo; // private String cmdLine; // private ArrayList wqllist; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlCALLWQL.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlCALLWQL.java similarity index 90% rename from nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlCALLWQL.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlCALLWQL.java index d3ad344e6..cf3644881 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlCALLWQL.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlCALLWQL.java @@ -1,14 +1,13 @@ -package org.nl.wql.core.engine.syntax; +package org.nl.modules.wql.core.engine.syntax; + +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.wql.WQL; +import org.nl.modules.wql.core.engine.object.WO; import java.util.HashMap; import java.util.Iterator; import java.util.Set; - -import lombok.extern.slf4j.Slf4j; -import org.nl.wql.WQL; -import org.nl.wql.core.engine.object.WO; - /** * 关于CALLWQL的语法说明 * 1、 @@ -16,7 +15,7 @@ import org.nl.wql.core.engine.object.WO; * */ @Slf4j -public class wqlCALLWQL extends IWQL{ +public class wqlCALLWQL extends IWQL { // private WO wo; // private String cmdLine; // private ArrayList wqllist; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlDELETE.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlDELETE.java similarity index 95% rename from nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlDELETE.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlDELETE.java index 2b919b377..3f03c3e1d 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlDELETE.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlDELETE.java @@ -1,4 +1,11 @@ -package org.nl.wql.core.engine.syntax; +package org.nl.modules.wql.core.engine.syntax; + +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.wql.WQLCore; +import org.nl.modules.wql.core.DataType; +import org.nl.modules.wql.core.bean.ErrorBean; +import org.nl.modules.wql.core.bean.ParameterBean; +import org.nl.modules.wql.core.engine.WQLFun; import java.io.StringReader; import java.sql.SQLException; @@ -7,16 +14,8 @@ import java.util.Iterator; import java.util.Set; import java.util.Stack; - -import lombok.extern.slf4j.Slf4j; -import org.nl.wql.WQLCore; -import org.nl.wql.core.DataType; -import org.nl.wql.core.bean.ErrorBean; -import org.nl.wql.core.bean.ParameterBean; -import org.nl.wql.core.engine.WQLFun; - @Slf4j -public class wqlDELETE extends IWQL{ +public class wqlDELETE extends IWQL { // private WO wo; // private String cmdLine; // private ArrayList wqllist; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlDUMP.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlDUMP.java similarity index 93% rename from nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlDUMP.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlDUMP.java index 4dee38f3e..c347b07c8 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlDUMP.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlDUMP.java @@ -1,8 +1,8 @@ -package org.nl.wql.core.engine.syntax; +package org.nl.modules.wql.core.engine.syntax; import lombok.extern.slf4j.Slf4j; -import org.nl.wql.core.bean.ErrorBean; +import org.nl.modules.wql.core.bean.ErrorBean; /** * 关于DUMP的语法说明 diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlERROR.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlERROR.java similarity index 88% rename from nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlERROR.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlERROR.java index 6e838bf7a..3b85ca5b6 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlERROR.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlERROR.java @@ -1,10 +1,10 @@ -package org.nl.wql.core.engine.syntax; +package org.nl.modules.wql.core.engine.syntax; import lombok.extern.slf4j.Slf4j; -import org.nl.wql.core.ERROR; -import org.nl.wql.core.bean.ErrorBean; +import org.nl.modules.wql.core.ERROR; +import org.nl.modules.wql.core.bean.ErrorBean; /** * 关于ERROR的语法说明 @@ -16,7 +16,7 @@ import org.nl.wql.core.bean.ErrorBean; * */ @Slf4j -public class wqlERROR extends IWQL{ +public class wqlERROR extends IWQL { // private WO wo; // private String cmdLine; // private ArrayList list; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlEXECSQL.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlEXECSQL.java similarity index 94% rename from nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlEXECSQL.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlEXECSQL.java index 6ce941251..48dc3bb0f 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlEXECSQL.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlEXECSQL.java @@ -1,4 +1,11 @@ -package org.nl.wql.core.engine.syntax; +package org.nl.modules.wql.core.engine.syntax; + +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.wql.WQLCore; +import org.nl.modules.wql.core.DataType; +import org.nl.modules.wql.core.bean.ErrorBean; +import org.nl.modules.wql.core.bean.ParameterBean; +import org.nl.modules.wql.core.engine.WQLFun; import java.io.StringReader; import java.sql.SQLException; @@ -6,16 +13,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.Set; - -import lombok.extern.slf4j.Slf4j; -import org.nl.wql.WQLCore; -import org.nl.wql.core.DataType; -import org.nl.wql.core.bean.ErrorBean; -import org.nl.wql.core.bean.ParameterBean; -import org.nl.wql.core.engine.WQLFun; - @Slf4j -public class wqlEXECSQL extends IWQL{ +public class wqlEXECSQL extends IWQL { // private WO wo; // private String cmdLine; // private ArrayList wqllist; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlIF.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlIF.java similarity index 95% rename from nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlIF.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlIF.java index d7103606c..09d06bcca 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlIF.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlIF.java @@ -1,11 +1,10 @@ -package org.nl.wql.core.engine.syntax; - -import java.util.Stack; - +package org.nl.modules.wql.core.engine.syntax; import lombok.extern.slf4j.Slf4j; -import org.nl.wql.core.engine.WQLFun; -import org.nl.wql.util.WqlUtil; +import org.nl.modules.wql.core.engine.WQLFun; +import org.nl.modules.wql.util.WqlUtil; + +import java.util.Stack; /** * 关于IF的语法说明 @@ -20,12 +19,12 @@ import org.nl.wql.util.WqlUtil; * */ @Slf4j -public class wqlIF extends IWQL{ +public class wqlIF extends IWQL { // private WO wo; // private String cmdLine; // private ArrayList list; - - + + //当前IF的状态 boolean isok = false; //嵌套栈 @@ -36,10 +35,10 @@ public class wqlIF extends IWQL{ // TODO Auto-generated method stub isok = false; stack = new Stack(); - + String cmdstr = cmdLine.substring(3,this.cmdLine.length()); String[] arr = cmdstr.split(" "); - + //1、进行参数替换和判断 String param1 = ""; String param2 = ""; //比较符 @@ -71,21 +70,21 @@ public class wqlIF extends IWQL{ //进行比较 boolean istrue = WQLFun.APPCompare(param1, param2, param3); stack.push(istrue); - + param1 = ""; param2 = ""; param3 = ""; } } } - + //2、最后进行完整的判断 this.isok = process(); - + log.debug("【IF运算】：IF "+cmdstr+"，判断结果："+this.isok); - + boolean isSuccess = false; - + //3、从第二行开始往下走，判断else、elseif和endif String cmdarea = "IF"; for(int i=0;i wqllist; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlLOOP.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlLOOP.java similarity index 92% rename from nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlLOOP.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlLOOP.java index 2a509c229..a7dcef30d 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlLOOP.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlLOOP.java @@ -1,8 +1,8 @@ -package org.nl.wql.core.engine.syntax; +package org.nl.modules.wql.core.engine.syntax; import lombok.extern.slf4j.Slf4j; -import org.nl.wql.util.WqlUtil; +import org.nl.modules.wql.util.WqlUtil; /** * 关于LOOP的语法说明 @@ -21,22 +21,22 @@ import org.nl.wql.util.WqlUtil; * */ @Slf4j -public class wqlLOOP extends IWQL{ +public class wqlLOOP extends IWQL { // private WO wo; // private String cmdLine; // private ArrayList list; - + @Override public boolean exec(int nLoop) { //loop不支持双重循环，nLoop参数无效，使用0即可 nLoop = 0; - + String[] arr = this.cmdLine.split(" "); if(arr.length==1){ log.error("LOOP语法错误："+this.cmdLine); return false; } - + String str = (String) wo.wp.getIOParam(arr[1], nLoop); int nNum = 0; try { diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlPAGEQUERY.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlPAGEQUERY.java similarity index 93% rename from nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlPAGEQUERY.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlPAGEQUERY.java index bcd35627d..969d941ed 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlPAGEQUERY.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlPAGEQUERY.java @@ -1,4 +1,4 @@ -package org.nl.wql.core.engine.syntax; +package org.nl.modules.wql.core.engine.syntax; import lombok.extern.slf4j.Slf4j; @@ -15,7 +15,7 @@ import java.util.Iterator; * */ @Slf4j -public class wqlPAGEQUERY extends IWQL{ +public class wqlPAGEQUERY extends IWQL { // private WO wo; // private String cmdLine; // private ArrayList list; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlQUERY.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlQUERY.java similarity index 93% rename from nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlQUERY.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlQUERY.java index 19cc9beae..454194d96 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlQUERY.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlQUERY.java @@ -1,4 +1,4 @@ -package org.nl.wql.core.engine.syntax; +package org.nl.modules.wql.core.engine.syntax; import lombok.extern.slf4j.Slf4j; @@ -15,7 +15,7 @@ import java.util.Iterator; * */ @Slf4j -public class wqlQUERY extends IWQL{ +public class wqlQUERY extends IWQL { // private WO wo; // private String cmdLine; // private ArrayList list; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlSELECT.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlSELECT.java similarity index 99% rename from nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlSELECT.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlSELECT.java index d80f46c84..b64a0f7ef 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlSELECT.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlSELECT.java @@ -1,4 +1,12 @@ -package org.nl.wql.core.engine.syntax; +package org.nl.modules.wql.core.engine.syntax; + +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.wql.WQLCore; +import org.nl.modules.wql.core.DataType; +import org.nl.modules.wql.core.bean.ErrorBean; +import org.nl.modules.wql.core.bean.ParameterBean; +import org.nl.modules.wql.core.engine.WQLFun; +import org.nl.modules.wql.util.WqlUtil; import java.io.StringReader; import java.sql.ResultSet; @@ -10,15 +18,6 @@ import java.util.Stack; import java.util.regex.Matcher; import java.util.regex.Pattern; - -import lombok.extern.slf4j.Slf4j; -import org.nl.wql.WQLCore; -import org.nl.wql.core.DataType; -import org.nl.wql.core.bean.ErrorBean; -import org.nl.wql.core.bean.ParameterBean; -import org.nl.wql.core.engine.WQLFun; -import org.nl.wql.util.WqlUtil; - /** * 关于SELECT语法的说明 * 1、SELECT、FROM、WHERE、INNER、JOIN、OUTER、OPTION等数据库关键字必须新起一行 diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlUPDATE.java b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlUPDATE.java similarity index 95% rename from nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlUPDATE.java rename to nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlUPDATE.java index 59f1c1cc4..8a7860e6d 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlUPDATE.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlUPDATE.java @@ -1,4 +1,12 @@ -package org.nl.wql.core.engine.syntax; +package org.nl.modules.wql.core.engine.syntax; + +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.wql.WQLCore; +import org.nl.modules.wql.core.DataType; +import org.nl.modules.wql.core.bean.ErrorBean; +import org.nl.modules.wql.core.bean.ParameterBean; +import org.nl.modules.wql.core.db.DBConnection; +import org.nl.modules.wql.core.engine.WQLFun; import java.io.StringReader; import java.sql.SQLException; @@ -8,15 +16,6 @@ import java.util.Iterator; import java.util.Set; import java.util.Stack; - -import lombok.extern.slf4j.Slf4j; -import org.nl.wql.WQLCore; -import org.nl.wql.core.DataType; -import org.nl.wql.core.bean.ErrorBean; -import org.nl.wql.core.bean.ParameterBean; -import org.nl.wql.core.db.DBConnection; -import org.nl.wql.core.engine.WQLFun; - /** * 关于UPDATE的说明： * @@ -24,7 +23,7 @@ import org.nl.wql.core.engine.WQLFun; * */ @Slf4j -public class wqlUPDATE extends IWQL{ +public class wqlUPDATE extends IWQL { // private WO wo; // private String cmdLine; // private ArrayList wqllist; diff --git a/nladmin-wql/src/main/java/org/nl/wql/exception/WDKException.java b/nladmin-system/src/main/java/org/nl/modules/wql/exception/WDKException.java similarity index 96% rename from nladmin-wql/src/main/java/org/nl/wql/exception/WDKException.java rename to nladmin-system/src/main/java/org/nl/modules/wql/exception/WDKException.java index 20a677328..c126b0238 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/exception/WDKException.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/exception/WDKException.java @@ -1,4 +1,4 @@ -package org.nl.wql.exception; +package org.nl.modules.wql.exception; public class WDKException extends RuntimeException { private static final long serialVersionUID = 9059634125483898385L; diff --git a/nladmin-wql/src/main/java/org/nl/wql/util/Calculate.java b/nladmin-system/src/main/java/org/nl/modules/wql/util/Calculate.java similarity index 99% rename from nladmin-wql/src/main/java/org/nl/wql/util/Calculate.java rename to nladmin-system/src/main/java/org/nl/modules/wql/util/Calculate.java index 6dc567426..763e40065 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/util/Calculate.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/util/Calculate.java @@ -1,4 +1,4 @@ -package org.nl.wql.util; +package org.nl.modules.wql.util; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.math.NumberUtils; diff --git a/nladmin-wql/src/main/java/org/nl/wql/util/CallBack.java b/nladmin-system/src/main/java/org/nl/modules/wql/util/CallBack.java similarity index 97% rename from nladmin-wql/src/main/java/org/nl/wql/util/CallBack.java rename to nladmin-system/src/main/java/org/nl/modules/wql/util/CallBack.java index f0d5c0636..188647290 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/util/CallBack.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/util/CallBack.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.nl.wql.util; +package org.nl.modules.wql.util; /** * @author: liaojinlong diff --git a/nladmin-wql/src/main/java/org/nl/wql/util/MethodFactory.java b/nladmin-system/src/main/java/org/nl/modules/wql/util/MethodFactory.java similarity index 99% rename from nladmin-wql/src/main/java/org/nl/wql/util/MethodFactory.java rename to nladmin-system/src/main/java/org/nl/modules/wql/util/MethodFactory.java index e811a70eb..3f610302f 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/util/MethodFactory.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/util/MethodFactory.java @@ -1,4 +1,4 @@ -package org.nl.wql.util; +package org.nl.modules.wql.util; import lombok.extern.slf4j.Slf4j; diff --git a/nladmin-wql/src/main/java/org/nl/wql/util/SpringContextHolder.java b/nladmin-system/src/main/java/org/nl/modules/wql/util/SpringContextHolder.java similarity index 99% rename from nladmin-wql/src/main/java/org/nl/wql/util/SpringContextHolder.java rename to nladmin-system/src/main/java/org/nl/modules/wql/util/SpringContextHolder.java index 2694c411c..e451aa0b2 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/util/SpringContextHolder.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/util/SpringContextHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.wql.util; +package org.nl.modules.wql.util; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; @@ -21,6 +21,7 @@ import org.springframework.beans.factory.DisposableBean; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.core.env.Environment; + import java.util.ArrayList; import java.util.List; diff --git a/nladmin-wql/src/main/java/org/nl/wql/util/WQLCalculator.java b/nladmin-system/src/main/java/org/nl/modules/wql/util/WQLCalculator.java similarity index 99% rename from nladmin-wql/src/main/java/org/nl/wql/util/WQLCalculator.java rename to nladmin-system/src/main/java/org/nl/modules/wql/util/WQLCalculator.java index 8aef328dc..a12302530 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/util/WQLCalculator.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/util/WQLCalculator.java @@ -1,7 +1,8 @@ -package org.nl.wql.util; +package org.nl.modules.wql.util; -import java.util.LinkedList; import java.util.ArrayList; +import java.util.LinkedList; + public class WQLCalculator { public static void main(String[] args) { String str = "10*(22+232)/3"; diff --git a/nladmin-wql/src/main/java/org/nl/wql/util/WQLFilterGroup.java b/nladmin-system/src/main/java/org/nl/modules/wql/util/WQLFilterGroup.java similarity index 99% rename from nladmin-wql/src/main/java/org/nl/wql/util/WQLFilterGroup.java rename to nladmin-system/src/main/java/org/nl/modules/wql/util/WQLFilterGroup.java index 8d1ed39ce..bf6c26b8d 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/util/WQLFilterGroup.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/util/WQLFilterGroup.java @@ -1,4 +1,4 @@ -package org.nl.wql.util; +package org.nl.modules.wql.util; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; @@ -12,7 +12,7 @@ public class WQLFilterGroup { private List groups; private String op; private List roles; - + public List getGroups() { return groups; } @@ -31,20 +31,20 @@ public class WQLFilterGroup { public void setRoles(List roles) { this.roles = roles; } - + public WQLFilterGroup(){ this.groups = new ArrayList(); this.roles = new ArrayList(); - + } - + public static WQLFilterGroup fromObject(JSONObject obj){ WQLFilterGroup filterGroup = new WQLFilterGroup(); - + if(obj.containsKey("op")){ filterGroup.setOp(obj.getString("op")); } - + if(obj.containsKey("rules")){ JSONArray jrules = obj.getJSONArray("rules"); List roles = new ArrayList(); diff --git a/nladmin-wql/src/main/java/org/nl/wql/util/WQLFilterRule.java b/nladmin-system/src/main/java/org/nl/modules/wql/util/WQLFilterRule.java similarity index 99% rename from nladmin-wql/src/main/java/org/nl/wql/util/WQLFilterRule.java rename to nladmin-system/src/main/java/org/nl/modules/wql/util/WQLFilterRule.java index 632490e4d..178f0dd5d 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/util/WQLFilterRule.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/util/WQLFilterRule.java @@ -1,4 +1,4 @@ -package org.nl.wql.util; +package org.nl.modules.wql.util; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; diff --git a/nladmin-wql/src/main/java/org/nl/wql/util/WqlUtil.java b/nladmin-system/src/main/java/org/nl/modules/wql/util/WqlUtil.java similarity index 99% rename from nladmin-wql/src/main/java/org/nl/wql/util/WqlUtil.java rename to nladmin-system/src/main/java/org/nl/modules/wql/util/WqlUtil.java index 3ef04065a..e75d1a534 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/util/WqlUtil.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/util/WqlUtil.java @@ -1,8 +1,8 @@ -package org.nl.wql.util; +package org.nl.modules.wql.util; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; -import org.nl.wql.core.content.HttpContext; +import org.nl.modules.wql.core.content.HttpContext; import org.springframework.data.domain.Pageable; import javax.persistence.Column; diff --git a/nladmin-system/src/main/java/org/nl/start/Init.java b/nladmin-system/src/main/java/org/nl/start/Init.java index 577016907..10b6f11c8 100644 --- a/nladmin-system/src/main/java/org/nl/start/Init.java +++ b/nladmin-system/src/main/java/org/nl/start/Init.java @@ -5,7 +5,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.modules.quartz.domain.QuartzJob; import org.nl.modules.quartz.repository.QuartzJobRepository; import org.nl.modules.quartz.utils.QuartzManage; -import org.nl.wql.WQLCore; +import org.nl.modules.wql.WQLCore; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.stereotype.Component; diff --git a/nladmin-wql/pom.xml b/nladmin-wql/pom.xml deleted file mode 100644 index aca79f26d..000000000 --- a/nladmin-wql/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - nladmin - org.nl - 2.6 - - 4.0.0 - - nladmin-wql - 2.7 - WQL模块 - - - - - com.hynnet - jxl - 2.6.12.1 - - - - - - - - - - - - - - - commons-beanutils - commons-beanutils-core - 1.8.0 - - - - - - - - nexus - - nexus - http://121.40.234.130:8081/repository/maven-releases/ - - - - diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLJava.java b/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLJava.java deleted file mode 100644 index 30b0858cd..000000000 --- a/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLJava.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.nl.wql.core.bean; - -import java.util.HashMap; - -import org.nl.wql.core.engine.object.WO; - - -public abstract class WQLJava { - abstract public HashMap process(WO wo,HashMap inMap); -} \ No newline at end of file diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolJBoss.java b/nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolJBoss.java deleted file mode 100644 index efad8e397..000000000 --- a/nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolJBoss.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.nl.wql.core.db; - -public class DBPoolJBoss { - -} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5638fb830..d4a82e766 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,6 @@ nladmin-system - nladmin-wql NL-ADMIN 后台管理