dev

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

@@ -72,6 +72,8 @@ public class FlowFieldInputController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody FlowFieldInput flowFieldInput)
     {
+        flowFieldInput.setCreateBy(getUsername());
+        flowFieldInput.setUpdateBy(getUsername());
         return toAjax(flowFieldInputService.insertFlowFieldInput(flowFieldInput));
     }
 
@@ -83,6 +85,7 @@ public class FlowFieldInputController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody FlowFieldInput flowFieldInput)
     {
+        flowFieldInput.setUpdateBy(getUsername());
         return toAjax(flowFieldInputService.updateFlowFieldInput(flowFieldInput));
     }
 

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

@@ -71,6 +71,8 @@ public class FlowFieldOutputController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody FlowFieldOutput flowFieldOutput)
     {
+        flowFieldOutput.setCreateBy(getUsername());
+        flowFieldOutput.setUpdateBy(getUsername());
         return toAjax(flowFieldOutputService.insertFlowFieldOutput(flowFieldOutput));
     }
 
@@ -82,6 +84,7 @@ public class FlowFieldOutputController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody FlowFieldOutput flowFieldOutput)
     {
+        flowFieldOutput.setUpdateBy(getUsername());
         return toAjax(flowFieldOutputService.updateFlowFieldOutput(flowFieldOutput));
     }
 

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

@@ -70,6 +70,8 @@ public class InfraredInputController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody InfraredInput infraredInput)
     {
+        infraredInput.setCreateBy(getUsername());
+        infraredInput.setUpdateBy(getUsername());
         return toAjax(infraredInputService.insertInfraredInput(infraredInput));
     }
 
@@ -81,6 +83,7 @@ public class InfraredInputController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody InfraredInput infraredInput)
     {
+        infraredInput.setUpdateBy(getUsername());
         return toAjax(infraredInputService.updateInfraredInput(infraredInput));
     }
 

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

@@ -71,6 +71,8 @@ public class InfraredOutputController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody InfraredOutput infraredOutput)
     {
+        infraredOutput.setCreateBy(getUsername());
+        infraredOutput.setUpdateBy(getUsername());
         return toAjax(infraredOutputService.insertInfraredOutput(infraredOutput));
     }
 
@@ -82,6 +84,7 @@ public class InfraredOutputController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody InfraredOutput infraredOutput)
     {
+        infraredOutput.setUpdateBy(getUsername());
         return toAjax(infraredOutputService.updateInfraredOutput(infraredOutput));
     }
 

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

@@ -71,6 +71,8 @@ public class Model3dController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody Model3d model3d)
     {
+        model3d.setCreateBy(getUsername());
+        model3d.setUpdateBy(getUsername());
         return toAjax(model3dService.insertModel3d(model3d));
     }
 
@@ -82,6 +84,7 @@ public class Model3dController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody Model3d model3d)
     {
+        model3d.setUpdateBy(getUsername());
         return toAjax(model3dService.updateModel3d(model3d));
     }
 

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

@@ -27,13 +27,21 @@ public class FlowFieldInput extends BaseEntity
     @Excel(name = "3d模型")
     private String model3dName;
 
-    /** 来流马赫数 */
-    @Excel(name = "来流马赫数")
-    private BigDecimal machNumber;
+    /** 来流马赫数x */
+    @Excel(name = "来流马赫数x")
+    private BigDecimal machNumberX;
+
+    /** 来流马赫数y */
+    @Excel(name = "来流马赫数y")
+    private BigDecimal machNumberY;
+
+    /** 来流马赫数z */
+    @Excel(name = "来流马赫数z")
+    private BigDecimal machNumberZ;
 
     /** 飞行高度 */
     @Excel(name = "飞行高度")
-    private Long flightHeight;
+    private BigDecimal flightHeight;
 
     /** OX坐标值 */
     @Excel(name = "OX坐标值")
@@ -51,13 +59,21 @@ public class FlowFieldInput extends BaseEntity
     @Excel(name = "压强")
     private BigDecimal pressure;
 
-    /** 流速 */
-    @Excel(name = "流速")
-    private Long flowVelocity;
+    /** 流速x */
+    @Excel(name = "流速x")
+    private BigDecimal flowVelocityX;
+
+    /** 流速y */
+    @Excel(name = "流速y")
+    private BigDecimal flowVelocityY;
+
+    /** 流速z */
+    @Excel(name = "流速z")
+    private BigDecimal flowVelocityZ;
 
     /** 密度 */
     @Excel(name = "密度")
-    private Long density;
+    private BigDecimal density;
 
     /** 二氧化碳质量分数 */
     @Excel(name = "二氧化碳质量分数")
@@ -71,6 +87,10 @@ public class FlowFieldInput extends BaseEntity
     @Excel(name = "水蒸气质量分数")
     private BigDecimal h2oMassFraction;
 
+    /** 温度 */
+    @Excel(name = "温度")
+    private BigDecimal temperature;
+
     /** Fluent网格文件 */
     @Excel(name = "Fluent网格文件")
     private String fluentGridFile;
@@ -113,9 +133,9 @@ public class FlowFieldInput extends BaseEntity
     {
         return model3dId;
     }
-    public void setMachNumber(BigDecimal machNumber) 
+    public void setMachNumberX(BigDecimal machNumberX) 
     {
-        this.machNumber = machNumber;
+        this.machNumberX = machNumberX;
     }
 
     public String getModel3dName() {
@@ -126,16 +146,34 @@ public class FlowFieldInput extends BaseEntity
         this.model3dName = model3dName;
     }
 
