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 0c0304517..d253ff132 100644 Binary files a/nladmin-system/src/main/java/org/nl/modules/system/wql/sys.xls and b/nladmin-system/src/main/java/org/nl/modules/system/wql/sys.xls differ 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 后台管理