Date util

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/common/util/DateUtil.java

@@ -22,26 +22,24 @@ import java.util.*;
 public class DateUtil {
 
     /** 时间格式(yyyy-MM-dd) */
-    public static final String DATE_PATTERN = "yyyy-MM-dd";
+    public static final String DATE_FORMAT = "yyyy-MM-dd";
 
     /** 时间格式(yyyy-MM-dd HH:mm:ss) */
-    public static final String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
+    public static final String DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
 
     /** 带时区的时间格式(yyyy-MM-dd HH:mm:ss +00:00) */
-    public static final String ZONED_DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss X";
+    public static final String ZONED_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss X";
 
-    public static final String SUBJECT_DATE = "yyyy/MM/dd";
+    /** 时间格式(yyyy/MM/dd) */
+    public static final String SUBJECT_DATE_FORMAT = "yyyy/MM/dd";
 
-    public static final ZoneId DEFAULT_ZONE_ID = ZoneId.of("Asia/Shanghai");
-
-    /** yyyy-MM-dd HH:mm:ss. */
-    public static final String DATE_FORMAT_FIVE = "yyyy-MM-dd HH:mm:ss";
+    /** 时间格式(yyyyMMdd) */
+    public static final String DATE_FORMAT_COMPACT = "yyyyMMdd";
 
-    /** yyyyMMdd. */
-    public static final String DATE_FORMAT_THREE = "yyyyMMdd";
+    /** 时间格式(yyyyMMddHHmmss) */
+    public static final String DATE_TIME_FORMAT_COMPACT = "yyyyMMddHHmmss";
 
-    /** yyyyMMddHHmm */
-    public static final String DATE_FORMAT = "yyyyMMddHHmmss";
+    public static final ZoneId DEFAULT_ZONE_ID = ZoneId.of("Asia/Shanghai");
 
     public static Date plusDays(Date date, int daysToAdd) {
         Calendar calendar = Calendar.getInstance();

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/common/util/GeoIpUtil.java

@@ -1,6 +1,5 @@
 package org.jeecg.modules.adweb.common.util;
 
-
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.maxmind.db.CHMCache;
 import com.maxmind.geoip2.DatabaseReader;
@@ -9,6 +8,7 @@ import com.maxmind.geoip2.model.CityResponse;
 import com.maxmind.geoip2.record.Country;
 import com.maxmind.geoip2.record.Location;
 import com.maxmind.geoip2.record.Subdivision;
+
 import org.jeecg.modules.adweb.common.dto.CountryAreaApiDto;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,7 +31,7 @@ import java.util.TimeZone;
 public class GeoIpUtil {
 
     private static final Logger log = LoggerFactory.getLogger(GeoIpUtil.class);
-    //GEOIp数据库实例
+    // GEOIp数据库实例
     private static DatabaseReader reader = null;
 
     @Value("${geoip.static.city.mmdb}")
@@ -67,12 +67,12 @@ public class GeoIpUtil {
         CountryAreaApiDto dto = new CountryAreaApiDto();
         try {
             DatabaseReader reader = getDatabaseReader(geoipCityMmdb);
-            if(reader == null){
+            if (reader == null) {
                 return dto;
             }
             InetAddress ipAddress = InetAddress.getByName(ip);
             CityResponse response = reader.city(ipAddress);
-            //国家
+            // 国家
             Country country = response.getCountry();
             dto.setCountryZhCN(country.getNames().get("zh-CN"));
             if ("香港".equals(country.getNames().get("zh-CN"))) {
@@ -85,7 +85,7 @@ public class GeoIpUtil {
                 dto.setCountryZhCN("中国澳门");
             }
             dto.setCountryIsoCode(country.getIsoCode());
-            //省份
+            // 省份
             Subdivision subdivision = response.getMostSpecificSubdivision();
             dto.setSubdivisionIsoCode(subdivision.getIsoCode());
             dto.setSubdivisionZhCN(subdivision.getNames().get("zh-CN"));
@@ -104,6 +104,7 @@ public class GeoIpUtil {
 
     /**
      * 根据ip获取时区
+     *
      * @param ip
      * @return 时区
      * @author Cyan -- 2020/3/9 10:58
@@ -125,26 +126,25 @@ public class GeoIpUtil {
 
     /**
      * 根据ip获取当地时区时间
+     *
      * @param ip
      * @return
      * @author Cyan -- 2020/3/9 11:06
      */
-    public Date getLocalhostTime(String ip,Date date) {
-        SimpleDateFormat sdf = new SimpleDateFormat(DateUtil.DATE_FORMAT_FIVE);
+    public Date getLocalhostTime(String ip, Date date) {
+        SimpleDateFormat sdf = new SimpleDateFormat(DateUtil.DATE_TIME_FORMAT);
         String timeZone = getTimeZone(ip);
-        if(StringUtils.isEmpty(timeZone)){
+        if (StringUtils.isEmpty(timeZone)) {
             timeZone = "Asia/Shanghai";
         }
         sdf.setTimeZone(TimeZone.getTimeZone(timeZone));
         String dateStr = sdf.format(date);
         Date res = new Date();
         try {
-            res = DateUtil.getFormatDate(dateStr,DateUtil.DATE_FORMAT_FIVE);
-        }catch (Exception e){
+            res = DateUtil.getFormatDate(dateStr, DateUtil.DATE_TIME_FORMAT);
+        } catch (Exception e) {
             log.error("获取ip时区时间失败", e);
         }
         return res;
     }
-
-
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/service/dataforseo/DataForSEOService.java

@@ -253,7 +253,7 @@ public class DataForSEOService {
 
             // 读取Serp相关数据
             Date seDatetime =
-                    DateUtil.parseDate(serpResult.getDatetime(), DateUtil.ZONED_DATE_TIME_PATTERN);
+                    DateUtil.parseDate(serpResult.getDatetime(), DateUtil.ZONED_DATE_TIME_FORMAT);
             String positionUrl =
                     Objects.nonNull(serpItem)
                             ? StringUtils.removeEnd(serpItem.getUrl(), "/")
@@ -283,7 +283,7 @@ public class DataForSEOService {
                                             .eq(
                                                     SeoKeywordsSerp::getSeDate,
                                                     DateUtil.formatDate(
-                                                            seDatetime, DateUtil.DATE_PATTERN)))
+                                                            seDatetime, DateUtil.DATE_FORMAT)))
                             .stream()
                             .findFirst()
                             .orElse(new SeoKeywordsSerp());
@@ -296,7 +296,7 @@ public class DataForSEOService {
             keywordSerp.setPageNumber(rankGroup > 0 ? rankGroup / GOOGLE_SEARCH_PAGE_SIZE + 1 : 0);
             keywordSerp.setRankGroup(rankGroup);
             keywordSerp.setRankAbsolute(rankAbsolute);
-            keywordSerp.setSeDate(DateUtil.formatDateStr(seDatetime, DateUtil.DATE_PATTERN));
+            keywordSerp.setSeDate(DateUtil.formatDateStr(seDatetime, DateUtil.DATE_FORMAT));
             keywordSerp.setSeDatetime(seDatetime);
             seoKeywordsSerpService.save(keywordSerp);
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/service/impl/SeoKeywordsSerpServiceImpl.java

@@ -44,7 +44,7 @@ public class SeoKeywordsSerpServiceImpl extends ServiceImpl<SeoKeywordsSerpMappe
         // Serp最后更新时间 + 一天
         Date startDate =
                 DateUtil.getTmrZeroTime(
-                        DateUtil.parseDate(latestSerp.getSeDate(), DateUtil.DATE_PATTERN));
+                        DateUtil.parseDate(latestSerp.getSeDate(), DateUtil.DATE_FORMAT));
         // DateForSEO返回的SearchEngine时间
         Date endDate = DateUtil.getTodayZeroTime(seDatetime);
 
@@ -64,7 +64,7 @@ public class SeoKeywordsSerpServiceImpl extends ServiceImpl<SeoKeywordsSerpMappe
             serp.setRankGroup(latestSerp.getRankGroup());
             serp.setRankAbsolute(latestSerp.getRankAbsolute());
             serp.setSeDate(
-                    DateUtil.formatDateStr(currentDate, DateUtil.DATE_PATTERN)); // 复制Serp值的目标日期
+                    DateUtil.formatDateStr(currentDate, DateUtil.DATE_FORMAT)); // 复制Serp值的目标日期
             serp.setSeDatetime(latestSerp.getSeDatetime()); // 真实Serp返回的SearchingEngine时间
             serpsToFill.add(serp);
         }