KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【添加】代码生成的功能的核心代码引入

Browse Source
This commit is contained in:
zer0Black
2021-04-01 13:33:48 +08:00
parent ee3eaf8458
commit be8938f03f
54 changed files with 2854 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/interceptor/OnlineInterceptor.java
+6 -8
View File
@@ -16,14 +16,12 @@ import com.jero.common.system.util.JwtUtil;
import com.jero.common.util.SpringContextUtils;
import com.jero.common.util.oConvertUtils;
import com.jero.generater.modules.online.cgform.service.IOnlineBaseAPI;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.HandlerInterceptor;
@Slf4j
public class OnlineInterceptor implements HandlerInterceptor {
private static final Logger a = LoggerFactory.getLogger(OnlineInterceptor.class);
private IOnlineBaseAPI b;
private ISysBaseAPI sysBaseAPI;
@@ -43,12 +41,12 @@ public class OnlineInterceptor implements HandlerInterceptor {
OnlineAuth onlineAuth = (OnlineAuth) ((HandlerMethod) handler).getMethodAnnotation(OnlineAuth.class);
if (onlineAuth != null) {
a.debug("===== online 菜单访问拦截器 =====");
log.debug("===== online 菜单访问拦截器 =====");
String str1 = request.getRequestURI().substring(request.getContextPath().length());
str1 = a(str1);
String str2 = onlineAuth.value();
String str3 = str1.substring(str1.lastIndexOf(str2) + str2.length());
a.debug("拦截请求(" + request.getMethod() + ")：" + str1 + ",");
log.debug("拦截请求(" + request.getMethod() + ")：" + str1 + ",");
if ("form".equals(str2) && "DELETE".equals(request.getMethod())) {
str3 = str3.substring(0, str3.lastIndexOf("/"));
@@ -79,7 +77,7 @@ public class OnlineInterceptor implements HandlerInterceptor {
boolean bool1 = this.sysBaseAPI.hasOnlineAuth(onlineAuthDTO);
if (!bool1) {
a.info("请求无权限(" + request.getMethod() + ")：" + str1);
log.info("请求无权限(" + request.getMethod() + ")：" + str1);
a(response, str2);
return false;
}
@@ -114,7 +112,7 @@ public class OnlineInterceptor implements HandlerInterceptor {
printWriter.print(JSON.toJSON(result));
}
} catch (IOException iOException) {
a.error(iOException.getMessage());
log.error(iOException.getMessage());
} finally {
if (printWriter != null)
printWriter.close();
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java
+6 -7
View File
@@ -27,8 +27,7 @@ import com.jero.generater.modules.online.cgform.entity.OnlCgformHead;
import com.jero.generater.modules.online.cgform.service.IOnlCgformButtonService;
import com.jero.generater.modules.online.cgform.service.IOnlCgformFieldService;
import com.jero.generater.modules.online.cgform.service.IOnlCgformHeadService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -43,8 +42,8 @@ import org.springframework.web.bind.annotation.RestController;
@RestController("onlCgformAuthController")
@RequestMapping({"/online/cgform/api"})
@Slf4j
public class OnlCgformAuthController {
private static final Logger a = LoggerFactory.getLogger(OnlCgformAuthController.class);
@Autowired
private IOnlCgformFieldService onlCgformFieldService;
@@ -83,7 +82,7 @@ public class OnlCgformAuthController {
this.onlAuthDataService.save(paramOnlAuthData);
result.success("添加成功！");
} catch (Exception exception) {
a.error(exception.getMessage(), exception);
log.error(exception.getMessage(), exception);
result.error500("操作失败");
}
return result;
@@ -150,7 +149,7 @@ public class OnlCgformAuthController {
result.setResult(paramOnlAuthPage);
result.success("操作成功！");
} catch (Exception exception) {
a.error(exception.getMessage(), exception);
log.error(exception.getMessage(), exception);
result.error500("操作失败");
}
return result;
@@ -232,7 +231,7 @@ public class OnlCgformAuthController {
}
result.success("操作成功！");
} catch (Exception exception) {
a.error(exception.getMessage(), exception);
log.error(exception.getMessage(), exception);
result.error500("操作失败");
}
return result;
@@ -246,7 +245,7 @@ public class OnlCgformAuthController {
this.onlAuthPageService.switchAuthColumn(paramAuthColumnVO);
result.success("操作成功！");
} catch (Exception exception) {
a.error(exception.getMessage(), exception);
log.error(exception.getMessage(), exception);
result.error500("操作失败");
}
return result;
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformApiController.java
+33 -33
View File
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.sql.DataSource;
import com.jero.generater.modules.online.auth.service.IOnlAuthPageService;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.Workbook;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
@@ -68,8 +69,6 @@ import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.jdbc.support.incrementer.OracleSequenceMaxValueIncrementer;
@@ -89,8 +88,9 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
@RestController("onlCgformApiController")
@RequestMapping({"/online/cgform/api"})
@Slf4j
public class OnlCgformApiController {
private static final Logger a = LoggerFactory.getLogger(OnlCgformApiController.class);
@Autowired
private IOnlCgformHeadService onlCgformHeadService;
@Autowired
@@ -117,7 +117,7 @@ public class OnlCgformApiController {
String var2 = var1.getHead().getTableName();
return DbTableUtil.a(var2) ? Result.error("数据库表[" + var2 + "]已存在,请从数据库导入表单") : this.onlCgformHeadService.addAll(var1);
} catch (Exception var3) {
a.error("OnlCgformApiController.addAll()发生异常：" + var3.getMessage(), var3);
log.error("OnlCgformApiController.addAll()发生异常：" + var3.getMessage(), var3);
return Result.error("操作失败");
}
}
@@ -127,7 +127,7 @@ public class OnlCgformApiController {
try {
return this.onlCgformHeadService.editAll(var1);
} catch (Exception var3) {
a.error("OnlCgformApiController.editAll()发生异常：" + var3.getMessage(), var3);
log.error("OnlCgformApiController.editAll()发生异常：" + var3.getMessage(), var3);
return Result.error("操作失败");
}
}
@@ -177,7 +177,7 @@ public class OnlCgformApiController {
this.a(var4, var7);
var3.setResult(var7);
} catch (Exception var8) {
a.error(var8.getMessage(), var8);
log.error(var8.getMessage(), var8);
var3.error500("数据库查询失败，" + var8.getMessage());
}
@@ -319,7 +319,7 @@ public class OnlCgformApiController {
Map var3 = this.onlCgformHeadService.queryManyFormData(var1, var2);
return Result.OK(CgformUtil.b(var3));
} catch (Exception var4) {
a.error("Online表单查询异常：" + var4.getMessage(), var4);
log.error("Online表单查询异常：" + var4.getMessage(), var4);
return Result.error("查询失败，" + var4.getMessage());
}
}
@@ -330,7 +330,7 @@ public class OnlCgformApiController {
Map var3 = this.onlCgformHeadService.querySubFormData(var1, var2);
return Result.OK(CgformUtil.b(var3));
} catch (Exception var4) {
a.error("Online表单查询异常：" + var4.getMessage(), var4);
log.error("Online表单查询异常：" + var4.getMessage(), var4);
return Result.error("查询失败，" + var4.getMessage());
}
}
@@ -340,7 +340,7 @@ public class OnlCgformApiController {
try {
return Result.OK(this.onlCgformHeadService.queryManySubFormData(var1, var2));
} catch (Exception var4) {
a.error("Online表单查询异常：" + var4.getMessage(), var4);
log.error("Online表单查询异常：" + var4.getMessage(), var4);
return Result.error("查询失败，" + var4.getMessage());
}
}
@@ -364,7 +364,7 @@ public class OnlCgformApiController {
return var5;
}
} catch (Exception var6) {
a.error("Online表单查询异常，" + var6.getMessage(), var6);
log.error("Online表单查询异常，" + var6.getMessage(), var6);
return Result.error("查询失败，" + var6.getMessage());
}
}
@@ -388,7 +388,7 @@ public class OnlCgformApiController {
var4.setResult(var5);
var4.setOnlTable(var7);
} catch (Exception var8) {
a.error("OnlCgformApiController.formAdd()发生异常：", var8);
log.error("OnlCgformApiController.formAdd()发生异常：", var8);
var4.setSuccess(false);
var4.setMessage("保存失败，" + CgformUtil.a(var8));
}
@@ -410,7 +410,7 @@ public class OnlCgformApiController {
var4.setOnlTable(var3);
return var4;
} catch (Exception var5) {
a.error("OnlCgformApiController.formEdit()发生异常：" + var5.getMessage(), var5);
log.error("OnlCgformApiController.formEdit()发生异常：" + var5.getMessage(), var5);
return Result.error("修改失败，" + CgformUtil.a(var5));
}
}
@@ -463,7 +463,7 @@ public class OnlCgformApiController {
this.onlCgformFieldService.deleteAutoList("design_form_data", "online_form_data_id", var2);
}
} catch (Exception var12) {
a.error("OnlCgformApiController.formEdit()发生异常：" + var12.getMessage(), var12);
log.error("OnlCgformApiController.formEdit()发生异常：" + var12.getMessage(), var12);
return Result.error("删除失败");
}
@@ -492,7 +492,7 @@ public class OnlCgformApiController {
this.onlCgformHeadService.deleteOneTableInfo(var3.getId(), var2);
}
} catch (Exception var5) {
a.error("OnlCgformApiController.formEdit()发生异常：" + var5.getMessage(), var5);
log.error("OnlCgformApiController.formEdit()发生异常：" + var5.getMessage(), var5);
return Result.error("删除失败");
}
@@ -509,7 +509,7 @@ public class OnlCgformApiController {
List var2 = this.onlCgformFieldService.getAutoListQueryInfo(var1);
return Result.OK(var2);
} catch (Exception var3) {
a.error("OnlCgformApiController.getQueryInfo()发生异常：" + var3.getMessage(), var3);
log.error("OnlCgformApiController.getQueryInfo()发生异常：" + var3.getMessage(), var3);
return Result.error("查询失败");
}
}
@@ -519,9 +519,9 @@ public class OnlCgformApiController {
try {
long var3 = System.currentTimeMillis();
this.onlCgformHeadService.doDbSynch(var1, var2);
a.info("==同步数据库消耗时间" + (System.currentTimeMillis() - var3) + "毫秒");
log.info("==同步数据库消耗时间" + (System.currentTimeMillis() - var3) + "毫秒");
} catch (Exception var5) {
a.error(var5.getMessage(), var5);
log.error(var5.getMessage(), var5);
return Result.error("同步数据库失败，" + CgformUtil.a(var5));
}
@@ -566,7 +566,7 @@ public class OnlCgformApiController {
try {
this.onlCgformHeadService.executeEnhanceExport(var4, (List)var12);
} catch (BusinessException var31) {
a.error("导出java增强处理出错", var31.getMessage());
log.error("导出java增强处理出错", var31.getMessage());
}
List var14 = this.a(fieldList, "id");
@@ -602,13 +602,13 @@ public class OnlCgformApiController {
var33.write(var34);
var3.flushBuffer();
} catch (Exception var30) {
a.error("--通过流的方式获取文件异常--" + var30.getMessage(), var30);
log.error("--通过流的方式获取文件异常--" + var30.getMessage(), var30);
} finally {
if (var34 != null) {
try {
var34.close();
} catch (IOException var29) {
a.error(var29.getMessage(), var29);
log.error(var29.getMessage(), var29);
}
}
@@ -775,7 +775,7 @@ public class OnlCgformApiController {
var7 = "文件导入成功！";
} else {
var7 = "识别模版数据错误";
a.error(var7);
log.error(var7);
}
}
@@ -786,10 +786,10 @@ public class OnlCgformApiController {
} catch (Exception var46) {
var6.setSuccess(false);
var6.setMessage(var46.getMessage());
a.error(var46.getMessage(), var46);
log.error(var46.getMessage(), var46);
}
a.info("=====online导入数据完成,耗时:" + (System.currentTimeMillis() - var4) + "毫秒=====");
log.info("=====online导入数据完成,耗时:" + (System.currentTimeMillis() - var4) + "毫秒=====");
return var6;
}
@@ -803,7 +803,7 @@ public class OnlCgformApiController {
try {
this.onlCgformHeadService.executeCustomerButton(var4, var2, var3);
} catch (Exception var7) {
a.error(var7.getMessage(), var7);
log.error(var7.getMessage(), var7);
return Result.error("执行失败!");
}
@@ -826,7 +826,7 @@ public class OnlCgformApiController {
try {
var4 = var13.nextLongValue();
} catch (Exception var12) {
a.error(var12.getMessage(), var12);
log.error(var12.getMessage(), var12);
}
} else if (oConvertUtils.isNotEmpty(var3) && "postgres".equalsIgnoreCase(var3)) {
var7 = new PostgreSQLSequenceMaxValueIncrementer(var2, "HIBERNATE_SEQUENCE");
@@ -834,7 +834,7 @@ public class OnlCgformApiController {
try {
var4 = var7.nextLongValue();
} catch (Exception var11) {
a.error(var11.getMessage(), var11);
log.error(var11.getMessage(), var11);
}
} else {
var4 = null;
@@ -846,7 +846,7 @@ public class OnlCgformApiController {
try {
var4 = var13.nextLongValue();
} catch (Exception var10) {
a.error(var10.getMessage(), var10);
log.error(var10.getMessage(), var10);
}
} else if (oConvertUtils.isNotEmpty(var3) && "postgres".equalsIgnoreCase(var3)) {
var7 = new PostgreSQLSequenceMaxValueIncrementer(var2, var6);
@@ -854,7 +854,7 @@ public class OnlCgformApiController {
try {
var4 = var7.nextLongValue();
} catch (Exception var9) {
a.error(var9.getMessage(), var9);
log.error(var9.getMessage(), var9);
}
} else {
var4 = null;
@@ -968,7 +968,7 @@ public class OnlCgformApiController {
for(int var15 = 0; var15 < var3.size(); ++var15) {
var2.put(var9, ((Map)var3.get(var15)).get(var8));
String var12 = CgformUtil.a(var5.getTableName(), var7, var2);
a.info("-----------动态列表查询子表sql》》" + var12);
log.info("-----------动态列表查询子表sql》》" + var12);
List var13 = this.onlCgformHeadService.queryListData(var12);
ConvertUtil.a(1, var13, var7);
((Map)var3.get(var15)).put(var1, CgformUtil.d(var13));
@@ -1080,7 +1080,7 @@ public class OnlCgformApiController {
}
} else {
a.error(" fileList 不合法！！！", var1);
log.error(" fileList 不合法！！！", var1);
}
}
@@ -1121,7 +1121,7 @@ public class OnlCgformApiController {
this.a(var4, var11);
var3.setResult(var11);
} catch (Exception var12) {
a.error(var12.getMessage(), var12);
log.error(var12.getMessage(), var12);
var3.error500("数据库查询失败" + var12.getMessage());
}
@@ -1147,7 +1147,7 @@ public class OnlCgformApiController {
var3.setMessage("保存成功");
return var3;
} catch (Exception var5) {
a.error("OnlCgformApiController.formAddForDesigner()发生异常：" + var5.getMessage(), var5);
log.error("OnlCgformApiController.formAddForDesigner()发生异常：" + var5.getMessage(), var5);
return Result.error("保存失败");
}
}
@@ -1161,7 +1161,7 @@ public class OnlCgformApiController {
var2.remove("update_time");
this.onlCgformHeadService.editCrazyFormData(var1, var2);
} catch (Exception var4) {
a.error("OnlCgformApiController.formEditForDesigner()发生异常：" + var4.getMessage(), var4);
log.error("OnlCgformApiController.formEditForDesigner()发生异常：" + var4.getMessage(), var4);
return Result.error("保存失败");
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java
+5 -5
View File
@@ -12,8 +12,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.generater.modules.online.cgform.entity.OnlCgformButton;
import com.jero.generater.modules.online.cgform.service.IOnlCgformButtonService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -27,8 +26,9 @@ import org.springframework.web.bind.annotation.RestController;
@RestController("onlCgformButtonController")
@RequestMapping({"/online/cgform/button"})
@Slf4j
public class OnlCgformButtonController {
private static final Logger a = LoggerFactory.getLogger(OnlCgformButtonController.class);
@Autowired
private IOnlCgformButtonService onlCgformButtonService;
@@ -55,7 +55,7 @@ public class OnlCgformButtonController {
this.onlCgformButtonService.save(var1);
var2.success("添加成功！");
} catch (Exception var4) {
a.error(var4.getMessage(), var4);
log.error(var4.getMessage(), var4);
var2.error500("操作失败");
}
@@ -75,7 +75,7 @@ public class OnlCgformButtonController {
var2.success("添加成功！");
} catch (Exception var6) {
a.error(var6.getMessage(), var6);
log.error(var6.getMessage(), var6);
var2.error500("操作失败");
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java
+4 -4
View File
@@ -13,8 +13,7 @@ import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
import com.jero.generater.modules.online.cgform.entity.OnlCgformHead;
import com.jero.generater.modules.online.cgform.service.IOnlCgformFieldService;
import com.jero.generater.modules.online.cgform.service.IOnlCgformHeadService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -27,8 +26,9 @@ import org.springframework.web.bind.annotation.RestController;
@RestController("onlCgformFieldController")
@RequestMapping({"/online/cgform/field"})
@Slf4j
public class OnlCgformFieldController {
private static final Logger a = LoggerFactory.getLogger(OnlCgformFieldController.class);
@Autowired
private IOnlCgformHeadService onlCgformHeadService;
@Autowired
@@ -73,7 +73,7 @@ public class OnlCgformFieldController {
this.onlCgformFieldService.save(var1);
var2.success("添加成功！");
} catch (Exception var4) {
a.error(var4.getMessage(), var4);
log.error(var4.getMessage(), var4);
var2.error500("操作失败");
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java
+21 -20
View File
@@ -20,6 +20,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Properties;
import javax.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresRoles;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.enums.CgformEnum;
@@ -35,9 +37,7 @@ import com.jero.generater.modules.online.cgform.service.IOnlCgformFieldService;
import com.jero.generater.modules.online.cgform.service.IOnlCgformHeadService;
import com.jero.generater.modules.online.cgform.util.CgformUtil;
import com.jero.generater.modules.online.config.exception.DBException;
import org.jeecgframework.codegenerate.database.DbReadTableUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.jero.codegenerate.database.DbReadTableUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;
@@ -53,8 +53,9 @@ import org.springframework.web.bind.annotation.RestController;
@RestController("onlCgformHeadController")
@RequestMapping({"/online/cgform/head"})
@Slf4j
public class OnlCgformHeadController {
private static final Logger a = LoggerFactory.getLogger(OnlCgformHeadController.class);
@Autowired
private IOnlCgformHeadService onlCgformHeadService;
@Autowired
@@ -92,7 +93,7 @@ public class OnlCgformHeadController {
this.onlCgformHeadService.save(var1);
var2.success("添加成功！");
} catch (Exception var4) {
a.error(var4.getMessage(), var4);
log.error(var4.getMessage(), var4);
var2.error500("操作失败");
}
@@ -184,7 +185,7 @@ public class OnlCgformHeadController {
this.onlCgformHeadService.saveEnhance(var2);
return Result.OK("保存成功!");
} catch (Exception var4) {
a.error(var4.getMessage(), var4);
log.error(var4.getMessage(), var4);
return Result.error("保存失败!");
}
}
@@ -196,7 +197,7 @@ public class OnlCgformHeadController {
OnlCgformEnhanceJs var4 = this.onlCgformHeadService.queryEnhance(var1, var3);
return var4 == null ? Result.error("查询为空") : Result.OK(var4);
} catch (Exception var5) {
a.error(var5.getMessage(), var5);
log.error(var5.getMessage(), var5);
return Result.error("查询失败!");
}
}
@@ -208,7 +209,7 @@ public class OnlCgformHeadController {
this.onlCgformHeadService.editEnhance(var2);
return Result.OK("保存成功!");
} catch (Exception var4) {
a.error(var4.getMessage(), var4);
log.error(var4.getMessage(), var4);
return Result.error("保存失败!");
}
}
@@ -219,7 +220,7 @@ public class OnlCgformHeadController {
List var3 = this.onlCgformHeadService.queryButtonList(var1);
return var3 != null && var3.size() != 0 ? Result.OK(var3) : Result.error("查询为空");
} catch (Exception var4) {
a.error(var4.getMessage(), var4);
log.error(var4.getMessage(), var4);
return Result.error("查询失败!");
}
}
@@ -242,7 +243,7 @@ public class OnlCgformHeadController {
return Result.error("保存失败,该按钮已存在增强配置!");
}
} catch (Exception var4) {
a.error(var4.getMessage(), var4);
log.error(var4.getMessage(), var4);
return Result.error("保存失败!");
}
}
@@ -259,7 +260,7 @@ public class OnlCgformHeadController {
return Result.error("保存失败,该按钮已存在增强配置!");
}
} catch (Exception var4) {
a.error(var4.getMessage(), var4);
log.error(var4.getMessage(), var4);
return Result.error("保存失败!");
}
}
@@ -270,7 +271,7 @@ public class OnlCgformHeadController {
this.onlCgformEnhanceService.deleteEnhanceSql(var1);
return Result.OK("删除成功");
} catch (Exception var3) {
a.error(var3.getMessage(), var3);
log.error(var3.getMessage(), var3);
return Result.error("删除失败!");
}
}
@@ -282,7 +283,7 @@ public class OnlCgformHeadController {
this.onlCgformEnhanceService.deleteBatchEnhanceSql(var2);
return Result.OK("删除成功");
} catch (Exception var3) {
a.error(var3.getMessage(), var3);
log.error(var3.getMessage(), var3);
return Result.error("删除失败!");
}
}
@@ -308,7 +309,7 @@ public class OnlCgformHeadController {
}
}
} catch (Exception var4) {
a.error(var4.getMessage(), var4);
log.error(var4.getMessage(), var4);
return Result.error("保存失败!");
}
}
@@ -328,7 +329,7 @@ public class OnlCgformHeadController {
}
}
} catch (Exception var4) {
a.error(var4.getMessage(), var4);
log.error(var4.getMessage(), var4);
return Result.error("保存失败!");
}
}
@@ -339,7 +340,7 @@ public class OnlCgformHeadController {
this.onlCgformEnhanceService.deleteEnhanceJava(var1);
return Result.OK("删除成功");
} catch (Exception var3) {
a.error(var3.getMessage(), var3);
log.error(var3.getMessage(), var3);
return Result.error("删除失败!");
}
}
@@ -351,7 +352,7 @@ public class OnlCgformHeadController {
this.onlCgformEnhanceService.deleteBatchEnhanceJava(var2);
return Result.OK("删除成功");
} catch (Exception var3) {
a.error(var3.getMessage(), var3);
log.error(var3.getMessage(), var3);
return Result.error("删除失败!");
}
}
@@ -368,7 +369,7 @@ public class OnlCgformHeadController {
try {
var6 = DbReadTableUtil.a();
} catch (SQLException var12) {
a.error(var12.getMessage(), var12);
log.error(var12.getMessage(), var12);
return Result.error("同步失败，未获取数据库表信息");
}
@@ -411,7 +412,7 @@ public class OnlCgformHeadController {
if (oConvertUtils.isNotEmpty(var4[var5])) {
int var6 = this.onlCgformHeadService.count((Wrapper)(new LambdaQueryWrapper<OnlCgformHead>()).eq(OnlCgformHead::getTableName, var4[var5]));
if (var6 <= 0) {
a.info("[IP] [online数据库导入表] --表名：" + var4[var5]);
log.info("[IP] [online数据库导入表] --表名：" + var4[var5]);
this.onlCgformHeadService.saveDbTable2Online(var4[var5]);
}
}
@@ -526,7 +527,7 @@ public class OnlCgformHeadController {
List var14 = CgformEnum.getJspModelList(var13);
var3.put("jspModeList", var14);
var3.put("projectPath", org.jeecgframework.codegenerate.a.a.m());
var3.put("projectPath", com.jero.codegenerate.properties.CodeConfigProperties.m());
return Result.OK(var3);
}
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java
+4 -4
View File
@@ -11,8 +11,7 @@ import com.jero.common.constant.CommonConstant;
import com.jero.common.system.query.QueryGenerator;
import com.jero.generater.modules.online.cgform.entity.OnlCgformIndex;
import com.jero.generater.modules.online.cgform.service.IOnlCgformIndexService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -25,8 +24,9 @@ import org.springframework.web.bind.annotation.RestController;
@RestController("onlCgformIndexController")
@RequestMapping({"/online/cgform/index"})
@Slf4j
public class OnlCgformIndexController {
private static final Logger a = LoggerFactory.getLogger(OnlCgformIndexController.class);
@Autowired
private IOnlCgformIndexService onlCgformIndexService;
@@ -62,7 +62,7 @@ public class OnlCgformIndexController {
this.onlCgformIndexService.save(var1);
var2.success("添加成功！");
} catch (Exception var4) {
a.error(var4.getMessage(), var4);
log.error(var4.getMessage(), var4);
var2.error500("操作失败");
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/converter/ConvertFactory.java
+5 -5
View File
@@ -18,11 +18,11 @@ import com.jero.generater.modules.online.cgform.converter.convertImpl.SwitchConv
import com.jero.generater.modules.online.cgform.converter.convertImpl.TreeSelectConverter;
import com.jero.generater.modules.online.cgform.converter.convertImpl.UserSelectConverter;
import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
@Slf4j
public class ConvertFactory {
private static final Logger a = LoggerFactory.getLogger(ConvertFactory.class);
private static final String b = "list";
private static final String c = "radio";
private static final String d = "checkbox";
@@ -172,9 +172,9 @@ public class ConvertFactory {
try {
var1 = MyClassLoader.getClassByScn(var0).newInstance();
} catch (InstantiationException var3) {
a.error(var3.getMessage(), var3);
log.error(var3.getMessage(), var3);
} catch (IllegalAccessException var4) {
a.error(var4.getMessage(), var4);
log.error(var4.getMessage(), var4);
}
} else {
var1 = SpringContextUtils.getBean(var0);
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/enhance/demo/CgformEnhanceBeanDemo.java
+5 -6
View File
@@ -4,21 +4,20 @@ import com.alibaba.fastjson.JSONObject;
import java.util.Map;
import com.jero.generater.modules.online.cgform.enhance.CgformEnhanceJavaInter;
import com.jero.generater.modules.online.config.exception.BusinessException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@Slf4j
@Component("cgformEnhanceBeanDemo")
public class CgformEnhanceBeanDemo implements CgformEnhanceJavaInter {
private static final Logger a = LoggerFactory.getLogger(CgformEnhanceBeanDemo.class);
public CgformEnhanceBeanDemo() {
}
public int execute(String tableName, JSONObject json) throws BusinessException {
a.info("--------我是自定义java增强测试bean-----------");
a.info("--------当前表单 tableName=> " + tableName);
a.info("--------当前表单 JSON数据=> " + json.toJSONString());
log.info("--------我是自定义java增强测试bean-----------");
log.info("--------当前表单 tableName=> " + tableName);
log.info("--------当前表单 JSON数据=> " + json.toJSONString());
if (json.containsKey("phone")) {
json.put("phone", "18611100000");
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/enhance/demo/CgformEnhanceImportDemo.java
+8 -9
View File
@@ -6,35 +6,34 @@ import java.util.Map;
import com.jero.common.util.oConvertUtils;
import com.jero.generater.modules.online.cgform.enhance.CgformEnhanceJavaInter;
import com.jero.generater.modules.online.config.exception.BusinessException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@Slf4j
@Component("cgformEnhanceImportDemo")
public class CgformEnhanceImportDemo implements CgformEnhanceJavaInter {
private static final Logger a = LoggerFactory.getLogger(CgformEnhanceImportDemo.class);
public CgformEnhanceImportDemo() {
}
public int execute(String tableName, JSONObject json) throws BusinessException {
a.info("--------当前tableName=>" + tableName);
a.info("===============================================================================================================");
a.info("--------导入JSON数据=>" + json.toJSONString());
log.info("--------当前tableName=>" + tableName);
log.info("===============================================================================================================");
log.info("--------导入JSON数据=>" + json.toJSONString());
if (oConvertUtils.isEmpty(json.get("name"))) {
a.info("-----变更导入数据，直接返回1----");
log.info("-----变更导入数据，直接返回1----");
json.put("name", "默认值");
return 1;
} else if (json.getString("name").equals("error")) {
json.put("name", "默认值");
throw new BusinessException("测试抛出异常error");
} else if (json.getString("name").equals("hello")) {
a.info("-----导入数据变更新，直接返回2----");
log.info("-----导入数据变更新，直接返回2----");
json.put("id", "testid123");
json.put("name", "JAVA导入增强 测试修改");
return 2;
} else if (json.getString("name").equals("ok")) {
a.info("-----丢弃导入数据，直接返回0----");
log.info("-----丢弃导入数据，直接返回0----");
return 0;
} else {
return 1;
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/enhance/demo/CgformEnhanceJavaDemo.java
+5 -6
View File
@@ -5,21 +5,20 @@ import com.alibaba.fastjson.JSONObject;
import java.util.Map;
import com.jero.generater.modules.online.cgform.enhance.CgformEnhanceJavaInter;
import com.jero.generater.modules.online.config.exception.BusinessException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@Slf4j
@Component("cgformEnhanceJavaDemo")
public class CgformEnhanceJavaDemo implements CgformEnhanceJavaInter {
private static final Logger a = LoggerFactory.getLogger(CgformEnhanceJavaDemo.class);
public CgformEnhanceJavaDemo() {
}
public int execute(String tableName, JSONObject json) throws BusinessException {
a.info("----------我是自定义java增强测试demo类-----------");
a.info("--------当前tableName=>" + tableName);
a.info("--------当前JSON数据=>" + json.toJSONString());
log.info("----------我是自定义java增强测试demo类-----------");
log.info("--------当前tableName=>" + tableName);
log.info("--------当前JSON数据=>" + json.toJSONString());
return 1;
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java
+8 -8
View File
@@ -17,6 +17,7 @@ import java.util.Map;
import com.jero.common.system.util.JeroDataAutorUtils;
import com.jero.generater.modules.online.auth.mapper.OnlAuthDataMapper;
import com.jero.generater.modules.online.auth.service.IOnlAuthPageService;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.LoginUser;
@@ -29,15 +30,14 @@ import com.jero.generater.modules.online.cgform.mapper.OnlCgformHeadMapper;
import com.jero.generater.modules.online.cgform.model.TreeModel;
import com.jero.generater.modules.online.cgform.service.IOnlCgformFieldService;
import com.jero.generater.modules.online.cgform.util.CgformUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Slf4j
@Service("onlCgformFieldServiceImpl")
public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper, OnlCgformField> implements IOnlCgformFieldService {
private static final Logger a = LoggerFactory.getLogger(OnlCgformFieldServiceImpl.class);
@Autowired
private OnlCgformFieldMapper onlCgformFieldMapper;
@Autowired
@@ -90,7 +90,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
Integer var20 = params.get("pageSize") == null ? 10 : Integer.parseInt(params.get("pageSize").toString());
if (var20 == -521) {
List var21 = this.onlCgformFieldMapper.queryListBySql(var9.toString());
a.debug("---Online查询sql 不分页 :>>" + var9.toString());
log.debug("---Online查询sql 不分页 :>>" + var9.toString());
if (var21 != null && var21.size() != 0) {
var5.put("total", var21.size());
var5.put("fieldList", var8);
@@ -102,7 +102,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
} else {
Integer var22 = params.get("pageNo") == null ? 1 : Integer.parseInt(params.get("pageNo").toString());
Page var18 = new Page((long)var22, (long)var20);
a.debug("---Online查询sql:>>" + var9.toString());
log.debug("---Online查询sql:>>" + var9.toString());
IPage var19 = this.onlCgformFieldMapper.selectPageBySql(var18, var9.toString());
var5.put("total", var19.getTotal());
var5.put("records", CgformUtil.d(var19.getRecords()));
@@ -170,7 +170,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
}
}
a.debug("---Online查询sql 不分页 :>>" + var10.toString());
log.debug("---Online查询sql 不分页 :>>" + var10.toString());
if (var25 != null && ((List)var25).size() != 0) {
var6.put("total", ((List)var25).size());
var6.put("fieldList", var9);
@@ -182,7 +182,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
} else {
Integer var26 = params.get("pageNo") == null ? 1 : Integer.parseInt(params.get("pageNo").toString());
Page var27 = new Page((long)var26, (long)var24);
a.debug("---Online查询sql:>>" + var10.toString());
log.debug("---Online查询sql:>>" + var10.toString());
IPage var28 = this.onlCgformFieldMapper.selectPageBySql(var27, var10.toString());
var6.put("total", var28.getTotal());
var6.put("records", CgformUtil.d(var28.getRecords()));
@@ -429,7 +429,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
String var10 = var5.toString();
String var11 = "DELETE FROM " + CgformUtil.f(tbname) + " where " + linkField + " in(" + var10.substring(0, var10.length() - 1) + ")";
a.debug("--删除sql-->" + var11);
log.debug("--删除sql-->" + var11);
this.onlCgformFieldMapper.deleteAutoList(var11);
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java
+24 -23
View File
@@ -21,6 +21,8 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import org.hibernate.HibernateException;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
@@ -58,15 +60,13 @@ import com.jero.generater.modules.online.config.util.DbTableUtil;
import com.jero.generater.modules.online.config.exception.BusinessException;
import com.jero.generater.modules.online.config.exception.DBException;
import com.jero.generater.modules.online.config.service.DbTableHandleI;
import org.jeecgframework.codegenerate.database.DbReadTableUtil;
import org.jeecgframework.codegenerate.generate.impl.CodeGenerateOne;
import org.jeecgframework.codegenerate.generate.impl.CodeGenerateOneToMany;
import org.jeecgframework.codegenerate.generate.pojo.ColumnVo;
import org.jeecgframework.codegenerate.generate.pojo.TableVo;
import org.jeecgframework.codegenerate.generate.pojo.onetomany.MainTableVo;
import org.jeecgframework.codegenerate.generate.pojo.onetomany.SubTableVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.jero.codegenerate.database.DbReadTableUtil;
import com.jero.codegenerate.generate.impl.CodeGenerateOne;
import com.jero.codegenerate.generate.impl.CodeGenerateOneToMany;
import com.jero.codegenerate.generate.pojo.ColumnVo;
import com.jero.codegenerate.generate.pojo.TableVo;
import com.jero.codegenerate.generate.pojo.onetomany.MainTableVo;
import com.jero.codegenerate.generate.pojo.onetomany.SubTableVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -74,9 +74,10 @@ import org.springframework.http.MediaType;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Slf4j
@Service("onlCgformHeadServiceImpl")
public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, OnlCgformHead> implements IOnlCgformHeadService {
private static final Logger a = LoggerFactory.getLogger(OnlCgformHeadServiceImpl.class);
@Autowired
private IOnlCgformFieldService fieldService;
@Autowired
@@ -295,7 +296,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
if ("normal".equals(synMethod)) {
long var8 = System.currentTimeMillis();
boolean var10 = DbTableUtil.a(var4);
a.info("==判断表是否存在消耗时间" + (System.currentTimeMillis() - var8) + "毫秒");
log.info("==判断表是否存在消耗时间" + (System.currentTimeMillis() - var8) + "毫秒");
if (var10) {
DbTableProcess var11 = new DbTableProcess();
List var12 = var11.b(var7);
@@ -327,13 +328,13 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
String var17 = var11.a(var15.getIndexName(), var4);
try {
a.info("删除索引 executeDDL:" + var17);
log.info("删除索引 executeDDL:" + var17);
((OnlCgformHeadMapper)this.baseMapper).executeDDL(var17);
if (CommonConstant.DEL_FLAG_1.equals(var15.getDelFlag())) {
this.indexService.removeById(var15.getId());
}
} catch (Exception var19) {
a.error("删除表【" + var4 + "】索引(" + var15.getIndexName() + ")失败!", var19);
log.error("删除表【" + var4 + "】索引(" + var15.getIndexName() + ")失败!", var19);
}
} else if (CommonConstant.DEL_FLAG_1.equals(var15.getDelFlag())) {
this.indexService.removeById(var15.getId());
@@ -366,10 +367,10 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
} else {
long var3 = System.currentTimeMillis();
boolean var5 = DbTableUtil.a(var2.getTableName());
a.info("==判断表是否存在消耗时间 " + (System.currentTimeMillis() - var3) + "毫秒");
log.info("==判断表是否存在消耗时间 " + (System.currentTimeMillis() - var3) + "毫秒");
if (var5) {
String var6 = DbTableUtil.getTableHandle().dropTableSQL(var2.getTableName());
a.info(" 删除表 executeDDL： " + var6);
log.info(" 删除表 executeDDL： " + var6);
((OnlCgformHeadMapper)this.baseMapper).executeDDL(var6);
}
@@ -506,7 +507,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
for(int var6 = 0; var6 < var5.size(); ++var6) {
ColumnVo var7 = (ColumnVo)var5.get(var6);
a.info(" columnt : " + var7.toString());
log.info(" columnt : " + var7.toString());
String var8 = var7.getFieldDbName();
OnlCgformField var9 = new OnlCgformField();
var9.setCgformHeadId(var3);
@@ -590,7 +591,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
try {
var9.setDbLength(Integer.valueOf(var7.getCharmaxLength()));
} catch (Exception var12) {
a.error(var12.getMessage(), var12);
log.error(var12.getMessage(), var12);
}
} else {
var9.setDbLength(Integer.valueOf(var7.getCharmaxLength()));
@@ -619,7 +620,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
var4.add(var9);
}
} catch (Exception var13) {
a.error(var13.getMessage(), var13);
log.error(var13.getMessage(), var13);
}
if (oConvertUtils.isEmpty(var2.getFormCategory())) {
@@ -775,10 +776,10 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
JSONObject var25 = (JSONObject)RestUtil.request(var24, HttpMethod.POST, var22, (JSONObject)null, var23, JSONObject.class).getBody();
if (var25 != null) {
String var26 = var25.getString("result");
a.info("保存流程草稿 dataId : " + var26);
log.info("保存流程草稿 dataId : " + var26);
}
} catch (Exception var21) {
a.error("保存流程草稿异常, " + var21.getMessage(), var21);
log.error("保存流程草稿异常, " + var21.getMessage(), var21);
}
}
@@ -1031,9 +1032,9 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
try {
var4 = MyClassLoader.getClassByScn(var3).newInstance();
} catch (InstantiationException var6) {
a.error(var6.getMessage(), var6);
log.error(var6.getMessage(), var6);
} catch (IllegalAccessException var7) {
a.error(var7.getMessage(), var7);
log.error(var7.getMessage(), var7);
}
} else if ("spring".equals(var2)) {
var4 = SpringContextUtils.getBean(var3);
@@ -1060,7 +1061,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
for(int var10 = 0; var10 < var9; ++var10) {
String var11 = var8[var10];
if (var11 != null && !var11.toLowerCase().trim().equals("")) {
a.info(" online sql 增强： " + var11);
log.info(" online sql 增强： " + var11);
((OnlCgformHeadMapper)this.baseMapper).executeDDL(var11);
}
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformIndexServiceImpl.java
+4 -4
View File
@@ -11,14 +11,14 @@ import com.jero.generater.modules.online.cgform.entity.OnlCgformIndex;
import com.jero.generater.modules.online.cgform.mapper.OnlCgformHeadMapper;
import com.jero.generater.modules.online.cgform.mapper.OnlCgformIndexMapper;
import com.jero.generater.modules.online.cgform.service.IOnlCgformIndexService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Slf4j
@Service("onlCgformIndexServiceImpl")
public class OnlCgformIndexServiceImpl extends ServiceImpl<OnlCgformIndexMapper, OnlCgformIndex> implements IOnlCgformIndexService {
private static final Logger a = LoggerFactory.getLogger(OnlCgformIndexServiceImpl.class);
@Autowired
private OnlCgformHeadMapper onlCgformHeadMapper;
@@ -79,7 +79,7 @@ public class OnlCgformIndexServiceImpl extends ServiceImpl<OnlCgformIndexMapper,
var8 = "create " + var11 + var9 + " on " + tbname + "(" + var10 + ")";
}
a.info(" 创建索引 executeDDL ：" + var8);
log.info(" 创建索引 executeDDL ：" + var8);
this.onlCgformHeadMapper.executeDDL(var8);
var7.setIsDbSynch("Y");
this.updateById(var7);
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/CgformUtil.java
+17 -16
View File
@@ -27,6 +27,8 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import com.jero.common.exception.JeroBootException;
@@ -67,11 +69,10 @@ import com.jero.generater.modules.online.cgform.service.IOnlCgformFieldService;
import com.jero.generater.modules.online.config.util.DbTableUtil;
import com.jero.generater.modules.online.config.exception.DBException;
import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Slf4j
public class CgformUtil {
private static final Logger aw = LoggerFactory.getLogger(CgformUtil.class);
public static final String a = "SELECT ";
public static final String b = " FROM ";
public static final String c = " AND ";
@@ -799,7 +800,7 @@ public class CgformUtil {
OnlCgformField var12 = (OnlCgformField)var11.next();
String var13 = var12.getDbFieldName();
if (null == var13) {
aw.info("--------online保存表单数据遇见空名称的字段------->>" + var12.getId());
log.info("--------online保存表单数据遇见空名称的字段------->>" + var12.getId());
} else if ("id".equals(var13.toLowerCase())) {
var7 = true;
var8 = var2.getString(var13);
@@ -848,7 +849,7 @@ public class CgformUtil {
String var17 = "insert into " + f(var0) + "(" + "id" + var3.toString() + ") values(" + "'" + var8 + "'" + var4.toString() + ")";
var6.put("execute_sql_string", var17);
aw.info("--动态表单保存sql-->" + var17);
log.info("--动态表单保存sql-->" + var17);
return var6;
}
}
@@ -879,7 +880,7 @@ public class CgformUtil {
OnlCgformField var9 = (OnlCgformField)var8.next();
String var10 = var9.getDbFieldName();
if (null == var10) {
aw.info("--------online修改表单数据遇见空名称的字段------->>" + var9.getId());
log.info("--------online修改表单数据遇见空名称的字段------->>" + var9.getId());
} else {
a(var9, var6, var2, "UPDATE_BY", "UPDATE_TIME");
String var11;
@@ -908,7 +909,7 @@ public class CgformUtil {
}
String var15 = "update " + f(var0) + " set " + var14 + " where " + "id" + "=" + "'" + var2.getString("id") + "'";
aw.info("--动态表单编辑sql-->" + var15);
log.info("--动态表单编辑sql-->" + var15);
var4.put("execute_sql_string", var15);
return var4;
}
@@ -1140,7 +1141,7 @@ public class CgformUtil {
}
}
} catch (Exception var4) {
aw.error(var4.getMessage(), var4);
log.error(var4.getMessage(), var4);
return false;
}
}
@@ -1267,7 +1268,7 @@ public class CgformUtil {
var4.append(" AND " + var2 + "=" + var7);
break;
default:
aw.info("--查询规则未匹配到---");
log.info("--查询规则未匹配到---");
}
}
@@ -1401,7 +1402,7 @@ public class CgformUtil {
}
public static String d(String var0) {
aw.info("最终的增强JS", var0);
log.info("最终的增强JS", var0);
return "class OnlineEnhanceJs{constructor(getAction,postAction,deleteAction){this._getAction=getAction;this._postAction=postAction;this._deleteAction=deleteAction;}" + var0 + "}";
}
@@ -1724,7 +1725,7 @@ public class CgformUtil {
OnlCgformField var11 = (OnlCgformField)var10.next();
String var12 = var11.getDbFieldName();
if (null == var12) {
aw.info("--------online保存表单数据遇见空名称的字段------->>" + var11.getId());
log.info("--------online保存表单数据遇见空名称的字段------->>" + var11.getId());
} else if (var2.get(var12) != null || "CREATE_BY".equalsIgnoreCase(var12) || "CREATE_TIME".equalsIgnoreCase(var12) || "SYS_ORG_CODE".equalsIgnoreCase(var12)) {
a(var11, var9, var2, "CREATE_BY", "CREATE_TIME", "SYS_ORG_CODE");
String var13;
@@ -1752,7 +1753,7 @@ public class CgformUtil {
String var16 = "insert into " + f(var0) + "(" + "id" + var3.toString() + ") values(" + "'" + var8 + "'" + var4.toString() + ")";
var6.put("execute_sql_string", var16);
aw.info("--表单设计器表单保存sql-->" + var16);
log.info("--表单设计器表单保存sql-->" + var16);
return var6;
}
}
@@ -1782,7 +1783,7 @@ public class CgformUtil {
OnlCgformField var8 = (OnlCgformField)var7.next();
String var9 = var8.getDbFieldName();
if (null == var9) {
aw.info("--------online修改表单数据遇见空名称的字段------->>" + var8.getId());
log.info("--------online修改表单数据遇见空名称的字段------->>" + var8.getId());
} else if (!"id".equals(var9) && (var2.get(var9) != null || "UPDATE_BY".equalsIgnoreCase(var9) || "UPDATE_TIME".equalsIgnoreCase(var9) || "SYS_ORG_CODE".equalsIgnoreCase(var9))) {
a(var8, var6, var2, "UPDATE_BY", "UPDATE_TIME", "SYS_ORG_CODE");
String var10;
@@ -1804,7 +1805,7 @@ public class CgformUtil {
}
String var14 = "update " + f(var0) + " set " + var13 + " where " + "id" + "=" + "'" + var2.getString("id") + "'";
aw.info("--表单设计器表单编辑sql-->" + var14);
log.info("--表单设计器表单编辑sql-->" + var14);
var4.put("execute_sql_string", var14);
return var4;
}
@@ -1814,7 +1815,7 @@ public class CgformUtil {
public static Map<String, Object> a(String var0, String var1, String var2) {
HashMap var3 = new HashMap();
String var4 = "update " + f(var0) + " set " + var1 + "=" + "'" + 0 + "'" + " where " + "id" + "=" + "'" + var2 + "'";
aw.info("--修改树节点状态：为无子节点sql-->" + var4);
log.info("--修改树节点状态：为无子节点sql-->" + var4);
var3.put("execute_sql_string", var4);
return var3;
}
@@ -1998,7 +1999,7 @@ public class CgformUtil {
var2 = var2 + "'%" + var3[var4] + "%" + "'";
}
aw.info(" POPUP fieldSql: " + var2);
log.info(" POPUP fieldSql: " + var2);
return var2;
} else {
return var2;
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/EnhanceJsUtil.java
+11 -12
View File
@@ -10,11 +10,10 @@ import com.jero.common.util.oConvertUtils;
import com.jero.generater.modules.online.cgform.entity.OnlCgformButton;
import com.jero.generater.modules.online.cgform.entity.OnlCgformEnhanceJs;
import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
@Slf4j
public class EnhanceJsUtil {
private static final Logger a = LoggerFactory.getLogger(EnhanceJsUtil.class);
private static final String b = "beforeSubmit,beforeAdd,beforeEdit,afterAdd,afterEdit,beforeDelete,afterDelete,mounted,created,show,loaded";
private static final String c = "\\}\\s*\r*\n*\\s*";
private static final String d = ",";
@@ -82,7 +81,7 @@ public class EnhanceJsUtil {
}
public static String a(String var0, List<OnlCgformButton> var1) {
a.info("最终的增强JS", var0);
log.info("最终的增强JS", var0);
return "class OnlineEnhanceJs{constructor(getAction,postAction,deleteAction){this._getAction=getAction;this._postAction=postAction;this._deleteAction=deleteAction;}" + var0 + "}";
}
@@ -101,14 +100,14 @@ public class EnhanceJsUtil {
public static String a(String var0) {
String var1 = "function OnlineEnhanceJs(getAction,postAction,deleteAction){return {_getAction:getAction,_postAction:postAction,_deleteAction:deleteAction," + var0 + "}}";
a.info("最终的增强JS", var1);
log.info("最终的增强JS", var1);
return var1;
}
public static String b(String var0, List<OnlCgformButton> var1) {
var0 = c(var0, var1);
String var2 = "function OnlineEnhanceJs(getAction,postAction,deleteAction){return {_getAction:getAction,_postAction:postAction,_deleteAction:deleteAction," + var0 + "}}";
a.info("最终的增强JS", var2);
log.info("最终的增强JS", var2);
return var2;
}
@@ -152,11 +151,11 @@ public class EnhanceJsUtil {
public static void a(OnlCgformEnhanceJs var0, String var1, List<OnlCgformField> var2) {
if (var0 != null && !oConvertUtils.isEmpty(var0.getCgJs())) {
String var3 = " " + var0.getCgJs();
a.debug("one enhanceJs begin==> " + var3);
log.debug("one enhanceJs begin==> " + var3);
Pattern var4 = Pattern.compile("(\\s{1}onlChange\\s*\\(\\)\\s*\\{)");
Matcher var5 = var4.matcher(var3);
if (var5.find()) {
a.debug("---JS 增强转换-main--enhanceJsFunctionName----onlChange");
log.debug("---JS 增强转换-main--enhanceJsFunctionName----onlChange");
var3 = a(var3, "onlChange", "\\s{1}");
OnlCgformField var7;
@@ -165,20 +164,20 @@ public class EnhanceJsUtil {
}
}
a.debug("one enhanceJs end==> " + var3);
log.debug("one enhanceJs end==> " + var3);
var0.setCgJs(var3);
}
}
public static void b(OnlCgformEnhanceJs var0, String var1, List<OnlCgformField> var2) {
if (var0 != null && !oConvertUtils.isEmpty(var0.getCgJs())) {
a.info(" sub enhanceJs begin==> " + var0);
log.info(" sub enhanceJs begin==> " + var0);
String var3 = var0.getCgJs();
String var4 = var1 + "_" + "onlChange";
Pattern var5 = Pattern.compile("(" + var4 + "\\s*\\(\\)\\s*\\{)");
Matcher var6 = var5.matcher(var3);
if (var6.find()) {
a.info("---JS 增强转换-sub-- enhanceJsFunctionName----" + var4);
log.info("---JS 增强转换-sub-- enhanceJsFunctionName----" + var4);
var3 = a((String)var3, var4, (String)null);
OnlCgformField var8;
@@ -187,7 +186,7 @@ public class EnhanceJsUtil {
}
}
a.info(" sub enhanceJs end==> " + var3);
log.info(" sub enhanceJs end==> " + var3);
var0.setCgJs(var3);
}
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportAPI.java
+12 -11
View File
@@ -20,6 +20,8 @@ import java.util.Map.Entry;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.usermodel.Workbook;
import com.jero.common.api.vo.Result;
@@ -41,8 +43,6 @@ import com.jero.generater.modules.online.cgreport.util.SqlUtil;
import org.jeecgframework.poi.excel.ExcelExportUtil;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -53,8 +53,9 @@ import org.springframework.web.bind.annotation.RestController;
@RestController("onlCgreportAPI")
@RequestMapping({"/online/cgreport/api"})
@Slf4j
public class OnlCgreportAPI {
private static final Logger a = LoggerFactory.getLogger(OnlCgreportAPI.class);
@Autowired
private OnlCgreportHeadServiceImpl onlCgreportHeadService;
@Autowired
@@ -243,16 +244,16 @@ public class OnlCgreportAPI {
var6.put("getAll", var2.getAttribute("getAll"));
Map var7;
if (StringUtils.isNotBlank(var5)) {
a.debug("Online报表: 走了多数据源逻辑");
log.debug("Online报表: 走了多数据源逻辑");
var7 = this.onlCgreportHeadService.executeSelectSqlDynamic(var5, var4, var6, var3.getId());
} else {
a.debug("Online报表: 走了稳定逻辑");
log.debug("Online报表: 走了稳定逻辑");
var7 = this.onlCgreportHeadService.executeSelectSql(var4, var3.getId(), var6);
}
return Result.OK(var7);
} catch (Exception var8) {
a.error(var8.getMessage(), var8);
log.error(var8.getMessage(), var8);
return Result.error("SQL执行失败：" + var8.getMessage());
}
}
@@ -264,7 +265,7 @@ public class OnlCgreportAPI {
List var2 = this.onlCgreportItemService.getAutoListQueryInfo(var1);
return Result.OK(var2);
} catch (Exception var3) {
a.info(var3.getMessage(), var3);
log.info(var3.getMessage(), var3);
return Result.error("查询失败");
}
}
@@ -277,7 +278,7 @@ public class OnlCgreportAPI {
List var3 = this.onlCgreportParamService.list(var2);
return Result.OK(var3);
} catch (Exception var4) {
a.info(var4.getMessage(), var4);
log.info(var4.getMessage(), var4);
return Result.error("查询失败");
}
}
@@ -491,10 +492,10 @@ public class OnlCgreportAPI {
var3 = Result.OK("数据库连接成功");
return var3;
} catch (ClassNotFoundException var17) {
a.error(var17.toString());
log.error(var17.toString());
var4 = Result.error("数据库连接失败：驱动类不存在");
} catch (Exception var18) {
a.error(var18.toString());
log.error(var18.toString());
var4 = Result.error("数据库连接失败：" + var18.getMessage());
return var4;
} finally {
@@ -503,7 +504,7 @@ public class OnlCgreportAPI {
var2.close();
}
} catch (SQLException var16) {
a.error(var16.toString());
log.error(var16.toString());
}
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java
+7 -7
View File
@@ -11,6 +11,7 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.jero.modules.base.service.BaseCommonService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.system.api.ISysBaseAPI;
@@ -25,8 +26,6 @@ import com.jero.generater.modules.online.cgreport.model.OnlCgreportModel;
import com.jero.generater.modules.online.cgreport.service.IOnlCgreportHeadService;
import com.jero.generater.modules.online.cgreport.service.IOnlCgreportItemService;
import com.jero.generater.modules.online.cgreport.service.IOnlCgreportParamService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -39,8 +38,9 @@ import org.springframework.web.bind.annotation.RestController;
@RestController("onlCgreportHeadController")
@RequestMapping({"/online/cgreport/head"})
@Slf4j
public class OnlCgreportHeadController {
private static final Logger a = LoggerFactory.getLogger(OnlCgreportHeadController.class);
@Autowired
private ISysBaseAPI sysBaseAPI;
@Autowired
@@ -71,7 +71,7 @@ public class OnlCgreportHeadController {
List var7 = null;
try {
a.info("Online报表，sql解析：" + var1);
log.info("Online报表，sql解析：" + var1);
this.baseCommonService.addLog("Online报表，sql解析：" + var1, 2, 2);
SqlInjectionUtil.specialFilterContentForOnlineReport(var1);
var6 = this.onlCgreportHeadService.getSqlFields(var1, var2);
@@ -106,7 +106,7 @@ public class OnlCgreportHeadController {
var13.put("params", var5);
return Result.OK(var13);
} catch (Exception var12) {
a.error(var12.getMessage(), var12);
log.error(var12.getMessage(), var12);
String var9 = "解析失败，";
int var10 = var12.getMessage().indexOf("Connection refused: connect");
if (var10 != -1) {
@@ -168,7 +168,7 @@ public class OnlCgreportHeadController {
this.onlCgreportItemService.saveBatch(var6);
var2.success("添加成功！");
} catch (Exception var9) {
a.error(var9.getMessage(), var9);
log.error(var9.getMessage(), var9);
var2.error500("操作失败");
}
@@ -180,7 +180,7 @@ public class OnlCgreportHeadController {
try {
return this.onlCgreportHeadService.editAll(var1);
} catch (Exception var3) {
a.error(var3.getMessage(), var3);
log.error(var3.getMessage(), var3);
return Result.error("操作失败");
}
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportItemController.java
+3 -3
View File
@@ -11,8 +11,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.generater.modules.online.cgreport.entity.OnlCgreportItem;
import com.jero.generater.modules.online.cgreport.service.IOnlCgreportItemService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -25,8 +24,9 @@ import org.springframework.web.bind.annotation.RestController;
@RestController("onlCgreportItemController")
@RequestMapping({"/online/cgreport/item"})
@Slf4j
public class OnlCgreportItemController {
private static final Logger a = LoggerFactory.getLogger(OnlCgreportItemController.class);
@Autowired
private IOnlCgreportItemService onlCgreportItemService;
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportParamController.java
+3 -3
View File
@@ -11,8 +11,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.generater.modules.online.cgreport.entity.OnlCgreportParam;
import com.jero.generater.modules.online.cgreport.service.IOnlCgreportParamService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -25,8 +24,9 @@ import org.springframework.web.bind.annotation.RestController;
@RestController("onlCgreportParamController")
@RequestMapping({"/online/cgreport/param"})
@Slf4j
public class OnlCgreportParamController {
private static final Logger a = LoggerFactory.getLogger(OnlCgreportParamController.class);
@Autowired
private IOnlCgreportParamService onlCgreportParamService;
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/service/a/CgReportExcelServiceImpl.java
+4 -4
View File
@@ -5,6 +5,8 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
import org.apache.poi.hssf.usermodel.HSSFRichTextString;
import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -16,13 +18,11 @@ import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.IndexedColors;
import org.apache.poi.ss.usermodel.Row;
import com.jero.generater.modules.online.cgreport.service.CgReportExcelServiceI;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@Service("cgReportExcelService")
@Slf4j
public class CgReportExcelServiceImpl implements CgReportExcelServiceI {
private static final Logger a = LoggerFactory.getLogger(CgReportExcelServiceImpl.class);
public CgReportExcelServiceImpl() {
}
@@ -82,7 +82,7 @@ public class CgReportExcelServiceImpl implements CgReportExcelServiceI {
var5.autoSizeColumn(var22);
}
} catch (Exception var20) {
a.error(var20.getMessage(), var20);
log.error(var20.getMessage(), var20);
}
return var4;
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/service/a/OnlCgreportHeadServiceImpl.java
+12 -11
View File
@@ -16,6 +16,8 @@ import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
@@ -40,15 +42,14 @@ import com.jero.generater.modules.online.cgreport.util.CgReportQueryParamUtil;
import com.jero.generater.modules.online.cgreport.util.SqlUtil;
import com.jero.generater.modules.online.config.util.DbTableUtil;
import com.jero.generater.modules.online.config.exception.DBException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Service("onlCgreportHeadServiceImpl")
@Slf4j
public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMapper, OnlCgreportHead> implements IOnlCgreportHeadService {
private static final Logger a = LoggerFactory.getLogger(OnlCgreportHeadServiceImpl.class);
@Autowired
private IOnlCgreportParamService onlCgreportParamService;
@Autowired
@@ -119,7 +120,7 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
var15 = var15 + " order by jero_rp_temp." + var16.toString() + " " + params.get("order").toString();
}
a.info("报表查询sql=>\r\n" + var15);
log.info("报表查询sql=>\r\n" + var15);
Object var17;
if (Boolean.valueOf(String.valueOf(params.get("getAll")))) {
List var18 = this.mapper.executeSelect(var15);
@@ -142,7 +143,7 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
String var7 = (String)params.get("column");
int var8 = oConvertUtils.getInt(params.get("pageNo"), 1);
int var9 = oConvertUtils.getInt(params.get("pageSize"), 10);
a.info("【Online多数据源逻辑】报表查询参数params: " + JSON.toJSONString(params));
log.info("【Online多数据源逻辑】报表查询参数params: " + JSON.toJSONString(params));
LambdaQueryWrapper<OnlCgreportParam> var10 = new LambdaQueryWrapper();
var10.eq(OnlCgreportParam::getCgrheadId, onlCgreportHeadId);
List var11 = this.onlCgreportParamService.list(var10);
@@ -184,9 +185,9 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
var20 = SqlUtils.createPageSqlByDBType(var5.getDbType(), var17, var8, var9);
}
a.info("多数据源 报表查询sql=>querySql: " + var17);
a.info("多数据源 报表查询sql=>pageSQL: " + var20);
a.info("多数据源 报表查询sql=>countSql: " + var18);
log.info("多数据源 报表查询sql=>querySql: " + var17);
log.info("多数据源 报表查询sql=>pageSQL: " + var20);
log.info("多数据源 报表查询sql=>countSql: " + var18);
HashMap var21 = new HashMap();
Map var22 = (Map)DynamicDBUtil.findOne(dbKey, var18, new Object[0]);
var21.put("total", var22.get("total"));
@@ -315,7 +316,7 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
var1 = SqlUtil.a(var1);
Set var3;
if (StringUtils.isNotBlank(var2)) {
a.info("parse sql : " + var1);
log.info("parse sql : " + var1);
DynamicDataSourceModel var4 = DataSourceCachePool.getCacheDynamicDataSourceModel(var2);
if (ReUtil.contains(" order\\s+by ", var1.toLowerCase()) && "3".equalsIgnoreCase(var4.getDbType())) {
throw new JeroBootException("SqlServer不支持SQL内排序!");
@@ -329,7 +330,7 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
var1 = "SELECT TOP 1 * FROM (" + var1 + ") temp";
}
a.info("parse sql with page : " + var1);
log.info("parse sql with page : " + var1);
Map var5 = (Map)DynamicDBUtil.findOne(var2, var1, new Object[0]);
if (var5 == null) {
throw new JeroBootException("该报表sql没有数据");
@@ -337,7 +338,7 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
var3 = var5.keySet();
} else {
a.info("parse sql: " + var1);
log.info("parse sql: " + var1);
String var8 = null;
try {
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/util/CgReportQueryParamUtil.java
+3 -4
View File
@@ -19,11 +19,10 @@ import com.jero.generater.modules.online.cgform.util.CgformUtil;
import com.jero.generater.modules.online.cgreport.entity.OnlCgreportItem;
import com.jero.generater.modules.online.config.util.DbTableUtil;
import com.jero.generater.modules.online.config.exception.DBException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
@Slf4j
public class CgReportQueryParamUtil {
private static final Logger a = LoggerFactory.getLogger(CgReportQueryParamUtil.class);
public CgReportQueryParamUtil() {
}
@@ -49,7 +48,7 @@ public class CgReportQueryParamUtil {
var7 = var9;
}
} catch (UnsupportedEncodingException var10) {
a.error(var10.getMessage(), var10);
log.error(var10.getMessage(), var10);
return;
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/util/SqlUtil.java
+5 -5
View File
@@ -11,11 +11,11 @@ import java.util.regex.Pattern;
import javax.servlet.http.HttpServletRequest;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
@Slf4j
public class SqlUtil {
private static final Logger m = LoggerFactory.getLogger(SqlUtil.class);
public static final String a = "select * from ( {0}) sel_tab00 limit {1},{2}";
public static final String b = "select * from ( {0}) sel_tab00 limit {2} offset {1}";
public static final String c = "select * from (select row_.*,rownum rownum_ from ({0}) row_ where rownum <= {1}) where rownum_>{2}";
@@ -140,9 +140,9 @@ public class SqlUtil {
String var1 = "(\\w|\\.)+ *\\S+ *\\S*\\$\\{\\w+\\}\\S*";
Pattern var2 = Pattern.compile(var1);
for(Matcher var3 = var2.matcher(var0); var3.find(); m.info("${}替换后结果 ==>" + var0)) {
for(Matcher var3 = var2.matcher(var0); var3.find(); log.info("${}替换后结果 ==>" + var0)) {
String var4 = var3.group();
m.info("${}匹配带参SQL片段 ==>" + var4);
log.info("${}匹配带参SQL片段 ==>" + var4);
if (var4.indexOf("where") != -1) {
var0 = var0.replace(var4, "where 1=1");
} else if (var4.indexOf("and") != -1) {
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/util/DbTableProcess.java
+13 -12
View File
@@ -18,6 +18,8 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.hibernate.HibernateException;
import org.hibernate.Session;
@@ -34,11 +36,10 @@ import com.jero.generater.modules.online.config.config.CgformConfigModel;
import com.jero.generater.modules.online.config.config.DataBaseConfig;
import com.jero.generater.modules.online.config.exception.DBException;
import com.jero.generater.modules.online.config.service.DbTableHandleI;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Slf4j
public class DbTableProcess {
private static final Logger a = LoggerFactory.getLogger(DbTableProcess.class);
private static final String b = "com/jero/generater/modules/online/config/engine/tableTemplate.ftl";
private static DbTableHandleI c;
@@ -64,18 +65,18 @@ public class DbTableProcess {
}
String var15 = FreemarkerHelper.a("com/jero/generater/modules/online/config/engine/tableTemplate.ftl", a(var0, var1));
a.info(var15);
log.info(var15);
HashMap var16 = new HashMap();
DataBaseConfig var17 = var0.getDbConfig();
var16.put("hibernate.connection.driver_class", var17.getDriverClassName());
var16.put("hibernate.connection.url", var17.getUrl());
var16.put("hibernate.connection.username", var17.getUsername());
if (var17.getDruid() != null && oConvertUtils.isNotEmpty(var17.getDruid().getPublicKey())) {
a.info(" dbconfig.getDruid().getPublicKey() = " + var17.getDruid().getPublicKey());
log.info(" dbconfig.getDruid().getPublicKey() = " + var17.getDruid().getPublicKey());
try {
String var5 = ConfigTools.decrypt(var17.getDruid().getPublicKey(), var17.getPassword());
a.info(" 解密密码 decryptPassword = " + var5);
log.info(" 解密密码 decryptPassword = " + var5);
var16.put("hibernate.connection.password", var5);
} catch (Exception var14) {
var14.printStackTrace();
@@ -119,7 +120,7 @@ public class DbTableProcess {
throw new DBException(var12.getCause().getMessage());
}
a.error(var12.getMessage());
log.error(var12.getMessage());
continue;
}
@@ -205,7 +206,7 @@ public class DbTableProcess {
throw new RuntimeException();
}
a.info(" db update sql : " + var5.toString());
log.info(" db update sql : " + var5.toString());
return var5;
}
@@ -230,7 +231,7 @@ public class DbTableProcess {
try {
var4 = DbTableUtil.getConnection();
} catch (Exception var21) {
a.error(var21.getMessage(), var21);
log.error(var21.getMessage(), var21);
}
DatabaseMetaData var5 = var4.getMetaData();
@@ -274,7 +275,7 @@ public class DbTableProcess {
String var18 = var9.getString("COLUMN_DEF");
String var19 = c(var18) == null ? "" : c(var18);
var10.setFieldDefault(var19);
a.info("getColumnMetadataFormDataBase --->COLUMN_NAME:" + var11.toUpperCase() + " TYPE_NAME :" + var12 + " DECIMAL_DIGITS:" + var13 + " COLUMN_SIZE:" + var15);
log.info("getColumnMetadataFormDataBase --->COLUMN_NAME:" + var11.toUpperCase() + " TYPE_NAME :" + var12 + " DECIMAL_DIGITS:" + var13 + " COLUMN_SIZE:" + var15);
var3.put(var11, var10);
}
@@ -300,7 +301,7 @@ public class DbTableProcess {
var4.setFieldDefault(c(var6.getDbDefaultVal()));
var4.setPkType(var1.getJformPkType() == null ? "UUID" : var1.getJformPkType());
var4.setOldColumnName(var6.getDbFieldNameOld() != null ? var6.getDbFieldNameOld().toLowerCase() : null);
a.info("getColumnMetadataFormCgForm ----> DbFieldName: " + var6.getDbFieldName().toLowerCase() + " | DbType: " + var6.getDbType().toLowerCase() + " | DbPointLength:" + var6.getDbPointLength() + " | DbLength:" + var6.getDbLength());
log.info("getColumnMetadataFormCgForm ----> DbFieldName: " + var6.getDbFieldName().toLowerCase() + " | DbType: " + var6.getDbType().toLowerCase() + " | DbPointLength:" + var6.getDbPointLength() + " | DbLength:" + var6.getDbLength());
var2.put(var6.getDbFieldName().toLowerCase(), var4);
}
@@ -395,7 +396,7 @@ public class DbTableProcess {
}
}
} catch (SQLException var10) {
a.error(var10.getMessage(), var10);
log.error(var10.getMessage(), var10);
} finally {
if (var1 != null) {
var1.close();
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/util/DbTableUtil.java
+7 -6
View File
@@ -9,6 +9,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.sql.DataSource;
import lombok.extern.slf4j.Slf4j;
import org.hibernate.Session;
import com.jero.common.util.SpringContextUtils;
import com.jero.common.util.oConvertUtils;
@@ -20,11 +22,10 @@ import com.jero.generater.modules.online.config.service.a.DbTableMysqlHandleImpl
import com.jero.generater.modules.online.config.service.a.DbTableOracleHandleImpl;
import com.jero.generater.modules.online.config.service.a.DbTablePostgresHandleImpl;
import com.jero.generater.modules.online.config.service.a.DbTableSQLServerHandleImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Slf4j
public class DbTableUtil {
private static final Logger b = LoggerFactory.getLogger(DbTableUtil.class);
public static String a = "";
public DbTableUtil() {
@@ -132,7 +133,7 @@ public class DbTableUtil {
a = "ORACLE";
}
} catch (Exception var7) {
b.error(var7.getMessage(), var7);
log.error(var7.getMessage(), var7);
} finally {
var1.close();
}
@@ -223,7 +224,7 @@ public class DbTableUtil {
}
if (var2.next()) {
b.info("数据库表：【" + var0 + "】已存在");
log.info("数据库表：【" + var0 + "】已存在");
var9 = true;
return var9;
}
@@ -241,7 +242,7 @@ public class DbTableUtil {
var1.close();
}
} catch (SQLException var19) {
b.error(var19.getMessage(), var19);
log.error(var19.getMessage(), var19);
}
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/util/FreemarkerHelper.java
+5 -4
View File
@@ -3,13 +3,14 @@ package com.jero.generater.modules.online.config.util;
import freemarker.template.Configuration;
import freemarker.template.Template;
import lombok.extern.slf4j.Slf4j;
import java.io.StringWriter;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Slf4j
public class FreemarkerHelper {
private static final Logger a = LoggerFactory.getLogger(FreemarkerHelper.class);
private static Configuration b;
public FreemarkerHelper() {
@@ -23,7 +24,7 @@ public class FreemarkerHelper {
var4.process(var2, var3);
return var3.toString();
} catch (Exception var5) {
a.error(var5.getMessage(), var5);
log.error(var5.getMessage(), var5);
return var5.toString();
}
}