试卷导入

陈杰
1 parent 54c3da43
Showing 25 changed files with 978 additions and 24 deletions Show diff stats
src/main/java/com/jevon/controller/LearnController.java
src/main/java/com/jevon/controller/ScheduleInitController.java
src/main/java/com/jevon/enums/DifficultEnums.java
src/main/java/com/jevon/enums/DimensionalEnums.java
src/main/java/com/jevon/mapper/AnalyseDetailMapper.java
src/main/java/com/jevon/mapper/AnalyseDimensionalMapper.java
src/main/java/com/jevon/mapper/AnalyseMapper.java
src/main/java/com/jevon/mapper/DimensionalMapper.java
src/main/java/com/jevon/model/Analyse.java
src/main/java/com/jevon/model/AnalyseDetail.java
src/main/java/com/jevon/model/AnalyseDimensional.java
src/main/java/com/jevon/model/Dimensional.java
src/main/java/com/jevon/service/AnalyseDetailService.java
src/main/java/com/jevon/service/AnalyseDimensionalService.java
src/main/java/com/jevon/service/AnalyseService.java
src/main/java/com/jevon/service/DimensionalService.java
src/main/java/com/jevon/service/impl/AnalyseDetailServiceImpl.java
src/main/java/com/jevon/service/impl/AnalyseDimensionalServiceImpl.java
src/main/java/com/jevon/service/impl/AnalyseServiceImpl.java
src/main/java/com/jevon/service/impl/DimensionalServiceImpl.java
 package com.jevon.controller;
+import com.jevon.enums.DifficultEnums;
+import com.jevon.enums.DimensionalEnums;
 import com.jevon.model.*;
+import com.jevon.service.AnalyseDetailService;
+import com.jevon.service.AnalyseDimensionalService;
+import com.jevon.service.AnalyseService;
+import com.jevon.service.DimensionalService;
 import com.jevon.vo.BaseVo;
+import com.jevon.vo.excel.ExamExcelVo;
 import com.jevon.vo.req.InitAnalyseReqVo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import java.io.File;
@@ -26,11 +36,31 @@ import java.util.*;
 @Api(value = "学情分析")
 public class LearnController {
+    @Autowired
+    AnalyseService analyseService;
+    @Autowired
+    DimensionalService dimensionalService;
+
+    @Autowired
+    AnalyseDimensionalService analyseDimensionalService;
+
+    @Autowired
+    AnalyseDetailService analyseDetailService;
+
+    @ApiOperation("试卷信息导入")
+    @RequestMapping(value = "initAnalyse", method = RequestMethod.POST)
     public BaseVo initAnalyse(@RequestBody InitAnalyseReqVo initAnalyseReqVo){
         BaseVo baseVo = new BaseVo();
-        Date date = new Date();
+        analysisExcel(initAnalyseReqVo);
+        return baseVo;
+    }
+
+    private void analysisExcel(InitAnalyseReqVo initAnalyseReqVo){
         try{
+            List<AnalyseDetail> analyseDetails = new ArrayList<>();
+            List<AnalyseDimensional> analyseDimensionals = new ArrayList<>();
+            Analyse analyse = analyseService.selectById(initAnalyseReqVo.getAnalyseId());
             String fileUrl = initAnalyseReqVo.getUrl();
             File excelFile = new File(fileUrl);
             // 获得工作簿
@@ -43,9 +73,8 @@ public class LearnController {
             }
             // 获得工作表
             Sheet sheet = workbook.getSheetAt(0);
+            Date date = new Date();
             int rows = sheet.getPhysicalNumberOfRows();
-            int column = 0 ;
-            int courseNumber = 0;
             for (int i = 0; i < rows; i++) {
                 // 获取第i行数据
                 Row sheetRow = sheet.getRow(i);
@@ -54,24 +83,63 @@ public class LearnController {
                     String title = sheetRow.getCell(0).getStringCellValue().trim();
                 }else if(i == 1){
                     //获取表头
-                    int j = 0 ;
-                    while (sheetRow.getCell(j) != null && StringUtils.isNotBlank(sheetRow.getCell(j).getStringCellValue().trim())) {
-                        j++ ;
-                    }
-                    column = j ;
                 } else {
-                    for (int j = 0; j < column; j++) {
-                        Cell cell = sheetRow.getCell(j);
-                        if(cell != null){
-                            cell.setCellType(CellType.STRING);
-                        }
+                    ExamExcelVo examExcelVo = new ExamExcelVo(sheetRow);
+                    AnalyseDetail analyseDetail = new AnalyseDetail();
+                    String questionNumber = null ;
+                    if(StringUtils.isNotBlank(examExcelVo.getQuestionSmallNumber())){
+                        questionNumber = examExcelVo.getQuestionNumber()+"("+examExcelVo.getQuestionSmallNumber()+")";
+                    }else {
+                        questionNumber = examExcelVo.getQuestionNumber() ;
                     }
+                    analyseDetail.setQuestionNumber(questionNumber);
+                    analyseDetail.setAnalyseId(analyse.getId());
+                    analyseDetail.setQuestionType(examExcelVo.getQuestionType());
+                    analyseDetail.setDifficult(DifficultEnums.getDifficultType(examExcelVo.getDifficult()));
+                    analyseDetail.setScore(new Float(examExcelVo.getScore()));
+                    analyseDetail.setCreateTime(date);
+                    analyseDetails.add(analyseDetail);
+                    initAnalyseDimensional(analyse,questionNumber,examExcelVo.getScore(),examExcelVo.getKnowledge(),DimensionalEnums.knowledge.getDimensionalType(),analyseDimensionals);
+                    initAnalyseDimensional(analyse,questionNumber,examExcelVo.getScore(),examExcelVo.getAbility(),DimensionalEnums.ability.getDimensionalType(),analyseDimensionals);
+                    initAnalyseDimensional(analyse,questionNumber,examExcelVo.getScore(),examExcelVo.getSkill(),DimensionalEnums.skill.getDimensionalType(),analyseDimensionals);
+                    initAnalyseDimensional(analyse,questionNumber,examExcelVo.getScore(),examExcelVo.getThink(),DimensionalEnums.think.getDimensionalType(),analyseDimensionals);
                 }
             }
+            analyseDetailService.insertBatch(analyseDetails);
+            analyseDimensionalService.insertBatch(analyseDimensionals);
         }catch (Exception e){
             System.out.println(e);
-            baseVo.setSuccess(false);
         }
-        return baseVo;
     }
+
+    private void initAnalyseDimensional(Analyse analyse ,String questionNumber , String score , String dimensionalMessage , int dimensionalType , List<AnalyseDimensional> analyseDimensionals){
+        if(StringUtils.isNotBlank(dimensionalMessage)){
+            String[] message =dimensionalMessage.split("、");
+            for (int j = 0; j < message.length ; j++) {
+                if(StringUtils.isNotBlank(message[j])){
+                    Dimensional dimensional = new Dimensional();
+                    dimensional.setDimensionalType(dimensionalType);
+                    dimensional.setDimensionalName(message[j]);
+                    //查数据库是否已存在该四维诊断  不存在则导入
+                    Dimensional result = dimensionalService.selectByTypeAndName(dimensionalType,message[j]);
+                    int dimensionalId = 0 ;
+                    if(result == null || result.getId() == 0){
+                        dimensional.setCreateTime(new Date());
+                        dimensionalId = dimensionalService.insert(dimensional);
+                    }else {
+                        dimensionalId = result.getId();
+                    }
+                    AnalyseDimensional analyseDimensional = new AnalyseDimensional();
+                    analyseDimensional.setAnalyseId(analyse.getId());
+                    analyseDimensional.setDimensionalId(dimensionalId);
+                    analyseDimensional.setQuestionNumber(questionNumber);
+                    analyseDimensional.setScore(new Float(score));
+                    analyseDimensional.setCreateTime(new Date());
+                    analyseDimensionals.add(analyseDimensional);
+                }
+            }
+        }
+    }
+
+
 }
@@ -314,7 +314,7 @@ public class ScheduleInitController {
             teacher.setTeacherName(json.get("name").toString());
             teachers.add(teacher);
         }
-        initTeacher(teachers);
+        initTeacher(teachers,schoolId);
         JSONObject classList = HttpClientUtils.httpGet(url+"/api/EasyN/GetSchoolClass?SchoolId="+schoolId);
         List<JSONObject> openClasses = (List<JSONObject>)classList.get("data");
         List<ClassModel> classModels = new ArrayList<>();
@@ -326,7 +326,7 @@ public class ScheduleInitController {
             classModel.setClassName(json.get("class_name").toString());
             classModels.add(classModel);
         }
-        initClass(classModels);
+        initClass(classModels,schoolId);
         JSONObject courseList = HttpClientUtils.httpGet(url+"/api/EasyN/GetSchoolSubject?SchoolId="+schoolId);
         List<JSONObject> openCourses = (List<JSONObject>)courseList.get("data");
         List<Course> courses = new ArrayList<>();
@@ -338,12 +338,12 @@ public class ScheduleInitController {
             course.setCourseType(0);
             courses.add(course);
         }
-        initCourse(courses);
+        initCourse(courses,schoolId);
     }
