Merge remote-tracking branch 'origin/master'

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/GreenwaveHistProviderImpl.java

@@ -547,7 +547,7 @@ public class GreenwaveHistProviderImpl extends BaseDubboInterfaceImpl<GreenwaveH
         List<CrossLaneDataHistPoExtend> list = greenwaveHistoryMapper.findCrossObjectIndex(params);
 
         list = list.stream().sorted(Comparator.comparing(o -> o.getStartTime())).collect(Collectors.toList());
-        //按时间分组分组
+        //路口方向分钟
         Map<String, List<CrossLaneDataHistPoExtend>> groupByDir = list.stream().collect(Collectors.groupingBy(o -> o.getCrossId() + "_" + o.getDirType(), TreeMap::new, Collectors.toList()));
 
         Set<String> hasDataScopeList = new HashSet<>();
@@ -599,7 +599,7 @@ public class GreenwaveHistProviderImpl extends BaseDubboInterfaceImpl<GreenwaveH
                     hasDataScopeList.add(dirTurnDesc + o.getTurnTypeName());
                 } else if (Objects.equals(3, objectType)) {
                     o.setTurnTypeName(TurnConvertEnum.getDescByKey(o.getTurnType()) + o.getLaneNo() + "车道");
-                    hasDataScopeList.add(dirTurnDesc + o.getTurnTypeName() + o.getLaneNo() + "车道");
+                    hasDataScopeList.add(dirTurnDesc + o.getTurnTypeName());
                 } else {
                     hasDataScopeList.add(dirTurnDesc);
                 }

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/service/impl/StaticInfoServiceImpl.java

@@ -698,10 +698,12 @@ public class StaticInfoServiceImpl implements StaticInfoService {
                                 crossSchedulesPOMonthDays.setCrossId(crossId);
                                 crossSchedulesPOMonthDays.setScheduleNo(vNtcipTimeBaseScheduleView.getNTimeBaseScheduleNumber());
                                 crossSchedulesPOMonthDays.setName("调度" + vNtcipTimeBaseScheduleView.getNTimeBaseScheduleNumber());
-                                crossSchedulesPOMonthDays.setWeek(0);
+//                                crossSchedulesPOMonthDays.setWeek(0);
+//                                crossSchedulesPOMonthDays.setPlanId(hisensePlanId);
+                                crossSchedulesPOMonthDays.setWeek(null);
+                                crossSchedulesPOMonthDays.setPlanId(0);
                                 crossSchedulesPOMonthDays.setMonths(monthsStr);
                                 crossSchedulesPOMonthDays.setDays(daysStr);
-                                crossSchedulesPOMonthDays.setPlanId(hisensePlanId);
                                 results.add(crossSchedulesPOMonthDays);
                             }
                         }