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

【添加】cgreport修复完毕

Browse Source
This commit is contained in:
zer0Black
2021-03-12 16:31:48 +08:00
parent e240930f17
commit 930673919a
14 changed files with 376 additions and 374 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/modules/online/cgform/util/b.java
+4 -4
View File
@@ -887,7 +887,7 @@ public class b {
String str2 = null;
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (loginUser == null) {
throw new JeecgBootException("online保存表单数据异常:系统未找到当前登陆用户信息");
throw new JeroBootException("online保存表单数据异常:系统未找到当前登陆用户信息");
}
@@ -985,7 +985,7 @@ public class b {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (loginUser == null) {
throw new JeecgBootException("online修改表单数据异常:系统未找到当前登陆用户信息");
throw new JeroBootException("online修改表单数据异常:系统未找到当前登陆用户信息");
}
@@ -1821,7 +1821,7 @@ public class b {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (loginUser == null) {
throw new JeecgBootException("online保存表单数据异常:系统未找到当前登陆用户信息");
throw new JeroBootException("online保存表单数据异常:系统未找到当前登陆用户信息");
}
for (OnlCgformField onlCgformField : paramList) {
@@ -1879,7 +1879,7 @@ public class b {
}
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (loginUser == null) {
throw new JeecgBootException("online保存表单数据异常:系统未找到当前登陆用户信息");
throw new JeroBootException("online保存表单数据异常:系统未找到当前登陆用户信息");
}
for (OnlCgformField onlCgformField : paramList) {
String str4 = onlCgformField.getDbFieldName();
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/a/a.java
+3 -3
View File
@@ -22,7 +22,7 @@ import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.usermodel.Workbook;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.PermissionData;
import com.jero.common.exception.JeecgBootException;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.DictModel;
import com.jero.common.system.vo.DynamicDataSourceModel;
@@ -347,7 +347,7 @@ public class a {
try {
map = this.onlCgreportHeadService.queryCgReportConfig(paramString);
} catch (Exception exception) {
throw new JeecgBootException("动态报表配置不存在!");
throw new JeroBootException("动态报表配置不存在!");
}
List<Map> list = (List)map.get("items");
@@ -532,7 +532,7 @@ public class a {
}
else {
throw new JeecgBootException("参数错误");
throw new JeroBootException("参数错误");
}
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/service/a/b.java
+7 -7
View File
@@ -19,7 +19,7 @@ import java.util.regex.Pattern;
import org.apache.commons.lang.StringUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeecgBootException;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.DynamicDataSourceModel;
@@ -122,7 +122,7 @@ public class b
if (ReUtil.contains(" order\\s+by ", sql.toLowerCase()) &&
"SQLSERVER".equalsIgnoreCase(str1)) {
throw new JeecgBootException("SqlServer不支持SQL内排序!");
throw new JeroBootException("SqlServer不支持SQL内排序!");
}
@@ -195,7 +195,7 @@ public class b
if (ReUtil.contains(" order\\s+by ", sql.toLowerCase()) &&
"3".equalsIgnoreCase(dynamicDataSourceModel.getDbType())) {
throw new JeecgBootException("SqlServer不支持SQL内排序!");
throw new JeroBootException("SqlServer不支持SQL内排序!");
}
@@ -382,7 +382,7 @@ public class b
if (ReUtil.contains(" order\\s+by ", paramString1.toLowerCase()) &&
"3".equalsIgnoreCase(dynamicDataSourceModel.getDbType())) {
throw new JeecgBootException("SqlServer不支持SQL内排序!");
throw new JeroBootException("SqlServer不支持SQL内排序!");
}
@@ -398,7 +398,7 @@ public class b
a.info("parse sql with page : " + paramString1);
Map map = (Map)DynamicDBUtil.findOne(paramString2, paramString1, new Object[0]);
if (map == null) {
throw new JeecgBootException("该报表sql没有数据");
throw new JeroBootException("该报表sql没有数据");
}
set = map.keySet();
} else {
@@ -412,14 +412,14 @@ public class b
}
if (ReUtil.contains(" order\\s+by ", paramString1.toLowerCase()) &&
"SQLSERVER".equalsIgnoreCase(str)) {
throw new JeecgBootException("SqlServer不支持SQL内排序!");
throw new JeroBootException("SqlServer不支持SQL内排序!");
}
IPage iPage = this.mapper.selectPageBySql(new Page(1L, 1L), paramString1);
List<Map> list = iPage.getRecords();
if (list.size() < 1) {
throw new JeecgBootException("该报表sql没有数据");
throw new JeroBootException("该报表sql没有数据");
}
set = ((Map)list.get(0)).keySet();
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/b/a.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/constant/CgReportConstant.java
+3 -3
View File
@@ -1,7 +1,7 @@
package org.jeecg.modules.online.cgreport.b;
package org.jeecg.modules.online.cgreport.constant;
public class a {
public class CgReportConstant {
public static final String a = "main";
public static final String b = "items";
public static final String c = "params";
@@ -33,6 +33,6 @@ public class a {
public static final String C = "config_iframe";
public static final String D = "popup_param_pre__";
public a() {
public CgReportConstant() {
}
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/a/a.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportAPI.java
+11 -11
View File
@@ -1,5 +1,5 @@
package org.jeecg.modules.online.cgreport.a;
package org.jeecg.modules.online.cgreport.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
@@ -24,7 +24,7 @@ import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.usermodel.Workbook;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.PermissionData;
import com.jero.common.exception.JeecgBootException;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.DictModel;
import com.jero.common.system.vo.DynamicDataSourceModel;
@@ -36,7 +36,7 @@ import org.jeecg.modules.online.cgreport.entity.OnlCgreportParam;
import org.jeecg.modules.online.cgreport.mapper.OnlCgreportHeadMapper;
import org.jeecg.modules.online.cgreport.service.IOnlCgreportItemService;
import org.jeecg.modules.online.cgreport.service.IOnlCgreportParamService;
import org.jeecg.modules.online.cgreport.service.a.b;
import org.jeecg.modules.online.cgreport.service.a.OnlCgreportHeadServiceImpl;
import org.jeecg.modules.online.cgreport.util.SqlUtil;
import org.jeecgframework.poi.excel.ExcelExportUtil;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -53,10 +53,10 @@ import org.springframework.web.bind.annotation.RestController;
@RestController("onlCgreportAPI")
@RequestMapping({"/online/cgreport/api"})
public class a {
private static final Logger a = LoggerFactory.getLogger(a.class);
public class OnlCgreportAPI {
private static final Logger a = LoggerFactory.getLogger(OnlCgreportAPI.class);
@Autowired
private b onlCgreportHeadService;
private OnlCgreportHeadServiceImpl onlCgreportHeadService;
@Autowired
private IOnlCgreportItemService onlCgreportItemService;
@Autowired
@@ -64,7 +64,7 @@ public class a {
@Autowired
private IOnlCgreportParamService onlCgreportParamService;
public a() {
public OnlCgreportAPI() {
}
@GetMapping({"/getColumnsAndData/{code}"})
@@ -272,7 +272,7 @@ public class a {
@GetMapping({"/getParamsInfo/{code}"})
public Result<?> c(@PathVariable("code") String var1) {
try {
LambdaQueryWrapper var2 = new LambdaQueryWrapper();
LambdaQueryWrapper<OnlCgreportParam> var2 = new LambdaQueryWrapper();
var2.eq(OnlCgreportParam::getCgrheadId, var1);
List var3 = this.onlCgreportParamService.list(var2);
return Result.OK(var3);
@@ -288,14 +288,14 @@ public class a {
String var4 = "报表";
String var5 = "导出信息";
if (!oConvertUtils.isNotEmpty(var1)) {
throw new JeecgBootException("参数错误");
throw new JeroBootException("参数错误");
} else {
Map var6 = null;
try {
var6 = this.onlCgreportHeadService.queryCgReportConfig(var1);
} catch (Exception var35) {
throw new JeecgBootException("动态报表配置不存在!");
throw new JeroBootException("动态报表配置不存在!");
}
List var7 = (List)var6.get("items");
@@ -431,7 +431,7 @@ public class a {
@GetMapping({"/getRpColumns/{code}"})
public Result<?> d(@PathVariable("code") String var1) {
LambdaQueryWrapper var2 = new LambdaQueryWrapper();
LambdaQueryWrapper<OnlCgreportHead> var2 = new LambdaQueryWrapper();
var2.eq(OnlCgreportHead::getCode, var1);
OnlCgreportHead var3 = (OnlCgreportHead)this.onlCgreportHeadService.getOne(var2);
if (var3 == null) {
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/a/b.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportHeadController.java
+6 -5
View File
@@ -1,5 +1,5 @@
package org.jeecg.modules.online.cgreport.a;
package org.jeecg.modules.online.cgreport.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,13 +9,14 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.jero.modules.base.service.BaseCommonService;
import org.apache.commons.lang.StringUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.DynamicDataSourceModel;
import com.jero.common.util.SqlInjectionUtil;
import org.jeecg.modules.base.service.BaseCommonService;
import org.jeecg.modules.online.cgform.util.CgformUtil;
import org.jeecg.modules.online.cgreport.entity.OnlCgreportHead;
import org.jeecg.modules.online.cgreport.entity.OnlCgreportItem;
@@ -38,8 +39,8 @@ import org.springframework.web.bind.annotation.RestController;
@RestController("onlCgreportHeadController")
@RequestMapping({"/online/cgreport/head"})
public class b {
private static final Logger a = LoggerFactory.getLogger(b.class);
public class OnlCgreportHeadController {
private static final Logger a = LoggerFactory.getLogger(OnlCgreportHeadController.class);
@Autowired
private ISysBaseAPI sysBaseAPI;
@Autowired
@@ -51,7 +52,7 @@ public class b {
@Autowired
private BaseCommonService baseCommonService;
public b() {
public OnlCgreportHeadController() {
}
@GetMapping({"/parseSql"})
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/a/c.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportItemController.java
+4 -4
View File
@@ -1,5 +1,5 @@
package org.jeecg.modules.online.cgreport.a;
package org.jeecg.modules.online.cgreport.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,12 +25,12 @@ import org.springframework.web.bind.annotation.RestController;
@RestController("onlCgreportItemController")
@RequestMapping({"/online/cgreport/item"})
public class c {
private static final Logger a = LoggerFactory.getLogger(c.class);
public class OnlCgreportItemController {
private static final Logger a = LoggerFactory.getLogger(OnlCgreportItemController.class);
@Autowired
private IOnlCgreportItemService onlCgreportItemService;
public c() {
public OnlCgreportItemController() {
}
@GetMapping({"/listByHeadId"})
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/a/d.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/controller/OnlCgreportParamController.java
+4 -4
View File
@@ -1,5 +1,5 @@
package org.jeecg.modules.online.cgreport.a;
package org.jeecg.modules.online.cgreport.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,12 +25,12 @@ import org.springframework.web.bind.annotation.RestController;
@RestController("onlCgreportParamController")
@RequestMapping({"/online/cgreport/param"})
public class d {
private static final Logger a = LoggerFactory.getLogger(d.class);
public class OnlCgreportParamController {
private static final Logger a = LoggerFactory.getLogger(OnlCgreportParamController.class);
@Autowired
private IOnlCgreportParamService onlCgreportParamService;
public d() {
public OnlCgreportParamController() {
}
@GetMapping({"/listByHeadId"})
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/service/a/a.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/service/a/CgReportExcelServiceImpl.java
+3 -3
View File
@@ -21,10 +21,10 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@Service("cgReportExcelService")
public class a implements CgReportExcelServiceI {
private static final Logger a = LoggerFactory.getLogger(a.class);
public class CgReportExcelServiceImpl implements CgReportExcelServiceI {
private static final Logger a = LoggerFactory.getLogger(CgReportExcelServiceImpl.class);
public a() {
public CgReportExcelServiceImpl() {
}
public HSSFWorkbook exportExcel(String title, Collection<?> titleSet, Collection<?> dataSet) {
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/service/a/b.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/service/a/OnlCgreportHeadServiceImpl.java
+23 -22
View File
@@ -18,7 +18,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.lang.StringUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeecgBootException;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.DynamicDataSourceModel;
@@ -36,6 +36,7 @@ import org.jeecg.modules.online.cgreport.model.OnlCgreportModel;
import org.jeecg.modules.online.cgreport.service.IOnlCgreportHeadService;
import org.jeecg.modules.online.cgreport.service.IOnlCgreportItemService;
import org.jeecg.modules.online.cgreport.service.IOnlCgreportParamService;
import org.jeecg.modules.online.cgreport.util.CgReportQueryParamUtil;
import org.jeecg.modules.online.cgreport.util.SqlUtil;
import org.jeecg.modules.online.config.b.d;
import org.jeecg.modules.online.config.exception.DBException;
@@ -46,8 +47,8 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Service("onlCgreportHeadServiceImpl")
public class b extends ServiceImpl<OnlCgreportHeadMapper, OnlCgreportHead> implements IOnlCgreportHeadService {
private static final Logger a = LoggerFactory.getLogger(b.class);
public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMapper, OnlCgreportHead> implements IOnlCgreportHeadService {
private static final Logger a = LoggerFactory.getLogger(OnlCgreportHeadServiceImpl.class);
@Autowired
private IOnlCgreportParamService onlCgreportParamService;
@Autowired
@@ -57,7 +58,7 @@ public class b extends ServiceImpl<OnlCgreportHeadMapper, OnlCgreportHead> imple
@Autowired
private ISysBaseAPI sysBaseAPI;
public b() {
public OnlCgreportHeadServiceImpl() {
}
public Map<String, Object> executeSelectSql(String sql, String onlCgreportHeadId, Map<String, Object> params) throws SQLException {
@@ -69,7 +70,7 @@ public class b extends ServiceImpl<OnlCgreportHeadMapper, OnlCgreportHead> imple
var19.printStackTrace();
}
LambdaQueryWrapper var5 = new LambdaQueryWrapper();
LambdaQueryWrapper<OnlCgreportParam> var5 = new LambdaQueryWrapper();
var5.eq(OnlCgreportParam::getCgrheadId, onlCgreportHeadId);
List var6 = this.onlCgreportParamService.list(var5);
if (var6 != null && var6.size() > 0) {
@@ -102,14 +103,14 @@ public class b extends ServiceImpl<OnlCgreportHeadMapper, OnlCgreportHead> imple
Integer var21 = oConvertUtils.getInt(params.get("pageSize"), 10);
Integer var22 = oConvertUtils.getInt(params.get("pageNo"), 1);
Page var24 = new Page((long)var22, (long)var21);
LambdaQueryWrapper var23 = new LambdaQueryWrapper();
LambdaQueryWrapper<OnlCgreportItem> var23 = new LambdaQueryWrapper();
var23.eq(OnlCgreportItem::getCgrheadId, onlCgreportHeadId);
var23.eq(OnlCgreportItem::getIsSearch, 1);
List var12 = this.onlCgreportItemService.list(var23);
String var13 = "jeecg_rp_temp.";
String var14 = org.jeecg.modules.online.cgreport.util.a.a(var12, params, var13, (String)null);
String var14 = CgReportQueryParamUtil.a(var12, params, var13, (String)null);
if (ReUtil.contains(" order\\s+by ", sql.toLowerCase()) && "SQLSERVER".equalsIgnoreCase(var4)) {
throw new JeecgBootException("SqlServer不支持SQL内排序!");
throw new JeroBootException("SqlServer不支持SQL内排序!");
} else {
String var15 = "select * from (" + sql + ") jeecg_rp_temp where 1=1 " + var14;
var15 = SqlUtil.b(var15);
@@ -142,7 +143,7 @@ public class b extends ServiceImpl<OnlCgreportHeadMapper, OnlCgreportHead> imple
int var8 = oConvertUtils.getInt(params.get("pageNo"), 1);
int var9 = oConvertUtils.getInt(params.get("pageSize"), 10);
a.info("【Online多数据源逻辑】报表查询参数params: " + JSON.toJSONString(params));
LambdaQueryWrapper var10 = new LambdaQueryWrapper();
LambdaQueryWrapper<OnlCgreportParam> var10 = new LambdaQueryWrapper();
var10.eq(OnlCgreportParam::getCgrheadId, onlCgreportHeadId);
List var11 = this.onlCgreportParamService.list(var10);
OnlCgreportParam var13;
@@ -160,16 +161,16 @@ public class b extends ServiceImpl<OnlCgreportHeadMapper, OnlCgreportHead> imple
}
}
LambdaQueryWrapper var24 = new LambdaQueryWrapper();
LambdaQueryWrapper<OnlCgreportItem> var24 = new LambdaQueryWrapper();
var24.eq(OnlCgreportItem::getCgrheadId, onlCgreportHeadId);
var24.eq(OnlCgreportItem::getIsSearch, 1);
List var25 = this.onlCgreportItemService.list(var24);
if (ReUtil.contains(" order\\s+by ", sql.toLowerCase()) && "3".equalsIgnoreCase(var5.getDbType())) {
throw new JeecgBootException("SqlServer不支持SQL内排序!");
throw new JeroBootException("SqlServer不支持SQL内排序!");
} else {
String var26 = "jeecg_rp_temp.";
var15 = DataBaseEnum.getDataBaseNameByValue(var5.getDbType());
String var16 = org.jeecg.modules.online.cgreport.util.a.a(var25, params, var26, var15);
String var16 = CgReportQueryParamUtil.a(var25, params, var26, var15);
String var17 = "select * from (" + sql + ") jeecg_rp_temp where 1=1 " + var16;
var17 = SqlUtil.b(var17);
String var18 = SqlUtils.getCountSql(var17);
@@ -205,10 +206,10 @@ public class b extends ServiceImpl<OnlCgreportHeadMapper, OnlCgreportHead> imple
return Result.error("未找到对应实体");
} else {
super.updateById(var2);
LambdaQueryWrapper var4 = new LambdaQueryWrapper();
LambdaQueryWrapper<OnlCgreportItem> var4 = new LambdaQueryWrapper();
var4.eq(OnlCgreportItem::getCgrheadId, var2.getId());
this.onlCgreportItemService.remove(var4);
LambdaQueryWrapper var5 = new LambdaQueryWrapper();
LambdaQueryWrapper<OnlCgreportParam> var5 = new LambdaQueryWrapper();
var5.eq(OnlCgreportParam::getCgrheadId, var2.getId());
this.onlCgreportParamService.remove(var5);
Iterator var6 = values.getParams().iterator();
@@ -238,10 +239,10 @@ public class b extends ServiceImpl<OnlCgreportHeadMapper, OnlCgreportHead> imple
public Result<?> delete(String id) {
boolean var2 = super.removeById(id);
if (var2) {
LambdaQueryWrapper var3 = new LambdaQueryWrapper();
LambdaQueryWrapper<OnlCgreportItem> var3 = new LambdaQueryWrapper();
var3.eq(OnlCgreportItem::getCgrheadId, id);
this.onlCgreportItemService.remove(var3);
LambdaQueryWrapper var4 = new LambdaQueryWrapper();
LambdaQueryWrapper<OnlCgreportParam> var4 = new LambdaQueryWrapper();
var4.eq(OnlCgreportParam::getCgrheadId, id);
this.onlCgreportParamService.remove(var4);
}
@@ -260,10 +261,10 @@ public class b extends ServiceImpl<OnlCgreportHeadMapper, OnlCgreportHead> imple
String var5 = var2[var4];
boolean var6 = super.removeById(var5);
if (var6) {
LambdaQueryWrapper var7 = new LambdaQueryWrapper();
LambdaQueryWrapper<OnlCgreportItem> var7 = new LambdaQueryWrapper();
var7.eq(OnlCgreportItem::getCgrheadId, var5);
this.onlCgreportItemService.remove(var7);
LambdaQueryWrapper var8 = new LambdaQueryWrapper();
LambdaQueryWrapper<OnlCgreportParam> var8 = new LambdaQueryWrapper();
var8.eq(OnlCgreportParam::getCgrheadId, var5);
this.onlCgreportParamService.remove(var8);
}
@@ -317,7 +318,7 @@ public class b extends ServiceImpl<OnlCgreportHeadMapper, OnlCgreportHead> imple
a.info("parse sql : " + var1);
DynamicDataSourceModel var4 = DataSourceCachePool.getCacheDynamicDataSourceModel(var2);
if (ReUtil.contains(" order\\s+by ", var1.toLowerCase()) && "3".equalsIgnoreCase(var4.getDbType())) {
throw new JeecgBootException("SqlServer不支持SQL内排序!");
throw new JeroBootException("SqlServer不支持SQL内排序!");
}
if ("1".equals(var4.getDbType())) {
@@ -331,7 +332,7 @@ public class b extends ServiceImpl<OnlCgreportHeadMapper, OnlCgreportHead> imple
a.info("parse sql with page : " + var1);
Map var5 = (Map)DynamicDBUtil.findOne(var2, var1, new Object[0]);
if (var5 == null) {
throw new JeecgBootException("该报表sql没有数据");
throw new JeroBootException("该报表sql没有数据");
}
var3 = var5.keySet();
@@ -346,13 +347,13 @@ public class b extends ServiceImpl<OnlCgreportHeadMapper, OnlCgreportHead> imple
}
if (ReUtil.contains(" order\\s+by ", var1.toLowerCase()) && "SQLSERVER".equalsIgnoreCase(var8)) {
throw new JeecgBootException("SqlServer不支持SQL内排序!");
throw new JeroBootException("SqlServer不支持SQL内排序!");
}
IPage var9 = this.mapper.selectPageBySql(new Page(1L, 1L), var1);
List var6 = var9.getRecords();
if (var6.size() < 1) {
throw new JeecgBootException("该报表sql没有数据");
throw new JeroBootException("该报表sql没有数据");
}
var3 = ((Map)var6.get(0)).keySet();
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/service/a/c.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/service/a/OnlCgreportItemServiceImpl.java
+3 -3
View File
@@ -15,12 +15,12 @@ import org.jeecg.modules.online.cgreport.service.IOnlCgreportItemService;
import org.springframework.stereotype.Service;
@Service("onlCgreportItemServiceImpl")
public class c extends ServiceImpl<OnlCgreportItemMapper, OnlCgreportItem> implements IOnlCgreportItemService {
public c() {
public class OnlCgreportItemServiceImpl extends ServiceImpl<OnlCgreportItemMapper, OnlCgreportItem> implements IOnlCgreportItemService {
public OnlCgreportItemServiceImpl() {
}
public List<Map<String, String>> getAutoListQueryInfo(String cgrheadId) {
LambdaQueryWrapper var2 = new LambdaQueryWrapper();
LambdaQueryWrapper<OnlCgreportItem> var2 = new LambdaQueryWrapper();
var2.eq(OnlCgreportItem::getCgrheadId, cgrheadId);
var2.eq(OnlCgreportItem::getIsSearch, 1);
List var3 = this.list(var2);
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/service/a/d.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/service/a/OnlCgreportParamServiceImpl.java
+2 -2
View File
@@ -8,7 +8,7 @@ import org.jeecg.modules.online.cgreport.service.IOnlCgreportParamService;
import org.springframework.stereotype.Service;
@Service("onlCgreportParamServiceImpl")
public class d extends ServiceImpl<OnlCgreportParamMapper, OnlCgreportParam> implements IOnlCgreportParamService {
public d() {
public class OnlCgreportParamServiceImpl extends ServiceImpl<OnlCgreportParamMapper, OnlCgreportParam> implements IOnlCgreportParamService {
public OnlCgreportParamServiceImpl() {
}
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/util/a.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgreport/util/CgReportQueryParamUtil.java
+3 -3
View File
@@ -22,10 +22,10 @@ import org.jeecg.modules.online.config.exception.DBException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class a {
private static final Logger a = LoggerFactory.getLogger(a.class);
public class CgReportQueryParamUtil {
private static final Logger a = LoggerFactory.getLogger(CgReportQueryParamUtil.class);
public a() {
public CgReportQueryParamUtil() {
}
public static void a(HttpServletRequest var0, Map<String, Object> var1, Map<String, Object> var2, Map<String, Object> var3) {