diff --git a/src/main/java/com/xydl/cac/controller/ModevTypeController.java b/src/main/java/com/xydl/cac/controller/ModevTypeController.java index be7e048..3fe785a 100644 --- a/src/main/java/com/xydl/cac/controller/ModevTypeController.java +++ b/src/main/java/com/xydl/cac/controller/ModevTypeController.java @@ -30,6 +30,13 @@ public class ModevTypeController extends BasicController { return Response.success(result); } + @GetMapping("listAllCount") + @ApiOperation("查询数量列表") + public Response> listAllCount() { + List result = service.listAllCount(); + return Response.success(result); + } + @PostMapping("add") @ApiOperation("新增") public Response add(@Validated @RequestBody ModevType item) throws Exception { diff --git a/src/main/java/com/xydl/cac/entity/ModevType.java b/src/main/java/com/xydl/cac/entity/ModevType.java index 8705be9..126fcf7 100644 --- a/src/main/java/com/xydl/cac/entity/ModevType.java +++ b/src/main/java/com/xydl/cac/entity/ModevType.java @@ -36,4 +36,6 @@ public class ModevType { private String tablename; + @Transient + private long sensorCount; } \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/repository/NSensorRepository.java b/src/main/java/com/xydl/cac/repository/NSensorRepository.java index 11efeb2..6aeedac 100644 --- a/src/main/java/com/xydl/cac/repository/NSensorRepository.java +++ b/src/main/java/com/xydl/cac/repository/NSensorRepository.java @@ -23,5 +23,7 @@ public interface NSensorRepository extends JpaRepository, JpaS List findByDevId(Integer devId); - long countByZsbIdIn(List list); + Long countByZsbIdIn(List list); + + Long countByTypeId(Integer typeId); } \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/service/ModevTypeService.java b/src/main/java/com/xydl/cac/service/ModevTypeService.java index b2216b8..bea0e1a 100644 --- a/src/main/java/com/xydl/cac/service/ModevTypeService.java +++ b/src/main/java/com/xydl/cac/service/ModevTypeService.java @@ -8,6 +8,8 @@ public interface ModevTypeService { List listAll(); + List listAllCount(); + ModevType add(ModevType item) throws Exception; void update(ModevType item) throws Exception; diff --git a/src/main/java/com/xydl/cac/service/impl/ModevTypeServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/ModevTypeServiceImpl.java index 8abee3a..6b799f1 100644 --- a/src/main/java/com/xydl/cac/service/impl/ModevTypeServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/ModevTypeServiceImpl.java @@ -33,6 +33,16 @@ public class ModevTypeServiceImpl implements ModevTypeService { return repository.findAll(); } + @Override + public List listAllCount() { + List list = repository.findAll(); + for (ModevType modevType : list) { + long count = sensorRepository.countByTypeId(modevType.getId()); + modevType.setSensorCount(count); + } + return list; + } + @Override public ModevType add(ModevType item) throws Exception { item.setId(null);