-    public BigDecimal getMachNumber()
+    public BigDecimal getMachNumberX()
+    {
+        return machNumberX;
+    }
+    public void setMachNumberY(BigDecimal machNumberY) 
+    {
+        this.machNumberY = machNumberY;
+    }
+
+    public BigDecimal getMachNumberY() 
+    {
+        return machNumberY;
+    }
+    public void setMachNumberZ(BigDecimal machNumberZ) 
+    {
+        this.machNumberZ = machNumberZ;
+    }
+
+    public BigDecimal getMachNumberZ() 
     {
-        return machNumber;
+        return machNumberZ;
     }
-    public void setFlightHeight(Long flightHeight) 
+    public void setFlightHeight(BigDecimal flightHeight) 
     {
         this.flightHeight = flightHeight;
     }
 
-    public Long getFlightHeight() 
+    public BigDecimal getFlightHeight() 
     {
         return flightHeight;
     }
@@ -175,21 +213,39 @@ public class FlowFieldInput extends BaseEntity
     {
         return pressure;
     }
-    public void setFlowVelocity(Long flowVelocity) 
+    public void setFlowVelocityX(BigDecimal flowVelocityX) 
     {
-        this.flowVelocity = flowVelocity;
+        this.flowVelocityX = flowVelocityX;
     }
 
-    public Long getFlowVelocity() 
+    public BigDecimal getFlowVelocityX() 
     {
-        return flowVelocity;
+        return flowVelocityX;
     }
-    public void setDensity(Long density) 
+    public void setFlowVelocityY(BigDecimal flowVelocityY) 
+    {
+        this.flowVelocityY = flowVelocityY;
+    }
+
+    public BigDecimal getFlowVelocityY() 
+    {
+        return flowVelocityY;
+    }
+    public void setFlowVelocityZ(BigDecimal flowVelocityZ) 
+    {
+        this.flowVelocityZ = flowVelocityZ;
+    }
+
+    public BigDecimal getFlowVelocityZ() 
+    {
+        return flowVelocityZ;
+    }
+    public void setDensity(BigDecimal density) 
     {
         this.density = density;
     }
 
-    public Long getDensity() 
+    public BigDecimal getDensity() 
     {
         return density;
     }
@@ -220,6 +276,15 @@ public class FlowFieldInput extends BaseEntity
     {
         return h2oMassFraction;
     }
+    public void setTemperature(BigDecimal temperature) 
+    {
+        this.temperature = temperature;
+    }
+
+    public BigDecimal getTemperature() 
+    {
+        return temperature;
+    }
     public void setFluentGridFile(String fluentGridFile) 
     {
         this.fluentGridFile = fluentGridFile;
@@ -277,27 +342,36 @@ public class FlowFieldInput extends BaseEntity
 
     @Override
     public String toString() {
-        return "FlowFieldInput{" +
-                "id=" + id +
-                ", model3dId=" + model3dId +
-                ", model3dName=" + model3dName +
-                ", machNumber=" + machNumber +
-                ", flightHeight=" + flightHeight +
-                ", oxCoordinate=" + oxCoordinate +
-                ", oyCoordinate=" + oyCoordinate +
-                ", ozCoordinate=" + ozCoordinate +
-                ", pressure=" + pressure +
-                ", flowVelocity=" + flowVelocity +
-                ", density=" + density +
-                ", co2MassFraction=" + co2MassFraction +
-                ", coMassFraction=" + coMassFraction +
-                ", h2oMassFraction=" + h2oMassFraction +
-                ", fluentGridFile='" + fluentGridFile + '\'' +
-                ", fluentGridFilePath='" + fluentGridFilePath + '\'' +
-                ", fluentCasFile='" + fluentCasFile + '\'' +
-                ", fluentCasFilePath='" + fluentCasFilePath + '\'' +
-                ", fluentDatFile='" + fluentDatFile + '\'' +
-                ", fluentDatFilePath='" + fluentDatFilePath + '\'' +
-                '}';
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("model3dId", getModel3dId())
+            .append("model3dName", getModel3dName())
+            .append("machNumberX", getMachNumberX())
+            .append("machNumberY", getMachNumberY())
+            .append("machNumberZ", getMachNumberZ())
+            .append("flightHeight", getFlightHeight())
+            .append("oxCoordinate", getOxCoordinate())
+            .append("oyCoordinate", getOyCoordinate())
+            .append("ozCoordinate", getOzCoordinate())
+            .append("pressure", getPressure())
+            .append("flowVelocityX", getFlowVelocityX())
+            .append("flowVelocityY", getFlowVelocityY())
+            .append("flowVelocityZ", getFlowVelocityZ())
+            .append("density", getDensity())
+            .append("co2MassFraction", getCo2MassFraction())
+            .append("coMassFraction", getCoMassFraction())
+            .append("h2oMassFraction", getH2oMassFraction())
+            .append("temperature", getTemperature())
+            .append("fluentGridFile", getFluentGridFile())
+            .append("fluentGridFilePath", getFluentGridFilePath())
+            .append("fluentCasFile", getFluentCasFile())
+            .append("fluentCasFilePath", getFluentCasFilePath())
+            .append("fluentDatFile", getFluentDatFile())
+            .append("fluentDatFilePath", getFluentDatFilePath())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
     }
 }

fidms-admin/src/main/java/com/fidms/web/service/impl/FlowFieldInputServiceImpl.java

@@ -54,6 +54,7 @@ public class FlowFieldInputServiceImpl implements IFlowFieldInputService
     public int insertFlowFieldInput(FlowFieldInput flowFieldInput)
     {
         flowFieldInput.setCreateTime(DateUtils.getNowDate());
+        flowFieldInput.setUpdateTime(DateUtils.getNowDate());
         return flowFieldInputMapper.insertFlowFieldInput(flowFieldInput);
     }
 

