交易凭证

src/main/java/cn/quantgroup/customer/rest/TransactionReceiptRecordRest.java

@@ -8,11 +8,14 @@ import cn.quantgroup.customer.util.FileToZip;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Maps;
+import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -53,6 +56,7 @@ public class TransactionReceiptRecordRest {
      */
     @RequestMapping("/orderQuery/importTransactionReceiptRecord")
     @ResponseBody
+    @Synchronized
     public JsonResult importTransactionReceiptRecord(@RequestParam("file")MultipartFile file) {
         try{
             return transactionReceiptRecordService.importTransactionReceiptRecord(file);
@@ -141,9 +145,9 @@ public class TransactionReceiptRecordRest {
     //导出压缩包
     @RequestMapping("/orderQuery/exportTransactionZipFile")
     @ResponseBody
-    public JsonResult exportTransactionZipFile() {
+    public JsonResult exportTransactionZipFile(HttpServletRequest request) {
         try{
-            return transactionReceiptRecordService.exportZipFile();
+            return transactionReceiptRecordService.exportZipFile(request);
         }catch(Exception e){
             e.printStackTrace();
             return JsonResult.buildErrorStateResult("导出文件出现错误");

src/main/java/cn/quantgroup/customer/rest/param/transactionreceipt/TransactionReceiptRecordQuery.java

@@ -37,6 +37,10 @@ public class TransactionReceiptRecordQuery {
 
     //更新成功list
     private List<String> successList;
+    //签章成功数量
+    private Integer successCount;
     //更新失败list
     private List<String> failList;
+    //签章失败数量
+    private Integer failCount;
 }

src/main/java/cn/quantgroup/customer/service/ITransactionReceiptRecordService.java

@@ -5,7 +5,7 @@ import cn.quantgroup.customer.rest.vo.JsonResult;
 import cn.quantgroup.customer.rest.vo.transaction.TransactionReceiptVO;
 import org.springframework.data.domain.Page;
 import org.springframework.web.multipart.MultipartFile;
-
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.List;
 
@@ -15,7 +15,7 @@ public interface ITransactionReceiptRecordService {
 
     JsonResult importTransactionReceiptRecord(MultipartFile file) throws IOException;
 
-    JsonResult  exportZipFile() throws Exception;
+    JsonResult  exportZipFile(HttpServletRequest request) throws Exception;
 
     JsonResult  checkCanExport();
 

src/main/java/cn/quantgroup/customer/util/ITextPDFUtil.java

@@ -573,15 +573,15 @@ public class ITextPDFUtil {
 
     public static void main(String[] args) {
         List<String>list =new ArrayList();
-        list.add("D:\\交易凭证0222\\1王五");
-        list.add("D:\\交易凭证0222\\1王二");
-        list.add("D:\\交易凭证0222\\2里三");
-        list.add("D:\\交易凭证0222\\2里斯");
-        list.add("D:\\交易凭证0222\\3吴就");
-        list.add("D:\\交易凭证0222\\3吴还");
+        list.add("D:/交易凭证0226/1王五");
+        list.add("D:/交易凭证0226/1王二");
+        list.add("D:/交易凭证0226/2里三");
+        list.add("D:/交易凭证0226/2里斯");
+        list.add("D:/交易凭证0226/3吴就");
+        list.add("D:/交易凭证0226/3吴还");
         for(String str : list){
             FileToZip.mkdir(str);
-            generatePDF(str+"\\"+20220222+".pdf");
+            generatePDF(str+"/"+20220226+".pdf");
         };
         //String str = "D:\\交易凭证0219\\1王五\\11.pdf";
         //generatePDF(str);