From 5cd4262f233df612fc9776c2be24bdf399f917f3 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Thu, 27 Aug 2020 16:26:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 + .../msdw/tms/api/QuestionsControllerApi.java | 7 + .../com/msdw/tms/common/utils/Constant.java | 5 +- .../tms/common/utils/poi/ExcelImportUtil.java | 2 +- .../controller/PersonalFileController.java | 3 +- .../tms/controller/ProjectController.java | 3 +- .../tms/controller/QuestionsController.java | 11 +- .../request/QuestionsImportRequest.java | 13 ++ .../msdw/tms/entity/response/CommonCode.java | 1 + .../entity/vo/QuestionsImportFailureVO.java | 76 ++++++++ .../msdw/tms/service/QuestionsService.java | 7 +- .../impl/ProjectRecordServiceImpl.java | 2 +- .../service/impl/QuestionsServiceImpl.java | 122 ++++++++++-- .../试题导入失败数据导出模板.xlsx | Bin 0 -> 10178 bytes .../excel-template/试题导出模板.xlsx | Bin 10889 -> 10311 bytes .../com/msdw/tms/TmsApplicationTests.java | 181 +++++++++++++++++- src/test/java/com/msdw/tms/UserTest.java | 26 +++ .../tms/service/QuestionsServiceTest.java | 5 +- 18 files changed, 443 insertions(+), 28 deletions(-) create mode 100644 src/main/java/com/msdw/tms/entity/vo/QuestionsImportFailureVO.java create mode 100644 src/main/resources/excel-template/试题导入失败数据导出模板.xlsx create mode 100644 src/test/java/com/msdw/tms/UserTest.java diff --git a/pom.xml b/pom.xml index b7ca58f..51f1328 100644 --- a/pom.xml +++ b/pom.xml @@ -139,9 +139,16 @@ hutool-all 5.3.8 + + + com.alibaba + fastjson + 1.2.72 + + evaluation org.springframework.boot diff --git a/src/main/java/com/msdw/tms/api/QuestionsControllerApi.java b/src/main/java/com/msdw/tms/api/QuestionsControllerApi.java index 1257152..7ebee11 100644 --- a/src/main/java/com/msdw/tms/api/QuestionsControllerApi.java +++ b/src/main/java/com/msdw/tms/api/QuestionsControllerApi.java @@ -95,4 +95,11 @@ public interface QuestionsControllerApi { @ApiOperation(value = "通过excel批量导出", notes = "通过excel批量导出") void exportQuestion(HttpServletResponse response) throws Exception; + + /** + * 通过excel批量导出 + */ + @ApiOperation(value = "导出导入失败的数据和失败原因", notes = "导出导入失败的数据和失败原因") + void exportFailureRecord(HttpServletResponse response, String token) throws Exception; + } diff --git a/src/main/java/com/msdw/tms/common/utils/Constant.java b/src/main/java/com/msdw/tms/common/utils/Constant.java index 5ee4add..bd399bf 100644 --- a/src/main/java/com/msdw/tms/common/utils/Constant.java +++ b/src/main/java/com/msdw/tms/common/utils/Constant.java @@ -93,8 +93,9 @@ public class Constant { /** * 测评规则表id */ - public static final int EVALUATION_RULES_ID = 1;/** - * 测评规则表id + public static final int EVALUATION_RULES_ID = 1; + /** + * excel后缀 */ public static final String EXCEL_SUFFIX = ".xlsx"; /** diff --git a/src/main/java/com/msdw/tms/common/utils/poi/ExcelImportUtil.java b/src/main/java/com/msdw/tms/common/utils/poi/ExcelImportUtil.java index 1ad8ec6..73b6c98 100644 --- a/src/main/java/com/msdw/tms/common/utils/poi/ExcelImportUtil.java +++ b/src/main/java/com/msdw/tms/common/utils/poi/ExcelImportUtil.java @@ -55,7 +55,7 @@ public class ExcelImportUtil { } Field field = entity.getClass().getDeclaredField("index"); field.setAccessible(true); - field.set(entity, rowNum); + field.set(entity, rowNum + 1); list.add(entity); } } catch (Exception e) { diff --git a/src/main/java/com/msdw/tms/controller/PersonalFileController.java b/src/main/java/com/msdw/tms/controller/PersonalFileController.java index 75980fc..e21d6d7 100644 --- a/src/main/java/com/msdw/tms/controller/PersonalFileController.java +++ b/src/main/java/com/msdw/tms/controller/PersonalFileController.java @@ -1,5 +1,6 @@ package com.msdw.tms.controller; +import com.msdw.tms.api.PersonalFileControllerApi; import com.msdw.tms.common.utils.R; import com.msdw.tms.entity.PersonalFileEntity; import com.msdw.tms.entity.vo.PersonalFileVo; @@ -12,7 +13,7 @@ import java.util.List; @RestController @RequestMapping("tms/personalFile") -public class PersonalFileController { +public class PersonalFileController implements PersonalFileControllerApi { @Autowired private PersonalFileService personalFileService; diff --git a/src/main/java/com/msdw/tms/controller/ProjectController.java b/src/main/java/com/msdw/tms/controller/ProjectController.java index 09014af..a7847a7 100644 --- a/src/main/java/com/msdw/tms/controller/ProjectController.java +++ b/src/main/java/com/msdw/tms/controller/ProjectController.java @@ -1,5 +1,6 @@ package com.msdw.tms.controller; +import com.msdw.tms.api.ProjectControllerApi; import com.msdw.tms.common.utils.PageUtils; import com.msdw.tms.common.utils.R; import com.msdw.tms.entity.ProjectEntity; @@ -21,7 +22,7 @@ import java.util.Map; */ @RestController @RequestMapping("fictitious/project") -public class ProjectController { +public class ProjectController implements ProjectControllerApi { @Autowired private ProjectService projectService; diff --git a/src/main/java/com/msdw/tms/controller/QuestionsController.java b/src/main/java/com/msdw/tms/controller/QuestionsController.java index cbb1eb7..73f515d 100644 --- a/src/main/java/com/msdw/tms/controller/QuestionsController.java +++ b/src/main/java/com/msdw/tms/controller/QuestionsController.java @@ -19,6 +19,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Arrays; import java.util.List; +import java.util.Map; /** @@ -116,9 +117,9 @@ public class QuestionsController implements QuestionsControllerApi { @PostMapping("/import") //@RequiresPermissions("qms:questions:import") public R importQuestion(@RequestParam(name = "file") MultipartFile file) throws IOException { - List list = questionsService.importQuestion(file); + Map map = questionsService.importQuestion(file); - return R.ok().put("data", list); + return R.ok().put("data", map); } /** @@ -163,4 +164,10 @@ public class QuestionsController implements QuestionsControllerApi { questionsService.exportQuestion(response); } + @Override + @GetMapping("/export_failure") + public void exportFailureRecord(HttpServletResponse response, String token) throws Exception { + questionsService.exportFailureRecord(response, token); + } + } diff --git a/src/main/java/com/msdw/tms/entity/request/QuestionsImportRequest.java b/src/main/java/com/msdw/tms/entity/request/QuestionsImportRequest.java index 7dcb5e1..d9435ff 100644 --- a/src/main/java/com/msdw/tms/entity/request/QuestionsImportRequest.java +++ b/src/main/java/com/msdw/tms/entity/request/QuestionsImportRequest.java @@ -2,6 +2,7 @@ package com.msdw.tms.entity.request; import com.msdw.tms.common.utils.poi.ExcelAttribute; import lombok.Data; +import lombok.ToString; /** * 试题的基本信息表 @@ -9,6 +10,7 @@ import lombok.Data; * @author gongsj */ @Data +@ToString public class QuestionsImportRequest { /** * 第几行 @@ -65,4 +67,15 @@ public class QuestionsImportRequest { */ @ExcelAttribute(sort = 9) private String answerAnalysis; + + public String toStringForCompare() { + return questionStem + + questionTypeName + + optionA + + optionB + + optionC + + optionD + + optionE + + optionF; + } } diff --git a/src/main/java/com/msdw/tms/entity/response/CommonCode.java b/src/main/java/com/msdw/tms/entity/response/CommonCode.java index 542b19e..6003682 100644 --- a/src/main/java/com/msdw/tms/entity/response/CommonCode.java +++ b/src/main/java/com/msdw/tms/entity/response/CommonCode.java @@ -15,6 +15,7 @@ public enum CommonCode implements ResultCode { EXCEL_INVALID(false, 10007, "excel表内容错误！"), EVALUATION_TIME_INVALID(false, 10008, "测评时间错误！"), EXCEL_FILE_INVALID(false, 10009, "上传excel文件错误！"), + REPEAT_INEXCEL(false, 10010, "试题在excel表中重复！"), FAIL(false, 11111, "操作失败！"), SERVER_ERROR(false, 99999, "抱歉，系统繁忙，请稍后重试！"); //操作是否成功 diff --git a/src/main/java/com/msdw/tms/entity/vo/QuestionsImportFailureVO.java b/src/main/java/com/msdw/tms/entity/vo/QuestionsImportFailureVO.java new file mode 100644 index 0000000..30e15f5 --- /dev/null +++ b/src/main/java/com/msdw/tms/entity/vo/QuestionsImportFailureVO.java @@ -0,0 +1,76 @@ +package com.msdw.tms.entity.vo; + +import com.msdw.tms.common.utils.poi.ExcelAttribute; +import lombok.Data; +import lombok.ToString; + +/** + * 试题的基本信息表 + * + * @author gongsj + */ +@Data +@ToString +public class QuestionsImportFailureVO { + /** + * 第几行 + */ + private Integer index; + + /** + * 题干，问题描述 + */ + @ExcelAttribute(sort = 0) + private String questionStem; + /** + * 题型 + */ + @ExcelAttribute(sort = 1) + private String questionTypeName; + /** + * 选项A + */ + @ExcelAttribute(sort = 2) + private String optionA; + /** + * 选项B + */ + @ExcelAttribute(sort = 3) + private String optionB; + /** + * 选项C + */ + @ExcelAttribute(sort = 4) + private String optionC; + /** + * 选项D + */ + @ExcelAttribute(sort = 5) + private String optionD; + /** + * 选项E + */ + @ExcelAttribute(sort = 6) + private String optionE; + /** + * 选项F + */ + @ExcelAttribute(sort = 7) + private String optionF; + /** + * 正确答案 + */ + @ExcelAttribute(sort = 8) + private String answer; + /** + * 答案解析 + */ + @ExcelAttribute(sort = 9) + private String answerAnalysis; + + /** + * 失败原因 + */ + @ExcelAttribute(sort = 10) + private String failureMsg; +} diff --git a/src/main/java/com/msdw/tms/service/QuestionsService.java b/src/main/java/com/msdw/tms/service/QuestionsService.java index ee57a5e..f791ba5 100644 --- a/src/main/java/com/msdw/tms/service/QuestionsService.java +++ b/src/main/java/com/msdw/tms/service/QuestionsService.java @@ -9,13 +9,12 @@ import com.msdw.tms.entity.request.QuestionsQueryRequest; import com.msdw.tms.entity.request.QuestionsUpdateRequest; import com.msdw.tms.entity.vo.EvaluationVO; import com.msdw.tms.entity.vo.QuestionsDetailVO; -import com.msdw.tms.entity.vo.QuestionsVO; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; -import java.util.Set; +import java.util.Map; /** * 记录试题信息 @@ -38,7 +37,7 @@ public interface QuestionsService extends IService { boolean deleteByIds(List asList); - List importQuestion(MultipartFile file) throws IOException; + Map importQuestion(MultipartFile file) throws IOException; FilesResult uploadFiles(MultipartFile file) throws IOException; @@ -49,5 +48,7 @@ public interface QuestionsService extends IService { void exportQuestion(HttpServletResponse response) throws Exception; String getEvaluationRemainingTime(Integer userId); + + void exportFailureRecord(HttpServletResponse response, String token) throws Exception; } diff --git a/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java index 558968b..8f262a1 100644 --- a/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java @@ -72,7 +72,7 @@ public class ProjectRecordServiceImpl extends ServiceImpl importQuestion(MultipartFile file) throws IOException { + public Map importQuestion(MultipartFile file) throws IOException { + //准备map接收导入失败的数据信息 + Map failureRecord = new HashMap<>(); + //准备list收集失败数据 + List failureVOs = new ArrayList<>(); + // 参数合法性校验，只能上传.xlsx后缀的文件 if (StringUtils.isBlank(file.getOriginalFilename()) || !file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")).equals(Constant.EXCEL_SUFFIX)) { @@ -337,12 +346,28 @@ public class QuestionsServiceImpl extends ServiceImpl failureRecord = new ArrayList<>(); - - for (int i = 0; i < list.size(); i++) { - QuestionsImportRequest question = list.get(i); + //去掉重复数据，得到去重后的数据 + ArrayList distinctList = list.stream().collect(Collectors.collectingAndThen(// 去重收集 + Collectors.toCollection(() -> + new TreeSet<>(Comparator.comparing(QuestionsImportRequest::toStringForCompare))), + ArrayList::new + )); + + //与元数据做差，得到重复的数据 + List repeatFactor = removeRepeatFactor(distinctList, list); + + //记录到失败信息列表 + repeatFactor.forEach(question -> { + QuestionsImportFailureVO failureVO = new QuestionsImportFailureVO(); + BeanUtils.copyProperties(question, failureVO); + failureVO.setFailureMsg(CommonCode.REPEAT_INEXCEL.message()); + failureVOs.add(failureVO); + }); + + List questions = distinctList.stream().map(question -> { //校验题干和内容重复 QuestionsEntity questionsEntity = new QuestionsEntity(); + //属性对拷 BeanUtils.copyProperties(question, questionsEntity); String questionTypeName = question.getQuestionTypeName(); //根据题型名称得到题型号 @@ -357,8 +382,11 @@ public class QuestionsServiceImpl extends ServiceImpl 0) {//说明已存在 - failureRecord.add("第 " + question.getIndex() + " 行导入失败，" + "题干：" + question.getQuestionStem() + "，失败信息：" + CommonCode.QUESTION_EXISTS.message()); - continue; + QuestionsImportFailureVO failureVO = new QuestionsImportFailureVO(); + BeanUtils.copyProperties(question, failureVO); + failureVO.setFailureMsg(CommonCode.QUESTION_EXISTS.message()); + failureVOs.add(failureVO); + return null; } - + //TODO 创建者和修改者。。。 questionsEntity.setCreateTime(new Date()); questionsEntity.setModifyTime(new Date()); + return questionsEntity; + }).filter(Objects::nonNull)// 过滤掉为null的对象 + .collect(Collectors.toList()); - this.save(questionsEntity); + String token = ""; + + // 有导入失败的数据，才会存入redis + if (failureVOs.size() > 0) { + //生成token + token = FAILURE_IMPORT_KEY + UUID.randomUUID().toString().replace("-", ""); + + ValueOperations ops = stringRedisTemplate.opsForValue(); + String failureVOJson = JSON.toJSONString(failureVOs); + + ops.set(token, failureVOJson, 30 * 60, TimeUnit.SECONDS); } + // 批量保存 + this.saveBatch(questions); + + failureRecord.put("token", token); + failureRecord.put("successNum", (list.size() - failureVOs.size()) + ""); + failureRecord.put("failureNum", failureVOs.size() + ""); + return failureRecord; } + private List removeRepeatFactor(List source, List dest) { + if (source != null && dest != null) { + if (source.size() != 0 && dest.size() != 0) { + Collection A = new ArrayList<>(source); + List B = new ArrayList<>(dest); + A.retainAll(B); + if (A.size() != 0) { + B.removeAll(A); + } + return B; + } + } + return dest; + } + /** * 上传模板文件，修改模板信息表数据 */ @Override @Transactional public FilesResult uploadFiles(MultipartFile file) throws IOException { - // 参数合法性校验，只能上传.xlsx后缀的文件 if (StringUtils.isBlank(file.getOriginalFilename()) || !file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")).equals(Constant.EXCEL_SUFFIX)) { @@ -493,12 +558,10 @@ public class QuestionsServiceImpl extends ServiceImpl ops = stringRedisTemplate.opsForValue(); + //获取数据 + String record = ops.get(token); + if (StringUtils.isEmpty(record)) { + return; + } + + List parse = (List) JSON.parse(record); + parse.sort(Comparator.comparing(QuestionsImportFailureVO::getIndex)); +// Collections.sort(parse, new Comparator() { +// @Override +// public int compare(QuestionsImportFailureVO o1, QuestionsImportFailureVO o2) { +// //升序 +// return o1.getIndex().compareTo(o2.getIndex()); +// } +// }); + + //2.加载模板流数据 + org.springframework.core.io.Resource resource = new ClassPathResource("excel-template/试题导入失败数据导出模板.xlsx"); + FileInputStream fis = new FileInputStream(resource.getFile()); + + //3、通过工具类下载文件 + new ExcelExportUtil(QuestionsImportRequest.class, Constant.ROW_INDEX, Constant.STYLE_INDEX). + export(response, fis, parse, "导入失败数据表.xlsx"); + } + private Set getRandomList(int len, List list) { Set set = new HashSet<>(); Random random = new Random(); diff --git a/src/main/resources/excel-template/试题导入失败数据导出模板.xlsx b/src/main/resources/excel-template/试题导入失败数据导出模板.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..9bea0c39e7c9895d969e457f0bd00317bb6a1744 GIT binary patch literal 10178 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/excel-template/试题导出模板.xlsx b/src/main/resources/excel-template/试题导出模板.xlsx index cc6ed7d7d57aa329727f0b788025b459815a375e..46366b90c68ea24c44fd77ced73871d8006e07fc 100644 GIT binary patch delta 3823 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 list = new ArrayList<>(); + list.add("a"); + list.add("b"); + list.add("c"); + list.add("d"); + list.add("b"); + list.add("c"); + list.add("a"); + list.add("a"); + list.add("a"); + + System.out.println("\n例子1 - 计算'a'出现的次数"); + System.out.println("a : " + Collections.frequency(list, "a")); + + System.out.println("\n例子2 - 计算所有对象出现的次数"); + Set uniqueSet = new HashSet<>(list); + for (String temp : uniqueSet) { + System.out.println(temp + ": " + Collections.frequency(list, temp)); + } + + System.out.println("\n例子3 -用Map来计算对象出现的次数"); + Map map = new HashMap<>(); + + for (String temp : list) { + Integer count = map.get(temp); + map.put(temp, (count == null) ? 1 : count + 1); + } + printMap(map); + + System.out.println("\nMap排序-以key排序"); + Map treeMap = new TreeMap<>(map); + printMap(treeMap); + + } + + static void printMap(Map map) { + for (Map.Entry entry : map.entrySet()) { + System.out.println("Key-value : " + entry.getKey() + "- " + + entry.getValue()); + } + } + + + @Test + void t9() throws Exception { + + List list = new ArrayList<>(); + list.add(new UserTest(1, "张三", "男", "深圳", "123456")); + list.add(new UserTest(2, "李四", "男", "深圳", "123456")); + list.add(new UserTest(3, "张三", "男", "杭州", "123456")); + list.add(new UserTest(4, "张三", "男", "深圳", "123456")); + list.add(new UserTest(5, "王五", "男", "深圳", "123456")); + list.add(new UserTest(6, "张三", "男", "深圳", "123456")); + list.add(new UserTest(7, "赵六", "女", "深圳", "123456")); + list.add(new UserTest(8, "赵六", "女", "深圳", "123456")); + list.add(new UserTest(9, "赵六", "女", "深圳", "123456")); + list.add(new UserTest(10, "赵六", "女", "深圳", "123456")); + list.add(new UserTest(11, "赵六", "女", "深圳", "123456")); + list.add(new UserTest(12, "张三", "男", "菲律宾", "123456")); + list.add(new UserTest(13, "张三", "男", "深圳", "123456")); + list.add(new UserTest(14, "张三", "男", "马来西亚", "123456")); + + + List errorMsg = new ArrayList<>(); + + ArrayList collect = list.stream() + .collect(Collectors.collectingAndThen(// 去重收集 + Collectors.toCollection(() -> + new TreeSet<>(Comparator.comparing(UserTest::toString))), + ArrayList::new + )); + + for (UserTest userTest : collect) { + + System.out.println(userTest.getIndex() + "-----" + userTest.toString()); + } + + System.out.println("----------------------------"); + + List userTests = removeRepeatFactor3(collect, list); + + for (UserTest userTest : userTests) { + + System.out.println(userTest.getIndex() + "-----" + userTest.toString()); + } + + + } + + private List removeRepeatFactor(List list1, List list2) { + if (list1 != null && list2 != null) { + if (list1.size() != 0 && list2.size() != 0) { + Collection A = new ArrayList<>(list1); + List B = new ArrayList<>(list2); + A.retainAll(B); + if (A.size() != 0) { + B.removeAll(A); + } + return B; + } + } + return list2; + } + + private List removeRepeatFactor3(List list1, List list2) { + if (list1 != null && list2 != null) { + if (list1.size() != 0 && list2.size() != 0) { + Collection A = new ArrayList<>(list1); + List B = new ArrayList<>(list2); + A.retainAll(B); + if (A.size() != 0) { + B.removeAll(A); + } + return B; + } + } + return list2; + } + + public List removeRepeatFactor2(List list1, List list2) throws Exception { + if (list1 != null && list2 != null) { + if (list1.size() != 0 && list2.size() != 0) { + Collection A = new ArrayList<>(list1); + Collection B = new ArrayList<>(list2); + A.retainAll(B); + if (A.size() != 0) { + B.removeAll(A); + } + return (List) B; + } + } + return list2; + } + + + @Test + void t10() { + + QuestionsImportRequest questionsImportRequest = new QuestionsImportRequest(); + questionsImportRequest.setOptionA("aaa"); + questionsImportRequest.setOptionB("bbb"); + questionsImportRequest.setOptionC("ccc"); + questionsImportRequest.setOptionD("ddd"); + questionsImportRequest.setOptionE("eee"); + questionsImportRequest.setOptionF("fff"); + questionsImportRequest.setQuestionStem("stem"); + questionsImportRequest.setQuestionTypeName("type"); + + System.out.println(questionsImportRequest.toStringForCompare()); + + } + + @Test + void t11() { + + List list = new ArrayList<>(); + list.add(new UserTest(1, "张三", "男", "深圳", "123456")); + list.add(new UserTest(2, "李四", "男", "深圳", "123456")); + list.add(new UserTest(3, "张三", "男", "杭州", "123456")); + list.add(new UserTest(4, "张三", "男", "深圳", "123456")); + list.add(new UserTest(5, "王五", "男", "深圳", "123456")); + list.add(new UserTest(6, "张三", "男", "深圳", "123456")); + list.add(new UserTest(7, "赵六", "女", "深圳", "123456")); + list.add(new UserTest(8, "赵六", "女", "深圳", "123456")); + list.add(new UserTest(9, "赵六", "女", "深圳", "123456")); + list.add(new UserTest(10, "赵六", "女", "深圳", "123456")); + list.add(new UserTest(11, "赵六", "女", "深圳", "123456")); + list.add(new UserTest(12, "张三", "男", "菲律宾", "123456")); + list.add(new UserTest(13, "张三", "男", "深圳", "123456")); + list.add(new UserTest(14, "张三", "男", "马来西亚", "123456")); + + stringRedisTemplate.opsForList().leftPush("sss", list.toString()); + } + } diff --git a/src/test/java/com/msdw/tms/UserTest.java b/src/test/java/com/msdw/tms/UserTest.java new file mode 100644 index 0000000..84e2982 --- /dev/null +++ b/src/test/java/com/msdw/tms/UserTest.java @@ -0,0 +1,26 @@ +package com.msdw.tms; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class UserTest { + private int index; + private String name; + private String gender; + private String addr; + private String phone; + + @Override + public String toString() { + return "UserTest{" + + "name='" + name + '\'' + + ", gender='" + gender + '\'' + + ", addr='" + addr + '\'' + + ", phone='" + phone + '\'' + + '}'; + } +} diff --git a/src/test/java/com/msdw/tms/service/QuestionsServiceTest.java b/src/test/java/com/msdw/tms/service/QuestionsServiceTest.java index 062824a..31729c3 100644 --- a/src/test/java/com/msdw/tms/service/QuestionsServiceTest.java +++ b/src/test/java/com/msdw/tms/service/QuestionsServiceTest.java @@ -24,6 +24,7 @@ import java.io.IOException; import java.nio.file.Files; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * 记录试题信息 @@ -93,9 +94,9 @@ class QuestionsServiceTest { IOUtils.copy(new FileInputStream(file), fileItem.getOutputStream()); MultipartFile multipartFile = new CommonsMultipartFile(fileItem); - List strings = questionsService.importQuestion(multipartFile); + Map map = questionsService.importQuestion(multipartFile); - System.out.println(strings.toString()); + System.out.println(map.toString()); } @Test