TASK:时间

This commit is contained in:
shahaibo
2024-04-03 18:29:43 +08:00
parent f1bd435c46
commit a3aee69512
4 changed files with 47 additions and 4 deletions

View File

@@ -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<PageBaseResponse<MiTuExport>> queryMiTuExportPage(@Valid @RequestBody QueryMiTuExportPageDTO query) {
public Response<PageBaseResponse<MiTuExportVO>> queryMiTuExportPage(@Valid @RequestBody QueryMiTuExportPageDTO query) {
return Response.success(miTuExportService.queryMiTuExportPage(query));
}

View File

@@ -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;
}

View File

@@ -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<MiTuExport> queryMiTuExportPage(QueryMiTuExportPageDTO query);
PageBaseResponse<MiTuExportVO> queryMiTuExportPage(QueryMiTuExportPageDTO query);
void exportMiTuReport(Long id, HttpServletResponse response) throws IOException, MinioException;
}

View File

@@ -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<MiTuExport> queryMiTuExportPage(QueryMiTuExportPageDTO query) {
public PageBaseResponse<MiTuExportVO> queryMiTuExportPage(QueryMiTuExportPageDTO query) {
// 分页数据
QueryWrapper<MiTuExport> 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<MiTuExportVO> convert = page.convert((Function<MiTuExport, MiTuExportVO>)
mituExport -> {
MiTuExportVO vo = CopyUtil.copyObject(mituExport, MiTuExportVO.class);
vo.setCreateTime(mituExport.getCreateTime().format(formatter));
return vo;
}
);
return PageBaseResponse.success(convert);
// return miTuExportMapper.selectPage();
}