From 045b55722b25ccc77d88671c5d6df309edb8a66d Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Tue, 22 Feb 2022 16:00:34 +0800
Subject: [PATCH] 1. 保安员新增异步推送数据至群访用户表 2. 会员标记接口新增,会员标记成功,则创建会员记录和会员题库记录(包含120道题目) 3. web 端考试开始,查询题目判断用户是否为会员,如果为会员则从会员题库获取当前人员的考试题目(从120道题中随机抽取60道)
---
src/main/java/org/springblade/modules/securitypaper/controller/SecurityPaperController.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/securitypaper/controller/SecurityPaperController.java b/src/main/java/org/springblade/modules/securitypaper/controller/SecurityPaperController.java
index 054c5aa..16ff32b 100644
--- a/src/main/java/org/springblade/modules/securitypaper/controller/SecurityPaperController.java
+++ b/src/main/java/org/springblade/modules/securitypaper/controller/SecurityPaperController.java
@@ -1,14 +1,21 @@
package org.springblade.modules.securitypaper.controller;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.securitypaper.entity.SecurityPaper;
+import org.springblade.modules.securitypaper.excel.SecurityPaperExcel;
+import org.springblade.modules.securitypaper.excel.SecurityPaperImporter;
import org.springblade.modules.securitypaper.service.SecurityPaperService;
+import org.springblade.modules.system.excel.SecurityExcel;
+import org.springblade.modules.system.excel.SecurityImporter;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
/**
* @author zhongrj
@@ -83,4 +90,15 @@
return R.data(detail);
}
+
+ /**
+ * 导入保安员证数据
+ */
+ @PostMapping("import-security-paper")
+ public R importSecurityPaper(MultipartFile file, Integer isCovered, String deptId) {
+ SecurityPaperImporter securityImporter = new SecurityPaperImporter(securityPaperService, false,deptId);
+ ExcelUtil.save(file, securityImporter, SecurityPaperExcel.class);
+ return R.success("操作成功");
+ }
+
}
--
Gitblit v1.9.3