退火调度排程优化

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/score/ApsConstraintProvider.java

@@ -1789,11 +1789,11 @@ public class ApsConstraintProvider implements ConstraintProvider {
             List<ProductionProcesses> v = entry.getValue();
 
             List<ProductionProcesses> vps = v.stream().filter(mv ->
-                    mv.getId().equals("926eb407a68b4a3baa4832678da79a67") || mv.getId().equals("06bd9b6b78da4d8caa131064bf2b8f68")).collect(Collectors.toList());
+                    mv.getId().equals("97e34b61e3984034a6c3d711b189d74e") || mv.getId().equals("eab35b6652234a2c9d51b7a2020250a9")).collect(Collectors.toList());
             if(v.size()>3){
                 int a = 1;
             }
-            if(vps.size()>1){
+            if(vps.size() == 2 && v.size() == 2){
                 int a = 1;
             }
             if(processes.size()>1){
@@ -3162,7 +3162,7 @@ public class ApsConstraintProvider implements ConstraintProvider {
                             ProductionProcesses bfpps = hasStartTimeProcess.get(i);
                             ProductionProcesses afpps = hasStartTimeProcess.get(i+1);
                             if(bfpps.getId() != null || afpps.getId() != null){
-                                if(bfpps.getEndTime().plusMinutes(30).compareTo(afpps.getStartTime())<0){
+                                if(bfpps.getEndTime().plusMinutes(300).compareTo(afpps.getStartTime())<0 && bfpps.getEndTime().plusMinutes(1200).compareTo(afpps.getStartTime())>0){
                                     b++;
                                 }
                             }