Commit cfea478f by “Kongxiangkun”

测试管理-题库试题导入问题修改

parent 7377f8e7
......@@ -2,7 +2,6 @@ package com.yizhi.application.exam.controller;
import cn.hutool.json.JSONUtil;
import com.yizhi.application.exam.upload.LibrarySubjectImport;
import com.yizhi.application.exam.vo.ImportVO;
import com.yizhi.core.application.context.ContextHolder;
import com.yizhi.core.application.context.RequestContext;
......@@ -28,7 +27,7 @@ public class ExamImportController {
private QuestionSubjectImport qs;
@Autowired
private LibrarySubjectImport librarySubjectImport;
private LibrarySubjectImport ls;
@ApiOperation("题库试题导入")
@PostMapping("/question/subject/import")
......@@ -48,7 +47,7 @@ public class ExamImportController {
map.put("libraryId",importVO.getId());
map.put("url",importVO.getUrl());
log.info("题目导入入参:{}", JSONUtil.toJsonStr(map));
librarySubjectImport.execute(map);
ls.execute(map);
return Response.ok();
}
......
......@@ -8,10 +8,11 @@
* <author> <time> <version> <desc>
* 作者姓名 修改时间 版本号 描述
*/
package com.yizhi.application.exam.upload;
package com.yizhi.application.exam.controller;
import cn.hutool.json.JSONUtil;
import com.yizhi.core.application.context.TaskContext;
import com.yizhi.core.application.file.task.AbstractDefaultTask;
import com.yizhi.exam.application.feign.QuestionLibrarySubjectClient;
import com.yizhi.exam.application.vo.TrQuestionLibrarySubjectVO;
import com.yizhi.exam.application.vo.TrQuestionSubjectOptionVO;
......@@ -46,7 +47,7 @@ import java.util.*;
* @since 1.0.0
*/
@Component
public class LibrarySubjectImport /**extends AbstractDefaultTask<List<ImportExamQuestionSubjectVO>, Map<String, Object>>**/ {
public class LibrarySubjectImport extends AbstractDefaultTask<List<ImportExamQuestionSubjectVO>, Map<String, Object>> {
private static String BASEPATH = "e:/";
private String XLSX = ".xlsx";
......@@ -75,14 +76,14 @@ public class LibrarySubjectImport /**extends AbstractDefaultTask<List<ImportExam
Long orgId = (Long) map.get("orgId");
int type = 0;
LOGGER.info("题库导入入参map:", JSONUtil.toJsonStr(map));
LOGGER.info("题库导入入参map:{}", JSONUtil.toJsonStr(map));
Date time = new Date();
Workbook book = getFile(url);
Long id = System.currentTimeMillis();
TaskContext taskContext = new TaskContext(id, "QUESTION-IMPORT" + id, TASKNAME, accountId, time, siteId, companyId);
// working(taskContext);
List<ImportExamQuestionSubjectVO> list = readExcelFile(book, taskContext);
LOGGER.info("题库导入入参内容:", JSONUtil.toJsonStr(list));
LOGGER.info("题库导入入参内容:{}", JSONUtil.toJsonStr(list));
int sort = 1; //生成默认排序
int s = 1;
int success = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment