TASK:时间
This commit is contained in:
@@ -7,6 +7,7 @@ import com.mixi.model.dto.QueryMiTuExportPageDTO;
|
|||||||
import com.mixi.model.dto.QueryStorePageDTO;
|
import com.mixi.model.dto.QueryStorePageDTO;
|
||||||
import com.mixi.model.dto.StoreAddOrEditDTO;
|
import com.mixi.model.dto.StoreAddOrEditDTO;
|
||||||
import com.mixi.model.dto.StoreDeleteDTO;
|
import com.mixi.model.dto.StoreDeleteDTO;
|
||||||
|
import com.mixi.model.vo.MiTuExportVO;
|
||||||
import com.mixi.model.vo.StoreVO;
|
import com.mixi.model.vo.StoreVO;
|
||||||
import com.mixi.service.MiTuExportService;
|
import com.mixi.service.MiTuExportService;
|
||||||
import com.mixi.service.StoreService;
|
import com.mixi.service.StoreService;
|
||||||
@@ -37,7 +38,7 @@ public class MiTuExportController {
|
|||||||
|
|
||||||
@ApiOperation(value = "MiTu报表查询")
|
@ApiOperation(value = "MiTu报表查询")
|
||||||
@PostMapping("/miTuExportPage")
|
@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));
|
return Response.success(miTuExportService.queryMiTuExportPage(query));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
29
src/main/java/com/mixi/model/vo/MiTuExportVO.java
Normal file
29
src/main/java/com/mixi/model/vo/MiTuExportVO.java
Normal 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;
|
||||||
|
}
|
||||||
@@ -4,6 +4,7 @@ import com.mixi.common.response.PageBaseResponse;
|
|||||||
import com.mixi.common.response.Response;
|
import com.mixi.common.response.Response;
|
||||||
import com.mixi.mapper.entity.MiTuExport;
|
import com.mixi.mapper.entity.MiTuExport;
|
||||||
import com.mixi.model.dto.QueryMiTuExportPageDTO;
|
import com.mixi.model.dto.QueryMiTuExportPageDTO;
|
||||||
|
import com.mixi.model.vo.MiTuExportVO;
|
||||||
import io.minio.errors.MinioException;
|
import io.minio.errors.MinioException;
|
||||||
import org.springframework.core.io.InputStreamResource;
|
import org.springframework.core.io.InputStreamResource;
|
||||||
|
|
||||||
@@ -21,7 +22,7 @@ import java.io.IOException;
|
|||||||
public interface MiTuExportService {
|
public interface MiTuExportService {
|
||||||
|
|
||||||
|
|
||||||
PageBaseResponse<MiTuExport> queryMiTuExportPage(QueryMiTuExportPageDTO query);
|
PageBaseResponse<MiTuExportVO> queryMiTuExportPage(QueryMiTuExportPageDTO query);
|
||||||
|
|
||||||
void exportMiTuReport(Long id, HttpServletResponse response) throws IOException, MinioException;
|
void exportMiTuReport(Long id, HttpServletResponse response) throws IOException, MinioException;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,10 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|||||||
import com.mixi.common.config.exception.BusinessException;
|
import com.mixi.common.config.exception.BusinessException;
|
||||||
import com.mixi.common.response.PageBaseResponse;
|
import com.mixi.common.response.PageBaseResponse;
|
||||||
import com.mixi.common.response.Response;
|
import com.mixi.common.response.Response;
|
||||||
|
import com.mixi.common.utils.CopyUtil;
|
||||||
import com.mixi.common.utils.MinioUtil;
|
import com.mixi.common.utils.MinioUtil;
|
||||||
import com.mixi.mapper.MiTuExportMapper;
|
import com.mixi.mapper.MiTuExportMapper;
|
||||||
import com.mixi.mapper.entity.MiTuExport;
|
import com.mixi.mapper.entity.MiTuExport;
|
||||||
import com.mixi.model.dto.QueryMiTuExportPageDTO;
|
import com.mixi.model.dto.QueryMiTuExportPageDTO;
|
||||||
|
import com.mixi.model.vo.MiTuExportVO;
|
||||||
import com.mixi.service.MiTuExportService;
|
import com.mixi.service.MiTuExportService;
|
||||||
import io.minio.errors.MinioException;
|
import io.minio.errors.MinioException;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -25,6 +27,8 @@ import javax.servlet.http.HttpServletRequest;
|
|||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.net.URLEncoder;
|
import java.net.URLEncoder;
|
||||||
|
import java.time.format.DateTimeFormatter;
|
||||||
|
import java.util.function.Function;
|
||||||
|
|
||||||
//import com.ai.da.common.utils.SendSmsUtil;
|
//import com.ai.da.common.utils.SendSmsUtil;
|
||||||
|
|
||||||
@@ -45,7 +49,7 @@ public class MiTuExportServiceImpl implements MiTuExportService {
|
|||||||
private MinioUtil minioUtil;
|
private MinioUtil minioUtil;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PageBaseResponse<MiTuExport> queryMiTuExportPage(QueryMiTuExportPageDTO query) {
|
public PageBaseResponse<MiTuExportVO> queryMiTuExportPage(QueryMiTuExportPageDTO query) {
|
||||||
// 分页数据
|
// 分页数据
|
||||||
QueryWrapper<MiTuExport> qw = new QueryWrapper<>();
|
QueryWrapper<MiTuExport> qw = new QueryWrapper<>();
|
||||||
qw.lambda().eq(MiTuExport::getStatus, 1);
|
qw.lambda().eq(MiTuExport::getStatus, 1);
|
||||||
@@ -69,7 +73,15 @@ public class MiTuExportServiceImpl implements MiTuExportService {
|
|||||||
// result.setCreateDate(store.getCreateDate().getTime());
|
// result.setCreateDate(store.getCreateDate().getTime());
|
||||||
// return result;
|
// 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();
|
// return miTuExportMapper.selectPage();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user