fidms-admin/src/main/java/com/fidms/web/service/impl/FlowFieldOutputServiceImpl.java

@@ -54,6 +54,7 @@ public class FlowFieldOutputServiceImpl implements IFlowFieldOutputService
     public int insertFlowFieldOutput(FlowFieldOutput flowFieldOutput)
     {
         flowFieldOutput.setCreateTime(DateUtils.getNowDate());
+        flowFieldOutput.setUpdateTime(DateUtils.getNowDate());
         return flowFieldOutputMapper.insertFlowFieldOutput(flowFieldOutput);
     }
 

fidms-admin/src/main/java/com/fidms/web/service/impl/InfraredInputServiceImpl.java

@@ -55,6 +55,7 @@ public class InfraredInputServiceImpl implements IInfraredInputService
     public int insertInfraredInput(InfraredInput infraredInput)
     {
         infraredInput.setCreateTime(DateUtils.getNowDate());
+        infraredInput.setUpdateTime(DateUtils.getNowDate());
         return infraredInputMapper.insertInfraredInput(infraredInput);
     }
 

fidms-admin/src/main/java/com/fidms/web/service/impl/InfraredOutputServiceImpl.java

@@ -54,6 +54,7 @@ public class InfraredOutputServiceImpl implements IInfraredOutputService
     public int insertInfraredOutput(InfraredOutput infraredOutput)
     {
         infraredOutput.setCreateTime(DateUtils.getNowDate());
+        infraredOutput.setUpdateTime(DateUtils.getNowDate());
         return infraredOutputMapper.insertInfraredOutput(infraredOutput);
     }
 

fidms-admin/src/main/java/com/fidms/web/service/impl/Model3dServiceImpl.java

@@ -54,6 +54,7 @@ public class Model3dServiceImpl implements IModel3dService
     public int insertModel3d(Model3d model3d)
     {
         model3d.setCreateTime(DateUtils.getNowDate());
+        model3d.setUpdateTime(DateUtils.getNowDate());
         return model3dMapper.insertModel3d(model3d);
     }
 

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

@@ -7,18 +7,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="FlowFieldInput" id="FlowFieldInputResult">
         <result property="id"    column="id"    />
         <result property="model3dId"    column="model_3d_id"    />
-        <result property="model3dName"    column="model3dName"    />
-        <result property="machNumber"    column="mach_number"    />
+        <result property="machNumberX"    column="mach_number_x"    />
+        <result property="machNumberY"    column="mach_number_y"    />
+        <result property="machNumberZ"    column="mach_number_z"    />
         <result property="flightHeight"    column="flight_height"    />
         <result property="oxCoordinate"    column="ox_coordinate"    />
         <result property="oyCoordinate"    column="oy_coordinate"    />
         <result property="ozCoordinate"    column="oz_coordinate"    />
         <result property="pressure"    column="pressure"    />
-        <result property="flowVelocity"    column="flow_velocity"    />
+        <result property="flowVelocityX"    column="flow_velocity_x"    />
+        <result property="flowVelocityY"    column="flow_velocity_y"    />
+        <result property="flowVelocityZ"    column="flow_velocity_z"    />
         <result property="density"    column="density"    />
         <result property="co2MassFraction"    column="co2_mass_fraction"    />
         <result property="coMassFraction"    column="co_mass_fraction"    />
         <result property="h2oMassFraction"    column="h2o_mass_fraction"    />
+        <result property="temperature"    column="temperature"    />
         <result property="fluentGridFile"    column="fluent_grid_file"    />
         <result property="fluentGridFilePath"    column="fluent_grid_file_path"    />
         <result property="fluentCasFile"    column="fluent_cas_file"    />
@@ -36,17 +40,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ffi.id,
             ffi.model_3d_id,
             m3.`name` model3dName,
-            ffi.mach_number,
+            ffi.mach_number_x,
+            ffi.mach_number_y,
+            ffi.mach_number_z,
             ffi.flight_height,
             ffi.ox_coordinate,
             ffi.oy_coordinate,
             ffi.oz_coordinate,
             ffi.pressure,
-            ffi.flow_velocity,
+            ffi.flow_velocity_x,
+            ffi.flow_velocity_y,
+            ffi.flow_velocity_z,
             ffi.density,
             ffi.co2_mass_fraction,
             ffi.co_mass_fraction,
             ffi.h2o_mass_fraction,
+            ffi.temperature,
             ffi.fluent_grid_file,
             ffi.fluent_grid_file_path,
             ffi.fluent_cas_file,
@@ -66,17 +75,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectFlowFieldInputVo"/>
         <where>  
             <if test="model3dId != null "> and model_3d_id = #{model3dId}</if>
-            <if test="machNumber != null "> and mach_number = #{machNumber}</if>
+            <if test="machNumberX != null "> and mach_number_x = #{machNumberX}</if>
+            <if test="machNumberY != null "> and mach_number_y = #{machNumberY}</if>
+            <if test="machNumberZ != null "> and mach_number_z = #{machNumberZ}</if>
             <if test="flightHeight != null "> and flight_height = #{flightHeight}</if>
             <if test="oxCoordinate != null "> and ox_coordinate = #{oxCoordinate}</if>
             <if test="oyCoordinate != null "> and oy_coordinate = #{oyCoordinate}</if>
             <if test="ozCoordinate != null "> and oz_coordinate = #{ozCoordinate}</if>
             <if test="pressure != null "> and pressure = #{pressure}</if>
