From 6cfa65c2edc273d5e6b85c8a26b989f8df904a22 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Mon, 11 Mar 2024 15:28:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8C=89=E7=9B=91=E6=B5=8B=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=B1=BB=E5=9E=8B=E7=BB=9F=E8=AE=A1=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xydl/cac/controller/ModevTypeController.java   |  7 +++++++
 src/main/java/com/xydl/cac/entity/ModevType.java       |  2 ++
 .../com/xydl/cac/repository/NSensorRepository.java     |  4 +++-
 .../java/com/xydl/cac/service/ModevTypeService.java    |  2 ++
 .../xydl/cac/service/impl/ModevTypeServiceImpl.java    | 10 ++++++++++
 5 files changed, 24 insertions(+), 1 deletion(-)

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<List<ModevType>> listAllCount() {
+        List<ModevType> result = service.listAllCount();
+        return Response.success(result);
+    }
+
     @PostMapping("add")
     @ApiOperation("新增")
     public Response<ModevType> 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<NSensor, Integer>, JpaS
 
     List<NSensor> findByDevId(Integer devId);
 
-    long countByZsbIdIn(List<Integer> list);
+    Long countByZsbIdIn(List<Integer> 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<ModevType> listAll();
 
+    List<ModevType> 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<ModevType> listAllCount() {
+        List<ModevType> 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);