[add] 路口检测优化

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/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>