فهرست منبع

Merge branch 'rmd-dev' of http://47.108.150.237:10000/allen/pdaaphm into rmd-dev

Rmengdi 8 ماه پیش
والد
کامیت
830ac5bdd2
1فایلهای تغییر یافته به همراه4 افزوده شده و 1 حذف شده
  1. 4 1
      pdaaphm-admin/src/main/java/com/pdaaphm/system/service/impl/TDataProcessServiceImpl.java

+ 4 - 1
pdaaphm-admin/src/main/java/com/pdaaphm/system/service/impl/TDataProcessServiceImpl.java

@@ -176,7 +176,7 @@ public class TDataProcessServiceImpl implements ITDataProcessService {
             Data newData = new Data();
             String resultPath = resultMap.get("resultPath");
             String resultImagePath = resultMap.get("resultImagePath");
-//            newData.setDataPath(resultPath.replaceFirst(PadaphmConfig.getProfile(),"/profile"));
+            newData.setDataPath(resultPath.replaceFirst(PadaphmConfig.getProfile(),"/profile"));
             if (checkFileExist(resultImagePath)) {
                 newData.setImagePath(resultImagePath.replaceFirst(PadaphmConfig.getProfile(),"/profile"));
             }
@@ -189,6 +189,7 @@ public class TDataProcessServiceImpl implements ITDataProcessService {
             dataProcess.setEndTime(new Date());
             this.updateTDataProcess(dataProcess);
         } else {
+            logger.error("dataProcess error,id:{},error:{}",dataProcess.getId(),resultMap.get("errorMsg"));
             // 失败场景
             dataProcess.setProcessStatus("4"); // 失败
             dataProcess.setEndTime(new Date());
@@ -201,7 +202,9 @@ public class TDataProcessServiceImpl implements ITDataProcessService {
         Map<String, String> result = new HashMap<>(2);
         String algUrl = algConfig.getAlgUrl();
         String dataPath = data.getDataPath();
+        logger.info("doRunDataProcess.dataPath: {}", dataPath);
         String fileName = FileUtils.getNameNotSuffix(dataPath);
+        logger.info("doRunDataProcess.fileName: {}", fileName);
         String originalFileName = fileName.split("_")[0];
         // 文件名 原始文件名_类型_时间戳
         String resultPath = StringUtils.format("{}/{}/{}_{}_{}.csv", PadaphmConfig.getUploadPath(), DateUtils.datePath(), originalFileName, bizAlgType, Seq.getId(Seq.uploadSeqType));