diff --git a/sql/init.sql b/sql/init.sql index a78989d..4d9c055 100644 --- a/sql/init.sql +++ b/sql/init.sql @@ -1,20 +1,23 @@ -CREATE TABLE `icd_file_config` ( +CREATE TABLE `icd_config_type` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `ied_name` varchar(45) NOT NULL, - `ldevice_inst` varchar(45) NOT NULL, - `ln_class` varchar(45) NOT NULL, - `do_name` varchar(45) NOT NULL, - `last_name` varchar(45) DEFAULT NULL, - `table_name` varchar(45) DEFAULT NULL, - `col_name` varchar(45) DEFAULT NULL, + `ied_name` varchar(45) NOT NULL COMMENT 'IED名称', + `ldevice_inst` varchar(45) NOT NULL COMMENT '设备类型', + `ln_class` varchar(45) NOT NULL COMMENT 'LN类型', + `table_name` varchar(45) DEFAULT NULL COMMENT '表名', PRIMARY KEY (`id`), - KEY `idxKey` (`ied_name`,`ldevice_inst`,`ln_class`,`do_name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -CREATE TABLE `icd_file_config_inst` ( + KEY `idxKey` (`ied_name`,`ldevice_inst`,`ln_class`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='ICD配置类型表'; +CREATE TABLE `icd_config_type_att` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `config_id` int(11) NOT NULL, - `inst` varchar(45) DEFAULT NULL, - `paramindex` varchar(200) DEFAULT NULL, - PRIMARY KEY (`id`), - KEY `idxConfigid` (`config_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + `icd_config_type_id` int(11) NOT NULL COMMENT '配置类型表id', + `do_name` varchar(45) NOT NULL COMMENT '属性', + `param` varchar(200) DEFAULT NULL COMMENT '参数', + `col_name` varchar(45) DEFAULT NULL COMMENT '字段名', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='ICD配置类型属性表'; +CREATE TABLE `icd_config_type_inst` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `icd_config_type_id` int(11) NOT NULL COMMENT '配置类型表id', + `inst` varchar(45) NOT NULL COMMENT '实例', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='ICD配置类型实例表'; diff --git a/src/main/java/com/xydl/cac/entity/IcdConfigType.java b/src/main/java/com/xydl/cac/entity/IcdConfigType.java index b2bc03c..9b32f1c 100644 --- a/src/main/java/com/xydl/cac/entity/IcdConfigType.java +++ b/src/main/java/com/xydl/cac/entity/IcdConfigType.java @@ -24,16 +24,16 @@ public class IcdConfigType { @Column(name = "id") private Integer id; - @Column(name = "ied_name") + @Column(name = "IED名称") private String iedName; - @Column(name = "ldevice_inst") + @Column(name = "设备类型") private String ldeviceInst; - @Column(name = "ln_class") + @Column(name = "LN类型") private String lnClass; - @Column(name = "table_name") + @Column(name = "表名") private String tableName; @Transient @@ -46,14 +46,14 @@ public class IcdConfigType { @Transient private List instList; - public void addAtt(String doName, String lastname) { + public void addAtt(String doName, String param) { if (attMap == null) { attMap = new LinkedHashMap<>(); } if (!attMap.containsKey(doName)) { IcdConfigTypeAtt item = IcdConfigTypeAtt.builder() .doName(doName) - .lastName(lastname) + .param(param) .build(); attMap.put(doName, item); } diff --git a/src/main/java/com/xydl/cac/entity/IcdConfigTypeAtt.java b/src/main/java/com/xydl/cac/entity/IcdConfigTypeAtt.java index 58fef02..12a3576 100644 --- a/src/main/java/com/xydl/cac/entity/IcdConfigTypeAtt.java +++ b/src/main/java/com/xydl/cac/entity/IcdConfigTypeAtt.java @@ -24,16 +24,16 @@ public class IcdConfigTypeAtt { @Column(name = "id") private Integer id; - @Column(name = "icd_config_type_id") + @Column(name = "配置类型表id") private Integer icdConfigTypeId; - @Column(name = "do_name") + @Column(name = "属性") private String doName; - @Column(name = "last_name") - private String lastName; + @Column(name = "参数") + private String param; - @Column(name = "col_name") + @Column(name = "字段名") private String colName; } \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/entity/IcdConfigTypeInst.java b/src/main/java/com/xydl/cac/entity/IcdConfigTypeInst.java index 2b983f1..0636162 100644 --- a/src/main/java/com/xydl/cac/entity/IcdConfigTypeInst.java +++ b/src/main/java/com/xydl/cac/entity/IcdConfigTypeInst.java @@ -22,10 +22,10 @@ public class IcdConfigTypeInst { @Column(name = "id") private Integer id; - @Column(name = "icd_config_type_id") + @Column(name = "配置类型表id") private Integer icdConfigTypeId; - @Column(name = "inst") + @Column(name = "实例") private String inst; @Transient 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 9211d35..b8c0904 100644 --- a/src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java @@ -114,7 +114,7 @@ public class ParamBindServiceImpl implements ParamBindService { if (StringUtils.isBlank(att.getColName())) { msgList.add(att.getDoName() + "该属性还未配置绑定字段"); } else { - String paramindex = param + "$" + att.getLastName(); + String paramindex = param + "$" + att.getParam(); Optional optionalRpt = rptparamindexRepository.findById(paramindex); if (!optionalRpt.isPresent()) { throw new Exception("未找到该Rptparamindex,对象参引=" + paramindex); @@ -226,7 +226,7 @@ public class ParamBindServiceImpl implements ParamBindService { List attList = attRepository.findByIcdConfigTypeId(type.getId()); for (IcdConfigTypeAtt att : attList) { if (StringUtils.isNotBlank(att.getColName())) { - String paramindex = param + "$" + att.getLastName(); + String paramindex = param + "$" + att.getParam(); Optional optionalRpt = rptparamindexRepository.findById(paramindex); if (!optionalRpt.isPresent()) { throw new Exception(item.getName() + "的字段" + att.getColName() + "对应的属性"