-    public BaseVo initCourse(List<Course> courseList){
+    public BaseVo initCourse(List<Course> courseList ,int schoolId){
         BaseVo baseVo = new BaseVo();
-        courseService.deleteSchoolId(courseList.get(0).getSchoolId());
+        courseService.deleteSchoolId(schoolId);
         for(Course course : courseList){
             if(course.getCourseId() == 0 || StringUtils.isBlank(course.getCourseName())){
                 baseVo.setSuccess(false);
@@ -360,9 +360,9 @@ public class ScheduleInitController {
         }
     }
-    public BaseVo initClass(List<ClassModel> classList){
+    public BaseVo initClass(List<ClassModel> classList , int schoolId){
         BaseVo baseVo = new BaseVo();
-        classModelService.deleteSchool(classList.get(0).getSchoolId());
+        classModelService.deleteSchool(schoolId);
         for(ClassModel classModel : classList){
             if(classModel.getClassId() == 0 || StringUtils.isBlank(classModel.getClassName()) ||
                     StringUtils.isBlank(classModel.getGrade()) || classModel.getSchoolId() == 0){
@@ -380,7 +380,7 @@ public class ScheduleInitController {
         }
     }
-    public BaseVo initTeacher(List<Teacher> teacherList){
+    public BaseVo initTeacher(List<Teacher> teacherList , int schoolId){
         List<Teacher> result = new ArrayList<>();
         for(Teacher teacher : teacherList){
             boolean isExist = false;
@@ -394,7 +394,7 @@ public class ScheduleInitController {
             }
         }
         BaseVo baseVo = new BaseVo();
-        teacherService.deleteSchool(result.get(0).getSchoolId());
+        teacherService.deleteSchool(schoolId);
         for(Teacher teacher : result){
             if(teacher.getSchoolId() == 0 || StringUtils.isBlank(teacher.getTeacherName()) ||
                     teacher.getTeacherId() == 0){
@@ -0,0 +1,46 @@
+package com.jevon.enums;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 8:40
+ */
+public enum DifficultEnums {
+
+    easy(1,"易"),
+    medium(2,"中"),
+    difficult(3,"难");
+
+    private int difficultType ;
+    private String difficultName ;
+
+    DifficultEnums(int difficultType, String difficultName) {
+        this.difficultType = difficultType;
+        this.difficultName = difficultName;
+    }
+
+    public int getDifficultType() {
+        return difficultType;
+    }
+
+    public void setDifficultType(int difficultType) {
+        this.difficultType = difficultType;
+    }
+
+    public String getDifficultName() {
+        return difficultName;
+    }
+
+    public void setDifficultName(String difficultName) {
+        this.difficultName = difficultName;
+    }
+
+    public static int getDifficultType(String difficultName){
+        for (DifficultEnums difficultEnums : DifficultEnums.values()) {
+            if (difficultEnums.getDifficultName().equals(difficultName)) {
+                return difficultEnums.getDifficultType();
+            }
+        }
+        return 0 ;
+    }
+}
@@ -0,0 +1,37 @@
+package com.jevon.enums;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 8:33
+ */
+public enum DimensionalEnums {
+    knowledge(1,"知识点"),
+    ability(2,"能力"),
+    skill(3,"技能"),
+    think(4,"四维");
+
+    private int dimensionalType ;
+    private String dimensionalName ;
+
+    DimensionalEnums(int dimensionalType, String dimensionalName) {
+        this.dimensionalType = dimensionalType;
+        this.dimensionalName = dimensionalName;
+    }
+
+    public int getDimensionalType() {
+        return dimensionalType;
+    }
+
+    public void setDimensionalType(int dimensionalType) {
+        this.dimensionalType = dimensionalType;
+    }
+
+    public String getDimensionalName() {
+        return dimensionalName;
+    }
+
+    public void setDimensionalName(String dimensionalName) {
+        this.dimensionalName = dimensionalName;
+    }
+}
@@ -0,0 +1,15 @@
+package com.jevon.mapper;
+
+import com.jevon.model.AnalyseDetail;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 11:11
+ */
+public interface AnalyseDetailMapper {
+
+    int insertBatch(List<AnalyseDetail> list);
+}
@@ -0,0 +1,15 @@
+package com.jevon.mapper;
+
+import com.jevon.model.AnalyseDimensional;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 11:12
+ */
+public interface AnalyseDimensionalMapper {
+
+    int insertBatch(List<AnalyseDimensional> list);
+}
@@ -0,0 +1,19 @@
+package com.jevon.mapper;
+
+import com.jevon.model.Analyse;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 10:56
+ */
+public interface AnalyseMapper {
+
+    int insert(Analyse analyse);
+
+    List<Analyse> select(Analyse analyse);
+
+    Analyse selectById(int id);
+}
@@ -0,0 +1,17 @@
+package com.jevon.mapper;
+
+import com.jevon.model.Dimensional;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 10:11
+ */
+public interface DimensionalMapper {
+
+    int insert(Dimensional dimensional);
+
+    List<Dimensional> select(Dimensional dimensional);
+}
@@ -0,0 +1,57 @@
+package com.jevon.model;
+
+import java.util.Date;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 10:55
+ */
+public class Analyse {
+
+    private int id ;
+    private String examName ;
+    private Date examTime ;
+    private String courseName ;
+    private Date createTime ;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getExamName() {
+        return examName;
+    }
+
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
+
+    public Date getExamTime() {
+        return examTime;
+    }
+
+    public void setExamTime(Date examTime) {
+        this.examTime = examTime;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}
@@ -0,0 +1,75 @@
+package com.jevon.model;
+
+import java.util.Date;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 8:38
+ */
+public class AnalyseDetail {
+
+    private int id ;
+    private int analyseId ;
+    private String questionNumber ;
+    private String questionType ;
+    private int difficult ;
+    private float score ;
+    private Date createTime ;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getAnalyseId() {
+        return analyseId;
+    }
+
+    public void setAnalyseId(int analyseId) {
+        this.analyseId = analyseId;
+    }
+
+    public String getQuestionNumber() {
+        return questionNumber;
+    }
+
+    public void setQuestionNumber(String questionNumber) {
+        this.questionNumber = questionNumber;
+    }
+
+    public int getDifficult() {
+        return difficult;
+    }
+
+    public void setDifficult(int difficult) {
+        this.difficult = difficult;
+    }
+
+    public float getScore() {
+        return score;
+    }
+
+    public void setScore(float score) {
+        this.score = score;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getQuestionType() {
+        return questionType;
+    }
+
+    public void setQuestionType(String questionType) {
+        this.questionType = questionType;
+    }
+}
@@ -0,0 +1,66 @@
+package com.jevon.model;
+
+import java.util.Date;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 8:42
+ */
+public class AnalyseDimensional {
+
+    private int id ;
+    private int analyseId ;
+    private String questionNumber ;
+    private int dimensionalId ;
+    private float score ;
+    private Date createTime ;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getAnalyseId() {
+        return analyseId;
+    }
+
+    public void setAnalyseId(int analyseId) {
+        this.analyseId = analyseId;
+    }
+
+    public String getQuestionNumber() {
+        return questionNumber;
+    }
+
+    public void setQuestionNumber(String questionNumber) {
+        this.questionNumber = questionNumber;
+    }
+
+    public int getDimensionalId() {
+        return dimensionalId;
+    }
+
+    public void setDimensionalId(int dimensionalId) {
+        this.dimensionalId = dimensionalId;
+    }
+
+    public float getScore() {
+        return score;
+    }
+
+    public void setScore(float score) {
+        this.score = score;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}
@@ -0,0 +1,48 @@
+package com.jevon.model;
+
+import java.util.Date;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 8:37
+ */
+public class Dimensional {
+
+    private int id ;
+    private int dimensionalType ;
+    private String dimensionalName;
+    private Date createTime ;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getDimensionalType() {
+        return dimensionalType;
+    }
+
+    public void setDimensionalType(int dimensionalType) {
+        this.dimensionalType = dimensionalType;
+    }
+
+    public String getDimensionalName() {
+        return dimensionalName;
+    }
+
+    public void setDimensionalName(String dimensionalName) {
+        this.dimensionalName = dimensionalName;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}
@@ -0,0 +1,16 @@
+package com.jevon.service;
+
+import com.jevon.model.AnalyseDetail;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 11:25
+ */
+public interface AnalyseDetailService {
+
+    int insertBatch(List<AnalyseDetail> list);
+
+}
@@ -0,0 +1,16 @@
+package com.jevon.service;
+
+import com.jevon.model.AnalyseDimensional;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 11:25
+ */
+public interface AnalyseDimensionalService {
+
+    int insertBatch(List<AnalyseDimensional> list);
+
+}
@@ -0,0 +1,20 @@
+package com.jevon.service;
+
+import com.jevon.model.Analyse;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 10:59
+ */
+public interface AnalyseService {
+
+    int insert(Analyse analyse);
+
+    List<Analyse> select(Analyse analyse);
+
+    Analyse selectById(int id);
+
+}
@@ -0,0 +1,19 @@
+package com.jevon.service;
+
+import com.jevon.model.Dimensional;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 10:24
+ */
+public interface DimensionalService {
+
+    int insert(Dimensional dimensional);
+
+    List<Dimensional> select(Dimensional dimensional);
+
+    Dimensional selectByTypeAndName(int type , String name);
+}
@@ -0,0 +1,38 @@
+package com.jevon.service.impl;
+
+import com.jevon.mapper.AnalyseDetailMapper;
+import com.jevon.model.AnalyseDetail;
+import com.jevon.service.AnalyseDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 11:26
+ */
+@Service
+public class AnalyseDetailServiceImpl implements AnalyseDetailService {
+
+    @Autowired
+    AnalyseDetailMapper analyseDetailMapper;
+
+    @Override
+    public int insertBatch(List<AnalyseDetail> list) {
+        int i = 0 ;
+        List<AnalyseDetail> result = new ArrayList<>();
+        for(AnalyseDetail analyseDetail :list){
+            i++ ;
+            result.add(analyseDetail);
+            if(i % 100 == 0){
+                analyseDetailMapper.insertBatch(result);
+                result = new ArrayList<>();
+            }
+        }
+        analyseDetailMapper.insertBatch(result);
+        return  1 ;
+    }
+}
@@ -0,0 +1,38 @@
+package com.jevon.service.impl;
+
+import com.jevon.mapper.AnalyseDimensionalMapper;
+import com.jevon.model.AnalyseDimensional;
+import com.jevon.service.AnalyseDimensionalService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 11:27
+ */
+@Service
+public class AnalyseDimensionalServiceImpl implements AnalyseDimensionalService {
+
+    @Autowired
+    AnalyseDimensionalMapper analyseDimensionalMapper;
+
+    @Override
+    public int insertBatch(List<AnalyseDimensional> list) {
+        int i = 0 ;
+        List<AnalyseDimensional> result = new ArrayList<>();
+        for(AnalyseDimensional analyseDetail :list){
+            i++ ;
+            result.add(analyseDetail);
+            if(i % 100 == 0){
+                analyseDimensionalMapper.insertBatch(result);
+                result = new ArrayList<>();
+            }
+        }
+        analyseDimensionalMapper.insertBatch(result);
+        return  1 ;
+    }
+}
@@ -0,0 +1,36 @@
+package com.jevon.service.impl;
+
+import com.jevon.mapper.AnalyseMapper;
+import com.jevon.model.Analyse;
+import com.jevon.service.AnalyseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 10:59
+ */
+@Service
+public class AnalyseServiceImpl implements AnalyseService {
+
+    @Autowired
+    AnalyseMapper analyseMapper;
+
+    @Override
+    public int insert(Analyse analyse) {
+        return analyseMapper.insert(analyse);
+    }
+
+    @Override
+    public List<Analyse> select(Analyse analyse) {
+        return analyseMapper.select(analyse);
+    }
+
+    @Override
+    public Analyse selectById(int id) {
+        return analyseMapper.selectById(id);
+    }
+}
@@ -0,0 +1,44 @@
+package com.jevon.service.impl;
+
+import com.jevon.mapper.DimensionalMapper;
+import com.jevon.model.Dimensional;
+import com.jevon.service.DimensionalService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 10:25
+ */
+@Service
+public class DimensionalServiceImpl implements DimensionalService {
+
+    @Autowired
+    DimensionalMapper dimensionalMapper;
+
+    @Override
+    public int insert(Dimensional dimensional) {
+        return dimensionalMapper.insert(dimensional);
+    }
+
+    @Override
+    public List<Dimensional> select(Dimensional dimensional) {
+        return dimensionalMapper.select(dimensional);
+    }
+
+    @Override
+    public Dimensional selectByTypeAndName(int type, String name) {
+        Dimensional dimensional = new Dimensional();
+        dimensional.setDimensionalType(type);
+        dimensional.setDimensionalName(name);
+        List<Dimensional> list = dimensionalMapper.select(dimensional);
+        if(list != null &&list.size() > 0){
+            return list.get(0);
+        }
+        return null;
+    }
+}
@@ -0,0 +1,168 @@
+package com.jevon.vo.excel;
+
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.Row;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 8:51
+ */
+public class ExamExcelVo {
+
+    private String questionNumber ;
+    private String questionSmallNumber ;
+    private String questionType ;
+    private String difficult ;
+    private String score ;
+    private String knowledge ;
+    private String ability ;
+    private String skill ;
+    private String think ;
+
+    public String getQuestionNumber() {
+        return questionNumber;
+    }
+
+    public void setQuestionNumber(String questionNumber) {
+        this.questionNumber = questionNumber;
+    }
+
+    public String getQuestionSmallNumber() {
+        return questionSmallNumber;
+    }
+
+    public void setQuestionSmallNumber(String questionSmallNumber) {
+        this.questionSmallNumber = questionSmallNumber;
+    }
+
+    public String getQuestionType() {
+        return questionType;
+    }
+
+    public void setQuestionType(String questionType) {
+        this.questionType = questionType;
+    }
+
+    public String getDifficult() {
+        return difficult;
+    }
+
+    public void setDifficult(String difficult) {
+        this.difficult = difficult;
+    }
+
+    public String getScore() {
+        return score;
+    }
+
+    public void setScore(String score) {
+        this.score = score;
+    }
+
+    public String getKnowledge() {
+        return knowledge;
+    }
+
+    public void setKnowledge(String knowledge) {
+        this.knowledge = knowledge;
+    }
+
+    public String getAbility() {
+        return ability;
+    }
+
+    public void setAbility(String ability) {
+        this.ability = ability;
+    }
+
+    public String getSkill() {
+        return skill;
+    }
+
+    public void setSkill(String skill) {
+        this.skill = skill;
+    }
+
+    public String getThink() {
+        return think;
+    }
+
+    public void setThink(String think) {
+        this.think = think;
+    }
+
+    public ExamExcelVo(Row sheetRow) {
+        Cell cell1 = sheetRow.getCell(0);
+        if(cell1 != null){
+            cell1.setCellType(CellType.STRING);
+            this.questionNumber = cell1.getStringCellValue().trim();
+        }
+
+        Cell cell2 = sheetRow.getCell(1);
+        if(cell2 != null){
+            cell2.setCellType(CellType.STRING);
+            this.questionSmallNumber = cell2.getStringCellValue().trim();
+        }else {
+            this.questionSmallNumber = null ;
+        }
+
+
+        Cell cell3 = sheetRow.getCell(2);
+        if(cell3 != null){
+            cell3.setCellType(CellType.STRING);
+            this.questionType = cell3.getStringCellValue().trim();
+        }else {
+            this.questionType = null ;
+        }
+
+        Cell cell4 = sheetRow.getCell(3);
+        if(cell4 != null){
+            cell4.setCellType(CellType.STRING);
+            this.difficult = cell4.getStringCellValue().trim();
+        }else {
+            this.difficult = null ;
+        }
+
+        Cell cell5 = sheetRow.getCell(4);
+        if(cell5 != null){
+            cell5.setCellType(CellType.STRING);
+            this.score = cell5.getStringCellValue().trim();
+        }else {
+            this.score = null ;
+        }
+
+        Cell cell6 = sheetRow.getCell(5);
+        if(cell6 != null){
+            cell6.setCellType(CellType.STRING);
+            this.knowledge = cell6.getStringCellValue().trim();
+        }else {
+            this.knowledge = null ;
+        }
+
+        Cell cell7 = sheetRow.getCell(6);
+        if(cell7 != null){
+            cell7.setCellType(CellType.STRING);
+            this.ability = cell7.getStringCellValue().trim();
+        }else {
+            this.ability = null ;
+        }
+
+        Cell cell8 = sheetRow.getCell(7);
+        if(cell8 != null){
+            cell8.setCellType(CellType.STRING);
+            this.skill = cell8.getStringCellValue().trim();
+        }else {
+            this.skill = null ;
+        }
+
+        Cell cell9 = sheetRow.getCell(8);
+        if(cell9 != null){
+            cell9.setCellType(CellType.STRING);
+            this.think = cell9.getStringCellValue().trim();
+        }else {
+            this.think = null ;
+        }
+    }
+}
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.jevon.mapper.AnalyseDetailMapper" >
+  <resultMap id="BaseResultMap" type="com.jevon.model.AnalyseDetail" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="analyse_id" property="analyseId" jdbcType="INTEGER" />
+    <result column="question_number" property="questionNumber" jdbcType="VARCHAR" />
+    <result column="question_type" property="questionType" jdbcType="INTEGER" />
+    <result column="difficult" property="difficult" jdbcType="INTEGER" />
+    <result column="score" property="score" jdbcType="FLOAT" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+
+  <insert id="insertBatch" parameterType="java.util.List">
+    insert into sz_learn_analyse_detail (analyse_id, question_number,question_type,difficult,score,create_time)
+    values
+     <foreach collection="list" item="emp" separator=",">
+       (#{emp.analyseId},#{emp.questionNumber},#{emp.questionType},#{emp.difficult},#{emp.score},#{emp.createTime})
+     </foreach>
+  </insert>
+</mapper>
 \ No newline at end of file
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.jevon.mapper.AnalyseDimensionalMapper" >
+  <resultMap id="BaseResultMap" type="com.jevon.model.AnalyseDimensional" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="analyse_id" property="analyseId" jdbcType="INTEGER" />
+    <result column="question_number" property="questionNumber" jdbcType="VARCHAR" />
+    <result column="dimensional_id" property="questionType" jdbcType="INTEGER" />
+    <result column="score" property="score" jdbcType="FLOAT" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+
+  <insert id="insertBatch" parameterType="java.util.List">
+    insert into sz_learn_analyse_dimensional (analyse_id, question_number,dimensional_id,score,create_time)
+    values
+     <foreach collection="list" item="emp" separator=",">
+       (#{emp.analyseId},#{emp.questionNumber},#{emp.dimensionalId},#{emp.score},#{emp.createTime})
+     </foreach>
+  </insert>
+</mapper>
 \ No newline at end of file
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.jevon.mapper.AnalyseMapper" >
+  <resultMap id="BaseResultMap" type="com.jevon.model.Analyse" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="exam_name" property="examName" jdbcType="VARCHAR" />
+    <result column="exam_time" property="examTime" jdbcType="TIMESTAMP" />
+    <result column="course_name" property="courseName" jdbcType="VARCHAR" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+
+  <insert id="insert" parameterType="com.jevon.model.Analyse"  useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+    insert into sz_learn_analyse (exam_name, exam_time,course_name,create_time)
+    values (#{examName},#{examTime},#{courseName},#{createTime})
+  </insert>
+
+  <select id="select" parameterType="com.jevon.model.Analyse" resultMap="BaseResultMap">
+    select * from sz_learn_analyse where 1=1
+	<if test="courseName != 0">
+      and course_name = #{courseName}
+    </if>
+    <if test="examName != null">
+      and exam_name = #{examName}
+    </if>
+  </select>
+
+  <select id="selectById" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select * from sz_learn_analyse where id = #{id}
+  </select>
+</mapper>
 \ No newline at end of file
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.jevon.mapper.DimensionalMapper" >
+  <resultMap id="BaseResultMap" type="com.jevon.model.Dimensional" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="dimensional_type" property="dimensionalType" jdbcType="INTEGER" />
+    <result column="dimensional_name" property="dimensionalName" jdbcType="VARCHAR" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+
+  <insert id="insert" parameterType="com.jevon.model.Dimensional"  useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+    insert into sz_learn_dimensional (dimensional_type, dimensional_name,create_time)
+    values (#{dimensionalType},#{dimensionalName},#{createTime})
+  </insert>
+
+  <select id="select" parameterType="com.jevon.model.Dimensional" resultMap="BaseResultMap">
+    select * from sz_learn_dimensional where 1=1
+	<if test="dimensionalType != 0">
+      and dimensional_type = #{dimensionalType}
+    </if>
+    <if test="dimensionalName != null">
+      and dimensional_name = #{dimensionalName}
+    </if>
+  </select>
+</mapper>
 \ No newline at end of file
1	package com.jevon.controller;	1	package com.jevon.controller;
2		2
		3	+import com.jevon.enums.DifficultEnums;
		4	+import com.jevon.enums.DimensionalEnums;
3	import com.jevon.model.*;	5	import com.jevon.model.*;
		6	+import com.jevon.service.AnalyseDetailService;
		7	+import com.jevon.service.AnalyseDimensionalService;
		8	+import com.jevon.service.AnalyseService;
		9	+import com.jevon.service.DimensionalService;
4	import com.jevon.vo.BaseVo;	10	import com.jevon.vo.BaseVo;
		11	+import com.jevon.vo.excel.ExamExcelVo;
5	import com.jevon.vo.req.InitAnalyseReqVo;	12	import com.jevon.vo.req.InitAnalyseReqVo;
6	import io.swagger.annotations.Api;	13	import io.swagger.annotations.Api;
		14	+import io.swagger.annotations.ApiOperation;
7	import org.apache.commons.lang3.StringUtils;	15	import org.apache.commons.lang3.StringUtils;
8	import org.apache.poi.hssf.usermodel.HSSFWorkbook;	16	import org.apache.poi.hssf.usermodel.HSSFWorkbook;
9	import org.apache.poi.ss.usermodel.*;	17	import org.apache.poi.ss.usermodel.*;
10	import org.apache.poi.xssf.usermodel.XSSFWorkbook;	18	import org.apache.poi.xssf.usermodel.XSSFWorkbook;
		19	+import org.springframework.beans.factory.annotation.Autowired;
11	import org.springframework.web.bind.annotation.RequestBody;	20	import org.springframework.web.bind.annotation.RequestBody;
12	import org.springframework.web.bind.annotation.RequestMapping;	21	import org.springframework.web.bind.annotation.RequestMapping;
		22	+import org.springframework.web.bind.annotation.RequestMethod;
13	import org.springframework.web.bind.annotation.RestController;	23	import org.springframework.web.bind.annotation.RestController;
14		24
15	import java.io.File;	25	import java.io.File;
	@@ -26,11 +36,31 @@ import java.util.*;		@@ -26,11 +36,31 @@ import java.util.*;
26	@Api(value = "学情分析")	36	@Api(value = "学情分析")
27	public class LearnController {	37	public class LearnController {
28		38
		39	+ @Autowired
		40	+ AnalyseService analyseService;
29		41
		42	+ @Autowired
		43	+ DimensionalService dimensionalService;
		44	+
		45	+ @Autowired
		46	+ AnalyseDimensionalService analyseDimensionalService;
		47	+
		48	+ @Autowired
		49	+ AnalyseDetailService analyseDetailService;
		50	+
		51	+ @ApiOperation("试卷信息导入")
		52	+ @RequestMapping(value = "initAnalyse", method = RequestMethod.POST)
30	public BaseVo initAnalyse(@RequestBody InitAnalyseReqVo initAnalyseReqVo){	53	public BaseVo initAnalyse(@RequestBody InitAnalyseReqVo initAnalyseReqVo){
31	BaseVo baseVo = new BaseVo();	54	BaseVo baseVo = new BaseVo();
32	- Date date = new Date();	55	+ analysisExcel(initAnalyseReqVo);
		56	+ return baseVo;
		57	+ }
		58	+
		59	+ private void analysisExcel(InitAnalyseReqVo initAnalyseReqVo){
33	try{	60	try{
		61	+ List<AnalyseDetail> analyseDetails = new ArrayList<>();
		62	+ List<AnalyseDimensional> analyseDimensionals = new ArrayList<>();
		63	+ Analyse analyse = analyseService.selectById(initAnalyseReqVo.getAnalyseId());
34	String fileUrl = initAnalyseReqVo.getUrl();	64	String fileUrl = initAnalyseReqVo.getUrl();
35	File excelFile = new File(fileUrl);	65	File excelFile = new File(fileUrl);
36	// 获得工作簿	66	// 获得工作簿
	@@ -43,9 +73,8 @@ public class LearnController {		@@ -43,9 +73,8 @@ public class LearnController {
43	}	73	}
44	// 获得工作表	74	// 获得工作表
45	Sheet sheet = workbook.getSheetAt(0);	75	Sheet sheet = workbook.getSheetAt(0);
		76	+ Date date = new Date();
46	int rows = sheet.getPhysicalNumberOfRows();	77	int rows = sheet.getPhysicalNumberOfRows();
47	- int column = 0 ;
48	- int courseNumber = 0;
49	for (int i = 0; i < rows; i++) {	78	for (int i = 0; i < rows; i++) {
50	// 获取第i行数据	79	// 获取第i行数据
51	Row sheetRow = sheet.getRow(i);	80	Row sheetRow = sheet.getRow(i);
	@@ -54,24 +83,63 @@ public class LearnController {		@@ -54,24 +83,63 @@ public class LearnController {
54	String title = sheetRow.getCell(0).getStringCellValue().trim();	83	String title = sheetRow.getCell(0).getStringCellValue().trim();
55	}else if(i == 1){	84	}else if(i == 1){
56	//获取表头	85	//获取表头
57	- int j = 0 ;
58	- while (sheetRow.getCell(j) != null && StringUtils.isNotBlank(sheetRow.getCell(j).getStringCellValue().trim())) {
59	- j++ ;
60	- }
61	- column = j ;
62	} else {	86	} else {
63	- for (int j = 0; j < column; j++) {
64	- Cell cell = sheetRow.getCell(j);
65	- if(cell != null){
66	- cell.setCellType(CellType.STRING);
67	- }	87	+ ExamExcelVo examExcelVo = new ExamExcelVo(sheetRow);
		88	+ AnalyseDetail analyseDetail = new AnalyseDetail();
		89	+ String questionNumber = null ;
		90	+ if(StringUtils.isNotBlank(examExcelVo.getQuestionSmallNumber())){
		91	+ questionNumber = examExcelVo.getQuestionNumber()+"("+examExcelVo.getQuestionSmallNumber()+")";
		92	+ }else {
		93	+ questionNumber = examExcelVo.getQuestionNumber() ;
68	}	94	}
		95	+ analyseDetail.setQuestionNumber(questionNumber);
		96	+ analyseDetail.setAnalyseId(analyse.getId());
		97	+ analyseDetail.setQuestionType(examExcelVo.getQuestionType());
		98	+ analyseDetail.setDifficult(DifficultEnums.getDifficultType(examExcelVo.getDifficult()));
		99	+ analyseDetail.setScore(new Float(examExcelVo.getScore()));
		100	+ analyseDetail.setCreateTime(date);
		101	+ analyseDetails.add(analyseDetail);
		102	+ initAnalyseDimensional(analyse,questionNumber,examExcelVo.getScore(),examExcelVo.getKnowledge(),DimensionalEnums.knowledge.getDimensionalType(),analyseDimensionals);
		103	+ initAnalyseDimensional(analyse,questionNumber,examExcelVo.getScore(),examExcelVo.getAbility(),DimensionalEnums.ability.getDimensionalType(),analyseDimensionals);
		104	+ initAnalyseDimensional(analyse,questionNumber,examExcelVo.getScore(),examExcelVo.getSkill(),DimensionalEnums.skill.getDimensionalType(),analyseDimensionals);
		105	+ initAnalyseDimensional(analyse,questionNumber,examExcelVo.getScore(),examExcelVo.getThink(),DimensionalEnums.think.getDimensionalType(),analyseDimensionals);
69	}	106	}
70	}	107	}
		108	+ analyseDetailService.insertBatch(analyseDetails);
		109	+ analyseDimensionalService.insertBatch(analyseDimensionals);
71	}catch (Exception e){	110	}catch (Exception e){
72	System.out.println(e);	111	System.out.println(e);
73	- baseVo.setSuccess(false);
74	}	112	}
75	- return baseVo;
76	}	113	}
		114	+
		115	+ private void initAnalyseDimensional(Analyse analyse ,String questionNumber , String score , String dimensionalMessage , int dimensionalType , List<AnalyseDimensional> analyseDimensionals){
		116	+ if(StringUtils.isNotBlank(dimensionalMessage)){
		117	+ String[] message =dimensionalMessage.split("、");
		118	+ for (int j = 0; j < message.length ; j++) {
		119	+ if(StringUtils.isNotBlank(message[j])){
		120	+ Dimensional dimensional = new Dimensional();
		121	+ dimensional.setDimensionalType(dimensionalType);
		122	+ dimensional.setDimensionalName(message[j]);
		123	+ //查数据库是否已存在该四维诊断不存在则导入
		124	+ Dimensional result = dimensionalService.selectByTypeAndName(dimensionalType,message[j]);
		125	+ int dimensionalId = 0 ;
		126	+ if(result == null \|\| result.getId() == 0){
		127	+ dimensional.setCreateTime(new Date());
		128	+ dimensionalId = dimensionalService.insert(dimensional);
		129	+ }else {
		130	+ dimensionalId = result.getId();
		131	+ }
		132	+ AnalyseDimensional analyseDimensional = new AnalyseDimensional();
		133	+ analyseDimensional.setAnalyseId(analyse.getId());
		134	+ analyseDimensional.setDimensionalId(dimensionalId);
		135	+ analyseDimensional.setQuestionNumber(questionNumber);
		136	+ analyseDimensional.setScore(new Float(score));
		137	+ analyseDimensional.setCreateTime(new Date());
		138	+ analyseDimensionals.add(analyseDimensional);
		139	+ }
		140	+ }
		141	+ }
		142	+ }
		143	+
		144	+
77	}	145	}
	@@ -314,7 +314,7 @@ public class ScheduleInitController {		@@ -314,7 +314,7 @@ public class ScheduleInitController {
314	teacher.setTeacherName(json.get("name").toString());	314	teacher.setTeacherName(json.get("name").toString());
315	teachers.add(teacher);	315	teachers.add(teacher);
316	}	316	}
317	- initTeacher(teachers);	317	+ initTeacher(teachers,schoolId);
318	JSONObject classList = HttpClientUtils.httpGet(url+"/api/EasyN/GetSchoolClass?SchoolId="+schoolId);	318	JSONObject classList = HttpClientUtils.httpGet(url+"/api/EasyN/GetSchoolClass?SchoolId="+schoolId);
319	List<JSONObject> openClasses = (List<JSONObject>)classList.get("data");	319	List<JSONObject> openClasses = (List<JSONObject>)classList.get("data");
320	List<ClassModel> classModels = new ArrayList<>();	320	List<ClassModel> classModels = new ArrayList<>();
	@@ -326,7 +326,7 @@ public class ScheduleInitController {		@@ -326,7 +326,7 @@ public class ScheduleInitController {
326	classModel.setClassName(json.get("class_name").toString());	326	classModel.setClassName(json.get("class_name").toString());
327	classModels.add(classModel);	327	classModels.add(classModel);
328	}	328	}
329	- initClass(classModels);	329	+ initClass(classModels,schoolId);
330	JSONObject courseList = HttpClientUtils.httpGet(url+"/api/EasyN/GetSchoolSubject?SchoolId="+schoolId);	330	JSONObject courseList = HttpClientUtils.httpGet(url+"/api/EasyN/GetSchoolSubject?SchoolId="+schoolId);
331	List<JSONObject> openCourses = (List<JSONObject>)courseList.get("data");	331	List<JSONObject> openCourses = (List<JSONObject>)courseList.get("data");
332	List<Course> courses = new ArrayList<>();	332	List<Course> courses = new ArrayList<>();
	@@ -338,12 +338,12 @@ public class ScheduleInitController {		@@ -338,12 +338,12 @@ public class ScheduleInitController {
338	course.setCourseType(0);	338	course.setCourseType(0);
339	courses.add(course);	339	courses.add(course);
340	}	340	}
341	- initCourse(courses);	341	+ initCourse(courses,schoolId);
342	}	342	}
343		343
344	- public BaseVo initCourse(List<Course> courseList){	344	+ public BaseVo initCourse(List<Course> courseList ,int schoolId){
345	BaseVo baseVo = new BaseVo();	345	BaseVo baseVo = new BaseVo();
346	- courseService.deleteSchoolId(courseList.get(0).getSchoolId());	346	+ courseService.deleteSchoolId(schoolId);
347	for(Course course : courseList){	347	for(Course course : courseList){
348	if(course.getCourseId() == 0 \|\| StringUtils.isBlank(course.getCourseName())){	348	if(course.getCourseId() == 0 \|\| StringUtils.isBlank(course.getCourseName())){
349	baseVo.setSuccess(false);	349	baseVo.setSuccess(false);
	@@ -360,9 +360,9 @@ public class ScheduleInitController {		@@ -360,9 +360,9 @@ public class ScheduleInitController {
360	}	360	}
361	}	361	}
362		362
363	- public BaseVo initClass(List<ClassModel> classList){	363	+ public BaseVo initClass(List<ClassModel> classList , int schoolId){
364	BaseVo baseVo = new BaseVo();	364	BaseVo baseVo = new BaseVo();
365	- classModelService.deleteSchool(classList.get(0).getSchoolId());	365	+ classModelService.deleteSchool(schoolId);
366	for(ClassModel classModel : classList){	366	for(ClassModel classModel : classList){
367	if(classModel.getClassId() == 0 \|\| StringUtils.isBlank(classModel.getClassName()) \|\|	367	if(classModel.getClassId() == 0 \|\| StringUtils.isBlank(classModel.getClassName()) \|\|
368	StringUtils.isBlank(classModel.getGrade()) \|\| classModel.getSchoolId() == 0){	368	StringUtils.isBlank(classModel.getGrade()) \|\| classModel.getSchoolId() == 0){
	@@ -380,7 +380,7 @@ public class ScheduleInitController {		@@ -380,7 +380,7 @@ public class ScheduleInitController {
380	}	380	}
381	}	381	}
382		382
383	- public BaseVo initTeacher(List<Teacher> teacherList){	383	+ public BaseVo initTeacher(List<Teacher> teacherList , int schoolId){
384	List<Teacher> result = new ArrayList<>();	384	List<Teacher> result = new ArrayList<>();
385	for(Teacher teacher : teacherList){	385	for(Teacher teacher : teacherList){
386	boolean isExist = false;	386	boolean isExist = false;
	@@ -394,7 +394,7 @@ public class ScheduleInitController {		@@ -394,7 +394,7 @@ public class ScheduleInitController {
394	}	394	}
395	}	395	}
396	BaseVo baseVo = new BaseVo();	396	BaseVo baseVo = new BaseVo();
397	- teacherService.deleteSchool(result.get(0).getSchoolId());	397	+ teacherService.deleteSchool(schoolId);
398	for(Teacher teacher : result){	398	for(Teacher teacher : result){
399	if(teacher.getSchoolId() == 0 \|\| StringUtils.isBlank(teacher.getTeacherName()) \|\|	399	if(teacher.getSchoolId() == 0 \|\| StringUtils.isBlank(teacher.getTeacherName()) \|\|
400	teacher.getTeacherId() == 0){	400	teacher.getTeacherId() == 0){
@@ -0,0 +1,46 @@		@@ -0,0 +1,46 @@
	1	+package com.jevon.enums;
	2	+
	3	+/**
	4	+ * @author chen
	5	+ * @version 1.0
	6	+ * @date 2019/10/18 0018 8:40
	7	+ */
	8	+public enum DifficultEnums {
	9	+
	10	+ easy(1,"易"),
	11	+ medium(2,"中"),
	12	+ difficult(3,"难");
	13	+
	14	+ private int difficultType ;
	15	+ private String difficultName ;
	16	+
	17	+ DifficultEnums(int difficultType, String difficultName) {
	18	+ this.difficultType = difficultType;
	19	+ this.difficultName = difficultName;
	20	+ }
	21	+
	22	+ public int getDifficultType() {
	23	+ return difficultType;
	24	+ }
	25	+
	26	+ public void setDifficultType(int difficultType) {
	27	+ this.difficultType = difficultType;
	28	+ }
	29	+
	30	+ public String getDifficultName() {
	31	+ return difficultName;
	32	+ }
	33	+
	34	+ public void setDifficultName(String difficultName) {
	35	+ this.difficultName = difficultName;
	36	+ }
	37	+
	38	+ public static int getDifficultType(String difficultName){
	39	+ for (DifficultEnums difficultEnums : DifficultEnums.values()) {
	40	+ if (difficultEnums.getDifficultName().equals(difficultName)) {
	41	+ return difficultEnums.getDifficultType();
	42	+ }
	43	+ }
	44	+ return 0 ;
	45	+ }
	46	+}
@@ -0,0 +1,37 @@		@@ -0,0 +1,37 @@
	1	+package com.jevon.enums;
	2	+
	3	+/**
	4	+ * @author chen
	5	+ * @version 1.0
	6	+ * @date 2019/10/18 0018 8:33
	7	+ */
	8	+public enum DimensionalEnums {
	9	+ knowledge(1,"知识点"),
	10	+ ability(2,"能力"),
	11	+ skill(3,"技能"),
	12	+ think(4,"四维");
	13	+
	14	+ private int dimensionalType ;
	15	+ private String dimensionalName ;
	16	+
	17	+ DimensionalEnums(int dimensionalType, String dimensionalName) {
	18	+ this.dimensionalType = dimensionalType;
	19	+ this.dimensionalName = dimensionalName;
	20	+ }
	21	+
	22	+ public int getDimensionalType() {
	23	+ return dimensionalType;
	24	+ }
	25	+
	26	+ public void setDimensionalType(int dimensionalType) {
	27	+ this.dimensionalType = dimensionalType;
	28	+ }
	29	+
	30	+ public String getDimensionalName() {
	31	+ return dimensionalName;
	32	+ }
	33	+
	34	+ public void setDimensionalName(String dimensionalName) {
	35	+ this.dimensionalName = dimensionalName;
	36	+ }
	37	+}
@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
	1	+package com.jevon.mapper;
	2	+
	3	+import com.jevon.model.AnalyseDetail;
	4	+
	5	+import java.util.List;
	6	+
	7	+/**
	8	+ * @author chen
	9	+ * @version 1.0
	10	+ * @date 2019/10/18 0018 11:11
	11	+ */
	12	+public interface AnalyseDetailMapper {
	13	+
	14	+ int insertBatch(List<AnalyseDetail> list);
	15	+}
@@ -0,0 +1,19 @@		@@ -0,0 +1,19 @@
	1	+package com.jevon.mapper;
	2	+
	3	+import com.jevon.model.Analyse;
	4	+
	5	+import java.util.List;
	6	+
	7	+/**
	8	+ * @author chen
	9	+ * @version 1.0
	10	+ * @date 2019/10/18 0018 10:56
	11	+ */
	12	+public interface AnalyseMapper {
	13	+
	14	+ int insert(Analyse analyse);
	15	+
	16	+ List<Analyse> select(Analyse analyse);
	17	+
	18	+ Analyse selectById(int id);
	19	+}
@@ -0,0 +1,17 @@		@@ -0,0 +1,17 @@
	1	+package com.jevon.mapper;
	2	+
	3	+import com.jevon.model.Dimensional;
	4	+
	5	+import java.util.List;
	6	+
	7	+/**
	8	+ * @author chen
	9	+ * @version 1.0
	10	+ * @date 2019/10/18 0018 10:11
	11	+ */
	12	+public interface DimensionalMapper {
	13	+
	14	+ int insert(Dimensional dimensional);
	15	+
	16	+ List<Dimensional> select(Dimensional dimensional);
	17	+}
@@ -0,0 +1,57 @@		@@ -0,0 +1,57 @@
	1	+package com.jevon.model;
	2	+
	3	+import java.util.Date;
	4	+
	5	+/**
	6	+ * @author chen
	7	+ * @version 1.0
	8	+ * @date 2019/10/18 0018 10:55
	9	+ */
	10	+public class Analyse {
	11	+
	12	+ private int id ;
	13	+ private String examName ;
	14	+ private Date examTime ;
	15	+ private String courseName ;
	16	+ private Date createTime ;
	17	+
	18	+ public int getId() {
	19	+ return id;
	20	+ }
	21	+
	22	+ public void setId(int id) {
	23	+ this.id = id;
	24	+ }
	25	+
	26	+ public String getExamName() {
	27	+ return examName;
	28	+ }
	29	+
	30	+ public void setExamName(String examName) {
	31	+ this.examName = examName;
	32	+ }
	33	+
	34	+ public Date getExamTime() {
	35	+ return examTime;
	36	+ }
	37	+
	38	+ public void setExamTime(Date examTime) {
	39	+ this.examTime = examTime;
	40	+ }
	41	+
	42	+ public String getCourseName() {
	43	+ return courseName;
	44	+ }
	45	+
	46	+ public void setCourseName(String courseName) {
	47	+ this.courseName = courseName;
	48	+ }
	49	+
	50	+ public Date getCreateTime() {
	51	+ return createTime;
	52	+ }
	53	+
	54	+ public void setCreateTime(Date createTime) {
	55	+ this.createTime = createTime;
	56	+ }
	57	+}
@@ -0,0 +1,75 @@		@@ -0,0 +1,75 @@
	1	+package com.jevon.model;
	2	+
	3	+import java.util.Date;
	4	+
	5	+/**
	6	+ * @author chen
	7	+ * @version 1.0
	8	+ * @date 2019/10/18 0018 8:38
	9	+ */
	10	+public class AnalyseDetail {
	11	+
	12	+ private int id ;
	13	+ private int analyseId ;
	14	+ private String questionNumber ;
	15	+ private String questionType ;
	16	+ private int difficult ;
	17	+ private float score ;
	18	+ private Date createTime ;
	19	+
	20	+ public int getId() {
	21	+ return id;
	22	+ }
	23	+
	24	+ public void setId(int id) {
	25	+ this.id = id;
	26	+ }
	27	+
	28	+ public int getAnalyseId() {
	29	+ return analyseId;
	30	+ }
	31	+
	32	+ public void setAnalyseId(int analyseId) {
	33	+ this.analyseId = analyseId;
	34	+ }
	35	+
	36	+ public String getQuestionNumber() {
	37	+ return questionNumber;
	38	+ }
	39	+
	40	+ public void setQuestionNumber(String questionNumber) {
	41	+ this.questionNumber = questionNumber;
	42	+ }
	43	+
	44	+ public int getDifficult() {
	45	+ return difficult;
	46	+ }
	47	+
	48	+ public void setDifficult(int difficult) {
	49	+ this.difficult = difficult;
	50	+ }
	51	+
	52	+ public float getScore() {
	53	+ return score;
	54	+ }
	55	+
	56	+ public void setScore(float score) {
	57	+ this.score = score;
	58	+ }
	59	+
	60	+ public Date getCreateTime() {
	61	+ return createTime;
	62	+ }
	63	+
	64	+ public void setCreateTime(Date createTime) {
	65	+ this.createTime = createTime;
	66	+ }
	67	+
	68	+ public String getQuestionType() {
	69	+ return questionType;
	70	+ }
	71	+
	72	+ public void setQuestionType(String questionType) {
	73	+ this.questionType = questionType;
	74	+ }
	75	+}
@@ -0,0 +1,66 @@		@@ -0,0 +1,66 @@
	1	+package com.jevon.model;
	2	+
	3	+import java.util.Date;
	4	+
	5	+/**
	6	+ * @author chen
	7	+ * @version 1.0
	8	+ * @date 2019/10/18 0018 8:42
	9	+ */
	10	+public class AnalyseDimensional {
	11	+
	12	+ private int id ;
	13	+ private int analyseId ;
	14	+ private String questionNumber ;
	15	+ private int dimensionalId ;
	16	+ private float score ;
	17	+ private Date createTime ;
	18	+
	19	+ public int getId() {
	20	+ return id;
	21	+ }
	22	+
	23	+ public void setId(int id) {
	24	+ this.id = id;
	25	+ }
	26	+
	27	+ public int getAnalyseId() {
	28	+ return analyseId;
	29	+ }
	30	+
	31	+ public void setAnalyseId(int analyseId) {
	32	+ this.analyseId = analyseId;
	33	+ }
	34	+
	35	+ public String getQuestionNumber() {
	36	+ return questionNumber;
	37	+ }
	38	+
	39	+ public void setQuestionNumber(String questionNumber) {
	40	+ this.questionNumber = questionNumber;
	41	+ }
	42	+
	43	+ public int getDimensionalId() {
	44	+ return dimensionalId;
	45	+ }
	46	+
	47	+ public void setDimensionalId(int dimensionalId) {
	48	+ this.dimensionalId = dimensionalId;
	49	+ }
	50	+
	51	+ public float getScore() {
	52	+ return score;
	53	+ }
	54	+
	55	+ public void setScore(float score) {
	56	+ this.score = score;
	57	+ }
	58	+
	59	+ public Date getCreateTime() {
	60	+ return createTime;
	61	+ }
	62	+
	63	+ public void setCreateTime(Date createTime) {
	64	+ this.createTime = createTime;
	65	+ }
	66	+}