diff --git a/src/main/java/com/xydl/cac/controller/NSensorController.java b/src/main/java/com/xydl/cac/controller/NSensorController.java
index 65e76ac..2ddb0fb 100644
--- a/src/main/java/com/xydl/cac/controller/NSensorController.java
+++ b/src/main/java/com/xydl/cac/controller/NSensorController.java
@@ -62,8 +62,9 @@ public class NSensorController extends BasicController {
 
     @GetMapping("listAll")
     @ApiOperation("查询全部")
-    public Response<List<NSensor>> listAll(@ApiParam("主设备id") @RequestParam(value = "zsbid", required = false) Integer zsbid) throws Exception {
-        List<NSensor> result = service.listAll(zsbid);
+    public Response<List<NSensor>> listAll(@ApiParam("主设备id") @RequestParam(value = "zsbid", required = false) Integer zsbid,
+                                           @ApiParam("类型") @RequestParam(value = "typeId", required = false) Integer typeId) throws Exception {
+        List<NSensor> result = service.listAll(zsbid , typeId);
         return Response.success(result);
     }
 
@@ -190,7 +191,7 @@ public class NSensorController extends BasicController {
     public void exportLatest(@ApiParam("主设备id") @RequestParam(value = "zsbid", required = false) Integer zsbid, HttpServletResponse response) throws Exception {
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf-8");
-        List<NSensor> result = service.listAll(zsbid);
+        List<NSensor> result = service.listAll(zsbid , null);
 
         Map<Integer, List<NSensor>> map = new HashMap<>();
         for (NSensor nSensor : result) {
diff --git a/src/main/java/com/xydl/cac/service/NSensorService.java b/src/main/java/com/xydl/cac/service/NSensorService.java
index e34eccf..04c51b2 100644
--- a/src/main/java/com/xydl/cac/service/NSensorService.java
+++ b/src/main/java/com/xydl/cac/service/NSensorService.java
@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 
 public interface NSensorService {
-    List<NSensor> listAll(Integer zsbid) throws Exception;
+    List<NSensor> listAll(Integer zsbid, Integer typeId) throws Exception;
 
     Page<NSensor> list(Integer typeId, int pageNum, int pageSize) 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 065b714..bdb38ee 100644
--- a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
@@ -51,13 +51,18 @@ public class NSensorServiceImpl implements NSensorService {
     I2relationRepository i2relationRepository;
 
     @Override
-    public List<NSensor> listAll(Integer zsbid) throws Exception {
-        List<NSensor> list;
-        if (zsbid == null) {
-            list = repository.findAll();
-        } else {
-            list = repository.findByZsbId(zsbid);
-        }
+    public List<NSensor> listAll(Integer zsbid, Integer typeId) throws Exception {
+        Specification<NSensor> specification = (root, query, builder) -> {
+            Predicate predicate = builder.conjunction();
+            if (zsbid != null) {
+                predicate.getExpressions().add(builder.equal(root.get("zsbId"), zsbid));
+            }
+            if (typeId != null) {
+                predicate.getExpressions().add(builder.equal(root.get("typeId"), typeId));
+            }
+            return predicate;
+        };
+        List<NSensor> list = repository.findAll(specification);
         this.fillOtherNames(list);
         return list;
     }