diff --git a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java index c49627ce..78c9ff51 100644 --- a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java +++ b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java @@ -211,9 +211,8 @@ public class ConvenientInquiryController { } @ApiOperation("下载交易记录") - @GetMapping("/queryTransaction/download") - public void exportTransactionRecords(@RequestParam String params, HttpServletResponse response){ - convenientInquiryService.exportTransactionRecords(params, response); -// return Response.success(); + @PostMapping("/queryTransaction/download") + public Response exportTransactionRecords(@Valid @RequestBody QueryPaymentInfoDTO queryPaymentInfoDTO, HttpServletResponse response){ + return Response.success(convenientInquiryService.exportTransactionRecords(queryPaymentInfoDTO, response)); } } diff --git a/src/main/java/com/ai/da/service/ConvenientInquiryService.java b/src/main/java/com/ai/da/service/ConvenientInquiryService.java index d7e58914..fa279d0d 100644 --- a/src/main/java/com/ai/da/service/ConvenientInquiryService.java +++ b/src/main/java/com/ai/da/service/ConvenientInquiryService.java @@ -52,5 +52,5 @@ public interface ConvenientInquiryService extends IService { Map> getCities(); - void exportTransactionRecords(String params, HttpServletResponse response); + String exportTransactionRecords(QueryPaymentInfoDTO queryPaymentInfoDTO, HttpServletResponse response); } diff --git a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java index 443abcd0..fb24c7ef 100644 --- a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java @@ -7,6 +7,7 @@ import com.ai.da.common.enums.CreditsEventsEnum; import com.ai.da.common.response.PageBaseResponse; import com.ai.da.common.utils.CopyUtil; import com.ai.da.common.utils.DateUtil; +import com.ai.da.common.utils.MinioUtil; import com.ai.da.mapper.primary.*; import com.ai.da.mapper.primary.entity.Account; import com.ai.da.mapper.primary.entity.Questionnaire; @@ -17,15 +18,21 @@ import com.ai.da.model.enums.Language; import com.ai.da.model.vo.*; import com.ai.da.service.*; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mysql.cj.util.StringUtils; +import io.minio.GetPresignedObjectUrlArgs; +import io.minio.MinioClient; +import io.minio.PutObjectArgs; +import io.minio.errors.*; +import io.minio.http.Method; import io.netty.util.internal.StringUtil; import lombok.extern.slf4j.Slf4j; import org.apache.poi.xssf.usermodel.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -34,7 +41,8 @@ import javax.servlet.http.HttpServletResponse; import java.io.*; import java.math.BigDecimal; import java.math.RoundingMode; -import java.net.URLEncoder; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; @@ -63,6 +71,9 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl getTrial(QueryUserConditionsVO queryUserConditionsVO) { log.info("getTrial parameter : {},page:{}, size:{}", queryUserConditionsVO, queryUserConditionsVO.getPage(), queryUserConditionsVO.getSize()); /* 添加按条件查询试用用户 */ @@ -630,8 +641,8 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl paymentInfoVOS, HttpServletResponse response) { + @Resource + private MinioClient minioClient; + + public String excelExport(List paymentInfoVOS, HttpServletResponse response) throws IOException { if (paymentInfoVOS == null || paymentInfoVOS.isEmpty()) { log.info("无数据,直接返回,不生成空文件"); - return; + return null; } // 文件名称 @@ -729,8 +747,8 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl i times = 1; } } - // Slogan 参数校验 + // Slogan 参数校验 slogan目前只能开一个接口。所以只有生产环境上能使用 if (generateThroughImageTextDTO.getLevel2Type().equals(CollectionLevel2TypeEnum.SLOGAN.getRealName())) { if (StringUtil.isNullOrEmpty(generateThroughImageTextDTO.getSloganBase64())) { log.error("Printboard-Slogan模式下,slogan image为空");