diff --git a/src/main/java/com/xydl/cac/entity/IcdFileConfig.java b/src/main/java/com/xydl/cac/entity/IcdFileConfig.java deleted file mode 100644 index 312a66e..0000000 --- a/src/main/java/com/xydl/cac/entity/IcdFileConfig.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.xydl.cac.entity; - -import io.swagger.annotations.ApiModel; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.List; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -@Entity -@Table(name = "icd_file_config") -@ApiModel("ICD文件配置表") -public class IcdFileConfig { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") - private Integer id; - - @Column(name = "ied_name") - private String iedName; - - @Column(name = "ldevice_inst") - private String ldeviceInst; - - @Column(name = "ln_class") - private String lnClass; - - @Column(name = "do_name") - private String doName; - - @Column(name = "last_name") - private String lastName; - - @Column(name = "table_name") - private String tableName; - - @Column(name = "col_name") - private String colName; - - @Transient - private List instList; - - public void addInst(String inst, String paramindex) { - if (instList == null) { - instList = new ArrayList<>(); - } - IcdFileConfigInst item = IcdFileConfigInst.builder() - .inst(inst) - .paramindex(paramindex) - .build(); - instList.add(item); - } - - public String buildParamIndex(IcdFileConfigInst inst) { - String param = iedName + ldeviceInst + "/" + lnClass + inst.getInst() + "$" + inst.getParamindex(); - return param; - } -} \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/entity/IcdFileConfigInst.java b/src/main/java/com/xydl/cac/entity/IcdFileConfigInst.java deleted file mode 100644 index 4faa0f6..0000000 --- a/src/main/java/com/xydl/cac/entity/IcdFileConfigInst.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.xydl.cac.entity; - -import io.swagger.annotations.ApiModel; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -@Entity -@Table(name = "icd_file_config_inst") -@ApiModel("ICD文件实例表") -public class IcdFileConfigInst { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") - private Integer id; - - @Column(name = "config_id") - private Integer configId; - - @Column(name = "inst") - private String inst; - - @Column(name = "paramindex") - private String paramindex; - -} \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/repository/IcdFileConfigInstRepository.java b/src/main/java/com/xydl/cac/repository/IcdFileConfigInstRepository.java deleted file mode 100644 index 28ff9a6..0000000 --- a/src/main/java/com/xydl/cac/repository/IcdFileConfigInstRepository.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.xydl.cac.repository; - -import com.xydl.cac.entity.IcdFileConfigInst; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import org.springframework.stereotype.Repository; - -import java.util.List; - - -@Repository -public interface IcdFileConfigInstRepository extends JpaRepository, JpaSpecificationExecutor { - - List findByConfigId(Integer configId); - - void deleteByConfigId(Integer configId); - -} \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/repository/IcdFileConfigRepository.java b/src/main/java/com/xydl/cac/repository/IcdFileConfigRepository.java deleted file mode 100644 index 6563834..0000000 --- a/src/main/java/com/xydl/cac/repository/IcdFileConfigRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.xydl.cac.repository; - -import com.xydl.cac.entity.IcdFileConfig; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import org.springframework.stereotype.Repository; - -import java.util.List; - - -@Repository -public interface IcdFileConfigRepository extends JpaRepository, JpaSpecificationExecutor { - - List findByIedName(String iedName); - - List findByIedNameAndLdeviceInstAndLnClassAndDoName(String iedName, String ldeviceInst, String lnClass, String doName); -} \ No newline at end of file