From 35c390431b4ffa1e3f50371a46b4e9ac63d9aa70 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期五, 17 四月 2026 09:45:08 +0800
Subject: [PATCH] Merge branch 'saas' of http://nonxin.cn:8090/r/product/product-server-tool-face/V2.0.0 into saas
---
src/main/java/com/product/face/entity/FaceListEntity.java | 157 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 108 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/product/face/entity/FaceListEntity.java b/src/main/java/com/product/face/entity/FaceListEntity.java
index 8b563cc..164ec4d 100644
--- a/src/main/java/com/product/face/entity/FaceListEntity.java
+++ b/src/main/java/com/product/face/entity/FaceListEntity.java
@@ -348,6 +348,18 @@
* @return
*/
public Map<String, List<String>> getFilters(Map<String, List<String>> tableAlias, Map<String, List<String>> aliasField,Map<String, List<String>> tableAndField) {
+ return getFilters(tableAlias, aliasField,tableAndField,false);
+ }
+ /**
+ * 鏂扮殑鏂规硶锛屾牴鎹煡璇㈣鍙ョ殑涓殑琛ㄥ埆鍚嶏紝鐢熸垚鏌ヨ鏉′欢
+ *
+ * @param tableAlias 琛ㄥ埆鍚�
+ * @param aliasField 瀛楁鍒悕
+ * @param tableAndField 琛ㄤ腑瀛楁
+ * @return
+ */
+ public Map<String, List<String>> getFilters(Map<String, List<String>> tableAlias, Map<String, List<String>> aliasField,Map<String, List<String>> tableAndField,boolean unionSql) {
+
DataPoolCacheImpl poolCache = null;
//鎵�鏈夊瓧娈甸泦鍚�
List<FaceField> faceFields = this.getFaceFields();
@@ -365,38 +377,65 @@
if (!faceField.isSearch()) {
continue;
}
- if (StringUtils.isEmpty(faceField.getFieldName()) || StringUtils.isEmpty(faceField.getFieldReference())) {
- if (poolCache == null) {
- poolCache = DataPoolCacheImpl.getInstance();
- }
- DataTableEntity dt = poolCache.getCacheData("琛ㄥ瓧娈典俊鎭�", new String[]{getTableUuid(), faceField.getFieldName()});
- if (BaseUtil.dataTableIsEmpty(dt)) {
- } else {
- FieldSetEntity f = dt.getFieldSetEntity(0);
- faceField.setFieldName(f.getString(CmnConst.FIELD_NAME));
- faceField.setFieldReference(f.getString("field_reference"));
- }
- }
- //瀛楁鍚嶇О
+ //瀛楁鍚嶇О,鍙兘鏄瓧娈靛埆鍚�
String fieldName = faceField.getFieldName();
- if (!StringUtils.isEmpty(fieldName)) {
- fieldName.trim();
- }
- if (aliasField != null && !StringUtils.isEmpty(fieldName)) {
- List<String> fieldAlias = aliasField.get(getTableName() + "." + fieldName);
- if (fieldAlias != null && fieldAlias.size() > 0) {
- String alias = fieldAlias.get(0);
- if (!StringUtils.isEmpty(alias)) {
- fieldName = alias.trim();
+ String factFieldName =fieldName;//鐪熷疄鐨勫瓧娈靛悕
+ //闇�瑕佸幓鏌ュ嚭鐪熷疄瀛楁鍚�
+ if (aliasField != null) {
+
+ for(String key:aliasField.keySet()) {
+ List<String> fieldAlias = aliasField.get(key);
+ if (fieldAlias != null && fieldAlias.size() > 0) {
+ for(int j=0;j<fieldAlias.size();j++){
+ String alias = fieldAlias.get(j);
+ if(fieldName.equals(alias)) {
+ factFieldName = key.trim();
+ if(factFieldName.indexOf('.')>0) {
+ factFieldName=factFieldName.substring(factFieldName.indexOf('.')+1);
+ }
+ }
+ }
}
}
}
+ //鍙栨煡璇㈡潯浠朵腑鐨勫瓧娈碉紝濡傛灉鏈夊埆鍚嶏紝鍒欐樉绀恒�愬埆鍚�.瀛楁鍚嶃��
+ String aliasTableField=getFieldName(tableAlias,aliasField, tableAndField, fieldName,factFieldName,unionSql);
+
+ //鏌ュ嚭瀛楁瀵瑰簲鐨勫弬鐓ч厤缃�
+ if (//StringUtils.isEmpty(faceField.getFieldName()) ||
+ StringUtils.isEmpty(faceField.getFieldReference())) {
+ if (poolCache == null) {
+ poolCache = DataPoolCacheImpl.getInstance();
+ }
+ DataTableEntity dt = poolCache.getCacheData("琛ㄥ瓧娈典俊鎭�", new String[]{getTableUuid(),factFieldName});
+ if (BaseUtil.dataTableIsEmpty(dt)) {
+
+ } else {
+ FieldSetEntity f = dt.getFieldSetEntity(0);
+// faceField.setFieldName(f.getString(CmnConst.FIELD_NAME));
+ faceField.setFieldReference(f.getString("field_reference"));
+ }
+ }
+
+// if (!StringUtils.isEmpty(fieldName)) {
+// fieldName.trim();
+// }
+// if (aliasField != null && !StringUtils.isEmpty(fieldName)) {
+// List<String> fieldAlias = aliasField.get(getTableName() + "." + fieldName);
+// if (fieldAlias != null && fieldAlias.size() > 0) {
+// String alias = fieldAlias.get(0);
+// if (!StringUtils.isEmpty(alias)) {
+// fieldName = alias.trim();
+// }
+// }
+// }
//鍙傜収澶勭悊
String field_reference = faceField.getFieldReference();
if (!StringUtils.isEmpty(field_reference)) {
if (field_reference.indexOf("銆�") == 0 && field_reference.indexOf("銆�") > 0) {
//鏅�氬弬鐓�
- filters.add(getDictFilter(getFieldName(tableAlias,aliasField, tableAndField, fieldName), field_reference.replace("銆�", "").replace("銆�", "")));
+// filters.add(getDictFilter(getFieldName(tableAlias,aliasField, tableAndField, fieldName), field_reference.replace("銆�", "").replace("銆�", "")));
+ filters.add(getDictFilter(aliasTableField, field_reference.replace("銆�", "").replace("銆�", "")));
continue;
} else {
if (poolCache == null) {
@@ -409,16 +448,18 @@
}
FieldSetEntity ff = prompt.getFieldSetEntity(0);
StringBuilder p = new StringBuilder();
- p.append(getFieldName(tableAlias,aliasField, tableAndField, fieldName)).append(" in ").append(" ( SELECT ").append(ff.getString("value_field")).append(" FROM ").append(ff.getString("source_table"));
+// p.append(getFieldName(tableAlias,aliasField, tableAndField, fieldName)).append(" in ").append(" ( SELECT ").append(ff.getString("value_field")).append(" FROM ").append(ff.getString("source_table"));
+ p.append(aliasTableField).append(" in ").append(" ( SELECT ").append(ff.getString("value_field")).append(" FROM ").append(ff.getString("source_table"));
p.append(" WHERE ").append(ff.getString("view_fields")).append(" like concat('%','~val~','%') )");
filters.add(p.toString());
continue;
}
}
- if (!StringUtils.isEmpty(faceField.getFieldName())) {
- fieldNames.add(getFieldName(tableAlias,aliasField, tableAndField, fieldName));
- }
+// if (!StringUtils.isEmpty(faceField.getFieldName())) {
+// fieldNames.add(getFieldName(tableAlias,aliasField, tableAndField, fieldName););
+// }
+ fieldNames.add(aliasTableField);
}
//鑾峰彇redis 璧峰key
String faceListKey = SystemFaceService.FACE_LIST_KEY;
@@ -435,17 +476,35 @@
return fieldName;
}
//鏂版柟娉�
- private String getFieldName(Map<String, List<String>> tableAlias,Map<String, List<String>> aliasField, Map<String, List<String>> tableAndField, String fieldName) {
+ //鑾峰彇銆愯〃鍚�.瀛楁鍚嶃�戯紝鍝灉娌℃湁琛ㄥ埆鍚嶏紝鍙繑鍥炲瓧娈靛悕
+ private String getFieldName(Map<String, List<String>> tableAlias,Map<String, List<String>> aliasField, Map<String, List<String>> tableAndField, String fieldName,String factFieldName) {
+ return getFieldName(tableAlias,aliasField, tableAndField, fieldName,factFieldName,false);
+ }
+ //鏂版柟娉�
+ /**
+ * 鑾峰彇銆愯〃鍚�.瀛楁鍚嶃�戯紝鍝灉娌℃湁琛ㄥ埆鍚嶏紝鍙繑鍥炲瓧娈靛悕
+ * @param tableAlias
+ * @param aliasField
+ * @param tableAndField
+ * @param fieldName
+ * @param factFieldName
+ * @param unionSql 鏄惁鏄敱union 缁勬垚鐨勫琛ㄦ煡璇紝涓旀槸鏀惧湪鏈�澶栧眰鐨勬煡璇㈡潯浠讹紝鏄垯涓嶈兘鍦ㄥ瓧娈靛墠闈㈠姞琛ㄥ埆鍚嶏紝鍚﹀垯瑕佹坊鍔犺〃鍒悕,閫傜敤sql濡傦細
+ * select * from (select* from xxx a union all select * from xxx b) where 鏉′欢
+ * @return
+ */
+ private String getFieldName(Map<String, List<String>> tableAlias,Map<String, List<String>> aliasField, Map<String, List<String>> tableAndField, String fieldName,String factFieldName,boolean unionSql) {
+
+ if(unionSql) return fieldName;
+
String table=null;
boolean b=false;
if(tableAndField!=null && !tableAndField.isEmpty()) {
for(String key:tableAndField.keySet()) {
for(String field:tableAndField.get(key)) {
if(fieldName.equals(field)) {
-
List<String>alias=tableAlias.get(key);
if(alias!=null && !alias.isEmpty()) {
- table=alias.get(0);//鍙栫涓�涓埆鍚�
+ table=alias.get(0);//鍙栫涓�涓〃鍒悕
}
b=true;
break;
@@ -455,28 +514,28 @@
}
}
b=false;
- //鎵惧埌瀛楁鐨勭湡瀹炲悕瀛�
- for(String f:aliasField.keySet()) {
- List<String> fs=aliasField.get(f);
- if(!fs.isEmpty()) {
- for(String af:fs) {
- //瀛楁鍒悕鏈夊彲鑳芥槸甯� 琛ㄥ埆鍚�
- int c=af.indexOf('.');
- if(c>0)af=af.substring(c+1);
- if(fieldName.equals(af)) {
- fieldName=f;
- b=true;
- break;
- }
- }
- }
- if(b)break;
- }
+// //鎵惧埌瀛楁鐨勭湡瀹炲悕瀛�
+// for(String f:aliasField.keySet()) {
+// List<String> fs=aliasField.get(f);
+// if(!fs.isEmpty()) {
+// for(String af:fs) {
+// //瀛楁鍒悕鏈夊彲鑳芥槸甯� 琛ㄥ埆鍚�
+// int c=af.indexOf('.');
+// if(c>0)af=af.substring(c+1);
+// if(fieldName.equals(af)) {
+// fieldName=f;
+// b=true;
+// break;
+// }
+// }
+// }
+// if(b)break;
+// }
if (fieldName.indexOf('.')<0 && !StringUtils.isEmpty(table)) {
- return "`" + table + "`." + fieldName;
+ return "`" + table + "`." + factFieldName;
}
- return fieldName;
+ return factFieldName;
}
/**
--
Gitblit v1.9.2