publish 2.0.0.rc46

springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CoreLogProcess.java

@@ -48,8 +48,8 @@ public class CoreLogProcess extends DaoBase {
     /**
      * 失败的文件
      */
-    @TableField(value = "fail_file")
-    private String failFile;
+    @TableField(value = "result_file")
+    private String resultFile;
 
     /**
      * 进度
@@ -174,19 +174,19 @@ public class CoreLogProcess extends DaoBase {
     /**
      * 获取失败的文件
      *
-     * @return fail_file - 失败的文件
+     * @return result_file - 失败的文件
      */
-    public String getFailFile() {
-        return failFile;
+    public String getResultFile() {
+        return resultFile;
     }
 
     /**
      * 设置失败的文件
      *
-     * @param failFile 失败的文件
+     * @param resultFile 失败的文件
      */
-    public void setFailFile(String failFile) {
-        this.failFile = failFile;
+    public void setResultFile(String resultFile) {
+        this.resultFile = resultFile;
     }
 
     /**

springboot-web/src/main/java/com/tiesheng/web/pojos/vo/ProcessDetailVo.java

@@ -5,7 +5,7 @@ package com.tiesheng.web.pojos.vo;
  */
 public class ProcessDetailVo {
 
-    private String title;
+    private String id;
 
     private Integer total;
 
@@ -15,13 +15,17 @@ public class ProcessDetailVo {
 
     private Integer process;
 
-    private String type;
-
     private Integer status;
 
-    private String failFile;
+    private String resultFile;
 
-    private String error;
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
 
     public Integer getStatus() {
         return status;
@@ -31,14 +35,6 @@ public class ProcessDetailVo {
         this.status = status;
     }
 
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
     public Integer getTotal() {
         return total;
     }
@@ -63,20 +59,12 @@ public class ProcessDetailVo {
         this.failNum = failNum;
     }
 
-    public String getType() {
-        return type;
+    public String getResultFile() {
+        return resultFile;
     }
 
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getFailFile() {
-        return failFile;
-    }
-
-    public void setFailFile(String failFile) {
-        this.failFile = failFile;
+    public void setResultFile(String resultFile) {
+        this.resultFile = resultFile;
     }
 
     public Integer getProcess() {
@@ -87,11 +75,4 @@ public class ProcessDetailVo {
         this.process = process;
     }
 
-    public String getError() {
-        return error;
-    }
-
-    public void setError(String error) {
-        this.error = error;
-    }
 }

springboot-web/src/main/java/com/tiesheng/web/service/CoreLogService.java

@@ -92,7 +92,7 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
             });
 
             // 执行结束
-            coreLogProcess.setFailFile(consumer.getFailFile());
+            coreLogProcess.setResultFile(consumer.getResultFile());
             coreLogProcess.setStatus(1);
             coreLogProcessMapper.updateById(coreLogProcess);
         });

springboot-web/src/main/java/com/tiesheng/web/service/imex/DefaultImexHandler.java

@@ -38,7 +38,7 @@ public class DefaultImexHandler implements TsImportHandler<String>, TsExportHand
     }
 
     @Override
-    public String getFailFile() {
+    public String getResultFile() {
         return "";
     }
 }

springboot-web/src/main/java/com/tiesheng/web/util/ProcessImportConsumer.java

@@ -15,10 +15,10 @@ public interface ProcessImportConsumer<T> {
 
 
     /**
-     * 获取失败的文件路径
+     * 获取导入结果文件
      *
      * @return
      */
-    String getFailFile();
+    String getResultFile();
 
 }