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
46665809
Commit
46665809
authored
Sep 19, 2023
by
duanruiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[update] 优化调度特殊日期,普通星期执行逻辑
parent
46d5995b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
PlanSendServiceImpl.java
.../java/net/wanji/web/service/impl/PlanSendServiceImpl.java
+2
-1
DataBrainLampStatusEnum.java
...nji/utc/hisense/common/enums/DataBrainLampStatusEnum.java
+2
-1
No files found.
signal-control-service/src/main/java/net/wanji/web/service/impl/PlanSendServiceImpl.java
View file @
46665809
...
...
@@ -598,7 +598,8 @@ public class PlanSendServiceImpl implements PlanSendService {
phaseListByTimeVO
=
getPhaseListByTimeVO
(
planName
,
datetime
,
runningPlanDTO
,
crossIdBO
);
}
}
}
else
if
(
CollectionUtil
.
isNotEmpty
(
week
))
{
}
if
(
CollectionUtil
.
isNotEmpty
(
week
)
&&
Objects
.
isNull
(
phaseListByTimeVO
.
getPhaseScheme
()))
{
for
(
Integer
day
:
week
)
{
// 1表示周日,2表示周一
int
today
=
DateUtil
.
dayOfWeek
(
datetime
);
...
...
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/common/enums/DataBrainLampStatusEnum.java
View file @
46665809
...
...
@@ -15,7 +15,8 @@ import org.apache.commons.lang3.StringUtils;
public
enum
DataBrainLampStatusEnum
{
RED
(
"red"
,
"21"
),
YELLOW
(
"yellow"
,
"22"
),
GREEN
(
"green"
,
"23"
);
GREEN
(
"green"
,
"23"
),
CLOSE
(
"off"
,
"11"
);
private
String
wjLampStatus
;
private
String
hisenseLamStatus
;
...
...
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