diff --git a/src/main/java/com/mixi/controller/MiTuExportController.java b/src/main/java/com/mixi/controller/MiTuExportController.java index 25a8353..90de535 100644 --- a/src/main/java/com/mixi/controller/MiTuExportController.java +++ b/src/main/java/com/mixi/controller/MiTuExportController.java @@ -7,6 +7,7 @@ import com.mixi.model.dto.QueryMiTuExportPageDTO; import com.mixi.model.dto.QueryStorePageDTO; import com.mixi.model.dto.StoreAddOrEditDTO; import com.mixi.model.dto.StoreDeleteDTO; +import com.mixi.model.vo.MiTuExportVO; import com.mixi.model.vo.StoreVO; import com.mixi.service.MiTuExportService; import com.mixi.service.StoreService; @@ -37,7 +38,7 @@ public class MiTuExportController { @ApiOperation(value = "MiTu报表查询") @PostMapping("/miTuExportPage") - public Response> queryMiTuExportPage(@Valid @RequestBody QueryMiTuExportPageDTO query) { + public Response> queryMiTuExportPage(@Valid @RequestBody QueryMiTuExportPageDTO query) { return Response.success(miTuExportService.queryMiTuExportPage(query)); } diff --git a/src/main/java/com/mixi/model/vo/MiTuExportVO.java b/src/main/java/com/mixi/model/vo/MiTuExportVO.java new file mode 100644 index 0000000..68fb852 --- /dev/null +++ b/src/main/java/com/mixi/model/vo/MiTuExportVO.java @@ -0,0 +1,29 @@ +package com.mixi.model.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +@Data +public class MiTuExportVO { + private Long id; + + + private String exportName; + + private String dataTime; + + private String url; + + private String createTime; + + private String span; + + /** + * 0未完成1已完成 + */ + private Integer status; +} diff --git a/src/main/java/com/mixi/service/MiTuExportService.java b/src/main/java/com/mixi/service/MiTuExportService.java index e4e6c77..c48e043 100644 --- a/src/main/java/com/mixi/service/MiTuExportService.java +++ b/src/main/java/com/mixi/service/MiTuExportService.java @@ -4,6 +4,7 @@ import com.mixi.common.response.PageBaseResponse; import com.mixi.common.response.Response; import com.mixi.mapper.entity.MiTuExport; import com.mixi.model.dto.QueryMiTuExportPageDTO; +import com.mixi.model.vo.MiTuExportVO; import io.minio.errors.MinioException; import org.springframework.core.io.InputStreamResource; @@ -21,7 +22,7 @@ import java.io.IOException; public interface MiTuExportService { - PageBaseResponse queryMiTuExportPage(QueryMiTuExportPageDTO query); + PageBaseResponse queryMiTuExportPage(QueryMiTuExportPageDTO query); void exportMiTuReport(Long id, HttpServletResponse response) throws IOException, MinioException; } diff --git a/src/main/java/com/mixi/service/impl/MiTuExportServiceImpl.java b/src/main/java/com/mixi/service/impl/MiTuExportServiceImpl.java index 252fe37..83fb196 100644 --- a/src/main/java/com/mixi/service/impl/MiTuExportServiceImpl.java +++ b/src/main/java/com/mixi/service/impl/MiTuExportServiceImpl.java @@ -6,10 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mixi.common.config.exception.BusinessException; import com.mixi.common.response.PageBaseResponse; import com.mixi.common.response.Response; +import com.mixi.common.utils.CopyUtil; import com.mixi.common.utils.MinioUtil; import com.mixi.mapper.MiTuExportMapper; import com.mixi.mapper.entity.MiTuExport; import com.mixi.model.dto.QueryMiTuExportPageDTO; +import com.mixi.model.vo.MiTuExportVO; import com.mixi.service.MiTuExportService; import io.minio.errors.MinioException; import lombok.extern.slf4j.Slf4j; @@ -25,6 +27,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.net.URLEncoder; +import java.time.format.DateTimeFormatter; +import java.util.function.Function; //import com.ai.da.common.utils.SendSmsUtil; @@ -45,7 +49,7 @@ public class MiTuExportServiceImpl implements MiTuExportService { private MinioUtil minioUtil; @Override - public PageBaseResponse queryMiTuExportPage(QueryMiTuExportPageDTO query) { + public PageBaseResponse queryMiTuExportPage(QueryMiTuExportPageDTO query) { // 分页数据 QueryWrapper qw = new QueryWrapper<>(); qw.lambda().eq(MiTuExport::getStatus, 1); @@ -69,7 +73,15 @@ public class MiTuExportServiceImpl implements MiTuExportService { // result.setCreateDate(store.getCreateDate().getTime()); // return result; // }); - return PageBaseResponse.success(page); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + IPage convert = page.convert((Function) + mituExport -> { + MiTuExportVO vo = CopyUtil.copyObject(mituExport, MiTuExportVO.class); + vo.setCreateTime(mituExport.getCreateTime().format(formatter)); + return vo; + } + ); + return PageBaseResponse.success(convert); // return miTuExportMapper.selectPage(); }