-            <if test="flowVelocity != null "> and flow_velocity = #{flowVelocity}</if>
+            <if test="flowVelocityX != null "> and flow_velocity_x = #{flowVelocityX}</if>
+            <if test="flowVelocityY != null "> and flow_velocity_y = #{flowVelocityY}</if>
+            <if test="flowVelocityZ != null "> and flow_velocity_z = #{flowVelocityZ}</if>
             <if test="density != null "> and density = #{density}</if>
             <if test="co2MassFraction != null "> and co2_mass_fraction = #{co2MassFraction}</if>
             <if test="coMassFraction != null "> and co_mass_fraction = #{coMassFraction}</if>
             <if test="h2oMassFraction != null "> and h2o_mass_fraction = #{h2oMassFraction}</if>
+            <if test="temperature != null "> and temperature = #{temperature}</if>
             <if test="fluentGridFile != null  and fluentGridFile != ''"> and fluent_grid_file = #{fluentGridFile}</if>
             <if test="fluentGridFilePath != null  and fluentGridFilePath != ''"> and fluent_grid_file_path = #{fluentGridFilePath}</if>
             <if test="fluentCasFile != null  and fluentCasFile != ''"> and fluent_cas_file = #{fluentCasFile}</if>
@@ -95,17 +109,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into bz_flow_field_input_t
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="model3dId != null">model_3d_id,</if>
-            <if test="machNumber != null">mach_number,</if>
+            <if test="machNumberX != null">mach_number_x,</if>
+            <if test="machNumberY != null">mach_number_y,</if>
+            <if test="machNumberZ != null">mach_number_z,</if>
             <if test="flightHeight != null">flight_height,</if>
             <if test="oxCoordinate != null">ox_coordinate,</if>
             <if test="oyCoordinate != null">oy_coordinate,</if>
             <if test="ozCoordinate != null">oz_coordinate,</if>
             <if test="pressure != null">pressure,</if>
-            <if test="flowVelocity != null">flow_velocity,</if>
+            <if test="flowVelocityX != null">flow_velocity_x,</if>
+            <if test="flowVelocityY != null">flow_velocity_y,</if>
+            <if test="flowVelocityZ != null">flow_velocity_z,</if>
             <if test="density != null">density,</if>
             <if test="co2MassFraction != null">co2_mass_fraction,</if>
             <if test="coMassFraction != null">co_mass_fraction,</if>
             <if test="h2oMassFraction != null">h2o_mass_fraction,</if>
+            <if test="temperature != null">temperature,</if>
             <if test="fluentGridFile != null and fluentGridFile != ''">fluent_grid_file,</if>
             <if test="fluentGridFilePath != null and fluentGridFilePath != ''">fluent_grid_file_path,</if>
             <if test="fluentCasFile != null and fluentCasFile != ''">fluent_cas_file,</if>
@@ -119,17 +138,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="model3dId != null">#{model3dId},</if>
-            <if test="machNumber != null">#{machNumber},</if>
+            <if test="machNumberX != null">#{machNumberX},</if>
+            <if test="machNumberY != null">#{machNumberY},</if>
+            <if test="machNumberZ != null">#{machNumberZ},</if>
             <if test="flightHeight != null">#{flightHeight},</if>
             <if test="oxCoordinate != null">#{oxCoordinate},</if>
             <if test="oyCoordinate != null">#{oyCoordinate},</if>
             <if test="ozCoordinate != null">#{ozCoordinate},</if>
             <if test="pressure != null">#{pressure},</if>
-            <if test="flowVelocity != null">#{flowVelocity},</if>
+            <if test="flowVelocityX != null">#{flowVelocityX},</if>
+            <if test="flowVelocityY != null">#{flowVelocityY},</if>
+            <if test="flowVelocityZ != null">#{flowVelocityZ},</if>
             <if test="density != null">#{density},</if>
             <if test="co2MassFraction != null">#{co2MassFraction},</if>
             <if test="coMassFraction != null">#{coMassFraction},</if>
             <if test="h2oMassFraction != null">#{h2oMassFraction},</if>
+            <if test="temperature != null">#{temperature},</if>
             <if test="fluentGridFile != null and fluentGridFile != ''">#{fluentGridFile},</if>
             <if test="fluentGridFilePath != null and fluentGridFilePath != ''">#{fluentGridFilePath},</if>
             <if test="fluentCasFile != null and fluentCasFile != ''">#{fluentCasFile},</if>
@@ -147,17 +171,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update bz_flow_field_input_t
         <trim prefix="SET" suffixOverrides=",">
             <if test="model3dId != null">model_3d_id = #{model3dId},</if>
-            <if test="machNumber != null">mach_number = #{machNumber},</if>
+            <if test="machNumberX != null">mach_number_x = #{machNumberX},</if>
+            <if test="machNumberY != null">mach_number_y = #{machNumberY},</if>
+            <if test="machNumberZ != null">mach_number_z = #{machNumberZ},</if>
             <if test="flightHeight != null">flight_height = #{flightHeight},</if>
             <if test="oxCoordinate != null">ox_coordinate = #{oxCoordinate},</if>
             <if test="oyCoordinate != null">oy_coordinate = #{oyCoordinate},</if>
             <if test="ozCoordinate != null">oz_coordinate = #{ozCoordinate},</if>
             <if test="pressure != null">pressure = #{pressure},</if>
