diff --git a/src/main/java/com/xydl/cac/controller/NPointController.java b/src/main/java/com/xydl/cac/controller/NPointController.java
new file mode 100644
index 0000000..958304f
--- /dev/null
+++ b/src/main/java/com/xydl/cac/controller/NPointController.java
@@ -0,0 +1,48 @@
+package com.xydl.cac.controller;
+
+import com.xydl.cac.entity.NPoint;
+import com.xydl.cac.model.Response;
+import com.xydl.cac.service.NPointService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.repository.query.Param;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@RestController
+@Api(tags = {"监测设备属性相关接口"})
+@RequestMapping("npoint")
+@Slf4j
+public class NPointController extends BasicController {
+
+    @Resource
+    NPointService service;
+
+    @GetMapping("listAll")
+    @ApiOperation("查询全部")
+    public Response<List<NPoint>> listAll(@ApiParam("监测设备id") @RequestParam(value = "sensorId", required = true) Integer sensorId) throws Exception {
+        List<NPoint> result = service.listAll(sensorId);
+        return Response.success(result);
+    }
+
+    @PostMapping("add")
+    @ApiOperation("新增")
+    public Response<NPoint> add(@Validated @RequestBody NPoint item) throws Exception {
+        NPoint result = service.add(item);
+        return Response.success(result);
+    }
+
+    @PostMapping("delete")
+    @ApiOperation("删除")
+    public Response<String> delete(@Validated @NotNull(message = "ID不能为空!") @Param("id") Integer id) {
+        service.delete(id);
+        return Response.success("OK");
+    }
+
+}
diff --git a/src/main/java/com/xydl/cac/repository/NPointRepository.java b/src/main/java/com/xydl/cac/repository/NPointRepository.java
index ea27ca3..3a8dbc6 100644
--- a/src/main/java/com/xydl/cac/repository/NPointRepository.java
+++ b/src/main/java/com/xydl/cac/repository/NPointRepository.java
@@ -11,6 +11,8 @@ import java.util.List;
 @Repository
 public interface NPointRepository extends JpaRepository<NPoint, Integer>, JpaSpecificationExecutor<NPoint> {
 
+    List<NPoint> findBySensorId(Integer sensorId);
+
     List<NPoint> findBySensorIdAndField(Integer sensorId, String field);
 
     List<NPoint> findBySensorIdAndType(Integer sensorId, Integer type);
diff --git a/src/main/java/com/xydl/cac/service/NPointService.java b/src/main/java/com/xydl/cac/service/NPointService.java
index 4bee750..bf06231 100644
--- a/src/main/java/com/xydl/cac/service/NPointService.java
+++ b/src/main/java/com/xydl/cac/service/NPointService.java
@@ -7,7 +7,7 @@ import java.util.List;
 
 public interface NPointService {
 
-    List<NPoint> listAll();
+    List<NPoint> listAll(Integer sensorId);
 
     Page<NPoint> list(int pageNum, int pageSize);
 
diff --git a/src/main/java/com/xydl/cac/service/impl/NPointServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/NPointServiceImpl.java
index 40236cc..080f9f4 100644
--- a/src/main/java/com/xydl/cac/service/impl/NPointServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/NPointServiceImpl.java
@@ -25,8 +25,8 @@ public class NPointServiceImpl implements NPointService {
     NPointRepository repository;
 
     @Override
-    public List<NPoint> listAll() {
-        List<NPoint> list = repository.findAll();
+    public List<NPoint> listAll(Integer sensorId) {
+        List<NPoint> list = repository.findBySensorId(sensorId);
         return list;
     }
 
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 3d58c6a..c0d29a6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -9,7 +9,7 @@ spring:
     time-zone: GMT+8
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.1.190:3306/iec104?charset=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&connectTimeout=60000&socketTimeout=60000
+    url: jdbc:mysql://192.168.1.190:3306/cacdb?charset=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&connectTimeout=60000&socketTimeout=60000
     username: root
     password: 123456
   jpa: