root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wql整合到system模块中

Browse Source
This commit is contained in:
lyd
2022-09-26 09:16:28 +08:00
parent 948b0f8ac3
commit 6d97d3a0eb
81 changed files with 333 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
nladmin-system/pom.xml
View File

@@ -20,6 +20,20 @@
</properties>
<dependencies>
<!--WQL-->
<dependency>
<groupId>com.hynnet</groupId>
<artifactId>jxl</artifactId>
<version>2.6.12.1</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
<version>1.8.0</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
@@ -57,12 +71,6 @@
<version>2.5.14</version>
</dependency>
<dependency>
<groupId>org.nl</groupId>
<artifactId>nladmin-wql</artifactId>
<version>2.7</version>
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc5</artifactId>

2
nladmin-system/src/main/java/org/nl/AppRun.java
View File

@@ -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;

2
nladmin-system/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java
View File

@@ -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;

2
nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java
View File

@@ -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;

6
nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageImageServiceImpl.java
View File

@@ -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;

6
nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java
View File

@@ -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;

2
nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java
View File

@@ -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;

2
nladmin-system/src/main/java/org/nl/modules/quartz/utils/QuartzRunnable.java
View File

@@ -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;

6
nladmin-system/src/main/java/org/nl/modules/system/service/impl/CodeDetailServiceImpl.java
View File

@@ -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;

4
nladmin-system/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java
View File

@@ -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;

6
nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java
View File

@@ -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;

6
nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridFieldServiceImpl.java
View File

@@ -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;

6
nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridServiceImpl.java
View File

@@ -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;

6
nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java
View File

@@ -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;

2
nladmin-system/src/main/java/org/nl/modules/system/service/impl/RoleServiceImpl.java
View File

@@ -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;

BIN
nladmin-system/src/main/java/org/nl/modules/system/wql/sys.xls
View File

Binary file not shown.

12
nladmin-wql/src/main/java/org/nl/wql/WQL.java → nladmin-system/src/main/java/org/nl/modules/wql/WQL.java
View File

@@ -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的运行对象

14
nladmin-wql/src/main/java/org/nl/wql/WQLCore.java → nladmin-system/src/main/java/org/nl/modules/wql/WQLCore.java
View File

@@ -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;

6
nladmin-wql/src/main/java/org/nl/wql/core/DataType.java → nladmin-system/src/main/java/org/nl/modules/wql/core/DataType.java
View File

@@ -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";

6
nladmin-wql/src/main/java/org/nl/wql/core/ERROR.java → nladmin-system/src/main/java/org/nl/modules/wql/core/ERROR.java
View File

@@ -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<String,String> ERR = new HashMap<String, String>();

2
nladmin-wql/src/main/java/org/nl/wql/core/bean/ConnectBean.java → nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ConnectBean.java
View File

@@ -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;
//

4
nladmin-wql/src/main/java/org/nl/wql/core/bean/DataTypeBean.java → nladmin-system/src/main/java/org/nl/modules/wql/core/bean/DataTypeBean.java
View File

