Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sungrowpowernew
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
gavelinfo
sungrowpowernew
Commits
2cd389fd
Commit
2cd389fd
authored
Nov 04, 2022
by
zhoumaotao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码调整3
parent
1850b35f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
4 deletions
+1
-4
McsRestServiceImpl.java
...n/java/com/gavel/mcs/service/impl/McsRestServiceImpl.java
+1
-4
No files found.
gavel/src/main/java/com/gavel/mcs/service/impl/McsRestServiceImpl.java
View file @
2cd389fd
...
@@ -182,9 +182,6 @@ public class McsRestServiceImpl extends BaseEditServiceImpl implements McsRestSe
...
@@ -182,9 +182,6 @@ public class McsRestServiceImpl extends BaseEditServiceImpl implements McsRestSe
private
boolean
allowedMap
(
Gw
gw
)
{
private
boolean
allowedMap
(
Gw
gw
)
{
String
mapcode
=
commonService
.
getStringOptionValue
(
JcsjParamEnum
.
AllowVoiceMap
.
id
());
String
mapcode
=
commonService
.
getStringOptionValue
(
JcsjParamEnum
.
AllowVoiceMap
.
id
());
if
(
StringUtils
.
isEmpty
(
mapcode
)){
return
true
;
//如果未设置默认全部
}
if
(
StringUtils
.
equals
(
gw
.
getMapcode
(),
mapcode
)){
if
(
StringUtils
.
equals
(
gw
.
getMapcode
(),
mapcode
)){
return
true
;
return
true
;
}
}
...
@@ -647,6 +644,6 @@ public class McsRestServiceImpl extends BaseEditServiceImpl implements McsRestSe
...
@@ -647,6 +644,6 @@ public class McsRestServiceImpl extends BaseEditServiceImpl implements McsRestSe
task
.
setTaskStatus
(
"5"
);
//取消完成
task
.
setTaskStatus
(
"5"
);
//取消完成
task
.
setCancelDate
(
Calendar
.
getInstance
().
getTime
());
task
.
setCancelDate
(
Calendar
.
getInstance
().
getTime
());
agvtaskService
.
update
(
task
);
agvtaskService
.
update
(
task
);
messageService
.
msgPush
(
"SUPERUSER"
,
"task"
,
"取消任务"
);
//
messageService.msgPush("SUPERUSER", "task", "取消任务");
}
}
}
}
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