feat: 增加新传感器的功能接口

src/main/java/com/xydl/cac/controller/NSensorController.java

@@ -0,0 +1,76 @@
+package com.xydl.cac.controller;
+
+import com.xydl.cac.entity.NSensor;
+import com.xydl.cac.exception.BusinessException;
+import com.xydl.cac.model.Response;
+import com.xydl.cac.service.NSensorService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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("nsensor")
+@Slf4j
+public class NSensorController extends BasicController {
+
+    @Resource
+    NSensorService service;
+
+    @GetMapping("listAll")
+    @ApiOperation("查询列表")
+    public Response<List<NSensor>> listAll(@NotNull(message = "主设备编号不能缺少") @Param("zsbid") Integer zsbid) {
+        List<NSensor> result = service.listAll(zsbid);
+        return Response.success(result);
+    }
+
+    @PostMapping("add")
+    @ApiOperation("新增")
+    public Response<NSensor> add(@Validated @RequestBody NSensor item) throws Exception {
+        NSensor result = service.add(item);
+        return Response.success(result);
+    }
+
+    @PostMapping("update")
+    @ApiOperation("更新")
+    public Response<String> update(@Validated @RequestBody NSensor item) throws Exception {
+        if (item.getId() == null) {
+            throw new BusinessException("ID不能为空!");
+        }
+        service.update(item);
+        return Response.success("OK");
+    }
+
+    @PostMapping("delete")
+    @ApiOperation("删除")
+    public Response<String> delete(@Validated @NotNull(message = "ID不能为空!") @Param("id") Integer id) {
+        service.delete(id);
+        return Response.success("OK");
+    }
+
+    @PostMapping("detail")
+    @ApiOperation("详情")
+    public Response<NSensor> detail(@Validated @NotNull(message = "ID不能为空!") Integer id) throws Exception {
+        NSensor detail = service.detail(id);
+        return Response.success(detail);
+    }
+
+    @PostMapping("bindicd")
+    @ApiOperation("详情")
+    public Response<String> bindicd(@Validated @NotNull(message = "ID不能为空!") @Param("id") Integer id, @Validated @NotNull(message = "icdid不能为空!") @Param("icdid") Integer icdid) {
+        try {
+            service.bindicd(id, icdid);
+            return Response.success("OK");
+        } catch (Exception ex) {
+            return Response.fail(ex.getMessage());
+        }
+    }
+
+}

src/main/java/com/xydl/cac/entity/NSensor.java

@@ -53,6 +53,18 @@ public class NSensor {
     @Column(name = "status")
     private Integer status;
 
+    @Column(name = "zsb_id")
+    @ApiModelProperty("主设备编号")
+    private Integer zsbId;
+
+    @Column(name = "icd_id")
+    @ApiModelProperty("关联icd表中的id")
+    private Integer icdId;
+
+    @ApiModelProperty("主设备名称")
+    @Transient
+    private String zsbName;
+
     @Transient
     private List<NPoint> points;
 

src/main/java/com/xydl/cac/entity/Zsb.java

@@ -220,6 +220,6 @@ public class Zsb {
     private String lxName;
 
     @Transient
-    private List<Modev> children;
+    private List<NSensor> children;
 
 }

src/main/java/com/xydl/cac/repository/NSensorRepository.java

@@ -13,4 +13,6 @@ public interface NSensorRepository extends JpaRepository<NSensor, Integer>, JpaS
 
     List<NSensor> findBySensorCode(String sensorCode);
 
+    List<NSensor> findByZsbId(Integer zsbId);
+
 }

src/main/java/com/xydl/cac/service/NSensorService.java

@@ -7,7 +7,7 @@ import java.util.Collection;
 import java.util.List;
 
 public interface NSensorService {
-    List<NSensor> listAll();
+    List<NSensor> listAll(Integer zsbid);
 
     Page<NSensor> list(int pageNum, int pageSize);
 
@@ -19,6 +19,8 @@ public interface NSensorService {
 
     NSensor detail(Integer id) throws Exception;
 
+    void bindicd(Integer id, Integer icdid) throws Exception;
+
     void importFrom(Collection<NSensor> collection);
 
 }

src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java

@@ -1,7 +1,9 @@
 package com.xydl.cac.service.impl;
 
+import com.xydl.cac.entity.Modev;
 import com.xydl.cac.entity.NPoint;
 import com.xydl.cac.entity.NSensor;
+import com.xydl.cac.exception.BusinessException;
 import com.xydl.cac.repository.NPointRepository;
 import com.xydl.cac.repository.NSensorRepository;
 import com.xydl.cac.service.NSensorService;
@@ -27,8 +29,13 @@ public class NSensorServiceImpl implements NSensorService {
     NPointRepository pointRepository;
 
     @Override
-    public List<NSensor> listAll() {
+    public List<NSensor> listAll(Integer zsbid) {
-        List<NSensor> list = repository.findAll();
+        List<NSensor> list;
+        if (zsbid == null) {
+            list = repository.findAll();
+        } else {
+            list = repository.findByZsbId(zsbid);
+        }
         return list;
     }
 
@@ -64,6 +71,17 @@ public class NSensorServiceImpl implements NSensorService {
         return optional.get();
     }
 
+    @Override
+    public void bindicd(Integer id, Integer icdid) throws Exception {
+        NSensor entity = repository.findById(id).orElse(null);
+        if (entity != null) {
+            entity.setIcdId(icdid);
+            repository.save(entity);
+        } else {
+            throw new BusinessException("未找到该传感器");
+        }
+    }
+
     @Override
     public void importFrom(Collection<NSensor> collection) {
         for (NSensor item : collection) {

src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java

@@ -8,6 +8,7 @@ import com.xydl.cac.model.ColumnModel;
 import com.xydl.cac.model.Response;
 import com.xydl.cac.repository.*;
 import com.xydl.cac.service.DataService;
+import com.xydl.cac.service.NSensorService;
 import com.xydl.cac.service.ParamBindService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -33,6 +34,8 @@ public class ParamBindServiceImpl implements ParamBindService {
     @Resource
     ZsbRepository zsbRepository;
     @Resource
+    NSensorRepository sensorRepository;
+    @Resource
     ModevRepository modevRepository;
     @Resource
     ModevTypeRepository modevTypeRepository;
@@ -60,8 +63,8 @@ public class ParamBindServiceImpl implements ParamBindService {
                 for (Zsb zsb : zsbList) {
                     zsb.setBdzName(bdz.getMc());
                     zsb.setJgName(jg.getMc());
-                    List<Modev> modevList = modevRepository.findByZsbid(zsb.getId());
+                    List<NSensor> sensorList = sensorRepository.findByZsbId(zsb.getId());
-                    zsb.setChildren(modevList);
+                    zsb.setChildren(sensorList);
                 }
             }
         }