From c0af8cca0cf624c20f0e684f80d7edf621dad6a9 Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Fri, 20 Oct 2023 11:29:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=A1=A5=E7=A9=BA=E6=8C=87=E9=92=88?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../XymanagerAdminApplicationTests.java       | 61 +++++++++++--------
 .../util/xinyin/TerminalUtils.java            |  6 +-
 2 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java b/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java
index a0a8507..3cb1dbe 100644
--- a/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java
+++ b/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java
@@ -30,32 +30,32 @@ import java.util.List;
 @SpringBootTest
 class XymanagerAdminApplicationTests {
 
-    @Autowired
-    TerminalsDao terminalsDao;
-    @Autowired
-    ScheduleDetailsDao scheduleDetailsDao;
-    @Autowired
-    SchedulesDao schedulesDao;
-    @Autowired
-    LinesDao linesDao;
-    @Autowired
-    private DyLevelDao dyLevelDao;
-
-    @Autowired
-    private TerminalPhotoDao terminalPhotoDao;
-
-    @Autowired
-    private TerminalSchedulesTempDao terminalSchedulesTempDao;
-
-    @Autowired
-    private TerminalScheduleDao terminalScheduleDao;
-    @Autowired
-    private RequestResultsDao requestResultsDao;
-    @Autowired
-    private TerminalImgAlarmParamsDao terminalImgAlarmParamsDao;
-
-    @Autowired
-    private CacheService cacheService;
+//    @Autowired
+//    TerminalsDao terminalsDao;
+//    @Autowired
+//    ScheduleDetailsDao scheduleDetailsDao;
+//    @Autowired
+//    SchedulesDao schedulesDao;
+//    @Autowired
+//    LinesDao linesDao;
+//    @Autowired
+//    private DyLevelDao dyLevelDao;
+//
+//    @Autowired
+//    private TerminalPhotoDao terminalPhotoDao;
+//
+//    @Autowired
+//    private TerminalSchedulesTempDao terminalSchedulesTempDao;
+//
+//    @Autowired
+//    private TerminalScheduleDao terminalScheduleDao;
+//    @Autowired
+//    private RequestResultsDao requestResultsDao;
+//    @Autowired
+//    private TerminalImgAlarmParamsDao terminalImgAlarmParamsDao;
+//
+//    @Autowired
+//    private CacheService cacheService;
 
     @Test
     void contextLoads() {
@@ -328,6 +328,15 @@ class XymanagerAdminApplicationTests {
 //        DateTime dateTime4 = MyDateUtils.offsetDay(date, -4);
 //        System.out.println(dateTime1.toString());
 
+
+        ArrayList<String> strlist = new ArrayList<>();
+        strlist.add("dsfad");
+        strlist.add("dsaffad");
+        strlist.add("dserefad");
+        strlist.add("dsfa3432d");
+        String[] array =new String[strlist.size()];
+        strlist.toArray(array);
+        System.out.println(array.toString());
     }
 
 }
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/TerminalUtils.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/TerminalUtils.java
index 8ebbf35..813c63b 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/TerminalUtils.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/TerminalUtils.java
@@ -153,7 +153,11 @@ public class TerminalUtils {
                 }
             }
             photosBean.setChannelid(channelid);
-            photosBean.setChannnelname(termchannelMap.get(channelid).getChannelName());
+            if (termchannelMap != null) {
+                if (termchannelMap.get(channelid) != null) {
+                    photosBean.setChannnelname(termchannelMap.get(channelid).getChannelName());
+                }
+            }
 
             if (termchannelMapMap != null) {
                 TerminalChannelMapper terminalChannelMapper = termchannelMapMap.get(termid + "#" + channelid);