diff --git a/cloud/dahua/pom.xml b/cloud/dahua/pom.xml
index 763242c..88c22d5 100644
--- a/cloud/dahua/pom.xml
+++ b/cloud/dahua/pom.xml
@@ -143,6 +143,12 @@
pinyin4j
2.5.0
+
+
+ cn.afterturn
+ easypoi-spring-boot-starter
+ 4.3.0
+
diff --git a/cloud/dahua/src/main/java/com/example/dahua/bean/yx/ExportStudentBean.java b/cloud/dahua/src/main/java/com/example/dahua/bean/yx/ExportStudentBean.java
new file mode 100644
index 0000000..f35f3e8
--- /dev/null
+++ b/cloud/dahua/src/main/java/com/example/dahua/bean/yx/ExportStudentBean.java
@@ -0,0 +1,49 @@
+package com.example.dahua.bean.yx;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
+public class ExportStudentBean implements Serializable {
+
+ @Excel(name = "姓名")
+ private String name;
+ @Excel(name = "班级")
+ private String className;
+ @Excel(name = "十六进制")
+ private String studentNum;
+ @Excel(name = "十进制")
+ private String studentNum10;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getClassName() {
+ return className;
+ }
+
+ public void setClassName(String className) {
+ this.className = className;
+ }
+
+ public String getStudentNum() {
+ return studentNum;
+ }
+
+ public void setStudentNum(String studentNum) {
+ this.studentNum = studentNum;
+ }
+
+ public String getStudentNum10() {
+ return studentNum10;
+ }
+
+ public void setStudentNum10(String studentNum10) {
+ this.studentNum10 = studentNum10;
+ }
+}
diff --git a/cloud/dahua/src/main/java/com/example/dahua/control/UserOperateController.java b/cloud/dahua/src/main/java/com/example/dahua/control/UserOperateController.java
index b83b03c..8d18a79 100644
--- a/cloud/dahua/src/main/java/com/example/dahua/control/UserOperateController.java
+++ b/cloud/dahua/src/main/java/com/example/dahua/control/UserOperateController.java
@@ -7,6 +7,7 @@ import com.example.dahua.dao.UserDao;
import com.example.dahua.service.UserOperateService;
import com.example.dahua.service.imp.BaseService;
import com.example.dahua.utils.ExcelUtil;
+import com.example.dahua.utils.ExcelUtil2;
import com.example.dahua.utils.HttpUtils;
import com.example.dahua.utils.ReadExcelUtil;
import io.swagger.annotations.Api;
@@ -19,10 +20,12 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
* 用户信息、人脸、卡信息、权限下发控制类
@@ -119,6 +122,21 @@ public class UserOperateController {
userOperateService.saveStudentInfo(readExcel, fileName);
}
+ /**
+ * 中意导出学生名单
+ * @param schoolId
+ * @param request
+ * @param response
+ */
+ @ApiOperation(value = "导入学生信息")
+ @RequestMapping(value = "exportStudent", method = RequestMethod.GET)
+ public void importExcel(@RequestParam("schoolId") Integer schoolId,
+ HttpServletRequest request, HttpServletResponse response){
+
+ List