增加Ar演出艺人时间表接口 判断空

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletController.java

@@ -19,6 +19,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -27,6 +28,7 @@ import java.util.List;
 import java.util.Map;
 
 @Api(tags = "小程序")
+@Slf4j
 @RestController
 @RequestMapping("/sweet-applet")
 public class SweetAppletController {
@@ -198,6 +200,7 @@ public class SweetAppletController {
             List<SweetPerformArtistTimeListDto> artistTimeList = arDataUtils.getArtistTimeList(performanceId);
             return ResponseDto.success(artistTimeList);
         } catch (Exception e) {
+            log.error("演出艺人时间表EX [e:{}]", e);
             return ResponseDto.failure("获取失败");
         }
     }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisArDataUtils.java

 package com.liquidnet.service.sweet.utils;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.sweet.constant.SweetConstant;
 import com.liquidnet.service.sweet.dto.*;
@@ -37,35 +38,38 @@ public class RedisArDataUtils {
             List<SweetPerformArtistTimeListDto> performArtistTimeList = new ArrayList<>();
             // 演出日期
             List<SweetManualAppletArDto> performTime = sweetManualMapper.getManualAppletArDto(performanceId);
-            Date dateEnd = DateUtil.parse(performTime.get(0).getTimeEnd(), DateUtil.DATE_SMALL_STR);
-            Date dateStart = DateUtil.parse(performTime.get(0).getTimeStart(), DateUtil.DATE_SMALL_STR);
-            int intervalDay = (int) DateUtil.intervalDays(dateStart, dateEnd);
-            for (int i = 0; i <= intervalDay; i++) {
-                String time = DateUtil.format(DateUtil.addDay(dateStart, i), DateUtil.Formatter.yyyy_MM_dd);
-                SweetPerformArtistTimeListDto performArtistTimeListDto = SweetPerformArtistTimeListDto.getNew();
-                performArtistTimeListDto.setStartTime(time);
-                // 场地
-                List<SweetManualArtistStageListArDto> stageList = sweetManualArtistsMapper.getStageNameListAr(performanceId);
-                // 艺人
-                List<SweetManualArtistListArDto> artistList = sweetManualArtistsMapper.getManualListAr(performanceId);
-                for (SweetManualArtistListArDto artist : artistList) {
-                    List<SweetManualArtistResourceUrlArDto> urlList = sweetArtistsUrlMapper.selectListOfAid(artist.getArtistId());
-                    artist.setResourceUrl(urlList);
-                }
-                for (SweetManualArtistStageListArDto stage : stageList) {
-                    List<SweetManualArtistListArDto> artistListArList = new ArrayList<>();
+            if (!CollectionUtil.isEmpty(performTime)) {
+                Date dateEnd = DateUtil.parse(performTime.get(0).getTimeEnd(), DateUtil.DATE_SMALL_STR);
+                Date dateStart = DateUtil.parse(performTime.get(0).getTimeStart(), DateUtil.DATE_SMALL_STR);
+                int intervalDay = (int) DateUtil.intervalDays(dateStart, dateEnd);
+                for (int i = 0; i <= intervalDay; i++) {
+                    String time = DateUtil.format(DateUtil.addDay(dateStart, i), DateUtil.Formatter.yyyy_MM_dd);
+                    SweetPerformArtistTimeListDto performArtistTimeListDto = SweetPerformArtistTimeListDto.getNew();
+                    performArtistTimeListDto.setStartTime(time);
+                    // 场地
+                    List<SweetManualArtistStageListArDto> stageList = sweetManualArtistsMapper.getStageNameListAr(performanceId);
+                    // 艺人
+                    List<SweetManualArtistListArDto> artistList = sweetManualArtistsMapper.getManualListAr(performanceId);
                     for (SweetManualArtistListArDto artist : artistList) {
-                        if (artist.getPerformanceStart().contains(time) && stage.getStageId().equals(artist.getStageId())) {
-                            artistListArList.add(artist);
+                        List<SweetManualArtistResourceUrlArDto> urlList = sweetArtistsUrlMapper.selectListOfAid(artist.getArtistId());
+                        artist.setResourceUrl(urlList);
+                    }
+                    for (SweetManualArtistStageListArDto stage : stageList) {
+                        List<SweetManualArtistListArDto> artistListArList = new ArrayList<>();
+                        for (SweetManualArtistListArDto artist : artistList) {
+                            if (artist.getPerformanceStart().contains(time) && stage.getStageId().equals(artist.getStageId())) {
+                                artistListArList.add(artist);
+                            }
                         }
+                        stage.setArtistList(artistListArList);
                     }
-                    stage.setArtistList(artistListArList);
-                }
-                performArtistTimeListDto.setStageList(stageList);
+                    performArtistTimeListDto.setStageList(stageList);
 
-                performArtistTimeList.add(performArtistTimeListDto);
+                    performArtistTimeList.add(performArtistTimeListDto);
+                }
+                redisUtil.set(redisKey, performArtistTimeList);
             }
-            redisUtil.set(redisKey, performArtistTimeList);
+
             return performArtistTimeList;
         } else {
             return (List<SweetPerformArtistTimeListDto>) obj;