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
644f8018
Commit
644f8018
authored
Jan 31, 2023
by
hanbing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
方案管理-方案配置,根据灯组查询车道返回车道对象全部字段
parent
3306671d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
16 deletions
+29
-16
LaneInfoPO.java
...ice/src/main/java/net/wanji/web/po/scheme/LaneInfoPO.java
+16
-13
SchemeConfigServiceImpl.java
...anji/web/service/scheme/impl/SchemeConfigServiceImpl.java
+8
-1
LaneIdsVO.java
...vice/src/main/java/net/wanji/web/vo/scheme/LaneIdsVO.java
+5
-2
No files found.
signal-control-service/src/main/java/net/wanji/web/po/scheme/LaneInfoPO.java
View file @
644f8018
package
net
.
wanji
.
web
.
po
.
scheme
;
package
net
.
wanji
.
web
.
po
.
scheme
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -10,68 +11,70 @@ import java.util.Date;
...
@@ -10,68 +11,70 @@ import java.util.Date;
* @date 2022/12/28 17:45
* @date 2022/12/28 17:45
*/
*/
@Data
@Data
@ApiModel
(
value
=
"LaneInfoPO"
,
description
=
"车道对象"
)
public
class
LaneInfoPO
{
public
class
LaneInfoPO
{
/**
/**
* 车道ID(路口ID_方向_序号)
* 车道ID(路口ID_方向_序号)
*/
*/
@ApiModelProperty
(
nam
e
=
"车道ID(路口ID_方向_序号)"
,
notes
=
""
)
@ApiModelProperty
(
valu
e
=
"车道ID(路口ID_方向_序号)"
,
notes
=
""
)
private
String
id
;
private
String
id
;
/**
/**
* 车道代码
* 车道代码
*/
*/
@ApiModelProperty
(
nam
e
=
"车道代码"
,
notes
=
""
)
@ApiModelProperty
(
valu
e
=
"车道代码"
,
notes
=
""
)
private
String
code
;
private
String
code
;
/**
/**
* 车道序号;从左车道开始编号11、12、13...
* 车道序号;从左车道开始编号11、12、13...
*/
*/
@ApiModelProperty
(
nam
e
=
"车道序号"
,
notes
=
"从左车道开始编号11、12、13..."
)
@ApiModelProperty
(
valu
e
=
"车道序号"
,
notes
=
"从左车道开始编号11、12、13..."
)
private
Integer
sort
;
private
Integer
sort
;
/** 车道类型:1路段车道;2进口车道;3出口车道;4左转弯待转区;6直行待行区 */
/** 车道类型:1路段车道;2进口车道;3出口车道;4左转弯待转区;6直行待行区 */
@ApiModelProperty
(
nam
e
=
"车道类型:1路段车道;2进口车道;3出口车道;4左转弯待转区;6直行待行区"
,
notes
=
""
)
@ApiModelProperty
(
valu
e
=
"车道类型:1路段车道;2进口车道;3出口车道;4左转弯待转区;6直行待行区"
,
notes
=
""
)
private
Integer
type
=
2
;
// todo 信控只用到进口车道
private
Integer
type
=
2
;
// todo 信控只用到进口车道
/**
/**
* 车道方向:1北;2东北;3东;4东南;5南;6西南;7西;8西北
* 车道方向:1北;2东北;3东;4东南;5南;6西南;7西;8西北
*/
*/
@ApiModelProperty
(
nam
e
=
"车道方向:1北;2东北;3东;4东南;5南;6西南;7西;8西北"
,
notes
=
""
)
@ApiModelProperty
(
valu
e
=
"车道方向:1北;2东北;3东;4东南;5南;6西南;7西;8西北"
,
notes
=
""
)
private
Integer
dir
;
private
Integer
dir
;
/**
/**
* 车道转向:0未知;1左转;2直行;3右转;4掉头;5直左;6直右;7左直右;8左右;9左转掉头;10直行掉头;11右转掉头;12左直掉头;13直右掉头;14左直右掉头;15左右掉头
* 车道转向:0未知;1左转;2直行;3右转;4掉头;5直左;6直右;7左直右;8左右;9左转掉头;10直行掉头;11右转掉头;12左直掉头;13直右掉头;14左直右掉头;15左右掉头
*/
*/
@ApiModelProperty
(
name
=
"车道转向:0未知;1左转;2直行;3右转;4掉头;5直左;6直右;7左直右;8左右;9左转掉头;10直行掉头;11右转掉头;12左直掉头;13直右掉头;14左直右掉头;15左右掉头"
,
notes
=
""
)
@ApiModelProperty
(
value
=
"车道转向:0未知;1:直行2:左转,3:右转,4:掉头,5:左直,6:右直,7:左转掉头,8:左直掉头, 9:左直右, 10:左右转"
,
notes
=
""
)
// 后端数据库对应关系:0未知;1左转;2直行;3右转;4掉头;5直左;6直右;7左直右;8左右;9左转掉头;10直行掉头;11右转掉头;12左直掉头;13直右掉头;14左直右掉头;15左右掉头
private
Integer
turn
;
private
Integer
turn
;
/**
/**
* 车道类别:1机动车;2非机动车;3公交专用;4可变;5潮汐
* 车道类别:1机动车;2非机动车;3公交专用;4可变;5潮汐
*/
*/
@ApiModelProperty
(
nam
e
=
"车道类别:1机动车;2非机动车;3公交专用;4可变;5潮汐"
,
notes
=
""
)
@ApiModelProperty
(
valu
e
=
"车道类别:1机动车;2非机动车;3公交专用;4可变;5潮汐"
,
notes
=
""
)
private
Integer
category
;
private
Integer
category
;
/**
/**
* 路口ID
* 路口ID
*/
*/
@ApiModelProperty
(
nam
e
=
"路口ID"
,
notes
=
""
)
@ApiModelProperty
(
valu
e
=
"路口ID"
,
notes
=
""
)
private
String
crossId
;
private
String
crossId
;
/**
/**
* 路段编号
* 路段编号
*/
*/
@ApiModelProperty
(
nam
e
=
"路段编号"
,
notes
=
""
)
@ApiModelProperty
(
valu
e
=
"路段编号"
,
notes
=
""
)
private
String
rid
=
""
;
private
String
rid
=
""
;
/**
/**
* 车道长度
* 车道长度
*/
*/
@ApiModelProperty
(
nam
e
=
"车道长度"
,
notes
=
""
)
@ApiModelProperty
(
valu
e
=
"车道长度"
,
notes
=
""
)
private
Double
length
=
0.0
;
private
Double
length
=
0.0
;
/**
/**
* 车道宽度
* 车道宽度
*/
*/
@ApiModelProperty
(
nam
e
=
"车道宽度"
,
notes
=
""
)
@ApiModelProperty
(
valu
e
=
"车道宽度"
,
notes
=
""
)
private
Double
width
=
0.0
;
private
Double
width
=
0.0
;
/**
/**
* 创建时间
* 创建时间
*/
*/
@ApiModelProperty
(
nam
e
=
"创建时间"
,
notes
=
""
)
@ApiModelProperty
(
valu
e
=
"创建时间"
,
notes
=
""
)
private
Date
gmtCreate
;
private
Date
gmtCreate
;
/**
/**
* 修改时间
* 修改时间
*/
*/
@ApiModelProperty
(
nam
e
=
"修改时间"
,
notes
=
""
)
@ApiModelProperty
(
valu
e
=
"修改时间"
,
notes
=
""
)
private
Date
gmtModified
;
private
Date
gmtModified
;
}
}
\ No newline at end of file
signal-control-service/src/main/java/net/wanji/web/service/scheme/impl/SchemeConfigServiceImpl.java
View file @
644f8018
package
net
.
wanji
.
web
.
service
.
scheme
.
impl
;
package
net
.
wanji
.
web
.
service
.
scheme
.
impl
;
import
net.wanji.web.common.constant.ControlModeConst
;
import
net.wanji.web.common.constant.ControlModeConst
;
import
net.wanji.web.common.enums.CrossTurnEnum
;
import
net.wanji.web.common.exception.PhaseNoNotUniqueException
;
import
net.wanji.web.common.exception.PhaseNoNotUniqueException
;
import
net.wanji.web.dto.CrossIdDTO
;
import
net.wanji.web.dto.CrossIdDTO
;
import
net.wanji.web.dto.LaneIdDTO
;
import
net.wanji.web.dto.LaneIdDTO
;
...
@@ -76,7 +77,13 @@ public class SchemeConfigServiceImpl implements SchemeConfigService {
...
@@ -76,7 +77,13 @@ public class SchemeConfigServiceImpl implements SchemeConfigService {
List
<
String
>
laneIds
=
crossLaneLightsPOList
.
stream
()
List
<
String
>
laneIds
=
crossLaneLightsPOList
.
stream
()
.
map
(
CrossLaneLightsPO:
:
getLaneId
)
.
map
(
CrossLaneLightsPO:
:
getLaneId
)
.
collect
(
Collectors
.
toList
());
.
collect
(
Collectors
.
toList
());
laneIdsVO
.
setLaneIds
(
laneIds
);
List
<
LaneInfoPO
>
laneInfoPOList
=
laneInfoMapper
.
selectByLaneIds
(
laneIds
);
for
(
LaneInfoPO
laneInfoPO
:
laneInfoPOList
)
{
Integer
backEndTurn
=
laneInfoPO
.
getTurn
();
Integer
frontEndTurn
=
CrossTurnEnum
.
getFrontByBack
(
backEndTurn
);
laneInfoPO
.
setTurn
(
frontEndTurn
);
}
laneIdsVO
.
setLanes
(
laneInfoPOList
);
return
laneIdsVO
;
return
laneIdsVO
;
}
}
...
...
signal-control-service/src/main/java/net/wanji/web/vo/scheme/LaneIdsVO.java
View file @
644f8018
package
net
.
wanji
.
web
.
vo
.
scheme
;
package
net
.
wanji
.
web
.
vo
.
scheme
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
net.wanji.web.po.scheme.LaneInfoPO
;
import
java.util.List
;
import
java.util.List
;
...
@@ -10,9 +12,10 @@ import java.util.List;
...
@@ -10,9 +12,10 @@ import java.util.List;
* @date 2023/1/9 8:56
* @date 2023/1/9 8:56
*/
*/
@Data
@Data
@ApiModel
(
value
=
"LaneIdsVO"
,
description
=
"根据灯组查询车道信息返回值"
)
public
class
LaneIdsVO
{
public
class
LaneIdsVO
{
@ApiModelProperty
(
value
=
"路口ID"
,
required
=
true
)
@ApiModelProperty
(
value
=
"路口ID"
,
required
=
true
)
private
String
crossId
;
private
String
crossId
;
@ApiModelProperty
(
value
=
"车道
ID
列表"
,
required
=
true
)
@ApiModelProperty
(
value
=
"车道列表"
,
required
=
true
)
private
List
<
String
>
laneId
s
;
private
List
<
LaneInfoPO
>
lane
s
;
}
}
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