From e7484f262cfb05b0ed7260c468ce4c78998b05f2 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Mon, 21 Feb 2022 19:09:50 +0800
Subject: [PATCH] 新增保安员批量导入接口
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 48 +++++++++++++++++++++++++++++++-----------------
1 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index bd86792..5f38506 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -48,7 +48,9 @@
import org.springblade.modules.system.entity.Role;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.excel.UserExcel;
+import org.springblade.modules.system.excel.UserExcels;
import org.springblade.modules.system.excel.UserImporter;
+import org.springblade.modules.system.excel.UserImporters;
import org.springblade.modules.system.service.IRoleService;
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.system.vo.UserVO;
@@ -349,6 +351,17 @@
}
/**
+ * 导入用户(保安员)
+ */
+ @PostMapping("import-users")
+ @ApiOperation(value = "导入用户", notes = "传入excel")
+ public R importUsers(MultipartFile file, Integer isCovered) {
+ UserImporters userImporter = new UserImporters(userService, isCovered == 1);
+ ExcelUtil.save(file, userImporter, UserExcels.class);
+ return R.success("操作成功");
+ }
+
+ /**
* 导出用户
*/
@GetMapping("export-user")
@@ -501,23 +514,24 @@
boolean status = userService.save(user);
//头像
- if (null!=user.getAvatar() && !user.getAvatar().equals("")) {
- user.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));
- }
-
- String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,sex,role_id,dept_id,cardid," +
- "jurisdiction,examination_type,status,is_deleted) " +
- "values(" + "'" + user.getId() + "'" + "," + "'" + user.getTenantId() + "'" + "," + "'" + user.getAccount() + "'" + "," +
- "'" + user.getPassword() + "'" + "," + "'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
- "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
- "," + "'" + user.getDeptId() + "'" +
- "," + "'" + user.getCardid() + "'" +
- "," + "'" + user.getJurisdiction() + "'" +
- "," + "'" + user.getExamination_type() + "'" +
- "," + "'" + user.getStatus() + "'" +
- "," + "'" + user.getIsDeleted() + "'" + ")";
+// if (null!=user.getAvatar() && !user.getAvatar().equals("")) {
+// user.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));
+// }
+//
+// String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,sex,role_id,dept_id,cardid," +
+// "jurisdiction,examination_type,status,is_deleted) " +
+// "values(" + "'" + user.getId() + "'" + "," + "'" + user.getTenantId() + "'" + "," + "'" + user.getAccount() + "'" + "," +
+// "'" + user.getPassword() + "'" + "," + "'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
+// "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
+// "," + "'" + user.getDeptId() + "'" +
+// "," + "'" + user.getCardid() + "'" +
+// "," + "'" + user.getJurisdiction() + "'" +
+// "," + "'" + user.getExamination_type() + "'" +
+// "," + "'" + user.getStatus() + "'" +
+// "," + "'" + user.getIsDeleted() + "'" + ")";
// System.out.println(s);
- FtpUtil.sqlFileUpload(s);
+// FtpUtil.sqlFileUpload(s);
return R.status(status);
}
-}
+};
+
--
Gitblit v1.9.3