|
|
@@ -1,31 +1,24 @@
|
|
|
package com.xjrsoft.module.personnel.controller;
|
|
|
|
|
|
+import cn.dev33.satoken.annotation.SaCheckPermission;
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.github.yulichang.toolkit.MPJWrappers;
|
|
|
-import com.xjrsoft.common.constant.GlobalConstant;
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
|
|
|
+import com.xjrsoft.common.model.result.RT;
|
|
|
import com.xjrsoft.common.page.ConventPage;
|
|
|
import com.xjrsoft.common.page.PageOutput;
|
|
|
-import com.xjrsoft.common.model.result.RT;
|
|
|
-import com.xjrsoft.common.utils.VoToColumnUtil;
|
|
|
+import com.xjrsoft.common.utils.FileZipUtil;
|
|
|
+import com.xjrsoft.common.utils.UploadUtil;
|
|
|
import com.xjrsoft.module.base.entity.BaseClass;
|
|
|
import com.xjrsoft.module.personnel.dto.AddStundentFaceProcessDto;
|
|
|
-import com.xjrsoft.module.personnel.dto.UpdateStundentFaceProcessDto;
|
|
|
-import cn.dev33.satoken.annotation.SaCheckPermission;
|
|
|
-
|
|
|
import com.xjrsoft.module.personnel.dto.StundentFaceProcessPageDto;
|
|
|
+import com.xjrsoft.module.personnel.dto.UpdateStundentFaceProcessDto;
|
|
|
import com.xjrsoft.module.personnel.entity.StundentFaceProcess;
|
|
|
-import com.xjrsoft.module.personnel.entity.TeacherFaceProcess;
|
|
|
import com.xjrsoft.module.personnel.service.IStundentFaceProcessService;
|
|
|
import com.xjrsoft.module.personnel.vo.StundentFaceProcessPageVo;
|
|
|
-
|
|
|
import com.xjrsoft.module.personnel.vo.StundentFaceProcessVo;
|
|
|
-import com.xjrsoft.module.personnel.vo.TeacherFaceProcessPageVo;
|
|
|
import com.xjrsoft.module.student.entity.BaseStudent;
|
|
|
import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
|
|
|
import com.xjrsoft.module.system.entity.DictionaryDetail;
|
|
|
@@ -34,11 +27,25 @@ import com.xjrsoft.module.teacher.entity.XjrUser;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
-import org.springframework.web.bind.annotation.*;
|
|
|
+import org.springframework.web.bind.annotation.DeleteMapping;
|
|
|
+import org.springframework.web.bind.annotation.GetMapping;
|
|
|
+import org.springframework.web.bind.annotation.PostMapping;
|
|
|
+import org.springframework.web.bind.annotation.PutMapping;
|
|
|
+import org.springframework.web.bind.annotation.RequestBody;
|
|
|
+import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
+import org.springframework.web.bind.annotation.RequestParam;
|
|
|
+import org.springframework.web.bind.annotation.RestController;
|
|
|
+import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import javax.validation.Valid;
|
|
|
-import javax.validation.constraints.NotNull;
|
|
|
+import java.io.FileOutputStream;
|
|
|
+import java.io.IOException;
|
|
|
+import java.io.InputStream;
|
|
|
+import java.io.OutputStream;
|
|
|
+import java.util.Enumeration;
|
|
|
import java.util.List;
|
|
|
+import java.util.zip.ZipEntry;
|
|
|
+import java.util.zip.ZipFile;
|
|
|
|
|
|
/**
|
|
|
* @title: 学生人脸信息审核
|
|
|
@@ -126,6 +133,35 @@ public class StundentFaceProcessController {
|
|
|
@SaCheckPermission("stundentfaceprocess:delete")
|
|
|
public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
|
|
|
return RT.ok(stundentFaceProcessService.removeBatchByIds(ids));
|
|
|
+ }
|
|
|
+
|
|
|
+ @PostMapping(value = "/batch-upload")
|
|
|
+ @ApiOperation(value = "批量新增学生人脸")
|
|
|
+ @SaCheckPermission("facemanager:add")
|
|
|
+ public RT<Boolean> add(@RequestParam("file") MultipartFile file) throws IOException {
|
|
|
+ ZipFile zipFile = FileZipUtil.convertToZipFile(file);
|
|
|
+ Enumeration<? extends ZipEntry> entries = zipFile.entries();
|
|
|
+ while (entries.hasMoreElements()){
|
|
|
+ ZipEntry entry = entries.nextElement();
|
|
|
+ String name = entry.getName();
|
|
|
+ InputStream stream = zipFile.getInputStream(entry); //读取文件内容
|
|
|
+
|
|
|
+// try (OutputStream outputStream = new FileOutputStream(file)) {
|
|
|
+// byte[] buffer = new byte[4096];
|
|
|
+// int bytesRead;
|
|
|
+// while ((bytesRead = stream.read(buffer)) != -1) {
|
|
|
+// outputStream.write(buffer, 0, bytesRead);
|
|
|
+// }
|
|
|
+// } finally {
|
|
|
+// if (stream != null) {
|
|
|
+// stream.close();
|
|
|
+// }
|
|
|
+// }
|
|
|
+// //保存到云服务器
|
|
|
+// String filePath = UploadUtil.uploadFile(file);
|
|
|
+
|
|
|
+ }
|
|
|
+ return RT.ok(true);
|
|
|
|
|
|
}
|
|
|
|