diff --git a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java index bb8a0c9..c628c15 100644 --- a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java @@ -63,7 +63,7 @@ public class DataServiceImpl implements DataService { List result = new ArrayList<>(); String sql = "SELECT COLUMN_NAME name, COLUMN_COMMENT comment FROM information_schema.columns WHERE TABLE_NAME='" - + tableName + "' AND TABLE_SCHEMA='" + schema + "'"; + + tableName + "' AND TABLE_SCHEMA='" + schema + "' ORDER BY comment,name"; List list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ColumnModel.class)); for (ColumnModel item : list) { String col = item.getName(); diff --git a/src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java index 3b5bdcf..4417fa7 100644 --- a/src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java @@ -114,11 +114,11 @@ public class ParamBindServiceImpl implements ParamBindService { if (StringUtils.isBlank(att.getColName())) { msgList.add(att.getDoName() + "该属性还未配置绑定字段"); } else { - String paramindex = param + "$" + att.getParam(); - Optional optionalRpt = rptparamindexRepository.findById(paramindex); - if (!optionalRpt.isPresent()) { - throw new Exception("未找到该Rptparamindex,对象参引=" + paramindex); - } +// String paramindex = param + "$" + att.getParam(); +// Optional optionalRpt = rptparamindexRepository.findById(paramindex); +// if (!optionalRpt.isPresent()) { +// throw new Exception("未找到该Rptparamindex,对象参引=" + paramindex); +// } } } diff --git a/src/main/java/com/xydl/cac/util/IcdXmlUtil.java b/src/main/java/com/xydl/cac/util/IcdXmlUtil.java index b675ca0..7eaa1e0 100644 --- a/src/main/java/com/xydl/cac/util/IcdXmlUtil.java +++ b/src/main/java/com/xydl/cac/util/IcdXmlUtil.java @@ -65,11 +65,19 @@ public class IcdXmlUtil { JsonNode lnNode = mapLN.get(lnClass + lnInst); String lnType = lnNode.get("lnType").asText(); - String lnDesc = lnNode.get("desc").asText(); + JsonNode nodeLnDesc = lnNode.get("desc"); + String lnDesc = null; + if (nodeLnDesc != null) { + lnDesc = nodeLnDesc.asText(); + } JsonNode nodeLNodeType = mapLNodeType.get(lnType); JsonNode nodeDO = findLNodeType_DO_Node(nodeLNodeType, doName); String doType = nodeDO.get("type").asText(); - String doDesc = nodeDO.get("desc").asText(); + JsonNode nodeDoDesc = nodeDO.get("desc"); + String doDesc = null; + if (nodeDoDesc != null) { + doDesc = nodeDoDesc.asText(); + } JsonNode nodeDOType = mapDOType.get(doType); String lastname = findLastname(nodeDOType, fc, mapDAType);