Commit 81447810 by qiuchaofei

1修改返回的结果集结构。

parent 7dce7e21
...@@ -3,6 +3,7 @@ package com.keymobile.metadata.metadataRelation.controller; ...@@ -3,6 +3,7 @@ package com.keymobile.metadata.metadataRelation.controller;
import com.keymobile.metadata.metadataRelation.pojo.BaseRelationship; import com.keymobile.metadata.metadataRelation.pojo.BaseRelationship;
import com.keymobile.metadata.metadataRelation.pojo.MetaData; import com.keymobile.metadata.metadataRelation.pojo.MetaData;
import com.keymobile.metadata.metadataRelation.pojo.returnBean.Edge; import com.keymobile.metadata.metadataRelation.pojo.returnBean.Edge;
import com.keymobile.metadata.metadataRelation.pojo.returnBean.MetaModel;
import com.keymobile.metadata.metadataRelation.pojo.returnBean.Node; import com.keymobile.metadata.metadataRelation.pojo.returnBean.Node;
import com.keymobile.metadata.metadataRelation.pojo.returnBean.ReturnReslult; import com.keymobile.metadata.metadataRelation.pojo.returnBean.ReturnReslult;
import com.keymobile.metadata.metadataRelation.service.IBaseRelationshipService; import com.keymobile.metadata.metadataRelation.service.IBaseRelationshipService;
...@@ -54,7 +55,7 @@ public class MetaDataController { ...@@ -54,7 +55,7 @@ public class MetaDataController {
List<MetaData> metaDataList = metadataService.finAllMetaData(); List<MetaData> metaDataList = metadataService.finAllMetaData();
Map<Long,Node> nodeMap = new HashMap<>(); Map<Long,Node> nodeMap = new HashMap<>();
Map<String,String> iconMap = new HashMap<>(); Map<String, MetaModel> metaModelMap = new HashMap<>();
for(MetaData metaData:metaDataList){ for(MetaData metaData:metaDataList){
Node node = new Node(); Node node = new Node();
...@@ -63,9 +64,14 @@ public class MetaDataController { ...@@ -63,9 +64,14 @@ public class MetaDataController {
node.setId(metaData.getMetadataId()); node.setId(metaData.getMetadataId());
node.setIcon(modelName); node.setIcon(modelName);
if(!iconMap.containsKey(modelName)){ if(!metaModelMap.containsKey(modelName)){
MetaModel model = new MetaModel();
String iconContext = getIconByModelId(modelName); String iconContext = getIconByModelId(modelName);
iconMap.put(modelName,iconContext); model.setModelName(modelName);
model.setCnName(modelName);
model.setDescription("");
model.setIcon(iconContext);
metaModelMap.put(modelName,model);
} }
node.setName(metaData.getName()); node.setName(metaData.getName());
...@@ -98,7 +104,7 @@ public class MetaDataController { ...@@ -98,7 +104,7 @@ public class MetaDataController {
} }
logger.info("关系的数量:"+result.getEdges().size()); logger.info("关系的数量:"+result.getEdges().size());
result.setIconMap(iconMap); result.setMetaModelMap(metaModelMap);
return result; return result;
} }
......
package com.keymobile.metadata.metadataRelation.pojo.returnBean;
public class MetaModel {
private String modelName;
private String icon;
private String cnName;
private String description;
public String getModelName() {
return modelName;
}
public void setModelName(String modelName) {
this.modelName = modelName;
}
public String getIcon() {
return icon;
}
public void setIcon(String icon) {
this.icon = icon;
}
public String getCnName() {
return cnName;
}
public void setCnName(String cnName) {
this.cnName = cnName;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
}
package com.keymobile.metadata.metadataRelation.pojo.returnBean; package com.keymobile.metadata.metadataRelation.pojo.returnBean;
import org.apache.commons.collections.map.HashedMap;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -11,16 +13,16 @@ public class ReturnReslult { ...@@ -11,16 +13,16 @@ public class ReturnReslult {
private List<Node> nodes = new ArrayList<>(); private List<Node> nodes = new ArrayList<>();
private Map<String,String> iconMap = new HashMap<>(); public Map<String, MetaModel> getMetaModelMap() {
return metaModelMap;
public Map<String, String> getIconMap() {
return iconMap;
} }
public void setIconMap(Map<String, String> iconMap) { public void setMetaModelMap(Map<String, MetaModel> metaModelMap) {
this.iconMap = iconMap; this.metaModelMap = metaModelMap;
} }
private Map<String,MetaModel> metaModelMap = new HashedMap();
public List<Edge> getEdges() { public List<Edge> getEdges() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment