From dc414d06c36e963de02da5cae888d4c5060346c1 Mon Sep 17 00:00:00 2001
From: huangfeng <beehuang74@hotmail.com>
Date: Wed, 2 Apr 2025 11:05:39 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=B7=BB=E5=8A=A0=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E6=97=B6=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ActivitiesServiceImpl.java             | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java
index 551ca11..ef4117b 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java
@@ -56,6 +56,23 @@ public class ActivitiesServiceImpl implements ActivitiesService {
         if (CollectionUtils.isEmpty(item.getTerms())) {
             throw new ApiException("装置列表信息不能为空");
         }
+        List<String> errList = new ArrayList<>();
+        for (Terminals term : item.getTerms()) {
+            if (term.getId() != null) {
+            } else if (StringUtils.isNotBlank(term.getCmdid())) {
+                Terminals t = terminalExtService.getByCmdid(term.getCmdid());
+                if (t != null) {
+                    term.setId(t.getId());
+                } else {
+                    errList.add(term.getCmdid() + "装置不存在");
+                }
+            } else {
+                errList.add("装置列表信息有异常");
+            }
+        }
+        if (errList.size() > 0) {
+            throw new ApiException(String.join(",", errList));
+        }
         MntnActivitiesExample example = new MntnActivitiesExample();
         MntnActivitiesExample.Criteria criteria = example.createCriteria();
         criteria.andTitleEqualTo(item.getTitle());