等公证书生成完成再上传区块连

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/OrderCochainServiceImpl.java

@@ -5,21 +5,17 @@ import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import javax.annotation.PostConstruct;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ZipUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -66,7 +62,7 @@ public class OrderCochainServiceImpl extends AbstractServiceImpl<IOrderCochainDa
 
 	private static String UPLOAD_FILE_PATH;
 
-//	@PostConstruct
+	@PostConstruct
 	public void init() {
 		new Thread(new Runnable() {
 
@@ -86,6 +82,9 @@ public class OrderCochainServiceImpl extends AbstractServiceImpl<IOrderCochainDa
 	}
 
 	private void initCochainPath(String path) {
+		if (StringUtils.isNotBlank(UPLOAD_FILE_PATH)) {
+			return;
+		}
 		// 得到文件的临时目录
 		String applicationDir = FileUploadUtil.getApplicationTempDir();
 		String downloadPath = applicationDir + "/" + path + "/";
@@ -104,6 +103,15 @@ public class OrderCochainServiceImpl extends AbstractServiceImpl<IOrderCochainDa
 		for (OrderCochainEntity cochainEntity : cochainEntitys) {
 			// 业务编码
 			String businessNo = cochainEntity.getBusinessNo();
+			// 这里必须先判断公证书已经生成然后，再上传区块连
+			QueryWrapper<OrderFileEntity> orderFileWrapper = new QueryWrapper<>();
+			orderFileWrapper.eq("business_no", businessNo);
+			orderFileWrapper.eq("code", 10);
+			// 这里处理，如果没有盖章的,就做任何处理
+			OrderFileEntity notarySigned = orderFileMapper.selectOne(orderFileWrapper);
+			if (notarySigned == null || StringUtils.isEmpty(notarySigned.getSignedPdfUrl())) {
+				continue;
+			}
 			initCochainPath(businessNo);
 			List<File> zipList = new ArrayList<>();
 			QueryWrapper<ContractOrderEntity> orderqw = new QueryWrapper<>();
@@ -171,7 +179,6 @@ public class OrderCochainServiceImpl extends AbstractServiceImpl<IOrderCochainDa
 					} else if (!repeat.equals(key)) {
 						downloadByPath(orderFile.getSignedPdfUrl(), map, orderFile.getFileName(), zipList);
 					}
-
 				}
 				// 处理视频
 				QueryWrapper<OrderRoomIdEntity> queryWrapper = new QueryWrapper<>();