|
@@ -13,16 +13,14 @@ import com.boman.common.core.web.domain.AjaxResult;
|
|
|
import com.boman.common.redis.RedisKey;
|
|
|
import com.boman.common.redis.service.RedisService;
|
|
|
import com.boman.domain.SysDictData;
|
|
|
+import com.boman.domain.constant.FormDataConstant;
|
|
|
import com.boman.gen.api.RemoteGenTableColumnService;
|
|
|
import com.boman.gen.api.RemoteGenTableService;
|
|
|
import com.boman.gen.controller.MyController;
|
|
|
import com.boman.gen.domain.GenTable;
|
|
|
import com.boman.gen.domain.GenTableColumn;
|
|
|
-import com.boman.gen.domain.GenTableRelation;
|
|
|
-import com.boman.gen.util.GenUtils;
|
|
|
import com.boman.system.api.RemoteDictDataService;
|
|
|
import com.boman.system.api.domain.SysFile;
|
|
|
-import com.boman.web.core.constant.FormDataConstant;
|
|
|
import com.boman.web.core.constant.MaskConstant;
|
|
|
import com.boman.web.core.constant.SubmitConstant;
|
|
|
import com.boman.web.core.domain.*;
|
|
@@ -47,7 +45,7 @@ import java.util.concurrent.TimeUnit;
|
|
|
import java.util.function.Predicate;
|
|
|
|
|
|
import static com.boman.common.core.utils.obj.ObjectUtils.*;
|
|
|
-import static com.boman.web.core.constant.FormDataConstant.*;
|
|
|
+import static com.boman.domain.constant.FormDataConstant.*;
|
|
|
import static com.boman.web.core.utils.ColumnUtils.*;
|
|
|
|
|
|
/**
|
|
@@ -262,30 +260,47 @@ public class TableServiceCmdService {
|
|
|
String selfColumnName = column.getColumnName();
|
|
|
for (JSONObject json : result) {
|
|
|
if (json.containsKey(selfColumnName.toUpperCase()) || json.containsKey(selfColumnName.toLowerCase())) {
|
|
|
- // 外键在table_column中的id
|
|
|
- Long fkColumnId = Long.parseLong(column.getForeignKey());
|
|
|
- GenTableColumn fkTableColumn = remoteGenTableColumnService.getById(fkColumnId);
|
|
|
- String fkColumnName = fkTableColumn.getColumnName();
|
|
|
- Long fkTableId = fkTableColumn.getTableId();
|
|
|
- GenTable fkGenTable = remoteGenTableService.getByTableId(fkTableId);
|
|
|
- // 显示键 table_column 表的id
|
|
|
- Long dkColumnId = fkGenTable.getDkColumn();
|
|
|
- GenTableColumn dkTableColumn = remoteGenTableColumnService.getById(dkColumnId);
|
|
|
- String dkColumnName = dkTableColumn.getColumnName();
|
|
|
- String fkTableName = fkGenTable.getTableName();
|
|
|
- Object primaryTableFKvalue = json.get(selfColumnName);
|
|
|
- // "DEPT_ID": {"value": 104, "name": "开发部"}
|
|
|
+ Map<String, String> fkInfoMap = column.getFkInfo();
|
|
|
+ String fkTableName = fkInfoMap.get(FK_TABLE_NAME);
|
|
|
+ String fkColumnName = fkInfoMap.get(FK_COLUMN_NAME);
|
|
|
+ String dkColumnName = fkInfoMap.get(DK_COLUMN_NAME);
|
|
|
+ Object primaryTableFkValue = json.get(selfColumnName);
|
|
|
+
|
|
|
JSONObject param = new JSONObject();
|
|
|
- param.put(fkColumnName, primaryTableFKvalue);
|
|
|
- List<JSONObject> fkList = selectService.getByMap(fkTableName, param);
|
|
|
-
|
|
|
- for (JSONObject object : fkList) {
|
|
|
- Object value = object.get(dkColumnName);
|
|
|
- jsonObject.put(SINGLE_OBJ_NAME, primaryTableFKvalue);
|
|
|
- jsonObject.put(SINGLE_OBJ_VALUE, value);
|
|
|
- json.put(selfColumnName.toLowerCase(), jsonObject);
|
|
|
- break;
|
|
|
- }
|
|
|
+ param.put(fkColumnName, primaryTableFkValue);
|
|
|
+ JSONObject fkInfo = selectService.getOneByMap(fkTableName, param);
|
|
|
+
|
|
|
+ Object value = fkInfo.get(dkColumnName);
|
|
|
+ jsonObject.put(SINGLE_OBJ_NAME, primaryTableFkValue);
|
|
|
+ jsonObject.put(SINGLE_OBJ_VALUE, value);
|
|
|
+ json.put(selfColumnName.toLowerCase(), jsonObject);
|
|
|
+
|
|
|
+
|
|
|
+ // method();=> fkTableName、fkColumnName
|
|
|
+ // 外键在table_column中的id
|
|
|
+// Long fkColumnId = Long.parseLong(column.getForeignKey());
|
|
|
+// GenTableColumn fkTableColumn = remoteGenTableColumnService.getById(fkColumnId);
|
|
|
+// String fkColumnName = fkTableColumn.getColumnName();
|
|
|
+// Long fkTableId = fkTableColumn.getTableId();
|
|
|
+// GenTable fkGenTable = remoteGenTableService.getByTableId(fkTableId);
|
|
|
+// // 显示键 table_column 表的id
|
|
|
+// Long dkColumnId = fkGenTable.getDkColumn();
|
|
|
+// GenTableColumn dkTableColumn = remoteGenTableColumnService.getById(dkColumnId);
|
|
|
+// String dkColumnName = dkTableColumn.getColumnName();
|
|
|
+// String fkTableName = fkGenTable.getTableName();
|
|
|
+// Object primaryTableFkValue = json.get(selfColumnName);
|
|
|
+// // "DEPT_ID": {"value": 104, "name": "开发部"}
|
|
|
+// JSONObject param = new JSONObject();
|
|
|
+// param.put(fkColumnName, primaryTableFkValue);
|
|
|
+// List<JSONObject> fkList = selectService.getByMap(fkTableName, param);
|
|
|
+//
|
|
|
+// for (JSONObject object : fkList) {
|
|
|
+// Object value = object.get(dkColumnName);
|
|
|
+// jsonObject.put(SINGLE_OBJ_NAME, primaryTableFkValue);
|
|
|
+// jsonObject.put(SINGLE_OBJ_VALUE, value);
|
|
|
+// json.put(selfColumnName.toLowerCase(), jsonObject);
|
|
|
+// break;
|
|
|
+// }
|
|
|
}
|
|
|
}
|
|
|
}
|