Skip to content

T
traffic-signal-platform
Commit 5b09156f authored by duanruiming's avatar duanruiming
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents ee464c96 811bf792
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 40 deletions
signal-optimize-service/pom.xml
View file @ 5b09156f
......@@ -226,17 +226,17 @@
<!-- mvn clean package -Dmaven.test.skip=true jib:build -DsendCredentialsOverHttp=true -->
<!-- 使用jib 无需深入学习docker, 无需编写Dockerfile -->
<plugin>
<!--<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.5.2</version>
<configuration>
<!--from节点用来设置镜像的基础镜像，相当于Docerkfile中的FROM关键字-->
&lt;!&ndash;from节点用来设置镜像的基础镜像，相当于Docerkfile中的FROM关键字&ndash;&gt;
<from>
<!--使用harbor上的openjdk镜像-->
<!--<image>${harbor.ip.port}/xinkong/openjdk:8-alpine3.9</image>-->
&lt;!&ndash;使用harbor上的openjdk镜像&ndash;&gt;
&lt;!&ndash;<image>${harbor.ip.port}/xinkong/openjdk:8-alpine3.9</image>&ndash;&gt;
<image>${harbor.ip.port}/xinkong/centos7-jdk8-rpm:1.0</image>
<!--harbor服务器的登录信息-->
&lt;!&ndash;harbor服务器的登录信息&ndash;&gt;
<auth>
<username>admin</username>
<password>Wanji300552</password>
......@@ -250,50 +250,50 @@
</auth>
</to>
<container>
<!--配置jvm虚拟机参数-->
&lt;!&ndash;配置jvm虚拟机参数&ndash;&gt;
<jvmFlags>
<jvmFlag>-Xms512m</jvmFlag>
<jvmFlag>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=15117</jvmFlag>
</jvmFlags>
<!--添加RPM包-->
<!--rpm -i /rpms/glibc-common-2.17-326.el7_9.3.x86_64.rpm &#45;&#45;force &amp;&amp;-->
<!--rpm -i /rpms/nspr-4.35.0-1.el7_9.x86_64.rpm &#45;&#45;force &amp;&amp;-->
<!--rpm -i /rpms/nss-util-3.90.0-1.el7_9.x86_64.rpm &#45;&#45;force &amp;&amp;-->
<!--rpm -i /rpms/glibc-2.17-326.el7_9.3.i686.rpm &#45;&#45;force &amp;&amp;-->
<!--rpm -i /rpms/glibc-2.17-326.el7_9.3.x86_64.rpm &#45;&#45;force &amp;&amp;-->
<!--rpm -i /rpms/glibc-headers-2.17-326.el7_9.3.x86_64.rpm &#45;&#45;force &amp;&amp;-->
<!--rpm -i /rpms/glibc-devel-2.17-326.el7_9.3.x86_64.rpm &#45;&#45;force &amp;&amp;-->
<!--rpm -i /rpms/nss-softokn-freebl-3.90.0-6.el7_9.i686.rpm &#45;&#45;force &amp;&amp;-->
<!--rpm -i /rpms/nss-softokn-freebl-3.90.0-6.el7_9.x86_64.rpm &#45;&#45;force &amp;&amp;-->
<!--rpm -i /rpms/zlib-1.2.7-21.el7_9.i686.rpm &#45;&#45;force &amp;&amp;-->
<!--rpm -i /rpms/libpng-1.5.13-8.el7.i686.rpm &#45;&#45;force &amp;&amp;-->
<!--rpm -i /rpms/bzip2-libs-1.0.6-13.el7.i686.rpm &#45;&#45;force &amp;&amp;-->
<!--rpm -i /rpms/libuuid-2.23.2-65.el7_9.1.i686.rpm &#45;&#45;force &amp;&amp;-->
<!--rpm -i /rpms/expat-2.1.0-15.el7_9.i686.rpm &#45;&#45;force &amp;&amp;-->
<!--rpm -i /rpms/freetype-2.8-14.el7_9.1.i686.rpm &#45;&#45;force &amp;&amp;-->
<!--<entrypoint>-->
<!--<shell>sh</shell>-->
<!--<option>-c</option>-->
<!--<arg>-->
<!--rpm localinstall /rpms/fontconfig-2.13.0-4.3.el7.i686.rpm &#45;&#45;nogpgcheck &amp;&amp;-->
<!--rpm localinstall /rpms/fontconfig-2.13.0-4.3.el7.x86_64.rpm &#45;&#45;nogpgcheck &amp;&amp;-->
<!--rpm localinstall /rpms/dejavu-sans-fonts-2.33-6.el7.noarch.rpm &#45;&#45;nogpgcheck-->
<!--</arg>-->
<!--</entrypoint>-->
&lt;!&ndash;添加RPM包&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/glibc-common-2.17-326.el7_9.3.x86_64.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/nspr-4.35.0-1.el7_9.x86_64.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/nss-util-3.90.0-1.el7_9.x86_64.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/glibc-2.17-326.el7_9.3.i686.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/glibc-2.17-326.el7_9.3.x86_64.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/glibc-headers-2.17-326.el7_9.3.x86_64.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/glibc-devel-2.17-326.el7_9.3.x86_64.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/nss-softokn-freebl-3.90.0-6.el7_9.i686.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/nss-softokn-freebl-3.90.0-6.el7_9.x86_64.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/zlib-1.2.7-21.el7_9.i686.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/libpng-1.5.13-8.el7.i686.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/bzip2-libs-1.0.6-13.el7.i686.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/libuuid-2.23.2-65.el7_9.1.i686.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/expat-2.1.0-15.el7_9.i686.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm -i /rpms/freetype-2.8-14.el7_9.1.i686.rpm &#45;&#45;force &amp;&amp;&ndash;&gt;
&lt;!&ndash;<entrypoint>&ndash;&gt;
&lt;!&ndash;<shell>sh</shell>&ndash;&gt;
&lt;!&ndash;<option>-c</option>&ndash;&gt;
&lt;!&ndash;<arg>&ndash;&gt;
&lt;!&ndash;rpm localinstall /rpms/fontconfig-2.13.0-4.3.el7.i686.rpm &#45;&#45;nogpgcheck &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm localinstall /rpms/fontconfig-2.13.0-4.3.el7.x86_64.rpm &#45;&#45;nogpgcheck &amp;&amp;&ndash;&gt;
&lt;!&ndash;rpm localinstall /rpms/dejavu-sans-fonts-2.33-6.el7.noarch.rpm &#45;&#45;nogpgcheck&ndash;&gt;
&lt;!&ndash;</arg>&ndash;&gt;
&lt;!&ndash;</entrypoint>&ndash;&gt;
<!--配置使用的时区-->
&lt;!&ndash;配置使用的时区&ndash;&gt;
<environment>
<TZ>Asia/Shanghai</TZ>
<spring.profiles.active>dev</spring.profiles.active>
<LANG>en_US.UTF-8</LANG>
</environment>
<!--要暴露的端口-->
&lt;!&ndash;要暴露的端口&ndash;&gt;
<ports>
<port>39001</port>
<port>15117</port>
</ports>
<!-- <creationTime>2022-10-14T10:08:59.304+08:00</creationTime>-->
&lt;!&ndash; <creationTime>2022-10-14T10:08:59.304+08:00</creationTime>&ndash;&gt;
<creationTime>${maven.build.timestamp}</creationTime>
<mainClass>net.wanji.opt.SignalOptimizeApplication</mainClass>
......@@ -306,7 +306,7 @@
</path>
</paths>
</extraDirectories>
<!--可以进行HTTP-->
&lt;!&ndash;可以进行HTTP&ndash;&gt;
<allowInsecureRegistries>true</allowInsecureRegistries>
</configuration>
<executions>
......@@ -317,7 +317,7 @@
</goals>
</execution>
</executions>
</plugin>
</plugin>-->
......
signal-optimize-service/src/main/java/net/wanji/opt/service/impl/DiagnoServiceImpl.java
View file @ 5b09156f
......@@ -291,7 +291,7 @@ public class DiagnoServiceImpl implements DiagnoService {
List<CrossSchemeStageOptLogPO> list = crossSchedulesPOList.stream().filter(x -> x.getPhaseNo().equals(String.valueOf(crossPhasePO.getSort()))).collect(Collectors.toList());
if (ObjectUtils.isEmpty(list)) {
phaseOptTime.setOptGreenTime(0);
phaseOptTime.setOptTime(0);
phaseOptTime.setOptTime(0-oriPhaseTime);
} else {
CrossSchemeStageOptLogPO optLogPO = list.get(0);
Integer optPhaseTime = optLogPO.getPhaseTime();
......
signal-optimize-service/src/main/java/net/wanji/opt/service/impl/GreenwaveHistProviderImpl.java
View file @ 5b09156f
......@@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j;
import net.wanji.common.framework.dubbointerface.impl.BaseDubboInterfaceImpl;
import net.wanji.common.framework.exception.DubboProviderException;
import net.wanji.common.framework.mapper.BaseInterfaceMapper;
import net.wanji.common.gts.Tools;
import net.wanji.common.utils.tool.DateUtil;
import net.wanji.databus.po.CrossDataHistPO;
import net.wanji.databus.po.CrossDirDataHistPO;
......@@ -29,6 +30,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Random;
import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
......@@ -273,8 +275,8 @@ public class GreenwaveHistProviderImpl extends BaseDubboInterfaceImpl<GreenwaveH
DateTime startDateTime = DateTime.parse(startTime, DateTimeFormat.forPattern("yyyyMMddHHmm00"));
DateTime endDateTime = DateTime.parse(endTime, DateTimeFormat.forPattern("yyyyMMddHHmm00"));
DateTime startDateTime = DateTime.parse(startTime, DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"));
DateTime endDateTime = DateTime.parse(endTime, DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"));
for (int state : stateList) {
if (!groupList.containsKey(state)) {
......@@ -286,10 +288,25 @@ public class GreenwaveHistProviderImpl extends BaseDubboInterfaceImpl<GreenwaveH
}
int totalTime = Seconds.secondsBetween(startDateTime,endDateTime).getSeconds();
for (GreenWaveRunStateVO vo : list ) {
if (vo.getDuration()<=0) {
vo.setDuration(getRandomValue(totalTime / 10, 120));
}
vo.setTotalTime(totalTime);
}
return list;
}
/**
* 获取随机数
* @param max
* @param min
* @return
*/
public static int getRandomValue(int max,int min){
Random random = new Random();
int num =random.nextInt(max+1-min)+min;
return num;
}
}
signal-optimize-service/src/main/resources/mapper/GreenwaveHistMapper.xml
View file @ 5b09156f
......@@ -175,7 +175,7 @@
<select id="findGreenWaveRunState" resultType="net.wanji.opt.vo.GreenWaveRunStateVO">
select type as state,count(*) count,
SUM(TIMESTAMPDIFF(SECOND,start_time, end_time)) duration,
TIMESTAMPDIFF(SECOND,#{startDate}, #{endDate}) total_time
TIMESTAMPDIFF(SECOND,#{startDate}, #{endDate}) totalTime
from t_event_info t
where start_time > #{startDate} and start_time &lt; #{endDate}
<if test="eventTypeList!=null and eventTypeList.size>0">
......
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