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
e578e6cd
Commit
e578e6cd
authored
Mar 09, 2023
by
hanbing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[update] 诊断优化,异常处理
parent
660d4cfc
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
2 deletions
+10
-2
DiagnoController.java
.../main/java/net/wanji/opt/controller/DiagnoController.java
+2
-1
DiagnoServiceImpl.java
...in/java/net/wanji/opt/service/impl/DiagnoServiceImpl.java
+4
-0
CrossIdDTO.java
wj-common/src/main/java/net/wanji/common/dto/CrossIdDTO.java
+4
-1
No files found.
signal-optimize-service/src/main/java/net/wanji/opt/controller/DiagnoController.java
View file @
e578e6cd
...
@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestBody;
...
@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
javax.validation.Valid
;
import
javax.ws.rs.core.MediaType
;
import
javax.ws.rs.core.MediaType
;
import
java.util.List
;
import
java.util.List
;
...
@@ -70,7 +71,7 @@ public class DiagnoController {
...
@@ -70,7 +71,7 @@ public class DiagnoController {
@ApiResponses
({
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
SchemeOptVO
.
class
),
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
SchemeOptVO
.
class
),
})
})
public
JsonViewObject
querySchemeOpt
(
@RequestBody
CrossIdDTO
crossIdDTO
)
{
public
JsonViewObject
querySchemeOpt
(
@RequestBody
@Valid
CrossIdDTO
crossIdDTO
)
{
SchemeOptVO
schemeOptVO
=
diagnoService
.
querySchemeOpt
(
crossIdDTO
);
SchemeOptVO
schemeOptVO
=
diagnoService
.
querySchemeOpt
(
crossIdDTO
);
return
JsonViewObject
.
newInstance
().
success
(
schemeOptVO
);
return
JsonViewObject
.
newInstance
().
success
(
schemeOptVO
);
}
}
...
...
signal-optimize-service/src/main/java/net/wanji/opt/service/impl/DiagnoServiceImpl.java
View file @
e578e6cd
package
net
.
wanji
.
opt
.
service
.
impl
;
package
net
.
wanji
.
opt
.
service
.
impl
;
import
cn.hutool.core.collection.CollectionUtil
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
com.github.pagehelper.PageInfo
;
import
com.github.pagehelper.PageInfo
;
...
@@ -161,6 +162,9 @@ public class DiagnoServiceImpl implements DiagnoService {
...
@@ -161,6 +162,9 @@ public class DiagnoServiceImpl implements DiagnoService {
schemeOptVO
.
setCrossId
(
crossId
);
schemeOptVO
.
setCrossId
(
crossId
);
// 选择数据批次时间最大的记录
// 选择数据批次时间最大的记录
List
<
CrossSchemeOptLogPO
>
maxList
=
crossSchemeOptLogMapper
.
selectMaxByCrossId
(
crossId
);
List
<
CrossSchemeOptLogPO
>
maxList
=
crossSchemeOptLogMapper
.
selectMaxByCrossId
(
crossId
);
if
(
CollectionUtil
.
isEmpty
(
maxList
))
{
throw
new
RuntimeException
(
"没有该路口优化日志数据"
);
}
// 根据相位去重
// 根据相位去重
TreeSet
<
CrossSchemeOptLogPO
>
collect
=
maxList
.
stream
()
TreeSet
<
CrossSchemeOptLogPO
>
collect
=
maxList
.
stream
()
.
collect
(
Collectors
.
toCollection
(
.
collect
(
Collectors
.
toCollection
(
...
...
wj-common/src/main/java/net/wanji/common/dto/CrossIdDTO.java
View file @
e578e6cd
...
@@ -3,6 +3,8 @@ package net.wanji.common.dto;
...
@@ -3,6 +3,8 @@ package net.wanji.common.dto;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
javax.validation.constraints.NotNull
;
/**
/**
* 方案管理-路口配置-获取路口方向列表输入参数
* 方案管理-路口配置-获取路口方向列表输入参数
*
*
...
@@ -11,6 +13,7 @@ import lombok.Data;
...
@@ -11,6 +13,7 @@ import lombok.Data;
*/
*/
@Data
@Data
public
class
CrossIdDTO
{
public
class
CrossIdDTO
{
@ApiModelProperty
(
value
=
"路口ID,如:c7e7b1f352dd4acab4a60088eb391cca"
,
required
=
true
)
@ApiModelProperty
(
value
=
"路口ID"
,
required
=
true
)
@NotNull
(
message
=
"路口ID不可为空"
)
private
String
crossId
;
private
String
crossId
;
}
}
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