Skip to content

T
traffic-signal-platform
Commit 8b2f08bc authored by duanruiming's avatar duanruiming
Browse files
Options

Merge branch 'jinan-green-city' 

# Conflicts:
#	signal-optimize-service/src/main/java/net/wanji/opt/kafka/ConsumerHandler.java
parents 9dcc8a47 35b50ee9
Show whitespace changes
Inline Side-by-side
Showing with 275 additions and 10 deletions
signal-optimize-service/src/main/resources/bootstrap-dev.yaml
View file @ 8b2f08bc
......@@ -2,7 +2,7 @@ spring:
cloud:
nacos:
config:
server-addr: 10.102.1.182:8848
server-addr: 173.17.0.1:8848
file-extension: yaml
group: signal
namespace: signal
......
signal-utc-service/pom.xml
View file @ 8b2f08bc
......@@ -278,6 +278,157 @@
</executions>
</plugin>
<!-- mvn clean package -Dmaven.test.skip=true jib:build -DsendCredentialsOverHttp=true -->
<!-- 使用jib 无需深入学习docker, 无需编写Dockerfile -->
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.5.2</version>
<!-- 将jib与mvn构建的生命周期绑定 -->
<executions>
<execution>
<id>build-image</id>
<phase>install</phase>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
<configuration>
<!--from节点用来设置镜像的基础镜像，相当于Docerkfile中的FROM关键字-->
<from>
<!--使用harbor上的openjdk镜像-->
<image>${harbor.ip.port}/xinkong/openjdk:8-alpine3.9</image>
<!--harbor服务器的登录信息-->
<auth>
<username>admin</username>
<password>Wanji300552</password>
</auth>
</from>
<to>
<image>${harbor.ip.port}/xinkong/${artifactId}:${version}</image>
<auth>
<username>admin</username>
<password>Wanji300552</password>
</auth>
</to>
<container>
<!--配置jvm虚拟机参数-->
<jvmFlags>
<jvmFlag>-Xms512m</jvmFlag>
<jvmFlag>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=15119</jvmFlag>
</jvmFlags>
<!--配置使用的时区-->
<environment>
<TZ>Asia/Shanghai</TZ>
<spring.profiles.active>dev</spring.profiles.active>
</environment>
<!--要暴露的端口-->
<ports>
<port>39003</port>
<port>15119</port>
<port>5050</port>
</ports>
<!-- <creationTime>2022-10-14T10:08:59.304+08:00</creationTime>-->
<creationTime>${maven.build.timestamp}</creationTime>
<mainClass>net.wanji.utc.hisense.HisenseApplication</mainClass>
</container>
<!--可以进行HTTP-->
<allowInsecureRegistries>true</allowInsecureRegistries>
</configuration>
</plugin>
<!-- maven 打包方式-->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<!--<version>2.6</version>-->
<executions>
<!--将启动脚本复制到指定目录-->
<execution>
<id>copy-bin</id>
<phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.parent.basedir}/assembly/${project.name}/bin</outputDirectory>
<resources>
<resource>
<directory>src/main/bin</directory>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
<!--将配置文件复制到指定目录-->
<execution>
<id>copy-configs</id>
<phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.parent.basedir}/assembly/${project.name}/resources
</outputDirectory>
<resources>
<resource>
<directory>src/main/resources</directory>
<excludes>
<exclude>**/bin/*</exclude>
</excludes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
<executions>
<!--将依赖jar包复制到lib目录-->
<execution>
<id>copy-dependencies</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.parent.basedir}/assembly/${project.name}/lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<!--指定生成jar包目录-->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<!--<classpathPrefix>lib/</classpathPrefix>-->
<classpathPrefix></classpathPrefix>
<mainClass> net.wanji.utc.UtcApplication</mainClass>
</manifest>
<manifestEntries>
<Class-Path>../resources/</Class-Path>
</manifestEntries>
</archive>
<excludes>
<exclude>*.**</exclude>
<exclude>*/*.xml</exclude>
<!--<exclude>configs/**/**</exclude>-->
</excludes>
<outputDirectory>${project.parent.basedir}/assembly/${project.name}/lib</outputDirectory>
<classesDirectory>
</classesDirectory>
</configuration>
</plugin>
</plugins>
</build>
......
wj-databus/pom.xml
View file @ 8b2f08bc
......@@ -12,7 +12,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.wanji</groupId>
<artifactId>wj-databus</artifactId>
<version>0.0.1</version>
<version>0.0.3</version>
<name>wj-databus</name>
<description>wj-databus</description>
......
wj-databus/src/main/java/net/wanji/databus/dao/entity/GreenwaveRealtimePO.java
View file @ 8b2f08bc
package net.wanji.databus.dao.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class GreenwaveRealtimePO {
/** 绿波ID */
@ApiModelProperty(name = "id",notes = "")
......@@ -56,6 +61,7 @@ public class GreenwaveRealtimePO {
private Double uncoordinatePhaseQueue ;
/** 创建时间 */
@ApiModelProperty(name = "数据时间",notes = "")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startTime ;
/** 创建时间 */
@ApiModelProperty(name = "创建时间",notes = "")
......@@ -63,4 +69,30 @@ public class GreenwaveRealtimePO {
/** 修改时间 */
@ApiModelProperty(name = "修改时间",notes = "")
private Date gmtModified ;
/** add 20241123 适配神思数据 */
@ApiModelProperty(value = "执行策略 失衡 2拥堵 3溢出 4死锁 5 空放", notes = "")
private Integer strategy;
@ApiModelProperty(value = "策略执行持续时间；单位：s", notes = "")
private Integer strategyDuration;
@ApiModelProperty(value = "优化执行次数", notes = "")
private Integer optimizeCount;
@ApiModelProperty(value = "优化时长，单位秒", notes = "")
private Integer optimizeSeconds;
@ApiModelProperty(value = "绿波带宽，单位秒", notes = "")
private Integer greenWaveWidth;
@ApiModelProperty(value = "协调方向 0正向 1反向 2双向", notes = "")
private Integer direction;
@ApiModelProperty(value = "方案周期，单位秒", notes = "")
private Integer planCycle;
@ApiModelProperty(value = "方推荐速度上限 km/h", notes = "")
private Integer speedHigh;
@ApiModelProperty(value = "推荐速度下限 km/h", notes = "")
@JsonProperty("speedLow")
private Integer speedDown;
@ApiModelProperty(value = "推荐速度下限 km/h", notes = "")
private String roadDirection;
@ApiModelProperty(value = "饱和度", notes = "")
private Integer sturation;
@ApiModelProperty(name = "采集时间（10位时间戳）",notes = "")
public Integer batchTime ;
}
wj-databus/src/main/java/net/wanji/databus/dao/mapper/GreenwaveRealtimeMapper.java
View file @ 8b2f08bc
......@@ -4,6 +4,7 @@ import feign.Param;
import net.wanji.databus.dao.entity.GreenwaveRealtimePO;
import org.springframework.stereotype.Repository;
import java.util.Collection;
import java.util.List;
/**
......@@ -17,4 +18,7 @@ public interface GreenwaveRealtimeMapper {
int insertBatch(@Param("list") List<GreenwaveRealtimePO> list);
int deleteOne(@Param("greenId") Integer greenId);
void deleteBatch(@Param("list") Collection<Integer> greenIds);
}
wj-databus/src/main/java/net/wanji/databus/po/CrossDataRealtimePO.java
View file @ 8b2f08bc
......@@ -2,9 +2,11 @@ package net.wanji.databus.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.omg.CORBA.UNKNOWN;
import java.util.Date;
......@@ -190,4 +192,19 @@ public class CrossDataRealtimePO {
private double timeOccupancy;
@ApiModelProperty(value = "空间占有率", notes = "平均空间密度（长度占比）")
private double vehicleLengthRatioMean;
/** add 20241123 适配神思数据 */
@ApiModelProperty(value = "执行策略 失衡 2拥堵 3溢出 4死锁 5 空放", notes = "")
private Integer strategy;
@ApiModelProperty(value = "策略执行持续时间；单位：s", notes = "")
@TableField("strategy_duration")
private Integer strategyDuration;
@ApiModelProperty(value = "优化执行次数", notes = "")
@TableField("optimize_count")
private Integer optimizeCount;
@ApiModelProperty(value = "优化时长，单位秒", notes = "")
@TableField("optimize_seconds")
private Integer optimizeSeconds;
@ApiModelProperty(value = "是否空放 0否 1是", notes = "")
@TableField("empty_pass")
private Integer emptyPass;
}
wj-databus/src/main/resources/mapper/CrossDataHistMapper.xml
View file @ 8b2f08bc
......@@ -45,6 +45,12 @@
<result column="traffic_flow_C" property="trafficFlowC"></result>
<result column="vehicle_length_ratio_mean" property="vehicleLengthRatioMean"></result>
<result column="time_occupancy" property="timeOccupancy"></result>
<!-- add 20241123 适配神思数据 -->
<result column="strategy" property="strategy"></result>
<result column="strategy_duration" property="strategyDuration"></result>
<result column="optimize_count" property="optimizeCount"></result>
<result column="optimize_seconds" property="optimizeSeconds"></result>
<result column="empty_pass" property="emptyPass"></result>
</resultMap>
<sql id="Base_Column_List">
......@@ -53,7 +59,8 @@
flow, flow_rate, speed, queue_length, stop_times, delay_time, sturation, batch_time, gmt_create, gmt_modified,
clear_rate,load_balance,not_clear_car_nums,green_light_efficiency,effusion_rate,
no_stop_rate,one_stop_rate,two_stop_rate,three_stop_rate,non_motor_flow,v_85,
traffic_flow_A,traffic_flow_B,traffic_flow_C,vehicle_length_ratio_mean,time_occupancy
traffic_flow_A,traffic_flow_B,traffic_flow_C,vehicle_length_ratio_mean,time_occupancy,
strategy, strategy_duration, optimize_count, optimize_seconds, empty_pass
</sql>
<insert id="insertBatch" parameterType="net.wanji.databus.po.CrossDataHistPO">
......@@ -67,7 +74,9 @@
#{entity.clearRate},#{entity.loadBalance},#{entity.notClearCarNums},#{entity.greenLightEfficiency},#{entity.effusionRate},
#{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},
#{entity.nonMotorFlow},#{entity.v85},#{entity.trafficFlowA},#{entity.trafficFlowB},
#{entity.trafficFlowC},#{entity.vehicleLengthRatioMean},#{entity.timeOccupancy})
#{entity.trafficFlowC},#{entity.vehicleLengthRatioMean},#{entity.timeOccupancy},
#{entity.strategy}, #{entity.strategyDuration}, #{entity.optimizeCount}, #{entity.optimizeSeconds}, #{entity.emptyPass}
)
</foreach>
</insert>
......
wj-databus/src/main/resources/mapper/CrossDataRealtimeMapper.xml
View file @ 8b2f08bc
......@@ -45,6 +45,12 @@
<result column="traffic_flow_C" property="trafficFlowC"></result>
<result column="vehicle_length_ratio_mean" property="vehicleLengthRatioMean"></result>
<result column="time_occupancy" property="timeOccupancy"></result>
<!-- add 20241123 适配神思数据 -->
<result column="strategy_duration" property="strategyDuration"></result>
<result column="optimize_count" property="optimizeCount"></result>
<result column="optimize_seconds" property="optimizeSeconds"></result>
<result column="empty_pass" property="emptyPass"></result>
<result column="strategy" property="strategy"></result>
</resultMap>
<sql id="Base_Column_List">
......@@ -53,7 +59,8 @@
queue_length,stop_times,delay_time,sturation,batch_time,gmt_create,gmt_modified,clear_rate,end_time,
load_balance,not_clear_car_nums,green_light_efficiency,effusion_rate,
no_stop_rate,one_stop_rate,two_stop_rate,three_stop_rate,non_motor_flow,v_85,
traffic_flow_A,traffic_flow_B,traffic_flow_C,vehicle_length_ratio_mean,time_occupancy
traffic_flow_A,traffic_flow_B,traffic_flow_C,vehicle_length_ratio_mean,time_occupancy,
strategy, strategy_duration, optimize_count, optimize_seconds, empty_pass
</sql>
<insert id="insertBatch" parameterType="net.wanji.databus.po.CrossDataRealtimePO">
......@@ -67,7 +74,9 @@
#{entity.clearRate},#{entity.endTime},#{entity.loadBalance},#{entity.notClearCarNums},#{entity.greenLightEfficiency},#{entity.effusionRate},
#{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},
#{entity.nonMotorFlow},#{entity.v85},#{entity.trafficFlowA},#{entity.trafficFlowB},#{entity.trafficFlowC},
#{entity.vehicleLengthRatioMean},#{entity.timeOccupancy})
#{entity.vehicleLengthRatioMean},#{entity.timeOccupancy},
#{entity.strategy}, #{entity.strategyDuration}, #{entity.optimizeCount}, #{entity.optimizeSeconds}, #{entity.emptyPass}
)
</foreach>
</insert>
......
wj-databus/src/main/resources/mapper/GreenwaveHistMapper.xml
View file @ 8b2f08bc
......@@ -21,11 +21,21 @@
<result property="startTime" column="start_time"/>
<result property="gmtCreate" column="gmt_create"/>
<result property="gmtModified" column="gmt_modified"/>
<!-- add 20241123 适配神思数据 -->
<result column="strategy" property="strategy"></result>
<result column="strategy_duration" property="strategyDuration"></result>
<result column="optimize_count" property="optimizeCount"></result>
<result column="optimize_seconds" property="optimizeSeconds"></result>
<result column="empty_pass" property="emptyPass"></result>
<result column="batch_time" property="batchTime"></result>
</resultMap>
<sql id="Base_Column_List">
id, green_id, status,type,traffic_index,speed,trval_time,stop_times,queue_length,cong_rate,delay_time,nopark_pass_rate,
cord_reliability,cord_queue_ratio,uncoordinate_phase_queue, start_time, gmt_create,gmt_modified
cord_reliability,cord_queue_ratio,uncoordinate_phase_queue, start_time, gmt_create,gmt_modified,
strategy, strategy_duration, optimize_count, optimize_seconds,
green_wave_width, direction, plan_cycle, speed_high, speed_down, road_direction, sturation, batch_time
</sql>
<select id="selectRunMonitor" resultType="net.wanji.databus.dao.entity.GreenwaveHistPOExt">
......@@ -82,7 +92,11 @@
(#{entity.id}, #{entity.greenId}, #{entity.status}, #{entity.type}, #{entity.trafficIndex},#{entity.speed},
#{entity.trvalTime}, #{entity.stopTimes}, #{entity.queueLength}, #{entity.congRate},
#{entity.delayTime}, #{entity.noparkPassRate}, #{entity.cordReliability}, #{entity.cordQueueRatio},
#{entity.uncoordinatePhaseQueue}, #{entity.startTime}, #{entity.gmtCreate}, #{entity.gmtModified})
#{entity.uncoordinatePhaseQueue}, #{entity.startTime}, #{entity.gmtCreate}, #{entity.gmtModified},
#{entity.strategy}, #{entity.strategyDuration}, #{entity.optimizeCount}, #{entity.optimizeSeconds},
#{entity.greenWaveWidth}, #{entity.direction}, #{entity.planCycle}, #{entity.speedHigh},
#{entity.speedDown}, #{entity.roadDirection}, #{entity.sturation}, #{entity.batchTime}
)
</foreach>
</insert>
......
wj-databus/src/main/resources/mapper/GreenwaveRealtimeMapper.xml
View file @ 8b2f08bc
......@@ -21,11 +21,28 @@
<result property="startTime" column="start_time"/>
<result property="gmtCreate" column="gmt_create"/>
<result property="gmtModified" column="gmt_modified"/>
<!-- add 20241123 适配神思数据 -->
<result column="strategy" property="strategy"></result>
<result column="strategy_duration" property="strategyDuration"></result>
<result column="optimize_count" property="optimizeCount"></result>
<result column="optimize_seconds" property="optimizeSeconds"></result>
<result column="green_wave_width" property="greenWaveWidth"></result>
<result column="direction" property="direction"></result>
<result column="plan_cycle" property="planCycle"></result>
<result column="speed_high" property="speedHigh"></result>
<result column="speed_down" property="speedDown"></result>
<result column="road_direction" property="roadDirection"></result>
<result column="sturation" property="sturation"></result>
<result column="batch_time" property="batchTime"></result>
</resultMap>
<sql id="Base_Column_List">
id, green_id, status,type,traffic_index,speed,trval_time,stop_times,queue_length,cong_rate,delay_time,nopark_pass_rate,
cord_reliability, cord_queue_ratio, uncoordinate_phase_queue, start_time, gmt_create,gmt_modified
cord_reliability, cord_queue_ratio, uncoordinate_phase_queue, start_time, gmt_create,gmt_modified,
strategy, strategy_duration, optimize_count, optimize_seconds,
green_wave_width, direction, plan_cycle, speed_high, speed_down, road_direction, sturation, batch_time
</sql>
<select id="selectById" resultType="net.wanji.databus.dao.entity.GreenwaveRealtimePO">
......@@ -43,7 +60,11 @@
(#{entity.id}, #{entity.greenId}, #{entity.status}, #{entity.type}, #{entity.trafficIndex}, #{entity.speed},
#{entity.trvalTime}, #{entity.stopTimes}, #{entity.queueLength}, #{entity.congRate},
#{entity.delayTime}, #{entity.noparkPassRate}, #{entity.cordReliability}, #{entity.cordQueueRatio},
#{entity.uncoordinatePhaseQueue}, #{entity.startTime}, #{entity.gmtCreate}, #{entity.gmtModified})
#{entity.uncoordinatePhaseQueue}, #{entity.startTime}, #{entity.gmtCreate}, #{entity.gmtModified},
#{entity.strategy}, #{entity.strategyDuration}, #{entity.optimizeCount}, #{entity.optimizeSeconds},
#{entity.greenWaveWidth}, #{entity.direction}, #{entity.planCycle}, #{entity.speedHigh},
#{entity.speedDown}, #{entity.roadDirection}, #{entity.sturation}, #{entity.batchTime}
)
</foreach>
</insert>
......@@ -56,4 +77,12 @@
</where>
</delete>
<delete id="deleteBatch" parameterType="String">
delete from t_greenwave_realtime
where green_id in
<foreach collection="list" item="greenId" separator="," open="(" close=")">
#{greenId}
</foreach>
</delete>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment