Commit 458c8875 by Ren Ping

fix:排班结果工程师详情修改

1 parent e171ae61
...@@ -19,7 +19,6 @@ import javax.annotation.Resource; ...@@ -19,7 +19,6 @@ import javax.annotation.Resource;
*/ */
@Component @Component
@Slf4j @Slf4j
@DisallowConcurrentExecution
public class AutoDispatchJob extends QuartzJobBean { public class AutoDispatchJob extends QuartzJobBean {
public static final String TEAM_JOB_PREFIX="BOXI_TEAM_"; public static final String TEAM_JOB_PREFIX="BOXI_TEAM_";
......
...@@ -49,11 +49,11 @@ public class SchedulerServiceImpl implements SchedulerService { ...@@ -49,11 +49,11 @@ public class SchedulerServiceImpl implements SchedulerService {
OrgTeamDao orgTeamDao; OrgTeamDao orgTeamDao;
private DefaultSolverFactory<DispatchSolution> solverFactory; private DefaultSolverFactory<DispatchSolution> solverFactory;
private Solver<DispatchSolution> solver; //private Solver<DispatchSolution> solver;
public SchedulerServiceImpl() { public SchedulerServiceImpl() {
solverFactory = DispatchSolutionUtils.getSolverFactory(30, 60 * 5); solverFactory = DispatchSolutionUtils.getSolverFactory(30, 60 * 5);
solver = solverFactory.buildSolver(); //solver = solverFactory.buildSolver();
} }
@Override @Override
...@@ -77,6 +77,7 @@ public class SchedulerServiceImpl implements SchedulerService { ...@@ -77,6 +77,7 @@ public class SchedulerServiceImpl implements SchedulerService {
continue; continue;
} }
log.info("dispatchRun prepare done, teamId:{}, day:{}, batch:{}, problemId:{}", teamId, currDay, batchNo, problemId); log.info("dispatchRun prepare done, teamId:{}, day:{}, batch:{}, problemId:{}", teamId, currDay, batchNo, problemId);
Solver<DispatchSolution> solver = solverFactory.buildSolver();
DispatchSolution solution = solver.solve(problem); DispatchSolution solution = solver.solve(problem);
DispatchSolutionUtils.removeHardConstraintCustomer(solution, solverFactory); DispatchSolutionUtils.removeHardConstraintCustomer(solution, solverFactory);
log.info("dispatchRun solve done, teamId:{}, day:{}, batch:{}, problemId:{}, score:{}", teamId, currDay, batchNo, problemId, solution.getScore().toShortString()); log.info("dispatchRun solve done, teamId:{}, day:{}, batch:{}, problemId:{}, score:{}", teamId, currDay, batchNo, problemId, solution.getScore().toShortString());
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!