Merge remote-tracking branch 'origin/master'

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

@@ -322,9 +322,6 @@ public class RunningEvaluateServiceImpl implements RunningEvaluateService {
         }
 
         RunningEvaluateMetricsDetailVO res = new RunningEvaluateMetricsDetailVO();
-        if (CollectionUtil.isEmpty(metricHistDTOList)) {
-            return res;
-        }
         // 路口级别全量数据
         List<MetricHistDTO> crossDTOList = crossDataHistMapper.selectMetricHistDTO(
                 crossId, startStamp, endStamp);
@@ -336,6 +333,9 @@ public class RunningEvaluateServiceImpl implements RunningEvaluateService {
             res.setProblemStatusList(buildProblemStatusList(filteredList));
             res.setSchemeList(buildSchemeList(filteredList, crossId));
         }
+        if (CollectionUtil.isEmpty(metricHistDTOList)) {
+            return res;
+        }
         // 使用全量数据按时间粒度聚合指标
         res.setMetricsList(buildMetricsList(metricHistDTOList, minutes));
         return res;

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

@@ -1310,15 +1310,11 @@ public class TrendServiceImpl implements TrendService {
             List<MainlineSchemeAnalysisVO.GreenwaveData> greenwaveData) {
 
         Calendar now = Calendar.getInstance();
-        String currentDayType = getDayType(now);
         String currentTime = new SimpleDateFormat("HH:mm").format(now.getTime());
 
         for (MainlineSchemeAnalysisVO.GreenwaveData data : greenwaveData) {
             String name = data.getName();
             // 旅游路 东向西 转山西路至霞景路路段:正向绿波 工作日 07:00-07:40
-            String[] split1 = name.split(" ");
-            String dayType = split1[3];
-
             Pattern pattern = Pattern.compile(".*?(\\d{2}:\\d{2}-\\d{2}:\\d{2})");
             Matcher matcher = pattern.matcher(name);
             if (matcher.matches()) {
@@ -1330,18 +1326,8 @@ public class TrendServiceImpl implements TrendService {
                     Date currentTimeDate = new SimpleDateFormat("HH:mm").parse(currentTime);
 
                     if (currentTimeDate.after(startTime) && currentTimeDate.before(endTime)) {
-                        if (!dayType.equals("工作日") && !dayType.equals("周末")) {
-                            SimpleDateFormat sdf = new SimpleDateFormat("M月d日");
-                            String currentDate = sdf.format(now.getTime());
-
-                            if (dayType.equals(currentDate)) {
                         return data;
                     }
-                        } else if ((dayType.equals("工作日") && currentDayType.equals("工作日"))
-                                || (dayType.equals("周末") && currentDayType.equals("周末"))) {
-                            return data;
-                        }
-                    }
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }
@@ -1351,15 +1337,6 @@ public class TrendServiceImpl implements TrendService {
         return null;
     }
 
-    private String getDayType(Calendar calendar) {
-        int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
-        if (dayOfWeek == Calendar.SATURDAY || dayOfWeek == Calendar.SUNDAY) {
-            return "周末";
-        } else {
-            return "工作日";
-        }
-    }
-
     private void setMetrics(GreenwaveCrossMetricsVO greenwaveCrossMetricsVO, GreenwaveCrossPO greenwaveCrossPO,
                             List<CrossTurnDataHistPO> listForNoPark, List<CrossTurnDataHistPO> listForPhaseQueue) {
         if (CollectionUtil.isNotEmpty(listForNoPark) && CollectionUtil.isNotEmpty(listForPhaseQueue)) {

wj-common/pom.xml

@@ -550,7 +550,7 @@
         <dependency>
             <groupId>org.toile-libre.libe</groupId>
             <artifactId>curl</artifactId>
-            <version>LATEST</version>
+            <version>0.0.43</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

wj-databus/src/main/java/net/wanji/databus/dao/mapper/LaneInfoMapper.java

@@ -38,5 +38,5 @@ public interface LaneInfoMapper {
 
     List<LaneInfoPO> selectByTurnType(String crossId, Integer type, Integer dir, List<Integer> keyList);
 
-    String selectIdByCrossIdDirTurn2(String crossId, Integer dir, Integer turnInt);
+    String selectIdByCrossIdDirTurn2(String crossId, Integer dir, Integer turn);
 }