From 84e29c9adb718b42a693e954d2b771651ef36796 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 12 八月 2026 17:20:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fix/hsy/20260811' into dev_business
---
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java | 31 +++++
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImpl.java | 54 +++++++++
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptImportRespVO.java | 24 ++++
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java | 2
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/statistics/SrmStatisticsServiceImpl.java | 3
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostImportRespVO.java | 24 ++++
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java | 34 +++++
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java | 83 +++++++++++++
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptImportExcelVO.java | 37 ++++++
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java | 11 +
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostImportExcelVO.java | 34 +++++
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostService.java | 11 +
12 files changed, 347 insertions(+), 1 deletions(-)
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/statistics/SrmStatisticsServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/statistics/SrmStatisticsServiceImpl.java
index 9500bcd..47a2a67 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/statistics/SrmStatisticsServiceImpl.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/statistics/SrmStatisticsServiceImpl.java
@@ -44,12 +44,15 @@
.apply("YEAR(create_time) = {0}", year));
long totalTenderCount = projects.size();
+ //鎷涙爣鎬婚噾棰�(棰勭畻閲戦)
BigDecimal totalTenderAmount = projects.stream()
.map(p -> p.getBudgetAmount() != null ? p.getBudgetAmount() : BigDecimal.ZERO)
.reduce(BigDecimal.ZERO, BigDecimal::add);
+ //瀹氭爣鎬婚噾棰�(涓爣閲戦)
BigDecimal totalAwardAmount = awards.stream()
.map(a -> a.getAwardAmount() != null ? a.getAwardAmount() : BigDecimal.ZERO)
.reduce(BigDecimal.ZERO, BigDecimal::add);
+ //鑺傜害閲戦(棰勭畻閲戦-涓爣閲戦)
BigDecimal savedAmount = totalTenderAmount.subtract(totalAwardAmount);
long supplierCount = bids.stream()
.map(SrmTenderBidDO::getSupplierId)
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
index 7a243b7..5e33b96 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
@@ -7,17 +7,25 @@
import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptRespVO;
import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptSaveReqVO;
import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptSimpleRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptImportExcelVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptImportRespVO;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
import cn.iocoder.yudao.module.system.service.dept.DeptService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import jakarta.servlet.http.HttpServletResponse;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
+import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -90,4 +98,27 @@
return success(BeanUtils.toBean(dept, DeptRespVO.class));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆閮ㄩ棬妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ List<DeptImportExcelVO> list = Arrays.asList(
+ DeptImportExcelVO.builder().name("鐮斿彂閮�").parentPath("鎬诲叕鍙�").sort(1).status(CommonStatusEnum.ENABLE.getStatus()).build(),
+ DeptImportExcelVO.builder().name("璐㈠姟閮�").parentPath("鎬诲叕鍙�").sort(2).status(CommonStatusEnum.ENABLE.getStatus()).build()
+ );
+ ExcelUtils.write(response, "閮ㄩ棬瀵煎叆妯℃澘.xls", "閮ㄩ棬鍒楄〃", DeptImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆閮ㄩ棬")
+ @Parameters({
+ @Parameter(name = "file", description = "Excel 鏂囦欢", required = true),
+ @Parameter(name = "updateSupport", description = "鏄惁鏀寔鏇存柊锛岄粯璁や负 false", example = "true")
+ })
+ @PreAuthorize("@ss.hasPermission('system:dept:import')")
+ public CommonResult<DeptImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<DeptImportExcelVO> list = ExcelUtils.read(file, DeptImportExcelVO.class);
+ return success(deptService.importDeptList(list, updateSupport));
+ }
+
}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
index b8d2472..c98349c 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
@@ -11,6 +11,8 @@
import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostRespVO;
import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostSaveReqVO;
import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostSimpleRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostImportExcelVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostImportRespVO;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO;
import cn.iocoder.yudao.module.system.service.dept.PostService;
import io.swagger.v3.oas.annotations.Operation;
@@ -22,8 +24,11 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import io.swagger.v3.oas.annotations.Parameters;
import java.io.IOException;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@@ -100,7 +105,7 @@
}
@GetMapping("/export-excel")
- @Operation(summary = "宀椾綅绠＄悊")
+ @Operation(summary = "瀵煎嚭宀椾綅 Excel")
@PreAuthorize("@ss.hasPermission('system:post:export')")
@ApiAccessLog(operateType = EXPORT)
public void export(HttpServletResponse response, @Validated PostPageReqVO reqVO) throws IOException {
@@ -111,4 +116,31 @@
BeanUtils.toBean(list, PostRespVO.class));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆宀椾綅妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<PostImportExcelVO> list = Arrays.asList(
+ PostImportExcelVO.builder().name("鍏ㄦ爤寮�鍙�").code("fullstack").sort(1)
+ .status(CommonStatusEnum.ENABLE.getStatus()).remark("鍏ㄦ爤寮�鍙戝伐绋嬪笀").build(),
+ PostImportExcelVO.builder().name("鍓嶇寮�鍙�").code("frontend").sort(2)
+ .status(CommonStatusEnum.ENABLE.getStatus()).remark("鍓嶇寮�鍙戝伐绋嬪笀").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "宀椾綅瀵煎叆妯℃澘.xls", "宀椾綅鍒楄〃", PostImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆宀椾綅")
+ @Parameters({
+ @Parameter(name = "file", description = "Excel 鏂囦欢", required = true),
+ @Parameter(name = "updateSupport", description = "鏄惁鏀寔鏇存柊锛岄粯璁や负 false", example = "true")
+ })
+ @PreAuthorize("@ss.hasPermission('system:post:import')")
+ public CommonResult<PostImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<PostImportExcelVO> list = ExcelUtils.read(file, PostImportExcelVO.class);
+ return success(postService.importPostList(list, updateSupport));
+ }
+
}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptImportExcelVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptImportExcelVO.java
new file mode 100644
index 0000000..86b3435
--- /dev/null
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptImportExcelVO.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeptImportExcelVO {
+
+ @ExcelProperty("閮ㄩ棬鍚嶇О")
+ private String name;
+
+ @ExcelProperty("涓婄骇閮ㄩ棬鍏ㄨ矾寰�")
+ private String parentPath;
+
+ @ExcelProperty("鏄剧ず椤哄簭")
+ private Integer sort;
+
+ @ExcelProperty("鑱旂郴鐢佃瘽")
+ private String phone;
+
+ @ExcelProperty("閭")
+ private String email;
+
+ @ExcelProperty(value = "鐘舵��", converter = DictConvert.class)
+ @DictFormat(DictTypeConstants.COMMON_STATUS)
+ private Integer status;
+
+}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptImportRespVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptImportRespVO.java
new file mode 100644
index 0000000..a7fe55a
--- /dev/null
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptImportRespVO.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Schema(description = "绠＄悊鍚庡彴 - 閮ㄩ棬瀵煎叆 Response VO")
+@Data
+@Builder
+public class DeptImportRespVO {
+
+ @Schema(description = "鍒涘缓鎴愬姛鐨勯儴闂ㄦ暟缁�", requiredMode = Schema.RequiredMode.REQUIRED)
+ private List<String> createDeptNames;
+
+ @Schema(description = "鏇存柊鎴愬姛鐨勯儴闂ㄦ暟缁�", requiredMode = Schema.RequiredMode.REQUIRED)
+ private List<String> updateDeptNames;
+
+ @Schema(description = "瀵煎叆澶辫触鐨勯儴闂ㄩ泦鍚� key 涓洪儴闂ㄥ悕锛寁alue 涓哄け璐ュ師鍥�", requiredMode = Schema.RequiredMode.REQUIRED)
+ private Map<String, String> failureDeptNames;
+
+}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostImportExcelVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostImportExcelVO.java
new file mode 100644
index 0000000..24a2c64
--- /dev/null
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostImportExcelVO.java
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class PostImportExcelVO {
+
+ @ExcelProperty("宀椾綅鍚嶇О")
+ private String name;
+
+ @ExcelProperty("宀椾綅缂栫爜")
+ private String code;
+
+ @ExcelProperty("宀椾綅鎺掑簭")
+ private Integer sort;
+
+ @ExcelProperty(value = "鐘舵��", converter = DictConvert.class)
+ @DictFormat(DictTypeConstants.COMMON_STATUS)
+ private Integer status;
+
+ @ExcelProperty("澶囨敞")
+ private String remark;
+
+}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostImportRespVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostImportRespVO.java
new file mode 100644
index 0000000..b6af22f
--- /dev/null
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostImportRespVO.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Schema(description = "绠＄悊鍚庡彴 - 宀椾綅瀵煎叆 Response VO")
+@Data
+@Builder
+public class PostImportRespVO {
+
+ @Schema(description = "鍒涘缓鎴愬姛鐨勫矖浣嶆暟缁�", requiredMode = Schema.RequiredMode.REQUIRED)
+ private List<String> createPostNames;
+
+ @Schema(description = "鏇存柊鎴愬姛鐨勫矖浣嶆暟缁�", requiredMode = Schema.RequiredMode.REQUIRED)
+ private List<String> updatePostNames;
+
+ @Schema(description = "瀵煎叆澶辫触鐨勫矖浣嶉泦鍚� key 涓哄矖浣嶅悕绉帮紝value 涓哄け璐ュ師鍥�", requiredMode = Schema.RequiredMode.REQUIRED)
+ private Map<String, String> failurePostNames;
+
+}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
index 38e185e..2c5ec72 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
@@ -55,12 +55,14 @@
ErrorCode DEPT_PARENT_ERROR = new ErrorCode(1_002_004_004, "涓嶈兘璁剧疆鑷繁涓虹埗閮ㄩ棬");
ErrorCode DEPT_NOT_ENABLE = new ErrorCode(1_002_004_006, "閮ㄩ棬({})涓嶅浜庡紑鍚姸鎬侊紝涓嶅厑璁搁�夋嫨");
ErrorCode DEPT_PARENT_IS_CHILD = new ErrorCode(1_002_004_007, "涓嶈兘璁剧疆鑷繁鐨勫瓙閮ㄩ棬涓虹埗閮ㄩ棬");
+ ErrorCode DEPT_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_002_004_008, "瀵煎叆閮ㄩ棬鏁版嵁涓嶈兘涓虹┖锛�");
// ========== 宀椾綅妯″潡 1-002-005-000 ==========
ErrorCode POST_NOT_FOUND = new ErrorCode(1_002_005_000, "褰撳墠宀椾綅涓嶅瓨鍦�");
ErrorCode POST_NOT_ENABLE = new ErrorCode(1_002_005_001, "宀椾綅({}) 涓嶅浜庡紑鍚姸鎬侊紝涓嶅厑璁搁�夋嫨");
ErrorCode POST_NAME_DUPLICATE = new ErrorCode(1_002_005_002, "宸茬粡瀛樺湪璇ュ悕瀛楃殑宀椾綅");
ErrorCode POST_CODE_DUPLICATE = new ErrorCode(1_002_005_003, "宸茬粡瀛樺湪璇ユ爣璇嗙殑宀椾綅");
+ ErrorCode POST_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_002_005_004, "瀵煎叆宀椾綅鏁版嵁涓嶈兘涓虹┖锛�");
// ========== 瀛楀吀绫诲瀷 1-002-006-000 ==========
ErrorCode DICT_TYPE_NOT_EXISTS = new ErrorCode(1_002_006_001, "褰撳墠瀛楀吀绫诲瀷涓嶅瓨鍦�");
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java
index 50c23e0..7912039 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java
@@ -3,6 +3,8 @@
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptSaveReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptImportExcelVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptImportRespVO;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
import java.util.*;
@@ -121,4 +123,13 @@
*/
void validateDeptList(Collection<Long> ids);
+ /**
+ * 瀵煎叆閮ㄩ棬鍒楄〃
+ *
+ * @param importDepts 瀵煎叆閮ㄩ棬鍒楄〃
+ * @param isUpdateSupport 鏄惁鏀寔鏇存柊
+ * @return 瀵煎叆缁撴灉
+ */
+ DeptImportRespVO importDeptList(List<DeptImportExcelVO> importDepts, boolean isUpdateSupport);
+
}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
index c48e711..79da07a 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
@@ -2,11 +2,15 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptSaveReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptImportExcelVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptImportRespVO;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
import cn.iocoder.yudao.module.system.dal.mysql.dept.DeptMapper;
import cn.iocoder.yudao.module.system.dal.redis.RedisKeyConstants;
@@ -235,4 +239,83 @@
});
}
+ @Override
+ public DeptImportRespVO importDeptList(List<DeptImportExcelVO> importDepts, boolean isUpdateSupport) {
+ if (CollUtil.isEmpty(importDepts)) {
+ throw exception(DEPT_IMPORT_LIST_IS_EMPTY);
+ }
+ DeptImportRespVO respVO = DeptImportRespVO.builder().createDeptNames(new ArrayList<>())
+ .updateDeptNames(new ArrayList<>()).failureDeptNames(new LinkedHashMap<>()).build();
+
+ // 1. 鍒濆鍖栫幇鏈夌殑鍏ㄨ矾寰勪笌閮ㄩ棬ID鏄犲皠
+ List<DeptDO> allDepts = getDeptList(new DeptListReqVO());
+ Map<Long, DeptDO> idDeptMap = cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap(allDepts, DeptDO::getId);
+ Map<String, Long> fullPathDeptIdMap = new HashMap<>();
+ for (DeptDO dept : allDepts) {
+ fullPathDeptIdMap.put(getFullPath(dept, idDeptMap), dept.getId());
+ }
+
+ // 2. 灏嗗鍏ョ殑閮ㄩ棬鎸夌収鐖堕儴闂ㄨ矾寰勬繁搴︽帓搴忥紝纭繚鍏堝鐞嗙埗閮ㄩ棬
+ importDepts.sort(Comparator.comparingInt(dept -> StrUtil.isEmpty(dept.getParentPath()) ? 0 : dept.getParentPath().split("/").length));
+
+ // 3. 閬嶅巻瀵煎叆
+ for (DeptImportExcelVO importDept : importDepts) {
+ // 3.1 鑾峰彇鐖堕儴闂� ID
+ Long parentId = DeptDO.PARENT_ID_ROOT;
+ if (StrUtil.isNotEmpty(importDept.getParentPath())) {
+ parentId = fullPathDeptIdMap.get(importDept.getParentPath());
+ if (parentId == null) {
+ respVO.getFailureDeptNames().put(importDept.getName(), "涓婄骇閮ㄩ棬涓嶅瓨鍦�: " + importDept.getParentPath());
+ continue;
+ }
+ }
+
+ // 3.2 鏍￠獙閮ㄩ棬鍚嶇О鏄惁鍞竴
+ try {
+ validateDeptNameUnique(null, parentId, importDept.getName());
+ } catch (ServiceException ex) {
+ if (!isUpdateSupport) {
+ respVO.getFailureDeptNames().put(importDept.getName(), ex.getMessage());
+ continue;
+ }
+ // 鏀寔鏇存柊锛屾墽琛屾洿鏂�
+ DeptDO existDept = deptMapper.selectByParentIdAndName(parentId, importDept.getName());
+ DeptDO updateDept = BeanUtils.toBean(importDept, DeptDO.class);
+ updateDept.setId(existDept.getId());
+ updateDept.setParentId(parentId);
+ deptMapper.updateById(updateDept);
+ respVO.getUpdateDeptNames().add(importDept.getName());
+
+ String myFullPath = StrUtil.isEmpty(importDept.getParentPath()) ? importDept.getName() : importDept.getParentPath() + "/" + importDept.getName();
+ fullPathDeptIdMap.put(myFullPath, existDept.getId());
+ continue;
+ }
+
+ // 3.3 鏂板閮ㄩ棬
+ DeptDO newDept = BeanUtils.toBean(importDept, DeptDO.class);
+ newDept.setParentId(parentId);
+ deptMapper.insert(newDept);
+ respVO.getCreateDeptNames().add(importDept.getName());
+
+ // 鏇存柊缂撳瓨锛屼緵鍚庣画瀛愰儴闂ㄤ娇鐢�
+ String myFullPath = StrUtil.isEmpty(importDept.getParentPath()) ? importDept.getName() : importDept.getParentPath() + "/" + importDept.getName();
+ fullPathDeptIdMap.put(myFullPath, newDept.getId());
+ }
+
+ return respVO;
+ }
+
+ private String getFullPath(DeptDO dept, Map<Long, DeptDO> idDeptMap) {
+ StringBuilder path = new StringBuilder(dept.getName());
+ Long parentId = dept.getParentId();
+ while (parentId != null && !DeptDO.PARENT_ID_ROOT.equals(parentId)) {
+ DeptDO parent = idDeptMap.get(parentId);
+ if (parent == null) {
+ break;
+ }
+ path.insert(0, parent.getName() + "/");
+ parentId = parent.getParentId();
+ }
+ return path.toString();
+ }
}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostService.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostService.java
index f83fefb..78139dd 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostService.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostService.java
@@ -3,6 +3,8 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostPageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostSaveReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostImportExcelVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostImportRespVO;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO;
import org.jspecify.annotations.Nullable;
@@ -88,4 +90,13 @@
*/
void validatePostList(Collection<Long> ids);
+ /**
+ * 瀵煎叆宀椾綅鍒楄〃
+ *
+ * @param importPosts 瀵煎叆宀椾綅鍒楄〃
+ * @param isUpdateSupport 鏄惁鏀寔鏇存柊
+ * @return 瀵煎叆缁撴灉
+ */
+ PostImportRespVO importPostList(List<PostImportExcelVO> importPosts, boolean isUpdateSupport);
+
}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImpl.java
index 36aeaec..79afd74 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImpl.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImpl.java
@@ -16,6 +16,12 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostImportExcelVO;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostImportRespVO;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
@@ -155,4 +161,52 @@
}
});
}
+
+ @Override
+ public PostImportRespVO importPostList(List<PostImportExcelVO> importPosts, boolean isUpdateSupport) {
+ if (CollUtil.isEmpty(importPosts)) {
+ throw exception(POST_IMPORT_LIST_IS_EMPTY);
+ }
+ PostImportRespVO respVO = PostImportRespVO.builder().createPostNames(new ArrayList<>())
+ .updatePostNames(new ArrayList<>()).failurePostNames(new LinkedHashMap<>()).build();
+ importPosts.forEach(importPost -> {
+ // 鏍￠獙锛屽垽鏂槸鍚︽湁涓嶇鍚堢殑鍘熷洜
+ try {
+ validatePostForCreateOrUpdate(null, importPost.getName(), importPost.getCode());
+ } catch (ServiceException ex) {
+ // 濡傛灉鏄噸澶嶅紓甯革紝鑰屼笖鏀寔鏇存柊
+ if (isUpdateSupport && (POST_NAME_DUPLICATE.getCode().equals(ex.getCode()) || POST_CODE_DUPLICATE.getCode().equals(ex.getCode()))) {
+ // ignore
+ } else {
+ respVO.getFailurePostNames().put(importPost.getName(), ex.getMessage());
+ return;
+ }
+ }
+
+ // 鍒ゆ柇濡傛灉瀛樺湪锛屽湪杩涜鏇存柊
+ PostDO existPost = postMapper.selectByName(importPost.getName());
+ if (existPost == null) {
+ existPost = postMapper.selectByCode(importPost.getCode());
+ }
+ if (existPost == null) {
+ PostDO post = BeanUtils.toBean(importPost, PostDO.class);
+ postMapper.insert(post);
+ respVO.getCreatePostNames().add(importPost.getName());
+ return;
+ }
+
+ // 濡傛灉瀛樺湪锛屽垽鏂槸鍚﹀厑璁告洿鏂�
+ if (!isUpdateSupport) {
+ respVO.getFailurePostNames().put(importPost.getName(), "宀椾綅鍚嶆垨缂栫爜宸茬粡瀛樺湪");
+ return;
+ }
+
+ // 鏇存柊宀椾綅
+ PostDO updatePost = BeanUtils.toBean(importPost, PostDO.class);
+ updatePost.setId(existPost.getId());
+ postMapper.updateById(updatePost);
+ respVO.getUpdatePostNames().add(importPost.getName());
+ });
+ return respVO;
+ }
}
--
Gitblit v1.9.3