JeroBoot/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix sonar】cgreport文件夹

Browse Source
This commit is contained in:
梁琦涛
2023-03-14 14:00:29 +08:00
parent 157dc311f1
commit f298061f25
4 changed files with 65 additions and 71 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/cgreport/controller/OnlCgreportAPI.java
+33 -39
View File
@@ -85,7 +85,7 @@ public class OnlCgreportAPI {
QueryWrapper<OnlCgreportItem> var7 = new QueryWrapper<>();
var7.eq(CGR_HEAD_ID, var1).eq(IS_SHOW, 1).orderByAsc(ORDER_NUM);
List<OnlCgreportItem> var8 = this.onlCgreportItemService.list(var7);
HashMap var9 = new HashMap();
HashMap var9 = new HashMap<>();
JSONArray var10 = new JSONArray();
JSONArray var11 = new JSONArray();
boolean var12 = false;
@@ -116,14 +116,14 @@ public class OnlCgreportAPI {
var11.add(var15);
var16 = var14.getDictCode();
List var20 = this.a(var16, var6, var14.getFieldName());
List<DictModel> var20 = this.a(var16, var6, var14.getFieldName());
if (var20 != null) {
var9.put(var14.getFieldName(), var20);
var15.put(CUSTOM_RENDER, var14.getFieldName());
}
}
HashMap var19 = new HashMap(3);
HashMap var19 = new HashMap<>(3);
var19.put("data", var4.getResult());
var19.put(COLUMNS, var11);
var19.put(DICT_OPTIONS, var9);
@@ -185,18 +185,16 @@ public class OnlCgreportAPI {
if (var2 == null) {
return Result.error(EN_IS_NULL);
} else {
QueryWrapper var3 = new QueryWrapper();
QueryWrapper<OnlCgreportItem> var3 = new QueryWrapper<>();
var3.eq(CGR_HEAD_ID, var1);
var3.eq(IS_SHOW, 1);
var3.orderByAsc(ORDER_NUM);
List var4 = this.onlCgreportItemService.list(var3);
ArrayList var5 = new ArrayList();
HashMap var6 = new HashMap();
Iterator var7 = var4.iterator();
List<OnlCgreportItem> var4 = this.onlCgreportItemService.list(var3);
ArrayList<Map<String,Object>> var5 = new ArrayList<>();
HashMap var6 = new HashMap<>();
while(var7.hasNext()) {
OnlCgreportItem var8 = (OnlCgreportItem)var7.next();
HashMap var9 = new HashMap(3);
for (OnlCgreportItem var8 : var4) {
HashMap<String,Object> var9 = new HashMap<>(3);
var9.put(TITLE, var8.getFieldTxt());
var9.put(DATA_INDEX, var8.getFieldName());
var9.put(ALIGN, CENTER);
@@ -222,7 +220,7 @@ public class OnlCgreportAPI {
}
}
HashMap var14 = new HashMap(1);
HashMap var14 = new HashMap<>(1);
var14.put(COLUMNS, var5);
var14.put(DICT_OPTIONS, var6);
var14.put("cgreportHeadName", var2.getName());
@@ -241,9 +239,9 @@ public class OnlCgreportAPI {
String var5 = var3.getDbSource();
try {
Map var6 = SqlUtil.a(var2);
Map<String, Object> var6 = SqlUtil.a(var2);
var6.put(GET_ALL, var2.getAttribute(GET_ALL));
Map var7;
Map<String, Object> var7;
if (StringUtils.isNotBlank(var5)) {
log.debug("Online报表: 走了多数据源逻辑");
var7 = this.onlCgreportHeadService.executeSelectSqlDynamic(var5, var4, var6, var3.getId());
@@ -263,7 +261,7 @@ public class OnlCgreportAPI {
@GetMapping({"/getQueryInfo/{code}"})
public Result b(@PathVariable("code") String var1) {
try {
List var2 = this.onlCgreportItemService.getAutoListQueryInfo(var1);
List<Map<String, String>> var2 = this.onlCgreportItemService.getAutoListQueryInfo(var1);
return Result.OK(var2);
} catch (Exception var3) {
log.info(var3.getMessage(), var3);
@@ -274,9 +272,9 @@ public class OnlCgreportAPI {
@GetMapping({"/getParamsInfo/{code}"})
public Result c(@PathVariable("code") String var1) {
try {
LambdaQueryWrapper<OnlCgreportParam> var2 = new LambdaQueryWrapper();
LambdaQueryWrapper<OnlCgreportParam> var2 = new LambdaQueryWrapper<>();
var2.eq(OnlCgreportParam::getCgrheadId, var1);
List var3 = this.onlCgreportParamService.list(var2);
List<OnlCgreportParam> var3 = this.onlCgreportParamService.list(var2);
return Result.OK(var3);
} catch (Exception var4) {
log.info(var4.getMessage(), var4);
@@ -292,7 +290,7 @@ public class OnlCgreportAPI {
if (!oConvertUtils.isNotEmpty(var1)) {
throw new JeroBootException("参数错误");
} else {
Map var6 = null;
Map<String, Object> var6 = null;
try {
var6 = this.onlCgreportHeadService.queryCgReportConfig(var1);
@@ -309,10 +307,10 @@ public class OnlCgreportAPI {
var9 = (List)var10.get("records");
}
ArrayList var36 = new ArrayList();
HashMap var11 = new HashMap();
HashMap var12 = new HashMap();
ArrayList var13 = new ArrayList();
ArrayList var36 = new ArrayList<>();
HashMap var11 = new HashMap<>();
HashMap var12 = new HashMap<>();
ArrayList var13 = new ArrayList<>();
String var15;
for(int var14 = 0; var14 < var7.size(); ++var14) {
@@ -323,11 +321,10 @@ public class OnlCgreportAPI {
JSONArray var18 = JSON.parseArray(JSON.toJSONString(var9));
List var19 = this.a(oConvertUtils.getString(var17), var18, var15);
if (var19 != null && !var19.isEmpty()) {
ArrayList var20 = new ArrayList();
Iterator var21 = var19.iterator();
ArrayList var20 = new ArrayList<>();
while(var21.hasNext()) {
DictModel var22 = (DictModel)var21.next();
for (Object o : var19) {
DictModel var22 = (DictModel) o;
var20.add(var22.getText() + "_" + var22.getValue());
}
@@ -370,10 +367,9 @@ public class OnlCgreportAPI {
Entry var39 = (Entry)var37.next();
var42 = (String)var39.getKey();
List var43 = (List)var39.getValue();
Iterator var46 = var13.iterator();
while(var46.hasNext()) {
ExcelExportEntity var48 = (ExcelExportEntity)var46.next();
for (Object o : var13) {
ExcelExportEntity var48 = (ExcelExportEntity) o;
if (var42.equals(var48.getName()) && var48.isColspan()) {
var48.setSubColumnList(var43);
}
@@ -382,14 +378,12 @@ public class OnlCgreportAPI {
if (!var36.isEmpty()) {
BigDecimal var38 = BigDecimal.valueOf(0.0D);
Iterator var40 = var36.iterator();
while(var40.hasNext()) {
var42 = (String)var40.next();
Iterator var45 = var9.iterator();
for (Object o : var36) {
var42 = (String) o;
while(var45.hasNext()) {
Map var47 = (Map)var45.next();
for (Object value : var9) {
Map var47 = (Map) value;
String var49 = var47.get(var42).toString();
if (var49.matches("\\d+(.\\d+)?")) {
BigDecimal var51 = new BigDecimal(var49);
@@ -440,13 +434,13 @@ public class OnlCgreportAPI {
if (var3 == null) {
return Result.error(EN_IS_NULL);
} else {
QueryWrapper var4 = new QueryWrapper<>();
QueryWrapper<OnlCgreportItem> var4 = new QueryWrapper<>();
var4.eq(CGR_HEAD_ID, var3.getId());
var4.eq(IS_SHOW, 1);
var4.orderByAsc(ORDER_NUM);
List<OnlCgreportItem> var5 = this.onlCgreportItemService.list(var4);
ArrayList var6 = new ArrayList();
HashMap var7 = new HashMap();
ArrayList var6 = new ArrayList<>();
HashMap var7 = new HashMap<>();
HashMap var10;
for(Iterator<OnlCgreportItem> var8 = var5.iterator(); var8.hasNext(); var6.add(var10)) {
@@ -462,7 +456,7 @@ public class OnlCgreportAPI {
String var12 = var9.getDictCode();
if (oConvertUtils.isNotEmpty(var12)) {
List var13 = this.a(var9.getDictCode(), (JSONArray)null, (String)null);
List<DictModel> var13 = this.a(var9.getDictCode(), (JSONArray)null, (String)null);
var7.put(var9.getFieldName(), var13);
var10.put(CUSTOM_RENDER, var9.getFieldName());
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java
+14 -14
View File
@@ -62,10 +62,10 @@ public class OnlCgreportHeadController {
}
HashMap var13 = new HashMap<>();
ArrayList var4 = new ArrayList<>();
ArrayList var5 = new ArrayList<>();
List var6 = null;
List var7 = null;
ArrayList<OnlCgreportItem> var4 = new ArrayList<>();
ArrayList<OnlCgreportParam> var5 = new ArrayList<>();
List<String> var6;
List<String> var7;
try {
log.info("Online报表，sql解析：" + var1);
@@ -108,11 +108,11 @@ public class OnlCgreportHeadController {
int var10 = var12.getMessage().indexOf("Connection refused: connect");
if (var10 != -1) {
var9 = var9 + "数据源连接失败.";
} else if (var12.getMessage().indexOf("值可能存在SQL注入风险") != -1) {
} else if (var12.getMessage().contains("值可能存在SQL注入风险")) {
var9 = var9 + "SQL可能存在SQL注入风险.";
} else if (var12.getMessage().indexOf("该报表sql没有数据") != -1) {
} else if (var12.getMessage().contains("该报表sql没有数据")) {
var9 = var9 + "报表sql查询数据为空，无法解析字段.";
} else if (var12.getMessage().indexOf("SqlServer不支持SQL内排序") != -1) {
} else if (var12.getMessage().contains("SqlServer不支持SQL内排序")) {
var9 = var9 + "SqlServer不支持SQL内排序.";
} else {
var9 = var9 + "SQL语法错误.";
@@ -125,9 +125,9 @@ public class OnlCgreportHeadController {
@GetMapping({"/list"})
public Result<IPage<OnlCgreportHead>> a(OnlCgreportHead var1, @RequestParam(name = "pageNo",defaultValue = "1") Integer var2, @RequestParam(name = "pageSize",defaultValue = "10") Integer var3, HttpServletRequest var4) {
Result var5 = new Result<>();
QueryWrapper var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap());
Page var7 = new Page<>(var2, var3);
IPage var8 = this.onlCgreportHeadService.page(var7, var6);
QueryWrapper<OnlCgreportHead> var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap());
Page<OnlCgreportHead> var7 = new Page<>(var2, var3);
IPage<OnlCgreportHead> var8 = this.onlCgreportHeadService.page(var7, var6);
var5.setSuccess(true);
var5.setResult(var8);
return var5;
@@ -138,14 +138,14 @@ public class OnlCgreportHeadController {
try {
String var3 = CgformUtil.a();
OnlCgreportHead var4 = var1.getHead();
List var5 = var1.getParams();
List var6 = var1.getItems();
List<OnlCgreportParam> var5 = var1.getParams();
List<OnlCgreportItem> var6 = var1.getItems();
var4.setId(var3);
Iterator var7 = var5.iterator();
while(var7.hasNext()) {
OnlCgreportParam var8 = (OnlCgreportParam)var7.next();
var8.setId((String)null);
var8.setId(null);
var8.setCgrheadId(var3);
}
@@ -153,7 +153,7 @@ public class OnlCgreportHeadController {
while(var7.hasNext()) {
OnlCgreportItem var10 = (OnlCgreportItem)var7.next();
var10.setId((String)null);
var10.setId(null);
var10.setFieldName(var10.getFieldName().trim().toLowerCase());
var10.setCgrheadId(var3);
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/service/a/OnlCgreportHeadServiceImpl.java
+15 -15
View File
@@ -100,8 +100,8 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
}
HashMap var20 = new HashMap<>();
Integer var21 = oConvertUtils.getInt(params.get("pageSize"), 10);
Integer var22 = oConvertUtils.getInt(params.get("pageNo"), 1);
int var21 = oConvertUtils.getInt(params.get("pageSize"), 10);
int var22 = oConvertUtils.getInt(params.get("pageNo"), 1);
Page var24 = new Page<>(var22, var21);
LambdaQueryWrapper<OnlCgreportItem> var23 = new LambdaQueryWrapper<>();
var23.eq(OnlCgreportItem::getCgrheadId, onlCgreportHeadId);
@@ -121,7 +121,7 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
log.info("报表查询sql=>\r\n" + var15);
Object var17;
if (Boolean.valueOf(String.valueOf(params.get("getAll")))) {
if (Boolean.TRUE.equals(Boolean.valueOf(String.valueOf(params.get("getAll"))))) {
List<Map<String, Object>> var18 = this.mapper.executeSelect(var15);
var17 = new Page<>();
((IPage)var17).setRecords(var18);
@@ -144,7 +144,7 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
log.info("【Online多数据源逻辑】报表查询参数params: " + JSON.toJSONString(params));
LambdaQueryWrapper<OnlCgreportParam> var10 = new LambdaQueryWrapper<>();
var10.eq(OnlCgreportParam::getCgrheadId, onlCgreportHeadId);
List var11 = this.onlCgreportParamService.list(var10);
List<OnlCgreportParam> var11 = this.onlCgreportParamService.list(var10);
OnlCgreportParam var13;
String var15;
if (var11 != null && !var11.isEmpty()) {
@@ -163,7 +163,7 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
LambdaQueryWrapper<OnlCgreportItem> var24 = new LambdaQueryWrapper<>();
var24.eq(OnlCgreportItem::getCgrheadId, onlCgreportHeadId);
var24.eq(OnlCgreportItem::getIsSearch, 1);
List var25 = this.onlCgreportItemService.list(var24);
List<OnlCgreportItem> var25 = this.onlCgreportItemService.list(var24);
if (ReUtil.contains(ORDER_S_BY, sql.toLowerCase()) && "3".equalsIgnoreCase(var5.getDbType())) {
throw new JeroBootException(SQL_SERVER_NOT_ORDER);
} else {
@@ -179,7 +179,7 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
}
String var20 = var17;
if (!Boolean.valueOf(String.valueOf(params.get("getAll")))) {
if (Boolean.FALSE.equals(Boolean.valueOf(String.valueOf(params.get("getAll"))))) {
var20 = SqlUtils.createPageSqlByDBType(var5.getDbType(), var17, var8, var9);
}
@@ -189,7 +189,7 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
HashMap var21 = new HashMap<>();
Map var22 = (Map)DynamicDBUtil.findOne(dbKey, var18, new Object[0]);
var21.put(TOTAL, var22.get(TOTAL));
List var23 = DynamicDBUtil.findList(dbKey, var20, new Object[0]);
List<Map<String, Object>> var23 = DynamicDBUtil.findList(dbKey, var20, new Object[0]);
var21.put("records", CgformUtil.d(var23));
return var21;
}
@@ -354,8 +354,8 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
throw new JeroBootException(SQL_SERVER_NOT_ORDER);
}
IPage var9 = this.mapper.selectPageBySql(new Page<>(1L, 1L), var1);
List var6 = var9.getRecords();
IPage<Map<String, Object>> var9 = this.mapper.selectPageBySql(new Page<>(1L, 1L), var1);
List<Map<String, Object>> var6 = var9.getRecords();
if (var6.isEmpty()) {
throw new JeroBootException("该报表sql没有数据");
}
@@ -374,9 +374,9 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
@Override
public Map<String, Object> queryCgReportConfig(String reportId) {
HashMap var2 = new HashMap<>(0);
Map var3 = this.mapper.queryCgReportMainConfig(reportId);
List var4 = this.mapper.queryCgReportItems(reportId);
List var5 = this.mapper.queryCgReportParams(reportId);
Map<String, Object> var3 = this.mapper.queryCgReportMainConfig(reportId);
List<Map<String, Object>> var4 = this.mapper.queryCgReportItems(reportId);
List<OnlCgreportParam> var5 = this.mapper.queryCgReportParams(reportId);
if (DbTableUtil.a()) {
var2.put("main", CgformUtil.b(var3));
var2.put("items", CgformUtil.d(var4));
@@ -392,13 +392,13 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
@Override
public List<Map<?, ?>> queryByCgReportSql(String sql, Map params, Map paramData, int pageNo, int pageSize) {
String var6 = SqlUtil.a(sql, params);
List var7 = new ArrayList();
List var7 = new ArrayList<>();
if (pageNo == -1 && pageSize == -1) {
var7 = this.mapper.executeSelete(var6);
} else {
Page var8 = new Page<>(pageNo, pageSize);
IPage var9 = this.mapper.selectPageBySql(var8, var6);
Page<Map<String, Object>> var8 = new Page<>(pageNo, pageSize);
IPage<Map<String, Object>> var9 = this.mapper.selectPageBySql(var8, var6);
if (!CollectionUtils.isEmpty(var9.getRecords())) {
var7.addAll(var9.getRecords());
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/util/SqlUtil.java
+3 -3
View File
@@ -149,11 +149,11 @@ public class SqlUtil {
for(Matcher var3 = var2.matcher(var0); var3.find(); log.info("${}替换后结果 ==>" + var0)) {
String var4 = var3.group();
log.info("${}匹配带参SQL片段 ==>" + var4);
if (var4.indexOf("where") != -1) {
if (var4.contains("where")) {
var0 = var0.replace(var4, "where 1=1");
} else if (var4.indexOf("and") != -1) {
} else if (var4.contains("and")) {
var0 = var0.replace(var4, "and 1=1");
} else if (var4.indexOf("or") != -1) {
} else if (var4.contains("or")) {
var0 = var0.replace(var4, "or 1=1");
} else {
var0 = var0.replace(var4, "1=1");