Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
traffic-signal-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
signal
traffic-signal-platform
Commits
afb55782
Commit
afb55782
authored
Jun 16, 2023
by
hanbing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[update] 路口车道信息没有实时数据时返回空
parent
dce4153b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
31 deletions
+5
-31
pom.xml
pom.xml
+0
-23
DiagnoServiceImpl.java
...in/java/net/wanji/opt/service/impl/DiagnoServiceImpl.java
+5
-8
No files found.
pom.xml
View file @
afb55782
...
@@ -106,29 +106,6 @@
...
@@ -106,29 +106,6 @@
<version>
${mybatis-plus-version}
</version>
<version>
${mybatis-plus-version}
</version>
</dependency>
</dependency>
<!-- MP相关 end -->
<!-- MP相关 end -->
<!-- <dependency>-->
<!-- <groupId>com.alibaba.cloud</groupId>-->
<!-- <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
<!-- <version>2021.0.1.0</version>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>com.alibaba.nacos</groupId>-->
<!-- <artifactId>nacos-client</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<!-- <!–nacos客户端依赖–>-->
<!-- <dependency>-->
<!-- <groupId>com.xkcoding.nacos</groupId>-->
<!-- <artifactId>nacos-client</artifactId>-->
<!-- <version>1.1.4</version>-->
<!-- </dependency>-->
<!-- <!–spring boot 集成 nacos 配置中心–>-->
<!-- <dependency>-->
<!-- <groupId>com.alibaba.boot</groupId>-->
<!-- <artifactId>nacos-config-spring-boot-starter</artifactId>-->
<!-- <version>0.2.1</version>-->
<!-- </dependency>-->
<dependency>
<dependency>
<groupId>
org.hibernate
</groupId>
<groupId>
org.hibernate
</groupId>
<artifactId>
hibernate-validator
</artifactId>
<artifactId>
hibernate-validator
</artifactId>
...
...
signal-optimize-service/src/main/java/net/wanji/opt/service/impl/DiagnoServiceImpl.java
View file @
afb55782
...
@@ -467,8 +467,6 @@ public class DiagnoServiceImpl implements DiagnoService {
...
@@ -467,8 +467,6 @@ public class DiagnoServiceImpl implements DiagnoService {
}
}
ledConfigList
.
add
(
ledConfigListElement
);
ledConfigList
.
add
(
ledConfigListElement
);
}
}
// 根据灯组序号排序
// ledConfigList.sort(Comparator.comparing(LedConfigListElement::getOrder));
Collections
.
sort
(
ledConfigList
,
Comparator
.
comparingInt
(
led
->
Integer
.
valueOf
(
led
.
getCode
())));
Collections
.
sort
(
ledConfigList
,
Comparator
.
comparingInt
(
led
->
Integer
.
valueOf
(
led
.
getCode
())));
}
}
...
@@ -490,13 +488,12 @@ public class DiagnoServiceImpl implements DiagnoService {
...
@@ -490,13 +488,12 @@ public class DiagnoServiceImpl implements DiagnoService {
// 查询拥堵状态、排队长度和指数
// 查询拥堵状态、排队长度和指数
CrossDirDataRealtimePO
crossDirDataRealtimePO
=
CrossDirDataRealtimePO
crossDirDataRealtimePO
=
crossDirDataRealtimeMapper
.
selectByCrossIdAndDirType
(
crossId
,
key
);
crossDirDataRealtimeMapper
.
selectByCrossIdAndDirType
(
crossId
,
key
);
if
(
crossDirDataRealtimePO
==
null
)
{
if
(
crossDirDataRealtimePO
!=
null
)
{
throw
new
RuntimeException
(
"没有该路口方向实时数据"
);
dirListElement
.
setStatus
(
crossDirDataRealtimePO
.
getStatus
());
dirListElement
.
setTraffic_index
(
crossDirDataRealtimePO
.
getTrafficIndex
());
dirListElement
.
setLength
(
crossDirDataRealtimePO
.
getLength
());
dirListElement
.
setDuration
(
crossDirDataRealtimePO
.
getDuration
());
}
}
dirListElement
.
setStatus
(
crossDirDataRealtimePO
.
getStatus
());
dirListElement
.
setTraffic_index
(
crossDirDataRealtimePO
.
getTrafficIndex
());
dirListElement
.
setLength
(
crossDirDataRealtimePO
.
getLength
());
dirListElement
.
setDuration
(
crossDirDataRealtimePO
.
getDuration
());
// 获取是否有行人道
// 获取是否有行人道
BaseCrossDirInfoPO
baseCrossDirInfoPO
=
baseCrossDirInfoMapper
.
selectByCrossIdAndDirType
(
crossId
,
key
);
BaseCrossDirInfoPO
baseCrossDirInfoPO
=
baseCrossDirInfoMapper
.
selectByCrossIdAndDirType
(
crossId
,
key
);
Integer
isPedestrian
=
baseCrossDirInfoPO
.
getIsPedestrian
();
Integer
isPedestrian
=
baseCrossDirInfoPO
.
getIsPedestrian
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment