From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java | 87 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 81 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java
index 9c5cdd4..07154a0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java
@@ -1,8 +1,14 @@
package com.ruoyi.web.controller.api;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.WebUtils;
+import com.ruoyi.system.importExcel.TBankFlowImportExcel;
import com.ruoyi.system.model.TBankFlow;
import com.ruoyi.system.query.TBankFlowQuery;
import com.ruoyi.system.service.TBankFlowService;
@@ -10,10 +16,16 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* <p>
@@ -28,10 +40,11 @@
public class TBankFlowController {
@Autowired
private TBankFlowService flowService;
+
/**
* 获取流水列表
*/
- @PreAuthorize("@ss.hasPermi('system:bankFlow:list')")
+ @PreAuthorize("@ss.hasPermi('flow:bank:detail:list')")
@ApiOperation(value = "获取银行流水列表")
@PostMapping("/list")
public R<PageInfo<TBankFlow>> list(@RequestBody TBankFlowQuery query) {
@@ -40,8 +53,70 @@
@ApiOperation(value = "根据支付方式统计流水金额")
@PostMapping("/getPaymentStats")
- public R<TBankFlowStatisticsVo> getPaymentStats(@RequestBody TBankFlowQuery query){
+ public R<TBankFlowStatisticsVo> getPaymentStats(@RequestBody TBankFlowQuery query) {
return R.ok(flowService.getPaymentStats(query));
}
+
+ @PostMapping("importBankFlow")
+ public void importElectronic(@RequestBody MultipartFile file) {
+ try (
+ InputStream is = file.getInputStream();
+ ) {
+ List<TBankFlowImportExcel> failList = new Vector<>();
+ EasyExcel.read(is, TBankFlowImportExcel.class, new AnalysisEventListener<TBankFlowImportExcel>() {
+ private final List<TBankFlowImportExcel> list = new ArrayList<>();
+ final AtomicInteger all = new AtomicInteger();
+
+ @Override
+ public void invoke(TBankFlowImportExcel data, AnalysisContext context) {
+ all.addAndGet(1);
+ boolean isok = data.validate();
+ if (!isok) {
+ failList.add(data);
+ return;
+ }
+ list.add(data);
+ int size = list.size();
+ if (size >= 100) {
+ flowService.saveImportBatch(list, failList);
+ list.clear();
+ }
+ }
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ int size = list.size();
+ if (size > 0) {
+ flowService.saveImportBatch(list, failList);
+ }
+ }
+ }).sheet().doRead();
+ // 导出导入结果
+ HttpServletResponse response = WebUtils.response();
+ response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+ response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
+ response.setHeader("Pragma", "no-cache");
+ if (failList.size() > 0) {
+ EasyExcel.write(response.getOutputStream(), TBankFlowImportExcel.class).sheet("Sheet1").doWrite(failList);
+ } else {
+ TBankFlowImportExcel result = new TBankFlowImportExcel();
+ result.setResult("全部成功");
+ failList.add(result);
+ EasyExcel.write(response.getOutputStream(), TBankFlowImportExcel.class).sheet("Sheet1").doWrite(failList);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ System.err.println("银行流水返回结果导出失败");
+ }
+ }
+
+ @GetMapping("getByBankSerialNumber")
+ public R<List<TBankFlow>> searchByBankSerialNumber(@RequestParam String bankSerialNumber){
+ List<TBankFlow> tBankFlows = flowService.searchByBankSerialNumber(bankSerialNumber);
+ return R.ok(tBankFlows);
+ }
+
+
}
+
+
--
Gitblit v1.7.1