-            <if test="flowVelocity != null">flow_velocity = #{flowVelocity},</if>
+            <if test="flowVelocityX != null">flow_velocity_x = #{flowVelocityX},</if>
+            <if test="flowVelocityY != null">flow_velocity_y = #{flowVelocityY},</if>
+            <if test="flowVelocityZ != null">flow_velocity_z = #{flowVelocityZ},</if>
             <if test="density != null">density = #{density},</if>
             <if test="co2MassFraction != null">co2_mass_fraction = #{co2MassFraction},</if>
             <if test="coMassFraction != null">co_mass_fraction = #{coMassFraction},</if>
             <if test="h2oMassFraction != null">h2o_mass_fraction = #{h2oMassFraction},</if>
+            <if test="temperature != null">temperature = #{temperature},</if>
             <if test="fluentGridFile != null and fluentGridFile != ''">fluent_grid_file = #{fluentGridFile},</if>
             <if test="fluentGridFilePath != null and fluentGridFilePath != ''">fluent_grid_file_path = #{fluentGridFilePath},</if>
             <if test="fluentCasFile != null and fluentCasFile != ''">fluent_cas_file = #{fluentCasFile},</if>

fidms-common/src/main/java/com/fidms/common/utils/file/MimeTypeUtils.java

@@ -38,7 +38,7 @@ public class MimeTypeUtils
             // pdf
             "pdf",
             // 3dmodel
-            "max", "dwg", "dxf",
+            "x_t", "IGS",
             // fluent
             "mesh", "cas", "dat"
             };

fidms-ui/src/layout/components/Navbar.vue

@@ -10,11 +10,11 @@
         <search id="header-search" class="right-menu-item" />
         
         <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <ruo-yi-git id="fidms-git" class="right-menu-item hover-effect" />
+          <fidmsGit id="fidms-git" class="right-menu-item hover-effect" />
         </el-tooltip>
 
         <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <ruo-yi-doc id="fidms-doc" class="right-menu-item hover-effect" />
+          <fidmsDoc id="fidms-doc" class="right-menu-item hover-effect" />
         </el-tooltip>
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />

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

@@ -11,15 +11,31 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="来流马赫数" prop="machNumber">
+      <!-- <el-form-item label="来流马赫数x" prop="machNumberX">
         <el-input
-          v-model="queryParams.machNumber"
-          placeholder="请输入来流马赫数"
+          v-model="queryParams.machNumberX"
+          placeholder="请输入来流马赫数x"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="飞行高度" prop="flightHeight">
+      <el-form-item label="来流马赫数y" prop="machNumberY">
+        <el-input
+          v-model="queryParams.machNumberY"
+          placeholder="请输入来流马赫数y"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="来流马赫数z" prop="machNumberZ">
+        <el-input
+          v-model="queryParams.machNumberZ"
+          placeholder="请输入来流马赫数z"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="飞行高度" prop="flightHeight">
         <el-input
           v-model="queryParams.flightHeight"
           placeholder="请输入飞行高度"
@@ -59,10 +75,26 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="流速" prop="flowVelocity">
+      <el-form-item label="流速x" prop="flowVelocityX">
+        <el-input
+          v-model="queryParams.flowVelocityX"
+          placeholder="请输入流速x"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="流速y" prop="flowVelocityY">
+        <el-input
+          v-model="queryParams.flowVelocityY"
+          placeholder="请输入流速y"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="流速z" prop="flowVelocityZ">
         <el-input
-          v-model="queryParams.flowVelocity"
-          placeholder="请输入流速"
+          v-model="queryParams.flowVelocityZ"
+          placeholder="请输入流速z"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -98,6 +130,14 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
+      </el-form-item>
+      <el-form-item label="温度" prop="temperature">
+        <el-input
+          v-model="queryParams.temperature"
+          placeholder="请输入温度"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -155,17 +195,22 @@
       <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="model3dName" />
-      <el-table-column label="来流马赫数" align="center" prop="machNumber" />
+      <el-table-column label="来流马赫数x" align="center" prop="machNumberX" />
+      <el-table-column label="来流马赫数y" align="center" prop="machNumberY" />
+      <el-table-column label="来流马赫数z" align="center" prop="machNumberZ" />
       <el-table-column label="飞行高度" align="center" prop="flightHeight" />
       <el-table-column label="OX坐标值" align="center" prop="oxCoordinate" />
       <el-table-column label="OY坐标值" align="center" prop="oyCoordinate" />
       <el-table-column label="OZ坐标值" align="center" prop="ozCoordinate" />
       <el-table-column label="压强" align="center" prop="pressure" />
-      <el-table-column label="流速" align="center" prop="flowVelocity" />
+      <el-table-column label="流速x" align="center" prop="flowVelocityX" />
+      <el-table-column label="流速y" align="center" prop="flowVelocityY" />
+      <el-table-column label="流速z" align="center" prop="flowVelocityZ" />
       <el-table-column label="密度" align="center" prop="density" />
       <el-table-column label="二氧化碳质量分数" align="center" prop="co2MassFraction" />
       <el-table-column label="一氧化碳质量分数" align="center" prop="coMassFraction" />
       <el-table-column label="水蒸气质量分数" align="center" prop="h2oMassFraction" />
+      <el-table-column label="温度" align="center" prop="temperature" />
       <!-- <el-table-column label="Fluent网格文件" align="center" prop="fluentGridFile" />
       <el-table-column label="Fluent网格文件路径" align="center" prop="fluentGridFilePath" />
       <el-table-column label="Fluent cas文件" align="center" prop="fluentCasFile" />
@@ -191,7 +236,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -203,7 +248,7 @@
     <!-- 添加或修改流场输入对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
