add 题库导入

zhongzheng-admin/src/main/java/com/zhongzheng/controller/bank/QuestionController.java

@@ -3,6 +3,7 @@ package com.zhongzheng.controller.bank;
 import java.util.List;
 import java.util.Arrays;
 
+import cn.hutool.core.lang.Validator;
 import cn.hutool.http.HttpStatus;
 import com.github.pagehelper.PageInfo;
 import com.zhongzheng.common.core.domain.entity.SysUser;
@@ -153,6 +154,11 @@ public class QuestionController extends BaseController {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         String operName = loginUser.getUsername();
         String message = iQuestionService.importQuestion(questionList, updateSupport, operName);
-        return AjaxResult.success(message);
+        if(Validator.isNotEmpty(message)){
+            return AjaxResult.error(message);
+        }else{
+            return AjaxResult.success(message);
+        }
+
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionAddBo.java

@@ -63,4 +63,11 @@ public class QuestionAddBo {
     /** 业务层级列表 */
     @ApiModelProperty("业务层级列表")
     private List<QuestionBusinessAddBo> businessList;
+
+    /** 创建者 */
+    @ApiModelProperty("创建者")
+    private String createBy;
+    /** 导入编号 */
+    @ApiModelProperty("导入编号")
+    private String importNo;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/Question.java

@@ -57,4 +57,6 @@ private static final long serialVersionUID=1L;
     /** 创建者 */
     @TableField(fill = FieldFill.INSERT)
     private String createBy;
+    /** 导入编号 */
+    private String importNo;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionServiceImpl.java

@@ -4,7 +4,9 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.core.domain.entity.SysUser;
+import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
@@ -15,12 +17,16 @@ import com.zhongzheng.modules.bank.mapper.QuestionMapper;
 import com.zhongzheng.modules.bank.service.IExamQuestionService;
 import com.zhongzheng.modules.bank.service.IQuestionBusinessService;
 import com.zhongzheng.modules.bank.service.IQuestionService;
+import com.zhongzheng.modules.bank.vo.QuestionBusinessImport;
 import com.zhongzheng.modules.bank.vo.QuestionImport;
 import com.zhongzheng.modules.bank.vo.QuestionVo;
 import com.zhongzheng.modules.base.domain.ApplyAreas;
 import com.zhongzheng.modules.course.bo.CourseChapterSectionListAddBo;
-import com.zhongzheng.modules.course.domain.CourseChapterSection;
-import com.zhongzheng.modules.course.service.ICourseChapterSectionService;
+import com.zhongzheng.modules.course.domain.*;
+import com.zhongzheng.modules.course.service.*;
+import com.zhongzheng.modules.exam.domain.ExamKnowledge;
+import com.zhongzheng.modules.exam.service.IExamKnowledgeService;
+import io.micrometer.core.lang.NonNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -29,10 +35,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /**
@@ -50,6 +54,25 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
     @Autowired
     private QuestionMapper questionMapper;
 
+    @Autowired
+    private ICourseEducationTypeService iCourseEducationTypeService;
+
+    @Autowired
+    private ICourseProjectTypeService iCourseProjectTypeService;
+
+    @Autowired
+    private ICourseBusinessService iCourseBusinessService;
+
+    @Autowired
+    private ICourseSubjectService iCourseSubjectService;
+
+    @Autowired
+    private IExamKnowledgeService iExamKnowledgeService;
+
+    @Autowired
+    private RedisCache redisCache;
+
+
     @Override
     public QuestionVo queryById(Long questionId){
         Question db = this.baseMapper.selectById(questionId);
@@ -176,15 +199,114 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         if (Validator.isNull(questionList) || questionList.size() == 0) {
             throw new CustomException("导入数据不能为空！");
         }
+        String errorLog = "";
+        String importNo = ServletUtils.getEncoded("IMPORT");
         for (QuestionImport question : questionList) {
-            System.out.println(question);
+            QuestionAddBo bo = new QuestionAddBo();
+            if(question.getKnowledge()!=null){
+                List<String> knowledgeList = Arrays.asList(question.getKnowledge().split(","));
+                List<Long> kIdList = new ArrayList<>();
+                for (String knowledge : knowledgeList) {
+                    Long knowledgeId = findKnowledgeId(knowledge);
+                    if(!Validator.isNotEmpty(knowledgeId)){
+                        errorLog+=knowledge+"-该知识点不存在\n";
+                        continue;
+                    }
+                    kIdList.add(knowledgeId);
+                }
+                //知识点ID拼接
+                bo.setKnowledgeIds(join(",", kIdList));
+            }
+            if(!Validator.isNotEmpty(question.getContent())){
+                errorLog+="题目内容空白\n";
+                continue;
+            }
+            Integer type = findType(question.getType());
+            if(type==null){
+                errorLog+=question.getType()+"-该题目类型错误\n";
+                continue;
+            }
+            if(!Validator.isNotEmpty(question.getPrefixName())){
+                errorLog+=question.getContent()+"-前缀名称空白\n";
+                continue;
+            }
+            bo.setContent(question.getContent());
+            bo.setType(type);
+            bo.setStatus(1);
+            bo.setPrefixName(question.getPrefixName());
+            bo.setAnswerQuestion(question.getAnswerQuestion().replace(" ", ""));
+            bo.setAnalysisContent(question.getAnalysisContent());
+            //业务层次,导入每条题目只有一条业务层次
+            List<QuestionBusinessAddBo> businessList = new ArrayList<>();
+            QuestionBusinessAddBo questionBusinessAddBo = new QuestionBusinessAddBo();
+            Long eduId = findEduId(question.getEducationType());
+            if(!Validator.isNotEmpty(eduId)){
+                errorLog+=question.getEducationType()+"-该业务层次不存在\n";
+                continue;
+            }
+            Long projectId = findProjectId(question.getProject());
+            if(!Validator.isNotEmpty(projectId)){
+                errorLog+=question.getProject()+"-该项目类型不存在\n";
+                continue;
+            }
+            Long businessId = findBusinessId(question.getBusiness());
+            if(!Validator.isNotEmpty(businessId)){
+                errorLog+=question.getBusiness()+"-该业务层次不存在\n";
+                continue;
+            }
+            Long subjectId = findSubjectId(question.getSubject());
+            if(!Validator.isNotEmpty(subjectId)){
+                errorLog+=question.getSubject()+"-该科目不存在\n";
+                continue;
+            }
+            questionBusinessAddBo.setEducationTypeId(eduId);
+            questionBusinessAddBo.setProjectId(projectId);
+            questionBusinessAddBo.setBusinessId(businessId);
+            questionBusinessAddBo.setSubjectId(subjectId);
+            businessList.add(questionBusinessAddBo);
+            bo.setBusinessList(businessList);
+            //选项列表
+            bo.setOptionsList(dealOptionsList(question));
+            bo.setCreateBy(operName);
+            bo.setImportNo(importNo);
+            bo.setPublishStatus(0);
+            errorLog = insertByAddBoImport(bo,errorLog);
         }
-        return null;
+        System.out.println(errorLog);
+        return errorLog;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public String insertByAddBoImport(QuestionAddBo bo,String errorLog) {
+        Question add = BeanUtil.toBean(bo, Question.class);
+        add.setCode(ServletUtils.getEncoded("TM"));
+        if(bo.getOptionsList()!=null){
+            add.setJsonStr(JSON.toJSONString(bo.getOptionsList()));
+        }
+        if(checkNameUnique(add)){
+            errorLog+=bo.getContent()+"-名称重复\n";
+           return errorLog;
+        }
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        boolean result = this.save(add);
+        if(bo.getBusinessList()!=null){
+            Collection<QuestionBusiness> coll = new HashSet<>();
+            for(int i=0;i<bo.getBusinessList().size();i++){
+                QuestionBusinessAddBo item = bo.getBusinessList().get(i);
+                QuestionBusiness addItem = BeanUtil.toBean(item, QuestionBusiness.class);
+                addItem.setMajorId(add.getQuestionId());
+                addItem.setType(QuestionBusiness.TYPE_QUESTION);
+                coll.add(addItem);
+            }
+            iQuestionBusinessService.saveBatch(coll);
+        }
+        return errorLog;
     }
 
     private boolean checkNameUnique(Question entity) {
         Question info = getOne(new LambdaQueryWrapper<Question>()
-                .eq(Question::getPrefixName,entity.getPrefixName()).ne(Question::getContent,entity.getContent()).last("limit 1"));
+                .eq(Question::getPrefixName,entity.getPrefixName()).eq(Question::getContent,entity.getContent()).ne(Question::getStatus,-1).last("limit 1"));
         if (Validator.isNotNull(info)) {
             if(Validator.isNotEmpty(entity.getQuestionId())){
                 if(entity.getQuestionId() != info.getQuestionId()){
@@ -196,4 +318,189 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         }
         return false;
     }
+
+    //合并选项列表
+    public List<QuestionChildAddBo> dealOptionsList(QuestionImport question){
+        List<QuestionChildAddBo> optionsList =new ArrayList<>();
+        if(Validator.isNotEmpty(question.getV1())){
+            QuestionChildAddBo bo1 = new QuestionChildAddBo();
+            bo1.setOptionsId(1L);
+            bo1.setContent(question.getV1());
+            optionsList.add(bo1);
+        }
+        if(Validator.isNotEmpty(question.getV2())){
+            QuestionChildAddBo bo2 = new QuestionChildAddBo();
+            bo2.setOptionsId(2L);
+            bo2.setContent(question.getV2());
+            optionsList.add(bo2);
+        }
+        if(Validator.isNotEmpty(question.getV3())){
+            QuestionChildAddBo bo3 = new QuestionChildAddBo();
+            bo3.setOptionsId(3L);
+            bo3.setContent(question.getV3());
+            optionsList.add(bo3);
+        }
+        if(Validator.isNotEmpty(question.getV4())){
+            QuestionChildAddBo bo4 = new QuestionChildAddBo();
+            bo4.setOptionsId(4L);
+            bo4.setContent(question.getV4());
+            optionsList.add(bo4);
+        }
+        if(Validator.isNotEmpty(question.getV5())){
+            QuestionChildAddBo bo5 = new QuestionChildAddBo();
+            bo5.setOptionsId(5L);
+            bo5.setContent(question.getV5());
+            optionsList.add(bo5);
+        }
+        if(Validator.isNotEmpty(question.getV6())){
+            QuestionChildAddBo bo6 = new QuestionChildAddBo();
+            bo6.setOptionsId(6L);
+            bo6.setContent(question.getV6());
+            optionsList.add(bo6);
+        }
+        return optionsList;
+    }
+
+    public Long findEduId(String edu){
+        if(edu!=null){
+            String key = "EDU_"+edu;
+            Long value = redisCache.getCacheObject(key);
+            if(value!=null){
+                if(value==0L){
+                    return null;
+                }
+                return value;
+            }
+            CourseEducationType info = iCourseEducationTypeService.getOne(new LambdaQueryWrapper<CourseEducationType>()
+                    .eq(CourseEducationType::getEducationName,edu));
+            if(info!=null){
+                redisCache.setCacheObject(key,info.getId(),3, TimeUnit.MINUTES);//3分钟
+                return info.getId();
+            }else{
+                redisCache.setCacheObject(key,0L,3, TimeUnit.MINUTES);//3分钟
+            }
+        }
+        return null;
+    }
+
+    public Long findProjectId(String project){
+        if(project!=null){
+            String key = "PROJ_"+project;
+            Long value = redisCache.getCacheObject(key);
+            if(value!=null){
+                if(value==0L){
+                    return null;
+                }
+                return value;
+            }
+            CourseProjectType info = iCourseProjectTypeService.getOne(new LambdaQueryWrapper<CourseProjectType>()
+                    .eq(CourseProjectType::getProjectName,project).eq(CourseProjectType::getStatus,1).last("limit 1"));
+            if(info!=null){
+                redisCache.setCacheObject(key,info.getId(),3, TimeUnit.MINUTES);//3分钟
+                return info.getId();
+            }else{
+                redisCache.setCacheObject(key,0L,3, TimeUnit.MINUTES);//3分钟
+            }
+        }
+        return null;
+    }
+
+    public Long findBusinessId(String business){
+        if(business!=null){
+            String key = "BUS_"+business;
+            Long value = redisCache.getCacheObject(key);
+            if(value!=null){
+                if(value==0L){
+                    return null;
+                }
+                return value;
+            }
+            CourseBusiness info = iCourseBusinessService.getOne(new LambdaQueryWrapper<CourseBusiness>()
+                    .eq(CourseBusiness::getBusinessName,business).eq(CourseBusiness::getStatus,1).last("limit 1"));
+            if(info!=null){
+                redisCache.setCacheObject(key,info.getId(),3, TimeUnit.MINUTES);//3分钟
+                return info.getId();
+            }else{
+                redisCache.setCacheObject(key,0L,3, TimeUnit.MINUTES);//3分钟
+            }
+        }
+        return null;
+    }
+
+    public Long findSubjectId(String subject){
+        if(subject!=null){
+            String key = "SUB_"+subject;
+            Long value = redisCache.getCacheObject(key);
+            if(value!=null){
+                if(value==0L){
+                    return null;
+                }
+                return value;
+            }
+            CourseSubject info = iCourseSubjectService.getOne(new LambdaQueryWrapper<CourseSubject>()
+                    .eq(CourseSubject::getSubjectName,subject).eq(CourseSubject::getStatus,1).last("limit 1"));
+            if(info!=null){
+                redisCache.setCacheObject(key,info.getId(),3, TimeUnit.MINUTES);//3分钟
+                return info.getId();
+            }else{
+                redisCache.setCacheObject(key,0L,3, TimeUnit.MINUTES);//3分钟
+            }
+        }
+        return null;
+    }
+
+    public Long findKnowledgeId(String knowledge){
+        if(knowledge!=null){
+            String key = "KNO_"+knowledge;
+            Long value = redisCache.getCacheObject(key);
+            if(value!=null){
+                if(value==0L){
+                    return null;
+                }
+                return value;
+            }
+            ExamKnowledge info = iExamKnowledgeService.getOne(new LambdaQueryWrapper<ExamKnowledge>()
+                    .eq(ExamKnowledge::getKnowledgeName,knowledge).eq(ExamKnowledge::getStatus,1).last("limit 1"));
+            if(info!=null){
+                redisCache.setCacheObject(key,info.getKnowledgeId(),3, TimeUnit.MINUTES);//3分钟
+                return info.getKnowledgeId();
+            }else{
+                redisCache.setCacheObject(key,0L,3, TimeUnit.MINUTES);//3分钟
+            }
+        }
+        return null;
+    }
+
+    public Integer findType(String type){
+        if("单选题".equals(type)){
+            return 1;
+        }
+        else if("多选题".equals(type)){
+            return 2;
+        }
+        else if("判断题".equals(type)){
+            return 3;
+        }
+        else if("简答题".equals(type)){
+            return 4;
+        }
+        else if("案例题".equals(type)){
+            return 5;
+        }
+        return null;
+    }
+
+    public  String join(@NonNull CharSequence delimiter, @NonNull Iterable tokens) {
+        final Iterator<?> it = tokens.iterator();
+        if (!it.hasNext()) {
+            return "";
+        }
+        final StringBuilder sb = new StringBuilder();
+        sb.append(it.next());
+        while (it.hasNext()) {
+            sb.append(delimiter);
+            sb.append(it.next());
+        }
+        return sb.toString();
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/vo/QuestionBusinessImport.java

@@ -1,9 +1,12 @@
 package com.zhongzheng.modules.bank.vo;
 
 import com.zhongzheng.common.annotation.Excel;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
 
 
 /**
@@ -13,8 +16,11 @@ import lombok.Data;
  * @date 2021-10-22
  */
 @Data
-@ApiModel("题库题目添加对象")
-public class QuestionBusinessImport {
+@NoArgsConstructor
+@Accessors(chain = true)
+public class QuestionBusinessImport implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /** 教育类型ID */
     @Excel(name = "教育类型")
@@ -29,4 +35,5 @@ public class QuestionBusinessImport {
     @Excel(name = "项目类型")
     private String project;
 
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/vo/QuestionImport.java

@@ -29,6 +29,8 @@ public class QuestionImport implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @Excel(name = "编号")
+    private String id;
     /** 题目正文 */
     @Excel(name = "题目内容")
     private String content;
@@ -63,6 +65,23 @@ public class QuestionImport implements Serializable {
     @Excel(name = "项目类型")
     private String project;
 
+    @Excel(name = "知识点")
+    private String knowledge;
+
+    private List<String> knowledgeList;
+
+    @Excel(name = "选项1")
+    private String v1;
+    @Excel(name = "选项2")
+    private String v2;
+    @Excel(name = "选项3")
+    private String v3;
+    @Excel(name = "选项4")
+    private String v4;
+    @Excel(name = "选项5")
+    private String v5;
+    @Excel(name = "选项6")
+    private String v6;
 
 
 }

zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionMapper.xml

@@ -19,6 +19,8 @@
         <result property="knowledgeIds" column="knowledge_ids"/>
         <result property="publishStatus" column="publish_status"/>
         <result property="code" column="code"/>
+        <result property="importNo" column="import_no"/>
+        <result property="createBy" column="create_by"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.bank.vo.QuestionVo" id="QuestionResultVo">