解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java

@@ -327,14 +327,15 @@ public class CommonServiceImpl {
 
     public  List<StationCacheInfoDto> getListStationCacheInfoDto(){
         List<StationCacheInfoDto> stationCacheInfoDtoList =redisTemplate.opsForList().range("station_info_cache",0,-1);
-       if(stationCacheInfoDtoList!=null){
+       if(ObjectUtils.isEmpty(stationCacheInfoDtoList)){
            try {
                stationCacheDataInit.run();
+               stationCacheInfoDtoList =redisTemplate.opsForList().range("station_info_cache",0,-1);
            } catch (Exception e) {
                throw new RuntimeException(e);
            }
        }
-        stationCacheInfoDtoList =redisTemplate.opsForList().range("station_info_cache",0,-1);
+
         return stationCacheInfoDtoList;
     }
 }