-        <el-form-item label="3d模型" prop="machNumber">
+        <el-form-item label="3d模型" prop="model3dId">
           <el-select v-model="form.model3dId" placeholder="请选择3d模型">
             <el-option
               v-for="item in modelOption"
@@ -213,38 +258,53 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="来流马赫数" prop="machNumber">
-          <el-input v-model="form.machNumber" placeholder="请输入来流马赫数" />
+        <el-form-item label="来流马赫数x" prop="machNumberX">
+          <el-input-number v-model="form.machNumberX" placeholder="请输入来流马赫数x" :controls="false" precision="6" />
+        </el-form-item>
+        <el-form-item label="来流马赫数y" prop="machNumberY">
+          <el-input-number v-model="form.machNumberY" placeholder="请输入来流马赫数y" :controls="false" precision="6" />
+        </el-form-item>
+        <el-form-item label="来流马赫数z" prop="machNumberZ">
+          <el-input-number v-model="form.machNumberZ" placeholder="请输入来流马赫数z" :controls="false" precision="6" />
         </el-form-item>
         <el-form-item label="飞行高度" prop="flightHeight">
-          <el-input v-model="form.flightHeight" placeholder="请输入飞行高度" />
+          <el-input-number v-model="form.flightHeight" placeholder="请输入飞行高度" :controls="false" precision="6" />
         </el-form-item>
         <el-form-item label="OX坐标值" prop="oxCoordinate">
-          <el-input v-model="form.oxCoordinate" placeholder="请输入OX坐标值" />
+          <el-input-number v-model="form.oxCoordinate" placeholder="请输入OX坐标值" :controls="false" precision="6" />
         </el-form-item>
         <el-form-item label="OY坐标值" prop="oyCoordinate">
-          <el-input v-model="form.oyCoordinate" placeholder="请输入OY坐标值" />
+          <el-input-number v-model="form.oyCoordinate" placeholder="请输入OY坐标值" :controls="false" precision="6" />
         </el-form-item>
         <el-form-item label="OZ坐标值" prop="ozCoordinate">
-          <el-input v-model="form.ozCoordinate" placeholder="请输入OZ坐标值" />
+          <el-input-number v-model="form.ozCoordinate" placeholder="请输入OZ坐标值" :controls="false" precision="6" />
         </el-form-item>
         <el-form-item label="压强" prop="pressure">
-          <el-input v-model="form.pressure" placeholder="请输入压强" />
+          <el-input-number v-model="form.pressure" placeholder="请输入压强" :controls="false" precision="6" />
+        </el-form-item>
+        <el-form-item label="流速x" prop="flowVelocityX">
+          <el-input-number v-model="form.flowVelocityX" placeholder="请输入流速x" :controls="false" precision="6" />
+        </el-form-item>
+        <el-form-item label="流速y" prop="flowVelocityY">
+          <el-input-number v-model="form.flowVelocityY" placeholder="请输入流速y" :controls="false" precision="6" />
         </el-form-item>
-        <el-form-item label="流速" prop="flowVelocity">
-          <el-input v-model="form.flowVelocity" placeholder="请输入流速" />
+        <el-form-item label="流速z" prop="flowVelocityZ">
+          <el-input-number v-model="form.flowVelocityZ" placeholder="请输入流速z" :controls="false" precision="6" />
         </el-form-item>
         <el-form-item label="密度" prop="density">
-          <el-input v-model="form.density" placeholder="请输入密度" />
+          <el-input-number v-model="form.density" placeholder="请输入密度" :controls="false" precision="6" />
         </el-form-item>
         <el-form-item label="二氧化碳质量分数" prop="co2MassFraction">
-          <el-input v-model="form.co2MassFraction" placeholder="请输入二氧化碳质量分数" />
+          <el-input-number v-model="form.co2MassFraction" placeholder="请输入二氧化碳质量分数" :controls="false" precision="2"/>
         </el-form-item>
         <el-form-item label="一氧化碳质量分数" prop="coMassFraction">
-          <el-input v-model="form.coMassFraction" placeholder="请输入一氧化碳质量分数" />
+          <el-input-number v-model="form.coMassFraction" placeholder="请输入一氧化碳质量分数" :controls="false" precision="2"/>
         </el-form-item>
         <el-form-item label="水蒸气质量分数" prop="h2oMassFraction">
-          <el-input v-model="form.h2oMassFraction" placeholder="请输入水蒸气质量分数" />
+          <el-input-number v-model="form.h2oMassFraction" placeholder="请输入水蒸气质量分数" :controls="false" precision="2"/>
+        </el-form-item>
+        <el-form-item label="温度" prop="temperature">
+          <el-input-number v-model="form.temperature" placeholder="请输入温度" :controls="false" precision="6"/>
         </el-form-item>
         <!-- <el-form-item label="Fluent网格文件" prop="fluentGridFile">
           <file-upload v-model="form.fluentGridFile"/>
@@ -275,8 +335,8 @@
 
 <script>
 import { listFlowIn, getFlowIn, delFlowIn, addFlowIn, updateFlowIn } from "@/api/data/flowIn";
