From ae252461d138bb1fc81c4a8f6cec27d88dd72eff Mon Sep 17 00:00:00 2001 From: 王彪总 Date: Wed, 17 Dec 2025 08:50:09 +0800 Subject: [PATCH] feat(garden): 更新巡检计划时间计算方法 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/util/timeinterval/TimeIntervalFrequencyUtil.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java index 3238650..4061655 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java @@ -110,7 +110,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { calculate.add(periodResult); planNum = Integer.parseInt(createReqVO.getRateValue()); }else{ - calculate= TimeIntervalFrequencyUtil.calculate(createReqVO.getBeginTime().toString(), createReqVO.getEndTime().toString(), rateValue, createReqVO.getCycleId()); + calculate= TimeIntervalFrequencyUtil.calculateNew(createReqVO.getBeginTime().toString(), createReqVO.getEndTime().toString(), rateValue, createReqVO.getCycleId()); if (CollectionUtils.isEmpty(calculate)) { log.warn("获取两个时间之间间隔天数错误"); return CommonResult.error(INSPECTION_CYCLE_ERROR); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/util/timeinterval/TimeIntervalFrequencyUtil.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/util/timeinterval/TimeIntervalFrequencyUtil.java index f5e8026..2dcb5cf 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/util/timeinterval/TimeIntervalFrequencyUtil.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/util/timeinterval/TimeIntervalFrequencyUtil.java @@ -230,7 +230,7 @@ public class TimeIntervalFrequencyUtil { // ====================== 测试用例 ====================== public static void main(String[] args) { - List r2 = calculateNew("2026-01-01", "2026-01-26", "9/2", 2); + List r2 = calculateNew("2026-01-01", "2026-01-26", "5/12", 1); r2.forEach(System.out::println); // //1:日/次；2:周/次；3:月/次；4:年/次 -- libgit2 0.21.4