From 9b3e959ae98a01244dc8026782fe671bc454d3b1 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Tue, 5 Mar 2024 14:04:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8A=8Amodev=E8=A1=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=AF=BC=E5=85=A5nsensor=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cac/controller/NSensorController.java     |  7 ++++++
 src/main/java/com/xydl/cac/entity/Modev.java  | 10 ++++++++
 .../cac/repository/NSensorRepository.java     |  2 ++
 .../com/xydl/cac/service/NSensorService.java  |  2 ++
 .../cac/service/impl/NSensorServiceImpl.java  | 23 +++++++++++++++++++
 5 files changed, 44 insertions(+)

diff --git a/src/main/java/com/xydl/cac/controller/NSensorController.java b/src/main/java/com/xydl/cac/controller/NSensorController.java
index e6c0f85..cd5fcf0 100644
--- a/src/main/java/com/xydl/cac/controller/NSensorController.java
+++ b/src/main/java/com/xydl/cac/controller/NSensorController.java
@@ -150,4 +150,11 @@ public class NSensorController extends BasicController {
         reportService.exportSensor(detail, response.getOutputStream());
     }
 
+    @PostMapping("importFromModev")
+    @ApiOperation("从modev表导入")
+    public Response<String> importFromModev() throws Exception {
+        String str = service.importFromModev();
+        return Response.success(str);
+    }
+
 }
diff --git a/src/main/java/com/xydl/cac/entity/Modev.java b/src/main/java/com/xydl/cac/entity/Modev.java
index bbdb522..f85f533 100644
--- a/src/main/java/com/xydl/cac/entity/Modev.java
+++ b/src/main/java/com/xydl/cac/entity/Modev.java
@@ -119,4 +119,14 @@ public class Modev {
     @ApiModelProperty("监测设备类型名称")
     @Transient
     private String modevtname;
+
+    public NSensor transform(){
+        NSensor sensor = NSensor.builder()
+                .name(name)
+                .typeId(modevtid)
+                .devId(id)
+                .zsbId(zsbid)
+                .build();
+        return sensor;
+    }
 }
\ 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 5077f75..02bc4e6 100644
--- a/src/main/java/com/xydl/cac/repository/NSensorRepository.java
+++ b/src/main/java/com/xydl/cac/repository/NSensorRepository.java
@@ -20,4 +20,6 @@ public interface NSensorRepository extends JpaRepository<NSensor, Integer>, JpaS
     List<NSensor> findByIcdIdAndIdIsNot(Integer icdid, Integer id);
 
     List<NSensor> findByTypeId(Integer typeId);
+
+    List<NSensor> findByDevId(Integer devId);
 }
\ No newline at end of file
diff --git a/src/main/java/com/xydl/cac/service/NSensorService.java b/src/main/java/com/xydl/cac/service/NSensorService.java
index 2b427fb..f0a99d5 100644
--- a/src/main/java/com/xydl/cac/service/NSensorService.java
+++ b/src/main/java/com/xydl/cac/service/NSensorService.java
@@ -28,4 +28,6 @@ public interface NSensorService {
 
     void importOne(NSensor sensor);
 
+    String importFromModev() 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 9cf0d61..8e37d88 100644
--- a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
@@ -1,11 +1,13 @@
 package com.xydl.cac.service.impl;
 
 import com.xydl.cac.entity.*;
+import com.xydl.cac.entity.constants.Constants;
 import com.xydl.cac.exception.BusinessException;
 import com.xydl.cac.model.ConditionModel;
 import com.xydl.cac.model.OnePage;
 import com.xydl.cac.model.SensorDetail;
 import com.xydl.cac.model.SensorUpdateModel;
+import com.xydl.cac.repository.ModevRepository;
 import com.xydl.cac.repository.NSensorRepository;
 import com.xydl.cac.service.*;
 import lombok.extern.slf4j.Slf4j;
@@ -34,6 +36,8 @@ public class NSensorServiceImpl implements NSensorService {
     ModevTypeService modevTypeService;
     @Resource
     ModevTypePointService modevTypePointService;
+    @Resource
+    ModevRepository modevRepository;
 
     @Override
     public List<NSensor> listAll(Integer zsbid) throws Exception {
@@ -88,6 +92,7 @@ public class NSensorServiceImpl implements NSensorService {
     @Override
     public NSensor add(NSensor item) throws Exception {
         item.setId(null);
+        item.setStatus(Constants.NORMAL);
         return repository.save(item);
     }
 
@@ -185,4 +190,22 @@ public class NSensorServiceImpl implements NSensorService {
         repository.save(item);
     }
 
+    @Override
+    public String importFromModev() throws Exception {
+        int success = 0;
+        int skip = 0;
+        List<Modev> list = modevRepository.findAll();
+        for (Modev item : list) {
+            NSensor sensor = item.transform();
+            List<NSensor> slist = repository.findByDevId(sensor.getDevId());
+            if (CollectionUtils.isEmpty(list)) {
+                this.add(sensor);
+                success++;
+            } else {
+                skip++;
+            }
+        }
+        return "成功导入" + success + "个，跳过" + skip + "个";
+    }
+
 }