修正干线路口问题列表状态

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

@@ -40,10 +40,14 @@ public class TrunkLineImpl implements TrunkLineService {
 
             vo.setCrossID(e.getCrossID());
             vo.setName(e.getName());
+            vo.setWkt(e.getWkt());
 
             if (e.getDirection() != null) {
+                String temp = e.getDirection().substring(1, e.getDirection().length() - 1);
+                temp = temp.replace("\"", "");
+                String[] temp1 = temp.split(",");
                 Map<String, Integer> directionMap = new HashMap<>();
-                for (String s : e.getDirection()) {
+                for (String s : temp1) {
                     directionMap.put(s, directionMap.getOrDefault(s, 0) + 1);
                 }
 

signal-optimize-service/src/main/java/net/wanji/opt/synthesis/pojo/TrunkLineCrossProblemEntity.java

@@ -9,6 +9,7 @@ public class TrunkLineCrossProblemEntity {
     private Integer inDir;
     private Integer outDir;
     private Integer status;
-    private String[] direction;
+    private String direction;
     private String startTime;
+    private String wkt;
 }

signal-optimize-service/src/main/java/net/wanji/opt/vo2/TrunkLineCrossProblemVO.java

@@ -23,6 +23,7 @@ public class TrunkLineCrossProblemVO {
     private String dir_1_name;
     @ApiModelProperty(value = "方向2")
     private String dir_2_name;
-
+    @ApiModelProperty(value = "路口坐标")
+    private String wkt;
 
 }

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

@@ -74,30 +74,17 @@
         ) b
     </select>
     <select id="getTrunkLineCrossProblem" parameterType="map" resultType="net.wanji.opt.synthesis.pojo.TrunkLineCrossProblemEntity">
-        select
-        a.cross_id,
-        b.name,
-        a.`status`,
-        a.direction ,
-        MAX(a.start_time) as start_time
-        from
-        t_cross_data_hist a
-        left join t_base_cross_info b on
-        a.cross_id = b.id
-        where
+        select a.cross_id,b.name,SUBSTR(b.location , 7 , LENGTH(b.location) - 7) as wkt,a.status,a.direction , a.start_time
+        from t_cross_data_hist a
+        left join t_base_cross_info b on a.cross_id = b.id
+        where a.cross_id in (select cross_id from t_greenwave_cross where green_id = 1)
+        <if test="time == null or time == '' ">
+            and DATE_FORMAT(a.start_time, '%Y-%m-%d %H:%i:00')= DATE_FORMAT(FROM_UNIXTIME(FLOOR(UNIX_TIMESTAMP(DATE_SUB(now(),INTERVAL 5 MINUTE)) / 300 ) * 300), '%Y-%m-%d %H:%i:00')
+        </if>
+        <if test="time != null and time != '' ">
+            and DATE_FORMAT(a.start_time, '%Y-%m-%d %H:%i:00')= DATE_FORMAT(FROM_UNIXTIME(FLOOR(UNIX_TIMESTAMP(#{time}) / 300 ) * 300), '%Y-%m-%d %H:%i:00')
+        </if>
 
-        a.cross_id in (
-        select
-        cross_id
-        from
-        t_greenwave_cross
-        where
-        green_id = #{greenID})
-          <if test="time != null and time != ''">
-            and DATE_FORMAT(a.start_time, '%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> DATE_FORMAT(#{time}, '%Y-%m-%d %H:%i:%s')
-          </if>
-        group by
-        a.cross_id
     </select>
     <select id="getIODir" parameterType="map" resultType="net.wanji.opt.synthesis.pojo.TrunkLineCrossProblemEntity">
         select