beetlsql3-dev
Mlxa0324 3 years ago
parent e7caed5827
commit 42f3295072

@ -1,10 +1,9 @@
package com.ibeetl.admin.console.dao;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.admin.core.entity.CoreAudit;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
@SqlResource("console.audit")
public interface AuditConsoleDao extends BaseMapper<CoreAudit> {

@ -1,14 +1,12 @@
package com.ibeetl.admin.console.dao;
import java.util.List;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.admin.core.entity.CoreDict;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
/**
* CoreDict Dao

@ -1,12 +1,13 @@
package com.ibeetl.admin.console.dao;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.admin.core.entity.CoreFunction;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
@SqlResource("console.function")
@Repository
public interface FunctionConsoleDao extends BaseMapper<CoreFunction> {
/**

@ -1,10 +1,9 @@
package com.ibeetl.admin.console.dao;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.admin.core.entity.CoreMenu;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
@SqlResource("console.menu")

@ -1,21 +1,18 @@
package com.ibeetl.admin.console.dao;
import java.util.List;
import org.beetl.sql.core.annotatoin.Param;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.annotatoin.SqlStatement;
import org.beetl.sql.core.annotatoin.SqlStatementType;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.admin.core.entity.CoreOrg;
import com.ibeetl.admin.core.entity.CoreUser;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.Param;
import org.beetl.sql.mapper.annotation.SqlResource;
import java.util.List;
@SqlResource("console.org")
public interface OrgConsoleDao extends BaseMapper<CoreOrg> {
void queryByCondition(PageQuery<CoreOrg> query);
@SqlStatement(type=SqlStatementType.SELECT)
// @SqlStatement(type=SqlStatementType.SELECT)
void queryUserByCondition(PageQuery<CoreUser> query);
void batchDelByIds(@Param(value = "ids") List<Long> ids);
}

@ -1,15 +1,12 @@
package com.ibeetl.admin.console.dao;
import java.util.List;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.admin.console.web.query.RoleUserQuery;
import com.ibeetl.admin.core.entity.CoreRole;
import com.ibeetl.admin.core.entity.CoreUser;
import org.springframework.stereotype.Repository;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import java.util.List;
@SqlResource("console.role")
public interface RoleConsoleDao extends BaseMapper<CoreRole> {

@ -1,15 +1,15 @@
package com.ibeetl.admin.console.dao;
import java.util.List;
import org.beetl.sql.core.annotatoin.Param;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.admin.console.web.dto.RoleDataAccessFunction;
import com.ibeetl.admin.core.entity.CoreRoleFunction;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;
@SqlResource("console.roleFunction")
@Repository
public interface RoleFunctionConsoleDao extends BaseMapper<CoreRoleFunction> {

@ -3,9 +3,9 @@ package com.ibeetl.admin.console.dao;
import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.entity.CoreUserRole;
import com.ibeetl.admin.core.util.enums.GeneralStateEnum;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import java.util.List;

@ -1,14 +1,5 @@
package com.ibeetl.admin.console.service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.beetl.sql.core.engine.PageQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.ibeetl.admin.console.dao.FunctionConsoleDao;
import com.ibeetl.admin.console.dao.RoleFunctionConsoleDao;
import com.ibeetl.admin.console.web.dto.RoleDataAccessFunction;
@ -22,6 +13,14 @@ import com.ibeetl.admin.core.rbac.tree.FunctionItem;
import com.ibeetl.admin.core.service.CoreBaseService;
import com.ibeetl.admin.core.service.CorePlatformService;
import com.ibeetl.admin.core.util.PlatformException;
import org.beetl.sql.core.engine.PageQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* @author TLT
*
@ -63,7 +62,7 @@ public class FunctionConsoleService extends CoreBaseService<CoreFunction> {
public Long saveFunction(CoreFunction function){
functionDao.insert(function,true);
functionDao.insert(function);
platformService.clearFunctionCache();
return function.getId();
}

@ -7,9 +7,7 @@ import com.ibeetl.admin.core.entity.CoreRoleMenu;
import com.ibeetl.admin.core.rbac.tree.MenuItem;
import com.ibeetl.admin.core.service.CoreBaseService;
import com.ibeetl.admin.core.service.CorePlatformService;
import com.ibeetl.admin.core.util.ConvertUtil;
import com.ibeetl.admin.core.util.PlatformException;
import org.apache.commons.lang3.StringUtils;
import org.beetl.sql.core.engine.PageQuery;
import org.springframework.beans.factory.annotation.Autowired;
@ -45,7 +43,7 @@ public class MenuConsoleService extends CoreBaseService<CoreMenu> {
if (queryCount > 0) {
throw new PlatformException("菜单编码已存在");
}
menuDao.insert(menu, true);
menuDao.insert(menu);
platformService.clearMenuCache();
return menu.getId();
}

@ -77,7 +77,7 @@ public class UserConsoleService extends CoreBaseService<CoreUser> {
user.setState(GeneralStateEnum.ENABLE.getValue());
user.setPassword(passwordEncryptService.password(user.getPassword()));
user.setDelFlag(DelFlagEnum.NORMAL.getValue());
userDao.insert(user, true);
userDao.insert(user);
if(StringUtils.isNotEmpty(user.getAttachmentId())){
//更新附件详细信息,关联到这个用户
fileService.updateFile(user.getAttachmentId(), User.class.getSimpleName(), String.valueOf(user.getId()));

@ -11,6 +11,7 @@
</parent>
<properties>
<maven.test.skip>true</maven.test.skip>
<beetlsql.version>3.19.0-RELEASE</beetlsql.version>
</properties>
<dependencies>
<dependency>
@ -83,7 +84,7 @@
<dependency>
<groupId>com.ibeetl</groupId>
<artifactId>beetl-framework-starter</artifactId>
<version>1.2.38.RELEASE</version>
<version>1.2.40.Beetl.RELEASE</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@ -91,6 +92,12 @@
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/com.ibeetl/sql-fetch -->
<dependency>
<groupId>com.ibeetl</groupId>
<artifactId>beetlsql</artifactId>
<version>${beetlsql.version}</version>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>

@ -1,7 +1,6 @@
package com.ibeetl.admin.core.conf;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.ibeetl.admin.core.rbac.DataAccess;
import com.ibeetl.admin.core.rbac.DataAccessFactory;
import com.ibeetl.admin.core.service.CorePlatformService;
import com.ibeetl.admin.core.util.TimeTool;
@ -26,7 +25,6 @@ import javax.servlet.http.HttpServletRequest;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@Configuration
@AutoConfigureAfter(JasonConfig.class)
@ -100,26 +98,14 @@ public class BeetlConf {
groupTemplate.registerFunction("session",sessionFunction);
groupTemplate.registerFunctionPackage("dict", dictDownQueryFunction);
// 模板页面判断是否有按钮权限,比如canAccess
groupTemplate.registerFunction("canAccess", new Function() {
@Override
public Boolean call(Object[] paras, Context ctx) {
Long userId = platFormService.getCurrentUser().getId();
Long orgId = platFormService.getCurrentOrgId();
String functionCode = (String) paras[0];
return platFormService.canAcessFunction(userId, orgId, functionCode);
}
groupTemplate.registerFunction("canAccess", (paras, ctx) -> {
Long userId = platFormService.getCurrentUser().getId();
Long orgId = platFormService.getCurrentOrgId();
String functionCode = (String) paras[0];
return platFormService.canAcessFunction(userId, orgId, functionCode);
});
groupTemplate.registerFunction("abcd", new Function() {
@Override
public Boolean call(Object[] paras, Context ctx) {
return true;
}
});
groupTemplate.registerFunction("abcd", (paras, ctx) -> true);
groupTemplate.registerFunction("env", new Function() {
@ -146,129 +132,98 @@ public class BeetlConf {
});
groupTemplate.registerFunction("dataAccessList", new Function() {
@Override
public List<DataAccess> call(Object[] paras, Context ctx) {
return dataAccessFactory.all();
}
});
groupTemplate.registerFunction("dataAccessList", (paras, ctx) -> dataAccessFactory.all());
//根据相应的字符分割字符串
groupTemplate.registerFunction("splitString", new Function() {
@Override
public List<String> call(Object[] paras, Context ctx) {
String key = (String)paras[0];
if(key!=null) {
if(paras.length >= 2){
String key2 = (String)paras[1];
return Arrays.asList(key.replace("\r","").split(key2));
}else {
return Arrays.asList(key.replace("\r","").split("\n"));
}
groupTemplate.registerFunction("splitString", (paras, ctx) -> {
String key = (String)paras[0];
if(key!=null) {
if(paras.length >= 2){
String key2 = (String)paras[1];
return Arrays.asList(key.replace("\r","").split(key2));
}else {
return Arrays.asList(key.replace("\r","").split("\n"));
}
return new ArrayList<String>();
}
return new ArrayList<String>();
});
//判断某个字符在相应字符串中的位置
groupTemplate.registerFunction("indexOf", new Function() {
@Override
public Boolean call(Object[] paras, Context ctx) {
String key = (String)paras[0];
String val = (String)paras[1];
if(key!=null) {
if(key.indexOf(val) >= 0){
return true;
}else {
return false;
}
groupTemplate.registerFunction("indexOf", (paras, ctx) -> {
String key = (String)paras[0];
String val = (String)paras[1];
if(key!=null) {
if(key.indexOf(val) >= 0){
return true;
}else {
return false;
}
return false;
}
return false;
});
//替换字符串中的所有相应字符
groupTemplate.registerFunction("replaceAll", new Function() {
@Override
public String call(Object[] paras, Context ctx) {
String key = (String)paras[0];
if(key!=null) {
if(paras.length >= 2){
String key2 = (String)paras[1];
if(paras.length == 3){
return key.replace(key2,(String)paras[2]);
}else {
return key.replace(key2,"");
}
groupTemplate.registerFunction("replaceAll", (paras, ctx) -> {
String key = (String)paras[0];
if(key!=null) {
if(paras.length >= 2){
String key2 = (String)paras[1];
if(paras.length == 3){
return key.replace(key2,(String)paras[2]);
}else {
return key;
return key.replace(key2,"");
}
}else {
return key;
}
return null;
}
return null;
});
//替换字符串中的所有相应字符
groupTemplate.registerFunction("replaceAll", new Function() {
@Override
public String call(Object[] paras, Context ctx) {
String key = (String)paras[0];
if(key!=null) {
if(paras.length >= 2){
String key2 = (String)paras[1];
if(paras.length == 3){
return key.replace(key2,(String)paras[2]);
}else {
return key.replace(key2,"");
}
groupTemplate.registerFunction("replaceAll", (paras, ctx) -> {
String key = (String)paras[0];
if(key!=null) {
if(paras.length >= 2){
String key2 = (String)paras[1];
if(paras.length == 3){
return key.replace(key2,(String)paras[2]);
}else {
return key;
return key.replace(key2,"");
}
}else {
return key;
}
return null;
}
return null;
});
//根据某个字符分割并且获取长度
groupTemplate.registerFunction("splitLength", new Function() {
@Override
public Integer call(Object[] paras, Context ctx) {
String key = (String)paras[0];
if(key!=null) {
if(paras.length >= 2){
String key2 = (String)paras[1];
return key.replace("\r","").split(key2).length;
}else {
return key.replace("\r","").split(",").length;
}
groupTemplate.registerFunction("splitLength", (paras, ctx) -> {
String key = (String)paras[0];
if(key!=null) {
if(paras.length >= 2){
String key2 = (String)paras[1];
return key.replace("\r","").split(key2).length;
}else {
return key.replace("\r","").split(",").length;
}
return 0;
}
return 0;
});
//时间格式转换 Mon Dec 31 00:00:00 CST 2012
groupTemplate.registerFunction("simpleDateFormat", new Function() {
@Override
public String call(Object[] paras, Context ctx) {
String key = null;
if(paras[0] != null){
key = paras[0].toString();
}
if(key!=null) {
if(paras.length >= 2){
String key2 = paras[1].toString();
return TimeTool.getNowTime(TimeTool.getTime(key),key2);
}else {
return TimeTool.getNowTime(TimeTool.getTime(key));
}
groupTemplate.registerFunction("simpleDateFormat", (paras, ctx) -> {
String key = null;
if(paras[0] != null){
key = paras[0].toString();
}
if(key!=null) {
if(paras.length >= 2){
String key2 = paras[1].toString();
return TimeTool.getNowTime(TimeTool.getTime(key),key2);
}else {
return TimeTool.getNowTime(TimeTool.getTime(key));
}
return null;
}
return null;
});
}
};

@ -1,143 +1,145 @@
package com.ibeetl.admin.core.conf;
import org.beetl.sql.core.InterceptorContext;
import org.beetl.sql.core.JavaType;
import org.beetl.sql.core.SQLManager;
import org.beetl.sql.core.mapper.MapperJavaProxy;
import org.beetl.sql.core.query.LambdaQuery;
import org.beetl.sql.core.query.Query;
import org.beetl.sql.ext.DebugInterceptor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Collection;
import java.util.ResourceBundle;
/**
* SQL
*/
public class MyDebugInterceptor extends DebugInterceptor {
static Logger logger = LoggerFactory.getLogger(MyDebugInterceptor.class);
public static Boolean showBeetlsql = Boolean.parseBoolean(ResourceBundle.getBundle("application") .getString("beetl-beetlsql.dev"));
private String showName;
static String mapperName = MapperJavaProxy.class.getName();
static String sqlManagerName = SQLManager.class.getName();
static String queryClassName = Query.class.getName();
static String lambdaQueryName = LambdaQuery.class.getName();
public MyDebugInterceptor(String showName) {
super();
this.showName = showName;
}
@Override
protected void println(String str) {
String lineSeparator = System.getProperty("line.separator", "\n");
// String lineSeparator ="";
if(showBeetlsql){
logger.info(lineSeparator+str);
}else {
System.out.println(lineSeparator+str);
}
}
@Override
public void before(InterceptorContext ctx) {
String sqlId = ctx.getSqlId();
if (this.isDebugEanble(sqlId)) {
ctx.put("debug.time", System.currentTimeMillis());
}
if (this.isSimple(sqlId)) {
return;
}
StringBuilder sb = new StringBuilder();
String lineSeparator = System.getProperty("line.separator", "\n");
sb.append("┏━━━━━ "+showName+" Debug [").append(this.getSqlId(formatSql(sqlId))).append("] ━━━").append(lineSeparator)
.append("┣ SQL\t " + formatSql(ctx.getSql()) + lineSeparator)
.append("┣ 参数:\t " + formatParas(ctx.getParas())).append(lineSeparator);
RuntimeException ex = new RuntimeException();
StackTraceElement[] traces = ex.getStackTrace();
int index = lookBusinessCodeInTrace(traces);
StackTraceElement bussinessCode = traces[index];
String className = bussinessCode.getClassName();
String mehodName = bussinessCode.getMethodName();
int line = bussinessCode.getLineNumber();
sb.append("┣ 位置:\t " + className + "." + mehodName + "(" + bussinessCode.getFileName() + ":" + line + ")"
+ lineSeparator);
ctx.put("logs", sb);
}
@Override
protected int lookBusinessCodeInTrace(StackTraceElement[] traces) {
String className = getTraceClassName();
for (int i = traces.length - 1; i >= 0; i--) {
String name = traces[i].getClassName();
if (className != null && className.equals(name)) {
return i;
} else if (name.equals(mapperName)) {
// 越过sun jdk 代理
int skipLine = JavaType.isJdk8() ? 3 : 2;
return i + skipLine;
} else if (name.equals(lambdaQueryName)) {
return i + 1;
} else if (name.equals(queryClassName)) {
return i + 1;
} else if (name.equals(sqlManagerName)) {
return i + 1;
}
}
// 不可能到这里
throw new IllegalStateException();
}
@Override
public void after(InterceptorContext ctx) {
String sqlId = ctx.getSqlId();
if (this.isSimple(sqlId)) {
this.simpleOut(ctx);
return;
}
long time = System.currentTimeMillis();
long start = (Long) ctx.get("debug.time");
String lineSeparator = System.getProperty("line.separator", "\n");
StringBuilder sb = (StringBuilder) ctx.get("logs");
sb.append("┣ 时间:\t " + (time - start) + "ms").append(lineSeparator);
if (ctx.isUpdate()) {
sb.append("┣ 更新:\t [");
if (ctx.getResult().getClass().isArray()) {
int[] ret = (int[]) ctx.getResult();
for (int i = 0; i < ret.length; i++) {
if (i > 0)
sb.append(",");
sb.append(ret[i]);
}
} else {
sb.append(ctx.getResult());
}
sb.append("]").append(lineSeparator);
} else {
if (ctx.getResult() instanceof Collection) {
sb.append("┣ 结果:\t [").append(((Collection) ctx.getResult()).size()).append("]").append(lineSeparator);
} else {
sb.append("┣ 结果:\t [").append(ctx.getResult()).append("]").append(lineSeparator);
}
}
sb.append("┗━━━━━ Debug [").append(this.getSqlId(formatSql(ctx.getSqlId()))).append("] ━━━")
.append(lineSeparator);
println(sb.toString());
}
public String getShowName() {
return showName;
}
public void setShowName(String showName) {
this.showName = showName;
}
}
//package com.ibeetl.admin.core.conf;
//
//import org.beetl.sql.clazz.kit.JavaType;
//import org.beetl.sql.core.InterceptorContext;
//import org.beetl.sql.clazz.kit.JavaType;
//import org.beetl.sql.core.SQLManager;
//import org.beetl.sql.mapper.MapperJavaProxy;
//import org.beetl.sql.core.query.LambdaQuery;
//import org.beetl.sql.core.query.Query;
//import org.beetl.sql.ext.DebugInterceptor;
//import org.beetl.sql.mapper.MapperJavaProxy;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
//
//import java.util.Collection;
//import java.util.ResourceBundle;
//
///**
// * SQL输出到日志
// */
//public class MyDebugInterceptor extends DebugInterceptor {
//
// static Logger logger = LoggerFactory.getLogger(MyDebugInterceptor.class);
//
// public static Boolean showBeetlsql = Boolean.parseBoolean(ResourceBundle.getBundle("application") .getString("beetl-beetlsql.dev"));
//
// private String showName;
//
// static String mapperName = MapperJavaProxy.class.getName();
// static String sqlManagerName = SQLManager.class.getName();
// static String queryClassName = Query.class.getName();
// static String lambdaQueryName = LambdaQuery.class.getName();
//
// public MyDebugInterceptor(String showName) {
// super();
// this.showName = showName;
// }
//
// @Override
// protected void println(String str) {
// String lineSeparator = System.getProperty("line.separator", "\n");
//// String lineSeparator ="";
// if(showBeetlsql){
// logger.info(lineSeparator+str);
// }else {
// System.out.println(lineSeparator+str);
// }
// }
//
// @Override
// public void before(InterceptorContext ctx) {
// String sqlId = ctx.getSqlId();
// if (this.isDebugEanble(sqlId)) {
// ctx.put("debug.time", System.currentTimeMillis());
// }
// if (this.isSimple(sqlId)) {
// return;
// }
// StringBuilder sb = new StringBuilder();
// String lineSeparator = System.getProperty("line.separator", "\n");
// sb.append("┏━━━━━ "+showName+" Debug [").append(this.getSqlId(formatSql(sqlId))).append("] ━━━").append(lineSeparator)
// .append("┣ SQL\t " + formatSql(ctx.getSql()) + lineSeparator)
// .append("┣ 参数:\t " + formatParas(ctx.getParas())).append(lineSeparator);
// RuntimeException ex = new RuntimeException();
// StackTraceElement[] traces = ex.getStackTrace();
// int index = lookBusinessCodeInTrace(traces);
// StackTraceElement bussinessCode = traces[index];
// String className = bussinessCode.getClassName();
// String mehodName = bussinessCode.getMethodName();
// int line = bussinessCode.getLineNumber();
// sb.append("┣ 位置:\t " + className + "." + mehodName + "(" + bussinessCode.getFileName() + ":" + line + ")"
// + lineSeparator);
// ctx.put("logs", sb);
// }
//
// @Override
// protected int lookBusinessCodeInTrace(StackTraceElement[] traces) {
//
// String className = getTraceClassName();
// for (int i = traces.length - 1; i >= 0; i--) {
// String name = traces[i].getClassName();
// if (className != null && className.equals(name)) {
// return i;
// } else if (name.equals(mapperName)) {
// // 越过sun jdk 代理
// int skipLine = JavaType.isJdk8() ? 3 : 2;
// return i + skipLine;
// } else if (name.equals(lambdaQueryName)) {
// return i + 1;
// } else if (name.equals(queryClassName)) {
// return i + 1;
// } else if (name.equals(sqlManagerName)) {
// return i + 1;
// }
// }
// // 不可能到这里
// throw new IllegalStateException();
//
// }
//
// @Override
// public void after(InterceptorContext ctx) {
// String sqlId = ctx.getSqlId();
// if (this.isSimple(sqlId)) {
// this.simpleOut(ctx);
// return;
// }
// long time = System.currentTimeMillis();
// long start = (Long) ctx.get("debug.time");
// String lineSeparator = System.getProperty("line.separator", "\n");
// StringBuilder sb = (StringBuilder) ctx.get("logs");
// sb.append("┣ 时间:\t " + (time - start) + "ms").append(lineSeparator);
// if (ctx.isUpdate()) {
// sb.append("┣ 更新:\t [");
// if (ctx.getResult().getClass().isArray()) {
// int[] ret = (int[]) ctx.getResult();
// for (int i = 0; i < ret.length; i++) {
// if (i > 0)
// sb.append(",");
// sb.append(ret[i]);
// }
// } else {
// sb.append(ctx.getResult());
// }
// sb.append("]").append(lineSeparator);
// } else {
// if (ctx.getResult() instanceof Collection) {
// sb.append("┣ 结果:\t [").append(((Collection) ctx.getResult()).size()).append("]").append(lineSeparator);
// } else {
// sb.append("┣ 结果:\t [").append(ctx.getResult()).append("]").append(lineSeparator);
// }
// }
// sb.append("┗━━━━━ Debug [").append(this.getSqlId(formatSql(ctx.getSqlId()))).append("] ━━━")
// .append(lineSeparator);
// println(sb.toString());
// }
//
// public String getShowName() {
// return showName;
// }
//
// public void setShowName(String showName) {
// this.showName = showName;
// }
//}

@ -1,7 +1,6 @@
package com.ibeetl.admin.core.conf;
import org.beetl.sql.core.IDAutoGen;
import org.beetl.sql.core.Interceptor;
import org.beetl.sql.core.SQLManager;
import org.beetl.sql.core.engine.SQLPlaceholderST;
import org.beetl.sql.ext.SnowflakeIDWorker;
@ -36,9 +35,9 @@ public class MyIdConfig {
@PostConstruct
@SuppressWarnings("unchecked")
public void init() {
sqlManager.setInters(new Interceptor[]{new MyDebugInterceptor("local ")});
// sqlManager.setInters(new Interceptor[]{new MyDebugInterceptor("local ")});
sqlManager.addIdAutonGen("maskAutoID", new IDAutoGen(){
sqlManager.addIdAutoGen("maskAutoID", new IDAutoGen(){
@Override
public synchronized Object nextID(String params) {

@ -1,9 +1,8 @@
package com.ibeetl.admin.core.dao;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.admin.core.entity.CoreAudit;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
/*
*

@ -1,16 +1,13 @@
package com.ibeetl.admin.core.dao;
import java.util.List;
import java.util.Map;
import com.ibeetl.admin.core.conf.DataSourceConfig;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.annotatoin.SqlStatement;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.admin.core.entity.CoreDict;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Map;
/**
* DAO
*/
@ -41,7 +38,7 @@ public interface CoreDictDao extends BaseMapper<CoreDict> {
* @param delFlag
* @return
*/
@SqlStatement(returnType = Map.class)
// @SqlStatement(returnType = Map.class)
List<Map<String, String>> findTypeList(int delFlag);

@ -1,9 +1,8 @@
package com.ibeetl.admin.core.dao;
import org.beetl.sql.core.annotatoin.Sql;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.admin.core.entity.CoreFile;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.Sql;
public interface CoreFileDao extends BaseMapper<CoreFile> {
@Sql("update core_file set biz_type=?,biz_id=? where file_batch_id=?")

@ -1,11 +1,10 @@
package com.ibeetl.admin.core.dao;
import org.beetl.sql.core.annotatoin.Param;
import org.beetl.sql.core.annotatoin.Sql;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.admin.core.entity.CoreFunction;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.Param;
import org.beetl.sql.mapper.annotation.Sql;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
@SqlResource("core.coreFunction")

@ -1,12 +1,9 @@
package com.ibeetl.admin.core.dao;
import org.beetl.sql.core.annotatoin.Param;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.annotatoin.SqlStatement;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.admin.core.entity.CoreMenu;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -1,14 +1,13 @@
package com.ibeetl.admin.core.dao;
import java.util.List;
import org.beetl.sql.core.annotatoin.Sql;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.admin.core.entity.CoreOrg;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.Sql;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;
@SqlResource("core.coreOrg")
@Repository
public interface CoreOrgDao extends BaseMapper<CoreOrg> {

@ -1,15 +1,12 @@
package com.ibeetl.admin.core.dao;
import org.beetl.sql.core.annotatoin.Param;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.admin.core.entity.CoreRole;
import java.util.List;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
@SqlResource("core.coreRole")
@Repository
public interface CoreRoleDao extends BaseMapper<CoreRole> {

@ -1,11 +1,8 @@
package com.ibeetl.admin.core.dao;
import org.beetl.sql.core.annotatoin.Param;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.annotatoin.SqlStatement;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.admin.core.entity.CoreRoleFunction;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;
@ -15,8 +12,9 @@ import java.util.List;
public interface CoreRoleFunctionDao extends BaseMapper<CoreRoleFunction> {
List<CoreRoleFunction> getRoleFunction( Long userId, Long orgId,
String code);
String code);
List<String> getRoleChildrenFunction(Long userId, Long orgId,
Long parentId);

@ -1,11 +1,8 @@
package com.ibeetl.admin.core.dao;
import org.beetl.sql.core.annotatoin.Param;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.annotatoin.SqlStatement;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.admin.core.entity.CoreRoleMenu;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -1,10 +1,8 @@
package com.ibeetl.admin.core.dao;
import org.beetl.sql.core.annotatoin.Param;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.admin.core.entity.CoreUser;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -1,10 +1,8 @@
package com.ibeetl.admin.core.dao;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.admin.core.entity.CoreUserRole;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
@SqlResource("core.coresUserRole")

@ -1,9 +1,8 @@
package com.ibeetl.admin.core.dao;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.admin.core.entity.CoreUser;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import java.util.List;

@ -1,14 +1,12 @@
package com.ibeetl.admin.core.entity;
import java.util.Date;
import javax.validation.constraints.NotNull;
import org.beetl.sql.core.annotatoin.AutoID;
import org.beetl.sql.core.annotatoin.SeqID;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.ibeetl.admin.core.util.ValidateConfig;
import org.beetl.sql.annotation.entity.AutoID;
import org.beetl.sql.annotation.entity.SeqID;
import javax.validation.constraints.NotNull;
import java.util.Date;
public class CoreAudit extends BaseEntity {

@ -1,18 +1,15 @@
package com.ibeetl.admin.core.entity;
import java.util.Date;
import javax.validation.constraints.NotNull;
import org.beetl.sql.core.annotatoin.AutoID;
import org.beetl.sql.core.annotatoin.SeqID;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonView;
import com.ibeetl.admin.core.util.ValidateConfig;
import org.beetl.sql.annotation.entity.AutoID;
import org.beetl.sql.annotation.entity.SeqID;
import org.hibernate.validator.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**
* :
* @author : TLT

@ -1,11 +1,11 @@
package com.ibeetl.admin.core.entity;
import java.util.Date;
import javax.validation.constraints.NotNull;
import org.beetl.sql.core.annotatoin.AutoID;
import org.beetl.sql.core.annotatoin.SeqID;
import com.ibeetl.admin.core.util.ValidateConfig;
import org.beetl.sql.annotation.entity.AutoID;
import org.beetl.sql.annotation.entity.SeqID;
import javax.validation.constraints.NotNull;
import java.util.Date;
/*
*

@ -1,16 +1,15 @@
package com.ibeetl.admin.core.entity;
import java.util.Date;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import org.beetl.sql.core.annotatoin.AutoID;
import org.beetl.sql.core.annotatoin.SeqID;
import org.beetl.sql.core.annotatoin.UpdateIgnore;
import com.ibeetl.admin.core.annotation.Dict;
import com.ibeetl.admin.core.util.ValidateConfig;
import com.ibeetl.admin.core.util.enums.CoreDictType;
import org.beetl.sql.annotation.entity.AutoID;
import org.beetl.sql.annotation.entity.SeqID;
import org.beetl.sql.annotation.entity.UpdateIgnore;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
public class CoreFunction extends BaseEntity {

@ -1,17 +1,15 @@
package com.ibeetl.admin.core.entity;
import java.util.Date;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import org.beetl.sql.core.annotatoin.AutoID;
import org.beetl.sql.core.annotatoin.SeqID;
import org.beetl.sql.core.annotatoin.UpdateIgnore;
import com.ibeetl.admin.core.annotation.Dict;
import com.ibeetl.admin.core.util.ValidateConfig;
import com.ibeetl.admin.core.util.enums.CoreDictType;
import org.beetl.sql.annotation.entity.AutoID;
import org.beetl.sql.annotation.entity.SeqID;
import org.beetl.sql.annotation.entity.UpdateIgnore;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**
*

@ -1,17 +1,15 @@
package com.ibeetl.admin.core.entity;
import java.util.Date;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import org.beetl.sql.core.annotatoin.AutoID;
import org.beetl.sql.core.annotatoin.SeqID;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.ibeetl.admin.core.annotation.Dict;
import com.ibeetl.admin.core.util.ValidateConfig;
import com.ibeetl.admin.core.util.enums.CoreDictType;
import org.beetl.sql.annotation.entity.AutoID;
import org.beetl.sql.annotation.entity.SeqID;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**

@ -1,16 +1,14 @@
package com.ibeetl.admin.core.entity;
import java.util.Date;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import org.beetl.sql.core.annotatoin.AutoID;
import org.beetl.sql.core.annotatoin.SeqID;
import com.ibeetl.admin.core.annotation.Dict;
import com.ibeetl.admin.core.util.ValidateConfig;
import com.ibeetl.admin.core.util.enums.CoreDictType;
import org.beetl.sql.annotation.entity.AutoID;
import org.beetl.sql.annotation.entity.SeqID;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**
*

@ -1,14 +1,12 @@
package com.ibeetl.admin.core.entity;
import java.util.Date;
import javax.validation.constraints.NotNull;
import org.beetl.sql.core.annotatoin.AutoID;
import org.beetl.sql.core.annotatoin.SeqID;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.ibeetl.admin.core.util.ValidateConfig;
import org.beetl.sql.annotation.entity.AutoID;
import org.beetl.sql.annotation.entity.SeqID;
import javax.validation.constraints.NotNull;
import java.util.Date;
/*
*

@ -1,12 +1,11 @@
package com.ibeetl.admin.core.entity;
import java.util.Date;
import javax.validation.constraints.NotNull;
import org.beetl.sql.core.annotatoin.AutoID;
import org.beetl.sql.core.annotatoin.SeqID;
import com.ibeetl.admin.core.util.ValidateConfig;
import org.beetl.sql.annotation.entity.AutoID;
import org.beetl.sql.annotation.entity.SeqID;
import javax.validation.constraints.NotNull;
import java.util.Date;
/*
*

@ -5,8 +5,8 @@ import com.ibeetl.admin.core.annotation.Dict;
import com.ibeetl.admin.core.enums.MenuEnums;
import com.ibeetl.admin.core.util.ValidateConfig;
import com.ibeetl.admin.core.util.enums.CoreDictType;
import org.beetl.sql.core.annotatoin.AutoID;
import org.beetl.sql.core.annotatoin.SeqID;
import org.beetl.sql.annotation.entity.AutoID;
import org.beetl.sql.annotation.entity.SeqID;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;

@ -1,11 +1,10 @@
package com.ibeetl.admin.core.entity;
import java.util.Date;
import org.beetl.sql.annotation.entity.AutoID;
import org.beetl.sql.annotation.entity.SeqID;
import javax.validation.constraints.NotNull;
import org.beetl.sql.core.annotatoin.AutoID;
import org.beetl.sql.core.annotatoin.SeqID;
import java.util.Date;
/*
*

@ -1,14 +1,10 @@
package com.ibeetl.admin.core.file;
import java.util.ArrayList;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ibeetl.admin.core.dao.CoreFileDao;
import com.ibeetl.admin.core.entity.CoreFile;
import java.util.List;
/**
* core_file,core_file_tag,tag
* @author TLT
@ -37,7 +33,7 @@ public class DBIndexHelper {
public void createFileItem(CoreFile file,List<FileTag> tags) {
fileDao.insert(file,true);
fileDao.insert(file);
if(tags==null||tags.isEmpty()) {
return ;
}

@ -2,8 +2,6 @@ package com.ibeetl.admin.core.gen;
import com.ibeetl.admin.core.util.beetl.VerifyForamtFunction;
import org.beetl.core.Configuration;
import org.beetl.core.Context;
import org.beetl.core.Function;
import org.beetl.core.GroupTemplate;
import org.beetl.core.resource.ClasspathResourceLoader;
@ -40,14 +38,9 @@ public abstract class BaseTarget implements Target {
cfg.build();
gt = new GroupTemplate(rs,cfg);
gt.registerFunction("verifyFormat", new VerifyForamtFunction());
gt.registerFunction("upperFirst", new Function() {
@Override
public Object call(Object[] paras, Context ctx) {
String s = (String)paras[0];
return upperFirst(s);
}
gt.registerFunction("upperFirst", (paras, ctx) -> {
String s = (String)paras[0];
return upperFirst(s);
});
} catch (IOException e) {
@ -57,12 +50,13 @@ public abstract class BaseTarget implements Target {
}
public static String upperFirst(String s) {
if (Character.isUpperCase(s.charAt(0)))
if (Character.isUpperCase(s.charAt(0))) {
return s;
else
} else {
return (new StringBuilder())
.append(Character.toUpperCase(s.charAt(0)))
.append(s.substring(1)).toString();
}
}
public GroupTemplate getGt() {

@ -57,14 +57,14 @@ public class CoreBaseService<T> {
* @param paras
* @return
*/
public <T> List<T> queryByObject(Object paras,String orderBy) {
if(!(paras instanceof TailBean)){
throw new PlatformException("指定的pojo"+paras.getClass()+" 不能获取数据字典需要继承TailBean");
}
TailBean ext = (TailBean)paras;
Class c = ext.getClass();
return (List<T>) sqlManager.template(c,paras,orderBy);
}
// public <T> List<T> queryByObject(Object paras,String orderBy) {
// if(!(paras instanceof TailBean)){
// throw new PlatformException("指定的pojo"+paras.getClass()+" 不能获取数据字典需要继承TailBean");
// }
// TailBean ext = (TailBean)paras;
// Class c = ext.getClass();
// return (List<T>) sqlManager.template(c,paras,orderBy);
// }
/**
* List
@ -89,7 +89,7 @@ public class CoreBaseService<T> {
* @return
*/
public <T> List<T> queryByObject(Class c,Object paras,String orderBy) {
return (List<T>) sqlManager.template(c,paras,orderBy);
return (List<T>) sqlManager.template(c);
}
@ -111,7 +111,7 @@ public class CoreBaseService<T> {
* @return
*/
public boolean save(T model) {
return sqlManager.insert(model,true) > 0;
return sqlManager.insert(model) > 0;
}
/**
@ -120,7 +120,7 @@ public class CoreBaseService<T> {
* @return
*/
public boolean insert(T model) {
return sqlManager.insert(model.getClass(),model,true)> 0;
return sqlManager.insert(model.getClass())> 0;
}
/**
@ -129,10 +129,11 @@ public class CoreBaseService<T> {
* @return
*/
public boolean saveBatch(List<T> list){
if(list.size()>0)
if(list.size()>0) {
return sqlManager.insertBatch(list.get(0).getClass(),list).length > 0;
else
} else {
return false;
}
}
/**
@ -149,10 +150,11 @@ public class CoreBaseService<T> {
* @return
*/
public boolean insertBatch(List<T> list, Boolean autoDbAssignKey){
if(list.size()>0)
return sqlManager.insertBatch(list.get(0).getClass(),list,autoDbAssignKey).length > 0;
else
if(list.size()>0) {
return sqlManager.insertBatch(list.get(0).getClass(),list).length > 0;
} else {
return false;
}
}
/**
@ -240,10 +242,11 @@ public class CoreBaseService<T> {
* @return
*/
public boolean updateBatch(List<T> list) {
if(list.size()>0)
if(list.size()>0) {
return sqlManager.updateByIdBatch(list).length > 0;
else
} else {
return false;
}
}
/**
@ -252,10 +255,11 @@ public class CoreBaseService<T> {
* @return
*/
public boolean updateBatchTemplate(List<T> list) {
if(list.size()>0)
if(list.size()>0) {
return sqlManager.updateBatchTemplateById(list.get(0).getClass(),list).length > 0;
else
} else {
return false;
}
}

@ -1,24 +1,22 @@
package com.ibeetl.admin.core.service;
import java.util.*;
import com.ibeetl.admin.core.entity.CoreFunction;
import com.ibeetl.admin.core.entity.CoreMenu;
import com.ibeetl.admin.core.gen.model.Attribute;
import com.ibeetl.admin.core.gen.model.Entity;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.beetl.sql.core.JavaType;
import org.beetl.sql.core.NameConversion;
import org.beetl.sql.clazz.ColDesc;
import org.beetl.sql.clazz.NameConversion;
import org.beetl.sql.clazz.TableDesc;
import org.beetl.sql.clazz.kit.JavaType;
import org.beetl.sql.core.SQLManager;
import org.beetl.sql.core.db.ClassDesc;
import org.beetl.sql.core.db.ColDesc;
import org.beetl.sql.core.db.MetadataManager;
import org.beetl.sql.core.db.TableDesc;
import org.beetl.sql.core.meta.MetadataManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ibeetl.admin.core.entity.CoreFunction;
import com.ibeetl.admin.core.entity.CoreMenu;
import com.ibeetl.admin.core.gen.model.Attribute;
import com.ibeetl.admin.core.gen.model.Entity;
import java.util.*;
/**
* entitymapperserviceconroller
@ -69,7 +67,6 @@ public class CoreCodeGenService {
if(tableDesc==null) {
return null;
}
ClassDesc classDesc = tableDesc .getClassDesc(nc);
Entity e = new Entity();
e.setName(nc.getClassName(table));
e.setComment(tableDesc.getRemark());
@ -84,7 +81,6 @@ public class CoreCodeGenService {
if(tableDesc==null) {
return null;
}
ClassDesc classDesc = tableDesc .getClassDesc(nc);
Entity e = new Entity();
e.setName(nc.getClassName(table));
e.setComment(tableDesc.getRemark());
@ -104,8 +100,8 @@ public class CoreCodeGenService {
attr.setId(true);
e.setIdAttribute(attr);
}
attr.setComment(desc.remark);
String type = JavaType.getType(desc.sqlType, desc.size, desc.digit);
attr.setComment(desc.getRemark());
String type = JavaType.getType(desc.getSqlType(), desc.getSize(), desc.getDigit());
if(type.equals("Double")){
type = "BigDecimal";
}
@ -136,7 +132,7 @@ public class CoreCodeGenService {
query.setCode(indexFunctonCode);
Object o = sqlManager.templateOne(query);
if(o != null){
return -1l;
return -1L;
}
//设置父功能点
@ -146,7 +142,7 @@ public class CoreCodeGenService {
rootFunction.setCreateTime(new Date());
rootFunction.setParentId(0L);
rootFunction.setType("FN0");
sqlManager.insert(rootFunction,true);
sqlManager.insert(rootFunction);
Long parentId =rootFunction.getId();
//设置曾删改查功能点
@ -158,7 +154,7 @@ public class CoreCodeGenService {
indexFunction.setAccessUrl("/"+data.getSystem()+"/"+data.getCode()+"/index.do");
//设置为查询功能
indexFunction.setType("FN1");
sqlManager.insert(indexFunction,true);
sqlManager.insert(indexFunction);
CoreFunction upateFunction = new CoreFunction();
@ -168,7 +164,7 @@ public class CoreCodeGenService {
upateFunction.setCreateTime(new Date());
upateFunction.setParentId(parentId);
upateFunction.setType("FN0");
sqlManager.insert(upateFunction,true);
sqlManager.insert(upateFunction);
CoreFunction addFunction = new CoreFunction();
String addFunctionCode = functionCode+".add";
@ -177,7 +173,7 @@ public class CoreCodeGenService {
addFunction.setCreateTime(new Date());
addFunction.setParentId(parentId);
addFunction.setType("FN0");
sqlManager.insert(addFunction,true);
sqlManager.insert(addFunction);
CoreFunction delFunction = new CoreFunction();
@ -187,7 +183,7 @@ public class CoreCodeGenService {
delFunction.setCreateTime(new Date());
delFunction.setParentId(parentId);
delFunction.setType("FN0");
sqlManager.insert(delFunction,true);
sqlManager.insert(delFunction);
//刷新缓存
platformService.clearFunctionCache();

@ -10,7 +10,7 @@ import com.ibeetl.admin.core.util.*;
import com.ibeetl.admin.core.util.beetl.*;
import com.ibeetl.admin.core.util.enums.DelFlagEnum;
import org.apache.commons.lang3.StringUtils;
import org.beetl.sql.core.SQLManager;
import org.beetl.core.GroupTemplate;
import org.beetl.sql.core.engine.SQLPlaceholderST;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
@ -18,6 +18,7 @@ import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@ -61,14 +62,14 @@ public class CorePlatformService {
public static final String ACCESS_SUPPER_ADMIN = "admin";
@Autowired HttpRequestLocal httpRequestLocal;
@Autowired CoreRoleFunctionDao roleFunctionDao;
@Autowired CoreRoleMenuDao sysRoleMenuDao;
@Resource
CoreRoleMenuDao sysRoleMenuDao;
@Autowired CoreOrgDao sysOrgDao;
@Autowired CoreRoleFunctionDao sysRoleFunctionDao;
@Autowired CoreMenuDao sysMenuDao;
@Autowired CoreUserDao sysUserDao;
@Autowired CoreFunctionDao sysFunctionDao;
@Autowired SQLManager sqlManager;
@Autowired GroupTemplate groupTemplate;
@Autowired DataAccessFunction dataAccessFunction;
@Autowired CorePlatformService self;
@Autowired DataAccessFactory dataAccessFactory;
@ -85,23 +86,23 @@ public class CorePlatformService {
public void init() {
SQLPlaceholderST.textFunList.add("function");
//sql语句里带有此函数来判断数据权限
sqlManager.getBeetl().getGroupTemplate().registerFunction("function", dataAccessFunction);
groupTemplate.registerFunction("function", dataAccessFunction);
//明天
sqlManager.getBeetl().getGroupTemplate().registerFunction("nextDay", new NextDayFunction());
groupTemplate.registerFunction("nextDay", new NextDayFunction());
//跳转路径配置
sqlManager.getBeetl().getGroupTemplate().registerFunction("getUrl", urlFunction);
groupTemplate.registerFunction("getUrl", urlFunction);
//默认ID到100的辅助表 用于分割循环
sqlManager.getBeetl().getGroupTemplate().registerFunction("numTable", numFunction);
groupTemplate.registerFunction("numTable", numFunction);
//数据库名配置
sqlManager.getBeetl().getGroupTemplate().registerFunction("getDataTableName", dataTableName);
groupTemplate.registerFunction("getDataTableName", dataTableName);
//订单过期时间配置
sqlManager.getBeetl().getGroupTemplate().registerFunction("getTimeLimit", timeLimit);
groupTemplate.registerFunction("getTimeLimit", timeLimit);
//订单评论过期天数配置
sqlManager.getBeetl().getGroupTemplate().registerFunction("getCommentLimit", commentTimeLimit);
groupTemplate.registerFunction("getCommentLimit", commentTimeLimit);
//分割判断
sqlManager.getBeetl().getGroupTemplate().registerFunction("split", splitFunction);
groupTemplate.registerFunction("split", splitFunction);
//根据操作人员的集团显示相应的会员等级
sqlManager.getBeetl().getGroupTemplate().registerFunction("rankJurisdiction", rankJurisdictionFunction);
groupTemplate.registerFunction("rankJurisdiction", rankJurisdictionFunction);
}

@ -1,6 +1,6 @@
package com.ibeetl.admin.core.util.enums;
import org.beetl.sql.core.annotatoin.EnumMapping;
import org.beetl.sql.annotation.entity.EnumMapping;
/**
* :

@ -1,6 +1,6 @@
package com.ibeetl.admin.core.util.enums;
import org.beetl.sql.core.annotatoin.EnumMapping;
import org.beetl.sql.annotation.entity.EnumMapping;
/**
* :

@ -1,6 +1,6 @@
package com.ibeetl.admin.core.util.enums;
import org.beetl.sql.core.annotatoin.EnumMapping;
import org.beetl.sql.annotation.entity.EnumMapping;
/**
* :

@ -6,8 +6,8 @@ import java.util.Map;
import ${basePackage}.entity.*;
import ${basePackage}.web.query.${entity.name}Query;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.core.engine.PageQuery;
import org.springframework.stereotype.Repository;

@ -142,7 +142,7 @@ public class ${entity.name}Service extends CoreBaseService<${entity.name}>{
}
public List<${entity.name}> getValues (Object paras){
return sqlManager.select("jlw.${entity.code}.get${entity.name}Values",${entity.name}.class,paras);
return sqlManager.select(SqlId.of("jlw.${entity.code}.get${entity.name}Values",${entity.name}.class,paras);
}
public List<${entity.name}> getValuesByQuery (${entity.name}Query ${entity.code}Query){

@ -12,10 +12,10 @@ import com.ibeetl.jlw.service.SysLogService;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.method.HandlerMethod;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.*;
import java.util.concurrent.*;
@ -28,7 +28,7 @@ import java.util.concurrent.*;
@Service
public class ActionLog {
@Autowired
@Resource
private CorePlatformService platformService;
private final Log log = LogFactory.getLog(this.getClass());

@ -2,7 +2,6 @@ package cn.jlw.web;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer;
import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
@ -28,7 +27,7 @@ public class WebApplication extends SpringBootServletInitializer implements WebA
@Bean
public ConfigurableServletWebServerFactory webServerFactory() {
TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory();
factory.addConnectorCustomizers((TomcatConnectorCustomizer) connector -> connector.setProperty("relaxedQueryChars", "|{}[]\\"));
factory.addConnectorCustomizers(connector -> connector.setProperty("relaxedQueryChars", "|{}[]\\"));
return factory;
}

@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.ApplicationMergeTeacherOpenCourse;
import com.ibeetl.jlw.web.query.ApplicationMergeTeacherOpenCourseQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -1,10 +1,9 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.jlw.entity.Attribute;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;

@ -1,10 +1,9 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.jlw.entity.AttributeGrouping;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;

@ -1,12 +1,9 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import java.util.Map;
import com.ibeetl.jlw.entity.*;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.jlw.entity.AttributeRelation;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;

@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.Competition;
import com.ibeetl.jlw.web.query.CompetitionQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -1,10 +1,9 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.jlw.entity.CompetitionNews;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;

@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.CompetitionStudents;
import com.ibeetl.jlw.web.query.CompetitionStudentsQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -1,14 +1,15 @@
package com.ibeetl.jlw.dao;
import java.math.BigDecimal;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.entity.CompetitionTaskOneQuestion;
import com.ibeetl.jlw.web.query.CompetitionTaskOneQuestionQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.math.BigDecimal;
import java.util.List;
/**
* CompetitionTaskOneQuestion Dao

@ -1,15 +1,14 @@
package com.ibeetl.jlw.dao;
import java.math.BigDecimal;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.web.query.CompetitionTaskOneQuestionQuery;
import com.ibeetl.jlw.entity.CompetitionTaskSecondQuestion;
import com.ibeetl.jlw.web.query.CompetitionTaskSecondQuestionQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* CompetitionTaskSecondQuestion Dao

@ -1,13 +1,14 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.entity.CompetitionTaskSecondQuestionStep;
import com.ibeetl.jlw.web.query.CompetitionTaskSecondQuestionStepQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* CompetitionTaskSecondQuestionStep Dao

@ -1,10 +1,9 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.jlw.entity.CompetitionTeacherEvaluation;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;

@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.CourseInfo;
import com.ibeetl.jlw.web.query.CourseInfoQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -1,10 +1,9 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.jlw.entity.CourseLabel;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;

@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.Exam;
import com.ibeetl.jlw.web.query.ExamQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -1,13 +1,14 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.entity.ExamStudents;
import com.ibeetl.jlw.web.query.ExamStudentsQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* ExamStudents Dao

@ -1,14 +1,15 @@
package com.ibeetl.jlw.dao;
import java.math.BigDecimal;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.entity.ExamTaskOneQuestion;
import com.ibeetl.jlw.web.query.ExamTaskOneQuestionQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.math.BigDecimal;
import java.util.List;
/**
* ExamTaskOneQuestion Dao

@ -1,13 +1,14 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.entity.ExamTaskSecondQuestion;
import com.ibeetl.jlw.web.query.ExamTaskSecondQuestionQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* ExamTaskSecondQuestion Dao

@ -1,13 +1,14 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.entity.ExamTaskSecondQuestionStep;
import com.ibeetl.jlw.web.query.ExamTaskSecondQuestionStepQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* ExamTaskSecondQuestionStep Dao

@ -1,13 +1,14 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.entity.ExamTaskThreeQuestion;
import com.ibeetl.jlw.web.query.ExamTaskThreeQuestionQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* ExamTaskThreeQuestion Dao

@ -1,14 +1,14 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.web.query.ExamTaskSecondQuestionStepQuery;
import com.ibeetl.jlw.entity.ExamTaskThreeQuestionStep;
import com.ibeetl.jlw.web.query.ExamTaskThreeQuestionStepQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* ExamTaskThreeQuestionStep Dao

@ -1,10 +1,9 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.jlw.entity.IpAddress;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;

@ -1,9 +1,9 @@
package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.ResourcesApplicationCourse;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;

@ -1,10 +1,9 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.jlw.entity.ResourcesApplication;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;

@ -1,15 +1,18 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.entity.CompetitionTaskSecondQuestion;
import com.ibeetl.jlw.entity.CourseInfo;
import com.ibeetl.jlw.entity.ExamTaskSecondQuestion;
import com.ibeetl.jlw.entity.ResourcesCompetition;
import com.ibeetl.jlw.web.query.CourseInfoQuery;
import com.ibeetl.jlw.web.query.ResourcesCompetitionQuery;
import com.ibeetl.jlw.web.query.ResourcesQuestionQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* ResourcesCompetition Dao

@ -1,12 +1,13 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.jlw.entity.ResourcesCompetitionStep;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* ResourcesCompetitionStep Dao

@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.ResourcesInfo;
import com.ibeetl.jlw.web.query.ResourcesInfoQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -4,9 +4,9 @@ import com.ibeetl.jlw.entity.CourseInfo;
import com.ibeetl.jlw.entity.ResourcesQuestion;
import com.ibeetl.jlw.web.query.CourseInfoQuery;
import com.ibeetl.jlw.web.query.ResourcesQuestionQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -4,8 +4,8 @@ import java.util.List;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.web.query.CourseInfoQuery;
import com.ibeetl.jlw.web.query.ResourcesTrainingQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.core.engine.PageQuery;
import org.springframework.stereotype.Repository;

@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.ResourcesTrainingStep;
import com.ibeetl.jlw.web.query.ResourcesTrainingStepQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.SchoolClass;
import com.ibeetl.jlw.web.query.SchoolClassQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.StudentClientLink;
import com.ibeetl.jlw.web.query.StudentClientLinkQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -3,9 +3,9 @@ package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.CourseInfo;
import com.ibeetl.jlw.entity.Student;
import com.ibeetl.jlw.web.query.StudentQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -1,10 +1,9 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.jlw.entity.StudentDefenceLog;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;

@ -1,9 +1,9 @@
package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.StudentDefenceLogInfo;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;

@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.StudentDefenceLogNote;
import com.ibeetl.jlw.web.query.StudentDefenceLogNoteQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -1,11 +1,9 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.web.query.StudentDirectMessagesQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.jlw.entity.StudentDirectMessages;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;

@ -1,16 +1,14 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import java.util.Map;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.entity.StudentQuestionLogAnswer;
import com.ibeetl.jlw.web.query.StudentQuestionLogAnswerQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* StudentQuestionLogAnswer Dao

@ -1,10 +1,9 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.jlw.entity.StudentQuestionLog;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;

@ -1,10 +1,9 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.jlw.entity.StudentQuestionLogInfo;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;

@ -1,9 +1,9 @@
package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.SysLog;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.Date;

@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.Teacher;
import com.ibeetl.jlw.web.query.TeacherQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.TeacherMergeApplication;
import com.ibeetl.jlw.web.query.TeacherMergeApplicationQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.TeacherMergeSchoolClass;
import com.ibeetl.jlw.web.query.TeacherMergeSchoolClassQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.TeacherOpenCourse;
import com.ibeetl.jlw.web.query.TeacherOpenCourseQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.TeacherOpenCourseMergeTeacher;
import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeTeacherQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSessionClass;
import com.ibeetl.jlw.web.query.TeacherOpenCourseScheduleSessionClassQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSession;
import com.ibeetl.jlw.web.query.TeacherOpenCourseScheduleSessionQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSessionTag;
import com.ibeetl.jlw.web.query.TeacherOpenCourseScheduleSessionTagQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao;
import com.ibeetl.jlw.entity.UniversitiesColleges;
import com.ibeetl.jlw.web.query.UniversitiesCollegesQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;

@ -1,13 +1,14 @@
package com.ibeetl.jlw.dao;
import java.util.List;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionCurriculumResources;
import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionCurriculumResourcesQuery;
import org.beetl.sql.core.annotatoin.SqlResource;
import org.beetl.sql.core.mapper.BaseMapper;
import org.beetl.sql.core.engine.PageQuery;
import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* UniversitiesCollegesJurisdictionCurriculumResources Dao

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save