diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/statistics/StatisticsController.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/statistics/StatisticsController.java index 6ea2370..1c41c2d 100644 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/statistics/StatisticsController.java +++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/statistics/StatisticsController.java @@ -86,10 +86,10 @@ queryForm.setEndTime(yesterday); // 查询转运作业次数 - List> transfer = selectCarJobCount(queryForm, null, "13"); + List> transfer = selectCarJobCount(queryForm, null, "5"); // 查询清扫作业次数 - List> clean = selectCarJobCount(queryForm, null, "5"); + List> clean = selectCarJobCount(queryForm, null, "13"); // 获取昨日转运作业次数和清扫作业次数 result.put("transfer", transfer.get(0).get("count")); diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/statistics/StatisticsController.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/statistics/StatisticsController.java index 6ea2370..1c41c2d 100644 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/statistics/StatisticsController.java +++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/statistics/StatisticsController.java @@ -86,10 +86,10 @@ queryForm.setEndTime(yesterday); // 查询转运作业次数 - List> transfer = selectCarJobCount(queryForm, null, "13"); + List> transfer = selectCarJobCount(queryForm, null, "5"); // 查询清扫作业次数 - List> clean = selectCarJobCount(queryForm, null, "5"); + List> clean = selectCarJobCount(queryForm, null, "13"); // 获取昨日转运作业次数和清扫作业次数 result.put("transfer", transfer.get(0).get("count")); diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/WasteCarJobHandler.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/WasteCarJobHandler.java index 26cc531..4ad91e7 100644 --- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/WasteCarJobHandler.java +++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/WasteCarJobHandler.java @@ -87,6 +87,11 @@ startMorning = startMorning.plusSeconds(RandomUtil.randomInt(-1800, 1800, true, true)); endMorning = endMorning.plusSeconds(RandomUtil.randomInt(-1800, 1800, true, true)); + int absentMorning = RandomUtil.randomInt(1, 100, true, true); + if (absentMorning < 5) { + continue; + } + // 作业记录 JobRecord recordMorning = new JobRecord(); recordMorning.setRouteId(route.getId()); @@ -111,6 +116,12 @@ startAfternoon = startAfternoon.plusSeconds(RandomUtil.randomInt(-1800, 1800, true, true)); endAfternoon = endAfternoon.plusSeconds(RandomUtil.randomInt(-1800, 1800, true, true)); + // 下午随机少几次 5%的概率没有下午的任务 + int absentAfternoon = RandomUtil.randomInt(1, 100, true, true); + if (absentAfternoon <= 5) { + continue; + } + // 作业记录 JobRecord recordAfternoon = new JobRecord(); recordAfternoon.setRouteId(route.getId());