|
|
@ -8,10 +8,8 @@ import org.springframework.stereotype.Service; |
|
|
|
import java.time.LocalDateTime; |
|
|
|
import java.time.LocalTime; |
|
|
|
import java.time.ZoneId; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Calendar; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.List; |
|
|
|
import java.util.*; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
/** |
|
|
|
* @program: GOLD |
|
|
@ -42,13 +40,22 @@ public class GeneralServiceImpl implements GeneralService { |
|
|
|
@Override |
|
|
|
public List<String> getGoods() { |
|
|
|
List<String> list = generalMapper.getGoods(); |
|
|
|
return list; |
|
|
|
// 使用 Java 8 的 Stream API 过滤 null 和空字符串 |
|
|
|
List<String> filteredList = list.stream() |
|
|
|
.filter(Objects::nonNull) // 过滤掉 null 值 |
|
|
|
.filter(str -> !str.trim().isEmpty()) // 过滤掉空字符串和仅包含空白字符的字符串 |
|
|
|
.collect(Collectors.toList()); |
|
|
|
return filteredList; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<String> getActivity() { |
|
|
|
List<String> list = generalMapper.getActivity(); |
|
|
|
return list; |
|
|
|
List<String> filteredList = list.stream() |
|
|
|
.filter(Objects::nonNull) // 过滤掉 null 值 |
|
|
|
.filter(str -> !str.trim().isEmpty()) // 过滤掉空字符串和仅包含空白字符的字符串 |
|
|
|
.collect(Collectors.toList()); |
|
|
|
return filteredList; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|