feat: SCD文件上传覆盖功能

src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java

@@ -40,7 +40,11 @@ public class IcdFileConfigServiceImpl implements IcdFileConfigService {
                     config.getIedName(), config.getLdeviceInst(), config.getLnClass());
             if (CollectionUtils.isEmpty(list)) {
                 repository.save(config);
+            } else {
+                config.setId(list.get(0).getId());
+            }
 
+            attRepository.deleteByIcdConfigTypeId(config.getId());
             if (config.getAttMap() != null) {
                 Collection<IcdConfigTypeAtt> attList = config.getAttMap().values();
                 for (IcdConfigTypeAtt item : attList) {
@@ -49,6 +53,7 @@ public class IcdFileConfigServiceImpl implements IcdFileConfigService {
                 attRepository.saveAll(attList);
             }
 
+            instRepository.deleteByIcdConfigTypeId(config.getId());
             if (config.getInstMap() != null) {
                 Collection<IcdConfigTypeInst> instList = config.getInstMap().values();
                 for (IcdConfigTypeInst item : instList) {
@@ -58,7 +63,6 @@ public class IcdFileConfigServiceImpl implements IcdFileConfigService {
             }
         }
     }
-    }
 
     @Override
     public List<String> iedList() {

src/main/java/com/xydl/cac/util/IcdXmlUtil.java

@@ -154,19 +154,21 @@ public class IcdXmlUtil {
         String result = "";
         List<JsonNode> daList = findNodes(node, "DA");
         for (JsonNode daNode : daList) {
-            JsonNode dchgNode = daNode.get("dchg");
             String fc = daNode.get("fc").asText();
-            if (dchgNode != null && dchgNode.asText().equals("true") && fc.equals(fcname)) {
+            String bType = daNode.get("bType").asText();
+            if (bType.equals("Struct") && fc.equals(fcname)) {
                 result = daNode.get("name").asText();
                 JsonNode typeNode = daNode.get("type");
                 if (typeNode != null && StringUtils.isNotBlank(typeNode.asText())) {
                     JsonNode nodeDAType = mapDAType.get(typeNode.asText());
+                    if (nodeDAType != null) {
                         List<JsonNode> bdaList = findNodes(nodeDAType, "BDA");
                         if (!CollectionUtils.isEmpty(bdaList)) {
                             String name = bdaList.get(0).get("name").asText();
                             result = result + "$" + name;
                         }
                     }
+                }
                 break;
             }
         }