From 86164c8f03ba37c81bf91b0b73532ccac2654e92 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Mon, 20 Oct 2025 08:59:43 +0800
Subject: [PATCH] 1.新增修改时增加操作人。 2.默认参数优化。
---
ard-route/src/main/java/com/ard/route/domain/ArdRouteFile.java | 14 ---
ard-route/src/main/java/com/ard/route/mapper/ArdRouteFileMapper.java | 8 ++
ard-route/src/main/resources/mapper/ArdRouteFileMapper.xml | 48 ++++++------
ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml | 51 +++++-------
ard-route/src/main/java/com/ard/route/service/IArdRouteFolderService.java | 4
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFileServiceImpl.java | 4 +
ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFolderController.java | 14 +++
ard-route/src/main/java/com/ard/route/domain/ArdRouteFolder.java | 20 ----
ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFileController.java | 2
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java | 46 ++++++++++-
10 files changed, 117 insertions(+), 94 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFileController.java b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFileController.java
index 8012075..3fa81b3 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFileController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFileController.java
@@ -81,6 +81,7 @@
@Log(title = "文件", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ArdRouteFile ardRouteFile) {
+ ardRouteFile.setCreateBy(getUsername());
return toAjax(ardRouteFileService.insertArdRouteFile(ardRouteFile));
}
@@ -92,6 +93,7 @@
@Log(title = "文件", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ArdRouteFile ardRouteFile) {
+ ardRouteFile.setUpdateBy(getUsername());
return toAjax(ardRouteFileService.updateArdRouteFile(ardRouteFile));
}
diff --git a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFolderController.java b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFolderController.java
index b41e8c2..f60b012 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFolderController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFolderController.java
@@ -1,6 +1,7 @@
package com.ard.web.controller.route;
import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import com.ard.common.annotation.Log;
@@ -81,6 +82,7 @@
@Log(title = "文件夹", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ArdRouteFolder ardRouteFolder) {
+ ardRouteFolder.setCreateBy(getUsername());
return toAjax(ardRouteFolderService.insertArdRouteFolder(ardRouteFolder));
}
@@ -92,6 +94,7 @@
@Log(title = "文件夹", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ArdRouteFolder ardRouteFolder) {
+ ardRouteFolder.setUpdateBy(getUsername());
return toAjax(ardRouteFolderService.updateArdRouteFolder(ardRouteFolder));
}
@@ -103,6 +106,15 @@
@Log(title = "文件夹", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
- return toAjax(ardRouteFolderService.deleteArdRouteFolderByIds(ids));
+ try {
+ Map<String, Integer> result = ardRouteFolderService.deleteArdRouteFolderByIds(ids);
+ if (!result.isEmpty()) {
+ return AjaxResult.success("删除成功.文件夹删除" + result.get("folder") + "文件删除" + result.get("file"));
+ } else {
+ return AjaxResult.success("没有删除文件夹信息。");
+ }
+ } catch(Exception e){
+ return AjaxResult.error(e.getMessage());
+ }
}
}
diff --git a/ard-route/src/main/java/com/ard/route/domain/ArdRouteFile.java b/ard-route/src/main/java/com/ard/route/domain/ArdRouteFile.java
index 2681ae1..7c86914 100644
--- a/ard-route/src/main/java/com/ard/route/domain/ArdRouteFile.java
+++ b/ard-route/src/main/java/com/ard/route/domain/ArdRouteFile.java
@@ -42,18 +42,4 @@
@Excel(name = "文件存储路径")
private String filePath;
- /** 创建者 */
- @Excel(name = "创建者")
- private String createdBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createdTime;
-
- /** 修改者 */
- @Excel(name = "修改者")
- private String updatedBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updatedTime;
-
}
diff --git a/ard-route/src/main/java/com/ard/route/domain/ArdRouteFolder.java b/ard-route/src/main/java/com/ard/route/domain/ArdRouteFolder.java
index e51a53a..f3757d7 100644
--- a/ard-route/src/main/java/com/ard/route/domain/ArdRouteFolder.java
+++ b/ard-route/src/main/java/com/ard/route/domain/ArdRouteFolder.java
@@ -1,11 +1,9 @@
package com.ard.route.domain;
-import java.util.Date;
import java.util.List;
import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
/**
@@ -26,22 +24,6 @@
@Excel(name = "文件夹名称")
private String fileName;
- /** 创建者 */
- @Excel(name = "创建者")
- private String createdBy;
-
- /** 创建时间 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createdTime;
-
- /** 修改者 */
- @Excel(name = "修改者")
- private String updatedBy;
-
- /** 修改时间 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updatedTime;
-
- private List<ArdRouteFile> ardRouteFile;
+ private List<ArdRouteFile> ardRouteFileLs;
}
diff --git a/ard-route/src/main/java/com/ard/route/mapper/ArdRouteFileMapper.java b/ard-route/src/main/java/com/ard/route/mapper/ArdRouteFileMapper.java
index c52688a..bc965b2 100644
--- a/ard-route/src/main/java/com/ard/route/mapper/ArdRouteFileMapper.java
+++ b/ard-route/src/main/java/com/ard/route/mapper/ArdRouteFileMapper.java
@@ -58,4 +58,12 @@
* @return 结果
*/
public int deleteArdRouteFileByIds(String[] ids);
+
+ /**
+ * 根据所属文件夹ID，删除文件
+ *
+ * @param folderId 所属文件夹ID
+ * @return 结果
+ */
+ public int deleteArdRouteFileByFolderId(String folderId);
}
diff --git a/ard-route/src/main/java/com/ard/route/service/IArdRouteFolderService.java b/ard-route/src/main/java/com/ard/route/service/IArdRouteFolderService.java
index aef4c03..652673b 100644
--- a/ard-route/src/main/java/com/ard/route/service/IArdRouteFolderService.java
+++ b/ard-route/src/main/java/com/ard/route/service/IArdRouteFolderService.java
@@ -1,6 +1,8 @@
package com.ard.route.service;
import java.util.List;
+import java.util.Map;
+
import com.ard.route.domain.ArdRouteFolder;
/**
@@ -49,7 +51,7 @@
* @param ids 需要删除的文件夹主键集合
* @return 结果
*/
- public int deleteArdRouteFolderByIds(String[] ids);
+ public Map<String, Integer> deleteArdRouteFolderByIds(String[] ids);
/**
* 删除文件夹信息
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFileServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFileServiceImpl.java
index c16378f..175ba15 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFileServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFileServiceImpl.java
@@ -4,6 +4,8 @@
import java.util.UUID;
import com.ard.common.annotation.DataScope;
+import com.ard.common.utils.DateUtils;
+import com.ard.common.utils.SecurityUtils;
import com.ard.common.utils.uuid.IdUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -55,6 +57,7 @@
@Override
public int insertArdRouteFile(ArdRouteFile ardRouteFile) {
ardRouteFile.setId(IdUtils.simpleUUID());
+ ardRouteFile.setCreateTime(DateUtils.getNowDate());
return ardRouteFileMapper.insertArdRouteFile(ardRouteFile);
}
@@ -66,6 +69,7 @@
*/
@Override
public int updateArdRouteFile(ArdRouteFile ardRouteFile) {
+ ardRouteFile.setUpdateTime(DateUtils.getNowDate());
return ardRouteFileMapper.updateArdRouteFile(ardRouteFile);
}
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java
index 8837a9d..2b0a1b3 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java
@@ -1,14 +1,21 @@
package com.ard.route.service.impl;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import com.ard.common.annotation.DataScope;
+import com.ard.common.utils.DateUtils;
+import com.ard.common.utils.SecurityUtils;
import com.ard.common.utils.uuid.IdUtils;
+import com.ard.route.domain.ArdRouteFile;
+import com.ard.route.mapper.ArdRouteFileMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.route.mapper.ArdRouteFolderMapper;
import com.ard.route.domain.ArdRouteFolder;
import com.ard.route.service.IArdRouteFolderService;
+import org.springframework.transaction.annotation.Transactional;
/**
* 文件夹Service业务层处理
@@ -22,6 +29,9 @@
@Autowired
private ArdRouteFolderMapper ardRouteFolderMapper;
+ @Autowired
+ private ArdRouteFileMapper ardRouteFileMapper;
+
/**
* 查询文件夹
*
@@ -30,7 +40,9 @@
*/
@Override
public ArdRouteFolder selectArdRouteFolderById(String id) {
- return ardRouteFolderMapper.selectArdRouteFolderById(id);
+ ArdRouteFolder ardRouteFolder = ardRouteFolderMapper.selectArdRouteFolderById(id);
+ ardRouteFolder.setArdRouteFileLs(getArdRouteFiles(id));
+ return ardRouteFolder;
}
/**
@@ -42,7 +54,20 @@
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public List<ArdRouteFolder> selectArdRouteFolderList(ArdRouteFolder ardRouteFolder) {
- return ardRouteFolderMapper.selectArdRouteFolderList(ardRouteFolder);
+ List<ArdRouteFolder> list = ardRouteFolderMapper.selectArdRouteFolderList(ardRouteFolder);
+ for (ArdRouteFolder routeFolder : list) {
+ routeFolder.setArdRouteFileLs(getArdRouteFiles(routeFolder.getId()));
+ }
+ return list;
+ }
+
+ /**
+ * 查询文件列表
+ */
+ private List<ArdRouteFile> getArdRouteFiles(String folderId) {
+ ArdRouteFile ardRouteFile = new ArdRouteFile();
+ ardRouteFile.setFolderId(folderId);
+ return ardRouteFileMapper.selectArdRouteFileList(ardRouteFile);
}
/**
@@ -54,6 +79,7 @@
@Override
public int insertArdRouteFolder(ArdRouteFolder ardRouteFolder) {
ardRouteFolder.setId(IdUtils.simpleUUID());
+ ardRouteFolder.setCreateTime(DateUtils.getNowDate());
return ardRouteFolderMapper.insertArdRouteFolder(ardRouteFolder);
}
@@ -65,6 +91,7 @@
*/
@Override
public int updateArdRouteFolder(ArdRouteFolder ardRouteFolder) {
+ ardRouteFolder.setUpdateTime(DateUtils.getNowDate());
return ardRouteFolderMapper.updateArdRouteFolder(ardRouteFolder);
}
@@ -75,8 +102,19 @@
* @return 结果
*/
@Override
- public int deleteArdRouteFolderByIds(String[] ids) {
- return ardRouteFolderMapper.deleteArdRouteFolderByIds(ids);
+ @Transactional(rollbackFor = Exception.class)
+ public Map<String, Integer> deleteArdRouteFolderByIds(String[] ids) {
+ Map<String, Integer> result = new HashMap<>();
+ int fileAdd = 0;
+ // 删除文件夹的同时也删除文件夹下的所有文件
+ for (String folderId : ids) {
+ ardRouteFileMapper.deleteArdRouteFileByFolderId(folderId);
+ fileAdd ++;
+ }
+ result.put("file", fileAdd);
+ int folderCount = ardRouteFolderMapper.deleteArdRouteFolderByIds(ids);
+ result.put("folder", folderCount);
+ return result;
}
/**
diff --git a/ard-route/src/main/resources/mapper/ArdRouteFileMapper.xml b/ard-route/src/main/resources/mapper/ArdRouteFileMapper.xml
index 54c6a5b..1a64382 100644
--- a/ard-route/src/main/resources/mapper/ArdRouteFileMapper.xml
+++ b/ard-route/src/main/resources/mapper/ArdRouteFileMapper.xml
@@ -11,10 +11,10 @@
<result property="fileType" column="file_type" />
<result property="fileSize" column="file_size" />
<result property="filePath" column="file_path" />
- <result property="createdBy" column="created_by" />
- <result property="createdTime" column="created_time" />
- <result property="updatedBy" column="updated_by" />
- <result property="updatedTime" column="updated_time" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectArdRouteFileVo">
@@ -24,10 +24,10 @@
file_type,
file_size,
file_path,
- created_by,
- created_time,
- updated_by,
- updated_time
+ create_by,
+ create_time,
+ update_by,
+ update_time
from ard_route_file
</sql>
@@ -39,10 +39,6 @@
<if test="fileType != null and fileType != ''"> and file_type = #{fileType}</if>
<if test="fileSize != null "> and file_size = #{fileSize}</if>
<if test="filePath != null and filePath != ''"> and file_path = #{filePath}</if>
- <if test="createdBy != null and createdBy != ''"> and created_by = #{createdBy}</if>
- <if test="createdTime != null "> and created_time = #{createdTime}</if>
- <if test="updatedBy != null and updatedBy != ''"> and updated_by = #{updatedBy}</if>
- <if test="updatedTime != null "> and updated_time = #{updatedTime}</if>
</where>
</select>
@@ -60,10 +56,10 @@
<if test="fileType != null">file_type,</if>
<if test="fileSize != null">file_size,</if>
<if test="filePath != null">file_path,</if>
- <if test="createdBy != null">created_by,</if>
- <if test="createdTime != null">created_time,</if>
- <if test="updatedBy != null">updated_by,</if>
- <if test="updatedTime != null">updated_time,</if>
+ <if test="createBy != null">create_by,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="updateBy != null">update_by,</if>
+ <if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -72,10 +68,10 @@
<if test="fileType != null">#{fileType},</if>
<if test="fileSize != null">#{fileSize},</if>
<if test="filePath != null">#{filePath},</if>
- <if test="createdBy != null">#{createdBy},</if>
- <if test="createdTime != null">#{createdTime},</if>
- <if test="updatedBy != null">#{updatedBy},</if>
- <if test="updatedTime != null">#{updatedTime},</if>
+ <if test="createBy != null">#{createBy},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="updateBy != null">#{updateBy},</if>
+ <if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
@@ -87,10 +83,10 @@
<if test="fileType != null">file_type = #{fileType},</if>
<if test="fileSize != null">file_size = #{fileSize},</if>
<if test="filePath != null">file_path = #{filePath},</if>
- <if test="createdBy != null">created_by = #{createdBy},</if>
- <if test="createdTime != null">created_time = #{createdTime},</if>
- <if test="updatedBy != null">updated_by = #{updatedBy},</if>
- <if test="updatedTime != null">updated_time = #{updatedTime},</if>
+ <if test="createBy != null">create_by = #{createBy},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="updateBy != null">update_by = #{updateBy},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
@@ -99,6 +95,10 @@
delete from ard_route_file where id = #{id}
</delete>
+ <delete id="deleteArdRouteFileByFolderId" parameterType="String">
+ delete from ard_route_file where folder_id = #{folderId}
+ </delete>
+
<delete id="deleteArdRouteFileByIds" parameterType="String">
delete from ard_route_file where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
diff --git a/ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml b/ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml
index 25bde7e..29385ce 100644
--- a/ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml
+++ b/ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml
@@ -7,17 +7,10 @@
<resultMap type="ArdRouteFolder" id="ArdRouteFolderResult">
<result property="id" column="id" />
<result property="fileName" column="file_name" />
- <result property="createdBy" column="created_by" />
- <result property="createdTime" column="created_time" />
- <result property="updatedBy" column="updated_by" />
- <result property="updatedTime" column="updated_time" />
- <!-- 关联 ArdRouteFile 对象 -->
- <association property="ardRouteFile"
- javaType="com.ard.route.domain.ArdRouteFile"
- column="folder_id"
- autoMapping="true"
- select="selectArdRouteFile">
- </association>
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
</resultMap>
<select id="selectArdRouteFile" resultType="com.ard.route.domain.ArdRouteFile">
@@ -27,10 +20,10 @@
<sql id="selectArdRouteFolderVo">
select id,
file_name,
- created_by,
- created_time,
- updated_by,
- updated_time
+ create_by,
+ create_time,
+ update_by,
+ update_time
from ard_route_folder
</sql>
@@ -38,10 +31,6 @@
<include refid="selectArdRouteFolderVo"/>
<where>
<if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
- <if test="createdBy != null and createdBy != ''"> and created_by = #{createdBy}</if>
- <if test="createdTime != null "> and created_time = #{createdTime}</if>
- <if test="updatedBy != null and updatedBy != ''"> and updated_by = #{updatedBy}</if>
- <if test="updatedTime != null "> and updated_time = #{updatedTime}</if>
</where>
</select>
@@ -55,18 +44,18 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="fileName != null">file_name,</if>
- <if test="createdBy != null">created_by,</if>
- <if test="createdTime != null">created_time,</if>
- <if test="updatedBy != null">updated_by,</if>
- <if test="updatedTime != null">updated_time,</if>
+ <if test="createBy != null">create_by,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="updateBy != null">update_by,</if>
+ <if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="fileName != null">#{fileName},</if>
- <if test="createdBy != null">#{createdBy},</if>
- <if test="createdTime != null">#{createdTime},</if>
- <if test="updatedBy != null">#{updatedBy},</if>
- <if test="updatedTime != null">#{updatedTime},</if>
+ <if test="createBy != null">#{createBy},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="updateBy != null">#{updateBy},</if>
+ <if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
@@ -74,10 +63,10 @@
update ard_route_folder
<trim prefix="SET" suffixOverrides=",">
<if test="fileName != null">file_name = #{fileName},</if>
- <if test="createdBy != null">created_by = #{createdBy},</if>
- <if test="createdTime != null">created_time = #{createdTime},</if>
- <if test="updatedBy != null">updated_by = #{updatedBy},</if>
- <if test="updatedTime != null">updated_time = #{updatedTime},</if>
+ <if test="createBy != null">create_by = #{createBy},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="updateBy != null">update_by = #{updateBy},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3