dev run process

pdaaphm-admin/src/main/java/com/pdaaphm/system/controller/DataController.java

@@ -25,7 +25,7 @@ import com.pdaaphm.common.core.page.TableDataInfo;
  * 数据管理Controller
  * 
  * @author Allen
- * @date 2024-08-19
+ * @date 2024-08-20
  */
 @RestController
 @RequestMapping("/system/data")

pdaaphm-admin/src/main/java/com/pdaaphm/system/domain/Data.java

@@ -18,11 +18,16 @@ public class Data extends BaseEntity
     /** 编号 */
     private Long id;
 
+    /** 数据名称 */
+    @Excel(name = "数据名称")
+    private String dataName;
+
     /** 数据类型（1原始，2补全结果，3扩充结果，4特称提取结果，5退化评估结果，6故障预测结果） */
     @Excel(name = "数据类型", readConverterExp = "1=原始，2补全结果，3扩充结果，4特称提取结果，5退化评估结果，6故障预测结果")
     private String dataType;
 
     /** 数据路径 */
+    @Excel(name = "数据路径")
     private String dataPath;
 
     public void setId(Long id) 
@@ -34,6 +39,15 @@ public class Data extends BaseEntity
     {
         return id;
     }
+    public void setDataName(String dataName) 
+    {
+        this.dataName = dataName;
+    }
+
+    public String getDataName() 
+    {
+        return dataName;
+    }
     public void setDataType(String dataType) 
     {
         this.dataType = dataType;
@@ -57,6 +71,7 @@ public class Data extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
+            .append("dataName", getDataName())
             .append("dataType", getDataType())
             .append("dataPath", getDataPath())
             .append("createBy", getCreateBy())

pdaaphm-admin/src/main/resources/mapper/system/DataMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="Data" id="DataResult">
         <result property="id"    column="id"    />
+        <result property="dataName"    column="data_name"    />
         <result property="dataType"    column="data_type"    />
         <result property="dataPath"    column="data_path"    />
         <result property="createBy"    column="create_by"    />
@@ -16,15 +17,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDataVo">
-        select id, data_type, data_path, create_by, create_time, update_by, update_time, remark from t_data
+        select id, data_name, data_type, data_path, create_by, create_time, update_by, update_time, remark from t_data
     </sql>
 
     <select id="selectDataList" parameterType="Data" resultMap="DataResult">
         <include refid="selectDataVo"/>
         <where>  
+            <if test="dataName != null  and dataName != ''"> and data_name like concat('%', #{dataName}, '%')</if>
             <if test="dataType != null  and dataType != ''"> and data_type = #{dataType}</if>
+            <if test="dataPath != null  and dataPath != ''"> and data_path = #{dataPath}</if>
         </where>
-        order by create_time desc
     </select>
     
     <select id="selectDataById" parameterType="Long" resultMap="DataResult">
@@ -35,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertData" parameterType="Data" useGeneratedKeys="true" keyProperty="id">
         insert into t_data
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="dataName != null">data_name,</if>
             <if test="dataType != null and dataType != ''">data_type,</if>
             <if test="dataPath != null">data_path,</if>
             <if test="createBy != null">create_by,</if>
@@ -44,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="dataName != null">#{dataName},</if>
             <if test="dataType != null and dataType != ''">#{dataType},</if>
             <if test="dataPath != null">#{dataPath},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -57,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateData" parameterType="Data">
         update t_data
         <trim prefix="SET" suffixOverrides=",">
+            <if test="dataName != null">data_name = #{dataName},</if>
             <if test="dataType != null and dataType != ''">data_type = #{dataType},</if>
             <if test="dataPath != null">data_path = #{dataPath},</if>
             <if test="createBy != null">create_by = #{createBy},</if>

pdaaphm-ui/src/views/system/data/index.vue

@@ -1,6 +1,14 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="数据名称" prop="dataName">
+        <el-input
+          v-model="queryParams.dataName"
+          placeholder="请输入数据名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="数据类型" prop="dataType">
         <el-select v-model="queryParams.dataType" placeholder="请选择数据类型" clearable>
           <el-option
@@ -66,11 +74,13 @@
     <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="数据名称" align="center" prop="dataName" />
       <el-table-column label="数据类型" align="center" prop="dataType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.biz_data_type" :value="scope.row.dataType"/>
         </template>
       </el-table-column>
+      <el-table-column label="数据路径" align="center" prop="dataPath" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -91,7 +101,7 @@
         </template>
       </el-table-column>
     </el-table>
-
+    
     <pagination
       v-show="total>0"
       :total="total"
@@ -103,6 +113,9 @@
     <!-- 添加或修改数据管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="数据名称" prop="dataName">
+          <el-input v-model="form.dataName" placeholder="请输入数据名称" />
+        </el-form-item>
         <el-form-item label="数据类型" prop="dataType">
           <el-radio-group v-model="form.dataType">
             <el-radio
@@ -113,7 +126,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="数据路径" prop="dataPath">
-          <file-upload v-model="form.dataPath"/>
+          <el-input v-model="form.dataPath" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -157,7 +170,9 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        dataName: null,
         dataType: null,
+        dataPath: null,
       },
       // 表单参数
       form: {},
@@ -191,6 +206,7 @@ export default {
     reset() {
       this.form = {
         id: null,
+        dataName: null,
         dataType: null,
         dataPath: null,
         createBy: null,