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
66d3aac8
Commit
66d3aac8
authored
May 22, 2023
by
hanbing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[update] 快速特勤,修改分组入参改为特勤ID
parent
1e6b905b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
11 deletions
+5
-11
SpecialServiceServiceImpl.java
...net/wanji/web/service/impl/SpecialServiceServiceImpl.java
+3
-9
GroupListVO.java
...ain/java/net/wanji/web/vo/specialService/GroupListVO.java
+2
-2
No files found.
signal-control-service/src/main/java/net/wanji/web/service/impl/SpecialServiceServiceImpl.java
View file @
66d3aac8
...
...
@@ -656,8 +656,7 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
Integer
specialServiceId
=
specialServiceIdBO
.
getId
();
SpecialServicePO
specialServicePO
=
specialServiceMapper
.
selectById
(
specialServiceId
);
String
specialServiceName
=
specialServicePO
.
getName
();
groupListVO
.
setSpecialServiceName
(
specialServiceName
);
groupListVO
.
setSpecialServiceId
(
specialServiceId
);
List
<
GroupListVO
.
GroupListElement
>
groupList
=
buildGroupList
(
specialServicePO
);
groupListVO
.
setGroupList
(
groupList
);
...
...
@@ -668,9 +667,7 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
@Override
@Transactional
public
void
updateGroup
(
GroupListVO
groupListVO
)
{
String
specialServiceName
=
groupListVO
.
getSpecialServiceName
();
SpecialServicePO
specialServicePO
=
specialServiceMapper
.
selectByName
(
specialServiceName
);
Integer
specialServiceId
=
specialServicePO
.
getId
();
Integer
specialServiceId
=
groupListVO
.
getSpecialServiceId
();
List
<
GroupListVO
.
GroupListElement
>
groupList
=
groupListVO
.
getGroupList
();
for
(
GroupListVO
.
GroupListElement
groupListElement
:
groupList
)
{
...
...
@@ -695,9 +692,7 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
@Override
public
void
autoUnlock
(
GroupListVO
groupListVO
)
{
String
specialServiceName
=
groupListVO
.
getSpecialServiceName
();
SpecialServicePO
specialServicePO
=
specialServiceMapper
.
selectByName
(
specialServiceName
);
Integer
specialServiceId
=
specialServicePO
.
getId
();
Integer
specialServiceId
=
groupListVO
.
getSpecialServiceId
();
List
<
GroupListVO
.
GroupListElement
>
groupList
=
groupListVO
.
getGroupList
();
for
(
GroupListVO
.
GroupListElement
groupListElement
:
groupList
)
{
...
...
@@ -716,7 +711,6 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
Integer
specialServiceId
=
specialServicePO
.
getId
();
List
<
SpecialServiceCrossPO
>
specialServiceCrossList
=
specialServiceCrossMapper
.
selectBySpecialServiceId
(
specialServiceId
);
int
crossNums
=
specialServiceCrossList
.
size
();
Map
<
String
,
List
<
SpecialServiceCrossPO
>>
map
=
specialServiceCrossList
.
stream
()
.
collect
(
Collectors
.
groupingBy
(
SpecialServiceCrossPO:
:
getGroupName
));
...
...
signal-control-service/src/main/java/net/wanji/web/vo/specialService/GroupListVO.java
View file @
66d3aac8
...
...
@@ -15,8 +15,8 @@ import java.util.List;
@Data
@ApiModel
(
value
=
"GroupListVO"
)
public
class
GroupListVO
{
@ApiModelProperty
(
value
=
"特勤
名称
"
,
notes
=
""
)
private
String
specialServiceName
;
@ApiModelProperty
(
value
=
"特勤
ID
"
,
notes
=
""
)
private
Integer
specialServiceId
;
private
List
<
GroupListElement
>
groupList
;
@NoArgsConstructor
...
...
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