[update] 绿波数据优化-添加绿波路口星期类型

wj-datacenter-service/src/main/java/net/wanji/datacenter/cache/CrossGreenWaveInfoCache.java

@@ -11,10 +11,7 @@ import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.time.LocalTime;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -51,7 +48,8 @@ public class CrossGreenWaveInfoCache implements InitializingBean {
                 List<GreenwaveCrossPO> greenWaveCrossPOS = greenwaveCrossMapper.selectByGreenwaveId(greenWaveId);
                 if (!CollectionUtils.isEmpty(greenWaveCrossPOS)) {
                     List<GreenwaveCrossPO> greenWaveCrossIds = greenWaveCrossPOS.stream()
-                            .filter(po -> LocalTime.parse(po.getStartTime()).isBefore(now) && LocalTime.parse(po.getEndTime()).isAfter(now))
+                            .filter(po -> LocalTime.parse(po.getStartTime()).isBefore(now)
+                                    && LocalTime.parse(po.getEndTime()).isAfter(now) && Objects.equals(0, po.getWeek()))
                             .sorted(Comparator.comparingInt(GreenwaveCrossPO::getSort))
                             .collect(Collectors.toList());
                     greenWaveInfoMap.put(greenWaveId, greenWaveCrossIds);