From 5b95b853f88b9f8c97daacc53bfa4fa76698af54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Wed, 8 Mar 2023 15:46:01 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91QueryGenerator?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/system/query/QueryGenerator.java | 51 ++++++++----------- 1 file changed, 20 insertions(+), 31 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/query/QueryGenerator.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/query/QueryGenerator.java index e53fca03..c7db9891 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/query/QueryGenerator.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/query/QueryGenerator.java @@ -1,5 +1,22 @@ package com.jero.common.system.query; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.constant.CommonConstant; +import com.jero.common.constant.DataBaseConstant; +import com.jero.common.system.util.JeroDataAutorUtils; +import com.jero.common.system.util.JwtUtil; +import com.jero.common.system.vo.SysPermissionDataRuleModel; +import com.jero.common.util.CommonUtils; +import com.jero.common.util.DateUtils; +import com.jero.common.util.SqlInjectionUtil; +import com.jero.common.util.oConvertUtils; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.util.NumberUtils; + import java.beans.PropertyDescriptor; import java.io.UnsupportedEncodingException; import java.lang.reflect.Field; @@ -12,28 +29,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; -import lombok.val; -import org.apache.commons.beanutils.PropertyUtils; -import com.jero.common.constant.CommonConstant; -import com.jero.common.constant.DataBaseConstant; -import com.jero.common.system.util.JeroDataAutorUtils; -import com.jero.common.system.util.JwtUtil; -import com.jero.common.system.vo.SysPermissionDataRuleModel; -import com.jero.common.util.CommonUtils; -import com.jero.common.util.DateUtils; -import com.jero.common.util.SqlInjectionUtil; -import com.jero.common.util.oConvertUtils; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.util.NumberUtils; - -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.annotation.DbType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; - -import lombok.extern.slf4j.Slf4j; - @Slf4j public class QueryGenerator { @@ -679,7 +674,7 @@ public class QueryGenerator { */ public static Set getSqlRuleParams(String sql) { if(oConvertUtils.isEmpty(sql)){ - return null; + return Collections.emptySet(); } Set varParams = new HashSet<>(); String regex = "\\#\\{\\w+\\}"; @@ -982,7 +977,7 @@ public class QueryGenerator { * @return */ public static String getAllConfigAuth() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); //权限查询 Map ruleMap = getRuleMap(); String sql_and = " and "; @@ -1050,13 +1045,7 @@ public class QueryGenerator { private static String getTableFieldName(Class clazz, String name) { try { //如果字段加注解了@TableField(exist = false),不走DB查询 - Field field = null; - try { - field = clazz.getDeclaredField(name); - } catch (NoSuchFieldException e) { - //e.printStackTrace(); - } - + Field field = clazz.getDeclaredField(name); //如果为空，则去父类查找字段 if (field == null) { List allFields = getClassFields(clazz);