BJ_FS / urbanops

Commit ae252461d138bb1fc81c4a8f6cec27d88dd72eff

Authored by 王彪总
1 parent 6e89f02d

feat(garden): 更新巡检计划时间计算方法 

- 将巡检计划服务中的时间间隔计算方法从 calculate 更改为 calculateNew
- 修复了时间间隔计算工具类中的测试用例参数配置
- 调整了周期性任务的时间频率设置以提高准确性
Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
  View file @ae25246
... ... @@ -110,7 +110,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
110 110 calculate.add(periodResult);
111 111 planNum = Integer.parseInt(createReqVO.getRateValue());
112 112 }else{
113   - calculate= TimeIntervalFrequencyUtil.calculate(createReqVO.getBeginTime().toString(), createReqVO.getEndTime().toString(), rateValue, createReqVO.getCycleId());
  113 + calculate= TimeIntervalFrequencyUtil.calculateNew(createReqVO.getBeginTime().toString(), createReqVO.getEndTime().toString(), rateValue, createReqVO.getCycleId());
114 114 if (CollectionUtils.isEmpty(calculate)) {
115 115 log.warn("获取两个时间之间间隔天数错误");
116 116 return CommonResult.error(INSPECTION_CYCLE_ERROR);
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/util/timeinterval/TimeIntervalFrequencyUtil.java
  View file @ae25246
... ... @@ -230,7 +230,7 @@ public class TimeIntervalFrequencyUtil {
230 230 // ====================== 测试用例 ======================
231 231 public static void main(String[] args) {
232 232  
233   - List<PeriodResult> r2 = calculateNew("2026-01-01", "2026-01-26", "9/2", 2);
  233 + List<PeriodResult> r2 = calculateNew("2026-01-01", "2026-01-26", "5/12", 1);
234 234 r2.forEach(System.out::println);
235 235  
236 236 // //1:日/次；2:周/次；3:月/次；4:年/次
... ...