修补空指针报错

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());
     }
 
 }

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);