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
d591be93
Commit
d591be93
authored
Jan 13, 2023
by
hanbing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
方案管理,类型返回环式
parent
97fb9c21
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
11 deletions
+6
-11
SchemeConfigServiceImpl.java
...anji/web/service/scheme/impl/SchemeConfigServiceImpl.java
+6
-11
No files found.
signal-control-service/src/main/java/net/wanji/web/service/scheme/impl/SchemeConfigServiceImpl.java
View file @
d591be93
...
@@ -111,12 +111,8 @@ public class SchemeConfigServiceImpl implements SchemeConfigService {
...
@@ -111,12 +111,8 @@ public class SchemeConfigServiceImpl implements SchemeConfigService {
List
<
SaveSchemeConfigDTO
.
PhaseScheme
>
phaseSchemeList
=
buildPhaseSchemeList
(
crossId
);
List
<
SaveSchemeConfigDTO
.
PhaseScheme
>
phaseSchemeList
=
buildPhaseSchemeList
(
crossId
);
saveSchemeConfigDTO
.
setPhaseSchemeList
(
phaseSchemeList
);
saveSchemeConfigDTO
.
setPhaseSchemeList
(
phaseSchemeList
);
// todo 暂时只有环式
saveSchemeConfigDTO
.
setTimeType
(
2
);
// // 定义环式还是阶段式
// if (saveSchemeConfigDTO.getTimeType() == null) {
// saveSchemeConfigDTO.setTimeType();
// }
return
saveSchemeConfigDTO
;
return
saveSchemeConfigDTO
;
}
}
...
@@ -290,13 +286,13 @@ public class SchemeConfigServiceImpl implements SchemeConfigService {
...
@@ -290,13 +286,13 @@ public class SchemeConfigServiceImpl implements SchemeConfigService {
phaseListElement
.
setRedTime
(
crossPhasePO
.
getRedTime
());
phaseListElement
.
setRedTime
(
crossPhasePO
.
getRedTime
());
// 特殊控制
// 特殊控制
Integer
controlMode
=
crossPhasePO
.
getControlMode
();
Integer
controlMode
=
crossPhasePO
.
getControlMode
();
if
(
controlMode
==
7
)
{
if
(
controlMode
==
ControlModeConst
.
YELLOW_FLASH
)
{
phaseListElement
.
setYellowFlash
(
1
);
phaseListElement
.
setYellowFlash
(
1
);
}
else
if
(
controlMode
==
4
)
{
}
else
if
(
controlMode
==
ControlModeConst
.
IS_RED
)
{
phaseListElement
.
setIsRed
(
1
);
phaseListElement
.
setIsRed
(
1
);
}
else
if
(
controlMode
==
2
)
{
}
else
if
(
controlMode
==
ControlModeConst
.
IS_GREEN
)
{
phaseListElement
.
setIsGreen
(
1
);
phaseListElement
.
setIsGreen
(
1
);
}
else
if
(
controlMode
==
6
)
{
}
else
if
(
controlMode
==
ControlModeConst
.
GREEN_FLASH
)
{
phaseListElement
.
setGreenFlash
(
1
);
phaseListElement
.
setGreenFlash
(
1
);
}
}
// 伴随相位的母相位列表
// 伴随相位的母相位列表
...
@@ -606,7 +602,6 @@ public class SchemeConfigServiceImpl implements SchemeConfigService {
...
@@ -606,7 +602,6 @@ public class SchemeConfigServiceImpl implements SchemeConfigService {
}
}
}
}
private
void
updateCrossPhaseLights
(
String
crossId
,
private
void
updateCrossPhaseLights
(
String
crossId
,
SaveSchemeConfigDTO
.
PhaseListElement
phase
,
SaveSchemeConfigDTO
.
PhaseListElement
phase
,
Integer
phaseId
)
{
Integer
phaseId
)
{
...
...
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