diff --git a/src/main/java/com/xydl/cac/service/ModevTypePointService.java b/src/main/java/com/xydl/cac/service/ModevTypePointService.java index ffb3342..ba8b462 100644 --- a/src/main/java/com/xydl/cac/service/ModevTypePointService.java +++ b/src/main/java/com/xydl/cac/service/ModevTypePointService.java @@ -8,6 +8,8 @@ public interface ModevTypePointService { List listAll(Integer modevtypeId); + List listAllCache(Integer modevtypeId); + ModevTypePoint add(ModevTypePoint item) throws Exception; void delete(Integer id) throws Exception; diff --git a/src/main/java/com/xydl/cac/service/impl/ModevTypePointServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/ModevTypePointServiceImpl.java index b767ded..d4a23f7 100644 --- a/src/main/java/com/xydl/cac/service/impl/ModevTypePointServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/ModevTypePointServiceImpl.java @@ -31,7 +31,6 @@ public class ModevTypePointServiceImpl implements ModevTypePointService { WarnRuleRepository ruleRepository; @Override - @Cacheable(value = "typePoint", key = "#modevtypeId") public List listAll(Integer modevtypeId) { List list = repository.findByModevtypeId(modevtypeId); for (ModevTypePoint point : list) { @@ -42,6 +41,13 @@ public class ModevTypePointServiceImpl implements ModevTypePointService { return list; } + @Override + @Cacheable(value = "typePoint", key = "#modevtypeId") + public List listAllCache(Integer modevtypeId) { + List list = this.listAll(modevtypeId); + return list; + } + @Override @CacheEvict(cacheNames = {"typePoint"}, allEntries = true) public ModevTypePoint add(ModevTypePoint item) throws Exception { diff --git a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java index b08a630..065b714 100644 --- a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java @@ -78,7 +78,7 @@ public class NSensorServiceImpl implements NSensorService { if (type.getId().equals(sensor.getTypeId())) { sensor.setTypeName(type.getMc()); sensor.setTableName(type.getTablename()); - List points = modevTypePointService.listAll(sensor.getTypeId()); + List points = modevTypePointService.listAllCache(sensor.getTypeId()); sensor.setTypePoints(points); } }