ZhuDeKang 4 ماه پیش
والد
کامیت
90e380dad3

+ 1 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -93,6 +93,7 @@ public class CommonController {
             ajax.put("newFileName", FileUtils.getName(fileName));
             ajax.put("originalFilename", file.getOriginalFilename());
             return ajax;
+            
         } catch (Exception e) {
             return AjaxResult.error(e.getMessage());
         }

+ 10 - 1
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/domain/MdDataSetFile.java

@@ -26,6 +26,7 @@ public class MdDataSetFile extends BaseEntity
     /** 文件路径 */
     @Excel(name = "文件路径")
     private String filePath;
+    private String originalFilename;
 
     /** 文件类型 */
     @Excel(name = "文件类型")
@@ -35,7 +36,15 @@ public class MdDataSetFile extends BaseEntity
     @Excel(name = "参数列表")
     private String pars;
 
-    public void setId(Long id) 
+    public String getOriginalFilename() {
+        return originalFilename;
+    }
+
+    public void setOriginalFilename(String originalFilename) {
+        this.originalFilename = originalFilename;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }

+ 6 - 1
ruoyi-api-patform/src/main/resources/mapper/interfaces/MdDataSetFileMapper.xml

@@ -8,12 +8,13 @@
         <result property="id"    column="ID"    />
         <result property="dcCode"    column="DC_CODE"    />
         <result property="filePath"    column="FILE_PATH"    />
+        <result property="originalFilename"    column="ORIGINAL_FILENAME"    />
         <result property="fileType"    column="FILE_TYPE"    />
         <result property="pars"    column="PARS"    />
     </resultMap>
 
     <sql id="selectMdDataSetFileVo">
-        select ID, DC_CODE, FILE_PATH, FILE_TYPE, PARS from md_data_set_file
+        select ID, DC_CODE, FILE_PATH,ORIGINAL_FILENAME, FILE_TYPE, PARS from md_data_set_file
     </sql>
 
     <select id="selectMdDataSetFileList" parameterType="com.ruoyi.interfaces.domain.MdDataSetFile" resultMap="MdDataSetFileResult">
@@ -22,6 +23,7 @@
             <if test="id != null "> and ID = #{id}</if>
             <if test="dcCode != null  and dcCode != ''"> and DC_CODE = #{dcCode}</if>
             <if test="filePath != null  and filePath != ''"> and FILE_PATH = #{filePath}</if>
+            <if test="originalFilename != null  and originalFilename != ''"> and ORIGINAL_FILENAME = #{originalFilename}</if>
             <if test="fileType != null  and fileType != ''"> and FILE_TYPE = #{fileType}</if>
             <if test="pars != null  and pars != ''"> and PARS = #{pars}</if>
         </where>
@@ -37,12 +39,14 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="dcCode != null">DC_CODE,</if>
             <if test="filePath != null">FILE_PATH,</if>
+            <if test="originalFilename != null">ORIGINAL_FILENAME,</if>
             <if test="fileType != null">FILE_TYPE,</if>
             <if test="pars != null">PARS,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="dcCode != null">#{dcCode},</if>
             <if test="filePath != null">#{filePath},</if>
+            <if test="originalFilename != null">#{originalFilename},</if>
             <if test="fileType != null">#{fileType},</if>
             <if test="pars != null">#{pars},</if>
         </trim>
@@ -53,6 +57,7 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="dcCode != null">DC_CODE = #{dcCode},</if>
             <if test="filePath != null">FILE_PATH = #{filePath},</if>
+            <if test="originalFilename != null">ORIGINAL_FILENAME = #{originalFilename},</if>
             <if test="fileType != null">FILE_TYPE = #{fileType},</if>
             <if test="pars != null">PARS = #{pars},</if>
         </trim>