dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 视图插件支持与或过滤器

Browse Source
This commit is contained in:
junjun 2023-12-28 11:49:11 +08:00
parent 2e54af1df0
commit e1f1f10d42
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/backend/src/main/java/io/dataease/service/chart/ViewPluginBaseServiceImpl.java
View File

@ -90,10 +90,10 @@ public class ViewPluginBaseServiceImpl implements ViewPluginBaseService {
SQLObj sqlObj = BeanUtils.copyBean(SQLObj.builder().build(), pluginViewSQL); SQLObj sqlObj = BeanUtils.copyBean(SQLObj.builder().build(), pluginViewSQL);
FilterTreeObj filters = gson.fromJson(gson.toJson(obj), FilterTreeObj.class); FilterTreeObj filters = gson.fromJson(gson.toJson(obj), FilterTreeObj.class);
logger.info("filters:" + gson.toJson(filters)); logger.info("filters:" + gson.toJson(filters));
Object o1 = execProviderMethod(queryProvider, methodName, sqlObj, filters); Object o1 = execProviderSuperMethod(queryProvider, methodName, sqlObj, filters);
logger.info("o1:" + (String) o1); logger.info("o1:" + (String) o1);
Object o; Object o;
if ((o = execProviderMethod(queryProvider, methodName, sqlObj, filters)) != null) { if ((o = execProviderSuperMethod(queryProvider, methodName, sqlObj, filters)) != null) {
logger.info("customWhereString:" + o); logger.info("customWhereString:" + o);
return (String) o; return (String) o;
} }
@ -231,6 +231,18 @@ public class ViewPluginBaseServiceImpl implements ViewPluginBaseService {
return null; return null;
} }
private Object execProviderSuperMethod(QueryProvider queryProvider, String methodName, Object... args) {
Method[] declaredMethods = queryProvider.getClass().getMethods();
for (int i = 0; i < declaredMethods.length; i++) {
Method method = declaredMethods[i];
if (StringUtils.equals(method.getName(), methodName)) {
method.setAccessible(true);
return ReflectUtil.invoke(queryProvider, method, args);
}
}
return null;
}
private Object execProviderMethod(QueryProvider queryProvider, String methodName, Object... args) { private Object execProviderMethod(QueryProvider queryProvider, String methodName, Object... args) {
Method[] declaredMethods = queryProvider.getClass().getDeclaredMethods(); Method[] declaredMethods = queryProvider.getClass().getDeclaredMethods();
for (int i = 0; i < declaredMethods.length; i++) { for (int i = 0; i < declaredMethods.length; i++) {