diff --git a/src/main/java/com/xydl/cac/iec/IecServerService.java b/src/main/java/com/xydl/cac/iec/IecServerService.java index 4272df1..9f74bdc 100644 --- a/src/main/java/com/xydl/cac/iec/IecServerService.java +++ b/src/main/java/com/xydl/cac/iec/IecServerService.java @@ -89,8 +89,12 @@ public class IecServerService { if (!optional.isPresent()) { throw new BusinessException("未找到该文件"); } + IcdFile icdFile = optional.get(); + if (icdFile.getSrv() != Constants.Server) { + throw new BusinessException("该文件不是服务端文件"); + } List result = new ArrayList<>(); - IcdFile icdFile = IcdXmlUtil.loadIcdType(optional.get().getXml()); + icdFile = IcdXmlUtil.loadIcdType(icdFile.getXml()); for (IcdConfigType config : icdFile.getConfigList()) { if (config.getAttMap() != null && config.getInstMap() != null) { Collection instList = config.getInstMap().values(); @@ -101,7 +105,7 @@ public class IecServerService { inst.setParamIndex(param); for (IcdConfigTypeAtt att : attList) { if (att.containInst(inst.getInst())) { - String paramindex = param + "$" + att.getDoName(); + String paramindex = param + "." + att.getDoName(); inst.addAtt(paramindex); } } diff --git a/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java index 087ca13..004d22e 100644 --- a/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java @@ -287,7 +287,7 @@ public class IcdFileConfigServiceImpl implements IcdFileConfigService { inst.setParamIndex(param); for (IcdConfigTypeAtt att : attList) { if (att.containInst(inst.getInst())) { - String paramindex = param + "$" + att.getDoName(); + String paramindex = param + "." + att.getDoName(); inst.addAtt(paramindex); } } diff --git a/src/main/java/com/xydl/cac/service/impl/IcdTransformServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/IcdTransformServiceImpl.java index 32c4cc8..098bfd5 100644 --- a/src/main/java/com/xydl/cac/service/impl/IcdTransformServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/IcdTransformServiceImpl.java @@ -5,6 +5,8 @@ import com.xydl.cac.exception.BusinessException; import com.xydl.cac.repository.IcdTransformRepository; import com.xydl.cac.service.IcdTransformService; import lombok.extern.slf4j.Slf4j; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,6 +24,7 @@ public class IcdTransformServiceImpl implements IcdTransformService { IcdTransformRepository transformRepository; @Override + @CacheEvict(cacheNames = {"listTransform"}, allEntries = true) public IcdTransform addTransform(IcdTransform icdTransform) { icdTransform.setId(null); IcdTransform save = transformRepository.save(icdTransform); @@ -29,6 +32,7 @@ public class IcdTransformServiceImpl implements IcdTransformService { } @Override + @CacheEvict(cacheNames = {"listTransform"}, allEntries = true) public void deleteTransform(Integer id) throws Exception { Optional byId = transformRepository.findById(id); if (!byId.isPresent()) { @@ -38,11 +42,13 @@ public class IcdTransformServiceImpl implements IcdTransformService { } @Override + @CacheEvict(cacheNames = {"listTransform"}, allEntries = true) public void clearTransform() { transformRepository.deleteAll(); } @Override + @Cacheable(value = "listTransform") public List listTransform() { return transformRepository.findAll(); }