saveDB

fidms-admin/src/main/java/com/fidms/web/controller/FlowFieldOutputController.java

@@ -83,7 +83,7 @@ public class FlowFieldOutputController extends BaseController
     @PreAuthorize("@ss.hasPermi('data:flowOut:edit')")
     @Log(title = "流场输出", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@NotNull @RequestBody FlowFieldOutput flowFieldOutput)
+    public AjaxResult edit(@RequestBody FlowFieldOutput flowFieldOutput)
     {
         flowFieldOutput.setUpdateBy(getUsername());
         return toAjax(flowFieldOutputService.updateFlowFieldOutput(flowFieldOutput));

fidms-admin/src/main/java/com/fidms/web/controller/common/CommonController.java

@@ -160,4 +160,5 @@ public class CommonController
             log.error("下载文件失败", e);
         }
     }
+
 }

fidms-admin/src/main/java/com/fidms/web/domain/FlowFieldOutput.java

@@ -65,7 +65,7 @@ public class FlowFieldOutput extends BaseEntity
     private String temperatureImage;
 
     /**表面温度分布图路径*/
-    @Excel(name="表面温度分布图路径")
+    @Excel(name="表面温度分布图路径",width = 25,height = 125,cellType= Excel.ColumnType.IMAGE)
     private String temperatureImagePath;
 
     /**表面速度分布图*/
@@ -73,7 +73,7 @@ public class FlowFieldOutput extends BaseEntity
     private String velocityImage;
 
     /**表面速度分布图路径*/
-    @Excel(name="表面速度分布图路径")
+    @Excel(name="表面速度分布图路径",width = 25,height = 125,cellType= Excel.ColumnType.IMAGE)
     private String velocityImagePath;
 
     /**表面压力分布图*/
@@ -81,7 +81,7 @@ public class FlowFieldOutput extends BaseEntity
     private String pressureImage;
 
     /**表面压力分布图路径*/
-    @Excel(name="表面压力分布图路径")
+    @Excel(name="表面压力分布图路径",width = 25,height = 125,cellType= Excel.ColumnType.IMAGE)
     private String pressureImagePath;
 
 
@@ -176,7 +176,7 @@ public class FlowFieldOutput extends BaseEntity
     public void setPressureImage(String pressureImg){this.pressureImage=pressureImg;}
     public String getPressureImage(){return pressureImage;}
 
-    public void setPressureImagePath(String pressureImgPath){this.velocityImagePath=pressureImgPath;}
+    public void setPressureImagePath(String pressureImgPath){this.pressureImagePath=pressureImgPath;}
     public String getPressureImagePath(){return pressureImagePath;}
 
     @Override

fidms-admin/src/main/java/com/fidms/web/domain/InfraredOutput.java

@@ -45,7 +45,7 @@ public class InfraredOutput extends BaseEntity
     private String infraredImage;
 
     /** 红外图像路径 */
-    @Excel(name = "红外图像路径")
+    @Excel(name = "红外图像路径",width = 25,height = 125,cellType= Excel.ColumnType.IMAGE)
     private String infraredImagePath;
 
     public void setId(Long id) 

fidms-admin/src/main/java/com/fidms/web/domain/Model3d.java