-import { getModelOption } from "@/api/data/model"
-
+import { getModelOption } from "@/api/data/model";
+getModelOption
 export default {
   name: "FlowIn",
   data() {
@@ -304,17 +364,22 @@ export default {
         pageNum: 1,
         pageSize: 10,
         model3dId: null,
-        machNumber: null,
+        machNumberX: null,
+        machNumberY: null,
+        machNumberZ: null,
         flightHeight: null,
         oxCoordinate: null,
         oyCoordinate: null,
         ozCoordinate: null,
         pressure: null,
-        flowVelocity: null,
+        flowVelocityX: null,
+        flowVelocityY: null,
+        flowVelocityZ: null,
         density: null,
         co2MassFraction: null,
         coMassFraction: null,
         h2oMassFraction: null,
+        temperature: null,
         fluentGridFile: null,
         fluentGridFilePath: null,
         fluentCasFile: null,
@@ -329,8 +394,14 @@ export default {
         model3dId: [
           { required: true, message: "3d模型主键不能为空", trigger: "change" }
         ],
-        machNumber: [
-          { required: true, message: "来流马赫数不能为空", trigger: "blur" }
+        machNumberX: [
+          { required: true, message: "来流马赫数X不能为空", trigger: "blur" }
+        ],
+        machNumberY: [
+          { required: true, message: "来流马赫数Y不能为空", trigger: "blur" }
+        ],
+        machNumberZ: [
+          { required: true, message: "来流马赫数Z不能为空", trigger: "blur" }
         ],
         flightHeight: [
           { required: true, message: "飞行高度不能为空", trigger: "blur" }
@@ -355,6 +426,9 @@ export default {
     this.getList();
     this.getOption();
   },
+  activated() {
+    this.getOption();
+  },
   methods: {
     /** 查询流场输入列表 */
     getList() {
@@ -375,17 +449,22 @@ export default {
       this.form = {
         id: null,
         model3dId: null,
-        machNumber: null,
+        machNumberX: null,
+        machNumberY: null,
+        machNumberZ: null,
         flightHeight: null,
         oxCoordinate: null,
         oyCoordinate: null,
         ozCoordinate: null,
         pressure: null,
-        flowVelocity: null,
+        flowVelocityX: null,
+        flowVelocityY: null,
+        flowVelocityZ: null,
         density: null,
         co2MassFraction: null,
         coMassFraction: null,
         h2oMassFraction: null,
+        temperature: null,
         fluentGridFile: null,
         fluentGridFilePath: null,
         fluentCasFile: null,
@@ -473,7 +552,9 @@ export default {
       })
     },
     getFileName(path) {
-      if (path.lastIndexOf("/") > -1) {
+      if (!path) {
+        return ''
+      } else if (path.lastIndexOf("/") > -1) {
         const newName = path.slice(path.lastIndexOf("/") + 1)
         const names = newName.split(".")
         if ((names.size = 2) && (names[0].length > 19)) {
@@ -482,7 +563,7 @@ export default {
           return newName
         }
       } else {
-        return "";
+        return '';
       }
     },
     download(path) {

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

@@ -15,6 +15,7 @@
           placeholder="请输入温度"
           clearable
           @keyup.enter.native="handleQuery"
+          :controls="false"
         />
       </el-form-item>
       <el-form-item label="二氧化碳" prop="co2">
@@ -23,6 +24,7 @@
           placeholder="请输入二氧化碳"
           clearable
           @keyup.enter.native="handleQuery"
+          :controls="false"
         />
       </el-form-item>
       <el-form-item label="一氧化碳" prop="co">
@@ -163,22 +165,22 @@
           <image-upload v-model="form.softScreenShootPath" :fileSize="10" :limit="1"/>
         </el-form-item>
         <el-form-item label="网格数" prop="gridNumber">
-          <el-input v-model="form.gridNumber" placeholder="请输入网格数" />
+          <el-input-number v-model="form.gridNumber" placeholder="请输入网格数" :controls="false" precision="0" />
         </el-form-item>
         <el-form-item label="是否为结构网格" prop="gridNumber">
           <el-checkbox v-model="form.isStructureGrid"></el-checkbox>
         </el-form-item>
         <el-form-item label="温度" prop="temperature">
-          <el-input v-model="form.temperature" placeholder="请输入温度" />
+          <el-input-number v-model="form.temperature" placeholder="请输入温度" :controls="false" precision="6" />
         </el-form-item>
         <el-form-item label="二氧化碳" prop="co2">
-          <el-input v-model="form.co2" placeholder="请输入二氧化碳" />
+          <el-input-number v-model="form.co2" placeholder="请输入二氧化碳" :controls="false" precision="6" />
         </el-form-item>
         <el-form-item label="一氧化碳" prop="co">
-          <el-input v-model="form.co" placeholder="请输入一氧化碳" />
+          <el-input-number v-model="form.co" placeholder="请输入一氧化碳" :controls="false" precision="6" />
         </el-form-item>
         <el-form-item label="水蒸气" prop="h2o">
-          <el-input v-model="form.h2o" placeholder="请输入水蒸气" />
+          <el-input-number v-model="form.h2o" placeholder="请输入水蒸气" :controls="false" precision="6" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -233,6 +235,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        outputFilePath: [
+          { required: true, message: "3d模型主键不能为空", trigger: "change" }
+        ],
       },
       fileType: ['dat', 'xlsx'],
     };
@@ -345,7 +350,9 @@ export default {
       }, `flowOut_${new Date().getTime()}.xlsx`)
     },
     getFileName(path) {
-      if (path.lastIndexOf("/") > -1) {
+      if (!path) {
+        return ''
+      } else if (path.lastIndexOf("/") > -1) {
         const newName = path.slice(path.lastIndexOf("/") + 1)
         const names = newName.split(".")
         if ((names.size = 2) && (names[0].length > 19)) {
@@ -354,7 +361,7 @@ export default {
           return newName
         }
       } else {
-        return "";
+        return '';
       }
     },
     download(path) {

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

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="表面材质" prop="surfaceMaterial">
         <el-input
           v-model="queryParams.surfaceMaterial"
@@ -115,15 +115,15 @@
 
     <!-- 添加或修改红外输入对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="表面材质" prop="flowFieldOutputPath">
-          <file-upload v-model="form.flowFieldOutputPath" :fileType="fileType" :fileSize="100" :limit="1"/>
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-form-item label="流场分析文件" prop="flowFieldOutputPath">
+          <file-upload v-model="form.flowFieldOutputPath" :fileType="fileType" :fileSize="100" :limit="1" />
         </el-form-item>
         <el-form-item label="表面材质" prop="surfaceMaterial">
-          <el-input v-model="form.surfaceMaterial" placeholder="请输入表面材质" />
+          <el-input v-model="form.surfaceMaterial" placeholder="请输入表面材质" :controls="false" precision="6" />
         </el-form-item>
         <el-form-item label="红外观测距离" prop="infraredObserDist">
-          <el-input v-model="form.infraredObserDist" placeholder="请输入红外观测距离" />
+          <el-input v-model="form.infraredObserDist" placeholder="请输入红外观测距离" :controls="false" precision="6" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -171,8 +171,8 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        flowFieldOutputId: [
-          { required: true, message: "流场输出结果编号不能为空", trigger: "change" }
+        flowFieldOutputPath: [
+          { required: true, message: "流场输出结果不能为空", trigger: "change" }
         ],
       },
       fileType: ['cas', 'dat']
@@ -279,7 +279,9 @@ export default {
       }, `infraredIn_${new Date().getTime()}.xlsx`)
     },
     getFileName(path) {
-      if (path.lastIndexOf("/") > -1) {
+      if (!path) {
+        return ''
+      } else if (path.lastIndexOf("/") > -1) {
         const newName = path.slice(path.lastIndexOf("/") + 1)
         const names = newName.split(".")
         if ((names.size = 2) && (names[0].length > 19)) {
@@ -288,7 +290,7 @@ export default {
           return newName
         }
       } else {
-        return "";
+        return '';
       }
     },
     download(path) {

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

@@ -111,7 +111,7 @@
           <file-upload v-model="form.outputFilePath" :fileType="fileType" :fileSize="100" :limit="1" />
         </el-form-item>
         <el-form-item label="红外辐射强度" prop="radiationIntensity">
-          <el-input v-model="form.radiationIntensity" placeholder="请输入红外辐射强度" />
+          <el-input-number v-model="form.radiationIntensity" placeholder="请输入红外辐射强度" :controls="false" precision="6" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -159,6 +159,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        outputFilePath:[
+          { required: true, message: "文件输出不能为空", trigger: "blur" }
+        ]
       },
       fileType: ['dat', 'xls', 'jpg', 'png']
     };
@@ -264,7 +267,9 @@ export default {
       }, `infraredOut_${new Date().getTime()}.xlsx`)
     },
     getFileName(path) {
-      if (path.lastIndexOf("/") > -1) {
+      if (!path) {
+        return ''
+      } else if (path.lastIndexOf("/") > -1) {
         const newName = path.slice(path.lastIndexOf("/") + 1)
         const names = newName.split(".")
         if ((names.size = 2) && (names[0].length > 19)) {
@@ -273,7 +278,7 @@ export default {
           return newName
         }
       } else {
-        return "";
+        return '';
       }
     },
     download(path) {

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

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <el-form-item label="3d模型名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -169,7 +169,7 @@ export default {
           { required: true, message: "3d模型不能为空", trigger: "blur" }
         ],
       },
-      fileType: ['max', 'dwg', 'dxf'],
+      fileType: ['x_t', 'IGS'],
     };
   },
   created() {
@@ -273,7 +273,9 @@ export default {
       }, `model_${new Date().getTime()}.xlsx`)
     },
     getFileName(path) {
-      if (path.lastIndexOf("/") > -1) {
+      if (!path) {
+        return ''
+      } else if (path.lastIndexOf("/") > -1) {
         const newName = path.slice(path.lastIndexOf("/") + 1)
         const names = newName.split(".")
         if ((names.size = 2) && (names[0].length > 19)) {
@@ -282,7 +284,7 @@ export default {
           return newName
         }
       } else {
-        return "";
+        return '';
       }
     },
     download(path) {

sql/ry_20230223.sql

@@ -740,7 +740,7 @@ CREATE TABLE bz_flow_field_input_t (
 	co2_mass_fraction DECIMAL ( 4, 2 ) COMMENT '二氧化碳质量分数',
 	co_mass_fraction DECIMAL ( 4, 2 ) COMMENT '一氧化碳质量分数',
 	h2o_mass_fraction DECIMAL ( 4, 2 ) COMMENT '水蒸气质量分数',
-	temperature DECIMAL ( 16, 6 ) COMMENT '温度'
+	temperature DECIMAL ( 16, 6 ) COMMENT '温度',
 	fluent_grid_file VARCHAR ( 255 ) COMMENT 'Fluent网格文件',
 	fluent_grid_file_path VARCHAR ( 511 ) COMMENT 'Fluent网格文件路径',
 	fluent_cas_file VARCHAR ( 255 ) COMMENT 'Fluent cas文件',
@@ -815,7 +815,6 @@ CREATE TABLE bz_infrared_output_t (
 	update_time datetime COMMENT '更新时间',
 PRIMARY KEY ( id )
 ) ENGINE = INNODB auto_increment = 1 COMMENT = '红外输出表';
-
 -- 菜单 SQL
 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
 values('3d模型', '2000', '1', 'model', 'data/model/index', 1, 0, 'C', '0', '0', 'data:model:list', '#', 'admin', sysdate(), '', null, '3d模型菜单');