Commit 869aa017 authored by Gwofoo's avatar Gwofoo

修改 显示组件库时的卡片详细信息

parent 76f816ca
......@@ -28,4 +28,8 @@ public class ToolLibraryDetailModel extends BaseModel {
@ApiModelProperty(value = "thumb")
private String thumb;
// 工具描述
@ApiModelProperty(value = "descr")
private String descr;
}
......@@ -39,7 +39,7 @@ public class ToolLibraryService extends BaseService<ToolLibraryModel, ToolLibrar
/**
* 由一级到二级
*/
public List<ToolLibraryTreeModel> queryForComponentList(String designer) throws ClassNotFoundException, SQLException {
public List<ToolLibraryTreeModel> queryForComponentList(String designer) throws SQLException {
Connection connection = dataSource.getConnection();
List<Map<String, Object>> displayMaps = DatabaseUtils.getMaps
("select display_name, DESIGNER_TYPE,SEQUENCE_NBR,parent from morphic_widget_group where DESIGNER_TYPE " +
......@@ -84,7 +84,7 @@ public class ToolLibraryService extends BaseService<ToolLibraryModel, ToolLibrar
* 由二级到三级
*/
public Page<ToolLibraryDetailModel> queryForComponentListDetails(Page<ToolLibraryDetailModel> page, String sequenceNbr)
throws ClassNotFoundException, SQLException {
throws SQLException {
Connection connection = dataSource.getConnection();
// 先查当前节点的parent,看是不是0,从而判断在叶子节点还是父节点
List<Map<String, Object>> clickedNodeMaps = DatabaseUtils.getMaps(
......@@ -102,14 +102,15 @@ public class ToolLibraryService extends BaseService<ToolLibraryModel, ToolLibrar
"where is_delete != 1 and parent = " + sequenceNbr, connection);
for (Map<String, Object> map : displayMaps) {
String seqNbr = map.get("SEQUENCE_NBR").toString();
displayTools.addAll(DatabaseUtils.getMaps("select SEQUENCE_NBR, category, component_key, name, thumb " +
displayTools.addAll(DatabaseUtils.getMaps(
"select SEQUENCE_NBR, category, component_key, name, thumb, descr " +
"from morphic_widget where is_delete != 1 and group_id = " + seqNbr, connection));
}
} else {
// 叶子节点
// 查询morphic_widget表中,group_id为sequenceNbr的所有工具数据
displayTools.addAll(DatabaseUtils.getMaps(
"select SEQUENCE_NBR, category, component_key, name, thumb " +
"select SEQUENCE_NBR, category, component_key, name, thumb, descr " +
"from morphic_widget " +
"where is_delete != 1 and group_id = " + sequenceNbr, connection));
}
......@@ -123,6 +124,7 @@ public class ToolLibraryService extends BaseService<ToolLibraryModel, ToolLibrar
model.setComponentKey(map.get("component_key").toString());
model.setName(map.get("name").toString());
model.setThumb(map.get("thumb").toString());
model.setDescr((String) Optional.ofNullable(map.get("descr")).orElse("无"));
records.add(model);
}
// 封装Page
......
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