@@ -4,6 +4,7 @@ import com.fidms.common.annotation.Excel;
 import com.fidms.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+
 /**
  * 3d模型对象 bz_model_3d_t
  * 
@@ -86,4 +87,5 @@ public class Model3d extends BaseEntity
             .append("updateTime", getUpdateTime())
             .toString();
     }
+
 }

fidms-quartz/src/main/java/com/fidms/quartz/task/RyTask.java

@@ -2,6 +2,10 @@ package com.fidms.quartz.task;
 
 import org.springframework.stereotype.Component;
 import com.fidms.common.utils.StringUtils;
+import org.springframework.boot.system.ApplicationHome;
+
+import java.io.File;
+import java.util.Date;
 
 /**
  * 定时任务调度测试
@@ -25,4 +29,16 @@ public class RyTask
     {
         System.out.println("执行无参方法");
     }
+
+    public void saveDB() {
+        ApplicationHome h = new ApplicationHome(getClass());
+        File jarF = h.getSource();
+        String rootPath = System.getProperty("user.dir");
+        String bakPath = jarF.getParentFile().toString() + "\\sql_bak.bat "+rootPath+ "\\sql\\fidms.sql";
+        try {
+            Process process = Runtime.getRuntime().exec(bakPath);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }

fidms-ui/src/views/data/flowOut/index.vue

@@ -87,7 +87,7 @@
             size="mini"
             type="text"
             icon="el-icon-download"
-            @click="download(scope.row.casOutputFilePath)"
+            @click="downloadfile(scope.row.casOutputFilePath)"
             v-hasPermi="['data:model:edit']"
           >{{ getFileName(scope.row.casOutputFilePath) }}
           </el-button>
@@ -99,7 +99,7 @@
             size="mini"
             type="text"
             icon="el-icon-download"
-            @click="download(scope.row.datOutputFilePath)"
+            @click="downloadfile(scope.row.datOutputFilePath)"
             v-hasPermi="['data:model:edit']"
           >{{ getFileName(scope.row.datOutputFilePath) }}
           </el-button>
@@ -111,7 +111,7 @@
             size="mini"
             type="text"
             icon="el-icon-download"
-            @click="download(scope.row.otherOutputFilePath)"
+            @click="downloadfile(scope.row.otherOutputFilePath)"
             v-hasPermi="['data:model:edit']"
           >{{ getFileName(scope.row.otherOutputFilePath) }}
           </el-button>
@@ -123,7 +123,7 @@
           size ="mini"
           type="text"
           icon="el-icon-download"
-          @click="download(scope.row.temperatureImagePath)"
+          @click="downloadfile(scope.row.temperatureImagePath)"
           v-haspermi="['data:model:edit']">
             {{getFileName(scope.row.temperatureImagePath)}}
           </el-button>
@@ -135,7 +135,7 @@
               size ="mini"
               type="text"
               icon="el-icon-download"
-              @click="download(scope.row.velocityImagePath)"
+              @click="downloadfile(scope.row.velocityImagePath)"
               v-haspermi="['data:model:edit']">
             {{getFileName(scope.row.velocityImagePath)}}
           </el-button>
@@ -147,7 +147,7 @@
               size ="mini"
               type="text"
               icon="el-icon-download"
-              @click="download(scope.row.pressureImagePath)"
+              @click="downloadfile(scope.row.pressureImagePath)"
               v-haspermi="['data:model:edit']">
             {{getFileName(scope.row.pressureImagePath)}}
           </el-button>
@@ -211,6 +211,9 @@
           <file-upload v-model="form.datOutputFilePath" :fileType="datfileType" :fileSize="2048" :limit="1"/>
         </el-form-item>
         <el-form-item label="other文件输出路径" prop="otherOutputFilePath">
+          <file-upload v-model="form.otherOutputFilePath" :fileType="imgfileType" :fileSize="2048" :limit="1"/>
+        </el-form-item>
+        <el-form-item label="表面温度分布图" prop="temperatureImagePath">
           <file-upload v-model="form.temperatureImagePath" :fileType="imgfileType" :fileSize="100" :limit="1"/>
         </el-form-item>
         <el-form-item label="表面速度分布图输出路径" prop="velocityImagePath">
@@ -425,7 +428,7 @@ export default {
         return '';
       }
     },
-    download(path) {
+    downloadfile(path) {
       this.$download.resource(path);
     },
     getOption(){

fidms-ui/src/views/data/infraredOut/index.vue

@@ -48,7 +48,7 @@
           v-hasPermi="['data:infraredOut:remove']"
         >删除</el-button>
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -57,7 +57,7 @@
           @click="handleExport"
           v-hasPermi="['data:infraredOut:export']"
         >导出</el-button>
-      </el-col> -->
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -72,7 +72,7 @@
             size="mini"
             type="text"
             icon="el-icon-download"
-            @click="download(scope.row.outputFilePath)"
+            @click="downloadfile(scope.row.outputFilePath)"
             v-hasPermi="['data:model:edit']"
           >{{ getFileName(scope.row.outputFilePath) }}
           </el-button>
@@ -85,7 +85,7 @@
             size="mini"
             type="text"
             icon="el-icon-download"
-            @click="download(scope.row.infraredImagePath)"
+            @click="downloadfile(scope.row.infraredImagePath)"
             v-hasPermi="['data:model:edit']">
             {{getFileName(scope.row.infraredImagePath)}}
           </el-button>
@@ -333,7 +333,7 @@ export default {
         return '';
       }
     },
-    download(path) {
+    downloadfile(path) {
       this.$download.resource(path);
     },
     getOption() {