Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
HYH.APSJ
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
佟礼
HYH.APSJ
Commits
ba8c978a
Commit
ba8c978a
authored
Jan 08, 2026
by
Tong Li
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
设备维修
parent
9ed1158d
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
3 deletions
+13
-3
ScheduleOperationService.java
...a/com/aps/service/Algorithm/ScheduleOperationService.java
+3
-0
MachineSchedulerService.java
...in/java/com/aps/service/plan/MachineSchedulerService.java
+3
-1
PlanResultServiceTest.java
src/test/java/com/aps/demo/PlanResultServiceTest.java
+7
-2
No files found.
src/main/java/com/aps/service/Algorithm/ScheduleOperationService.java
View file @
ba8c978a
...
@@ -169,6 +169,8 @@ Integer newMachineId1=newMachineId.intValue();
...
@@ -169,6 +169,8 @@ Integer newMachineId1=newMachineId.intValue();
MachineSchedulerService
machineScheduler
=
new
MachineSchedulerService
(
MachineSchedulerService
machineScheduler
=
new
MachineSchedulerService
(
chromosome
.
getBaseTime
());
chromosome
.
getBaseTime
());
machineScheduler
.
ClearMachineCache
(
machineId
);
MachineTimeline
machineTimeline
=
machineScheduler
.
getOrCreateTimeline
(
machine
);
MachineTimeline
machineTimeline
=
machineScheduler
.
getOrCreateTimeline
(
machine
);
machine
.
setAvailability
(
machineTimeline
.
getSegments
());
machine
.
setAvailability
(
machineTimeline
.
getSegments
());
}
else
{
}
else
{
...
@@ -244,6 +246,7 @@ Integer newMachineId1=newMachineId.intValue();
...
@@ -244,6 +246,7 @@ Integer newMachineId1=newMachineId.intValue();
machine
.
getMaintenanceWindows
().
remove
(
index
.
getAsInt
());
machine
.
getMaintenanceWindows
().
remove
(
index
.
getAsInt
());
MachineSchedulerService
machineScheduler
=
new
MachineSchedulerService
(
MachineSchedulerService
machineScheduler
=
new
MachineSchedulerService
(
chromosome
.
getBaseTime
());
chromosome
.
getBaseTime
());
machineScheduler
.
ClearMachineCache
(
machineId
);
MachineTimeline
machineTimeline
=
machineScheduler
.
getOrCreateTimeline
(
machine
);
MachineTimeline
machineTimeline
=
machineScheduler
.
getOrCreateTimeline
(
machine
);
machine
.
setAvailability
(
machineTimeline
.
getSegments
());
machine
.
setAvailability
(
machineTimeline
.
getSegments
());
}
else
{
}
else
{
...
...
src/main/java/com/aps/service/plan/MachineSchedulerService.java
View file @
ba8c978a
...
@@ -32,7 +32,9 @@ public class MachineSchedulerService {
...
@@ -32,7 +32,9 @@ public class MachineSchedulerService {
this
.
holidays
=
holidays
!=
null
?
holidays
:
new
ArrayList
<>();
this
.
holidays
=
holidays
!=
null
?
holidays
:
new
ArrayList
<>();
this
.
currentTime
=
currentTime
;
this
.
currentTime
=
currentTime
;
}
}
public
void
ClearMachineCache
(
long
machineId
)
{
timelineCache
.
remove
(
machineId
);
}
public
MachineTimeline
getOrCreateTimeline
(
Machine
machine
)
{
public
MachineTimeline
getOrCreateTimeline
(
Machine
machine
)
{
long
machineId
=
machine
.
getId
();
long
machineId
=
machine
.
getId
();
...
...
src/test/java/com/aps/demo/PlanResultServiceTest.java
View file @
ba8c978a
...
@@ -6,6 +6,7 @@ import com.aps.entity.Algorithm.Chromosome;
...
@@ -6,6 +6,7 @@ import com.aps.entity.Algorithm.Chromosome;
import
com.aps.entity.Algorithm.ObjectiveWeights
;
import
com.aps.entity.Algorithm.ObjectiveWeights
;
import
com.aps.entity.Gantt.ProductGanttVO
;
import
com.aps.entity.Gantt.ProductGanttVO
;
import
com.aps.entity.basic.Machine
;
import
com.aps.entity.basic.Machine
;
import
com.aps.entity.basic.MaintenanceWindow
;
import
com.aps.service.Algorithm.NSGAIIUtils
;
import
com.aps.service.Algorithm.NSGAIIUtils
;
import
com.aps.service.plan.PlanResultService
;
import
com.aps.service.plan.PlanResultService
;
import
com.aps.service.plan.SceneService
;
import
com.aps.service.plan.SceneService
;
...
@@ -37,13 +38,17 @@ public class PlanResultServiceTest {
...
@@ -37,13 +38,17 @@ public class PlanResultServiceTest {
// nsgaiiUtils.Test();
// nsgaiiUtils.Test();
//planResultService.execute2("C5FB5EF2A7334A0A92F826F4937E1008");
//planResultService.execute2("C5FB5EF2A7334A0A92F826F4937E1008");
planResultService
.
execute2
(
"B6AE363FF5044DDF8DECE32D5FE0F7EA
"
);
// planResultService.execute2("F79370487E4C455B8C4CF9BA41541CA9
");
// LocalDateTime t= LocalDateTime.of(2025, 11, 15, 6, 51, 11);
// LocalDateTime t= LocalDateTime.of(2025, 11, 15, 6, 51, 11);
// List<Integer> opids=new ArrayList<>();
// List<Integer> opids=new ArrayList<>();
// opids.add(1);
// opids.add(1);
// planResultService.Move("B571EF6682DB463AB2977B1055A74112",opids,t,3403L);
// planResultService.Move("B571EF6682DB463AB2977B1055A74112",opids,t,3403L);
// planResultService.Redecode("B6AE363FF5044DDF8DECE32D5FE0F7EA");
// planResultService.Redecode("B6AE363FF5044DDF8DECE32D5FE0F7EA");
// MaintenanceWindow maintenanceWindow=new MaintenanceWindow();
// maintenanceWindow.setStartTime(LocalDateTime.of(2025, 10, 21, 0, 0, 0));
// maintenanceWindow.setEndTime(LocalDateTime.of(2025, 10, 31, 0, 0, 0));
// planResultService.AddMaintenanceWindow("B6AE363FF5044DDF8DECE32D5FE0F7EA",1245l,maintenanceWindow);
// planResultService.SpiltOrder("A41D662EE0764D008173C5A0E42B15F6","5f9d5383-b89a-4a4f-8805-2f617c711968",new Double[]{500d, 500d});
// planResultService.SpiltOrder("A41D662EE0764D008173C5A0E42B15F6","5f9d5383-b89a-4a4f-8805-2f617c711968",new Double[]{500d, 500d});
}
}
...
...
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