@@ -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 {

2
nladmin-wql/src/main/java/org/nl/wql/core/bean/ErrorBean.java → nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ErrorBean.java
View File

@@ -10,7 +10,7 @@
* 文件版本：v1.0
*
*******************************************************/
package org.nl.wql.core.bean;
package org.nl.modules.wql.core.bean;
public class ErrorBean {

2
nladmin-wql/src/main/java/org/nl/wql/core/bean/ParameterBean.java → nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ParameterBean.java
View File

@@ -1,4 +1,4 @@
package org.nl.wql.core.bean;
package org.nl.modules.wql.core.bean;
/**
* SQL参数

4
nladmin-wql/src/main/java/org/nl/wql/core/bean/ResultBean.java → nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ResultBean.java
View File

@@ -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;

2
nladmin-wql/src/main/java/org/nl/wql/core/bean/TableBean.java → nladmin-system/src/main/java/org/nl/modules/wql/core/bean/TableBean.java
View File

@@ -1,4 +1,4 @@
package org.nl.wql.core.bean;
package org.nl.modules.wql.core.bean;
/**
* excel中读取的表的说明
* @author Administrator

6
nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLData.java → nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLData.java
View File

@@ -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;

2
nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLDataField.java → nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLDataField.java
View File

@@ -1,4 +1,4 @@
package org.nl.wql.core.bean;
package org.nl.modules.wql.core.bean;
import java.io.Serializable;

10
nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLJava.java Normal file
View File

@@ -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);
}

8
nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLModule.java → nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLModule.java
View File

@@ -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<String,WQLModule> getWQLModuleMap(){
public static HashMap<String, WQLModule> getWQLModuleMap(){
return WQLCore.moduleMap;
}

2
nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLModuleBean.java → nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLModuleBean.java
View File

@@ -1,4 +1,4 @@
package org.nl.wql.core.bean;
package org.nl.modules.wql.core.bean;
import com.alibaba.fastjson.JSONObject;

14
nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLObject.java → nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLObject.java
View File

@@ -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.*;

2
nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLObjectField.java → nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLObjectField.java
View File

@@ -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; //字段中文名称

8
nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLRowSetDynaClass.java → nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLRowSetDynaClass.java
View File

@@ -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 {
/**

2
nladmin-wql/src/main/java/org/nl/wql/core/bean/XLSTableRow.java → nladmin-system/src/main/java/org/nl/modules/wql/core/bean/XLSTableRow.java
View File

@@ -1,4 +1,4 @@
package org.nl.wql.core.bean;
package org.nl.modules.wql.core.bean;
import java.io.Serializable;

2
nladmin-wql/src/main/java/org/nl/wql/core/content/BaseContext.java → nladmin-system/src/main/java/org/nl/modules/wql/core/content/BaseContext.java
View File

@@ -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";

6
nladmin-wql/src/main/java/org/nl/wql/core/content/HttpContext.java → nladmin-system/src/main/java/org/nl/modules/wql/core/content/HttpContext.java
View File

@@ -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<String, Object> parameters = new HashMap();

2
nladmin-wql/src/main/java/org/nl/wql/core/content/ServiceContext.java → nladmin-system/src/main/java/org/nl/modules/wql/core/content/ServiceContext.java
View File

@@ -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;

2
nladmin-wql/src/main/java/org/nl/wql/core/db/DBConnBean.java → nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBConnBean.java
View File

@@ -1,4 +1,4 @@
package org.nl.wql.core.db;
package org.nl.modules.wql.core.db;
public class DBConnBean {
private String drivers;

6
nladmin-wql/src/main/java/org/nl/wql/core/db/DBConnection.java → nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBConnection.java
View File

@@ -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;

12
nladmin-wql/src/main/java/org/nl/wql/core/db/DBPool.java → nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPool.java
View File

@@ -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; //唯一实例

5
nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPoolJBoss.java Normal file
View File

@@ -0,0 +1,5 @@
package org.nl.modules.wql.core.db;
public class DBPoolJBoss {
}

6
nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolSpring.java → nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPoolSpring.java
View File

@@ -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;

14
nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolTomcat.java → nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPoolTomcat.java
View File

@@ -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; //联结池是否可用
/**

14
nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolWeblogic.java → nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPoolWeblogic.java
View File

@@ -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

12
nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolWebsphere.java → nladmin-system/src/main/java/org/nl/modules/wql/core/db/DBPoolWebsphere.java
View File

@@ -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 {

19
nladmin-wql/src/main/java/org/nl/wql/core/engine/Syntax.java → nladmin-system/src/main/java/org/nl/modules/wql/core/engine/Syntax.java
View File

@@ -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，则该命令域置空

16
nladmin-wql/src/main/java/org/nl/wql/core/engine/WQLEngine.java → nladmin-system/src/main/java/org/nl/modules/wql/core/engine/WQLEngine.java
View File

@@ -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;

42
nladmin-wql/src/main/java/org/nl/wql/core/engine/WQLFun.java → nladmin-system/src/main/java/org/nl/modules/wql/core/engine/WQLFun.java
View File

@@ -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 {

34
nladmin-wql/src/main/java/org/nl/wql/core/engine/object/WO.java → nladmin-system/src/main/java/org/nl/modules/wql/core/engine/object/WO.java
View File

@@ -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();

38
nladmin-wql/src/main/java/org/nl/wql/core/engine/object/WP.java → nladmin-system/src/main/java/org/nl/modules/wql/core/engine/object/WP.java
View File

@@ -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对象的设计说明：

13
nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/IWQL.java → nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/IWQL.java
View File

@@ -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;

8
nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlAssign.java → nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlAssign.java
View File

@@ -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;
/**

15
nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlCALLJAVA.java → nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlCALLJAVA.java
View File

@@ -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;

17
nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlCALLPROC.java → nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlCALLPROC.java
View File

@@ -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;

13
nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlCALLWQL.java → nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlCALLWQL.java
View File

@@ -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;

19
nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlDELETE.java → nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlDELETE.java
View File

@@ -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;

4
nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlDUMP.java → nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlDUMP.java
View File

@@ -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的语法说明

8
nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlERROR.java → nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlERROR.java
View File

@@ -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;

19
nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlEXECSQL.java → nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlEXECSQL.java
View File

@@ -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;

13
nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlIF.java → nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlIF.java
View File

@@ -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,7 +19,7 @@ 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;

19
nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlINSERT.java → nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlINSERT.java
View File

@@ -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;
@@ -8,16 +15,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 wqlINSERT extends IWQL{
public class wqlINSERT extends IWQL {
// private WO wo;
// private String cmdLine;
// private ArrayList<String> wqllist;

6
nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlLOOP.java → nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlLOOP.java
View File

@@ -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,7 +21,7 @@ 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;

4
nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlPAGEQUERY.java → nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlPAGEQUERY.java
View File

@@ -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;

4
nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlQUERY.java → nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlQUERY.java
View File

@@ -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;

19
nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlSELECT.java → nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlSELECT.java
View File

@@ -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等数据库关键字必须新起一行

21
nladmin-wql/src/main/java/org/nl/wql/core/engine/syntax/wqlUPDATE.java → nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlUPDATE.java
View File

@@ -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;

2
nladmin-wql/src/main/java/org/nl/wql/exception/WDKException.java → nladmin-system/src/main/java/org/nl/modules/wql/exception/WDKException.java
View File

@@ -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;

2
nladmin-wql/src/main/java/org/nl/wql/util/Calculate.java → nladmin-system/src/main/java/org/nl/modules/wql/util/Calculate.java
View File

@@ -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;

2
nladmin-wql/src/main/java/org/nl/wql/util/CallBack.java → nladmin-system/src/main/java/org/nl/modules/wql/util/CallBack.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.nl.wql.util;
package org.nl.modules.wql.util;
/**
* @author: liaojinlong

2
nladmin-wql/src/main/java/org/nl/wql/util/MethodFactory.java → nladmin-system/src/main/java/org/nl/modules/wql/util/MethodFactory.java
View File

@@ -1,4 +1,4 @@
package org.nl.wql.util;
package org.nl.modules.wql.util;
import lombok.extern.slf4j.Slf4j;

3
nladmin-wql/src/main/java/org/nl/wql/util/SpringContextHolder.java → nladmin-system/src/main/java/org/nl/modules/wql/util/SpringContextHolder.java
View File

@@ -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;

5
nladmin-wql/src/main/java/org/nl/wql/util/WQLCalculator.java → nladmin-system/src/main/java/org/nl/modules/wql/util/WQLCalculator.java
View File

@@ -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";

2
nladmin-wql/src/main/java/org/nl/wql/util/WQLFilterGroup.java → nladmin-system/src/main/java/org/nl/modules/wql/util/WQLFilterGroup.java
View File

@@ -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;

2
nladmin-wql/src/main/java/org/nl/wql/util/WQLFilterRule.java → nladmin-system/src/main/java/org/nl/modules/wql/util/WQLFilterRule.java
View File

@@ -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;

4
nladmin-wql/src/main/java/org/nl/wql/util/WqlUtil.java → nladmin-system/src/main/java/org/nl/modules/wql/util/WqlUtil.java
View File

@@ -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;

2
nladmin-system/src/main/java/org/nl/start/Init.java
View File

@@ -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;

63
nladmin-wql/pom.xml
View File

@@ -1,63 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>nladmin</artifactId>
<groupId>org.nl</groupId>
<version>2.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>nladmin-wql</artifactId>
<version>2.7</version>
<name>WQL模块</name>
<dependencies>
<!--<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<version>2.4</version>
<classifier>jdk15</classifier>
</dependency>-->
<dependency>
<groupId>com.hynnet</groupId>
<artifactId>jxl</artifactId>
<version>2.6.12.1</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.nl</groupId>-->
<!-- <artifactId>nladmin-logging</artifactId>-->
<!-- <version>2.6</version>-->
<!-- <scope>compile</scope>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.nl</groupId>-->
<!-- <artifactId>nladmin-system</artifactId>-->
<!-- <version>2.6</version>-->
<!-- </dependency>-->
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
<version>1.8.0</version>
</dependency>
</dependencies>
<distributionManagement>
<!--正式版本-->
<repository>
<!-- nexus服务器中用户名：在settings.xml中<server>的id-->
<id>nexus</id>
<!-- 这个名称自己定义 -->
<name>nexus</name>
<url>http://121.40.234.130:8081/repository/maven-releases/</url>
</repository>
<!--快照
<snapshotRepository>
<id>nexus-snapshots</id>
<name>Snapshots repository</name>
<url>http://192.168.1.105/repository/yang/</url>
</snapshotRepository>-->
</distributionManagement>
</project>

10
nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLJava.java
View File

@@ -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);
}

5
nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolJBoss.java
View File

@@ -1,5 +0,0 @@
package org.nl.wql.core.db;
public class DBPoolJBoss {
}

1
pom.xml
View File

@@ -12,7 +12,6 @@
<modules>
<module>nladmin-system</module>
<module>nladmin-wql</module>
</modules>
<name>NL-ADMIN 后台管理</name>