Merge branch 'dev-xym-update1' of Server/long-article-recommend into master

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/vo/GhDetailVo.java

@@ -21,7 +21,7 @@ public class GhDetailVo {
 
     private String category2;
 
-    private Date createTime;
+    private String createTime;
 
-    private Date updateTime;
+    private String updateTime;
 }

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/exterior/impl/GhDetailServiceImpl.java

@@ -9,6 +9,7 @@ import com.tzld.longarticle.recommend.server.model.vo.GhDetailVo;
 import com.tzld.longarticle.recommend.server.repository.model.GhDetail;
 import com.tzld.longarticle.recommend.server.repository.model.GhDetailExample;
 import com.tzld.longarticle.recommend.server.service.exterior.GhDetailService;
+import com.tzld.longarticle.recommend.server.util.DateUtils;
 import com.tzld.longarticle.recommend.server.util.page.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -44,6 +45,7 @@ public class GhDetailServiceImpl implements GhDetailService {
         page.setCurrentPage(pageNum);
         page.setPageSize(pageSize);
         GhDetailExample example = new GhDetailExample();
+        example.setOrderByClause("create_time desc");
         GhDetailExample.Criteria criteria = example.createCriteria().andIsDeleteEqualTo(0);
         if (StringUtils.isNotEmpty(accountId)) {
             criteria.andGhIdEqualTo(accountId);
@@ -60,6 +62,8 @@ public class GhDetailServiceImpl implements GhDetailService {
                 ghDetailVo.setAccountId(ghDetail.getGhId());
                 ghDetailVo.setAccountName(ghDetail.getGhName());
                 ghDetailVo.setTypeName(GhTypeEnum.getTypeName(ghDetailVo.getType()));
+                ghDetailVo.setCreateTime(DateUtils.getDateString(ghDetail.getCreateTime().getTime(), "yyyy-MM-dd HH:mm:ss"));
+                ghDetailVo.setUpdateTime(DateUtils.getDateString(ghDetail.getUpdateTime().getTime(), "yyyy-MM-dd HH:mm:ss"));
                 ghDetailVos.add(ghDetailVo);
             }
         }
@@ -67,6 +71,8 @@ public class GhDetailServiceImpl implements GhDetailService {
         return CommonResponse.success(page);
     }
 
+
+
     @Override
     public CommonResponse<Void> addGhDetail(GhDetailVo ghDetailVo) {
         if (ghDetailVo == null

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/util/DateUtils.java

@@ -278,6 +278,15 @@ public final class DateUtils {
         return dateTime.format(dateFormat);
     }
 
+    public static String getDateString(Long timestamp, String pattern) {
+        // 创建日期时间格式化器
+        DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern(pattern);
+        // 将时间戳转换为 LocalDateTime
+        LocalDateTime dateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault());
+        // 格式化日期时间并返回
+        return dateTime.format(dateFormat);
+    }
+
     public static Date getDate(String dateString) {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         LocalDate localDate = LocalDate.parse(dateString, formatter);