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

@@ -8,6 +8,7 @@ import com.fidms.common.enums.BusinessType;
 import com.fidms.common.utils.poi.ExcelUtil;
 import com.fidms.web.domain.FlowFieldOutput;
 import com.fidms.web.service.IFlowFieldOutputService;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -82,7 +83,7 @@ public class FlowFieldOutputController extends BaseController
     @PreAuthorize("@ss.hasPermi('data:flowOut:edit')")
     @Log(title = "流场输出", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody FlowFieldOutput flowFieldOutput)
+    public AjaxResult edit(@NotNull @RequestBody FlowFieldOutput flowFieldOutput)
     {
         flowFieldOutput.setUpdateBy(getUsername());
         return toAjax(flowFieldOutputService.updateFlowFieldOutput(flowFieldOutput));

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

@@ -361,38 +361,38 @@ public class FlowFieldInput extends BaseEntity
             altitude=this.flightAltitude.doubleValue();
         else
             altitude=0;
-        //公式中未给出R的值，暂命为1；
-        double R=1;
+        //公式中,单位的换算；
+        double R=287,T0=288.15,P0=1.01325*pow(10,5),D0=1.225,g=9.8;
         if(altitude!=0 /*&& temperature!=0 && density!=0 && pressure!=0*/)
         {
             if(altitude>0 && altitude<=11000 )
             {
-                temperature = 288.15 - 0.0065*altitude;
-                pressure = 101325*pow((1-0.0065*altitude/288.15),(9800/0.0065/R));
-                density = 1225*pow((1-0.0065*altitude/288.15),(9800/0.0065/R-1));
+                temperature = T0 - 0.0065*altitude;
+                pressure = P0*pow((1-0.0065*altitude/T0),(g/0.0065/R));
+                density = D0*pow((1-0.0065*altitude/T0),(g/0.0065/R-1));
             }
             else if(altitude>11000 && altitude<=20000)
             {
                 temperature=216.7;
-                double temperature11 = 288.15-0.0065*11000;
-                double pressure11=101325*pow((1-0.0065*11000/288.15),(9800/0.0065/R));
-                pressure = pressure11*pow(Math.E,(-9800*(altitude-11000)/temperature11/R));
-                double density11 = 1225*pow((1-0.0065*11000/288.15),(9800/0.0065/R-1));
-                density = density11*pow(Math.E,(-9800*(altitude-11000/temperature11/R)));
+                double temperature11 = T0-0.0065*11000;
+                double pressure11=P0*pow((1-0.0065*11000/T0),(g/0.0065/R));
+                pressure = pressure11*pow(Math.E,(-g*(altitude-11000)/temperature11/R));
+                double density11 = D0*pow((1-0.0065*11000/T0),(g/0.0065/R-1));
+                density = density11*pow(Math.E,(-g*(altitude-11000/temperature11/R)));
             }
             else if(altitude>20000 && altitude<=32000)
             {
-                double temperature11 = 288.15-0.0065*11000;
+                double temperature11 = T0-0.0065*11000;
                 double temperature20 = 216.7;
                 temperature = temperature20+0.001*(altitude-20000);
 
-                double pressure11=101325*pow((1-0.0065*11000/288.15),(9800/0.0065/R));
-                double pressure20 = pressure11*pow(Math.E,(-9800*(20000-11000)/temperature11/R));
-                pressure = pressure20*pow((1+0.001*(altitude-20000)/temperature20),-9800/0.001/R);
+                double pressure11=P0*pow((1-0.0065*11000/T0),(g/0.0065/R));
+                double pressure20 = pressure11*pow(Math.E,(-g*(20000-11000)/temperature11/R));
+                pressure = pressure20*pow((1+0.001*(altitude-20000)/temperature20),-g/0.001/R);
 
-                double density11 = 1225*pow((1-0.0065*11000/288.15),(9800/0.0065/R-1));
-                double density20 = density11*pow(Math.E,(-9800*(20000-11000/temperature11/R)));
-                density = density20*pow((1+0.001*(altitude-20000)/temperature20),(-9800/0.001/R-1));
+                double density11 = D0*pow((1-0.0065*11000/T0),(g/0.0065/R-1));
+                double density20 = density11*pow(Math.E,(-g*(20000-11000/temperature11/R)));
+                density = density20*pow((1+0.001*(altitude-20000)/temperature20),(-g/0.001/R-1));
             }
             setFlowTemperature(BigDecimal.valueOf(temperature));
             setFlowPressure(BigDecimal.valueOf(pressure));

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

@@ -21,6 +21,10 @@ public class Model3d extends BaseEntity
     @Excel(name = "3D模型名称")
     private String name;
 
+    /**飞机类型*/
+    @Excel(name="飞机类型")
+    private String aircraftType;
+
     /** 3d模型文件名称 */
     @Excel(name = "3D模型文件名称")
     private String model3dFile;
@@ -47,6 +51,8 @@ public class Model3d extends BaseEntity
     {
         return name;
     }
+    public void setAircraftType(String type){this.aircraftType=type;}
+    public String getAircraftType(){return aircraftType;}
     public void setModel3dFile(String model3dFile) 
     {
         this.model3dFile = model3dFile;
@@ -71,6 +77,7 @@ public class Model3d extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
             .append("name", getName())
+            .append("aircraftType",getAircraftType())
             .append("model3dFile", getModel3dFile())
             .append("model3dFilePath", getModel3dFilePath())
             .append("createBy", getCreateBy())

fidms-admin/src/main/resources/application-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://124.71.193.202:3306/fidms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://124.71.193.202:3306/fidms_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: '*R~1jBvy*8EKUFK6i'
             # 从库数据源

fidms-admin/src/main/resources/mapper/data/Model3dMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="Model3d" id="Model3dResult">
         <result property="id"    column="id"    />
         <result property="name"    column="name"    />
+        <result property="aircraftType" column="aircraft_type"/>
         <result property="model3dFile"    column="model_3d_file"    />
         <result property="model3dFilePath"    column="model_3d_file_path"    />
         <result property="createBy"    column="create_by"    />
@@ -16,13 +17,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectModel3dVo">
-        select id, name, model_3d_file, model_3d_file_path, create_by, create_time, update_by, update_time from bz_model_3d_t
+        select id, name, aircraft_type,model_3d_file, model_3d_file_path, create_by, create_time, update_by, update_time from bz_model_3d_t
     </sql>
 
     <select id="selectModel3dList" parameterType="Model3d" resultMap="Model3dResult">
         <include refid="selectModel3dVo"/>
         <where>  
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="aircraftType!= null and aircraftType!=''">and aircraft_type = #{aircraftType}</if>
             <if test="model3dFile != null  and model3dFile != ''"> and model_3d_file = #{model3dFile}</if>
             <if test="model3dFilePath != null  and model3dFilePath != ''"> and model_3d_file_path = #{model3dFilePath}</if>
         </where>
@@ -37,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into bz_model_3d_t
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="name != null and name != ''">name,</if>
+            <if test="aircraftType != null and aircraftType!=''">aircraft_type,</if>
             <if test="model3dFile != null and model3dFile != ''">model_3d_file,</if>
             <if test="model3dFilePath != null and model3dFilePath != ''">model_3d_file_path,</if>
             <if test="createBy != null">create_by,</if>
@@ -46,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null and name != ''">#{name},</if>
+            <if test="aircraftType!=null and aircraftType!=''">#{aircraftType},</if>
             <if test="model3dFile != null and model3dFile != ''">#{model3dFile},</if>
             <if test="model3dFilePath != null and model3dFilePath != ''">#{model3dFilePath},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -59,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update bz_model_3d_t
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null and name != ''">name = #{name},</if>
+            <if test="aircraftType!=null and aircraftType!=''">aircraft_type=#{aircraftType},</if>
             <if test="model3dFile != null and model3dFile != ''">model_3d_file = #{model3dFile},</if>
             <if test="model3dFilePath != null and model3dFilePath != ''">model_3d_file_path = #{model3dFilePath},</if>
             <if test="createBy != null">create_by = #{createBy},</if>

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

@@ -75,6 +75,7 @@
         @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <!--
       <el-form-item label="来流温度" prop="flowTemperature">
         <el-input
           v-model="queryParams.flowTemperature"
@@ -98,8 +99,8 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item>
+      </el-form-item>-->
+      <el-form-item label="飞行高度" prop="flightAltitude">
         <el-input
         v-model="queryParams.flightAltitude"
         placeholder="请输入飞行高度"
@@ -300,22 +301,22 @@
 
         <!-- <el-form-item label="Fluent网格文件" prop="fluentGridFile">
           <file-upload v-model="form.fluentGridFile"/>
-        </el-form-item> -->
+        </el-form-item>
         <el-form-item label="Fluent网格文件" prop="fluentGridFilePath">
           <file-upload v-model="form.fluentGridFilePath" :fileType="fileTypeGrid" :fileSize="100" :limit="1"/>
-        </el-form-item>
+        </el-form-item>-->
         <!-- <el-form-item label="Fluent cas文件" prop="fluentCasFile">
           <file-upload v-model="form.fluentCasFile"/>
-        </el-form-item> -->
+        </el-form-item>
         <el-form-item label="Fluent cas文件" prop="fluentCasFilePath">
           <file-upload v-model="form.fluentCasFilePath" :fileType="fileTypeCas" :fileSize="100" :limit="1"/>
-        </el-form-item>
+        </el-form-item>-->
         <!-- <el-form-item label="Fluent dat文件路径" prop="fluentDatFile">
           <file-upload v-model="form.fluentDatFile"/>
-        </el-form-item> -->
+        </el-form-item>
         <el-form-item label="Fluent dat文件" prop="fluentDatFilePath">
           <file-upload v-model="form.fluentDatFilePath" :fileType="fileTypeDat" :fileSize="100" :limit="1"/>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

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

@@ -205,15 +205,12 @@
           <file-upload v-model="form.outputFile"/>
         </el-form-item> -->
         <el-form-item label="cas文件输出路径" prop="casOutputFilePath">
-          <file-upload v-model="form.casOutputFilePath" :fileType="casfileType" :fileSize="100" :limit="1"/>
+          <file-upload v-model="form.casOutputFilePath" :fileType="casfileType" :fileSize="2048" :limit="1"/>
         </el-form-item>
         <el-form-item label="dat文件输出路径" prop="datOutputFilePath">
-          <file-upload v-model="form.datOutputFilePath" :fileType="datfileType" :fileSize="100" :limit="1"/>
+          <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="fileType" :fileSize="100" :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">
@@ -237,6 +234,7 @@ import { listFlowOut, getFlowOut, delFlowOut, addFlowOut, updateFlowOut } from "
 import { getFlowFieldInOption} from "@/api/data/flowIn";
 export default {
   name: "FlowOut",
+  dicts: ['sys_common_status'],
   data() {
     return {
       // 遮罩层

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

@@ -65,6 +65,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="3D模型名称" align="center" prop="name" />
+      <el-table-column label="飞机类型" align="center" prop="aircraftType" />
       <el-table-column label="3D模型文件" align="center" prop="model3dFilePath">
         <template slot-scope="scope">
           <el-button
@@ -110,6 +111,9 @@
         <el-form-item label="3D模型名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入3D模型名称" />
         </el-form-item>
+        <el-form-item label="飞机类型" prop="aircraftType">
+          <el-input v-model="form.aircraftType" placeholder="请输入飞机类型"/>
+        </el-form-item>
         <!-- <el-form-item label="3d模型文件名称" prop="model3dFile">
           <file-upload v-model="form.model3dFile"/>
         </el-form-item> -->
@@ -155,6 +159,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         name: null,
+        aircraftType:null,
         model3dFile: null,
         model3dFilePath: null,
       },
@@ -195,6 +200,7 @@ export default {
       this.form = {
         id: null,
         name: null,
+        aircraftType:null,
         model3dFile: null,
         model3dFilePath: null,
         createBy: null,