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
21707575
Commit
21707575
authored
Jul 25, 2023
by
duanruiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "[update] 相位倒计时"
This reverts commit
bd10cb7f
.
parent
bd10cb7f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
CrossConfigServiceImpl.java
...wanji/web/service/scheme/impl/CrossConfigServiceImpl.java
+6
-7
No files found.
signal-control-service/src/main/java/net/wanji/web/service/scheme/impl/CrossConfigServiceImpl.java
View file @
21707575
package
net
.
wanji
.
web
.
service
.
scheme
.
impl
;
import
cn.hutool.core.collection.CollectionUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
net.wanji.common.dto.CrossIdDTO
;
import
net.wanji.common.enums.LightsAddressEnum
;
import
net.wanji.databus.dao.mapper.BaseCrossLaneLightsMapper
;
import
net.wanji.databus.dao.mapper.BaseCrossLightsMapper
;
import
net.wanji.databus.dao.mapper.BaseCrossPhaseLightsMapper
;
import
net.wanji.databus.dao.mapper.LaneInfoMapper
;
import
net.wanji.databus.dao.mapper.*
;
import
net.wanji.databus.po.BaseCrossLightsPO
;
import
net.wanji.databus.po.CrossLaneLightsPO
;
import
net.wanji.databus.po.LaneInfoPO
;
import
net.wanji.web.common.enums.CrossLisghtsLaneDirEnum
;
import
net.wanji.web.common.exception.LightLaneConflictException
;
import
net.wanji.web.common.exception.RidInfoException
;
import
net.wanji.web.dto.DirListElement
;
import
net.wanji.web.dto.LaneListElement
;
import
net.wanji.web.dto.LedConfigListElement
;
...
...
@@ -460,9 +459,9 @@ public class CrossConfigServiceImpl implements CrossConfigService {
int
sort
=
Integer
.
parseInt
(
sortStr
);
// 上一个路口ID
String
preId
=
laneInfoMapper
.
selectPreId
(
crossId
,
dir
);
//
if (ObjectUtil.isEmpty(preId)) {
//
throw new RidInfoException("基础路网中无上一路口数据");
//
}
if
(
ObjectUtil
.
isEmpty
(
preId
))
{
throw
new
RidInfoException
(
"基础路网中无上一路口数据"
);
}
// 0 主路;900 进口道渠化序号。信控车道类型都是进口车道
laneInfoPO
.
setId
(
preId
+
crossId
+
0
+
900
+
sort
);
laneInfoPO
.
setCode
(
laneListElement
.
getName
());
...
...
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