打印日志

eladmin-system/src/main/java/me/zhengjie/appapi/util/FileUploadUtil.java

@@ -338,7 +338,6 @@ public class FileUploadUtil {
 			// 这里的inputSteam已经关闭了
 			byte[] b = IoUtil.readBytes(inputSteam);
 			// 将b转成inputstream
-
 			bis = IoUtil.toStream(b);
 			FileHandleVo fileHandlevo = new FileHandleVo();
 			fileHandlevo.setFilePath(filePath);

eladmin-system/src/main/java/me/zhengjie/base/util/CFCACertUtil.java

@@ -12,6 +12,7 @@ import cfca.trustsign.converter.JsonObjectMapper;
 import cfca.trustsign.util.PdfUtil;
 import cfca.trustsign.util.SecurityUtil;
 import cfca.trustsign.util.TimeUtil;
+import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.appapi.util.FileUploadUtil;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -21,7 +22,7 @@ import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-
+@Slf4j
 public class CFCACertUtil {
     private static final int PROXY_SIGN_ON = 1;
     private static final String PROJECT_CODE = "004";
@@ -343,8 +344,11 @@ public class CFCACertUtil {
     	   contentType = "application/ofd";
     	   suffix=".ofd";
        }
-       FileUploadUtil.uploadFile(filePath, contentType, fileBtye);
        String fullFilePath = filePath + contractNo + suffix;
+       //上传文件路径
+       log.info("上传文件的目录："+ fullFilePath);
+       FileUploadUtil.uploadFile(fullFilePath, contentType, fileBtye);
+     
         return fullFilePath;
     }
 

eladmin-system/src/main/java/me/zhengjie/modules/system/rest/TencentPushController.java

@@ -20,6 +20,7 @@ import me.zhengjie.appapi.entity.OrderRoomIdEntity;
 import me.zhengjie.appapi.entity.PushDataEntity;
 import me.zhengjie.appapi.service.OrderRoomIdService;
 import me.zhengjie.appapi.service.TencentPushService;
+import me.zhengjie.appapi.util.StatusEnum.StepStatusEnum;
 import me.zhengjie.base.util.DownloadUtils;
 
 @Controller
@@ -59,7 +60,8 @@ public class TencentPushController {
 			// 这里通过订单查询相关信息
 			if (orderRoomId != null && orderRoomId.size() > 0) {
 				OrderRoomIdEntity orderRoomIdEntity = orderRoomId.get(0);
-				String filePath = orderRoomIdEntity.getBusinessNo() + "/" + orderRoomIdEntity.getOrderId();
+				String orderType = StepStatusEnum.getType(orderRoomIdEntity.getOrderId());
+				String filePath = orderRoomIdEntity.getBusinessNo() + "/" + orderType;
 				String fileName = filePath + "/PC" + fileId + ".mp4";
 				DownloadUtils.downloadFile(json.get("video_url"), fileName);
 				OrderRoomIdEntity update = new OrderRoomIdEntity();
@@ -108,7 +110,8 @@ public class TencentPushController {
 							String roomId = param.get("roomId");
 							OrderRoomIdEntity orderRoomId = new OrderRoomIdEntity();
 							orderRoomId.setAppFileId(fileId);
-							String filePath = orderRoomId.getBusinessNo() + "/" + orderRoomId.getOrderId();
+							String orderType = StepStatusEnum.getType(orderRoomId.getOrderId());
+							String filePath = orderRoomId.getBusinessNo() + "/" + orderType;
 							String fileName = filePath + "/APP" + fileId + ".mp4";
 							DownloadUtils.downloadFile(videoUrl.get("Url").toString(), fileName);
 							orderRoomId.setAppVideoUrl(fileName);
@@ -150,8 +153,9 @@ public class TencentPushController {
 
 				if (orderRoomId != null && orderRoomId.size() > 0) {
 					OrderRoomIdEntity orderRoomIdEntity = orderRoomId.get(0);
-					String filePath = orderRoomIdEntity.getBusinessNo() + "/" + orderRoomIdEntity.getOrderId();
-					String fileName =  filePath + "/APP" + fileId + ".mp4";
+					String orderType = StepStatusEnum.getType(orderRoomIdEntity.getOrderId());
+					String filePath = orderRoomIdEntity.getBusinessNo() + "/" + orderType;
+					String fileName = filePath + "/APP" + fileId + ".mp4";
 					DownloadUtils.downloadFile(path, fileName);
 					OrderRoomIdEntity update = new OrderRoomIdEntity();
 					update.setPcFileId(fileId);