11.7

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java

@@ -300,9 +300,9 @@ public class UserController {
     public void exportStudentList(@Validated UserPageReqVO exportReqVO,
                                          HttpServletResponse response) throws IOException {
         exportReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<teacherImportExcelVO> list = BeanUtils.toBean(userService.getUserPage1(exportReqVO).getList(),teacherImportExcelVO.class) ;
+        List<StudentImportExcelVO> list = BeanUtils.toBean(userService.getUserPage1(exportReqVO).getList(),StudentImportExcelVO.class) ;
         // 输出 Excel
-        ExcelUtils.write(response, "导师数据.xls", "数据", teacherImportExcelVO.class, list);
+        ExcelUtils.write(response, "在校生数据.xls", "数据", StudentImportExcelVO.class, list);
     }
     @GetMapping("/exportGraduate")
     @Operation(summary = "导出毕业生")
@@ -311,11 +311,22 @@ public class UserController {
     public void exportGraduateList(@Validated UserPageReqVO exportReqVO,
                                   HttpServletResponse response) throws IOException {
         exportReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<teacherImportExcelVO> list = BeanUtils.toBean(userService.getGraduateStudentPage(exportReqVO).getList(),teacherImportExcelVO.class) ;
+        List<graduateStudentImportExcelVO> list = BeanUtils.toBean(userService.getGraduateStudentPage(exportReqVO).getList(),graduateStudentImportExcelVO.class) ;
         // 输出 Excel
-        ExcelUtils.write(response, "导师数据.xls", "数据", teacherImportExcelVO.class, list);
+        ExcelUtils.write(response, "毕业生数据.xls", "数据", graduateStudentImportExcelVO.class, list);
     }
 
+    @GetMapping("/exportFace")
+    @Operation(summary = "导出人脸信息")
+    @PreAuthorize("@ss.hasPermission('system:user:exportFace')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportFace(@Validated UserPageReqVO exportReqVO,
+                                   HttpServletResponse response) throws IOException {
+        exportReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<faceImportExcelVO> list = BeanUtils.toBean(userService.getGraduateStudentPage(exportReqVO).getList(),faceImportExcelVO.class) ;
+        // 输出 Excel
+        ExcelUtils.write(response, "人脸信息数据.xls", "数据", faceImportExcelVO.class, list);
+    }
 
     @GetMapping("/get-import-template")
     @Operation(summary = "获得用户模板")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/StudentImportExcelVO.java

@@ -20,21 +20,21 @@ import lombok.experimental.Accessors;
 @NoArgsConstructor
 @Accessors(chain = false) // 设置 chain = false，避免用户导入有问题
 public class StudentImportExcelVO {
-    @ExcelProperty("登录名称")
+    @ExcelProperty("登录账号")
     private String username;
 
     @ExcelProperty("登录密码")
     private String password;
 
+    @ExcelProperty("姓名")
+    private String nickname;
+
     @ExcelProperty("年级")
     private String grade;
 
     @ExcelProperty("学号")
     private String userNumber;
 
-    @ExcelProperty("姓名")
-    private String nickname;
-
     @ExcelProperty("专业")
     private String major;
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/faceImportExcelVO.java

@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.system.controller.admin.user.vo.user;
+
+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 com.alibaba.excel.annotation.ExcelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * 用户 Excel 导入 VO
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = false) // 设置 chain = false，避免用户导入有问题
+public class faceImportExcelVO {
+
+    @ExcelProperty("姓名")
+    private String nickname;
+
+    @ExcelProperty(value = "用户性别", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.USER_SEX)
+    private Integer sex;
+
+    @ExcelProperty("年级")
+    private String grade;
+
+    @ExcelProperty("专业")
+    private String major;
+
+    @ExcelProperty("学号")
+    private String userNumber;
+
+    private String userType;
+
+    @ExcelProperty("用户邮箱")
+    private String email;
+
+    @ExcelProperty("手机号码")
+    private String mobile;
+
+    @ExcelProperty("工作间名称")
+    private String deptName;
+
+    @ExcelProperty("导师名称")
+    private String supervisor;
+
+    @ExcelProperty("导师电话")
+    private String supervisorMobile;
+
+    @ExcelProperty("人脸信息")
+    private String photoUrl;
+
+    @ExcelProperty(value = "账号状态", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.COMMON_STATUS)
+    private Integer status;
+
+
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/graduateStudentImportExcelVO.java

@@ -24,12 +24,12 @@ public class graduateStudentImportExcelVO {
     @ExcelProperty("登录名称")
     private String username;
 
-    @ExcelProperty("用户名称")
-    private String nickname;
-
     @ExcelProperty("用户密码")
     private String password;
 
+    @ExcelProperty("用户名称")
+    private String nickname;
+
     @ExcelProperty(value = "用户性别", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.USER_SEX)
     private Integer sex;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/teacherImportExcelVO.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = false) // 设置 chain = false，避免用户导入有问题
 public class teacherImportExcelVO {
 
-    @ExcelProperty("登录名称")
+    @ExcelProperty("登录账号")
     private String username;
 
     @ExcelProperty("登录密码")