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
22315b3b
Commit
22315b3b
authored
Feb 06, 2023
by
hanbing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
态势监测,返回当前时间相位列表
parent
d897966e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
42 additions
and
0 deletions
+42
-0
PlanSendController.java
...ain/java/net/wanji/web/controller/PlanSendController.java
+16
-0
CrossDirInfoMapper.java
.../java/net/wanji/web/mapper/scheme/CrossDirInfoMapper.java
+1
-0
PlanSendService.java
.../src/main/java/net/wanji/web/service/PlanSendService.java
+5
-0
PlanSendServiceImpl.java
.../java/net/wanji/web/service/impl/PlanSendServiceImpl.java
+20
-0
No files found.
signal-control-service/src/main/java/net/wanji/web/controller/PlanSendController.java
View file @
22315b3b
...
...
@@ -8,6 +8,7 @@ import net.wanji.feign.pojo.result.JsonViewObject;
import
net.wanji.web.dto.CrossIdAndPhaseIdsDTO
;
import
net.wanji.web.dto.CrossIdAndTimeDTO
;
import
net.wanji.web.dto.CrossIdDTO
;
import
net.wanji.web.dto.SaveSchemeConfigDTO
;
import
net.wanji.web.dto.ScheduleIdDTO
;
import
net.wanji.web.dto.SchemeIdDTO
;
import
net.wanji.web.service.impl.PlanSendServiceImpl
;
...
...
@@ -17,6 +18,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.List
;
/**
* @author hanbing
* @date 2023/01/04 16:10
...
...
@@ -99,4 +102,17 @@ public class PlanSendController {
return
jsonViewObject
.
success
(
phaseListByTimeVO
);
}
@ApiOperation
(
value
=
"根据当前时间返回相位列表(单环)"
,
notes
=
"根据当前时间返回相位列表(单环)"
)
@PostMapping
(
"/phaseListByTimeSingleRing"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
SaveSchemeConfigDTO
.
PhaseListElement
.
class
),
})
public
JsonViewObject
phaseListByTimeSingleRing
(
@RequestBody
CrossIdAndTimeDTO
crossIdAndTimeDTO
)
{
List
<
SaveSchemeConfigDTO
.
PhaseListElement
>
phaseListByTime
=
planSendService
.
phaseListByTimeSingleRing
(
crossIdAndTimeDTO
);
JsonViewObject
jsonViewObject
=
JsonViewObject
.
newInstance
();
return
jsonViewObject
.
success
(
phaseListByTime
);
}
}
signal-control-service/src/main/java/net/wanji/web/mapper/scheme/CrossDirInfoMapper.java
View file @
22315b3b
...
...
@@ -18,6 +18,7 @@ public interface CrossDirInfoMapper {
void
updateIsPedestrian
(
@Param
(
"isPersonCross"
)
Integer
isPersonCross
,
@Param
(
"id"
)
String
id
);
// todo 只返回进口
CrossDirInfoPO
selectByCrossIdAndDirType
(
@Param
(
"crossId"
)
String
crossId
,
@Param
(
"dirType"
)
Integer
dirType
);
List
<
CrossDirInfoPO
>
selectByCrossId
(
String
crossId
);
...
...
signal-control-service/src/main/java/net/wanji/web/service/PlanSendService.java
View file @
22315b3b
...
...
@@ -4,10 +4,13 @@ import net.wanji.feign.pojo.result.JsonViewObject;
import
net.wanji.web.dto.CrossIdAndTimeDTO
;
import
net.wanji.web.dto.CrossIdDTO
;
import
net.wanji.web.dto.CrossIdAndPhaseIdsDTO
;
import
net.wanji.web.dto.SaveSchemeConfigDTO
;
import
net.wanji.web.dto.ScheduleIdDTO
;
import
net.wanji.web.dto.SchemeIdDTO
;
import
net.wanji.web.vo.PhaseListByTimeVO
;
import
java.util.List
;
/**
* @author Kent HAN
* @date 2022/11/3 16:14
...
...
@@ -30,4 +33,6 @@ public interface PlanSendService {
JsonViewObject
syncScheme
(
CrossIdDTO
crossIdDTO
);
PhaseListByTimeVO
phaseListByTime
(
CrossIdAndTimeDTO
crossIdAndTimeDTO
);
List
<
SaveSchemeConfigDTO
.
PhaseListElement
>
phaseListByTimeSingleRing
(
CrossIdAndTimeDTO
crossIdAndTimeDTO
);
}
signal-control-service/src/main/java/net/wanji/web/service/impl/PlanSendServiceImpl.java
View file @
22315b3b
...
...
@@ -333,6 +333,26 @@ public class PlanSendServiceImpl implements PlanSendService {
return
phaseListByTimeVO
;
}
@Override
public
List
<
SaveSchemeConfigDTO
.
PhaseListElement
>
phaseListByTimeSingleRing
(
CrossIdAndTimeDTO
crossIdAndTimeDTO
)
{
List
<
SaveSchemeConfigDTO
.
PhaseListElement
>
phaseListByTime
=
new
ArrayList
<>();
PhaseListByTimeVO
phaseListByTimeVO
=
phaseListByTime
(
crossIdAndTimeDTO
);
SaveSchemeConfigDTO
.
PhaseScheme
phaseScheme
=
phaseListByTimeVO
.
getPhaseScheme
();
if
(
phaseScheme
!=
null
)
{
List
<
SaveSchemeConfigDTO
.
RingListElement
>
ringList
=
phaseScheme
.
getRingList
();
SaveSchemeConfigDTO
.
RingListElement
ringListElement
=
ringList
.
get
(
0
);
List
<
SaveSchemeConfigDTO
.
GroupListElement
>
groupList
=
ringListElement
.
getGroupList
();
for
(
SaveSchemeConfigDTO
.
GroupListElement
groupListElement
:
groupList
)
{
List
<
SaveSchemeConfigDTO
.
PhaseListElement
>
phaseList
=
groupListElement
.
getPhaseList
();
phaseListByTime
.
addAll
(
phaseList
);
}
}
return
phaseListByTime
;
}
private
PhaseListByTimeVO
getPhaseListByTimeVO
(
String
planName
,
Date
datetime
,
RunningPlanDTO
runningPlanDTO
,
CrossIdDTO
crossIdDTO
)
{
PhaseListByTimeVO
phaseListByTimeVO
=
new
PhaseListByTimeVO
();
...
...
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