1.console程序FileUtil增加uploadfile目录下按文件名称查找存在

2.console增加文件来源枚举类，修改页面显示
3.调整console健康检查方法，去掉语句 from dual
4.调整spare2程序FilesUtil查找fileupload目录下文件

ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/constant/enums/FileOriginEnum.java

@@ -0,0 +1,15 @@
+package com.jiayue.ipfcst.common.data.constant.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum FileOriginEnum {
+
+    E1(1,"console"),
+    E2(2,"spare2"),
+    E3(3,"manual");
+    private final Integer code;
+    private final String message;
+}

ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/entity/ManualUploadLog.java

@@ -1,6 +1,7 @@
 package com.jiayue.ipfcst.common.data.entity;
 
 import com.jiayue.ipfcst.common.data.abst.AbstractBaseEntity;
+import com.jiayue.ipfcst.common.data.constant.enums.FileOriginEnum;
 import com.jiayue.ipfcst.common.data.constant.enums.FileTypeEnum;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -75,6 +76,12 @@ public class ManualUploadLog extends AbstractBaseEntity {
     @Enumerated(EnumType.STRING)
     private FileTypeEnum fileTypeEnum;
 
+    /**
+     * 文件来源
+     */
+    @Column
+    @Enumerated(EnumType.STRING)
+    private FileOriginEnum fileOriginEnum = FileOriginEnum.E3;
 
     /**
      * 上报设备ID(指定气象站或测风塔)

ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/entity/UploadFileLog.java

@@ -1,6 +1,7 @@
 package com.jiayue.ipfcst.common.data.entity;
 
 import com.jiayue.ipfcst.common.data.abst.AbstractBaseEntity;
+import com.jiayue.ipfcst.common.data.constant.enums.FileOriginEnum;
 import com.jiayue.ipfcst.common.data.constant.enums.FileStatusEnum;
 import com.jiayue.ipfcst.common.data.constant.enums.FileTypeEnum;
 import com.jiayue.ipfcst.common.data.constant.enums.UploadProtocolEnum;
@@ -20,7 +21,7 @@ import javax.persistence.*;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @Entity
-@Table(indexes = {@Index(columnList = "createTime",name="ufl_ct_idx")})
+@Table(indexes = {@Index(columnList = "createTime", name = "ufl_ct_idx")})
 public class UploadFileLog extends AbstractBaseEntity {
 
     /**
@@ -67,6 +68,13 @@ public class UploadFileLog extends AbstractBaseEntity {
     private FileTypeEnum fileTypeEnum;
 
     /**
+     * 文件来源
+     */
+    @Column
+    @Enumerated(EnumType.STRING)
+    private FileOriginEnum fileOriginEnum = FileOriginEnum.E1;
+
+    /**
      * 文件状态
      */
     @Column

ipfcst-console/src/main/frontend/views/dashboard/index.vue

@@ -1142,12 +1142,12 @@ export default {
         },
                 check7() {
                   this.visible2 = true
-                  this.lsofData = ['Druid状态', '------------------']
+                  this.lsofData = ['数据库查询状态', '------------------']
                   this.$axios.get('/consoleCheckUp/dshealth').then(res => {
-                    if (res.data != null) {
-                      for (let j = 0; j < res.data.length; j++) {
-                        this.lsofData.push(res.data[j])
-                      }
+                    if (0 ==  res.code) {
+                      this.lsofData.push("成功")
+                    } else {
+                      this.lsofData.push("失败")
                     }
                   })
                 },

ipfcst-console/src/main/frontend/views/uploadFile/queryUploadFile/index.vue

@@ -63,6 +63,7 @@
           <vxe-table-column field="uploadObjectNo" title="上报对象编号" width="6%" />
           <vxe-table-column field="fileName" title="上报文件名称" width="18%" />
           <vxe-table-column field="fileTypeEnum" title="上报文件类型" :formatter="formatefileType" width="8%"/>
+          <vxe-table-column field="FileOriginEnum" title="来源" :formatter="formatefileType" width="8%"/>
           <vxe-table-column :formatter="dateFormat" field="createTime" title="文件生成时间" width="150px" />
           <vxe-table-column field="backupA" title="文件补报时间" width="150px" />
           <vxe-table-column

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/service/ConsoleCheckUpService.java

@@ -41,7 +41,7 @@ public class ConsoleCheckUpService {
       Class.forName(driverClassName);
       connection = DriverManager.getConnection(url, username, password);
       Statement statement = connection.createStatement();
-      String sql = SqlUtil.formatSql("SELECT 1 FROM DUAL");
+      String sql = SqlUtil.formatSql("SELECT 1 ");
       result = statement.execute(sql);
     } catch (Exception ex) {
       log.error(ex.getLocalizedMessage());

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/util/FileUtil.java

@@ -349,6 +349,13 @@ public class FileUtil {
   }
 
   // 可以在这里添加其他实用方法
-
+  /**
+   * 检查uploadfile目录下是否生成过文件{name}
+   * @param name
+   * @return
+   */
+  public static boolean findUploadfileBy(String name) {
+    return cn.hutool.core.io.FileUtil.exist(getFileUploadPath(), name);
+  }
 
 }

ipfcst-spare2/src/main/java/com/jiayue/ipfcst/spare2/util/FilesUtil.java

@@ -117,10 +117,11 @@ public class FilesUtil extends CommonDataUtil {
 
     /**
      * 检查uploadfile目录下是否生成过文件{name}
+     *
      * @param name
      * @return
      */
-    public static boolean checkUpGened(String name) {
+    public static boolean findUploadfileBy(String name) {
         return FileUtil.exist(getFileUploadPath(), name);
     }