Эх сурвалжийг харах

推荐时间 身份认证接口

licailing 3 жил өмнө
parent
commit
13a75294a4

+ 6 - 3
src/main/java/com/izouma/nineth/dto/RecommendDTO.java

@@ -4,11 +4,14 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDateTime;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class RecommendDTO {
-    private Integer sort;
-    private Object obj;
-    private String type;
+    private Integer       sort;
+    private Object        obj;
+    private String        type;
+    private LocalDateTime createdAt;
 }

+ 5 - 3
src/main/java/com/izouma/nineth/web/CollectionController.java

@@ -64,7 +64,7 @@ public class CollectionController extends BaseController {
     @PostMapping("/create")
     public Collection create(@RequestBody CollectionInfoDTO record) {
         Collection collection = new Collection();
-        BeanUtils.copyProperties(record,collection);
+        BeanUtils.copyProperties(record, collection);
         collection = collectionService.create(collection);
         CollectionPrivilege collectionPrivilege = new CollectionPrivilege();
         BeanUtils.copyProperties(record, collectionPrivilege);
@@ -176,14 +176,16 @@ public class CollectionController extends BaseController {
             collectionDTO.setPrivileges(null);
             collectionDTO.setProperties(null);
 
-            return new RecommendDTO(rc.getRecommend().getSort(), collectionDTO, "collection");
+            return new RecommendDTO(rc.getRecommend().getSort(), collectionDTO, "collection", rc.getRecommend()
+                    .getCreatedAt());
         }).collect(Collectors.toList());
 
         List<RecommendDTO> news = newsRepo.recommend("LIST").stream().map(rn -> {
             if (StringUtils.isNotBlank(rn.getRecommend().getPic())) {
                 rn.getNews().setPic(rn.getRecommend().getPic());
             }
-            return new RecommendDTO(rn.getRecommend().getSort(), rn.getNews(), "news");
+            return new RecommendDTO(rn.getRecommend().getSort(), rn.getNews(), "news", rn.getRecommend()
+                    .getCreatedAt());
         }).collect(Collectors.toList());
 
         recommedDTOS.addAll(collectionDTOS);

+ 2 - 2
src/main/java/com/izouma/nineth/web/IdentityAuthController.java

@@ -93,8 +93,8 @@ public class IdentityAuthController extends BaseController {
     }
 
     @PostMapping("/my")
-    public String my(){
-        return identityAuthRepo.findFirstByUserId(SecurityUtils.getAuthenticatedUser().getId()).getStatus().toString();
+    public IdentityAuth my(){
+        return identityAuthRepo.findFirstByUserId(SecurityUtils.getAuthenticatedUser().getId());
     }
 }