Merge remote-tracking branch 'origin/master'

signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/CrossController.java

@@ -53,7 +53,7 @@ public class CrossController {
                 date = DateUtil.now().substring(0, 10);
             }
             Map<String, Object> result = crossService.getCrossStatusDistribution(crossID, date, groupType, objectType, condition);
-            List<CrossStatusDisOptTimeEntity> optTimes = crossService.getOptTimeList(crossID);
+            List<CrossStatusDisOptTimeEntity> optTimes = crossService.getOptTimeList(crossID, date);
             List<CrossOrGreenWaveTypeEntity> typeList = crossService.getCrossTypeList(crossID, date);
             result.put("optTimesList", optTimes);
             result.put("typeList", typeList);

signal-optimize-service/src/main/java/net/wanji/opt/dao/mapper/CrossMapper.java

@@ -18,7 +18,7 @@ public interface CrossMapper {
      * 监测详情-路口事件详情-路口状态分布趋势-优化时间
      * @param crossID 路口ID
      */
-    List<CrossStatusDisOptTimeEntity> getOptTimes(String crossID);
+    List<CrossStatusDisOptTimeEntity> getOptTimes(String crossID, String date);
 
     /**
      * 监测详情-路口事件详情-路口实时告警

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/CrossService.java

@@ -54,7 +54,7 @@ public interface CrossService {
      * @param crossID 路口ID
      * @return
      */
-    List<CrossStatusDisOptTimeEntity> getOptTimeList(String crossID);
+    List<CrossStatusDisOptTimeEntity> getOptTimeList(String crossID, String date);
 
     /**
      * 获取路口基础信息————方向、转向、车道信息

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/implv2/CrossServiceImpl.java

@@ -209,8 +209,9 @@ public class CrossServiceImpl implements CrossService {
     }
 
     @Override
-    public List<CrossStatusDisOptTimeEntity> getOptTimeList(String crossID) {
-        return crossMapper.getOptTimes(crossID);
+    public List<CrossStatusDisOptTimeEntity> getOptTimeList(String crossID, String date) {
+        String dt = date.substring(0, 10).replaceAll("-", "");
+        return crossMapper.getOptTimes(crossID, dt);
     }
 
     /**

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/report/impl/GreenWaveCrossRidServiceImpl.java

@@ -54,7 +54,12 @@ public class GreenWaveCrossRidServiceImpl implements GreenWaveCrossRidService {
             String[] dirs = greenDir.split(",");
             String content = StrUtil.format("{}{}走向",CrossDirEnum.getDesc(Integer.valueOf(dirs[0])),CrossDirEnum.getDesc(Integer.valueOf(dirs[1]))) ;
             GreenWaveCrossRidInfoVO greenWaveCrossRidInfoVO = new GreenWaveCrossRidInfoVO();
-            GreenWaveCrossRidInfo greenWaveCrossRidInfo = greenWaveCrossRidInfoList.get(1);
+            GreenWaveCrossRidInfo greenWaveCrossRidInfo = greenWaveCrossRidInfoList.get(0);
+            for (GreenWaveCrossRidInfo waveCrossRidInfo : greenWaveCrossRidInfoList) {
+                if(waveCrossRidInfo.getIsKeyRoute() == 1){
+                    greenWaveCrossRidInfo = waveCrossRidInfo;
+                }
+            }
             BeanUtils.copyProperties(greenWaveCrossRidInfo,greenWaveCrossRidInfoVO);
             greenWaveCrossRidInfoVO.setGreenDirName(content);
             greenWaveCrossRidInfoVO.setLevelName(RoadLevelEnum.getDesc(greenWaveCrossRidInfo.getLevel()));

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/report/impl/GreenWaveWeekDataServiceImpl.java

@@ -316,7 +316,7 @@ public class GreenWaveWeekDataServiceImpl extends ServiceImpl<GreenWaveWeekDataM
             greenWaveWeekDataVO.setGreenRoadType(RoadLevelEnum.getDesc(greenInfoList.get(0).getLevel()));
             greenWaveWeekDataVOList.add(greenWaveWeekDataVO);
         }
-        List<GreenWaveWeekDataVO> collect = greenWaveWeekDataVOList.stream().sorted(Comparator.comparingDouble(GreenWaveWeekDataVO::getCongestCount).reversed()).collect(Collectors.toList());
+        List<GreenWaveWeekDataVO> collect = greenWaveWeekDataVOList.stream().sorted(Comparator.comparingDouble(GreenWaveWeekDataVO::getCongestIndex).reversed()).collect(Collectors.toList());
         collect.forEach(x->{
             x.setRank(collect.indexOf(x)+1);
         });
@@ -430,7 +430,7 @@ public class GreenWaveWeekDataServiceImpl extends ServiceImpl<GreenWaveWeekDataM
                                 }else if(travelTime == 0){
                                     samePeriodData.setPmTravelTimeSituation("相等");
                                 }else {
-                                    samePeriodData.setPmTravelTimeSituation("增加"+Math.abs(travelTime)+"s");
+                                    samePeriodData.setPmTravelTimeSituation("增加");
                                 }
                                 if(waveWeekData.getSpeed()!=0){
                                     greenReportSamePeriodData.setAvgSpeedRatio(Math.round((speed/waveWeekData.getSpeed()*10000))/100.0);

signal-optimize-service/src/main/resources/mapper/CrossMapper.xml

@@ -28,7 +28,7 @@
                   and a.cross_id = #{crossID}
                   and sign(a.rtn_type) = -1
                   and a.current_algo = 1
-                  and a.issue_time >= CURDATE()
+                  and a.dt = #{date}
 
                 union
 
@@ -42,7 +42,7 @@
                   and a.cross_id = #{crossID}
                   and a.current_algo = 2
                   and a.response_code = 200
-                  and a.issue_time >= CURDATE()
+                  and a.dt = #{date}
 
                 union
 
@@ -56,7 +56,7 @@
                   and a.cross_id = #{crossID}
                   and a.current_algo = 3
                   and a.response_code = 200
-                  and a.issue_time >= CURDATE()
+                  and a.dt = #{date}
             ) b
         order by b.issue_time
     </select>

signal-optimize-service/src/main/resources/mapper/report/CrossRidLaneMapper.xml

@@ -13,14 +13,17 @@
         b.dir as dir,
         b.turn as turn,
         c.name AS lane_name,
+        b.type as lane_type,
         c.out_dir as out_dir,
-        c.in_dir as in_dir
+        c.in_dir as in_dir,
+        c.start_cross_id,
+        c.end_cross_id
         FROM
         t_base_cross_info AS a
-        LEFT JOIN t_base_lane_info AS b ON a.id = b.cross_id
-        LEFT JOIN t_base_rid_info AS c ON b.rid = c.id
+        LEFT JOIN t_base_rid_info AS c ON a.id = c.start_cross_id or a.id = c.end_cross_id
+        LEFT JOIN t_base_lane_info AS b ON b.rid = c.id
         WHERE
-        a.is_signal = 1 and b.type = 2
+        a.is_signal = 1
         <if test="crossIdList != null">
             and a.id in
             <foreach collection="crossIdList" item="crossId" open="(" close=")" separator=",">