From 38e4448e91d520cf2125541d3bb48c41b12070f4 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Fri, 8 Mar 2024 16:33:07 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=8F=82=E6=95=B0=E6=94=AF=E6=8C=81dev?=
 =?UTF-8?q?Id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xydl/cac/model/ConditionModel.java    |  2 ++
 .../cac/service/impl/NSensorServiceImpl.java  | 22 +++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/xydl/cac/model/ConditionModel.java b/src/main/java/com/xydl/cac/model/ConditionModel.java
index 3afa852..954cee2 100644
--- a/src/main/java/com/xydl/cac/model/ConditionModel.java
+++ b/src/main/java/com/xydl/cac/model/ConditionModel.java
@@ -23,6 +23,8 @@ public class ConditionModel {
     private Date endTime;
     @ApiModelProperty("id")
     private Integer id;
+    @ApiModelProperty("装置ID")
+    private Integer devId;
     @ApiModelProperty("页码")
     Integer pageNum;
     @ApiModelProperty("每页数量")
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 a8e49a5..f40b5e4 100644
--- a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
@@ -121,11 +121,25 @@ public class NSensorServiceImpl implements NSensorService {
 
     @Override
     public SensorDetail<Map<String, Object>> getDetail(ConditionModel model) throws Exception {
-        Optional<NSensor> optional = repository.findById(model.getId());
-        if (!optional.isPresent()) {
-            throw new BusinessException("未找到该装置");
+        NSensor sensor;
+        if (model.getId() != null) {
+            Optional<NSensor> optional = repository.findById(model.getId());
+            if (!optional.isPresent()) {
+                throw new BusinessException("未找到该装置id=" + model.getId());
+            }
+            sensor = optional.get();
+        } else if (model.getDevId() != null) {
+            List<NSensor> list = repository.findByDevId(model.getDevId());
+            if (CollectionUtils.isEmpty(list)) {
+                throw new BusinessException("未找到该装置devId=" + model.getDevId());
+            } else if (list.size() > 1) {
+                throw new BusinessException("存在相同devId=" + model.getDevId() + "的多个装置,请先修正监测装置数据");
+            }
+            sensor = list.get(0);
+        } else {
+            throw new BusinessException("缺少id或者eqmid信息");
         }
-        NSensor sensor = optional.get();
+
         if (sensor.getTypeId() == null) {
             throw new BusinessException("该装置缺少类型id信息");
         }