Selaa lähdekoodia

[update] message:1.LocalDateTime返回给前端去掉T

kelei 10 kuukautta sitten
vanhempi
commit
c8cd95dd78

+ 25 - 0
admin/src/main/java/com/flyer/foster/config/LocalDateTimeFormatConfig.java

@@ -0,0 +1,25 @@
+package com.flyer.foster.config;
+
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * LocalDateTimeFormatConfig
+ *
+ * @author kelei
+ * @since 2022/6/8/15:59
+ */
+@Configuration
+public class LocalDateTimeFormatConfig {
+    private static final String LOCAL_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+    @Bean
+    public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilderCustomizer() {
+        return builder -> builder.serializerByType(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(LOCAL_DATE_TIME_FORMAT)));
+    }
+}

+ 12 - 2
admin/src/main/java/com/flyer/foster/controller/app/AppTreePosterContentController.java

@@ -28,7 +28,7 @@ public class AppTreePosterContentController {
     private ITreePosterContentService iTreePosterContentService;
 
     /**
-     * 海报悄悄话列表-分页
+     * 海报悄悄话列表-分页(小程序)
      *
      * @return
      */
@@ -39,6 +39,16 @@ public class AppTreePosterContentController {
     }
 
     /**
+     * 我的问候列表(小程序)
+     * @param queryDTO
+     * @return
+     */
+    @GetMapping("/list")
+    public R getList(AppTreePosterContentQueryDTO queryDTO) {
+        return R.ok().result(iTreePosterContentService.getList(queryDTO));
+    }
+
+    /**
      * 新增果树海报悄悄话(小程序)
      *
      * @param addDTO
@@ -50,7 +60,7 @@ public class AppTreePosterContentController {
     }
 
     /**
-     * 修改海报悄悄话状态
+     * 修改海报悄悄话状态(小程序)
      *
      * @param treePosterContentId
      * @param updateDTO

+ 4 - 0
admin/src/main/java/com/flyer/foster/dto/app/AppTreePosterContentRespDTO.java

@@ -2,6 +2,8 @@ package com.flyer.foster.dto.app;
 
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /**
  * AppTreePosterContentAddDTO
  *
@@ -21,4 +23,6 @@ public class AppTreePosterContentRespDTO {
     private Integer treeId;
 
     private Integer status;
+
+    private LocalDateTime createdTime;
 }

+ 4 - 0
admin/src/main/java/com/flyer/foster/service/ITreePosterContentService.java

@@ -8,6 +8,8 @@ import com.flyer.foster.dto.app.AppTreePosterContentUpdateDTO;
 import com.flyer.foster.entity.TreePosterContent;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 果树海报悄悄话 服务类
@@ -23,4 +25,6 @@ public interface ITreePosterContentService extends IService<TreePosterContent> {
     boolean updateTreePosterContent(Integer treePosterContentId, AppTreePosterContentUpdateDTO updateDTO);
 
     IPage<AppTreePosterContentRespDTO> getPageList(IPage<TreePosterContent> page, AppTreePosterContentQueryDTO queryDTO);
+
+    List<AppTreePosterContentRespDTO> getList(AppTreePosterContentQueryDTO queryDTO);
 }

+ 24 - 1
admin/src/main/java/com/flyer/foster/service/impl/TreePosterContentServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -92,7 +93,7 @@ public class TreePosterContentServiceImpl extends ServiceImpl<ITreePosterContent
 
         IPage<TreePosterContent> pageInfo = this.lambdaQuery()
                 .eq(TreePosterContent::getAppUserId, queryDTO.getAppUserId())
-                .eq(TreePosterContent::getAppUserId, queryDTO.getAppUserId())
+                .eq(TreePosterContent::getTreeId, queryDTO.getTreeId())
                 .page(page);
         List<AppTreePosterContentRespDTO> list = new ArrayList<>();
         AppTreePosterContentRespDTO respDTO;
@@ -105,4 +106,26 @@ public class TreePosterContentServiceImpl extends ServiceImpl<ITreePosterContent
         pageResult.setTotal(pageInfo.getTotal());
         return pageResult;
     }
+
+    @Override
+    public List<AppTreePosterContentRespDTO> getList(AppTreePosterContentQueryDTO queryDTO) {
+        List<AppTreePosterContentRespDTO> list = new ArrayList<>();
+        AppTreePosterContentRespDTO respDTO;
+
+        // 当天最小时间
+        LocalDateTime min = LocalDateTime.of(LocalDate.from(LocalDateTime.now()), LocalDateTime.MIN.toLocalTime());
+        // 当天最大时间
+        LocalDateTime max = LocalDateTime.of(LocalDate.from(LocalDateTime.now()), LocalDateTime.MAX.toLocalTime());
+
+        List<TreePosterContent> treePosterContentList = this.lambdaQuery()
+                .eq(TreePosterContent::getTreeId, queryDTO.getTreeId())
+                .between(TreePosterContent::getCreatedTime, min, max)
+                .list();
+        for (TreePosterContent treePosterContent : treePosterContentList) {
+            respDTO = new AppTreePosterContentRespDTO();
+            BeanUtil.copyProperties(treePosterContent, respDTO);
+            list.add(respDTO);
+        }
+        return list;
+    }
 }