BJ_FS / urbanops

Commit 9abc2b291f7c473fcd6dd03c3db751faaddf9b51

Authored by 王彪总
1 parent 677f14fb

feat(garden): 更新时间间隔频率工具类 

- 调整周期ID枚举值以匹配新的业务逻辑
- 修改convertToDays方法中各周期对应的天数计算规则
- 更新注释说明，明确各个周期类型的含义及对应关系
Inline Side-by-side
Showing 1 changed file with 11 additions and 5 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/util/timeinterval/TimeIntervalFrequencyUtil.java
  View file @9abc2b2
@@ -80,7 +80,13 @@ public class TimeIntervalFrequencyUtil { @@ -80,7 +80,13 @@ public class TimeIntervalFrequencyUtil {
80 80
81 /** 81 /**
82 * 将 y 个单位转换为固定天数 82 * 将 y 个单位转换为固定天数
83 - * 1:日/次；2:周/次；3:月/次；4:年/次；5:按次；6:季度；7:半年 83 + * TIME(0, "次"),
  84 + * DAY(1, "次/日"),
  85 + * WEEK(2, "次/周"),
  86 + * MONTH(3, "次/月"),
  87 + * QUARTER(4, "次/季"),
  88 + * SEMIANNUAL(5, "次/半年"),
  89 + * YEAR(6, "次/年");
84 */ 90 */
85 private static long convertToDays(int y, Integer cycleId) { 91 private static long convertToDays(int y, Integer cycleId) {
86 switch (cycleId) { 92 switch (cycleId) {
@@ -90,13 +96,13 @@ public class TimeIntervalFrequencyUtil { @@ -90,13 +96,13 @@ public class TimeIntervalFrequencyUtil {
90 return (long) y * 7; 96 return (long) y * 7;
91 case 3: // MONTH 97 case 3: // MONTH
92 return (long) y * 30; 98 return (long) y * 30;
93 - case 4: // YEAR 99 + case 6: // YEAR
94 return (long) y * 365; 100 return (long) y * 365;
95 - case 5: // TIME 101 + case 0: // TIME
96 return 1; // 按次：将整个时间段视为1个周期 102 return 1; // 按次：将整个时间段视为1个周期
97 - case 6: // QUARTER 103 + case 4: // QUARTER
98 return (long) y * 90; // 1季度=3个月=90天 104 return (long) y * 90; // 1季度=3个月=90天
99 - case 7: // SEMIANNUAL 105 + case 5: // SEMIANNUAL
100 return (long) y * 180; // 半年=6个月=180天 106 return (long) y * 180; // 半年=6个月=180天
101 default: 107 default:
102 throw new IllegalArgumentException("无效的周期ID: " + cycleId); 108 throw new IllegalArgumentException("无效的周期ID: " + cycleId);