Merge remote-tracking branch 'origin/master'

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

@@ -497,7 +497,7 @@ public class StaticInfoServiceImpl implements StaticInfoService {
                     String turn = readUtf8Line.substring(3);
                     Integer wjLightsDir = HiseseDirEnum.getWjLightsDir(Integer.parseInt(dir, 2));
                     Integer wjLightsTurn = HisenseTurnEnum.getWjLightsTurn(Integer.parseInt(turn, 2));
-                    if (wjLightsDir == 0 || wjLightsTurn == 0){
+                    if (wjLightsDir == 0 && wjLightsTurn == 0){
                         continue;
                     }
                     Integer wjPerson = HisensePersonEntranceAndExitEnum.getWjperson(Integer.parseInt(turn, 2));
@@ -513,6 +513,7 @@ public class StaticInfoServiceImpl implements StaticInfoService {
                     } else if (wjLightsDir == 7) {
                         crossLightsPO.setType(1);
                     }
+
                     //key
                     String lightMapKey = String.valueOf(wjLightsDir).concat(String.valueOf(wjLightsTurn)).concat(String.valueOf(crossLightsPO.getType()));
                     if (!lightsMap.containsKey(lightMapKey)) {
@@ -718,10 +719,10 @@ public class StaticInfoServiceImpl implements StaticInfoService {
         //查询当前路口运行的方案
         LocalDate now = LocalDate.now();
         int week = now.getDayOfWeek().getValue();
-        if (week == 7) {
-            //表中周日用0表示
-            week = 0;
-        }
+//        if (week == 7) {
+//            //表中周日用0表示
+//            week = 0;
+//        }
         CrossNowSchemePO baseCrossSchemePO = baseCrossSchemeMapper.selectByCrossIdAndWeek(crossId, week);
         if (ObjectUtil.isNotEmpty(baseCrossSchemePO)) {
             coordinationStatus = new CoordinationStatus();