Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 9639f664
authored
Oct 31, 2023
by
刘鑫
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop-16542' into 'develop'
容量初始化T+20 See merge request !357
2 parents
8f7ea441
6117633a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
project-order/src/main/java/com/dituhui/pea/order/scheduler/InitEngineerCapacityScheduler.java
project-order/src/main/resources/application.yaml
project-order/src/main/java/com/dituhui/pea/order/scheduler/InitEngineerCapacityScheduler.java
View file @
9639f66
...
@@ -149,6 +149,8 @@ public class InitEngineerCapacityScheduler {
...
@@ -149,6 +149,8 @@ public class InitEngineerCapacityScheduler {
lengthOfLeave
+=
DateTimeUtil
.
betweenTwoTime
(
leaveStartTime
,
sliceEndLocalTime
,
TimeUnit
.
MINUTES
);
lengthOfLeave
+=
DateTimeUtil
.
betweenTwoTime
(
leaveStartTime
,
sliceEndLocalTime
,
TimeUnit
.
MINUTES
);
}
else
if
(
leaveStartTime
.
isBefore
(
sliceStartLocalTime
)
&&
leaveEndTime
.
isAfter
(
sliceEndLocalTime
))
{
}
else
if
(
leaveStartTime
.
isBefore
(
sliceStartLocalTime
)
&&
leaveEndTime
.
isAfter
(
sliceEndLocalTime
))
{
lengthOfLeave
+=
DateTimeUtil
.
betweenTwoTime
(
sliceStartLocalTime
,
sliceEndLocalTime
,
TimeUnit
.
MINUTES
);
lengthOfLeave
+=
DateTimeUtil
.
betweenTwoTime
(
sliceStartLocalTime
,
sliceEndLocalTime
,
TimeUnit
.
MINUTES
);
}
else
if
(
leaveStartTime
.
isBefore
(
sliceStartLocalTime
)
&&
leaveEndTime
.
compareTo
(
sliceEndLocalTime
)
<=
0
)
{
lengthOfLeave
+=
DateTimeUtil
.
betweenTwoTime
(
sliceStartLocalTime
,
leaveEndTime
,
TimeUnit
.
MINUTES
);
}
}
}
}
// 剩余可约容量
// 剩余可约容量
...
...
project-order/src/main/resources/application.yaml
View file @
9639f66
...
@@ -74,21 +74,21 @@ scheduler:
...
@@ -74,21 +74,21 @@ scheduler:
init-engineer-capacity
:
init-engineer-capacity
:
# 每天22点1次
# 每天22点1次
cron-expr
:
0 0 22 * * ?
cron-expr
:
0 0 22 * * ?
day-offset-begin
:
0
day-offset-begin
:
1
day-offset-end
:
14
day-offset-end
:
20
rewrite-force
:
true
rewrite-force
:
true
calc-engineer-capacity
:
calc-engineer-capacity
:
# 8-20点,每30分钟1次
# 8-20点,每30分钟1次
cron-expr
:
0 */30 1-23 * * ?
cron-expr
:
0 */30 1-23 * * ?
day-offset-begin
:
0
day-offset-begin
:
0
day-offset-end
:
14
day-offset-end
:
20
calc-org-capacity
:
calc-org-capacity
:
# 8-20点,每小时1次
# 8-20点,每小时1次
cron-expr
:
0 0 1-23 * * ?
cron-expr
:
0 0 1-23 * * ?
day-offset-begin
:
0
day-offset-begin
:
0
day-offset-end
:
14
day-offset-end
:
20
logging
:
logging
:
level
:
level
:
root
:
info
root
:
info
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment