修改pdf合并

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/UserAXQInfoServiceImpl.java

@@ -168,58 +168,34 @@ public class UserAXQInfoServiceImpl implements UserAXQInfoService {
 	 * @param businessNo
 	 * @throws Exception
 	 */
-//	private void signContract(List<UploadSignInfoVO> signInfoList, String businessNo) throws Exception {
-//		String[] codes = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
-//		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListWithCodes(businessNo, codes);
-//		// 取出所有的二进制流
-//		List<InputStream> list = new ArrayList<>();
-//		String fileName = "";
-//		for (OrderFileEntity orderFile : orderFileList) {
-//			if(StringUtils.isNotBlank(fileName)) {
-//				fileName = FileUploadUtil.getFileName(orderFile.getPdfUrl());
-//			}
-//			InputStream inputStream = FileUploadUtil.getInputStream(orderFile.getPdfUrl());
-//			list.add(inputStream);
-//		}
-//		byte[] b = PdfUtils.mergePdf(list);
-//		//将所有需要签名的pdf进行合并
-//		InputStream input = new ByteArrayInputStream(b);
-//		String axqContractNo = CFCACertUtil.uploadMultiSignContract(signInfoList, null, null, input, fileName);
-//		String path = businessNo + "/signed-doc/";
-//		String filePath = CFCACertUtil.download(path, axqContractNo);
-//		for (OrderFileEntity orderFile : orderFileList) {
-//			OrderFileEntity updateOrderFile = new OrderFileEntity();
-//			updateOrderFile.setId(orderFile.getId());
-//			updateOrderFile.setUpdateTime(new Date());
-//			updateOrderFile.setUpdaterId(-1l);
-//			try {
-//				updateOrderFile.setAxqContractNo(axqContractNo);
-//				updateOrderFile.setAxqSignedTime(new Date());
-//				//设置签名的pdf
-//				updateOrderFile.setSignedPdfUrl(filePath);
-//			} catch (Exception e) {
-//				e.printStackTrace();
-//			}
-//			orderFileMapper.updateById(updateOrderFile);
-//		}
-//	}
-	private void signContract(List<UploadSignInfoVO> signInfoList, String businessNo) {
-		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListWithCodes(businessNo, "1,2,3,4,5,6,7,8,9".split(","));
-		CFCACertUtil.proxySwitchOn = "dev".equals(systemEnv);
+	private void signContract(List<UploadSignInfoVO> signInfoList, String businessNo) throws Exception {
+		String[] codes = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListWithCodes(businessNo, codes);
+		// 取出所有的二进制流
+		List<InputStream> list = new ArrayList<>();
+		String fileName = "";
+		for (OrderFileEntity orderFile : orderFileList) {
+			if(StringUtils.isNotBlank(fileName)) {
+				fileName = FileUploadUtil.getFileName(orderFile.getPdfUrl());
+			}
+			InputStream inputStream = FileUploadUtil.getInputStream(orderFile.getPdfUrl());
+			list.add(inputStream);
+		}
+		byte[] b = PdfUtils.mergePdf(list);
+		//将所有需要签名的pdf进行合并
+		InputStream input = new ByteArrayInputStream(b);
+		String axqContractNo = CFCACertUtil.uploadMultiSignContract(signInfoList, null, null, input, fileName);
+		String path = businessNo + "/signed-doc/";
+		String filePath = CFCACertUtil.download(path, axqContractNo);
 		for (OrderFileEntity orderFile : orderFileList) {
-			String path = businessNo + "/signed-doc-" + orderFile.getId() + "/";
 			OrderFileEntity updateOrderFile = new OrderFileEntity();
 			updateOrderFile.setId(orderFile.getId());
 			updateOrderFile.setUpdateTime(new Date());
 			updateOrderFile.setUpdaterId(-1l);
 			try {
-				InputStream inputStream = FileUploadUtil.getInputStream(orderFile.getPdfUrl());
-				String fileName = FileUploadUtil.getFileName(orderFile.getPdfUrl());
-				String axqContractNo = CFCACertUtil.uploadMultiSignContract(signInfoList, null, null, inputStream, fileName);
 				updateOrderFile.setAxqContractNo(axqContractNo);
 				updateOrderFile.setAxqSignedTime(new Date());
-				//
-				String filePath = CFCACertUtil.download(path, axqContractNo);
+				//设置签名的pdf
 				updateOrderFile.setSignedPdfUrl(filePath);
 			} catch (Exception e) {
 				e.printStackTrace();
@@ -227,6 +203,30 @@ public class UserAXQInfoServiceImpl implements UserAXQInfoService {
 			orderFileMapper.updateById(updateOrderFile);
 		}
 	}
+//	private void signContract(List<UploadSignInfoVO> signInfoList, String businessNo) {
+//		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListWithCodes(businessNo, "1,2,3,4,5,6,7,8,9".split(","));
+//		CFCACertUtil.proxySwitchOn = "dev".equals(systemEnv);
+//		for (OrderFileEntity orderFile : orderFileList) {
+//			String path = businessNo + "/signed-doc-" + orderFile.getId() + "/";
+//			OrderFileEntity updateOrderFile = new OrderFileEntity();
+//			updateOrderFile.setId(orderFile.getId());
+//			updateOrderFile.setUpdateTime(new Date());
+//			updateOrderFile.setUpdaterId(-1l);
+//			try {
+//				InputStream inputStream = FileUploadUtil.getInputStream(orderFile.getPdfUrl());
+//				String fileName = FileUploadUtil.getFileName(orderFile.getPdfUrl());
+//				String axqContractNo = CFCACertUtil.uploadMultiSignContract(signInfoList, null, null, inputStream, fileName);
+//				updateOrderFile.setAxqContractNo(axqContractNo);
+//				updateOrderFile.setAxqSignedTime(new Date());
+//				//
+//				String filePath = CFCACertUtil.download(path, axqContractNo);
+//				updateOrderFile.setSignedPdfUrl(filePath);
+//			} catch (Exception e) {
+//				e.printStackTrace();
+//			}
+//			orderFileMapper.updateById(updateOrderFile);
+//		}
+//	}
 	@Override
 	public ResponseDTO<?> getAuthStatus(String idCard) {
 		QueryWrapper<UserAXQInfoEntity> userQw = new QueryWrapper<>();