From d8143b9121bbe941f116230eaa5524ab2cc12a66 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 10 七月 2025 21:20:21 +0800
Subject: [PATCH] 新增
---
src/main/java/com/linghu/controller/UserController.java | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 108 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/linghu/controller/UserController.java b/src/main/java/com/linghu/controller/UserController.java
index 9165d8c..76ccb70 100644
--- a/src/main/java/com/linghu/controller/UserController.java
+++ b/src/main/java/com/linghu/controller/UserController.java
@@ -5,11 +5,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.linghu.model.common.ResponseResult;
import com.linghu.model.entity.Sectionalization;
-import com.linghu.model.entity.Type;
import com.linghu.model.entity.User;
-import com.linghu.model.excel.KeywordExcel;
import com.linghu.model.excel.UserExcel;
import com.linghu.model.vo.UserPageVO;
+import com.linghu.service.SectionalizationService;
import com.linghu.service.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -17,12 +16,16 @@
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
@RestController
@RequestMapping("/user")
@@ -42,6 +45,7 @@
if (list != null && list.size() > 0) {
return ResponseResult.error("该邮箱已存在");
}
+ user.setStatus("正常");
userService.save(user);
return ResponseResult.success();
@@ -52,8 +56,12 @@
* 修改用户
*/
@PutMapping
- @ApiOperation(value = "添加")
+ @ApiOperation(value = "修改")
public ResponseResult edit(@RequestBody User user) {
+ User user1 = userService.getById(user.getUser_id());
+ if (user1 == null) {
+ return ResponseResult.error("该账户不存在");
+ }
List<User> list = userService.list(new LambdaQueryWrapper<User>()
.ne(User::getUser_id, user.getUser_id())
.eq(User::getUser_email, user.getUser_email()));
@@ -80,22 +88,20 @@
* 分页查询
*/
@GetMapping
- @ApiOperation(value = "删除")
+ @ApiOperation(value = "分页")
public ResponseResult<Page<UserPageVO>> page(@RequestParam(value = "pageSize", required = false, defaultValue = "10")Integer pageSize,
@RequestParam(value = "pageNum", required = false,defaultValue = "1")Integer pageNum,
@RequestParam(value = "sectionalization_id",required = false)Integer sectionalization_id,
@RequestParam(value = "status" ,required = false)String status) {
Page<UserPageVO> page = new Page<>(pageNum, pageSize);
return ResponseResult.success( userService.getPage(page,sectionalization_id,status));
-
-
}
/**
* 下载模板
*/
- @PostMapping("/downloadTemplate")
+ @GetMapping("/downloadTemplate")
@ApiOperation("下载模板")
public ResponseEntity<byte[]> downloadTemplate() throws IOException {
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -111,7 +117,102 @@
/**
* 导入文件
*/
+ // 导入文件
+ @Autowired
+ private SectionalizationService sectionalizationService;
+ @PostMapping("/importUserExcel")
+ @ApiOperation("导入用户数据")
+ public ResponseResult importUserExcel(@RequestParam("file") MultipartFile file) {
+ //查找出用户列表
+ List<User> userList = userService.list();
+ //名称
+ Map<String, User> nameMap = userList.stream()
+ .collect(Collectors.toMap(
+ User::getUser_name, // Key映射
+ excel -> excel, // Value映射
+ (oldValue, newValue) -> oldValue // 键冲突处理（保留旧值）
+ ));
+ //查找出分组列表
+ List<Sectionalization> list = sectionalizationService.list();
+ //分组
+ Map<String, Sectionalization> sectionalizationMap = list.stream()
+ .collect(Collectors.toMap(
+ Sectionalization::getSectionalization_name, // Key映射
+ excel -> excel, // Value映射
+ (oldValue, newValue) -> oldValue // 键冲突处理（保留旧值）
+ ));
+
+ try {
+ // 检查文件是否为空
+ if (file.isEmpty()) {
+ return ResponseResult.error("上传文件不能为空");
+ }
+
+ // 读取Excel数据
+ List<UserExcel> excelList = EasyExcel.read(file.getInputStream())
+ .head(UserExcel.class)
+ .sheet()
+ .doReadSync();
+
+ // 数据转换与验证
+ List<String> errorMessages = new ArrayList<>();
+ for (UserExcel excel : excelList) {
+ // 检查必要字段
+ if (!StringUtils.hasText(excel.getUser_name())) {
+ errorMessages.add("账户名不能为空");
+ continue;
+ }
+ if (!StringUtils.hasText(excel.getUser_email())) {
+ errorMessages.add("邮箱不能为空");
+ continue;
+ }
+ if (!StringUtils.hasText(String.valueOf(excel.getPassword()))) {
+ errorMessages.add("密码不能为空");
+ continue;
+ }
+
+ if (!StringUtils.hasText(excel.getSectionalization_name())) {
+ errorMessages.add("分组不能为空");
+ continue;
+ }
+ if (nameMap.containsKey(excel.getUser_name())){
+ errorMessages.add("用户名称重复");
+ continue;
+ }
+ }
+ // 处理错误
+ if (!errorMessages.isEmpty()) {
+ return ResponseResult.error("数据验证失败: " + String.join("; ", errorMessages));
+ }
+ // 开始添加
+ for (UserExcel excel : excelList) {
+ User user = new User();
+ if (sectionalizationMap.containsKey(excel.getSectionalization_name())) {
+ user.setSectionalization_id(sectionalizationMap.get(excel.getSectionalization_name()).getSectionalization_id());
+ }else {
+ //新增
+ Sectionalization sectionalization = new Sectionalization();
+ sectionalization.setSectionalization_name(excel.getSectionalization_name());
+ sectionalizationService.save(sectionalization);
+ user.setSectionalization_id(sectionalization.getSectionalization_id());
+ }
+ user.setUser_email(excel.getUser_email());
+ user.setUser_name(excel.getUser_name());
+ user.setPassword(excel.getPassword());
+ user.setStatus("正常");
+ userService.save(user);
+
+ }
+ // 返回信息
+ return ResponseResult.success();
+ }
+ catch (Exception e) {
+ // 记录详细异常信息
+
+ return ResponseResult.error("文件解析失败：" + e.getMessage());
+ }
+ }
--
Gitblit v1.7.1