|
@@ -13,6 +13,8 @@ import org.springframework.stereotype.Component;
|
|
|
|
|
|
import javax.annotation.PostConstruct;
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.time.LocalDate;
|
|
|
+import java.time.Period;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
@@ -62,10 +64,26 @@ public class EsSaveInfoUtil {
|
|
|
return !esindexinfo.containsKey(index);
|
|
|
}
|
|
|
|
|
|
- public int DyMonth(String index){
|
|
|
- int t=Date8Util.between(esindexinfo.get(index));
|
|
|
+ public int DyMonthOld(String index){
|
|
|
+ String esIndex=esindexinfo.get(index);
|
|
|
+ int t=Date8Util.between(esindexinfo.get(index));
|
|
|
return Math.min(t,DyrqCommonRedis.SAVE_MAX_TIME);
|
|
|
}
|
|
|
+ public int DyMonth(String index){
|
|
|
+ String esIndex="202303";
|
|
|
+ int t= getDateBetween(esIndex);
|
|
|
+ return Math.min(t,DyrqCommonRedis.SAVE_MAX_TIME);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ private int getDateBetween(String month){
|
|
|
+ String yearMonth = Date8Util.getYearMonth();
|
|
|
+ LocalDate date1 = LocalDate.of(Integer.parseInt(month.substring(0, 4)), Integer.parseInt(month.substring(4, 6)), 1);
|
|
|
+ LocalDate date2 = LocalDate.of(Integer.parseInt(yearMonth.substring(0, 4)), Integer.parseInt(yearMonth.substring(4, 6)), 1);
|
|
|
+ Period between = Period.between(date1, date2);
|
|
|
+ return between.getYears() * 12 + between.getMonths();
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
public long getCarId(String meid){
|
|
|
return StringUtil.isNotEmpty(meid) ? carGpsInfo.get(meid) : 0;
|