Merge remote-tracking branch 'origin/master'

signal-control-service/src/main/java/net/wanji/web/mapper/scheme/CrossDirDataRealtimeMapper.java

 package net.wanji.web.mapper.scheme;
 
-import net.wanji.web.po.scheme.CrossDirDataRealtimePO;
+import net.wanji.common.po.CrossDirDataRealtimePO;
 import org.springframework.stereotype.Repository;
 
 /**

signal-control-service/src/main/java/net/wanji/web/service/scheme/impl/CrossConfigServiceImpl.java

@@ -18,7 +18,7 @@ import net.wanji.web.mapper.scheme.CrossPhaseLightsMapper;
 import net.wanji.web.mapper.scheme.CrossTurnDataHistMapper;
 import net.wanji.web.mapper.scheme.LaneInfoMapper;
 import net.wanji.web.mapper.scheme.LaneSegmentMapper;
-import net.wanji.web.po.scheme.CrossDirDataRealtimePO;
+import net.wanji.common.po.CrossDirDataRealtimePO;
 import net.wanji.web.po.scheme.CrossDirInfoPO;
 import net.wanji.web.po.scheme.CrossLaneLightsPO;
 import net.wanji.web.po.scheme.CrossLightsPO;

signal-control-service/src/main/resources/mapper/scheme/CrossDirDataRealtimeMapper.xml

@@ -3,11 +3,11 @@
 <mapper namespace="net.wanji.web.mapper.scheme.CrossDirDataRealtimeMapper">
 
     <sql id="baseColumnList">
-        id,dir_type,in_out_type,cross_id,length,status,traffic_index,start_time,duration,flow,speed,queue_length,
-        stop_times,delay_time,sturation,batch_time,gmt_create,gmt_modified
+        id,dir_type,in_out_type,cross_id,length,status,traffic_index,start_time,capacity,duration,flow,speed,queue_length,
+        stop_times,delay_time,sturation,batch_time,gmt_create,gmt_modified,effusion_time
     </sql>
 
-    <select id="selectByCrossIdAndDirType" resultType="net.wanji.web.po.scheme.CrossDirDataRealtimePO">
+    <select id="selectByCrossIdAndDirType" resultType="net.wanji.common.po.CrossDirDataRealtimePO">
         select
             <include refid="baseColumnList"/>
         from t_cross_dir_data_realtime

signal-optimize-service/src/main/java/net/wanji/opt/po/CrossDataHistPO.java

@@ -8,7 +8,6 @@ import java.util.Date;
 /**
  * @author hanbing
  * @date 2023/1/10 16:36
- * @desc CrossDataRealtimePO
  */
 @Data
 public class CrossDataHistPO {

signal-optimize-service/src/main/java/net/wanji/opt/po/CrossDataRealtimePO.java

-package net.wanji.opt.po;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author hfx
- * @date 2023/1/10 16:36
- * @desc CrossDataRealtimePO
- */
-@Data
-public class CrossDataRealtimePO {
-
-
-    @ApiModelProperty(name = "路口ID",notes = "")
-    private String crossId;
-
-    @ApiModelProperty(name = "是否失衡：0否；1是",notes = "")
-    private Integer isUnbalance;
-
-    @ApiModelProperty(name = "是否溢出：0否；1是",notes = "")
-    private Integer isSpillover;
-
-    @ApiModelProperty(name = "是否拥堵：0否；1是",notes = "")
-    private Integer isCongestion;
-
-    @ApiModelProperty(name = "失衡指数",notes = "")
-    private Double unbalanceIndex;
-
-    @ApiModelProperty(name = "溢出指数",notes = "")
-    private Double spilloverIndex;
-
-    @ApiModelProperty(name = "拥堵指数",notes = "")
-    private Double congestionIndex;
-
-    @ApiModelProperty(name = "综合指数",notes = "")
-    private Double compositeIndex;
-
-    @ApiModelProperty(name = "交通流量（辆）",notes = "")
-    private Integer flow;
-
-    @ApiModelProperty(name = "平均速度（km/h）",notes = "")
-    private Double speed;
-
-    @ApiModelProperty(name = "停车次数（次）",notes = "")
-    private Double stopTimes;
-
-    @ApiModelProperty(name = "延误时间（秒）",notes = "")
-    private Integer delayTime;
-
-    @ApiModelProperty(name = "饱和度",notes = "")
-    private Double sturation;
-
-    @ApiModelProperty(name = "数据批次",notes = "")
-    private Integer batchTime;
-
-}

signal-optimize-service/src/main/java/net/wanji/opt/po/strategy/IdeaPO.java

@@ -8,7 +8,6 @@ import java.util.Date;
 /**
  * @author hanbing
  * @date 2023/1/10 16:36
- * @desc CrossDataRealtimePO
  */
 @Data
 public class IdeaPO {

signal-optimize-service/src/main/java/net/wanji/opt/po/strategy/StrategyPO.java

@@ -8,7 +8,6 @@ import java.util.Date;
 /**
  * @author hanbing
  * @date 2023/1/10 16:36
- * @desc CrossDataRealtimePO
  */
 @Data
 public class StrategyPO {

signal-optimize-service/src/main/java/net/wanji/opt/po/trend/CrossDataRealtimePO.java

@@ -11,7 +11,6 @@ import java.util.List;
 /**
  * @author hfx
  * @date 2023/1/10 16:36
- * @desc CrossDataRealtimePO
  */
 @Data
 public class CrossDataRealtimePO {

signal-optimize-service/src/main/java/net/wanji/opt/po/trend/CrossDirDataHistPO.java

@@ -8,7 +8,6 @@ import java.util.Date;
 /**
  * @author hfx
  * @date 2023/1/10 16:36
- * @desc CrossDataRealtimePO
  */
 @Data
 public class CrossDirDataHistPO {
@@ -35,6 +34,8 @@ public class CrossDirDataHistPO {
     private Double trafficIndex ;
     @ApiModelProperty(value = "开始时间：yyyy-MM-dd HH:mm:ss",notes = "")
     private Date startTime ;
+    @ApiModelProperty(value = "通行能力（辆/某一时段内最大过车数）,通行能力=自然流量",notes = "")
+    private Integer capacity ;
     @ApiModelProperty(value = "持续时间（单位：分钟）",notes = "")
     private Integer duration ;
     /** 交通流量（辆） */
@@ -64,4 +65,6 @@ public class CrossDirDataHistPO {
     /** 修改时间 */
     @ApiModelProperty(name = "修改时间",notes = "")
     private Date gmtModified ;
+    @ApiModelProperty(name = "溢流时长，计算溢流率提供；溢流率：交叉口间路段车辆排队长度超出可容纳空间的时长与观测总时长的百分比",notes = "")
+    private Double effusionTime ;
 }

signal-optimize-service/src/main/java/net/wanji/opt/po/trend/CrossTurnDataRealtimePO.java

@@ -8,7 +8,6 @@ import java.util.Date;
 /**
  * @author hfx
  * @date 2023/1/10 16:36
- * @desc CrossDataRealtimePO
  */
 @Data
 public class CrossTurnDataRealtimePO {

signal-optimize-service/src/main/java/net/wanji/opt/po/trend/GreenwaveInfoPO.java

@@ -8,7 +8,6 @@ import java.util.Date;
 /**
  * @author hfx
  * @date 2023/1/10 16:36
- * @desc CrossDataRealtimePO
  */
 @Data
 public class GreenwaveInfoPO {

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

@@ -114,9 +114,8 @@ public class DiagnoServiceImpl implements DiagnoService {
         querySceneDTO.setPageSize(999);
         PageInfo<AddOrUpdateSceneDTO> pageInfo = sceneService.queryScene(querySceneDTO);
         List<AddOrUpdateSceneDTO> list = pageInfo.getList();
-        AddOrUpdateSceneDTO addOrUpdateSceneDTO = list.get(0);
 
-        return addOrUpdateSceneDTO;
+        return list.get(0);
     }
 
     @Override
@@ -132,8 +131,8 @@ public class DiagnoServiceImpl implements DiagnoService {
                 String startCrossId = ridInfo.getStartCrossId();
                 crossIdAndLocationVO.setId(startCrossId);
                 CrossInfoPO crossInfoPO = crossInfoMapper.selectById(startCrossId);
-                crossIdAndLocationVO.setName(crossInfoPO.getName());
                 if (crossInfoPO != null) {
+                    crossIdAndLocationVO.setName(crossInfoPO.getName());
                     String startLocationStr = crossInfoPO.getLocation();
                     double[] startLonLat = CrossUtil.getLonLat(startLocationStr);
                     List<Double> startLocation = new ArrayList<>();

signal-optimize-service/src/main/resources/mapper/trend/CrossDirDataHist.xml

@@ -2,10 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="net.wanji.opt.dao.mapper.trend.CrossDirDataHistMapper">
 
+    <sql id="baseColumnList">
+        id,dir_type,in_out_type,cross_id,length,status,traffic_index,start_time,capacity,flow,speed,queue_length,stop_times,
+        delay_time,sturation,batch_time,gmt_create,gmt_modified,effusion_time
+
+    </sql>
+
 
     <select id="selectByCrossIdAndTimestamp" resultType="net.wanji.opt.po.trend.CrossDirDataHistPO">
-        select
-            id,dir_type,in_out_type,cross_id,length,status,traffic_index,flow,speed,queue_length,stop_times,delay_time,sturation,batch_time,gmt_create,gmt_modified
+        select <include refid="baseColumnList"/>
         from t_cross_dir_data_hist
         where cross_id = #{crossId} and in_out_type = 1
           and batch_time <![CDATA[ >= ]]> #{preSeconds}
@@ -13,8 +18,7 @@
     </select>
 
     <select id="selectByCrossIdDirAndTimestamp" resultType="net.wanji.opt.po.trend.CrossDirDataHistPO">
-        select
-            id,dir_type,in_out_type,cross_id,length,status,traffic_index,flow,speed,queue_length,stop_times,delay_time,sturation,batch_time,gmt_create,gmt_modified
+        select <include refid="baseColumnList"/>
         from t_cross_dir_data_hist
         where cross_id = #{crossId} and in_out_type = 1 and dir_type = #{dir}
           and batch_time <![CDATA[ >= ]]> #{preSeconds}

signal-control-service/src/main/java/net/wanji/web/po/scheme/CrossDirDataRealtimePO.java → wj-common/src/main/java/net/wanji/common/po/CrossDirDataRealtimePO.java

-package net.wanji.web.po.scheme;
+package net.wanji.common.po;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -35,6 +35,8 @@ public class CrossDirDataRealtimePO {
     private Double trafficIndex ;
     @ApiModelProperty(value = "开始时间：yyyy-MM-dd HH:mm:ss",notes = "")
     private Date startTime ;
+    @ApiModelProperty(value = "通行能力（辆/某一时段内最大过车数）,通行能力=自然流量",notes = "")
+    private Integer capacity ;
     @ApiModelProperty(value = "持续时间（单位：分钟）",notes = "")
     private Integer duration ;
     /** 交通流量（辆） */
@@ -64,5 +66,6 @@ public class CrossDirDataRealtimePO {
     /** 修改时间 */
     @ApiModelProperty(name = "修改时间",notes = "")
     private Date gmtModified ;
-
+    @ApiModelProperty(name = "溢流时长，计算溢流率提供；溢流率：交叉口间路段车辆排队长度超出可容纳空间的时长与观测总时长的百分比",notes = "")
+    private Double effusionTime ;
 }