文件上传参数

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -73,14 +73,14 @@ public class CommonController
      * 通用上传请求（单个）
      */
     @PostMapping("/upload")
-    public AjaxResult uploadFile(MultipartFile file) throws Exception
+    public AjaxResult uploadFile(String fileType, MultipartFile file) throws Exception
     {
         try
         {
             // 上传文件路径
             String filePath = RuoYiConfig.getUploadPath();
             // 上传并返回新文件名称
-            String fileName = FileUploadUtils.upload(filePath, file);
+            String fileName = FileUploadUtils.upload(filePath, fileType, file);
             String url = serverConfig.getUrl() + fileName;
             AjaxResult ajax = AjaxResult.success();
             ajax.put("url", url);

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -121,7 +121,7 @@ public class SysProfileController extends BaseController
         if (!file.isEmpty())
         {
             LoginUser loginUser = getLoginUser();
-            String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION);
+            String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), "头像", file, MimeTypeUtils.IMAGE_EXTENSION);
             if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
             {
                 AjaxResult ajax = AjaxResult.success();

oa-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java

@@ -54,11 +54,11 @@ public class FileUploadUtils
      * @return 文件名称
      * @throws Exception
      */
-    public static final String upload(MultipartFile file) throws IOException
+    public static final String upload(String fileType, MultipartFile file) throws IOException
     {
         try
         {
-            return upload(getDefaultBaseDir(), file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+            return upload(getDefaultBaseDir(), fileType, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
         }
         catch (Exception e)
         {
@@ -74,11 +74,11 @@ public class FileUploadUtils
      * @return 文件名称
      * @throws IOException
      */
-    public static final String upload(String baseDir, MultipartFile file) throws IOException
+    public static final String upload(String baseDir, String fileType, MultipartFile file) throws IOException
     {
         try
         {
-            return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+            return upload(baseDir, fileType, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
         }
         catch (Exception e)
         {
@@ -98,7 +98,7 @@ public class FileUploadUtils
      * @throws IOException 比如读写文件出错时
      * @throws InvalidExtensionException 文件校验异常
      */
-    public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension)
+    public static final String upload(String baseDir, String fileType, MultipartFile file, String[] allowedExtension)
             throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,
             InvalidExtensionException
     {
@@ -110,7 +110,7 @@ public class FileUploadUtils
 
         assertAllowed(file, allowedExtension);
 
-        String fileName = extractFilename(file);
+        String fileName = extractFilename(file, fileType);
 
         String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath();
         file.transferTo(Paths.get(absPath));
@@ -120,10 +120,13 @@ public class FileUploadUtils
     /**
      * 编码文件名
      */
-    public static final String extractFilename(MultipartFile file)
+    public static final String extractFilename(MultipartFile file, String fileType)
     {
-        return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
-                FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), getExtension(file));
+        //原始代码
+//        return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
+//                FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), getExtension(file));
+        return StringUtils.format("{}/{}.{}", fileType,
+                FilenameUtils.getBaseName(file.getOriginalFilename()), getExtension(file));
     }
 
     public static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProject.java

@@ -133,6 +133,22 @@ public class CmcProject extends BaseEntity
     @Excel(name = "kml文件的中心位置纬度")
     private String kmlLat;
 
+    /** 项目用车 */
+    @Excel(name = "项目用车")
+    private String cars;
+
+    /** 项目驾驶员 */
+    @Excel(name = "项目驾驶员")
+    private String drivers;
+
+    /** 项目设备 */
+    @Excel(name = "项目设备")
+    private String devices;
+
+    /** 项目参与人员 */
+    @Excel(name = "项目参与人员")
+    private String participates;
+
     public void setProjectId(String projectId)
     {
         this.projectId = projectId;
@@ -404,6 +420,38 @@ public class CmcProject extends BaseEntity
         return kmlLat;
     }
 
+    public String getCars()
+    {
+        return cars;
+    }
+    public void setDrivers(String drivers)
+    {
+        this.drivers = drivers;
+    }
+
+    public String getDrivers()
+    {
+        return drivers;
+    }
+    public void setDevices(String devices)
+    {
+        this.devices = devices;
+    }
+
+    public String getDevices()
+    {
+        return devices;
+    }
+    public void setParticipates(String participates)
+    {
+        this.participates = participates;
+    }
+
+    public String getParticipates()
+    {
+        return participates;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml

@@ -29,6 +29,10 @@
         <result property="projectCp"    column="project_cp"    />
         <result property="kmlLng"    column="kml_lng"    />
         <result property="kmlLat"    column="kml_lat"    />
+        <result property="cars"    column="cars"    />
+        <result property="drivers"    column="drivers"    />
+        <result property="devices"    column="devices"    />
+        <result property="participates"    column="participates"    />
         <association property="projectLeaderUser"    javaType="SysUser"         resultMap="ProjectLeaderResult" />
         <association property="projectRegistrantUser"    javaType="SysUser"         resultMap="ProjectRegistrantResult" />
         <association property="technicalDirectorUser"    javaType="SysUser"         resultMap="TechnicalDirectorResult" />
@@ -59,7 +63,7 @@
         select p.project_id, p.project_number, p.project_name, p.project_leader, u.nick_name as leader_nick_name, p.is_finished, p.project_source, p.party_a, p.contact_person, p.telephone,
                p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.register_time, p.plan_time,
                p.entry_time, p.exit_time, p.remark, c.technical_director, u2.nick_name as director_nick_name, c.quality_inspector, u3.nick_name as inspector_nick_name, u3.user_id as inspector_user_id,
-               p.project_kml, p.project_cp, p.kml_lng, p.kml_lat from cmc_project as p
+               p.project_kml, p.project_cp, p.kml_lng, p.kml_lat, p.cars, p.drivers, p.devices, p.participates from cmc_project as p
         left join sys_user as u on u.user_id = p.project_leader
         left join sys_user as u1 on u1.user_id = p.project_registrant
         left join cmc_technical as c on c.project_id = p.project_id
@@ -127,6 +131,10 @@
             <if test="projectCp != null">project_cp,</if>
             <if test="kmlLng != null">kml_lng,</if>
             <if test="kmlLat != null">kml_lat,</if>
+            <if test="cars != null">cars,</if>
+            <if test="drivers != null">drivers,</if>
+            <if test="devices != null">devices,</if>
+            <if test="participates != null">participates,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectId != null">#{projectId},</if>
@@ -153,6 +161,10 @@
             <if test="projectCp != null">#{projectCp},</if>
             <if test="kmlLng != null">#{kmlLng},</if>
             <if test="kmlLat != null">#{kmlLat},</if>
+            <if test="cars != null">#{cars},</if>
+            <if test="drivers != null">#{drivers},</if>
+            <if test="devices != null">#{devices},</if>
+            <if test="participates != null">#{participates},</if>
         </trim>
     </insert>
 
@@ -182,6 +194,10 @@
             <if test="projectCp != null">project_cp = #{projectCp},</if>
             <if test="kmlLng != null">kml_lng = #{kmlLng},</if>
             <if test="kmlLat != null">kml_lat = #{kmlLat},</if>
+            <if test="cars != null">cars = #{cars},</if>
+            <if test="drivers != null">drivers = #{drivers},</if>
+            <if test="devices != null">devices = #{devices},</if>
+            <if test="participates != null">participates = #{participates},</if>
         </trim>
         where project_id = #{projectId}
     </update>