学情排课嵌入分布式

陈杰
1 parent 5efb4092
Showing 257 changed files with 16090 additions and 2343 deletions Show diff stats
cloud/common/pom.xml
cloud/common/src/main/java/com/sincere/common/dto/independence/AnalyseDetailDto.java
cloud/common/src/main/java/com/sincere/common/dto/independence/AnalyseDimensionalDto.java
cloud/common/src/main/java/com/sincere/common/dto/independence/AnalyseDto.java
cloud/common/src/main/java/com/sincere/common/dto/independence/ChapterDto.java
cloud/common/src/main/java/com/sincere/common/dto/independence/ClassCourseDto.java
cloud/common/src/main/java/com/sincere/common/dto/independence/ClassModelDto.java
cloud/common/src/main/java/com/sincere/common/dto/independence/CourseDto.java
cloud/common/src/main/java/com/sincere/common/dto/independence/GetLearnDto.java
cloud/common/src/main/java/com/sincere/common/dto/independence/JoinClassDto.java
cloud/common/src/main/java/com/sincere/common/dto/independence/LeagueDto.java
cloud/common/src/main/java/com/sincere/common/dto/independence/ScheduleDto.java
cloud/common/src/main/java/com/sincere/common/dto/independence/StudentDetailDto.java
cloud/common/src/main/java/com/sincere/common/dto/independence/StudentDto.java
cloud/common/src/main/java/com/sincere/common/dto/independence/TeacherClassDto.java
cloud/common/src/main/java/com/sincere/common/enums/DifficultEnums.java
cloud/common/src/main/java/com/sincere/common/enums/DimensionalEnums.java
cloud/common/src/main/java/com/sincere/common/util/HttpClientUtils.java
cloud/common/src/main/java/com/sincere/common/util/RedisUtils.java
cloud/common/src/main/java/com/sincere/common/util/SerializeUtil.java
@@ -19,6 +19,16 @@
     <dependencies>
         <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>2.9.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.3</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
         </dependency>
@@ -40,6 +50,16 @@
             <artifactId>commons-collections</artifactId>
             <version>3.2.2</version>
         </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.5.0</version>
+        </dependency>
     </dependencies>
     <build>
@@ -0,0 +1,76 @@
+package com.sincere.common.dto.independence;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/13 0013 10:05
+ */
+public class AnalyseDetailDto implements Serializable {
+
+    private int id ;
+    private int analyseId ;
+    private String questionNumber ;
+    private String questionType ;
+    private int difficult ;
+    private Double 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 Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double 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,67 @@
+package com.sincere.common.dto.independence;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/13 0013 10:19
+ */
+public class AnalyseDimensionalDto implements Serializable {
+
+    private int id ;
+    private int analyseId ;
+    private String questionNumber ;
+    private int dimensionalId ;
+    private Double 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 Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}
@@ -0,0 +1,85 @@
+package com.sincere.common.dto.independence;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/13 0013 9:39
+ */
+public class AnalyseDto implements Serializable {
+
+    private int id ;
+    private String examName ;
+    private String examTime ;
+    private String courseName ;
+    private Date createTime ;
+    private Double maxScore ;
+    private String grade ;
+    private String examScope ;
+
+    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 String getExamTime() {
+        return examTime;
+    }
+
+    public void setExamTime(String 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;
+    }
+
+    public Double getMaxScore() {
+        return maxScore;
+    }
+
+    public void setMaxScore(Double maxScore) {
+        this.maxScore = maxScore;
+    }
+
+    public String getGrade() {
+        return grade;
+    }
+
+    public void setGrade(String grade) {
+        this.grade = grade;
+    }
+
+    public String getExamScope() {
+        return examScope;
+    }
+
+    public void setExamScope(String examScope) {
+        this.examScope = examScope;
+    }
+}
@@ -0,0 +1,67 @@
+package com.sincere.common.dto.independence;
+
+import java.io.Serializable;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/13 0013 9:17
+ */
+public class ChapterDto implements Serializable {
+
+    private int id ;
+    private int analyseId ;
+    private int chapterNumber ;
+    private String chapterName ;
+    private Double chapterScore ;
+
+    private Double percent ;
+
+    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 int getChapterNumber() {
+        return chapterNumber;
+    }
+
+    public void setChapterNumber(int chapterNumber) {
+        this.chapterNumber = chapterNumber;
+    }
+
+    public String getChapterName() {
+        return chapterName;
+    }
+
+    public void setChapterName(String chapterName) {
+        this.chapterName = chapterName;
+    }
+
+    public Double getChapterScore() {
+        return chapterScore;
+    }
+
+    public void setChapterScore(Double chapterScore) {
+        this.chapterScore = chapterScore;
+    }
+
+    public Double getPercent() {
+        return percent;
+    }
+
+    public void setPercent(Double percent) {
+        this.percent = percent;
+    }
+}
@@ -0,0 +1,132 @@
+package com.sincere.common.dto.independence;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/13 0013 16:46
+ */
+public class ClassCourseDto implements Serializable {
+
+    private Integer courseId;
+
+    private Integer schoolId;
+
+    private String grade;
+
+    private Integer classId;
+
+    private Integer singleOrDouble;
+
+    private Integer week;
+
+    private Integer courseNumber;
+
+    private String courseName;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private String team ;
+
+    private int courseOpenId ;
+
+    public Integer getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Integer courseId) {
+        this.courseId = courseId;
+    }
+
+    public Integer getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Integer schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public String getGrade() {
+        return grade;
+    }
+
+    public void setGrade(String grade) {
+        this.grade = grade;
+    }
+
+    public Integer getClassId() {
+        return classId;
+    }
+
+    public void setClassId(Integer classId) {
+        this.classId = classId;
+    }
+
+    public Integer getSingleOrDouble() {
+        return singleOrDouble;
+    }
+
+    public void setSingleOrDouble(Integer singleOrDouble) {
+        this.singleOrDouble = singleOrDouble;
+    }
+
+    public Integer getWeek() {
+        return week;
+    }
+
+    public void setWeek(Integer week) {
+        this.week = week;
+    }
+
+    public Integer getCourseNumber() {
+        return courseNumber;
+    }
+
+    public void setCourseNumber(Integer courseNumber) {
+        this.courseNumber = courseNumber;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName == null ? null : courseName.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getTeam() {
+        return team;
+    }
+
+    public void setTeam(String team) {
+        this.team = team;
+    }
+
+    public int getCourseOpenId() {
+        return courseOpenId;
+    }
+
+    public void setCourseOpenId(int courseOpenId) {
+        this.courseOpenId = courseOpenId;
+    }
+}
@@ -0,0 +1,51 @@
+package com.sincere.common.dto.independence;
+
+import java.io.Serializable;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/13 0013 16:35
+ */
+public class ClassModelDto implements Serializable {
+
+    private Integer classId;
+
+    private Integer schoolId;
+
+    private String grade;
+
+    private String className;
+
+    public Integer getClassId() {
+        return classId;
+    }
+
+    public void setClassId(Integer classId) {
+        this.classId = classId;
+    }
+
+    public Integer getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Integer schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public String getGrade() {
+        return grade;
+    }
+
+    public void setGrade(String grade) {
+        this.grade = grade;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className == null ? null : className.trim();
+    }
+}
@@ -0,0 +1,57 @@
+package com.sincere.common.dto.independence;
+
+import java.io.Serializable;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/13 0013 16:38
+ */
+public class CourseDto implements Serializable {
+
+    private int id ;
+    private int schoolId ;
+    private int courseId ;
+    private String courseName ;
+    private int courseType;
+
+    public int getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(int courseId) {
+        this.courseId = courseId;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(int schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public int getCourseType() {
+        return courseType;
+    }
+
+    public void setCourseType(int courseType) {
+        this.courseType = courseType;
+    }
+}
@@ -0,0 +1,30 @@
+package com.sincere.common.dto.independence;
+
+import java.io.Serializable;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/13 0013 9:04
+ */
+public class GetLearnDto implements Serializable {
+
+    private int analyseId ;
+    private String schoolName ;
+
+    public int getAnalyseId() {
+        return analyseId;
+    }
+
+    public void setAnalyseId(int analyseId) {
+        this.analyseId = analyseId;
+    }
+
+    public String getSchoolName() {
+        return schoolName;
+    }
+
+    public void setSchoolName(String schoolName) {
+        this.schoolName = schoolName;
+    }
+}
@@ -0,0 +1,75 @@
+package com.sincere.common.dto.independence;
+
+import java.io.Serializable;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/13 0013 15:32
+ */
+public class JoinClassDto implements Serializable {
+
+    private int id ;
+    private int schoolId ;
+    private int classId ;
+    private String team ;
+    private int courseId ;
+    private String courseName ;
+    private int courseGroup ;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(int schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public int getClassId() {
+        return classId;
+    }
+
+    public void setClassId(int classId) {
+        this.classId = classId;
+    }
+
+    public String getTeam() {
+        return team;
+    }
+
+    public void setTeam(String team) {
+        this.team = team;
+    }
+
+    public int getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(int courseId) {
+        this.courseId = courseId;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public int getCourseGroup() {
+        return courseGroup;
+    }
+
+    public void setCourseGroup(int courseGroup) {
+        this.courseGroup = courseGroup;
+    }
+}
@@ -0,0 +1,48 @@
+package com.sincere.common.dto.independence;
+
+import java.io.Serializable;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/13 0013 9:46
+ */
+public class LeagueDto implements Serializable {
+
+    private int id ;
+    private int analyseId ;
+    private String league ;
+    private String schoolName ;
+
+    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 getLeague() {
+        return league;
+    }
+
+    public void setLeague(String league) {
+        this.league = league;
+    }
+
+    public String getSchoolName() {
+        return schoolName;
+    }
+
+    public void setSchoolName(String schoolName) {
+        this.schoolName = schoolName;
+    }
+}
@@ -0,0 +1,103 @@
+package com.sincere.common.dto.independence;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/13 0013 13:51
+ */
+public class ScheduleDto implements Serializable {
+
+    private int id ;
+    private String scheduleName ;
+    private int schoolId ;
+    private String team ;
+    private Date createTime ;
+    private Date updateTime ;
+    private int speed ;
+    private int morning ;
+    private int afternoon;
+    private int night ;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getScheduleName() {
+        return scheduleName;
+    }
+
+    public void setScheduleName(String scheduleName) {
+        this.scheduleName = scheduleName;
+    }
+
+    public int getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(int schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public String getTeam() {
+        return team;
+    }
+
+    public void setTeam(String team) {
+        this.team = team;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public int getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(int speed) {
+        this.speed = speed;
+    }
+
+    public int getMorning() {
+        return morning;
+    }
+
+    public void setMorning(int morning) {
+        this.morning = morning;
+    }
+
+    public int getAfternoon() {
+        return afternoon;
+    }
+
+    public void setAfternoon(int afternoon) {
+        this.afternoon = afternoon;
+    }
+
+    public int getNight() {
+        return night;
+    }
+
+    public void setNight(int night) {
+        this.night = night;
+    }
+}
@@ -0,0 +1,112 @@
+package com.sincere.common.dto.independence;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/13 0013 10:56
+ */
+public class StudentDetailDto implements Serializable {
+
+    private long id ;
+    private int openId;
+    private String schoolName ;
+    private String className ;
+    private String studentName ;
+    private String studentNumber ;
+    private int analyseId ;
+    private String examNumber ;
+    private Double score ;
+    private Date createTime ;
+    private int correct ; //1 正确 0 错误
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public int getOpenId() {
+        return openId;
+    }
+
+    public void setOpenId(int openId) {
+        this.openId = openId;
+    }
+
+    public String getSchoolName() {
+        return schoolName;
+    }
+
+    public void setSchoolName(String schoolName) {
+        this.schoolName = schoolName;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+    public String getStudentNumber() {
+        return studentNumber;
+    }
+
+    public void setStudentNumber(String studentNumber) {
+        this.studentNumber = studentNumber;
+    }
+
+    public int getAnalyseId() {
+        return analyseId;
+    }
+
+    public void setAnalyseId(int analyseId) {
+        this.analyseId = analyseId;
+    }
+
+    public String getExamNumber() {
+        return examNumber;
+    }
+
+    public void setExamNumber(String examNumber) {
+        this.examNumber = examNumber;
+    }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public int getCorrect() {
+        return correct;
+    }
+
+    public void setCorrect(int correct) {
+        this.correct = correct;
+    }
+}
@@ -0,0 +1,95 @@
+package com.sincere.common.dto.independence;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/13 0013 10:51
+ */
+public class StudentDto implements Serializable {
+
+    private int id ;
+    private int openId;
+    private String schoolName ;
+    private String className ;
+    private String studentName ;
+    private String studentNumber ;
+    private int analyseId ;
+    private double score ;
+    private Date createTime ;
+
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getOpenId() {
+        return openId;
+    }
+
+    public void setOpenId(int openId) {
+        this.openId = openId;
+    }
+
+    public String getSchoolName() {
+        return schoolName;
+    }
+
+    public void setSchoolName(String schoolName) {
+        this.schoolName = schoolName;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+    public String getStudentNumber() {
+        return studentNumber;
+    }
+
+    public void setStudentNumber(String studentNumber) {
+        this.studentNumber = studentNumber;
+    }
+
+    public int getAnalyseId() {
+        return analyseId;
+    }
+
+    public void setAnalyseId(int analyseId) {
+        this.analyseId = analyseId;
+    }
+
+    public double getScore() {
+        return score;
+    }
+
+    public void setScore(double score) {
+        this.score = score;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}
@@ -0,0 +1,132 @@
+package com.sincere.common.dto.independence;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/13 0013 16:53
+ */
+public class TeacherClassDto implements Serializable {
+
+    private Integer tClassId;
+
+    private Integer teacherId;
+
+    private String teacherName;
+
+    private Integer schoolId;
+
+    private String grade;
+
+    private Integer classId;
+
+    private String courseName;
+
+    private Integer times;
+
+    private Integer joinTimes;
+
+    private Date createTime;
+
+    private String team ;
+
+    private int status ;
+
+    public Integer gettClassId() {
+        return tClassId;
+    }
+
+    public void settClassId(Integer tClassId) {
+        this.tClassId = tClassId;
+    }
+
+    public Integer getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Integer teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName == null ? null : teacherName.trim();
+    }
+
+    public Integer getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Integer schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public String getGrade() {
+        return grade;
+    }
+
+    public void setGrade(String grade) {
+        this.grade = grade;
+    }
+
+    public Integer getClassId() {
+        return classId;
+    }
+
+    public void setClassId(Integer classId) {
+        this.classId = classId;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName == null ? null : courseName.trim();
+    }
+
+    public Integer getTimes() {
+        return times;
+    }
+
+    public void setTimes(Integer times) {
+        this.times = times;
+    }
+
+    public Integer getJoinTimes() {
+        return joinTimes;
+    }
+
+    public void setJoinTimes(Integer joinTimes) {
+        this.joinTimes = joinTimes;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getTeam() {
+        return team;
+    }
+
+    public void setTeam(String team) {
+        this.team = team;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+}
@@ -0,0 +1,66 @@
+package com.sincere.common.enums;
+
+/**
+ * 学情分析 题目困难程度
+ * @author chen
+ * @version 1.0 1
+ * @date 2019/10/18 0018 8:40
+ */
+public enum DifficultEnums {
+
+    easy(1,"易","认知"),
+    medium(2,"中","理解"),
+    difficult(3,"难","应用");
+
+    private int difficultType ;
+    private String difficultName ;
+    private String difficultShow ;
+
+    DifficultEnums(int difficultType, String difficultName, String difficultShow) {
+        this.difficultType = difficultType;
+        this.difficultName = difficultName;
+        this.difficultShow = difficultShow;
+    }
+
+    public String getDifficultShow() {
+        return difficultShow;
+    }
+
+    public void setDifficultShow(String difficultShow) {
+        this.difficultShow = difficultShow;
+    }
+
+    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 ;
+    }
+
+    public static String getDifficultName(int difficultType){
+        for (DifficultEnums difficultEnums : DifficultEnums.values()) {
+            if (difficultEnums.getDifficultType() == difficultType) {
+                return difficultEnums.getDifficultName();
+            }
+        }
+        return "" ;
+    }
+}
@@ -0,0 +1,38 @@
+package com.sincere.common.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,164 @@
+package com.sincere.common.util;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+/**
+ * HttpClient4.3工具类
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/11 0011 10:17
+ */
+public class HttpClientUtils {
+
+    private static RequestConfig requestConfig = null;
+
+    static
+    {
+        // 设置请求和传输超时时间
+        requestConfig = RequestConfig.custom().setSocketTimeout(2000).setConnectTimeout(2000).build();
+    }
+
+    public static void main(String[] args){
+        JSONObject teacherList = HttpClientUtils.httpGet("http://60.190.202.57:1000/api/EasyN/GetSchoolSubject?SchoolId=1");
+        System.out.println("1");
+    }
+
+    /**
+     * post请求传输json参数
+     * @param url  url地址
+     * @param jsonParam 参数
+     * @return
+     */
+    public static JSONObject httpPost(String url, JSONObject jsonParam) {
+        // post请求返回结果
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        JSONObject jsonResult = null;
+        HttpPost httpPost = new HttpPost(url);
+        // 设置请求和传输超时时间
+        httpPost.setConfig(requestConfig);
+        try {
+            if (null != jsonParam) {
+                // 解决中文乱码问题
+                StringEntity entity = new StringEntity(jsonParam.toString(), "utf-8");
+                entity.setContentEncoding("UTF-8");
+                entity.setContentType("application/json");
+                httpPost.setEntity(entity);
+            }
+            CloseableHttpResponse result = httpClient.execute(httpPost);
+            // 请求发送成功，并得到响应
+            if (result.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                String str = "";
+                // 读取服务器返回过来的json字符串数据
+                str = EntityUtils.toString(result.getEntity(), "utf-8");
+                // 把json字符串转换成json对象
+                jsonResult = JSONObject.parseObject(str);
+
+            }
+        } catch (IOException e) {
+
+        } finally {
+            httpPost.releaseConnection();
+        }
+        return jsonResult;
+    }
+
+    /**
+     * post请求传输String参数 例如：name=Jack&sex=1&type=2
+     * Content-type:application/x-www-form-urlencoded
+     * @param url            url地址
+     * @param strParam       参数
+     * @return
+     */
+    public static JSONObject httpPost(String url, String strParam) {
+        // post请求返回结果
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        JSONObject jsonResult = null;
+        HttpPost httpPost = new HttpPost(url);
+        httpPost.setConfig(requestConfig);
+        try {
+            if (null != strParam) {
+                // 解决中文乱码问题
+                StringEntity entity = new StringEntity(strParam, "utf-8");
+                entity.setContentEncoding("UTF-8");
+                entity.setContentType("application/x-www-form-urlencoded");
+                httpPost.setEntity(entity);
+            }
+            CloseableHttpResponse result = httpClient.execute(httpPost);
+            // 请求发送成功，并得到响应
+            if (result.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                String str = "";
+                // 读取服务器返回过来的json字符串数据
+                str = EntityUtils.toString(result.getEntity(), "utf-8");
+                // 把json字符串转换成json对象
+                jsonResult = JSONObject.parseObject(str);
+            }
+        } catch (IOException e) {
+
+        } finally {
+            httpPost.releaseConnection();
+        }
+        return jsonResult;
+    }
+
+    /**
+     * 发送get请求
+     * @param url 路径
+     * @return
+     */
+    public static JSONObject httpGet(String url) {
+        // get请求返回结果
+        JSONObject jsonResult = null;
+        CloseableHttpClient client = HttpClients.createDefault();
+        // 发送get请求
+        HttpGet request = new HttpGet(url);
+        request.setConfig(requestConfig);
+        try {
+            CloseableHttpResponse response = client.execute(request);
+            // 请求发送成功，并得到响应
+            if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                // 读取服务器返回过来的json字符串数据
+                HttpEntity entity = response.getEntity();
+                String strResult = EntityUtils.toString(entity, "utf-8");
+                // 把json字符串转换成json对象
+                jsonResult = JSONObject.parseObject(strResult);
+            }
+        } catch (IOException e) {
+
+        } finally {
+            request.releaseConnection();
+        }
+        return jsonResult;
+    }
+
+
+    public static InputStream GetFileInputStream(String fileUrl){
+        try{
+            URL url = new URL(fileUrl);
+            HttpURLConnection conn = (HttpURLConnection)url.openConnection();
+            //设置超时间为3秒
+            conn.setConnectTimeout(8*1000);
+            //得到输入流
+            InputStream inputStream = conn.getInputStream();
+
+            return inputStream ;
+        }catch (Exception e){
+
+        }
+        return null ;
+    }
+}
 \ No newline at end of file
@@ -0,0 +1,225 @@
+package com.sincere.common.util;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.JedisPoolConfig;
+
+import javax.annotation.PostConstruct;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/5 0005 8:51
+ */
+@Component
+@PropertySource(value = "classpath:conf.properties")
+public class RedisUtils {
+
+
+    @Value("${redis.host}")
+    private String host;
+    @Value("${redis.port}")
+    private int port;
+    @Value("${redis.password}")
+    private String password;
+
+    @PostConstruct
+    public void getApiToken() {
+        ADDR = this.host ;
+        PORT = this.port ;
+        AUTH = this.password ;
+    }
+
+    //Redis服务器IP
+    private static String ADDR;
+
+    //Redis的端口号
+    private static int PORT;
+
+    //访问密码
+    private static String AUTH;
+
+    //可用连接实例的最大数目，默认值为8；
+    //如果赋值为-1，则表示不限制；如果pool已经分配了maxActive个jedis实例，则此时pool的状态为exhausted(耗尽)。
+    private static int MAX_ACTIVE = 1024;
+
+    //控制一个pool最多有多少个状态为idle(空闲的)的jedis实例，默认值也是8。
+    private static int MAX_IDLE = 200;
+
+    //等待可用连接的最大时间，单位毫秒，默认值为-1，表示永不超时。如果超过等待时间，则直接抛出JedisConnectionException；
+    private static int MAX_WAIT = 10000;
+
+    private static int TIMEOUT = 10000;
+
+    //在borrow一个jedis实例时，是否提前进行validate操作；如果为true，则得到的jedis实例均是可用的；
+    private static boolean TEST_ON_BORROW = true;
+
+    private static JedisPool jedisPool = null;
+
+
+    /**
+     * 获取Jedis实例
+     * @return
+     */
+    public synchronized static Jedis getJedis() {
+
+        try {
+            if (jedisPool != null) {
+                Jedis resource = jedisPool.getResource();
+                return resource;
+            } else {
+                JedisPoolConfig config = new JedisPoolConfig();
+                config.setMaxTotal(MAX_ACTIVE);
+                config.setMaxIdle(MAX_IDLE);
+                config.setMaxWaitMillis(MAX_WAIT);
+                config.setTestOnBorrow(TEST_ON_BORROW);
+                jedisPool = new JedisPool(config, ADDR, PORT, TIMEOUT, AUTH);
+                Jedis resource = jedisPool.getResource();
+                return resource;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public static void main(String[] args) {
+        RedisUtils.setString("test","test");
+    }
+    /**
+     * 释放jedis资源
+     * @param jedis
+     */
+    public static void returnResource(final Jedis jedis) {
+        if (jedis != null) {
+            jedisPool.returnResource(jedis);
+        }
+    }
+
+    public static void setString(String key ,String value){
+        Jedis jedis = null;
+        try {
+            jedis = getJedis();
+            jedis.set(key,value);
+        } catch (Exception e) {
+            System.out.println("setString设置redis键值异常:key=" + key + " value=" + value + " cause:" + e.getMessage());
+        } finally {
+            if(jedis != null)
+            {
+                jedis.close();
+            }
+        }
+    }
+
+    public static void setObject(String key,Object object) {
+        Jedis jedis = null;
+        try {
+            jedis = getJedis();
+            jedis.set(key.getBytes(), SerializeUtil.serialize(object));
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.println("setString设置redis键值异常:key=" + key + " value=" + object + " cause:" + e.getMessage());
+        } finally {
+            if(jedis != null)
+            {
+                jedis.close();
+            }
+        }
+    }
+
+    public static void setString(String key ,String value , int expireTime){
+        String result = "OK";
+        Jedis jedis = null;
+        try {
+            jedis = getJedis();
+            jedis.set(key,value);
+            if(result.equals("OK")) {
+                jedis.expire(key.getBytes(), expireTime);
+            }
+        } catch (Exception e) {
+            System.out.println("setString设置redis键值异常:key=" + key + " value=" + value + " cause:" + e.getMessage());
+        } finally {
+            if(jedis != null)
+            {
+                jedis.close();
+            }
+        }
+    }
+
+    public static String getString(String key) {
+        Jedis jedis = null;
+        try {
+            jedis = getJedis();
+            String value = jedis.get(key);
+            return value;
+        } catch (Exception e) {
+            System.out.println("getString获取redis键值异常:key=" + key + " cause:" + e.getMessage());
+        } finally {
+            jedis.close();
+        }
+        return null;
+    }
+
+    public static Object getObject(String key) {
+        Jedis jedis = null;
+        try {
+            jedis = getJedis();
+            byte[] value = jedis.get(key.getBytes());
+            return SerializeUtil. unserialize(value);
+        } catch (Exception e) {
+            System.out.println("getString获取redis键值异常:key=" + key + " cause:" + e.getMessage());
+        } finally {
+            jedis.close();
+        }
+        return null;
+    }
+
+
+    /**
+     * 删除key
+     */
+    public static Long delkeyObject(String key) {
+        Jedis jedis = null;
+        try {
+            jedis = getJedis();
+            return jedis.del(key.getBytes());
+        }catch(Exception e) {
+            e.printStackTrace();
+            return null;
+        }finally{
+            if(jedis != null)
+            {
+                jedis.close();
+            }
+        }
+    }
+
+    public static Boolean existsObject(String key) {
+        Jedis jedis = null;
+        try {
+            jedis = getJedis();
+            return jedis.exists(key);
+        }catch(Exception e) {
+            e.printStackTrace();
+            return false;
+        }finally{
+            if(jedis != null)
+            {
+                jedis.close();
+            }
+        }
+    }
+
+    public static void flushAll() {
+        Jedis jedis = null;
+        try {
+            jedis = getJedis();
+            jedis.flushAll();
+        } catch (Exception e) {
+            System.out.println("Cache清空失败：" + e);
+        }
+    }
+}
@@ -0,0 +1,44 @@
+package com.sincere.common.util;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/5 0005 9:06
+ */
+public class SerializeUtil {
+
+    // 序列化
+    public static byte[] serialize(Object object) {
+        ObjectOutputStream oos;
+        oos = null;
+        ByteArrayOutputStream baos = null;
+        try {
+            baos = new ByteArrayOutputStream();
+            oos = new ObjectOutputStream(baos);
+            oos.writeObject(object);
+            byte[] bytes = baos.toByteArray();
+            return bytes;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    // 反序列化
+    public static Object unserialize( byte[] bytes) {
+        ByteArrayInputStream bais = null;
+        try {
+            bais = new ByteArrayInputStream(bytes);
+            ObjectInputStream ois = new ObjectInputStream(bais);
+            return ois.readObject();
+        } catch (Exception e) {
+
+        }
+        return null;
+    }
+}
@@ -0,0 +1,29 @@
+package com.sincere.common.vo;
+
+import java.io.Serializable;
+
+public class BaseVo implements Serializable {
+
+    private boolean success;
+    private String message ;
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public BaseVo() {
+        success = true;
+    }
+}
@@ -0,0 +1,58 @@
+package com.sincere.common.vo.independence.paike;
+
+import com.sincere.common.dto.independence.TeacherClassDto;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/12 0012 8:30
+ */
+public class ClassCourseDetailVo {
+
+    private String courseName ;
+    private String teacherName ;
+    private int times ;
+    private int joinTimes ;
+
+
+    public ClassCourseDetailVo(TeacherClassDto teacherClass) {
+        this.courseName = teacherClass.getCourseName();
+        this.teacherName = teacherClass.getTeacherName();
+        this.joinTimes = teacherClass.getJoinTimes();
+        this.times = teacherClass.getTimes()-2*(teacherClass.getJoinTimes());
+    }
+
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public int getTimes() {
+        return times;
+    }
+
+    public void setTimes(int times) {
+        this.times = times;
+    }
+
+    public int getJoinTimes() {
+        return joinTimes;
+    }
+
+    public void setJoinTimes(int joinTimes) {
+        this.joinTimes = joinTimes;
+    }
+
+}
@@ -0,0 +1,25 @@
+package com.sincere.common.vo.independence.paike;
+
+
+import com.sincere.common.dto.independence.ClassCourseDto;
+import com.sincere.common.vo.BaseVo;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/11 0011 10:17
+ */
+public class ClassCourseRepVo extends BaseVo {
+
+    private List<ClassCourseDto> data;
+
+    public List<ClassCourseDto> getData() {
+        return data;
+    }
+
+    public void setData(List<ClassCourseDto> data) {
+        this.data = data;
+    }
+}
@@ -0,0 +1,49 @@
+package com.sincere.common.vo.independence.paike;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/12 0012 8:30
+ */
+public class ClassCourseVO {
+
+    private int classId ;
+    private String className ;
+    private int allCount ;
+
+    List<ClassCourseDetailVo> list ;
+
+    public int getClassId() {
+        return classId;
+    }
+
+    public void setClassId(int classId) {
+        this.classId = classId;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
+
+    public int getAllCount() {
+        return allCount;
+    }
+
+    public void setAllCount(int allCount) {
+        this.allCount = allCount;
+    }
+
+    public List<ClassCourseDetailVo> getList() {
+        return list;
+    }
+
+    public void setList(List<ClassCourseDetailVo> list) {
+        this.list = list;
+    }
+}
@@ -0,0 +1,24 @@
+package com.sincere.common.vo.independence.paike;
+
+import com.sincere.common.dto.independence.ClassModelDto;
+import com.sincere.common.vo.BaseVo;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/11 0011 14:08
+ */
+public class ClassRepVo extends BaseVo {
+
+    private List<ClassModelDto> data ;
+
+    public List<ClassModelDto> getData() {
+        return data;
+    }
+
+    public void setData(List<ClassModelDto> data) {
+        this.data = data;
+    }
+}
@@ -0,0 +1,30 @@
+package com.sincere.common.vo.independence.paike;
+
+import java.io.Serializable;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/12 0012 8:58
+ */
+public class CourseGroupReqVo implements Serializable {
+
+    private int scheduleId ;
+    private int courseGroup ;
+
+    public int getScheduleId() {
+        return scheduleId;
+    }
+
+    public void setScheduleId(int scheduleId) {
+        this.scheduleId = scheduleId;
+    }
+
+    public int getCourseGroup() {
+        return courseGroup;
+    }
+
+    public void setCourseGroup(int courseGroup) {
+        this.courseGroup = courseGroup;
+    }
+}
@@ -0,0 +1,28 @@
+package com.sincere.common.vo.independence.paike;
+
+import com.sincere.common.dto.independence.CourseDto;
+import com.sincere.common.vo.BaseVo;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/11 0011 10:12
+ */
+public class CourseRepVo extends BaseVo {
+
+    private List<CourseDto> data ;
+
+    public List<CourseDto> getData() {
+        return data;
+    }
+
+    public void setData(List<CourseDto> data) {
+        this.data = data;
+    }
+
+    public CourseRepVo(){
+        super();
+    }
+}
@@ -0,0 +1,42 @@
+package com.sincere.common.vo.independence.paike;
+
+import com.jevon.model.Course;
+import com.sincere.common.dto.independence.CourseDto;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/14 0014 7:58
+ */
+public class CourseTypeListVO {
+
+    private int courseType ;
+    private String courseTypeName ;
+    private List<CourseDto> list ;
+
+    public int getCourseType() {
+        return courseType;
+    }
+
+    public void setCourseType(int courseType) {
+        this.courseType = courseType;
+    }
+
+    public String getCourseTypeName() {
+        return courseTypeName;
+    }
+
+    public void setCourseTypeName(String courseTypeName) {
+        this.courseTypeName = courseTypeName;
+    }
+
+    public List<CourseDto> getList() {
+        return list;
+    }
+
+    public void setList(List<CourseDto> list) {
+        this.list = list;
+    }
+}
@@ -0,0 +1,52 @@
+package com.sincere.common.vo.independence.paike;
+
+import java.io.Serializable;
+
+public class FirstReqVo implements Serializable {
+
+    private int scheduleId;
+    private int morning ;
+    private int afternoon;
+    private int night ;
+    private int dayNumber;
+
+    public int getScheduleId() {
+        return scheduleId;
+    }
+
+    public void setScheduleId(int scheduleId) {
+        this.scheduleId = scheduleId;
+    }
+
+    public int getMorning() {
+        return morning;
+    }
+
+    public void setMorning(int morning) {
+        this.morning = morning;
+    }
+
+    public int getAfternoon() {
+        return afternoon;
+    }
+
+    public void setAfternoon(int afternoon) {
+        this.afternoon = afternoon;
+    }
+
+    public int getNight() {
+        return night;
+    }
+
+    public void setNight(int night) {
+        this.night = night;
+    }
+
+    public int getDayNumber() {
+        return dayNumber;
+    }
+
+    public void setDayNumber(int dayNumber) {
+        this.dayNumber = dayNumber;
+    }
+}
@@ -0,0 +1,57 @@
+package com.sincere.common.vo.independence.paike;
+
+import java.io.Serializable;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/12 0012 9:20
+ */
+public class GetCourseClassListRepVo implements Serializable {
+
+    private int classId ;
+    private String className ;
+    private int courseId ;
+    private String courseName ;
+    private String teacherName ;
+
+    public int getClassId() {
+        return classId;
+    }
+
+    public void setClassId(int classId) {
+        this.classId = classId;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
+
+    public int getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(int courseId) {
+        this.courseId = courseId;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+}
@@ -0,0 +1,32 @@
+package com.sincere.common.vo.independence.paike;
+
+import com.sincere.common.vo.BaseVo;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/14 0014 7:59
+ */
+public class GetCourseTypeListRepVo extends BaseVo {
+
+    private int scheduleId ;
+    private List<CourseTypeListVO> data ;
+
+    public int getScheduleId() {
+        return scheduleId;
+    }
+
+    public void setScheduleId(int scheduleId) {
+        this.scheduleId = scheduleId;
+    }
+
+    public List<CourseTypeListVO> getData() {
+        return data;
+    }
+
+    public void setData(List<CourseTypeListVO> data) {
+        this.data = data;
+    }
+}
@@ -0,0 +1,40 @@
+package com.sincere.common.vo.independence.paike;
+
+
+import com.sincere.common.vo.BaseVo;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/11 0011 16:55
+ */
+public class InitRepVo extends BaseVo {
+
+    private int classNumber ;
+    private int teacherNumber ;
+    private int courseNumber ;
+
+    public int getClassNumber() {
+        return classNumber;
+    }
+
+    public void setClassNumber(int classNumber) {
+        this.classNumber = classNumber;
+    }
+
+    public int getTeacherNumber() {
+        return teacherNumber;
+    }
+
+    public void setTeacherNumber(int teacherNumber) {
+        this.teacherNumber = teacherNumber;
+    }
+
+    public int getCourseNumber() {
+        return courseNumber;
+    }
+
+    public void setCourseNumber(int courseNumber) {
+        this.courseNumber = courseNumber;
+    }
+}
@@ -0,0 +1,40 @@
+package com.sincere.common.vo.independence.paike;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/10 0010 8:40
+ */
+public class JoinClassReqVo implements Serializable {
+
+    private int scheduleId ;
+    private int courseId ;
+    private List<Integer> classIdList ;
+
+    public int getScheduleId() {
+        return scheduleId;
+    }
+
+    public void setScheduleId(int scheduleId) {
+        this.scheduleId = scheduleId;
+    }
+
+    public int getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(int courseId) {
+        this.courseId = courseId;
+    }
+
+    public List<Integer> getClassIdList() {
+        return classIdList;
+    }
+
+    public void setClassIdList(List<Integer> classIdList) {
+        this.classIdList = classIdList;
+    }
+}
@@ -0,0 +1,46 @@
+package com.sincere.common.vo.independence.paike;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/11 0011 14:27
+ */
+public class JoinDetail {
+
+    private int courseGroup ;
+    private String courseName ;
+    private String className ;
+    private String teacherName ;
+
+    public int getCourseGroup() {
+        return courseGroup;
+    }
+
+    public void setCourseGroup(int courseGroup) {
+        this.courseGroup = courseGroup;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+}
@@ -0,0 +1,24 @@
+package com.sincere.common.vo.independence.paike;
+
+
+import com.sincere.common.vo.BaseVo;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/11 0011 14:28
+ */
+public class JoinRepVo extends BaseVo {
+
+    private List<JoinDetail> data ;
+
+    public List<JoinDetail> getData() {
+        return data;
+    }
+
+    public void setData(List<JoinDetail> data) {
+        this.data = data;
+    }
+}
@@ -0,0 +1,58 @@
+package com.sincere.common.vo.independence.paike;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/9 0009 15:53
+ */
+public class NoScheduleReqVo implements Serializable {
+
+    private int scheduleId ;
+    private String grade ;
+    private int classId ;
+    private int level ;  //1 班级不排 2 年级不排  3 学校不排
+    private List<String> list ;
+
+    public int getScheduleId() {
+        return scheduleId;
+    }
+
+    public void setScheduleId(int scheduleId) {
+        this.scheduleId = scheduleId;
+    }
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+
+    public List<String> getList() {
+        return list;
+    }
+
+    public void setList(List<String> list) {
+        this.list = list;
+    }
+
+    public String getGrade() {
+        return grade;
+    }
+
+    public void setGrade(String grade) {
+        this.grade = grade;
+    }
+
+    public int getClassId() {
+        return classId;
+    }
+
+    public void setClassId(int classId) {
+        this.classId = classId;
+    }
+}
@@ -0,0 +1,68 @@
+package com.sincere.common.vo.independence.paike;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/9/25 0025 8:41
+ */
+public class ParallelClassReqVo implements Serializable {
+
+    private int scheduleId ;
+    private List<String> intervalList ;
+    private int courseType;
+
+    private int level ;  //1 班级不排 2 年级不排  3 学校不排
+    private String grade ;
+    private int classId ;
+
+    public int getScheduleId() {
+        return scheduleId;
+    }
+
+    public void setScheduleId(int scheduleId) {
+        this.scheduleId = scheduleId;
+    }
+
+    public List<String> getIntervalList() {
+        return intervalList;
+    }
+
+    public void setIntervalList(List<String> intervalList) {
+        this.intervalList = intervalList;
+    }
+
+    public int getCourseType() {
+        return courseType;
+    }
+
+    public void setCourseType(int courseType) {
+        this.courseType = courseType;
+    }
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+
+    public String getGrade() {
+        return grade;
+    }
+
+    public void setGrade(String grade) {
+        this.grade = grade;
+    }
+
+    public int getClassId() {
+        return classId;
+    }
+
+    public void setClassId(int classId) {
+        this.classId = classId;
+    }
+}
@@ -0,0 +1,29 @@
+package com.sincere.common.vo.independence.paike;
+
+import java.io.Serializable;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/15 0015 8:08
+ */
+public class RecallReqVo implements Serializable {
+    private int scheduleId ;
+    private int number  ;// 对应页面  1不排课 2 公共课 3 主课 4 副课
+
+    public int getScheduleId() {
+        return scheduleId;
+    }
+
+    public void setScheduleId(int scheduleId) {
+        this.scheduleId = scheduleId;
+    }
+
+    public int getNumber() {
+        return number;
+    }
+
+    public void setNumber(int number) {
+        this.number = number;
+    }
+}
@@ -0,0 +1,28 @@
+package com.sincere.common.vo.independence.paike;
+
+
+import com.sincere.common.dto.independence.ScheduleDto;
+import com.sincere.common.vo.BaseVo;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/11 0011 14:03
+ */
+public class ScheduleListRepVo extends BaseVo {
+
+    private List<ScheduleDto> data ;
+
+    public List<ScheduleDto> getData() {
+        return data;
+    }
+
+    public void setData(List<ScheduleDto> data) {
+        this.data = data;
+    }
+    public ScheduleListRepVo(){
+        super();
+    }
+}
@@ -0,0 +1,41 @@
+package com.sincere.common.vo.independence.paike;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/9 0009 16:32
+ */
+public class SetTypeReqVo implements Serializable {
+
+    private int scheduleId ;
+    private int courseType ;  // 1 主课  2 副课 3 公共课
+    private List<Integer>  courseIdList ;
+
+
+    public int getCourseType() {
+        return courseType;
+    }
+
+    public void setCourseType(int courseType) {
+        this.courseType = courseType;
+    }
+
+    public int getScheduleId() {
+        return scheduleId;
+    }
+
+    public void setScheduleId(int scheduleId) {
+        this.scheduleId = scheduleId;
+    }
+
+    public List<Integer> getCourseIdList() {
+        return courseIdList;
+    }
+
+    public void setCourseIdList(List<Integer> courseIdList) {
+        this.courseIdList = courseIdList;
+    }
+}
@@ -0,0 +1,33 @@
+package com.sincere.common.vo.independence.paike;
+
+
+import com.sincere.common.vo.BaseVo;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/12 0012 8:32
+ */
+public class TeacherCourseRepVo extends BaseVo {
+
+    private List<ClassCourseVO> data ;
+    private List<String> courseNameList ;
+
+    public List<ClassCourseVO> getData() {
+        return data;
+    }
+
+    public void setData(List<ClassCourseVO> data) {
+        this.data = data;
+    }
+
+    public List<String> getCourseNameList() {
+        return courseNameList;
+    }
+
+    public void setCourseNameList(List<String> courseNameList) {
+        this.courseNameList = courseNameList;
+    }
+}
@@ -0,0 +1,46 @@
+package com.sincere.common.vo.independence.school;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 15:37
+ */
+@ApiModel
+public class Form1 implements Serializable {
+
+    @ApiModelProperty(value="等级")
+    private String level ;
+    @ApiModelProperty(value="人数")
+    private int number ;
+    @ApiModelProperty(value="比例")
+    private double prop ;
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    public int getNumber() {
+        return number;
+    }
+
+    public void setNumber(int number) {
+        this.number = number;
+    }
+
+    public double getProp() {
+        return prop;
+    }
+
+    public void setProp(double prop) {
+        this.prop = prop;
+    }
+}
@@ -0,0 +1,38 @@
+package com.sincere.common.vo.independence.school;
+
+import com.sincere.common.vo.BaseVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 15:46
+ */
+@ApiModel
+public class Form1RepVO extends BaseVo {
+
+    @ApiModelProperty(value="分数段区间")
+    private Map<String ,String> map ;
+    @ApiModelProperty(value="分数段详情")
+    private List<Form1> list ;
+
+    public Map<String, String> getMap() {
+        return map;
+    }
+
+    public void setMap(Map<String, String> map) {
+        this.map = map;
+    }
+
+    public List<Form1> getList() {
+        return list;
+    }
+
+    public void setList(List<Form1> list) {
+        this.list = list;
+    }
+}
@@ -0,0 +1,86 @@
+package com.sincere.common.vo.independence.school;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 16:10
+ */
+@ApiModel
+public class Form2 implements Serializable {
+
+    @ApiModelProperty(value="名称")
+    private String name ;
+    @ApiModelProperty(value="参考人数")
+    private int studentNumber ;
+    @ApiModelProperty(value="参考人数占比")
+    private double studentProp ;
+    @ApiModelProperty(value="高分段人数")
+    private int highNumber ;
+    @ApiModelProperty(value="高分段人数占比")
+    private double highProp ;
+    @ApiModelProperty(value="低分段人数")
+    private int lowNumber ;
+    @ApiModelProperty(value="低分段人数占比")
+    private double lowProp ;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getStudentNumber() {
+        return studentNumber;
+    }
+
+    public void setStudentNumber(int studentNumber) {
+        this.studentNumber = studentNumber;
+    }
+
+    public int getHighNumber() {
+        return highNumber;
+    }
+
+    public void setHighNumber(int highNumber) {
+        this.highNumber = highNumber;
+    }
+
+    public double getHighProp() {
+        return highProp;
+    }
+
+    public void setHighProp(double highProp) {
+        this.highProp = highProp;
+    }
+
+    public int getLowNumber() {
+        return lowNumber;
+    }
+
+    public void setLowNumber(int lowNumber) {
+        this.lowNumber = lowNumber;
+    }
+
+    public double getLowProp() {
+        return lowProp;
+    }
+
+    public void setLowProp(double lowProp) {
+        this.lowProp = lowProp;
+    }
+
+    public double getStudentProp() {
+        return studentProp;
+    }
+
+    public void setStudentProp(double studentProp) {
+        this.studentProp = studentProp;
+    }
+}
@@ -0,0 +1,26 @@
+package com.sincere.common.vo.independence.school;
+
+import com.sincere.common.vo.BaseVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/22 0022 9:51
+ */
+@ApiModel
+public class Form2RepVO extends BaseVo {
+    @ApiModelProperty(value="数据")
+    private List<Form2> data ;
+
+    public List<Form2> getData() {
+        return data;
+    }
+
+    public void setData(List<Form2> data) {
+        this.data = data;
+    }
+}
@@ -0,0 +1,96 @@
+package com.sincere.common.vo.independence.school;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/21 0021 9:03
+ */
+@ApiModel
+public class Form3 implements Serializable {
+
+    @ApiModelProperty(value="名称")
+    private String name ;
+    @ApiModelProperty(value="最高分")
+    private Double maxScore ;
+    @ApiModelProperty(value="平均分")
+    private Double average ;
+    @ApiModelProperty(value="最低分")
+    private Double minScore ;
+    @ApiModelProperty(value="优秀率")
+    private Double apercent ;
+    @ApiModelProperty(value="良好率")
+    private Double bpercent ;
+    @ApiModelProperty(value="及格率")
+    private Double cpercent ;
+    @ApiModelProperty(value="不及格率")
+    private Double dpercent ;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Double getMaxScore() {
+        return maxScore;
+    }
+
+    public void setMaxScore(Double maxScore) {
+        this.maxScore = maxScore;
+    }
+
+    public Double getAverage() {
+        return average;
+    }
+
+    public void setAverage(Double average) {
+        this.average = average;
+    }
+
+    public Double getMinScore() {
+        return minScore;
+    }
+
+    public void setMinScore(Double minScore) {
+        this.minScore = minScore;
+    }
+
+    public Double getApercent() {
+        return apercent;
+    }
+
+    public void setApercent(Double apercent) {
+        this.apercent = apercent;
+    }
+
+    public Double getBpercent() {
+        return bpercent;
+    }
+
+    public void setBpercent(Double bpercent) {
+        this.bpercent = bpercent;
+    }
+
+    public Double getCpercent() {
+        return cpercent;
+    }
+
+    public void setCpercent(Double cpercent) {
+        this.cpercent = cpercent;
+    }
+
+    public Double getDpercent() {
+        return dpercent;
+    }
+
+    public void setDpercent(Double dpercent) {
+        this.dpercent = dpercent;
+    }
+}
@@ -0,0 +1,23 @@
+package com.sincere.common.vo.independence.school;
+
+import com.sincere.common.vo.BaseVo;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/22 0022 10:14
+ */
+public class Form3RepVO extends BaseVo {
+
+    private List<Form3> data ;
+
+    public List<Form3> getData() {
+        return data;
+    }
+
+    public void setData(List<Form3> data) {
+        this.data = data;
+    }
+}
@@ -0,0 +1,66 @@
+package com.sincere.common.vo.independence.school;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/21 0021 9:51
+ */
+@ApiModel
+public class Form4 implements Serializable {
+
+    @ApiModelProperty(value="名称")
+    private String name ;
+    @ApiModelProperty(value="众数")
+    private Double modeNumber ;
+    @ApiModelProperty(value="中位数")
+    private Double medianNumber ;
+    @ApiModelProperty(value="标准差")
+    private Double stdev ;
+    @ApiModelProperty(value="平均分")
+    private Double avgNumber ;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Double getModeNumber() {
+        return modeNumber;
+    }
+
+    public void setModeNumber(Double modeNumber) {
+        this.modeNumber = modeNumber;
+    }
+
+    public Double getMedianNumber() {
+        return medianNumber;
+    }
+
+    public void setMedianNumber(Double medianNumber) {
+        this.medianNumber = medianNumber;
+    }
+
+    public Double getStdev() {
+        return stdev;
+    }
+
+    public void setStdev(Double stdev) {
+        this.stdev = stdev;
+    }
+
+    public Double getAvgNumber() {
+        return avgNumber;
+    }
+
+    public void setAvgNumber(Double avgNumber) {
+        this.avgNumber = avgNumber;
+    }
+}
@@ -0,0 +1,25 @@
+package com.sincere.common.vo.independence.school;
+
+import com.sincere.common.vo.BaseVo;
+import io.swagger.annotations.ApiModel;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/22 0022 10:23
+ */
+@ApiModel
+public class Form4RepVO extends BaseVo {
+
+    private List<Form4> data ;
+
+    public List<Form4> getData() {
+        return data;
+    }
+
+    public void setData(List<Form4> data) {
+        this.data = data;
+    }
+}
@@ -0,0 +1,136 @@
+package com.sincere.common.vo.independence.school;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/21 0021 9:59
+ */
+@ApiModel
+public class Form5 implements Serializable {
+    @ApiModelProperty(value="题号")
+    private String examNumber ;
+    @ApiModelProperty(value="难度")
+    private String difficultName ;
+    @ApiModelProperty(value="分值")
+    private Double score ;
+    @ApiModelProperty(value="得分率 区")
+    private Double allRate ;
+    @ApiModelProperty(value="得分率 联盟校")
+    private Double leagueRate ;
+    @ApiModelProperty(value="得分率  本校")
+    private Double schoolRate ;
+    @ApiModelProperty(value="平均分 区")
+    private Double allAvg ;
+    @ApiModelProperty(value="平均分  联盟校")
+    private Double leagueAvg ;
+    @ApiModelProperty(value="平均分 本校")
+    private Double schoolAvg ;
+    @ApiModelProperty(value="区分度   区")
+    private Double allDist ;
+    @ApiModelProperty(value="区分度  联盟校")
+    private Double leagueDist ;
+    @ApiModelProperty(value="区分度 本校")
+    private Double schoolDist ;
+
+
+    public String getExamNumber() {
+        return examNumber;
+    }
+
+    public void setExamNumber(String examNumber) {
+        this.examNumber = examNumber;
+    }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
+    public Double getAllRate() {
+        return allRate;
+    }
+
+    public void setAllRate(Double allRate) {
+        this.allRate = allRate;
+    }
+
+    public Double getSchoolRate() {
+        return schoolRate;
+    }
+
+    public void setSchoolRate(Double schoolRate) {
+        this.schoolRate = schoolRate;
+    }
+
+    public Double getAllAvg() {
+        return allAvg;
+    }
+
+    public void setAllAvg(Double allAvg) {
+        this.allAvg = allAvg;
+    }
+
+    public Double getSchoolAvg() {
+        return schoolAvg;
+    }
+
+    public void setSchoolAvg(Double schoolAvg) {
+        this.schoolAvg = schoolAvg;
+    }
+
+    public Double getAllDist() {
+        return allDist;
+    }
+
+    public void setAllDist(Double allDist) {
+        this.allDist = allDist;
+    }
+
+    public Double getSchoolDist() {
+        return schoolDist;
+    }
+
+    public void setSchoolDist(Double schoolDist) {
+        this.schoolDist = schoolDist;
+    }
+
+    public String getDifficultName() {
+        return difficultName;
+    }
+
+    public void setDifficultName(String difficultName) {
+        this.difficultName = difficultName;
+    }
+
+    public Double getLeagueRate() {
+        return leagueRate;
+    }
+
+    public void setLeagueRate(Double leagueRate) {
+        this.leagueRate = leagueRate;
+    }
+
+    public Double getLeagueAvg() {
+        return leagueAvg;
+    }
+
+    public void setLeagueAvg(Double leagueAvg) {
+        this.leagueAvg = leagueAvg;
+    }
+
+    public Double getLeagueDist() {
+        return leagueDist;
+    }
+
+    public void setLeagueDist(Double leagueDist) {
+        this.leagueDist = leagueDist;
+    }
+}
@@ -0,0 +1,25 @@
+package com.sincere.common.vo.independence.school;
+
+import com.sincere.common.vo.BaseVo;
+import io.swagger.annotations.ApiModel;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/22 0022 10:28
+ */
+@ApiModel
+public class Form5RepVO extends BaseVo {
+
+    private List<Form5> data ;
+
+    public List<Form5> getData() {
+        return data;
+    }
+
+    public void setData(List<Form5> data) {
+        this.data = data;
+    }
+}
@@ -0,0 +1,137 @@
+package com.sincere.common.vo.independence.school;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/21 0021 11:25
+ */
+@ApiModel
+public class Form6 implements Serializable {
+    @ApiModelProperty(value="维度名称")
+    private String dimensional ;
+    @ApiModelProperty(value="分值")
+    private Double score ;
+    @ApiModelProperty(value="得分率 区")
+    private Double allRate ;
+    @ApiModelProperty(value="得分率 联盟校")
+    private Double leagueRate ;
+    @ApiModelProperty(value="得分率 本校")
+    private Double schoolRate ;
+    @ApiModelProperty(value="平均分 区")
+    private Double allAvg ;
+    @ApiModelProperty(value="平均分 联盟校")
+    private Double leagueAvg ;
+    @ApiModelProperty(value="平均分 本校")
+    private Double schoolAvg ;
+    @ApiModelProperty(value="区分度 区")
+    private Double allDist ;
+    @ApiModelProperty(value="区分度 联盟校")
+    private Double leagueDist ;
+    @ApiModelProperty(value="区分度 本校")
+    private Double schoolDist ;
+
+
+    private String examNumber ;
+
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
+    public Double getAllRate() {
+        return allRate;
+    }
+
+    public void setAllRate(Double allRate) {
+        this.allRate = allRate;
+    }
+
+    public Double getSchoolRate() {
+        return schoolRate;
+    }
+
+    public void setSchoolRate(Double schoolRate) {
+        this.schoolRate = schoolRate;
+    }
+
+    public Double getAllAvg() {
+        return allAvg;
+    }
+
+    public void setAllAvg(Double allAvg) {
+        this.allAvg = allAvg;
+    }
+
+    public Double getSchoolAvg() {
+        return schoolAvg;
+    }
+
+    public void setSchoolAvg(Double schoolAvg) {
+        this.schoolAvg = schoolAvg;
+    }
+
+    public Double getAllDist() {
+        return allDist;
+    }
+
+    public void setAllDist(Double allDist) {
+        this.allDist = allDist;
+    }
+
+    public Double getSchoolDist() {
+        return schoolDist;
+    }
+
+    public void setSchoolDist(Double schoolDist) {
+        this.schoolDist = schoolDist;
+    }
+
+    public String getExamNumber() {
+        return examNumber;
+    }
+
+    public void setExamNumber(String examNumber) {
+        this.examNumber = examNumber;
+    }
+
+    public String getDimensional() {
+        return dimensional;
+    }
+
+    public void setDimensional(String dimensional) {
+        this.dimensional = dimensional;
+    }
+
+    public Double getLeagueRate() {
+        return leagueRate;
+    }
+
+    public void setLeagueRate(Double leagueRate) {
+        this.leagueRate = leagueRate;
+    }
+
+    public Double getLeagueAvg() {
+        return leagueAvg;
+    }
+
+    public void setLeagueAvg(Double leagueAvg) {
+        this.leagueAvg = leagueAvg;
+    }
+
+    public Double getLeagueDist() {
+        return leagueDist;
+    }
+
+    public void setLeagueDist(Double leagueDist) {
+        this.leagueDist = leagueDist;
+    }
+}
@@ -0,0 +1,25 @@
+package com.sincere.common.vo.independence.school;
+
+import com.sincere.common.vo.BaseVo;
+import io.swagger.annotations.ApiModel;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/22 0022 10:51
+ */
+@ApiModel
+public class Form6RepVO extends BaseVo {
+
+    private List<Form6> data ;
+
+    public List<Form6> getData() {
+        return data;
+    }
+
+    public void setData(List<Form6> data) {
+        this.data = data;
+    }
+}
@@ -0,0 +1,46 @@
+package com.sincere.common.vo.independence.school;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/21 0021 14:58
+ */
+@ApiModel
+public class Form7 implements Serializable {
+
+    @ApiModelProperty(value = "名称")
+    private String name ;
+    @ApiModelProperty(value = "分值")
+    private Double score ;
+    @ApiModelProperty(value = "占比")
+    private Double percent ;
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Double getPercent() {
+        return percent;
+    }
+
+    public void setPercent(Double percent) {
+        this.percent = percent;
+    }
+}
@@ -0,0 +1,88 @@
+package com.sincere.common.vo.independence.school;
+
+import com.sincere.common.dto.independence.ChapterDto;
+import com.sincere.common.vo.BaseVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/24 0024 9:20
+ */
+@ApiModel
+public class Form7RepVO extends BaseVo {
+
+    @ApiModelProperty(value = "举例七年级上册")
+    private String examScope ;
+    @ApiModelProperty(value = "科目")
+    private String courseName ;
+    @ApiModelProperty(value = "满分")
+    private Double maxScore ;
+    @ApiModelProperty(value = "考试时长")
+    private String examTime ;
+    @ApiModelProperty(value = "章节列表对应分值")
+    private List<ChapterDto> list ;
+    @ApiModelProperty(value = "难度列表对应分值")
+    private List<Form7> difficultList ;
+    @ApiModelProperty(value = "题型类型对应分值")
+    private List<Form7> typeList ;
+
+    public String getExamScope() {
+        return examScope;
+    }
+
+    public void setExamScope(String examScope) {
+        this.examScope = examScope;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public List<ChapterDto> getList() {
+        return list;
+    }
+
+    public void setList(List<ChapterDto> list) {
+        this.list = list;
+    }
+
+    public List<Form7> getDifficultList() {
+        return difficultList;
+    }
+
+    public void setDifficultList(List<Form7> difficultList) {
+        this.difficultList = difficultList;
+    }
+
+    public List<Form7> getTypeList() {
+        return typeList;
+    }
+
+    public void setTypeList(List<Form7> typeList) {
+        this.typeList = typeList;
+    }
+
+    public Double getMaxScore() {
+        return maxScore;
+    }
+
+    public void setMaxScore(Double maxScore) {
+        this.maxScore = maxScore;
+    }
+
+    public String getExamTime() {
+        return examTime;
+    }
+
+    public void setExamTime(String examTime) {
+        this.examTime = examTime;
+    }
+}
@@ -0,0 +1,66 @@
+package com.sincere.common.vo.independence.school;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/21 0021 15:14
+ */
+@ApiModel
+public class Form8 implements Serializable {
+
+    @ApiModelProperty(value="题目难度")
+    private String difficultName ;
+    @ApiModelProperty(value="分值")
+    private Double score ;
+    @ApiModelProperty(value="得分率 区")
+    private Double allRate ;
+    @ApiModelProperty(value="得分率 联盟校")
+    private Double leagueRate ;
+    @ApiModelProperty(value="得分率  本校")
+    private Double schoolRate ;
+
+    public String getDifficultName() {
+        return difficultName;
+    }
+
+    public void setDifficultName(String difficultName) {
+        this.difficultName = difficultName;
+    }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
+    public Double getAllRate() {
+        return allRate;
+    }
+
+    public void setAllRate(Double allRate) {
+        this.allRate = allRate;
+    }
+
+    public Double getSchoolRate() {
+        return schoolRate;
+    }
+
+    public void setSchoolRate(Double schoolRate) {
+        this.schoolRate = schoolRate;
+    }
+
+    public Double getLeagueRate() {
+        return leagueRate;
+    }
+
+    public void setLeagueRate(Double leagueRate) {
+        this.leagueRate = leagueRate;
+    }
+}
@@ -0,0 +1,25 @@
+package com.sincere.common.vo.independence.school;
+
+import com.sincere.common.vo.BaseVo;
+import io.swagger.annotations.ApiModel;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/22 0022 10:47
+ */
+@ApiModel
+public class Form8RepVO extends BaseVo {
+
+    private List<Form8> data ;
+
+    public List<Form8> getData() {
+        return data;
+    }
+
+    public void setData(List<Form8> data) {
+        this.data = data;
+    }
+}
@@ -0,0 +1,135 @@
+package com.sincere.common.vo.independence.school;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/23 0023 9:04
+ */
+@ApiModel
+public class SuggestRepVo {
+    @ApiModelProperty(value = "总体情况")
+    private String assess ;
+    @ApiModelProperty(value = "难度系数")
+    private String difficultyDegree ;
+    @ApiModelProperty(value = "优秀率")
+    private String excellentRate ;
+    @ApiModelProperty(value = "知识点得分率不到50%的")
+    private List<String> lessKnowledgeList ;
+    @ApiModelProperty(value = "知识点得分率不到70%")
+    private List<String> midKnowledgeList ;
+    @ApiModelProperty(value = "学习能力得分率＜69%")
+    private List<String> lessAbilityList ;
+    @ApiModelProperty(value = "学习能力得分率在70%≤η＜80%")
+    private List<String> midAbilityList ;
+    @ApiModelProperty(value = "学习能力得分率≥80%")
+    private List<String> highAbilityList ;
+    @ApiModelProperty(value = "探究技能方面得分率＜69%")
+    private List<String> lessSkillList ;
+    @ApiModelProperty(value = "探究技能方面得分率在70%≤η＜80%")
+    private List<String> midSkillList ;
+    @ApiModelProperty(value = "探究技能方面得分率≥80%")
+    private List<String> highSkillList ;
+    @ApiModelProperty(value = "选择题错误率>15%")
+    private List<String> errorList ;
+
+    public List<String> getErrorList() {
+        return errorList;
+    }
+
+    public void setErrorList(List<String> errorList) {
+        this.errorList = errorList;
+    }
+
+    public String getAssess() {
+        return assess;
+    }
+
+    public void setAssess(String assess) {
+        this.assess = assess;
+    }
+
+    public String getDifficultyDegree() {
+        return difficultyDegree;
+    }
+
+    public void setDifficultyDegree(String difficultyDegree) {
+        this.difficultyDegree = difficultyDegree;
+    }
+
+    public String getExcellentRate() {
+        return excellentRate;
+    }
+
+    public void setExcellentRate(String excellentRate) {
+        this.excellentRate = excellentRate;
+    }
+
+    public List<String> getLessKnowledgeList() {
+        return lessKnowledgeList;
+    }
+
+    public void setLessKnowledgeList(List<String> lessKnowledgeList) {
+        this.lessKnowledgeList = lessKnowledgeList;
+    }
+
+    public List<String> getMidKnowledgeList() {
+        return midKnowledgeList;
+    }
+
+    public void setMidKnowledgeList(List<String> midKnowledgeList) {
+        this.midKnowledgeList = midKnowledgeList;
+    }
+
+    public List<String> getLessAbilityList() {
+        return lessAbilityList;
+    }
+
+    public void setLessAbilityList(List<String> lessAbilityList) {
+        this.lessAbilityList = lessAbilityList;
+    }
+
+    public List<String> getMidAbilityList() {
+        return midAbilityList;
+    }
+
+    public void setMidAbilityList(List<String> midAbilityList) {
+        this.midAbilityList = midAbilityList;
+    }
+
+    public List<String> getHighAbilityList() {
+        return highAbilityList;
+    }
+
+    public void setHighAbilityList(List<String> highAbilityList) {
+        this.highAbilityList = highAbilityList;
+    }
+
+    public List<String> getLessSkillList() {
+        return lessSkillList;
+    }
+
+    public void setLessSkillList(List<String> lessSkillList) {
+        this.lessSkillList = lessSkillList;
+    }
+
+    public List<String> getMidSkillList() {
+        return midSkillList;
+    }
+
+    public void setMidSkillList(List<String> midSkillList) {
+        this.midSkillList = midSkillList;
+    }
+
+    public List<String> getHighSkillList() {
+        return highSkillList;
+    }
+
+    public void setHighSkillList(List<String> highSkillList) {
+        this.highSkillList = highSkillList;
+    }
+}
@@ -0,0 +1,35 @@
+package com.sincere.common.vo.independence.school;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/21 0021 8:34
+ */
+@ApiModel
+public class Table1 implements Serializable {
+    @ApiModelProperty(value="分数段")
+    private String score ;
+    @ApiModelProperty(value="人数")
+    private int number ;
+
+    public String getScore() {
+        return score;
+    }
+
+    public void setScore(String score) {
+        this.score = score;
+    }
+
+    public int getNumber() {
+        return number;
+    }
+
+    public void setNumber(int number) {
+        this.number = number;
+    }
+}
@@ -0,0 +1,55 @@
+package com.sincere.common.vo.independence.school;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/5 0005 8:27
+ */
+@ApiModel
+public class Table2 implements Serializable {
+    @ApiModelProperty(value = "知识点")
+    private String knowledge ;
+    @ApiModelProperty(value = "得分率")
+    private Double schoolRate ;
+    @ApiModelProperty(value = "考频")
+    private String rate ;
+    @ApiModelProperty(value = "平均分")
+    private String avg ;
+
+    public String getKnowledge() {
+        return knowledge;
+    }
+
+    public void setKnowledge(String knowledge) {
+        this.knowledge = knowledge;
+    }
+
+    public Double getSchoolRate() {
+        return schoolRate;
+    }
+
+    public void setSchoolRate(Double schoolRate) {
+        this.schoolRate = schoolRate;
+    }
+
+    public String getRate() {
+        return rate;
+    }
+
+    public void setRate(String rate) {
+        this.rate = rate;
+    }
+
+    public String getAvg() {
+        return avg;
+    }
+
+    public void setAvg(String avg) {
+        this.avg = avg;
+    }
+}
@@ -0,0 +1,23 @@
+package com.sincere.common.vo.independence.school;
+
+import com.sincere.common.vo.BaseVo;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/5 0005 8:39
+ */
+public class Table2RepVO extends BaseVo {
+
+    private List<Table2> data ;
+
+    public List<Table2> getData() {
+        return data;
+    }
+
+    public void setData(List<Table2> data) {
+        this.data = data;
+    }
+}
@@ -0,0 +1,4 @@
+#redis
+redis.host=121.40.109.21
+redis.port=6379
+redis.password=123456
 \ No newline at end of file
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>cloud</artifactId>
+        <groupId>com.sincere</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>independence</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.sincere</groupId>
+            <artifactId>common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.rapid-framework</groupId>
+            <artifactId>rapid-core</artifactId>
+            <version>4.0.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-feign</artifactId>
+            <version>1.3.6.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-openfeign-core</artifactId>
+            <version>2.1.2.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.5.0</version>
+        </dependency>
+        <!--只有slf4j-api依赖-->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.13</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/commons-net/commons-net -->
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+            <version>2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>4.1.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>4.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.6.5</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.6.5</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.6.5</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <!--打包文件名-->
+        <finalName>independence</finalName>
+        <!--打包方式-->
+        <plugins>
+            <!-- 设置编译版本 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+            <!-- 打包jar文件时，配置manifest文件，加入lib包的jar依赖 -->
+            <!-- 本地启动需要注释-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>com.jevon.Application</mainClass>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                        </manifest>
+                        <manifestEntries>
+                            <Class-Path>./config/</Class-Path>
+                        </manifestEntries>
+                    </archive>
+                    <excludes>
+                        <exclude>config/**</exclude>
+                    </excludes>
+                    <classesDirectory></classesDirectory>
+                </configuration>
+            </plugin>
+            <!-- 拷贝依赖的jar包到lib目录 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>
+                                ${project.build.directory}/lib
+                            </outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- 解决资源文件的编码问题 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.5</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+            <!-- 打包source文件为jar文件 -->
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <attach>true</attach>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
 \ No newline at end of file
@@ -0,0 +1,18 @@
+package com.sincere.independence;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+@EnableFeignClients(basePackages = "com.sincere.independence.feign")
+@EnableEurekaClient
+@SpringBootApplication
+public class IndependenceApplication {
+
+
+    public static void main(String[] args) {
+        SpringApplication.run(IndependenceApplication.class, args);
+    }
+
+}
@@ -0,0 +1,38 @@
+package com.sincere.independence;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@EnableSwagger2
+@Configuration      //让Spring来加载该类配置
+public class Swagger2 {
+
+    @Bean
+   public Docket createRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(apiInfo())
+                .enableUrlTemplating(true)
+                .select()
+                // 扫描所有有注解的api，用这种方式更灵活
+                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+                .paths(PathSelectors.any())
+                .build();
+
+    }
+     private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+               .title("Spring Boot中使用Swagger2构建RESTful APIs")
+                 .description("接口文档")
+                 .termsOfServiceUrl("")
+                .version("1.0")
+              .build();
+     }
+}
@@ -0,0 +1,444 @@
+package com.sincere.independence.controller;
+
+import com.sincere.common.dto.independence.*;
+import com.sincere.common.enums.DifficultEnums;
+import com.sincere.common.enums.DimensionalEnums;
+import com.sincere.common.util.RedisUtils;
+import com.sincere.common.vo.BaseVo;
+import com.sincere.independence.feign.LearnFeign;
+import com.sincere.independence.vo.*;
+import com.sincere.independence.vo.excel.ExamExcelVo;
+import com.sincere.independence.vo.excel.ScoreExcelVo;
+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.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.*;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/17 0017 13:33
+ */
+@RestController
+@RequestMapping(value = "/learn")
+@Api(value = "学情分析")
+public class LearnController {
+
+    @Autowired
+    LearnFeign learnFeign ;
+
+    @ApiOperation("获取列表")
+    @RequestMapping(value = "getList", method = RequestMethod.POST)
+    public List<AnalyseDto> getList(){
+        return  learnFeign.getList(new AnalyseDto());
+    }
+
+    @ApiOperation("获取详情,微信入口")
+    @RequestMapping(value = "getDetail", method = RequestMethod.GET)
+    public List<AnalyseDto> getAnalyseId(String grade , String schoolName){
+        List<AnalyseDto> result = new ArrayList<>();
+        AnalyseDto search = new AnalyseDto();
+        String[] msg = grade.split(",");
+        for(String gradeMsg : msg){
+            search.setGrade(initGrade(gradeMsg,schoolName));
+            List<AnalyseDto> analyseList = learnFeign.getList(search);
+            if(analyseList != null && analyseList.size() > 0){
+                for(AnalyseDto analyse :analyseList){
+                    List<LeagueDto> leagues = learnFeign.getLeagueByAnalyse(analyse.getId());
+                    for(LeagueDto league : leagues){
+                        if(league.getSchoolName() != null && league.getSchoolName().equals(schoolName)){
+                            result.add(analyse);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        if(result.size() == 0){
+            AnalyseDto searchAnalyse = new AnalyseDto();
+            searchAnalyse.setExamName("顺治中学模拟考试");
+            List<AnalyseDto> analyseList = learnFeign.getList(searchAnalyse);
+            if(analyseList != null && analyseList.size() > 0){
+                result.add(analyseList.get(0));
+            }
+        }
+        return  result ;
+    }
+
+    private String initGrade(String grade , String schoolName){
+        String result = null ;
+        if(schoolName.equals("绍兴市越城区皋埠中学")){
+            if(grade.equals("2019级初中一年级")){
+                result = "七年级" ;
+            }
+            if(grade.equals("2017级初中三年级")){
+                result = "九年级" ;
+            }
+        }
+        if(schoolName.equals("绍兴市建功中学")){
+            if(grade.equals("2019级初中一年级")){
+                result = "七年级" ;
+            }
+            if(grade.equals("2017级初中三年级")){
+                result = "九年级" ;
+            }
+        }
+        if(schoolName.equals("绍兴长城中学")){
+            if(grade.equals("2019级初中一年级")){
+                result = "七年级" ;
+            }
+            if(grade.equals("2017级初中三年级")){
+                result = "九年级" ;
+            }
+        }
+        if(schoolName.equals("绍兴市文澜中学")){
+            if(grade.equals("2019级初中一年级")){
+                result = "七年级" ;
+            }
+            if(grade.equals("2017级初中三年级")){
+                result = "九年级" ;
+            }
+        }
+        if(schoolName.equals("绍兴文理学院附属中学（慧）")){
+            if(grade.equals("2019级初中一年级")){
+                result = "七年级" ;
+            }
+            if(grade.equals("2017级初中三年级")){
+                result = "九年级" ;
+            }
+        }
+        if(result == null){
+            result = grade ;
+        }
+        return result ;
+    }
+
+    @ApiOperation("创建考试")
+    @RequestMapping(value = "createExam", method = RequestMethod.POST)
+    public BaseVo createExam(@RequestBody CreateExamReqVo createExamReqVo){
+        AnalyseDto analyse = new AnalyseDto();
+        analyse.setCourseName(createExamReqVo.getCourseName());
+        analyse.setExamName(createExamReqVo.getExamName());
+        analyse.setExamTime(createExamReqVo.getExamTime());
+        analyse.setCreateTime(new Date());
+        analyse.setGrade(createExamReqVo.getGrade());
+        return learnFeign.insertAnalyse(analyse);
+    }
+
+    @ApiOperation("更新考试信息")
+    @RequestMapping(value = "updateExam", method = RequestMethod.POST)
+    public BaseVo updateExam(@RequestBody UpdateExamReqVo updateExamReqVo){
+        BaseVo baseVo = new BaseVo();
+        AnalyseDto analyse = learnFeign.selectById(updateExamReqVo.getAnalyseId());
+        if(analyse == null){
+            baseVo.setMessage("考试不存在");
+            baseVo.setSuccess(false);
+            return baseVo;
+        }
+        analyse.setExamTime(updateExamReqVo.getExamTime());
+        analyse.setExamName(updateExamReqVo.getExamName());
+        analyse.setCourseName(updateExamReqVo.getCourseName());
+        analyse.setGrade(updateExamReqVo.getGrade());
+        return learnFeign.updateAnalyse(analyse);
+    }
+
+    @ApiOperation("试卷信息导入")
+    @RequestMapping(value = "initAnalyse", method = RequestMethod.POST)
+    public BaseVo initAnalyse(@RequestBody InitAnalyseReqVo initAnalyseReqVo){
+        BaseVo baseVo = new BaseVo();
+        AnalyseDto analyse = learnFeign.selectById(initAnalyseReqVo.getAnalyseId());
+        List<AnalyseDetailDto> analyseDetails = learnFeign.isImportExam(analyse.getId());
+        if(analyseDetails != null & analyseDetails.size() > 0){
+            baseVo.setMessage("已经导入");
+            baseVo.setSuccess(false);
+        }else {
+            RedisUtils.flushAll();
+            analysisExcel(initAnalyseReqVo);
+        }
+        return baseVo;
+    }
+
+    private void analysisExcel(InitAnalyseReqVo initAnalyseReqVo){
+        try{
+            List<AnalyseDetailDto> analyseDetails = new ArrayList<>();
+            List<AnalyseDimensionalDto> analyseDimensionals = new ArrayList<>();
+            Float maxScore = 0f;
+            AnalyseDto analyse = learnFeign.selectById(initAnalyseReqVo.getAnalyseId());
+            File excelFile = new File(initAnalyseReqVo.getUrl());
+            // 获得工作簿
+            String file = excelFile.getName();
+            Workbook workbook = null;
+            InputStream inputStream = new FileInputStream(excelFile) ;
+            //InputStream inputStream = HttpClientUtils.GetFileInputStream(initAnalyseReqVo.getUrl());
+            if(inputStream == null){
+                return;
+            }
+            if (file.endsWith("xls")) {
+                workbook = new HSSFWorkbook(inputStream);
+            } else {
+                workbook = new XSSFWorkbook(inputStream);
+            }
+            // 获得工作表
+            Sheet sheet = workbook.getSheetAt(0);
+            Date date = new Date();
+            int rows = sheet.getPhysicalNumberOfRows();
+            for (int i = 0; i < rows; i++) {
+                // 获取第i行数据
+                Row sheetRow = sheet.getRow(i);
+                if (i == 0) {
+                    //获取标题
+                    String title = sheetRow.getCell(0).getStringCellValue().trim();
+                }else if(i == 1){
+                    //获取表头
+                } else {
+                    ExamExcelVo examExcelVo = new ExamExcelVo(sheetRow);
+                    if(examExcelVo.getScore() != null){
+                        maxScore = maxScore + new Float(examExcelVo.getScore());
+                        AnalyseDetailDto analyseDetail = new AnalyseDetailDto();
+                        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 Double(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);
+                    }
+                }
+            }
+            learnFeign.insertBatchAnalyseDetail(analyseDetails);
+            learnFeign.insertBatchAnalyseDimensional(analyseDimensionals);
+            analyse.setMaxScore(new Double(maxScore));
+            learnFeign.updateAnalyse(analyse);
+        }catch (Exception e){
+           e.printStackTrace();
+        }
+    }
+
+    private void initAnalyseDimensional(AnalyseDto analyse ,String questionNumber , String score , String dimensionalMessage , int dimensionalType , List<AnalyseDimensionalDto> analyseDimensionals){
+        if(StringUtils.isNotBlank(dimensionalMessage)){
+            String[] message =dimensionalMessage.split("、");
+            for (int j = 0; j < message.length ; j++) {
+                if(StringUtils.isNotBlank(message[j])){
+                    //查数据库是否已存在该四维诊断  不存在则导入
+                    int dimensionalId = learnFeign.selectDimensional(dimensionalType,message[j]);
+                    AnalyseDimensionalDto analyseDimensional = new AnalyseDimensionalDto();
+                    analyseDimensional.setAnalyseId(analyse.getId());
+                    analyseDimensional.setDimensionalId(dimensionalId);
+                    analyseDimensional.setQuestionNumber(questionNumber);
+                    analyseDimensional.setScore(new Double(score));
+                    analyseDimensional.setCreateTime(new Date());
+                    analyseDimensionals.add(analyseDimensional);
+                }
+            }
+        }
+    }
+
+    @ApiOperation("考生成绩导入")
+    @RequestMapping(value = "initScore", method = RequestMethod.POST)
+    public BaseVo initScore(@RequestBody InitScoreReqVo initScoreReqVo){
+        BaseVo baseVo = new BaseVo();
+        boolean success = analysisScoreExcel(initScoreReqVo);
+        if(!success){
+            baseVo.setSuccess(false);
+            baseVo.setMessage("一个学校不能在两个联盟下");
+        }
+        return baseVo;
+    }
+
+    private boolean analysisScoreExcel(InitScoreReqVo initScoreReqVo){
+        try{
+            AnalyseDto analyse = learnFeign.selectById(initScoreReqVo.getAnalyseId());
+            List<AnalyseDetailDto> analyseDetails = learnFeign.isImportExam(analyse.getId());
+            Map<String , Double> scoreMap = new HashMap<>();
+            for(AnalyseDetailDto analyseDetail : analyseDetails){
+                scoreMap.put(analyseDetail.getQuestionNumber(),analyseDetail.getScore());
+            }
+            File excelFile = new File(initScoreReqVo.getUrl());
+            // 获得工作簿
+            String file = excelFile.getName();
+            Workbook workbook = null;
+            InputStream inputStream = new FileInputStream(excelFile) ;
+            //InputStream inputStream = HttpClientUtils.GetFileInputStream(initScoreReqVo.getUrl());
+            if(inputStream == null){
+                return false ;
+            }
+            if (file.endsWith("xls")) {
+                workbook = new HSSFWorkbook(inputStream);
+            } else {
+                workbook = new XSSFWorkbook(inputStream);
+            }
+            // 获得工作表
+            for(int number = 0 ; number < workbook.getNumberOfSheets() ; number++){
+                Sheet sheet = workbook.getSheetAt(number);
+                List<StudentDetailDto> studentDetails = new ArrayList<>();
+                List<StudentDto> students = new ArrayList<>();
+                Date date = new Date();
+                int rows = sheet.getPhysicalNumberOfRows();
+                Map<Integer , String> map = new HashMap<>();
+                int column = 0 ;
+                for (int i = 0; i < rows; i++) {
+                    // 获取第i行数据
+                    Row sheetRow = sheet.getRow(i);
+                    if (i == 0) {
+                        //获取标题
+                    }else if(i == 1){
+                        //获取表头
+                        int j = 7 ;
+                        while (sheetRow.getCell(j) != null){
+                            Cell cell = sheetRow.getCell(j);
+                            cell.setCellType(CellType.STRING);
+                            map.put(j,cell.getStringCellValue().trim().replace("（","(").replace("）",")"));
+                            j++;
+                        }
+                        column = j ;
+                    } else {
+                        ScoreExcelVo scoreExcelVo = new ScoreExcelVo(sheetRow);
+                       if(StringUtils.isNotBlank(scoreExcelVo.getStudentName())){
+                           StudentDto student = initStudent(scoreExcelVo);
+                           student.setAnalyseId(analyse.getId());
+                           student.setCreateTime(date);
+                           students.add(student);
+                           for(int j = 7 ; j < column ; j++){
+                               Cell cell = sheetRow.getCell(j);
+                               StudentDetailDto studentDetail = initStudentDetail(scoreExcelVo);
+                               studentDetail.setAnalyseId(analyse.getId());
+                               studentDetail.setExamNumber(map.get(j));
+                               studentDetail.setScore(new Double(cell.getNumericCellValue()));
+                               Double score = scoreMap.get((map.get(j))) ;
+                               Double studentScore = studentDetail.getScore() ;
+                               if(Double.doubleToLongBits(score) == Double.doubleToLongBits(studentScore) ){
+                                   studentDetail.setCorrect(1);
+                               }else {
+                                   studentDetail.setCorrect(0);
+                               }
+                               studentDetail.setCreateTime(date);
+                               studentDetails.add(studentDetail);
+                           }
+                       }
+                    }
+                }
+                boolean flag = learnFeign.initLeagueSchool(initScoreReqVo.getLeagueId(),students.get(0).getSchoolName());
+                if(flag){
+                    learnFeign.insertBatchStudent(students);
+                    learnFeign.insertBatchStudentDetail(studentDetails);
+                    return true ;
+                }else {
+                    return  false ;
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            System.out.println(e.toString());
+        }
+        return false ;
+    }
+
+    private StudentDto initStudent(ScoreExcelVo scoreExcelVo){
+        StudentDto studentDto = new StudentDto();
+        studentDto.setSchoolName(scoreExcelVo.getSchoolName());
+        studentDto.setClassName(scoreExcelVo.getClassName());
+        studentDto.setStudentName(scoreExcelVo.getStudentName());
+        studentDto.setStudentNumber(scoreExcelVo.getStudentNumber());
+        studentDto.setScore(new Double(scoreExcelVo.getScore()));
+        return  studentDto;
+    }
+
+    private StudentDetailDto initStudentDetail(ScoreExcelVo scoreExcelVo){
+        StudentDetailDto studentDetailDto = new StudentDetailDto();
+        studentDetailDto.setSchoolName(scoreExcelVo.getSchoolName());
+        studentDetailDto.setClassName(scoreExcelVo.getClassName());
+        studentDetailDto.setStudentName(scoreExcelVo.getStudentName());
+        studentDetailDto.setStudentNumber(scoreExcelVo.getStudentNumber());
+        return studentDetailDto ;
+    }
+
+    @ApiOperation("获取该次考试联盟学校信息")
+    @RequestMapping(value = "getLeague", method = RequestMethod.GET)
+    public GetLeagueRepVo getLeague(int analyseId){
+        GetLeagueRepVo getLeagueRepVo = new GetLeagueRepVo();
+        List<LeagueDto> leagues = learnFeign.getLeagueByAnalyse(analyseId);
+        List<GetLeague> getLeagues = new ArrayList<>();
+        for(LeagueDto league : leagues){
+            boolean isExist = false ;
+            for(GetLeague getLeague : getLeagues){
+                if(getLeague.getLeagueName().equals(league.getLeague())){
+                    isExist = true ;
+                    List<LeagueDto> list = getLeague.getLeagues();
+                    list.add(league);
+                    getLeague.setLeagues(list);
+                }
+            }
+            if(!isExist){
+                GetLeague getLeague = new GetLeague();
+                getLeague.setLeagueName(league.getLeague());
+                List<LeagueDto> list = new ArrayList<>();
+                list.add(league);
+                getLeague.setLeagues(list);
+                getLeagues.add(getLeague);
+            }
+        }
+        getLeagueRepVo.setData(getLeagues);
+        return getLeagueRepVo;
+    }
+
+    @ApiOperation("创建联盟")
+    @RequestMapping(value = "createLeague", method = RequestMethod.POST)
+    public BaseVo createLeague(@RequestBody CreateLeagueReqVo createLeagueReqVo){
+        BaseVo baseVo = new BaseVo();
+        LeagueDto league = new LeagueDto();
+        AnalyseDto analyse = learnFeign.selectById(createLeagueReqVo.getAnalyseId());
+        league.setAnalyseId(analyse.getId());
+        league.setLeague(createLeagueReqVo.getLeague());
+        int id = learnFeign.insertLeague(league);
+        baseVo.setMessage(id +"");
+        return baseVo;
+    }
+
+    @ApiOperation("基础信息输入")
+    @RequestMapping(value = "createChapter", method = RequestMethod.POST)
+    public BaseVo createChapter(@RequestBody ChapterReqVo chapterReqVo){
+        BaseVo baseVo = new BaseVo();
+        AnalyseDto analyseDto = new AnalyseDto();
+        analyseDto.setId(chapterReqVo.getAnalyseId());
+        analyseDto.setExamTime(chapterReqVo.getExamTime());
+        analyseDto.setExamScope(chapterReqVo.getExamScope());
+        learnFeign.updateAnalyse(analyseDto);
+        List<ChapterDto> list = new ArrayList<>();
+        for(ChapterReq chapterReq :chapterReqVo.getList()){
+            ChapterDto chapter = new ChapterDto();
+            chapter.setAnalyseId(chapterReqVo.getAnalyseId());
+            chapter.setChapterNumber(chapterReq.getChapterNumber());
+            chapter.setChapterName(chapterReq.getChapterName());
+            chapter.setChapterScore(chapterReq.getScore());
+            list.add(chapter);
+        }
+        learnFeign.initChapter(list);
+        return baseVo;
+    }
+
+    @ApiOperation("获取导入的学校列表")
+    @RequestMapping(value = "getSchoolName", method = RequestMethod.GET)
+    public List<String> getSchoolName(int analyseId){
+        return learnFeign.getSchoolName(analyseId);
+    }
+}
@@ -0,0 +1,132 @@
+package com.sincere.independence.controller;
+
+import com.sincere.common.dto.independence.GetLearnDto;
+import com.sincere.common.vo.independence.school.*;
+import com.sincere.independence.feign.LearnFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.util.List;
+import java.util.Map;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 15:54
+ */
+@RestController
+@RequestMapping(value = "/getLearn")
+@Api(value = "学情分析")
+public class LearnStatController {
+    @Autowired
+    LearnFeign learnFeign ;
+
+
+    @ApiOperation("getForm1_1")
+    @RequestMapping(value = "getForm1_1", method = RequestMethod.POST)
+    public Form7RepVO getForm1_1(@RequestBody GetLearnDto getLearnDto){
+        return learnFeign.getForm1_1(getLearnDto);
+    }
+
+    @ApiOperation("getForm2_1_1")
+    @RequestMapping(value = "getForm2_1_1", method = RequestMethod.POST)
+    public Form1RepVO getForm2_1_1(@RequestBody GetLearnDto getLearnDto){
+        return learnFeign.getForm2_1_1(getLearnDto);
+    }
+
+    @ApiOperation("getForm2_1_2")
+    @RequestMapping(value = "getForm2_1_2", method = RequestMethod.POST)
+    public Form2RepVO getForm2_1_2(@RequestBody GetLearnDto getLearnDto){
+        return learnFeign.getForm2_1_2(getLearnDto);
+    }
+
+    @ApiOperation("getForm2_1_3_2")
+    @RequestMapping(value = "getForm2_1_3_2", method = RequestMethod.POST)
+    public Form2RepVO getForm2_1_3_2(@RequestBody GetLearnDto getLearnDto){
+        return learnFeign.getForm2_1_3_2(getLearnDto);
+    }
+
+    @ApiOperation("getForm2_1_3")
+    @RequestMapping(value = "getForm2_1_3", method = RequestMethod.POST)
+    public List<Table1> getForm2_1_3(@RequestBody GetLearnDto getLearnDto){
+        return learnFeign.getForm2_1_3(getLearnDto);
+    }
+
+    @ApiOperation("getForm2_2_1")
+    @RequestMapping(value = "getForm2_2_1", method = RequestMethod.POST)
+    public Form3RepVO getForm2_2_1(@RequestBody GetLearnDto getLearnDto){
+       return learnFeign.getForm2_2_1(getLearnDto);
+    }
+
+    @ApiOperation("getForm2_2_2")
+    @RequestMapping(value = "getForm2_2_2", method = RequestMethod.POST)
+    public Form4RepVO getForm2_2_2(@RequestBody GetLearnDto getLearnDto){
+        return learnFeign.getForm2_2_2(getLearnDto);
+    }
+
+    @ApiOperation("getForm2_2_3")
+    @RequestMapping(value = "getForm2_2_3", method = RequestMethod.POST)
+    public Form5RepVO getForm2_2_3(@RequestBody GetLearnDto getLearnDto){
+        return learnFeign.getForm2_2_3(getLearnDto);
+    }
+
+    @ApiOperation("getForm2_2_4")
+    @RequestMapping(value = "getForm2_2_4", method = RequestMethod.POST)
+    public Form8RepVO getForm2_2_4(@RequestBody GetLearnDto getLearnDto){
+        return learnFeign.getForm2_2_4(getLearnDto);
+    }
+
+    @ApiOperation("getForm2_2_5")
+    @RequestMapping(value = "getForm2_2_5", method = RequestMethod.POST)
+    public Map<String,Double> getForm2_2_5(@RequestBody GetLearnDto getLearnDto){
+        return learnFeign.getForm2_2_5(getLearnDto);
+    }
+
+    @ApiOperation("getForm3_1")
+    @RequestMapping(value = "getForm3_1", method = RequestMethod.POST)
+    public Form6RepVO getForm3_1(@RequestBody GetLearnDto getLearnDto){
+        return learnFeign.getForm3_1(getLearnDto);
+    }
+
+    @ApiOperation("getForm3_1_1")
+    @RequestMapping(value = "getForm3_1_1", method = RequestMethod.POST)
+    public Table2RepVO getForm3_1_1(@RequestBody GetLearnDto getLearnDto){
+        return learnFeign.getForm3_1_1(getLearnDto);
+    }
+
+    @ApiOperation("getForm3_2")
+    @RequestMapping(value = "getForm3_2", method = RequestMethod.POST)
+    public Form6RepVO getForm3_2(@RequestBody GetLearnDto getLearnDto){
+        return learnFeign.getForm3_2(getLearnDto);
+    }
+
+    @ApiOperation("getForm3_3")
+    @RequestMapping(value = "getForm3_3", method = RequestMethod.POST)
+    public Form6RepVO getForm3_3(@RequestBody GetLearnDto getLearnDto){
+        return learnFeign.getForm3_3(getLearnDto);
+    }
+
+    @ApiOperation("getForm3_4")
+    @RequestMapping(value = "getForm3_4", method = RequestMethod.POST)
+    public Form6RepVO getForm3_4(@RequestBody GetLearnDto getLearnDto){
+        return learnFeign.getForm3_4(getLearnDto);
+    }
+
+    @ApiOperation("获取教学改进建议")
+    @RequestMapping(value = "getSuggest", method = RequestMethod.POST)
+    public String getSuggest(@RequestBody GetLearnDto getLearnDto){
+        return learnFeign.getSuggest(getLearnDto);
+    }
+
+    @ApiOperation("获取教学改进建议")
+    @RequestMapping(value = "getSuggest2", method = RequestMethod.POST)
+    public String getSuggest2(@RequestBody GetLearnDto getLearnDto){
+       return learnFeign.getSuggest2(getLearnDto);
+    }
+
+}
@@ -0,0 +1,121 @@
+package com.sincere.independence.feign;
+
+import com.sincere.common.dto.independence.*;
+import com.sincere.common.vo.BaseVo;
+import com.sincere.common.vo.independence.school.*;
+import org.springframework.cloud.openfeign.FeignClient;
+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.RequestParam;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/13 0013 11:32
+ */
+@FeignClient("independenceSearch")
+public interface LearnFeign {
+
+    @RequestMapping(value = "/learn/init/getList", method = RequestMethod.POST)
+    List<AnalyseDto> getList(@RequestBody AnalyseDto analyseDto);
+
+    @RequestMapping(value = "/learn/init/insertAnalyse", method = RequestMethod.POST)
+    BaseVo insertAnalyse(@RequestBody AnalyseDto analyseDto);
+
+    @RequestMapping(value = "/learn/init/updateAnalyse", method = RequestMethod.POST)
+    BaseVo updateAnalyse(@RequestBody AnalyseDto analyseDto);
+
+    @RequestMapping(value = "/learn/init/selectById", method = RequestMethod.GET)
+    AnalyseDto selectById(@RequestParam("analyseId") int analyseId) ;
+
+    @RequestMapping(value = "/learn/init/getLeagueByAnalyse", method = RequestMethod.GET)
+    List<LeagueDto> getLeagueByAnalyse(@RequestParam("analyseId") int analyseId);
+
+    @RequestMapping(value = "/learn/init/isImportExam", method = RequestMethod.GET)
+    List<AnalyseDetailDto> isImportExam(@RequestParam("analyseId") int analyseId);
+
+    @RequestMapping(value = "/learn/init/insertBatchAnalyseDetail", method = RequestMethod.POST)
+    boolean insertBatchAnalyseDetail(@RequestBody List<AnalyseDetailDto> analyseDetailDtos);
+
+    @RequestMapping(value = "/learn/init/insertBatchAnalyseDimensional", method = RequestMethod.POST)
+    boolean insertBatchAnalyseDimensional(@RequestBody List<AnalyseDimensionalDto> analyseDimensionalDtos);
+
+    //查数据库是否已存在该四维诊断  不存在则导入 返回主键
+    @RequestMapping(value = "/learn/init/selectDimensional", method = RequestMethod.GET)
+    int selectDimensional(@RequestParam("type") int type, @RequestParam("name") String name);
+
+    @RequestMapping(value = "/learn/init/insertBatchStudent", method = RequestMethod.POST)
+    boolean insertBatchStudent(@RequestBody List<StudentDto> studentDtos);
+
+    @RequestMapping(value = "/learn/init/insertBatchStudentDetail", method = RequestMethod.POST)
+    boolean insertBatchStudentDetail(@RequestBody List<StudentDetailDto> studentDetailDtos);
+
+    @RequestMapping(value = "/learn/init/initLeagueSchool", method = RequestMethod.GET)
+    boolean initLeagueSchool(@RequestParam("leagueId")int leagueId , @RequestParam("schoolName")String schoolName);
+
+    @RequestMapping(value = "/learn/init/insertLeague", method = RequestMethod.POST)
+    int insertLeague(@RequestBody LeagueDto leagueDto);
+
+    @RequestMapping(value = "/learn/init/getSchoolName", method = RequestMethod.GET)
+    List<String> getSchoolName(@RequestParam("analyseId")int analyseId);
+
+    @RequestMapping(value = "/learn/init/initChapter", method = RequestMethod.POST)
+    boolean initChapter(@RequestBody List<ChapterDto> chapterDtos);
+
+
+
+    @RequestMapping(value = "learn/getLearn/getForm1_1", method = RequestMethod.POST)
+    Form7RepVO getForm1_1(@RequestBody GetLearnDto getLearnDto);
+
+    @RequestMapping(value = "learn/getLearn/getForm2_1_1", method = RequestMethod.POST)
+    Form1RepVO getForm2_1_1(@RequestBody GetLearnDto getLearnDto);
+
+    @RequestMapping(value = "learn/getLearn/getForm2_1_2", method = RequestMethod.POST)
+    Form2RepVO getForm2_1_2(@RequestBody GetLearnDto GetLearnDto);
+
+    @RequestMapping(value = "learn/getLearn/getForm2_1_3_2", method = RequestMethod.POST)
+    Form2RepVO getForm2_1_3_2(@RequestBody GetLearnDto GetLearnDto);
+
+    @RequestMapping(value = "learn/getLearn/getForm2_1_3", method = RequestMethod.POST)
+    List<Table1> getForm2_1_3(@RequestBody GetLearnDto GetLearnDto);
+
+    @RequestMapping(value = "learn/getLearn/getForm2_2_1", method = RequestMethod.POST)
+    Form3RepVO getForm2_2_1(@RequestBody GetLearnDto GetLearnDto);
+
+    @RequestMapping(value = "learn/getLearn/getForm2_2_2", method = RequestMethod.POST)
+    public Form4RepVO getForm2_2_2(@RequestBody GetLearnDto GetLearnDto);
+
+    @RequestMapping(value = "learn/getLearn/getForm2_2_3", method = RequestMethod.POST)
+    Form5RepVO getForm2_2_3(@RequestBody GetLearnDto GetLearnDto);
+
+    @RequestMapping(value = "learn/getLearn/getForm2_2_4", method = RequestMethod.POST)
+    Form8RepVO getForm2_2_4(@RequestBody GetLearnDto GetLearnDto);
+
+    @RequestMapping(value = "learn/getLearn/getForm2_2_5", method = RequestMethod.POST)
+    Map<String,Double> getForm2_2_5(@RequestBody GetLearnDto GetLearnDto);
+
+    @RequestMapping(value = "learn/getLearn/getForm3_1", method = RequestMethod.POST)
+    Form6RepVO getForm3_1(@RequestBody GetLearnDto GetLearnDto);
+
+    @RequestMapping(value = "learn/getLearn/getForm3_1_1", method = RequestMethod.POST)
+    Table2RepVO getForm3_1_1(@RequestBody GetLearnDto GetLearnDto);
+
+    @RequestMapping(value = "learn/getLearn/getForm3_2", method = RequestMethod.POST)
+    Form6RepVO getForm3_2(@RequestBody GetLearnDto GetLearnDto);
+
+    @RequestMapping(value = "learn/getLearn/getForm3_3", method = RequestMethod.POST)
+    Form6RepVO getForm3_3(@RequestBody GetLearnDto GetLearnDto);
+
+    @RequestMapping(value = "learn/getLearn/getForm3_4", method = RequestMethod.POST)
+    Form6RepVO getForm3_4(@RequestBody GetLearnDto GetLearnDto);
+
+    @RequestMapping(value = "learn/getLearn/getSuggest", method = RequestMethod.POST)
+    String getSuggest(@RequestBody GetLearnDto GetLearnDto);
+
+    @RequestMapping(value = "learn/getLearn/getSuggest2", method = RequestMethod.POST)
+    String getSuggest2(@RequestBody GetLearnDto GetLearnDto);
+}
@@ -0,0 +1,38 @@
+package com.sincere.independence.filter;
+
+import org.springframework.stereotype.Component;
+
+import javax.servlet.*;
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 用于解决跨域问题
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/11 0011 10:17
+ */
+@Component
+@WebFilter(urlPatterns = "/*", filterName = "authFilter")
+public class AllowOriginFilter implements Filter {
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+    }
+
+    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException {
+        HttpServletResponse response = (HttpServletResponse) res;
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+        response.setHeader("Access-Control-Allow-Credentials", "true");
+        response.setHeader("Access-Control-Allow-Headers","Origin, X-Requested-With, Content-Type, Accept");
+        chain.doFilter(req, res);
+    }
+
+    @Override
+    public void destroy() {
+    }
+}
+
+
@@ -0,0 +1,44 @@
+package com.sincere.independence.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/24 0024 8:55
+ */
+@ApiModel
+public class ChapterReq {
+
+    @ApiModelProperty(value = "考试章节")
+    private int chapterNumber ;
+    @ApiModelProperty(value = "章节名称")
+    private String chapterName ;
+    @ApiModelProperty(value = "章节 分值")
+    private Double score ;
+
+    public int getChapterNumber() {
+        return chapterNumber;
+    }
+
+    public void setChapterNumber(int chapterNumber) {
+        this.chapterNumber = chapterNumber;
+    }
+
+    public String getChapterName() {
+        return chapterName;
+    }
+
+    public void setChapterName(String chapterName) {
+        this.chapterName = chapterName;
+    }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+}
@@ -0,0 +1,65 @@
+package com.sincere.independence.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/24 0024 8:53
+ */
+@ApiModel
+public class ChapterReqVo {
+
+    private int analyseId ;
+    @ApiModelProperty(value = "考试时长")
+    private String examTime ;
+    @ApiModelProperty(value = "考试范围 七年级上册")
+    private String examScope ;
+    @ApiModelProperty(value = "满分")
+    private Double maxScore ;
+    @ApiModelProperty(value = "考试内容")
+    private List<ChapterReq> list ;
+
+    public int getAnalyseId() {
+        return analyseId;
+    }
+
+    public void setAnalyseId(int analyseId) {
+        this.analyseId = analyseId;
+    }
+
+    public String getExamTime() {
+        return examTime;
+    }
+
+    public void setExamTime(String examTime) {
+        this.examTime = examTime;
+    }
+
+    public String getExamScope() {
+        return examScope;
+    }
+
+    public void setExamScope(String examScope) {
+        this.examScope = examScope;
+    }
+
+    public List<ChapterReq> getList() {
+        return list;
+    }
+
+    public void setList(List<ChapterReq> list) {
+        this.list = list;
+    }
+
+    public Double getMaxScore() {
+        return maxScore;
+    }
+
+    public void setMaxScore(Double maxScore) {
+        this.maxScore = maxScore;
+    }
+}
@@ -0,0 +1,53 @@
+package com.sincere.independence.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 14:48
+ */
+@ApiModel
+public class CreateExamReqVo {
+    @ApiModelProperty(value="考试名称")
+    private String examName ;
+    @ApiModelProperty(value="学科")
+    private String courseName ;
+    @ApiModelProperty(value="考试时间")
+    private String examTime ;
+    @ApiModelProperty(value="年级")
+    private String grade ;
+
+    public String getExamName() {
+        return examName;
+    }
+
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getExamTime() {
+        return examTime;
+    }
+
+    public void setExamTime(String examTime) {
+        this.examTime = examTime;
+    }
+
+    public String getGrade() {
+        return grade;
+    }
+
+    public void setGrade(String grade) {
+        this.grade = grade;
+    }
+}
@@ -0,0 +1,28 @@
+package com.sincere.independence.vo;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/23 0023 15:46
+ */
+public class CreateLeagueReqVo {
+
+    private int analyseId ;
+    private String league ;
+
+    public int getAnalyseId() {
+        return analyseId;
+    }
+
+    public void setAnalyseId(int analyseId) {
+        this.analyseId = analyseId;
+    }
+
+    public String getLeague() {
+        return league;
+    }
+
+    public void setLeague(String league) {
+        this.league = league;
+    }
+}
@@ -0,0 +1,32 @@
+package com.sincere.independence.vo;
+
+import com.sincere.common.dto.independence.LeagueDto;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/22 0022 15:46
+ */
+public class GetLeague {
+
+    private String leagueName ;
+    private List<LeagueDto> leagues ;
+
+    public String getLeagueName() {
+        return leagueName;
+    }
+
+    public void setLeagueName(String leagueName) {
+        this.leagueName = leagueName;
+    }
+
+    public List<LeagueDto> getLeagues() {
+        return leagues;
+    }
+
+    public void setLeagues(List<LeagueDto> leagues) {
+        this.leagues = leagues;
+    }
+}
@@ -0,0 +1,23 @@
+package com.sincere.independence.vo;
+
+import com.sincere.common.vo.BaseVo;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/22 0022 15:48
+ */
+public class GetLeagueRepVo extends BaseVo {
+
+    private List<GetLeague> data ;
+
+    public List<GetLeague> getData() {
+        return data;
+    }
+
+    public void setData(List<GetLeague> data) {
+        this.data = data;
+    }
+}
@@ -0,0 +1,28 @@
+package com.sincere.independence.vo;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/17 0017 13:36
+ */
+public class InitAnalyseReqVo {
+
+    private int analyseId ;
+    private String url ;
+
+    public int getAnalyseId() {
+        return analyseId;
+    }
+
+    public void setAnalyseId(int analyseId) {
+        this.analyseId = analyseId;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+}
@@ -0,0 +1,19 @@
+package com.sincere.independence.vo;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/23 0023 15:50
+ */
+public class InitScoreReqVo extends InitAnalyseReqVo {
+
+    private int leagueId ;
+
+    public int getLeagueId() {
+        return leagueId;
+    }
+
+    public void setLeagueId(int leagueId) {
+        this.leagueId = leagueId;
+    }
+}
@@ -0,0 +1,24 @@
+package com.sincere.independence.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 14:53
+ */
+@ApiModel
+public class UpdateExamReqVo extends  CreateExamReqVo{
+
+    @ApiModelProperty(value="主键")
+    private int analyseId ;
+
+    public int getAnalyseId() {
+        return analyseId;
+    }
+
+    public void setAnalyseId(int analyseId) {
+        this.analyseId = analyseId;
+    }
+}
@@ -0,0 +1,168 @@
+package com.sincere.independence.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 extends ExcelVo {
+
+    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) {
+        super(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,14 @@
+package com.sincere.independence.vo.excel;
+
+import org.apache.poi.ss.usermodel.Row;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 13:59
+ */
+public class ExcelVo {
+
+    public ExcelVo(Row sheetRow) {
+    }
+}
@@ -0,0 +1,102 @@
+package com.sincere.independence.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 13:50
+ */
+public class ScoreExcelVo extends ExcelVo {
+
+    private String schoolName ;
+    private String className ;
+    private String studentNumber ;
+    private String studentName ;
+    private String courseName ;
+    private String score ;
+
+    public String getSchoolName() {
+        return schoolName;
+    }
+
+    public void setSchoolName(String schoolName) {
+        this.schoolName = schoolName;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
+
+    public String getStudentNumber() {
+        return studentNumber;
+    }
+
+    public void setStudentNumber(String studentNumber) {
+        this.studentNumber = studentNumber;
+    }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getScore() {
+        return score;
+    }
+
+    public void setScore(String score) {
+        this.score = score;
+    }
+
+    public ScoreExcelVo(Row sheetRow) {
+        super(sheetRow);
+        Cell cell1 = sheetRow.getCell(1);
+        if(cell1 != null){
+            cell1.setCellType(CellType.STRING);
+            this.schoolName = cell1.getStringCellValue().trim();
+        }
+        Cell cell2 = sheetRow.getCell(2);
+        if(cell2 != null){
+            cell2.setCellType(CellType.STRING);
+            this.className = cell2.getStringCellValue().trim();
+        }
+        Cell cell3 = sheetRow.getCell(3);
+        if(cell3 != null){
+            cell3.setCellType(CellType.STRING);
+            this.studentNumber = cell3.getStringCellValue().trim();
+        }
+        Cell cell4 = sheetRow.getCell(4);
+        if(cell4 != null){
+            cell4.setCellType(CellType.STRING);
+            this.studentName = cell4.getStringCellValue().trim();
+        }
+        Cell cell5 = sheetRow.getCell(5);
+        if(cell5 != null){
+            cell5.setCellType(CellType.STRING);
+            this.courseName = cell5.getStringCellValue().trim();
+        }
+        Cell cell6 = sheetRow.getCell(6);
+        if(cell6 != null){
+            cell6.setCellType(CellType.STRING);
+            this.score = cell6.getStringCellValue().trim();
+        }
+    }
+}
@@ -0,0 +1,20 @@
+server:
+  port: 8008
+
+spring:
+  application:
+    name: independence
+  profiles:
+    active: dev
+
+
+eureka:
+  instance:
+    hostname: localhost
+    lease-expiration-duration-in-seconds: 60
+    lease-renewal-interval-in-seconds: 10
+  client:
+    service-url:
+      #      defaultZone: http://localhost:8761/eureka/
+      defaultZone: http://localhost:8761/eureka/,http://localhost:8762/eureka/
+
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="true">
+        <!-- 项目名称 -->
+        <property name="PROJECT_NAME" value="smartCampus_java" />
+
+        <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <!--    <property name="LOG_HOME" value="/opt/web/log/" />-->
+        <property name="LOG_HOME" value="D://smartCampus_java//log"/>
+
+        <!-- 控制台输出 -->
+        <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+            <!--<withJansi>true</withJansi>-->
+            <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+                <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+                <pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] %highlight([%-5level] %logger{50} - %msg%n)</pattern>
+                <charset>UTF-8</charset>
+            </encoder>
+        </appender>
+
+        <!-- 按照每天生成日志文件 -->
+        <appender name="SYSTEM_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+            <!-- 过滤器，只打印ERROR级别的日志 -->
+            <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+                <!--日志文件输出的文件名-->
+                <FileNamePattern>${LOG_HOME}/${PROJECT_NAME}.system-dev.%d{yyyy-MM-dd HH}.%i.log</FileNamePattern>
+                <!--日志文件保留天数-->
+                <MaxHistory>30</MaxHistory>
+                <!--日志文件最大的大小-->
+                <MaxFileSize>100MB</MaxFileSize>
+            </rollingPolicy>
+
+            <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+                <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+                <pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] %logger{50} - %msg%n</pattern>
+                <charset>UTF-8</charset>
+            </encoder>
+        </appender>
+            <logger name="system_error" additivity="true">
+        <appender-ref ref="SYSTEM_FILE"/>
+    </logger>
+
+    <!-- 设置Spring&Hibernate日志输出级别 -->
+    <logger name="org.springframework" level="WARN" />
+    <logger name="org.mybatis" level="WARN" />
+    <logger name="com.ibatis" level="DEBUG" />
+    <logger name="com.ibatis.common.jdbc.SimpleDataSource" level="DEBUG" />
+    <logger name="com.ibatis.common.jdbc.ScriptRunner" level="DEBUG" />
+    <logger name="com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate" level="DEBUG" />
+
+
+    <logger name="java.sql.Connection" level="DEBUG" />
+    <logger name="java.sql.Statement" level="DEBUG" />
+    <logger name="java.sql.PreparedStatement" level="DEBUG" />
+    <logger name="com.jevon.mapper" level="DEBUG" />
+    <!-- 开发环境下的日志配置 -->
+    <root level="ERROR">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="SYSTEM_FILE" />
+    </root>
+
+</configuration>
 \ No newline at end of file
@@ -24,10 +24,12 @@
         <module>dahua</module>
         <module>consumer</module>
         <module>haikangface</module>
-        <module>smartCampus_search</module>
-        <module>xiaoan_search</module>
+        <module>search_independence</module>
+        <module>search_smartCampus</module>
+        <module>search_xiaoan</module>
         <module>mypulsar</module>
         <module>weigeng</module>
+        <module>independence</module>
     </modules>
     <properties>
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>cloud</artifactId>
+        <groupId>com.sincere</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>search_independence</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.sincere</groupId>
+            <artifactId>common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
+            <version>6.4.0.jre8</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.16</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.3.2</version>
+        </dependency>
+
+        <!--只有slf4j-api依赖-->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.13</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/commons-net/commons-net -->
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+            <version>2.0</version>
+        </dependency>
+        <!--数据库-->
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>1.3.0</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <!--打包文件名-->
+        <finalName>search_smartCampus</finalName>
+        <!--打包方式-->
+        <plugins>
+            <!-- 设置编译版本 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+            <!-- 打包jar文件时，配置manifest文件，加入lib包的jar依赖 -->
+            <!-- 本地启动需要注释-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>com.sincere.smartSearch.SmartSearchApplication</mainClass>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                        </manifest>
+                        <manifestEntries>
+                            <Class-Path>./config/</Class-Path>
+                        </manifestEntries>
+                    </archive>
+                    <excludes>
+                        <exclude>config/**</exclude>
+                    </excludes>
+                    <classesDirectory></classesDirectory>
+                </configuration>
+            </plugin>
+            <!-- 拷贝依赖的jar包到lib目录 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>
+                                ${project.build.directory}/lib
+                            </outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- 解决资源文件的编码问题 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.5</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+            <!-- 打包source文件为jar文件 -->
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <attach>true</attach>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
 \ No newline at end of file
@@ -0,0 +1,23 @@
+package com.sincere.independence;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.context.annotation.ComponentScan;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/13 0013 8:40
+ */
+@EnableEurekaClient
+@SpringBootApplication
+@MapperScan("com.sincere.independence.mapper")
+@ComponentScan("com.sincere.common")
+public class IndependenceSearchApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(IndependenceSearchApplication.class, args);
+    }
+}
@@ -0,0 +1,225 @@
+package com.sincere.independence.controller;
+
+import com.sincere.common.dto.independence.*;
+import com.sincere.common.util.RedisUtils;
+import com.sincere.common.vo.BaseVo;
+import com.sincere.independence.model.*;
+import com.sincere.independence.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/11/13 0013 9:33
+ */
+@RestController
+@RequestMapping(value = "/learn/init")
+public class LearnController {
+
+    @Autowired
+    AnalyseService analyseService;
+
+    @Autowired
+    DimensionalService dimensionalService;
+
+    @Autowired
+    AnalyseDimensionalService analyseDimensionalService;
+
+    @Autowired
+    AnalyseDetailService analyseDetailService;
+
+    @Autowired
+    StudentDetailService studentDetailService;
+
+    @Autowired
+    StudentService studentService;
+
+    @Autowired
+    LeagueService leagueService;
+
+    @Autowired
+    ChapterService chapterService;
+
+    @Autowired
+    KnowledgeService knowledgeService;
+
+    @RequestMapping(value = "getList", method = RequestMethod.POST)
+    public List<AnalyseDto> getList(@RequestBody AnalyseDto analyseDto){
+        List<Analyse> list = analyseService.select(new Analyse(analyseDto));
+        List<AnalyseDto> analyseDtos = new ArrayList<>();
+        for(Analyse analyse : list){
+            AnalyseDto temp = initAnalyseDto(analyse);
+            analyseDtos.add(temp);
+        }
+        return  analyseDtos;
+    }
+
+    private AnalyseDto initAnalyseDto(Analyse analyse){
+        AnalyseDto analyseDto = new AnalyseDto();
+        analyseDto.setCourseName(analyse.getCourseName());
+        analyseDto.setCreateTime(analyse.getCreateTime());
+        analyseDto.setExamName(analyse.getExamName());
+        analyseDto.setExamScope(analyse.getExamScope());
+        analyseDto.setExamTime(analyse.getExamTime());
+        analyseDto.setGrade(analyse.getGrade());
+        analyseDto.setId(analyse.getId());
+        analyseDto.setMaxScore(analyse.getMaxScore());
+        return analyseDto;
+    }
+
+    @RequestMapping(value = "insertAnalyse", method = RequestMethod.POST)
+    public BaseVo insertAnalyse(@RequestBody AnalyseDto analyseDto){
+        BaseVo baseVo = new BaseVo();
+        Analyse analyse = new Analyse(analyseDto);
+        analyseService.insert(analyse);
+        baseVo.setMessage(analyse.getId()+"");
+        return baseVo;
+    }
+
+    @RequestMapping(value = "updateAnalyse", method = RequestMethod.POST)
+    public BaseVo updateAnalyse(@RequestBody AnalyseDto analyseDto){
+        BaseVo baseVo = new BaseVo();
+        Analyse analyse = new Analyse(analyseDto);
+        analyseService.update(analyse);
+        return baseVo;
+    }
+
+    @RequestMapping(value = "selectById", method = RequestMethod.GET)
+    public AnalyseDto selectById(@RequestParam("analyseId") int analyseId) {
+        Analyse analyse = analyseService.selectById(analyseId);
+        return initAnalyseDto(analyse);
+    }
+
+    @RequestMapping(value = "getLeagueByAnalyse", method = RequestMethod.GET)
+    public List<LeagueDto> getLeagueByAnalyse(@RequestParam("analyseId") int analyseId){
+        List<League> leagues = leagueService.selectByAnalyseId(analyseId);
+        List<LeagueDto> leagueDtos = new ArrayList<>();
+        for(League league : leagues){
+            leagueDtos.add(initLeagueDto(league));
+        }
+        return leagueDtos ;
+    }
+
+    private LeagueDto initLeagueDto(League league){
+        LeagueDto leagueDto = new LeagueDto();
+        leagueDto.setAnalyseId(league.getAnalyseId());
+        leagueDto.setId(league.getId());
+        leagueDto.setLeague(league.getLeague());
+        leagueDto.setSchoolName(league.getSchoolName());
+        return leagueDto;
+    }
+
+    @RequestMapping(value = "isImportExam", method = RequestMethod.GET)
+    public List<AnalyseDetailDto> isImportExam(@RequestParam("analyseId") int analyseId){
+        List<AnalyseDetail> analyseDetails = analyseDetailService.selectByAnalyseId(analyseId);
+        List<AnalyseDetailDto> analyseDetailDtos = new ArrayList<>();
+        if(analyseDetails != null & analyseDetails.size() > 0){
+            for(AnalyseDetail analyseDetail : analyseDetails){
+                analyseDetailDtos.add(initAnalyseDetail(analyseDetail));
+            }
+        }
+        return analyseDetailDtos ;
+    }
+
+    private AnalyseDetailDto initAnalyseDetail(AnalyseDetail analyseDetail){
+        AnalyseDetailDto analyseDetailDto = new AnalyseDetailDto();
+        analyseDetailDto.setAnalyseId(analyseDetail.getAnalyseId());
+        analyseDetailDto.setCreateTime(analyseDetail.getCreateTime());
+        analyseDetailDto.setDifficult(analyseDetail.getDifficult());
+        analyseDetailDto.setQuestionNumber(analyseDetail.getQuestionNumber());
+        analyseDetailDto.setScore(analyseDetail.getScore());
+        analyseDetailDto.setId(analyseDetail.getId());
+        return analyseDetailDto;
+    }
+
+    @RequestMapping(value = "insertBatchAnalyseDetail", method = RequestMethod.POST)
+    public boolean insertBatchAnalyseDetail(@RequestBody List<AnalyseDetailDto> analyseDetailDtos){
+        List<AnalyseDetail> list = new ArrayList<>();
+        for(AnalyseDetailDto analyseDetailDto :analyseDetailDtos){
+            list.add(new AnalyseDetail(analyseDetailDto));
+        }
+        analyseDetailService.insertBatch(list);
+        return true ;
+    }
+
+    @RequestMapping(value = "insertBatchAnalyseDimensional", method = RequestMethod.POST)
+    public boolean insertBatchAnalyseDimensional(@RequestBody List<AnalyseDimensionalDto> analyseDimensionalDtos){
+        List<AnalyseDimensional> list = new ArrayList<>();
+        for(AnalyseDimensionalDto analyseDimensionalDto :analyseDimensionalDtos){
+            list.add(new AnalyseDimensional(analyseDimensionalDto));
+        }
+        analyseDimensionalService.insertBatch(list);
+        return true ;
+    }
+
+    //查数据库是否已存在该四维诊断  不存在则导入 返回主键
+    @RequestMapping(value = "selectDimensional", method = RequestMethod.GET)
+    public int selectDimensional(@RequestParam("type") int type, @RequestParam("name") String name) {
+        Dimensional result = dimensionalService.selectByTypeAndName(type,name);
+        int dimensionalId = 0 ;
+        if(result == null || result.getId() == 0){
+            Dimensional dimensional = new Dimensional();
+            dimensional.setDimensionalType(type);
+            dimensional.setDimensionalName(name);
+            dimensional.setCreateTime(new Date());
+            dimensionalService.insert(dimensional);
+            dimensionalId = dimensional.getId();
+        }else{
+            dimensionalId = result.getId();
+        }
+        return dimensionalId ;
+    }
+
+    @RequestMapping(value = "insertBatchStudent", method = RequestMethod.POST)
+    public boolean insertBatchStudent(@RequestBody List<StudentDto> studentDtos){
+        List<Student> list = new ArrayList<>();
+        for(StudentDto studentDto :studentDtos){
+            list.add(new Student(studentDto));
+        }
+        studentService.insertBatch(list);
+        return true ;
+    }
+
+    @RequestMapping(value = "insertBatchStudentDetail", method = RequestMethod.POST)
+    public boolean insertBatchStudentDetail(@RequestBody List<StudentDetailDto> studentDetailDtos){
+        List<StudentDetail> list = new ArrayList<>();
+        for(StudentDetailDto studentDetailDto :studentDetailDtos){
+            list.add(new StudentDetail(studentDetailDto));
+        }
+        studentDetailService.insertBatch(list);
+        return true ;
+    }
+
+    @RequestMapping(value = "initLeagueSchool", method = RequestMethod.GET)
+    public boolean initLeagueSchool(@RequestParam("leagueId")int leagueId , @RequestParam("schoolName")String schoolName){
+        return leagueService.initLeagueSchool(leagueId,schoolName)==1 ? true : false ;
+    }
+
+    @RequestMapping(value = "insertLeague", method = RequestMethod.POST)
+    public int insertLeague(@RequestBody LeagueDto leagueDto){
+        League league = new League(leagueDto);
+        leagueService.insert(league);
+        return league.getId();
+    }
+
+    @RequestMapping(value = "getSchoolName", method = RequestMethod.GET)
+    public List<String> getSchoolName(@RequestParam("analyseId")int analyseId){
+        return studentService.selectSchoolNameByAnalyse(analyseId);
+    }
+
+    @RequestMapping(value = "initChapter", method = RequestMethod.POST)
+    public boolean initChapter(@RequestBody List<ChapterDto> chapterDtos){
+        List<Chapter> list = new ArrayList<>();
+        for(ChapterDto chapterDto : chapterDtos){
+            list.add(new Chapter(chapterDto));
+        }
+        chapterService.insertBatch(list);
+        return true ;
+    }
+
+}
@@ -0,0 +1,1216 @@
+package com.sincere.independence.controller;
+
+import com.sincere.common.dto.independence.ChapterDto;
+import com.sincere.common.dto.independence.GetLearnDto;
+import com.sincere.common.enums.DifficultEnums;
+import com.sincere.common.enums.DimensionalEnums;
+import com.sincere.common.util.RedisUtils;
+import com.sincere.common.vo.independence.school.SuggestRepVo;
+import com.sincere.common.vo.independence.school.*;
+import com.sincere.independence.model.*;
+import com.sincere.independence.service.*;
+import io.swagger.annotations.ApiOperation;
+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.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/18 0018 15:54
+ */
+@RestController
+@RequestMapping(value = "learn/getLearn")
+public class LearnStatController {
+    @Autowired
+    AnalyseService analyseService;
+
+    @Autowired
+    DimensionalService dimensionalService;
+
+    @Autowired
+    AnalyseDimensionalService analyseDimensionalService;
+
+    @Autowired
+    AnalyseDetailService analyseDetailService;
+
+    @Autowired
+    StudentDetailService studentDetailService;
+
+    @Autowired
+    StudentService studentService;
+
+    @Autowired
+    LeagueService leagueService;
+
+    @Autowired
+    ChapterService chapterService;
+
+    @Autowired
+    KnowledgeService knowledgeService ;
+
+
+    @RequestMapping(value = "getForm1_1", method = RequestMethod.POST)
+    public Form7RepVO getForm1_1(@RequestBody GetLearnDto getLearnDto){
+        Form7RepVO form7RepVO = new Form7RepVO();
+        if(RedisUtils.existsObject(getLearnDto.getAnalyseId()+"_"+getLearnDto.getSchoolName()+"_1_1")){
+            form7RepVO = (Form7RepVO) RedisUtils.getObject(getLearnDto.getAnalyseId()+"_"+getLearnDto.getSchoolName()+"_1_1");
+        }else {
+            Analyse analyse = analyseService.selectById(getLearnDto.getAnalyseId());
+            form7RepVO.setExamTime(analyse.getExamTime());
+            form7RepVO.setMaxScore(analyse.getMaxScore());
+            form7RepVO.setExamScope(analyse.getExamScope());
+            form7RepVO.setCourseName(analyse.getCourseName());
+
+            List<Chapter> chapters = chapterService.selectByAnalyse(analyse.getId());
+            List<ChapterDto> chapterDtos = new ArrayList<>();
+            for(Chapter chapter : chapters){
+                ChapterDto chapterDto = new ChapterDto();
+                chapterDto.setAnalyseId(chapter.getAnalyseId());
+                chapterDto.setChapterName(chapter.getChapterName());
+                chapterDto.setChapterNumber(chapter.getChapterNumber());
+                chapterDto.setChapterScore(chapter.getChapterScore());
+                chapterDto.setPercent(chapter.getChapterScore() / analyse.getMaxScore() * 100);
+                chapterDtos.add(chapterDto);
+            }
+            form7RepVO.setList(chapterDtos);
+            List<Form7> difficultList = new ArrayList<>();
+            for (DifficultEnums difficultEnums : DifficultEnums.values()){
+                Form7 form7 = new Form7();
+                form7.setName(difficultEnums.getDifficultShow());
+                form7.setPercent(analyseDetailService.selectDifficult(analyse.getId(),difficultEnums.getDifficultType())/analyse.getMaxScore()*100);
+                difficultList.add(form7);
+            }
+            form7RepVO.setDifficultList(difficultList);
+
+            List<Form7> typeList = new ArrayList<>();
+            List<String> list = analyseDetailService.selectQuestionType(analyse.getId());
+            for(String type : list){
+                Form7 form7 = new Form7();
+                form7.setName(type);
+                Double score = analyseDetailService.selectSumType(analyse.getId(),type);
+                form7.setScore(score);
+                form7.setPercent(score / analyse.getMaxScore() * 100);
+                typeList.add(form7);
+            }
+            form7RepVO.setTypeList(typeList);
+            RedisUtils.setObject(getLearnDto.getAnalyseId()+"_"+getLearnDto.getSchoolName()+"_1_1",form7RepVO);
+        }
+        return form7RepVO;
+    }
+
+    @RequestMapping(value = "getForm2_1_1", method = RequestMethod.POST)
+    public Form1RepVO getForm2_1_1(@RequestBody GetLearnDto getLearnDto){
+        Form1RepVO form1RepVo = new Form1RepVO();
+        if(RedisUtils.existsObject(getLearnDto.getAnalyseId()+"_"+getLearnDto.getSchoolName()+"_2_1_1")){
+            form1RepVo = (Form1RepVO) RedisUtils.getObject(getLearnDto.getAnalyseId()+"_"+getLearnDto.getSchoolName()+"_2_1_1");
+        }else {
+            //2.1表
+            Analyse analyse = analyseService.selectById(getLearnDto.getAnalyseId());
+            //分数段
+            Double maxScore = analyse.getMaxScore();
+            Map<String,String> segmentMap = new HashMap<>();
+            segmentMap.put("A(优秀)",maxScore*0.85 + "~" + maxScore+"分");
+            segmentMap.put("B(良好)",maxScore*0.7 + "~" + (maxScore*0.85-1f)+"分");
+            segmentMap.put("C(及格)",maxScore*0.6 + "~" + (maxScore*0.7-1f)+"分");
+            segmentMap.put("D(不及格)",0 + "~" + (maxScore*0.6-1f)+"分");
+            form1RepVo.setMap(segmentMap);
+            List<Student> students = studentService.selectBySchoolName(getLearnDto.getAnalyseId(),null,getLearnDto.getSchoolName());
+            double sum = new Double(students.size());
+            int a = studentService.selectCountByScore(getLearnDto.getAnalyseId(),null,getLearnDto.getSchoolName(),maxScore*0.85,maxScore+1f);
+            int b = studentService.selectCountByScore(getLearnDto.getAnalyseId(),null,getLearnDto.getSchoolName(),maxScore*0.7,(maxScore*0.85));
+            int c = studentService.selectCountByScore(getLearnDto.getAnalyseId(),null,getLearnDto.getSchoolName(),maxScore*0.6,(maxScore*0.7));
+            int d = studentService.selectCountByScore(getLearnDto.getAnalyseId(),null,getLearnDto.getSchoolName(),maxScore*0,(maxScore*0.6));
+            List<Form1> form1List = new ArrayList<>();
+            Form1 formA = new Form1();
+            formA.setLevel("A");
+            formA.setNumber(a);
+            formA.setProp(a/sum*100);
+            Form1 formB = new Form1();
+            formB.setLevel("B");
+            formB.setNumber(b);
+            formB.setProp(b/sum*100);
+            Form1 formC = new Form1();
+            formC.setLevel("C");
+            formC.setNumber(c);
+            formC.setProp(c/sum*100);
+            Form1 formD = new Form1();
+            formD.setLevel("D");
+            formD.setNumber(d);
+            formD.setProp(d/sum*100);
+            form1List.add(formA);
+            form1List.add(formB);
+            form1List.add(formC);
+            form1List.add(formD);
+            form1RepVo.setList(form1List);
+            RedisUtils.setObject(getLearnDto.getAnalyseId()+"_"+getLearnDto.getSchoolName()+"_2_1_1",form1RepVo);
+        }
+        return form1RepVo;
+    }
+
+    @RequestMapping(value = "getForm2_1_2", method = RequestMethod.POST)
+    public Form2RepVO getForm2_1_2(@RequestBody GetLearnDto GetLearnDto){
+        Form2RepVO repVO = new Form2RepVO();
+        if(RedisUtils.existsObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_2_1_2")){
+            repVO = (Form2RepVO) RedisUtils.getObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_2_1_2");
+        }else {
+            Analyse analyse = analyseService.selectById(GetLearnDto.getAnalyseId());
+            if(analyse == null){
+                repVO.setSuccess(false);
+                repVO.setMessage("请先创建考试");
+                return  repVO;
+            }
+            List<String> leagues = leagueService.getLeagueBySchoolName(analyse.getId(),GetLearnDto.getSchoolName());
+            if(leagues == null){
+                repVO.setSuccess(false);
+                repVO.setMessage("请先设定联盟校");
+                return  repVO;
+            }
+            List<Student> allStudents = studentService.selectBySchoolName(GetLearnDto.getAnalyseId(),null,null);
+            List<Student> leagueStudents = studentService.selectBySchoolName(GetLearnDto.getAnalyseId(),leagues,null);
+            List<Student> students = studentService.selectBySchoolName(GetLearnDto.getAnalyseId(),null,GetLearnDto.getSchoolName());
+            //先算高分段的分数
+            int highNumber = (int) Math.floor(allStudents.size()*0.27);
+            double highScore = allStudents.get(highNumber).getScore();
+            int lowNumber = allStudents.size()-highNumber;
+            double lowScore = allStudents.get(lowNumber).getScore();
+            List<Form2> list = new ArrayList<>();
+
+            int highAllCount = studentService.selectCountByScore(GetLearnDto.getAnalyseId(),null,null,highScore,analyse.getMaxScore()+1f);
+            int lowAllCount = studentService.selectCountByScore(GetLearnDto.getAnalyseId(),null,null,0,lowScore);
+            Form2 form2 = new Form2();
+            form2.setName("区");
+            form2.setStudentNumber(allStudents.size());
+            form2.setHighNumber(highAllCount);
+            form2.setLowNumber(lowAllCount);
+            list.add(form2);
+            {
+                int highLeagueCount = studentService.selectCountByScore(GetLearnDto.getAnalyseId(),leagues,null,highScore,analyse.getMaxScore()+1f);
+                int lowLeagueCount = studentService.selectCountByScore(GetLearnDto.getAnalyseId(),leagues,null,0,lowScore);
+                Form2 form = new Form2();
+                form.setName("联盟校");
+                form.setStudentNumber(leagueStudents.size());
+                form.setStudentProp(new Double(leagueStudents.size()) / new Double(allStudents.size()));
+                form.setHighNumber(highLeagueCount);
+                form.setLowNumber(lowLeagueCount);
+                form.setHighProp(highLeagueCount/new Double(highAllCount));
+                form.setLowProp(lowLeagueCount/new Double(lowAllCount));
+                list.add(form);
+            }
+            {
+                int highCount = studentService.selectCountByScore(GetLearnDto.getAnalyseId(),null,GetLearnDto.getSchoolName(),highScore,analyse.getMaxScore()+1f);
+                int lowCount = studentService.selectCountByScore(GetLearnDto.getAnalyseId(),null,GetLearnDto.getSchoolName(),0,lowScore);
+                Form2 form = new Form2();
+                form.setName(GetLearnDto.getSchoolName());
+                form.setStudentNumber(students.size());
+                form.setStudentProp(new Double(students.size()) / new Double(allStudents.size()));
+                form.setHighNumber(highCount);
+                form.setLowNumber(lowCount);
+                form.setHighProp(highCount/new Double(highAllCount));
+                form.setLowProp(lowCount/new Double(lowAllCount));
+                list.add(form);
+            }
+            repVO.setData(list);
+            RedisUtils.setObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_2_1_2",repVO);
+        }
+        return repVO;
+    }
+
+    @RequestMapping(value = "getForm2_1_3_2", method = RequestMethod.POST)
+    public Form2RepVO getForm2_1_3_2(@RequestBody GetLearnDto GetLearnDto){
+        Form2RepVO repVO = new Form2RepVO();
+        if(RedisUtils.existsObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_2_1_3_2")){
+            repVO = (Form2RepVO) RedisUtils.getObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_2_1_3_2");
+        }else {
+            Analyse analyse = analyseService.selectById(GetLearnDto.getAnalyseId());
+            if(analyse == null){
+                repVO.setSuccess(false);
+                repVO.setMessage("请先创建考试");
+                return  repVO;
+            }
+            List<Student> allStudents = studentService.selectBySchoolName(GetLearnDto.getAnalyseId(),null,GetLearnDto.getSchoolName());
+            //先算高分段的分数
+            int highNumber = (int) Math.floor(allStudents.size()*0.27);
+            double highScore = allStudents.get(highNumber).getScore();
+            int lowNumber = allStudents.size()-highNumber;
+            double lowScore = allStudents.get(lowNumber).getScore();
+            int highAllCount = studentService.selectCountByScore(GetLearnDto.getAnalyseId(),null,GetLearnDto.getSchoolName(),highScore,analyse.getMaxScore()+1f);
+            int lowAllCount = studentService.selectCountByScore(GetLearnDto.getAnalyseId(),null,GetLearnDto.getSchoolName(),0,lowScore);
+            List<Form2> resultList = new ArrayList<>();
+            Form2 form = new Form2();
+            form.setName(GetLearnDto.getSchoolName());
+            form.setStudentNumber(allStudents.size());
+            form.setHighNumber(highAllCount);
+            form.setLowNumber(lowAllCount);
+            resultList.add(form);
+            List<String> classNamList = studentService.selectClassNameBySchool(GetLearnDto.getAnalyseId(),GetLearnDto.getSchoolName());
+            for(String className : classNamList){
+                List<Student> list = studentService.selectByClassName(GetLearnDto.getAnalyseId(),GetLearnDto.getSchoolName(),className);
+                int highCount = studentService.selectCountBySchoolScore(GetLearnDto.getAnalyseId(),GetLearnDto.getSchoolName(),className,highScore,analyse.getMaxScore()+1f);
+                int lowCount = studentService.selectCountBySchoolScore(GetLearnDto.getAnalyseId(),GetLearnDto.getSchoolName(),className,0,lowScore);
+                Form2 form2 = new Form2();
+                form2.setName(className);
+                form2.setStudentNumber(list.size());
+                form2.setStudentProp(new Double(list.size()) / new Double(allStudents.size()));
+                form2.setHighNumber(highCount);
+                form2.setLowNumber(lowCount);
+                form2.setHighProp(highCount/new Double(highAllCount));
+                form2.setLowProp(lowCount/new Double(lowAllCount));
+                resultList.add(form2);
+            }
+            repVO.setData(resultList);
+            RedisUtils.setObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_2_1_3_2",repVO);
+        }
+        return repVO;
+    }
+
+    @RequestMapping(value = "getForm2_1_3", method = RequestMethod.POST)
+    public List<Table1> getForm2_1_3(@RequestBody GetLearnDto GetLearnDto){
+        Analyse analyse = analyseService.selectById(GetLearnDto.getAnalyseId());
+        List<Double> list = new ArrayList<>();
+        list.add(Math.ceil(analyse.getMaxScore()));
+        list.add(Math.ceil(analyse.getMaxScore()*0.95));
+        list.add(Math.ceil(analyse.getMaxScore()*0.9));
+        list.add(Math.ceil(analyse.getMaxScore()*0.85));
+        list.add(Math.ceil(analyse.getMaxScore()*0.8));
+        list.add(Math.ceil(analyse.getMaxScore()*0.75));
+        list.add(Math.ceil(analyse.getMaxScore()*0.7));
+        list.add(Math.ceil(analyse.getMaxScore()*0.65));
+        list.add(Math.ceil(analyse.getMaxScore()*0.6));
+        list.add(Math.ceil(analyse.getMaxScore()*0.55));
+        list.add(Math.ceil(analyse.getMaxScore()*0.5));
+        list.add(Math.ceil(analyse.getMaxScore()*0.45));
+        list.add(Math.ceil(analyse.getMaxScore()*0.4));
+        list.add(Math.ceil(analyse.getMaxScore()*0.35));
+        list.add(Math.ceil(analyse.getMaxScore()*0.3));
+        list.add(Math.ceil(analyse.getMaxScore()*0));
+        List<Table1> list1 = new ArrayList<>();
+        for(int i =0 ; i <list.size() ; i++){
+            Table1 table1 = new Table1();
+            if(i == 0){
+                table1.setScore(list.get(i)+"");
+                table1.setNumber(studentService.selectCountByScore(analyse.getId(),null,GetLearnDto.getSchoolName(),new Double(list.get(i)),new Double(list.get(i)+1)));
+            }else {
+                table1.setScore(list.get(i)+"-"+(list.get(i-1)-0.5));
+                table1.setNumber(studentService.selectCountByScore(analyse.getId(),null,GetLearnDto.getSchoolName(),new Double(list.get(i)),new Double(list.get(i-1))));
+            }
+            list1.add(table1);
+        }
+        return list1;
+    }
+
+    @RequestMapping(value = "getForm2_2_1", method = RequestMethod.POST)
+    public Form3RepVO getForm2_2_1(@RequestBody GetLearnDto GetLearnDto){
+        Form3RepVO repVO = new Form3RepVO();
+        if(RedisUtils.existsObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_2_2_1")){
+            repVO = (Form3RepVO) RedisUtils.getObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_2_2_1");
+        }else {
+            Analyse analyse = analyseService.selectById(GetLearnDto.getAnalyseId());
+            if(analyse == null){
+                repVO.setSuccess(false);
+                repVO.setMessage("请先创建考试");
+                return  repVO;
+            }
+            List<String> leagues = leagueService.getLeagueBySchoolName(analyse.getId(),GetLearnDto.getSchoolName());
+            if(leagues == null){
+                repVO.setSuccess(false);
+                repVO.setMessage("请先设定联盟校");
+                return  repVO;
+            }
+            List<Form3> list = new ArrayList<>();
+            List<Student> allStudents = studentService.selectBySchoolName(analyse.getId(),null,null);
+            {
+                Form3 form3 = new Form3();
+                form3.setName("区");
+                form3.setMaxScore(studentService.selectMaxScore(analyse.getId(),null,null));
+                form3.setAverage(studentService.selectAvgScore(analyse.getId(),null,null));
+                form3.setMinScore(studentService.selectMinScore(analyse.getId(),null,null));
+                int a = studentService.selectCountByScore(analyse.getId(),null,null,analyse.getMaxScore()*0.85,analyse.getMaxScore()+1);
+                form3.setApercent(a / new Double(allStudents.size()) * 100);
+                int b = studentService.selectCountByScore(analyse.getId(),null,null,analyse.getMaxScore()*0.7,analyse.getMaxScore()*0.85);
+                form3.setBpercent(b / new Double(allStudents.size()) * 100);
+                int c = studentService.selectCountByScore(analyse.getId(),null,null,analyse.getMaxScore()*0.6,analyse.getMaxScore()*0.7);
+                form3.setCpercent(c / new Double(allStudents.size()) * 100);
+                int d = studentService.selectCountByScore(analyse.getId(),null,null,analyse.getMaxScore()*0,analyse.getMaxScore()*0.6);
+                form3.setDpercent(d / new Double(allStudents.size()) * 100);
+                list.add(form3);
+            }
+            {
+                Form3 form = new Form3();
+                form.setName("联盟校");
+                List<Student> students = studentService.selectBySchoolName(analyse.getId(),leagues,null);
+                form.setMaxScore(studentService.selectMaxScore(analyse.getId(),leagues,null));
+                form.setAverage(studentService.selectAvgScore(analyse.getId(),leagues,null));
+                form.setMinScore(studentService.selectMinScore(analyse.getId(),leagues,null));
+                int a1 = studentService.selectCountByScore(analyse.getId(),leagues,null,analyse.getMaxScore()*0.85,analyse.getMaxScore()+1);
+                form.setApercent(a1 / new Double(students.size()) * 100);
+                int b1 = studentService.selectCountByScore(analyse.getId(),leagues,null,analyse.getMaxScore()*0.7,analyse.getMaxScore()*0.85);
+                form.setBpercent(b1 / new Double(students.size()) * 100);
+                int c1 = studentService.selectCountByScore(analyse.getId(),leagues,null,analyse.getMaxScore()*0.6,analyse.getMaxScore()*0.7);
+                form.setCpercent(c1 / new Double(students.size()) * 100);
+                int d1 = studentService.selectCountByScore(analyse.getId(),leagues,null,analyse.getMaxScore()*0,analyse.getMaxScore()*0.6);
+                form.setDpercent(d1 / new Double(students.size()) * 100);
+                list.add(form);
+            }
+            {
+                Form3 form = new Form3();
+                form.setName(GetLearnDto.getSchoolName());
+                List<Student> students = studentService.selectBySchoolName(analyse.getId(),null,GetLearnDto.getSchoolName());
+                form.setMaxScore(studentService.selectMaxScore(analyse.getId(),null,GetLearnDto.getSchoolName()));
+                form.setAverage(studentService.selectAvgScore(analyse.getId(),null,GetLearnDto.getSchoolName()));
+                form.setMinScore(studentService.selectMinScore(analyse.getId(),null,GetLearnDto.getSchoolName()));
+                int a1 = studentService.selectCountByScore(analyse.getId(),null,GetLearnDto.getSchoolName(),analyse.getMaxScore()*0.85,analyse.getMaxScore()+1);
+                form.setApercent(a1 / new Double(students.size()) * 100);
+                int b1 = studentService.selectCountByScore(analyse.getId(),null,GetLearnDto.getSchoolName(),analyse.getMaxScore()*0.7,analyse.getMaxScore()*0.85);
+                form.setBpercent(b1 / new Double(students.size()) * 100);
+                int c1 = studentService.selectCountByScore(analyse.getId(),null,GetLearnDto.getSchoolName(),analyse.getMaxScore()*0.6,analyse.getMaxScore()*0.7);
+                form.setCpercent(c1 / new Double(students.size()) * 100);
+                int d1 = studentService.selectCountByScore(analyse.getId(),null,GetLearnDto.getSchoolName(),analyse.getMaxScore()*0,analyse.getMaxScore()*0.6);
+                form.setDpercent(d1 / new Double(students.size()) * 100);
+                list.add(form);
+            }
+            repVO.setData(list);
+            RedisUtils.setObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_2_2_1",repVO);
+        }
+        return repVO ;
+    }
+
+    @RequestMapping(value = "getForm2_2_2", method = RequestMethod.POST)
+    public Form4RepVO getForm2_2_2(@RequestBody GetLearnDto GetLearnDto){
+        Form4RepVO repVO = new Form4RepVO();
+        if(RedisUtils.existsObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_2_2_2")){
+            repVO = (Form4RepVO) RedisUtils.getObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_2_2_2");
+        }else {
+            Analyse analyse = analyseService.selectById(GetLearnDto.getAnalyseId());
+            if(analyse == null){
+                repVO.setSuccess(false);
+                repVO.setMessage("请先创建考试");
+                return  repVO;
+            }
+            List<String> leagues = leagueService.getLeagueBySchoolName(analyse.getId(),GetLearnDto.getSchoolName());
+            if(leagues == null){
+                repVO.setSuccess(false);
+                repVO.setMessage("请先设定联盟校");
+                return  repVO;
+            }
+            List<Form4> list = new ArrayList<>();
+            {
+                Form4 form4 = new Form4();
+                form4.setName("区");
+                form4.setModeNumber(studentService.selectModeNumber(analyse.getId(),null,null));
+                form4.setMedianNumber(studentService.selectMedian(analyse.getId(),null,null));
+                form4.setStdev(studentService.selectStdev(analyse.getId(),null,null));
+                form4.setAvgNumber(studentService.selectAvgScore(analyse.getId(),null,null));
+                list.add(form4);
+            }
+            {
+                Form4 form = new Form4();
+                form.setName("联盟校");
+                form.setModeNumber(studentService.selectModeNumber(analyse.getId(),leagues,null));
+                form.setMedianNumber(studentService.selectMedian(analyse.getId(),leagues,null));
+                form.setStdev(studentService.selectStdev(analyse.getId(),leagues,null));
+                form.setAvgNumber(studentService.selectAvgScore(analyse.getId(),leagues,null));
+                list.add(form);
+            }
+            {
+                Form4 form = new Form4();
+                form.setName(GetLearnDto.getSchoolName());
+                form.setModeNumber(studentService.selectModeNumber(analyse.getId(),null,GetLearnDto.getSchoolName()));
+                form.setMedianNumber(studentService.selectMedian(analyse.getId(),null,GetLearnDto.getSchoolName()));
+                form.setStdev(studentService.selectStdev(analyse.getId(),null,GetLearnDto.getSchoolName()));
+                form.setAvgNumber(studentService.selectAvgScore(analyse.getId(),null,GetLearnDto.getSchoolName()));
+                list.add(form);
+            }
+            repVO.setData(list);
+            RedisUtils.setObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_2_2_2",repVO);
+        }
+        return repVO;
+    }
+
+    @RequestMapping(value = "getForm2_2_3", method = RequestMethod.POST)
+    public Form5RepVO getForm2_2_3(@RequestBody GetLearnDto GetLearnDto){
+        Form5RepVO repVO = new Form5RepVO();
+        if(RedisUtils.existsObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_2_2_3")){
+            repVO = (Form5RepVO) RedisUtils.getObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_2_2_3");
+        }else {
+            Analyse analyse = analyseService.selectById(GetLearnDto.getAnalyseId());
+            if(analyse == null){
+                repVO.setSuccess(false);
+                repVO.setMessage("请先创建考试");
+                return  repVO;
+            }
+            List<String> leagues = leagueService.getLeagueBySchoolName(analyse.getId(),GetLearnDto.getSchoolName());
+            if(leagues == null){
+                repVO.setSuccess(false);
+                repVO.setMessage("请先设定联盟校");
+                return  repVO;
+            }
+            List<String> allHighStudent = new ArrayList<>();
+            List<String> allLowStudent = new ArrayList<>();
+            List<Student> allStudents = studentService.selectBySchoolName(analyse.getId(),null,null);
+            int allNumber = (int) Math.floor(allStudents.size()*0.27) ;
+            {
+                //获取区 高分段，低分段学生编号
+                for (int i = 0; i < allNumber ; i++) {
+                    allHighStudent.add(allStudents.get(i).getStudentNumber());
+                }
+                for(int i =allStudents.size()-allNumber ; i < allStudents.size() ; i++){
+                    allLowStudent.add(allStudents.get(i).getStudentNumber());
+                }
+            }
+            List<String> leagueHighStudent = new ArrayList<>();
+            List<String> leagueLowStudent = new ArrayList<>();
+            List<Student> leagueStudents = studentService.selectBySchoolName(analyse.getId(),leagues,null);
+            int leagueNumber = (int) Math.floor(leagueStudents.size()*0.27) ;
+            {
+                //获取联盟校 高分段 低分段 学生编号
+                for (int i = 0; i < leagueNumber ; i++) {
+                    leagueHighStudent.add(leagueStudents.get(i).getStudentNumber());
+                }
+                for(int i =leagueStudents.size()-leagueNumber ; i < leagueStudents.size() ; i++){
+                    leagueLowStudent.add(leagueStudents.get(i).getStudentNumber());
+                }
+            }
+            List<String> highStudent = new ArrayList<>();
+            List<String> lowStudent = new ArrayList<>();
+            List<Student> students = studentService.selectBySchoolName(analyse.getId(),null,GetLearnDto.getSchoolName());
+            int number = (int) Math.floor(students.size()*0.27) ;
+            {
+                //获取本校高分段 低分段 学生编号
+                for (int i = 0; i < number ; i++) {
+                    highStudent.add(students.get(i).getStudentNumber());
+                }
+                for(int i =students.size()-number ; i < students.size() ; i++){
+                    lowStudent.add(students.get(i).getStudentNumber());
+                }
+            }
+
+            List<Form5> list = new ArrayList<>();
+
+            List<AnalyseDetail> analyseDetails = analyseDetailService.selectByAnalyseId(analyse.getId());
+            for(AnalyseDetail analyseDetail : analyseDetails){
+                Form5 from5 = new Form5();
+                Double allSumScore = studentDetailService.selectSumScore(analyse.getId(),null,null,analyseDetail.getQuestionNumber());
+                Double leagueSumScore = studentDetailService.selectSumScore(analyse.getId(),leagues,null,analyseDetail.getQuestionNumber());
+                Double schoolSumScore = studentDetailService.selectSumScore(analyse.getId(),null,GetLearnDto.getSchoolName(),analyseDetail.getQuestionNumber());
+                from5.setExamNumber(analyseDetail.getQuestionNumber());
+                from5.setScore(analyseDetail.getScore());
+                from5.setDifficultName(DifficultEnums.getDifficultName(analyseDetail.getDifficult()));
+                from5.setAllRate(allSumScore/new Double(allStudents.size()) / analyseDetail.getScore());
+                from5.setLeagueRate(leagueSumScore/new Double(leagueStudents.size()) / analyseDetail.getScore());
+                from5.setSchoolRate(schoolSumScore/new Double(students.size()) / analyseDetail.getScore());
+
+                from5.setAllAvg(allSumScore / new Double(allStudents.size()));
+                from5.setLeagueAvg(leagueSumScore / new Double(leagueStudents.size()));
+                from5.setSchoolAvg(schoolSumScore / new Double(students.size()));
+
+                int allHigh = studentDetailService.selectTrueByExamNumber(analyse.getId(),null,null ,analyseDetail.getQuestionNumber(),allHighStudent);
+                int allLow = studentDetailService.selectTrueByExamNumber(analyse.getId(),null,null ,analyseDetail.getQuestionNumber(),allLowStudent);
+
+                int leagueHigh = studentDetailService.selectTrueByExamNumber(analyse.getId(),leagues,null ,analyseDetail.getQuestionNumber(),allHighStudent);
+                int leagueLow = studentDetailService.selectTrueByExamNumber(analyse.getId(),leagues,null ,analyseDetail.getQuestionNumber(),allLowStudent);
+
+                int high = studentDetailService.selectTrueByExamNumber(analyse.getId(),null,GetLearnDto.getSchoolName() ,analyseDetail.getQuestionNumber(),highStudent);
+                int low = studentDetailService.selectTrueByExamNumber(analyse.getId(),null,GetLearnDto.getSchoolName() ,analyseDetail.getQuestionNumber(),lowStudent);
+                from5.setAllDist(new Double(allHigh-allLow)/new Double(allNumber));
+                from5.setLeagueDist(new Double(leagueHigh-leagueLow)/new Double(leagueNumber));
+                from5.setSchoolDist(new Double(high-low)/new Double(number));
+                list.add(from5);
+            }
+            repVO.setData(list);
+            RedisUtils.setObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_2_2_3",repVO);
+        }
+        return repVO;
+    }
+
+    @RequestMapping(value = "getForm2_2_4", method = RequestMethod.POST)
+    public Form8RepVO getForm2_2_4(@RequestBody GetLearnDto GetLearnDto){
+        Form8RepVO repVO = new Form8RepVO();
+        if(RedisUtils.existsObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_2_2_4")){
+            repVO = (Form8RepVO) RedisUtils.getObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_2_2_4");
+        }else {
+            Analyse analyse = analyseService.selectById(GetLearnDto.getAnalyseId());
+            if(analyse == null){
+                repVO.setSuccess(false);
+                repVO.setMessage("请先创建考试");
+                return  repVO;
+            }
+            List<String> leagues = leagueService.getLeagueBySchoolName(analyse.getId(),GetLearnDto.getSchoolName());
+            if(leagues == null){
+                repVO.setSuccess(false);
+                repVO.setMessage("请先设定联盟校");
+                return  repVO;
+            }
+            List<Form8> list = new ArrayList<>();
+            List<Student> allStudents = studentService.selectBySchoolName(analyse.getId(),null,null);
+            List<Student> leagueStudents = studentService.selectBySchoolName(analyse.getId(),leagues,null);
+            List<Student> students = studentService.selectBySchoolName(analyse.getId(),null,GetLearnDto.getSchoolName());
+            for(DifficultEnums enums : DifficultEnums.values()){
+                Form8 form8 = new Form8();
+                form8.setDifficultName(enums.getDifficultName());
+                form8.setScore(analyseDetailService.selectDifficult(analyse.getId(),enums.getDifficultType()));
+                List<AnalyseDetail> analyseDetails = analyseDetailService.selectDifficultDetail(analyse.getId(),enums.getDifficultType());
+                Double allSumScore = 0d , leagueSumScore = 0d , schoolSumScore = 0d , score = 0d;
+                for(AnalyseDetail analyseDetail : analyseDetails){
+                    allSumScore = allSumScore + studentDetailService.selectSumScore(analyse.getId(),null,null,analyseDetail.getQuestionNumber());
+                    leagueSumScore = leagueSumScore + studentDetailService.selectSumScore(analyse.getId(),leagues,null,analyseDetail.getQuestionNumber());
+                    schoolSumScore = schoolSumScore + studentDetailService.selectSumScore(analyse.getId(),null,GetLearnDto.getSchoolName(),analyseDetail.getQuestionNumber());
+                    score = score + analyseDetail.getScore() ;
+                }
+                form8.setAllRate(allSumScore / new Double(allStudents.size()) / score );
+                form8.setLeagueRate(leagueSumScore / new Double(leagueStudents.size()) / score );
+                form8.setSchoolRate(schoolSumScore / new Double(students.size()) / score);
+                list.add(form8);
+            }
+            repVO.setData(list);
+            RedisUtils.setObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_2_2_4",repVO);
+        }
+        return repVO;
+    }
+
+    @RequestMapping(value = "getForm2_2_5", method = RequestMethod.POST)
+    public Map<String,Double> getForm2_2_5(@RequestBody GetLearnDto GetLearnDto){
+        Analyse analyse = analyseService.selectById(GetLearnDto.getAnalyseId());
+        //分数段
+        Double maxScore = analyse.getMaxScore();
+        Map<String,Double> segmentMap = new HashMap<>();
+        segmentMap.put("A",maxScore*0.85);
+        segmentMap.put("B",maxScore*0.7);
+        segmentMap.put("C",maxScore*0.6);
+        segmentMap.put("D",maxScore*0.6);
+        return segmentMap ;
+    }
+
+    @RequestMapping(value = "getForm3_1", method = RequestMethod.POST)
+    public Form6RepVO getForm3_1(@RequestBody GetLearnDto GetLearnDto){
+        Form6RepVO form6RepVO = new Form6RepVO();
+        if(RedisUtils.existsObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_3_1")){
+            form6RepVO = (Form6RepVO) RedisUtils.getObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_3_1");
+        }else {
+            form6RepVO = initDimensional(GetLearnDto, DimensionalEnums.knowledge.getDimensionalType()) ;
+            RedisUtils.setObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_3_1",form6RepVO);
+        }
+        return form6RepVO;
+    }
+
+    @RequestMapping(value = "getForm3_1_1", method = RequestMethod.POST)
+    public Table2RepVO getForm3_1_1(@RequestBody GetLearnDto GetLearnDto){
+        Table2RepVO table2RepVO = new Table2RepVO();
+        Form6RepVO form6RepVO = new Form6RepVO();
+        if(RedisUtils.existsObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_3_1")){
+            form6RepVO = (Form6RepVO) RedisUtils.getObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_3_1");
+        }else {
+            form6RepVO = initDimensional(GetLearnDto,DimensionalEnums.knowledge.getDimensionalType()) ;
+            RedisUtils.setObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_3_1",form6RepVO);
+        }
+        List<Knowledge> knowledges = knowledgeService.selectAll();
+        List<Table2> table2List = new ArrayList<>();
+        for(Knowledge knowledge : knowledges){
+            Double sumScore = new Double("0");
+            Double getScore = new Double("0");
+            String[] detailArray = knowledge.getDetail().split("、");
+            for(String detail : detailArray){
+                for(Form6 form6 : form6RepVO.getData()){
+                    if(detail.equals(form6.getDimensional())){
+                        sumScore = sumScore + form6.getScore() ;
+                        getScore = getScore + form6.getSchoolRate()*form6.getScore();
+                    }
+                }
+            }
+            if(sumScore > 0){
+                Table2 table2 = new Table2();
+                table2.setKnowledge(knowledge.getKnowledge());
+                table2.setAvg(knowledge.getAvg());
+                table2.setRate(knowledge.getRate());
+                table2.setSchoolRate(getScore / sumScore);
+                table2List.add(table2);
+            }
+        }
+        List<Table2> data = sort(table2List);
+        table2RepVO.setData(data);
+        return table2RepVO;
+    }
+
+    private List<Table2> sort(List<Table2> target){
+        List<Table2> course = new ArrayList<>();
+        if(target.size() > 0){
+            for(Table2 table2 : target){
+                if(table2.getSchoolRate() < 0.75 && Double.valueOf(table2.getAvg()) >2){
+                    course.add(table2);
+                }
+            }
+            if(course.size() == 0){
+                Double avg = new Double("0");
+                Table2 result = new Table2();
+                for(Table2 table2 : target){
+                    if(avg < new Double(table2.getAvg())){
+                        avg = new Double(table2.getAvg()) ;
+                        result = table2 ;
+                    }
+                }
+                course.add(result);
+            }
+
+            if(course.size() > 5){
+                course = course.subList(0,5);
+            }
+            for (int i = 0; i < course.size() ; i++) {
+                Table2 temp = new Table2();
+                for (int j = 0; j < course.size() ; j++) {
+                    if(new Double(course.get(i).getAvg()) > new Double(course.get(j).getAvg())){
+                        temp = course.get(j);
+                        course.set(j,course.get(i));
+                        course.set(i,temp);
+                    }
+                }
+            }
+        }
+        return course;
+    }
+
+    @RequestMapping(value = "getForm3_2", method = RequestMethod.POST)
+    public Form6RepVO getForm3_2(@RequestBody GetLearnDto GetLearnDto){
+        Form6RepVO form6RepVO = new Form6RepVO();
+        if(RedisUtils.existsObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_3_2")){
+            form6RepVO = (Form6RepVO) RedisUtils.getObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_3_2");
+        }else {
+            form6RepVO = initDimensional(GetLearnDto,DimensionalEnums.skill.getDimensionalType()) ;
+            RedisUtils.setObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_3_2",form6RepVO);
+        }
+        return form6RepVO;
+    }
+
+    @RequestMapping(value = "getForm3_3", method = RequestMethod.POST)
+    public Form6RepVO getForm3_3(@RequestBody GetLearnDto GetLearnDto){
+        Form6RepVO form6RepVO = new Form6RepVO();
+        if(RedisUtils.existsObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_3_3")){
+            form6RepVO = (Form6RepVO) RedisUtils.getObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_3_3");
+        }else {
+            form6RepVO = initDimensional(GetLearnDto,DimensionalEnums.ability.getDimensionalType()) ;
+            RedisUtils.setObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_3_3",form6RepVO);
+        }
+        return form6RepVO;
+    }
+
+    @RequestMapping(value = "getForm3_4", method = RequestMethod.POST)
+    public Form6RepVO getForm3_4(@RequestBody GetLearnDto GetLearnDto){
+        Form6RepVO form6RepVO = new Form6RepVO();
+        if(RedisUtils.existsObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_3_4")){
+            form6RepVO = (Form6RepVO) RedisUtils.getObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_3_4");
+        }else {
+            form6RepVO = initDimensional(GetLearnDto,DimensionalEnums.think.getDimensionalType()) ;
+            RedisUtils.setObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_3_4",form6RepVO);
+        }
+        return form6RepVO;
+    }
+
+    private Form6RepVO initDimensional(GetLearnDto GetLearnDto , int dimensionalType){
+        Form6RepVO repVO = new Form6RepVO();
+        Analyse analyse = analyseService.selectById(GetLearnDto.getAnalyseId());
+        if(analyse == null){
+            repVO.setSuccess(false);
+            repVO.setMessage("请先创建考试");
+            return  repVO;
+        }
+        List<String> leagues = leagueService.getLeagueBySchoolName(analyse.getId(),GetLearnDto.getSchoolName());
+        if(leagues == null){
+            repVO.setSuccess(false);
+            repVO.setMessage("请先设定区");
+            return  repVO;
+        }
+        List<String> allHighStudent = new ArrayList<>();
+        List<String> allLowStudent = new ArrayList<>();
+        List<Student> allStudents = studentService.selectBySchoolName(analyse.getId(),null,null);
+        int allNumber = (int) Math.floor(allStudents.size()*0.27) ;
+        {
+            //获取区 高分段，低分段学生编号
+            for (int i = 0; i < allNumber ; i++) {
+                allHighStudent.add(allStudents.get(i).getStudentNumber());
+            }
+            for(int i =allStudents.size()-allNumber ; i < allStudents.size() ; i++){
+                allLowStudent.add(allStudents.get(i).getStudentNumber());
+            }
+        }
+        List<String> leagueHighStudent = new ArrayList<>();
+        List<String> leagueLowStudent = new ArrayList<>();
+        List<Student> leagueStudents = studentService.selectBySchoolName(analyse.getId(),leagues,null);
+        int leagueNumber = (int) Math.floor(leagueStudents.size()*0.27) ;
+        {
+            //获取联盟校 高分段 低分段 学生编号
+            for (int i = 0; i < leagueNumber ; i++) {
+                leagueHighStudent.add(leagueStudents.get(i).getStudentNumber());
+            }
+            for(int i =leagueStudents.size()-leagueNumber ; i < leagueStudents.size() ; i++){
+                leagueLowStudent.add(leagueStudents.get(i).getStudentNumber());
+            }
+        }
+        List<String> highStudent = new ArrayList<>();
+        List<String> lowStudent = new ArrayList<>();
+        List<Student> students = studentService.selectBySchoolName(analyse.getId(),null,GetLearnDto.getSchoolName());
+        int number = (int) Math.floor(students.size()*0.27) ;
+        {
+            //获取本校高分段 低分段 学生编号
+            for (int i = 0; i < number ; i++) {
+                highStudent.add(students.get(i).getStudentNumber());
+            }
+            for(int i =students.size()-number ; i < students.size() ; i++){
+                lowStudent.add(students.get(i).getStudentNumber());
+            }
+        }
+
+        List<Form6> list = new ArrayList<>();
+
+        List<Dimensional> knowledgeList = dimensionalService.selectByAnalyse(analyse.getId(),dimensionalType);
+        for(Dimensional dimensional : knowledgeList){
+            Form6 form6 = new Form6();
+            form6.setDimensional(dimensional.getDimensionalName());
+            List<AnalyseDimensional>  analyseDimensionals = analyseDimensionalService.selectByDimensional(analyse.getId(),dimensional.getId());
+            Double score = 0d;
+            StringBuffer examNumber = new StringBuffer();
+            List<String> examNumberList = new ArrayList<>();
+            for(AnalyseDimensional analyseDimensional :analyseDimensionals){
+                score = score + analyseDimensional.getScore() ;
+                String questionNumber = analyseDimensional.getQuestionNumber();
+                if(questionNumber.contains("(")){
+                    questionNumber = questionNumber.split("\\(")[0];
+                }
+                if(!examNumber.toString().contains(questionNumber)){
+                    examNumber.append(questionNumber).append(",");
+                }
+                examNumberList.add(analyseDimensional.getQuestionNumber());
+            }
+            Double allSumScore = studentDetailService.selectSumScore(analyse.getId(),null,null,examNumberList);
+            int allHigh = studentDetailService.selectTrueByExamNumber(analyse.getId(),null,null ,examNumberList,allHighStudent);
+            int allLow = studentDetailService.selectTrueByExamNumber(analyse.getId(),null,null ,examNumberList,allLowStudent);
+
+            Double leagueSumScore = studentDetailService.selectSumScore(analyse.getId(),leagues,null,examNumberList);
+            int leagueHigh = studentDetailService.selectTrueByExamNumber(analyse.getId(),leagues,null ,examNumberList,leagueHighStudent);
+            int leagueLow = studentDetailService.selectTrueByExamNumber(analyse.getId(),leagues,null ,examNumberList,leagueLowStudent);
+
+            Double schoolSumScore = studentDetailService.selectSumScore(analyse.getId(),null,GetLearnDto.getSchoolName(),examNumberList);
+            int high = studentDetailService.selectTrueByExamNumber(analyse.getId(),null,GetLearnDto.getSchoolName() ,examNumberList,highStudent);
+            int low = studentDetailService.selectTrueByExamNumber(analyse.getId(),null,GetLearnDto.getSchoolName() ,examNumberList,lowStudent);
+
+            form6.setScore(score);
+            form6.setAllRate(allSumScore / new Double(allStudents.size()) / score );
+            form6.setLeagueRate(leagueSumScore / new Double(leagueStudents.size()) / score );
+            form6.setSchoolRate(schoolSumScore / new Double(students.size()) / score);
+
+            form6.setAllAvg(allSumScore / new Double(allStudents.size()));
+            form6.setLeagueAvg(leagueSumScore / new Double(leagueStudents.size()));
+            form6.setSchoolAvg(schoolSumScore / new Double(students.size()));
+
+            form6.setAllDist(new Double(allHigh-allLow) / new Double(allNumber * analyseDimensionals.size()));
+            form6.setLeagueDist(new Double(leagueHigh-leagueLow) / new Double(leagueNumber * analyseDimensionals.size()));
+            form6.setSchoolDist(new Double(high-low) / new Double(number * analyseDimensionals.size()));
+            form6.setExamNumber(examNumber.toString().substring(0,examNumber.toString().length()-1));
+            list.add(form6);
+        }
+        repVO.setData(list);
+        return repVO;
+    }
+
+    private Form6RepVO initSchoolDimensional(GetLearnDto GetLearnDto , int dimensionalType){
+        Form6RepVO repVO = new Form6RepVO();
+        Analyse analyse = analyseService.selectById(GetLearnDto.getAnalyseId());
+        if(analyse == null){
+            repVO.setSuccess(false);
+            repVO.setMessage("请先创建考试");
+            return  repVO;
+        }
+        List<String> highStudent = new ArrayList<>();
+        List<String> lowStudent = new ArrayList<>();
+        List<Student> students = studentService.selectBySchoolName(analyse.getId(),null,GetLearnDto.getSchoolName());
+        int number = (int) Math.floor(students.size()*0.27) ;
+        {
+            //获取本校高分段 低分段 学生编号
+            for (int i = 0; i < number ; i++) {
+                highStudent.add(students.get(i).getStudentNumber());
+            }
+            for(int i =students.size()-number ; i < students.size() ; i++){
+                lowStudent.add(students.get(i).getStudentNumber());
+            }
+        }
+        List<Form6> list = new ArrayList<>();
+        List<Dimensional> knowledgeList = dimensionalService.selectByAnalyse(analyse.getId(),dimensionalType);
+        for(Dimensional dimensional : knowledgeList){
+            Form6 form6 = new Form6();
+            form6.setDimensional(dimensional.getDimensionalName());
+            List<AnalyseDimensional>  analyseDimensionals = analyseDimensionalService.selectByDimensional(analyse.getId(),dimensional.getId());
+            Double score = 0d;
+            StringBuffer examNumber = new StringBuffer();
+            List<String> examNumberList = new ArrayList<>();
+            for(AnalyseDimensional analyseDimensional :analyseDimensionals){
+                score = score + analyseDimensional.getScore() ;
+                examNumber.append(analyseDimensional.getQuestionNumber()).append(",");
+                examNumberList.add(analyseDimensional.getQuestionNumber());
+            }
+            Double schoolSumScore = studentDetailService.selectSumScore(analyse.getId(),null,GetLearnDto.getSchoolName(),examNumberList);
+            int high = studentDetailService.selectTrueByExamNumber(analyse.getId(),null,GetLearnDto.getSchoolName() ,examNumberList,highStudent);
+            int low = studentDetailService.selectTrueByExamNumber(analyse.getId(),null,GetLearnDto.getSchoolName() ,examNumberList,lowStudent);
+            form6.setScore(score);
+            form6.setSchoolRate(schoolSumScore / new Double(students.size()) / score);
+            form6.setSchoolAvg(schoolSumScore / new Double(students.size()));
+            form6.setSchoolDist(new Double(high-low) / new Double(number * analyseDimensionals.size()));
+            form6.setExamNumber(examNumber.toString().substring(0,examNumber.toString().length()-1));
+            list.add(form6);
+        }
+        repVO.setData(list);
+        return repVO;
+    }
+
+    @RequestMapping(value = "getSuggest", method = RequestMethod.POST)
+    public String getSuggest(@RequestBody GetLearnDto GetLearnDto){
+        String suggest = null ;
+        if(RedisUtils.existsObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_suggest")){
+            suggest = RedisUtils.getString(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_suggest");
+        }else {
+            SuggestRepVo suggestRepVo = new SuggestRepVo() ;
+            Analyse analyse = analyseService.selectById(GetLearnDto.getAnalyseId());
+            Double avg = studentService.selectAvgScore(analyse.getId(),null,GetLearnDto.getSchoolName()) ;
+            DecimalFormat df = new DecimalFormat("#.00");
+            //得分率
+            String avgStr = df.format(avg / analyse.getMaxScore());
+
+            List<Student> students = studentService.selectBySchoolName(GetLearnDto.getAnalyseId(),null,GetLearnDto.getSchoolName());
+            int a = studentService.selectCountByScore(GetLearnDto.getAnalyseId(),null,GetLearnDto.getSchoolName(),analyse.getMaxScore()*0.85,analyse.getMaxScore()+1f);
+            //优秀率
+            Double apercent = new Double(a) / new Double(students.size()) * 100 ;
+            String aStr = df.format(apercent);
+            String access = "";
+            if(avg>=80){
+                if(apercent >= 20){
+                    access = "良好";
+                }else {
+                    access = "相对可以";
+                }
+            }else if(avg >= 75){
+                if(apercent >= 35){
+                    access = "很好";
+                }else if(apercent >= 20){
+                    access = "良好";
+                }else {
+                    access = "相对可以";
+                }
+            }else if(avg >= 70){
+                if(apercent >= 20){
+                    access = "良好";
+                }else {
+                    access = "相对可以";
+                }
+            } else if (avg >= 60) {
+                if(apercent >= 10){
+                    access = "相对可以";
+                }else {
+                    access = "一般";
+                }
+            }else {
+                access = "暴露出一些问题，试卷偏难，学生掌握不够理想";
+            }
+            suggestRepVo.setAssess(access);
+            suggestRepVo.setDifficultyDegree(avgStr);
+            suggestRepVo.setExcellentRate(aStr);
+            suggestRepVo.setErrorList(getErrorRate(GetLearnDto.getAnalyseId(),GetLearnDto.getSchoolName(),students.size()));
+            Form6RepVO knowledge = initSchoolDimensional(GetLearnDto,DimensionalEnums.knowledge.getDimensionalType());
+            List<String> lessKnowledgeList = new ArrayList<>(); //不足50%
+            List<String> midKnowledgeList = new ArrayList<>(); //50-70%
+            for(Form6 form6 :knowledge.getData()){
+                if(form6.getSchoolRate() < 0.5d){
+                    lessKnowledgeList.add(form6.getDimensional());
+                }else if(form6.getSchoolRate() < 0.7d){
+                    midKnowledgeList.add(form6.getDimensional());
+                }
+            }
+            suggestRepVo.setLessKnowledgeList(lessKnowledgeList);
+            suggestRepVo.setMidKnowledgeList(midKnowledgeList);
+            Form6RepVO ability = initSchoolDimensional(GetLearnDto,DimensionalEnums.ability.getDimensionalType());
+            List<String> lessAbilityList = new ArrayList<>(); //不足70%
+            List<String> midAbilityList = new ArrayList<>(); //70-80%
+            List<String> highAbilityList = new ArrayList<>(); //大于80%
+            for(Form6 form6 :ability.getData()){
+                if(form6.getSchoolRate() < 0.7d){
+                    lessAbilityList.add(form6.getDimensional());
+                }else if(form6.getSchoolRate() < 0.8d){
+                    midAbilityList.add(form6.getDimensional());
+                }else if(form6.getSchoolRate() >= 0.8d){
+                    highAbilityList.add(form6.getDimensional());
+                }
+            }
+            suggestRepVo.setLessAbilityList(lessAbilityList);
+            suggestRepVo.setMidAbilityList(midAbilityList);
+            suggestRepVo.setHighAbilityList(highAbilityList);
+            Form6RepVO skill = initSchoolDimensional(GetLearnDto,DimensionalEnums.skill.getDimensionalType());
+            List<String> lessSkillList = new ArrayList<>(); //不足70%
+            List<String> midSkillList = new ArrayList<>(); //70-80%
+            List<String> highSkillList = new ArrayList<>(); //大于80%
+            for(Form6 form6 :skill.getData()){
+                if(form6.getSchoolRate() < 0.7d){
+                    lessSkillList.add(form6.getDimensional());
+                }else if(form6.getSchoolRate() < 0.8d){
+                    midSkillList.add(form6.getDimensional());
+                }else if(form6.getSchoolRate() >= 0.8d){
+                    highSkillList.add(form6.getDimensional());
+                }
+            }
+            suggestRepVo.setLessSkillList(lessSkillList);
+            suggestRepVo.setMidSkillList(midSkillList);
+            suggestRepVo.setHighSkillList(highSkillList);
+            suggest = initSuggest(suggestRepVo);
+            RedisUtils.setString(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_suggest",suggest);
+        }
+        return suggest;
+    }
+
+    private List<String> getErrorRate(int analyseId , String schoolName , int studentSize){
+        List<String> errorList = new ArrayList<>();
+        List<AnalyseDetail> analyseDetails = analyseDetailService.selectByAnalyseId(analyseId);
+        double errorNumber = Math.ceil(studentSize * 0.15) ;
+        for(AnalyseDetail analyseDetail :analyseDetails){
+            if("选择题".equals(analyseDetail.getQuestionType())){
+                int number = studentDetailService.selectTrueByExamNumber(analyseId,schoolName,analyseDetail.getQuestionNumber());
+                if(errorNumber < (studentSize-number)){
+                    errorList.add(analyseDetail.getQuestionNumber());
+                }
+            }
+        }
+        return errorList;
+    }
+
+    private String initSuggest(SuggestRepVo suggestRepVo){
+        StringBuffer stringBuffer = new StringBuffer();
+        stringBuffer.append("<p>本次检测总体情况").append(suggestRepVo.getAssess()).append("，难度系数是0")
+                .append(suggestRepVo.getDifficultyDegree()).append("，优秀率是").append(suggestRepVo.getExcellentRate()).append("%。")
+                .append("对有关知识，总体掌握情况比较好。</p><p>从考试结果分析，各知识点掌握程度较好，唯");
+        if(suggestRepVo.getMidKnowledgeList().size() != 0){
+            for (int i = 0; i < suggestRepVo.getMidKnowledgeList().size(); i++) {
+                if(i == suggestRepVo.getMidKnowledgeList().size() - 1 ){
+                    stringBuffer.append(suggestRepVo.getMidKnowledgeList().get(i));
+                }else {
+                    stringBuffer.append(suggestRepVo.getMidKnowledgeList().get(i)).append("、");
+                }
+            }
+            stringBuffer.append("几个知识点掌握较弱，");
+        }
+        if(suggestRepVo.getLessKnowledgeList().size() != 0){
+            for (int i = 0; i < suggestRepVo.getLessKnowledgeList().size(); i++) {
+                if(i == suggestRepVo.getLessKnowledgeList().size() - 1 ){
+                    stringBuffer.append(suggestRepVo.getLessKnowledgeList().get(i));
+                }else {
+                    stringBuffer.append(suggestRepVo.getLessKnowledgeList().get(i)).append("、");
+                }
+            }
+            stringBuffer.append("几个知识点学生的理解有些问题。");
+        }
+        stringBuffer.append("</p><p>探究技能方面：");
+        if(suggestRepVo.getHighSkillList().size() != 0){
+            for (int i = 0; i < suggestRepVo.getHighSkillList().size(); i++) {
+                if(i == suggestRepVo.getHighSkillList().size() - 1 ){
+                    stringBuffer.append(suggestRepVo.getHighSkillList().get(i));
+                }else {
+                    stringBuffer.append(suggestRepVo.getHighSkillList().get(i)).append("、");
+                }
+            }
+            stringBuffer.append("掌握的比较好，");
+        }
+        if(suggestRepVo.getMidSkillList().size() != 0){
+            for (int i = 0; i < suggestRepVo.getMidSkillList().size(); i++) {
+                if(i == suggestRepVo.getMidSkillList().size() - 1 ){
+                    stringBuffer.append(suggestRepVo.getMidSkillList().get(i));
+                }else {
+                    stringBuffer.append(suggestRepVo.getMidSkillList().get(i)).append("、");
+                }
+            }
+            stringBuffer.append("等相对较弱一些，");
+        }
+        if(suggestRepVo.getLessSkillList().size() != 0){
+            for (int i = 0; i < suggestRepVo.getLessSkillList().size(); i++) {
+                if(i == suggestRepVo.getLessSkillList().size() - 1 ){
+                    stringBuffer.append(suggestRepVo.getLessSkillList().get(i));
+                }else {
+                    stringBuffer.append(suggestRepVo.getLessSkillList().get(i)).append("、");
+                }
+            }
+            stringBuffer.append("学生掌握有些问题。");
+        }
+        stringBuffer.append("</p><p>学习能力上：");
+        if(suggestRepVo.getHighAbilityList().size() != 0){
+            for (int i = 0; i < suggestRepVo.getHighAbilityList().size(); i++) {
+                if(i == suggestRepVo.getHighAbilityList().size() - 1 ){
+                    stringBuffer.append(suggestRepVo.getHighAbilityList().get(i));
+                }else {
+                    stringBuffer.append(suggestRepVo.getHighAbilityList().get(i)).append("、");
+                }
+            }
+            stringBuffer.append("掌握较好，");
+        }
+        if(suggestRepVo.getMidAbilityList().size() != 0){
+            for (int i = 0; i < suggestRepVo.getMidAbilityList().size(); i++) {
+                if(i == suggestRepVo.getMidAbilityList().size() - 1 ){
+                    stringBuffer.append(suggestRepVo.getMidAbilityList().get(i));
+                }else {
+                    stringBuffer.append(suggestRepVo.getMidAbilityList().get(i)).append("、");
+                }
+            }
+            stringBuffer.append("等相对较弱一些，");
+        }
+        if(suggestRepVo.getLessAbilityList().size() != 0){
+            for (int i = 0; i < suggestRepVo.getLessAbilityList().size(); i++) {
+                if(i == suggestRepVo.getLessAbilityList().size() - 1 ){
+                    stringBuffer.append(suggestRepVo.getLessAbilityList().get(i));
+                }else {
+                    stringBuffer.append(suggestRepVo.getLessAbilityList().get(i)).append("、");
+                }
+            }
+            stringBuffer.append("学得还欠缺一些。");
+        }
+        if(suggestRepVo.getErrorList().size() != 0){
+            stringBuffer.append("另外，部分学生审题不够清楚、思维有定势，如选择题");
+            for (int i = 0; i < suggestRepVo.getErrorList().size(); i++) {
+                if(i == suggestRepVo.getErrorList().size() - 1 ){
+                    stringBuffer.append(suggestRepVo.getErrorList().get(i));
+                }else {
+                    stringBuffer.append(suggestRepVo.getErrorList().get(i)).append("、");
+                }
+            }
+            stringBuffer.append("错误率大于15%。");
+        }
+        stringBuffer.append("</p><p>后续复习巩固可以从抓好基础、提高能力和注重应用上下功夫。提升");
+        for (int i = 0; i < suggestRepVo.getLessKnowledgeList().size(); i++) {
+            if(i == suggestRepVo.getLessKnowledgeList().size() - 1 ){
+                stringBuffer.append(suggestRepVo.getLessKnowledgeList().get(i));
+            }else {
+                stringBuffer.append(suggestRepVo.getLessKnowledgeList().get(i)).append("、");
+            }
+        }
+        stringBuffer.append("的教学，减少低分面；以思维教学促进学生能力的提高，特别是");
+        for (int i = 0; i < suggestRepVo.getLessAbilityList().size(); i++) {
+            if(i == suggestRepVo.getLessAbilityList().size() - 1 ){
+                stringBuffer.append(suggestRepVo.getLessAbilityList().get(i));
+            }else {
+                stringBuffer.append(suggestRepVo.getLessAbilityList().get(i)).append("、");
+            }
+        }
+        stringBuffer.append("等方面的能力；重视将知识应用到具体的实践中，尤其是做好试题审题和思路分析的引导，教师自己开发一些新情景的试题。</p>");
+        return  stringBuffer.toString();
+    }
+
+    @RequestMapping(value = "getSuggest2", method = RequestMethod.POST)
+    public String getSuggest2(@RequestBody GetLearnDto GetLearnDto){
+        String suggest = null ;
+        if(RedisUtils.existsObject(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_suggest2")){
+            suggest = RedisUtils.getString(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_suggest2");
+        }else {
+            SuggestRepVo suggestRepVo = new SuggestRepVo() ;
+            Analyse analyse = analyseService.selectById(GetLearnDto.getAnalyseId());
+            Double avg = studentService.selectAvgScore(analyse.getId(),null,GetLearnDto.getSchoolName()) ;
+            DecimalFormat df = new DecimalFormat("#.00");
+            //得分率
+            String avgStr = df.format(avg / analyse.getMaxScore());
+
+            List<Student> students = studentService.selectBySchoolName(GetLearnDto.getAnalyseId(),null,GetLearnDto.getSchoolName());
+            int a = studentService.selectCountByScore(GetLearnDto.getAnalyseId(),null,GetLearnDto.getSchoolName(),analyse.getMaxScore()*0.85,analyse.getMaxScore()+1f);
+            //优秀率
+            Double apercent = new Double(a) / new Double(students.size()) * 100 ;
+            String aStr = df.format(apercent);
+            String access = "";
+            if(avg>=80){
+                if(apercent >= 20){
+                    access = "良好";
+                }else {
+                    access = "相对可以";
+                }
+            }else if(avg >= 75){
+                if(apercent >= 35){
+                    access = "很好";
+                }else if(apercent >= 20){
+                    access = "良好";
+                }else {
+                    access = "相对可以";
+                }
+            }else if(avg >= 70){
+                if(apercent >= 20){
+                    access = "良好";
+                }else {
+                    access = "相对可以";
+                }
+            } else if (avg >= 60) {
+                if(apercent >= 10){
+                    access = "相对可以";
+                }else {
+                    access = "一般";
+                }
+            }else {
+                access = "暴露出一些问题，试卷偏难，学生掌握不够理想";
+            }
+            suggestRepVo.setAssess(access);
+            suggestRepVo.setDifficultyDegree(avgStr);
+            suggestRepVo.setExcellentRate(aStr);
+            suggestRepVo.setErrorList(getErrorRate(GetLearnDto.getAnalyseId(),GetLearnDto.getSchoolName(),students.size()));
+            Form6RepVO knowledge = initSchoolDimensional(GetLearnDto,DimensionalEnums.knowledge.getDimensionalType());
+            List<String> lessKnowledgeList = new ArrayList<>(); //不足50%
+            List<String> midKnowledgeList = new ArrayList<>(); //50-70%
+            for(Form6 form6 :knowledge.getData()){
+                if(form6.getSchoolRate() < 0.5d){
+                    lessKnowledgeList.add(form6.getDimensional());
+                }else if(form6.getSchoolRate() < 0.7d){
+                    midKnowledgeList.add(form6.getDimensional());
+                }
+            }
+            suggestRepVo.setLessKnowledgeList(lessKnowledgeList);
+            suggestRepVo.setMidKnowledgeList(midKnowledgeList);
+            Form6RepVO ability = initSchoolDimensional(GetLearnDto,DimensionalEnums.ability.getDimensionalType());
+            List<String> lessAbilityList = new ArrayList<>(); //不足70%
+            List<String> midAbilityList = new ArrayList<>(); //70-80%
+            List<String> highAbilityList = new ArrayList<>(); //大于80%
+            for(Form6 form6 :ability.getData()){
+                if(form6.getSchoolRate() < 0.7d){
+                    lessAbilityList.add(form6.getDimensional());
+                }else if(form6.getSchoolRate() < 0.8d){
+                    midAbilityList.add(form6.getDimensional());
+                }else if(form6.getSchoolRate() >= 0.8d){
+                    highAbilityList.add(form6.getDimensional());
+                }
+            }
+            suggestRepVo.setLessAbilityList(lessAbilityList);
+            suggestRepVo.setMidAbilityList(midAbilityList);
+            suggestRepVo.setHighAbilityList(highAbilityList);
+            Form6RepVO skill = initSchoolDimensional(GetLearnDto,DimensionalEnums.skill.getDimensionalType());
+            List<String> lessSkillList = new ArrayList<>(); //不足70%
+            List<String> midSkillList = new ArrayList<>(); //70-80%
+            List<String> highSkillList = new ArrayList<>(); //大于80%
+            for(Form6 form6 :skill.getData()){
+                if(form6.getSchoolRate() < 0.7d){
+                    lessSkillList.add(form6.getDimensional());
+                }else if(form6.getSchoolRate() < 0.8d){
+                    midSkillList.add(form6.getDimensional());
+                }else if(form6.getSchoolRate() >= 0.8d){
+                    highSkillList.add(form6.getDimensional());
+                }
+            }
+            suggestRepVo.setLessSkillList(lessSkillList);
+            suggestRepVo.setMidSkillList(midSkillList);
+            suggestRepVo.setHighSkillList(highSkillList);
+            suggest = initSuggest2(suggestRepVo);
+            RedisUtils.setString(GetLearnDto.getAnalyseId()+"_"+GetLearnDto.getSchoolName()+"_suggest2",suggest);
+        }
+        return suggest;
+    }
+
+    private String initSuggest2(SuggestRepVo suggestRepVo){
+        StringBuffer stringBuffer = new StringBuffer();
+        stringBuffer.append("<p>本次检测总体情况").append(suggestRepVo.getAssess()).append("，难度系数是0")
+                .append(suggestRepVo.getDifficultyDegree()).append("，优秀率是").append(suggestRepVo.getExcellentRate()).append("%。")
+                .append("对有关知识，总体掌握情况比较好。</p><p>从考试结果分析，各知识点掌握程度较好，唯......");
+        stringBuffer.append("</p><p>后续复习巩固可以从抓好基础、提高能力和注重应用上下功夫......</p>");
+        return  stringBuffer.toString();
+    }
+
+}
@@ -0,0 +1,907 @@
+package com.sincere.independence.controller;
+
+import com.sincere.common.vo.BaseVo;
+import com.sincere.common.vo.independence.paike.*;
+import com.sincere.independence.model.*;
+import com.sincere.independence.service.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+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.util.*;
+
+@RestController
+@RequestMapping(value = "/schedule")
+@Api(value = "排课表")
+public class ScheduleController {
+
+    @Autowired
+    ClassCourseService classCourseService;
+
+    @Autowired
+    ClassModelService classModelService;
+
+    @Autowired
+    TeacherCourseService teacherCourseService;
+
+    @Autowired
+    TeacherClassService teacherClassService;
+
+    @Autowired
+    CourseService courseService;
+
+    @Autowired
+    JoinClassService joinClassService;
+
+    @Autowired
+    ScheduleService scheduleService;
+
+    @ApiOperation("作息安排")
+    @RequestMapping(value = "firstChoose", method = RequestMethod.POST)
+    public BaseVo firstChoose(@RequestBody FirstReqVo firstReqVo){
+        BaseVo baseVo = new BaseVo();
+        Schedule schedule = scheduleService.selectById(firstReqVo.getScheduleId());
+        if(schedule != null && schedule.getSpeed() == 0){
+            schedule.setMorning(firstReqVo.getMorning());
+            schedule.setAfternoon(firstReqVo.getAfternoon());
+            schedule.setNight(firstReqVo.getNight());
+            scheduleService.updateZuoxi(schedule);
+            firstReqVo.setDayNumber(firstReqVo.getMorning()+firstReqVo.getAfternoon()+firstReqVo.getNight());
+            List<ClassCourse> classCourses = new ArrayList<>();
+            //暂时只有单周
+            for (int i = 1; i <= 7; i++) {
+                classCourses.addAll(setClassCourse(false,i,firstReqVo));
+            }
+            classCourseService.insertSchoolClass(classCourses);
+            schedule.setSpeed(2);
+            scheduleService.updateSpeed(schedule);
+        }else {
+            baseVo.setMessage("排课计划不存在或已生成作息");
+            baseVo.setSuccess(false);
+        }
+        return  baseVo;
+    }
+
+    @ApiOperation("设置公共资源课，主课，副课")
+    @RequestMapping(value = "setCourseType", method = RequestMethod.POST)
+    public BaseVo setCourseType(@RequestBody SetTypeReqVo setTypeReqVo){
+        BaseVo baseVo = new BaseVo();
+        Schedule schedule = scheduleService.selectById(setTypeReqVo.getScheduleId());
+        if(schedule == null){
+            baseVo.setMessage("参数有误");
+            baseVo.setSuccess(false);
+            return baseVo;
+        }
+        if(teacherClassService.selectHasSchedule(schedule.getSchoolId(),schedule.getTeam()) >0){
+            baseVo.setMessage("已经部分排课，不能再设置");
+            baseVo.setSuccess(false);
+            return baseVo;
+        }
+        for(Integer courseId : setTypeReqVo.getCourseIdList()){
+            if(setTypeReqVo.getCourseType() !=1 && setTypeReqVo.getCourseType() != 2 &&setTypeReqVo.getCourseType() != 3){
+                baseVo.setMessage("课程类型错误");
+                baseVo.setSuccess(false);
+                return baseVo;
+            }
+            courseService.updateCourseType(courseId,setTypeReqVo.getCourseType(),schedule.getSchoolId());
+        }
+        return baseVo;
+    }
+
+    @ApiOperation("合班")
+    @RequestMapping(value = "joinClass", method = RequestMethod.POST)
+    public BaseVo joinClass(@RequestBody JoinClassReqVo joinClassReqVo){
+        BaseVo baseVo = new BaseVo();
+        Schedule schedule = scheduleService.selectById(joinClassReqVo.getScheduleId());
+        if(teacherClassService.selectHasSchedule(schedule.getSchoolId(),schedule.getTeam()) >0){
+            baseVo.setMessage("已经部分排课，不能再设置");
+            baseVo.setSuccess(false);
+            return baseVo;
+        }
+        Course course = courseService.selectBySchoolIdAndCourseId(schedule.getSchoolId(),joinClassReqVo.getCourseId());
+        List<JoinClass> list = new ArrayList<>();
+        String grade = null ;
+        String teacherName = null ;
+        for(Integer classId : joinClassReqVo.getClassIdList()){
+            ClassModel classModel = classModelService.selectByPrimaryKey(classId);
+            if(grade == null){
+                grade = classModel.getGrade();
+            }
+            if(!grade.equals(classModel.getGrade())){
+                baseVo.setMessage("合班不能跨年段");
+                baseVo.setSuccess(false);
+                return baseVo;
+            }
+            TeacherClass teacherClass = new TeacherClass();
+            teacherClass.setTeam(schedule.getTeam());
+            teacherClass.setSchoolId(schedule.getSchoolId());
+            teacherClass.setCourseName(course.getCourseName());
+            teacherClass.setClassId(classId);
+            TeacherClass resultTeacherClass = teacherClassService.selectByCourseAndClass(teacherClass);
+            if(teacherName == null){
+                teacherName = resultTeacherClass.getTeacherName();
+            }
+            if(!teacherName.equals(resultTeacherClass.getTeacherName())){
+                baseVo.setMessage("合班必须同一个老师");
+                baseVo.setSuccess(false);
+                return baseVo;
+            }
+            JoinClass joinClass = new JoinClass();
+            joinClass.setSchoolId(schedule.getSchoolId());
+            joinClass.setClassId(classId);
+            joinClass.setTeam(schedule.getTeam());
+            joinClass.setCourseId(course.getCourseId());
+            joinClass.setCourseName(course.getCourseName());
+            List<JoinClass> joinClasses = joinClassService.selectByCourse(joinClass);
+            if(joinClasses != null && joinClasses.size() > 0){
+                baseVo.setSuccess(false);
+                baseVo.setMessage("不能重复合班");
+                return baseVo;
+            }
+            list.add(joinClass);
+        }
+        joinClassService.insertBatch(list);
+        return baseVo;
+    }
+
+    @ApiOperation("删除某个合班信息")
+    @RequestMapping(value = "deleteJoinClass", method = RequestMethod.POST)
+    public BaseVo deleteJoinClass(@RequestBody CourseGroupReqVo courseGroupReqVo){
+        BaseVo baseVo = new BaseVo();
+        Schedule schedule = scheduleService.selectById(courseGroupReqVo.getScheduleId());
+        if(teacherClassService.selectHasSchedule(schedule.getSchoolId(),schedule.getTeam()) >0){
+            baseVo.setMessage("已经部分排课，不能再删除");
+            baseVo.setSuccess(false);
+            return baseVo;
+        }
+        joinClassService.deleteCourseGroup(courseGroupReqVo.getCourseGroup());
+        return baseVo;
+    }
+
+    @ApiOperation("不排课")
+    @RequestMapping(value = "noSchedule", method = RequestMethod.POST)
+    public BaseVo noSchedule(@RequestBody NoScheduleReqVo noScheduleReqVo){
+        BaseVo baseVo = new BaseVo();
+        Schedule schedule =scheduleService.selectById(noScheduleReqVo.getScheduleId());
+        if(teacherClassService.selectHasSchedule(schedule.getSchoolId(),schedule.getTeam()) >0){
+            baseVo.setMessage("已经部分排课，不能再设置");
+            baseVo.setSuccess(false);
+            return baseVo;
+        }
+        for(String msg : noScheduleReqVo.getList()){
+            try {
+                String[] arrayMsg = msg.split("-");
+                ClassCourse classCourse = new ClassCourse();
+                classCourse.setTeam(schedule.getTeam());
+                classCourse.setSchoolId(schedule.getSchoolId());
+                classCourse.setWeek(Integer.valueOf(arrayMsg[0]));
+                classCourse.setCourseNumber(Integer.valueOf(arrayMsg[1]));
+                classCourse.setSingleOrDouble(1);
+                if(noScheduleReqVo.getLevel() == 1){
+                    classCourse.setClassId(noScheduleReqVo.getClassId());
+                }
+                if(noScheduleReqVo.getLevel() == 2){
+                    classCourse.setGrade(noScheduleReqVo.getGrade());
+                }
+                List<ClassCourse> list = classCourseService.selectClassCourseByClass(classCourse);
+                for(ClassCourse temp : list){
+                    temp.setCourseName("不排课");
+                    classCourseService.updateByPrimaryKey(temp);
+                }
+            }catch (Exception e){
+                System.out.println("不排课"+e.toString());
+                baseVo.setSuccess(false);
+                baseVo.setMessage("格式不对");
+            }
+        }
+        return baseVo;
+    }
+
+    @ApiOperation("选择拟排科目类型，设置优先区间  提示")
+    @RequestMapping(value = "secondChooseBefore", method = RequestMethod.POST)
+    public BaseVo secondChooseBefore(@RequestBody ParallelClassReqVo parallelClassReqVo){
+        BaseVo baseVo = new BaseVo();
+        Schedule schedule = scheduleService.selectById(parallelClassReqVo.getScheduleId());
+        StringBuffer stringBuffer = new StringBuffer();
+        if(parallelClassReqVo.getLevel() == 1){
+            ClassModel classModel = classModelService.selectByPrimaryKey(parallelClassReqVo.getClassId());
+            stringBuffer.append("本次不排课设置，只涉及"+classModel.getClassName());
+        }else if(parallelClassReqVo.getLevel() == 2){
+            List<ClassModel> list = classModelService.selectBySchoolIdAndGrade(schedule.getSchoolId(),parallelClassReqVo.getGrade());
+            stringBuffer.append("本次不排课设置，共涉及"+list.size()+"个班");
+        }else {
+            List<ClassModel> list = classModelService.selectBySchoolId(schedule.getSchoolId());
+            stringBuffer.append("本次不排课设置，共涉及"+list.size()+"个班");
+        }
+        baseVo.setMessage(stringBuffer.toString());
+        return baseVo;
+    }
+
+    @Transactional
+    @ApiOperation("选择拟排科目类型，设置优先区间")
+    @RequestMapping(value = "secondChoose", method = RequestMethod.POST)
+    public BaseVo secondChoose(@RequestBody ParallelClassReqVo parallelClassReqVo) {
+        BaseVo baseVo = new BaseVo();
+        Schedule schedule = scheduleService.selectById(parallelClassReqVo.getScheduleId());
+        //TODO  暂时只有单周
+        boolean isDouble = false;
+        //优先范围
+        List<ClassCourse> limitList = new ArrayList<>();
+        for(String msg : parallelClassReqVo.getIntervalList()){
+            String[] arrayMsg = msg.split("-");
+            ClassCourse classCourse = new ClassCourse();
+            classCourse.setSingleOrDouble(1);
+            classCourse.setWeek(Integer.valueOf(arrayMsg[0]));
+            classCourse.setCourseNumber(Integer.valueOf(arrayMsg[1]));
+            limitList.add(classCourse);
+        }
+
+        //查询该课程类型下 所有的老师授课信息
+        Course course = new Course();
+        course.setSchoolId(schedule.getSchoolId());
+        course.setCourseType(parallelClassReqVo.getCourseType());
+        List<Course> courseList = courseService.selectByCourse(course);
+        List<TeacherClass> teacherClasss = new ArrayList<>();
+        int courseCount = 0 ;
+        for(Course course1 : courseList){
+            TeacherClass search = new TeacherClass();
+            search.setSchoolId(schedule.getSchoolId());
+            search.setCourseName(course1.getCourseName());
+            search.setTeam(schedule.getTeam());
+            if(parallelClassReqVo.getLevel() == 1){
+                search.setClassId(parallelClassReqVo.getClassId());
+            }
+            if(parallelClassReqVo.getLevel() == 2){
+                search.setGrade(parallelClassReqVo.getGrade());
+            }
+            List<TeacherClass> teacherClassList = teacherClassService.selectByCourseName(search);
+            courseCount = courseCount + teacherClassList.get(0).getTimes();
+            teacherClasss.addAll(teacherClassList);
+        }
+        if(courseCount > limitList.size()){
+            baseVo.setSuccess(false);
+            baseVo.setMessage("所要设置的公共课程数大于选择课表时段，请重新设置");
+            return baseVo;
+        }
+        //联排的优先级
+        List<Integer> joinList = new ArrayList<>();
+        for(int i = 1 ; i <= 5 ; i++) {
+            joinList.add(i);
+        }
+        Set<TeacherClass> teacherClassSet = new HashSet<>(teacherClasss);
+        for (TeacherClass temp : teacherClassSet) {
+            TeacherCourse teacherCourse = new TeacherCourse();
+            teacherCourse.setSchoolId(schedule.getSchoolId());
+            teacherCourse.setTeacherName(temp.getTeacherName());
+            teacherCourse.setTeam(schedule.getTeam());
+            //插入教师排课表
+            if(teacherCourseService.isCreateCourse(teacherCourse) == 0){
+                //插入教师排课表
+                insertTeacherCourse(isDouble, teacherCourse);
+            }
+            TeacherClass searchTeacher = new TeacherClass();
+            searchTeacher.setSchoolId(temp.getSchoolId());
+            searchTeacher.setTeam(temp.getTeam());
+            searchTeacher.setClassId(temp.getClassId());
+            searchTeacher.setTeacherName(temp.getTeacherName());
+            searchTeacher.setCourseName(temp.getCourseName());
+            TeacherClass teacherClass = teacherClassService.selectByTeacher(searchTeacher);
+            if(teacherClass.getStatus() == 1){
+                //已经排课不再排课
+            }else {
+                ClassCourse classCourse = new ClassCourse();
+                classCourse.setClassId(temp.getClassId());
+                classCourse.setTeam(schedule.getTeam());
+                classCourse.setSchoolId(schedule.getSchoolId());
+                classCourse.setSingleOrDouble(1);
+                List<ClassCourse> classCourses = classCourseService.selectByClassIdAndSingleOrDouble(classCourse);
+                initWeekCourse(parallelClassReqVo.getCourseType(),joinList,teacherClass,classCourses,limitList,0);
+                //排课结束，更新
+                //如果是合班的话，需要更新多个teacherClass
+                teacherClassService.updateSchedule(teacherClass.gettClassId());
+                JoinClass joinClass = new JoinClass();
+                joinClass.setSchoolId(schedule.getSchoolId());
+                joinClass.setTeam(schedule.getTeam());
+                joinClass.setCourseId(courseService.selectBySchoolIdAndCourseName(schedule.getSchoolId(),teacherClass.getCourseName()).getCourseId());
+                joinClass.setClassId(classCourse.getClassId());
+                List<JoinClass> joinClasses = joinClassService.selectByCourse(joinClass);
+                if(joinClasses != null && joinClasses.size() > 0){
+                    List<JoinClass> resultList = joinClassService.selectByCourseGroup(joinClasses.get(0).getCourseGroup());
+                    for(JoinClass joinClass1 :resultList){
+                            TeacherClass searchTeacherClass = new TeacherClass();
+                            searchTeacherClass.setSchoolId(schedule.getSchoolId());
+                            searchTeacherClass.setTeam(schedule.getTeam());
+                            searchTeacherClass.setCourseName(teacherClass.getCourseName());
+                            searchTeacherClass.setClassId(joinClass1.getClassId());
+                            TeacherClass resultTeacherClass = teacherClassService.selectByCourseAndClass(searchTeacherClass);
+                            teacherClassService.updateSchedule(resultTeacherClass.gettClassId());
+                    }
+                }
+
+            }
+        }
+        return baseVo;
+    }
+
+    @ApiOperation("排课撤回")
+    @RequestMapping(value = "recall", method = RequestMethod.POST)
+    public BaseVo recall(@RequestBody RecallReqVo recallReqVo){
+        BaseVo baseVo = new BaseVo();
+        Schedule schedule = scheduleService.selectById(recallReqVo.getScheduleId());
+        switch (recallReqVo.getNumber()){
+            case 1:
+                //不排课撤回
+                ClassCourse classCourse1 = new ClassCourse();
+                classCourse1.setSchoolId(schedule.getSchoolId());
+                classCourse1.setCourseName("不排课");
+                classCourseService.recallClassCourse(classCourse1);
+                break;
+            case 2:
+                //公共课不排课
+                recall(3,schedule);
+                break;
+            case 3:
+                //主课
+                recall(1,schedule);
+                break;
+            case 4:
+                recall(2,schedule);
+                break;
+        }
+        return baseVo;
+    }
+
+    private void recall(int courseType , Schedule schedule){
+        Course course = new Course();
+        course.setSchoolId(schedule.getSchoolId());
+        course.setCourseType(courseType);
+        List<Course> list = courseService.selectByCourse(course);
+        for(Course temp : list){
+            ClassCourse classCourse2 = new ClassCourse();
+            classCourse2.setSchoolId(schedule.getSchoolId());
+            classCourse2.setCourseName(temp.getCourseName());
+            classCourseService.recallClassCourse(classCourse2);
+            TeacherClass teacherClass = new TeacherClass();
+            teacherClass.setSchoolId(schedule.getSchoolId());
+            teacherClass.setTeam(schedule.getTeam());
+            teacherClass.setCourseName(temp.getCourseName());
+            List<TeacherClass> teacherClasses = teacherClassService.selectByCourseName(teacherClass);
+            for(TeacherClass teacherClass1 : teacherClasses){
+                TeacherCourse teacherCourse2 = new TeacherCourse();
+                teacherCourse2.setSchoolId(schedule.getSchoolId());
+                teacherCourse2.setTeam(schedule.getTeam());
+                teacherCourse2.setTeacherName(teacherClass1.getTeacherName());
+                teacherCourse2.setCourseName(temp.getCourseName());
+                teacherCourseService.recallTeacherCourse(teacherCourse2);
+                teacherClassService.recallTeacherClass(teacherClass1.gettClassId());
+            }
+
+        }
+    }
+
+    //设置当天课的信息
+    private List<ClassCourse> setClassCourse(boolean isDouble , int i , FirstReqVo firstReqVo){
+        List<ClassCourse> classCourses = new ArrayList<>();
+        Schedule schedule = scheduleService.selectById(firstReqVo.getScheduleId());
+        Date date = new Date();
+        for(int j = 1 ; j <= firstReqVo.getDayNumber() ; j++){
+            ClassCourse classCourse = new ClassCourse();
+            classCourse.setSingleOrDouble(isDouble ? 2 : 1);
+            classCourse.setSchoolId(schedule.getSchoolId());
+            classCourse.setWeek(i);
+            classCourse.setCourseNumber(j);
+            classCourse.setCreateTime(date);
+            classCourses.add(classCourse);
+            classCourse.setTeam(schedule.getTeam());
+        }
+        return classCourses;
+    }
+
+    /**
+     *
+     * @param courseType  所排课的课程类型 // 1 主课  2 副课 3 公共课
+     * @param joinList  联课优先级
+     * @param teacherClass  老师授课信息
+     * @param list      班级课程
+     * @param limitList  单课优先级
+     * @param functionTimes  循环次数
+     */
+    private void initWeekCourse(int courseType ,List<Integer> joinList ,TeacherClass teacherClass ,
+                                List<ClassCourse> list , List<ClassCourse> limitList ,int functionTimes){
+       List<Integer> sort = new ArrayList<>();
+        String team = teacherClass.getTeam();
+        int singleOrDouble = list.get(0).getSingleOrDouble();
+        for(ClassCourse classCourse : limitList){
+            if(!sort.contains(classCourse.getCourseNumber())){
+                sort.add(classCourse.getCourseNumber());
+            }
+        }
+        int times = 0 ;  //已经排课数
+        //先排联课
+        int joinTimes = 0 ;  //已经排联课数
+        for(int w = 0 ; w <= 4 ; w++) {
+            int week = joinList.get(w);
+            if(joinTimes == teacherClass.getJoinTimes()){
+                break;
+            }
+            for (int i = 0; i < sort.size(); i++) {
+                int courseNumber = sort.get(i);
+                ClassCourse classCourse = getClassCourse(list, week, courseNumber);
+                if(!sort.contains(courseNumber+1)){
+                    continue;
+                }
+                ClassCourse classCourseNext =getClassCourse(list, week, courseNumber+1);
+                if (StringUtils.isBlank(classCourse.getCourseName()) && StringUtils.isBlank(classCourseNext.getCourseName())) {
+                    Course course = courseService.selectBySchoolIdAndCourseName(teacherClass.getSchoolId(),teacherClass.getCourseName());
+                    classCourse.setCourseOpenId(course.getCourseId());
+                    classCourse.setCourseName(teacherClass.getCourseName());
+                    classCourseNext.setCourseOpenId(course.getCourseId());
+                    classCourseNext.setCourseName(teacherClass.getCourseName());
+                    TeacherCourse searchTeacherCourse = new TeacherCourse();
+                    searchTeacherCourse.setTeam(team);
+                    searchTeacherCourse.setSchoolId(teacherClass.getSchoolId());
+                    searchTeacherCourse.setGrade(teacherClass.getGrade());
+                    searchTeacherCourse.setTeacherName(teacherClass.getTeacherName());
+                    searchTeacherCourse.setSingleOrDouble(singleOrDouble);
+                    searchTeacherCourse.setWeek(week);
+                    searchTeacherCourse.setCourseName(teacherClass.getCourseName());
+                    //查询当天老师的课是否已经大于等于2  防止老师一天课程太多
+                    int dayCourse = teacherCourseService.selectTeacherDayCourseNumber(searchTeacherCourse);
+                    if(dayCourse >= 2){
+                        break;
+                    }
+                    searchTeacherCourse.setCourseNumber(courseNumber);
+                    TeacherCourse teacherFirst = teacherCourseService.selectTeacherCourse(searchTeacherCourse);
+                    searchTeacherCourse.setCourseNumber(courseNumber+1);
+                    TeacherCourse teacherSecond = teacherCourseService.selectTeacherCourse(searchTeacherCourse);
+                    if (StringUtils.isBlank(teacherFirst.getCourseName()) && StringUtils.isBlank(teacherSecond.getCourseName())) {
+                        classCourseService.updateByPrimaryKey(classCourse);
+                        classCourseService.updateByPrimaryKey(classCourseNext);
+                        teacherFirst.setCourseName(teacherClass.getCourseName());
+                        teacherFirst.setClassId(classCourse.getClassId()+"");
+                        teacherSecond.setCourseName(teacherClass.getCourseName());
+                        teacherSecond.setClassId(classCourse.getClassId()+"");
+                        teacherCourseService.updateTeacherCourse(teacherFirst);
+                        teacherCourseService.updateTeacherCourse(teacherSecond);
+                        times = times + 2;
+                        reSort(sort,courseNumber);
+                        reSort(sort,courseNumber+1);
+                        reSort(joinList,week);
+                        joinTimes++ ;
+                        break;
+                    } else {
+                        continue;
+                    }
+                }
+            }
+        }
+        //单节课
+        int before = 0 ;
+        for(int week = 1 ; week <= 5 ; week++){
+            if(times == teacherClass.getTimes()){
+                break;
+            }
+            if(before > 0){
+                sort = reSort(sort,before);
+            }
+            for(int i = 0 ; i < sort.size() ; i++){
+                int courseNumber = sort.get(i);
+                ClassCourse classCourse = getClassCourse(list,week,courseNumber);
+                boolean flag = false ;
+                //去判断 查出的classCourse 是否在limitList
+                for(ClassCourse temp : limitList){
+                    if(temp.getWeek() == classCourse.getWeek() &&
+                            temp.getCourseNumber() == classCourse.getCourseNumber()){
+                        flag = true ;
+                        break;
+                    }
+                }
+                if(flag){
+                    if(StringUtils.isBlank(classCourse.getCourseName())){
+                        Course course = courseService.selectBySchoolIdAndCourseName(teacherClass.getSchoolId(),teacherClass.getCourseName());
+                        //约束条件判断
+                        TeacherCourse result = checkConstraint(classCourse,teacherClass,course,singleOrDouble,week,courseNumber);
+                        if(result == null){
+                           break;
+                        }
+                        //设置课程
+                        if(setCourse(classCourse,teacherClass,result,course)){
+                            times++;
+                            before = courseNumber;
+                            break;
+                        }else {
+                            continue;
+                        }
+                    }
+                }
+            }
+        }
+        if(functionTimes > 2){
+            //递归次数限制，防止无限循环，内存溢出,手动优化课程
+            optimizeCourse(teacherClass);
+        }else{
+            if(times < teacherClass.getTimes()){
+                //优先时段中课程数 不够
+                teacherClass.setTimes(teacherClass.getTimes()-times);
+                teacherClass.setJoinTimes(teacherClass.getJoinTimes()-joinTimes);
+                //放大优先范围，上下一节，并去掉原来的优先范围
+                List<ClassCourse> newLimitList = new ArrayList<>();
+                int maxCourseNumber =classCourseService.selectMaxCourseNumber(teacherClass.getSchoolId(),team);
+                for(ClassCourse classCourse : limitList){
+                    if(classCourse.getCourseNumber() == 1){
+                        ClassCourse temp = new ClassCourse();
+                        temp.setWeek(classCourse.getWeek());
+                        temp.setCourseNumber(2);
+                        newLimitList.add(temp);
+                    }else if(classCourse.getCourseNumber() == maxCourseNumber){
+                        ClassCourse temp = new ClassCourse();
+                        temp.setWeek(classCourse.getWeek());
+                        temp.setCourseNumber(maxCourseNumber-1);
+                        newLimitList.add(temp);
+                    }else{
+                        ClassCourse temp = new ClassCourse();
+                        temp.setWeek(classCourse.getWeek());
+                        temp.setCourseNumber(classCourse.getCourseNumber()-1);
+                        newLimitList.add(temp);
+                        ClassCourse temp2 = new ClassCourse();
+                        temp2.setWeek(classCourse.getWeek());
+                        temp2.setCourseNumber(classCourse.getCourseNumber()+1);
+                        newLimitList.add(temp2);
+                    }
+                }
+                List<ClassCourse> result = new ArrayList<>();
+                for (int i = 0; i < newLimitList.size() ; i++) {
+                    boolean isExist = false ;
+                    for(ClassCourse classCourse : limitList){
+                        if(newLimitList.get(i).getWeek() == classCourse.getWeek() &&
+                                newLimitList.get(i).getCourseNumber() == classCourse.getCourseNumber()){
+                            isExist = true ;
+                        }
+                    }
+                    if(!isExist){
+                        result.add(newLimitList.get(i));
+                    }
+                }
+                functionTimes ++ ;
+                initWeekCourse(courseType,joinList,teacherClass,list,result,functionTimes);
+            }
+        }
+    }
+
+    //设置课程
+    private boolean setCourse(ClassCourse classCourse ,TeacherClass teacherClass , TeacherCourse result , Course course){
+        //合课 多做一层判断  另一个班级这节课也为空
+        JoinClass joinClass = new JoinClass();
+        joinClass.setSchoolId(classCourse.getSchoolId());
+        joinClass.setTeam(classCourse.getTeam());
+        joinClass.setCourseId(classCourse.getCourseOpenId());
+        joinClass.setClassId(classCourse.getClassId());
+        List<JoinClass> joinClasses = joinClassService.selectByCourse(joinClass);
+        if(joinClasses != null && joinClasses.size() > 0){
+            //说明是合班的课程
+            boolean isClash = false ;
+            List<ClassCourse> joinClassList = new ArrayList<>();
+            List<JoinClass> resultList = joinClassService.selectByCourseGroup(joinClasses.get(0).getCourseGroup());
+            for(JoinClass temp : resultList){
+                ClassCourse joinClassCourse = new ClassCourse();
+                joinClassCourse.setTeam(classCourse.getTeam());
+                joinClassCourse.setClassId(temp.getClassId());
+                joinClassCourse.setWeek(classCourse.getWeek());
+                joinClassCourse.setCourseNumber(classCourse.getCourseNumber());
+                joinClassCourse.setSingleOrDouble(classCourse.getSingleOrDouble());
+                ClassCourse joinResultClassCourse = classCourseService.selectClassCourse(joinClassCourse);
+                joinClassList.add(joinResultClassCourse);
+                if(StringUtils.isNotBlank(joinResultClassCourse.getCourseName())){
+                    isClash = true ;
+                    break;
+                }
+            }
+            if(isClash){
+                //合班的班级有 该节次的课 已经有老师上了
+                return false;
+            }else {
+                String classIdString = "";
+                for(ClassCourse temp : joinClassList){
+                    classIdString = course.getCourseId() + "," ;
+                    temp.setCourseOpenId(course.getCourseId());
+                    temp.setCourseName(teacherClass.getCourseName());
+                    classCourseService.updateByPrimaryKey(temp);
+                }
+                result.setGrade(classCourse.getGrade());
+                result.setClassId(classIdString);
+                result.setCourseName(classCourse.getCourseName());
+                teacherCourseService.updateTeacherCourse(result);
+                return true;
+            }
+        }else {
+            //普通课程
+            if(StringUtils.isBlank(result.getCourseName())){
+                classCourseService.updateByPrimaryKey(classCourse);
+                result.setGrade(classCourse.getGrade());
+                result.setClassId(classCourse.getClassId()+"");
+                result.setCourseName(classCourse.getCourseName());
+                teacherCourseService.updateTeacherCourse(result);
+                return true;
+            }else {
+                return false ;
+            }
+        }
+    }
+
+    //判断班级与老师的约束条件
+    private TeacherCourse checkConstraint(ClassCourse classCourse , TeacherClass teacherClass ,
+                                    Course course , int singleOrDouble , int week , int courseNumber ){
+        classCourse.setCourseOpenId(course.getCourseId());
+        classCourse.setCourseName(teacherClass.getCourseName());
+        //判断当天是否还能继续排课
+        TeacherClass searchTeacher = new TeacherClass();
+        searchTeacher.setSchoolId(teacherClass.getSchoolId());
+        searchTeacher.setTeam(teacherClass.getTeam());
+        searchTeacher.setClassId(teacherClass.getClassId());
+        searchTeacher.setTeacherName(teacherClass.getTeacherName());
+        searchTeacher.setCourseName(teacherClass.getCourseName());
+        TeacherClass resultTeacherClass = teacherClassService.selectByTeacher(searchTeacher);
+        if(resultTeacherClass.getTimes() > 5 && classCourseService.selectCourseByClassIdAndWeek(classCourse) >= 2){
+            return null ;
+        }
+        if(resultTeacherClass.getTimes() <= 5 && classCourseService.selectCourseByClassIdAndWeek(classCourse) >= 1){
+            return null ;
+        }
+        TeacherCourse searchTeacherCourse = new TeacherCourse();
+        searchTeacherCourse.setTeam(teacherClass.getTeam());
+        searchTeacherCourse.setSchoolId(teacherClass.getSchoolId());
+        searchTeacherCourse.setGrade(teacherClass.getGrade());
+        searchTeacherCourse.setTeacherName(teacherClass.getTeacherName());
+        searchTeacherCourse.setSingleOrDouble(singleOrDouble);
+        searchTeacherCourse.setWeek(week);
+        searchTeacherCourse.setCourseNumber(courseNumber);
+        searchTeacherCourse.setCourseName(teacherClass.getCourseName());
+        TeacherCourse result = teacherCourseService.selectTeacherCourse(searchTeacherCourse);
+        //老师当天课程不能多于 该老师平均课程
+        if(teacherCourseService.selectTeacherDayCourseNumber(searchTeacherCourse)
+                >= teacherClassService.selectTeacherDayClass(teacherClass.getSchoolId(),teacherClass.getTeam(),teacherClass.getTeacherName())){
+            return null ;
+        }
+        return result ;
+    }
+
+    //课程冲突 ，调优
+    private void optimizeCourse(TeacherClass teacherClass){
+        int times = teacherClass.getTimes();
+        int maxCourseNumber = classCourseService.selectMaxCourseNumber(teacherClass.getSchoolId(),teacherClass.getTeam()) ;
+        while (times > 0){
+            boolean flag = false ;
+            List<ClassCourse> noClassList = classCourseService.selectNoCourse(teacherClass.getClassId(),teacherClass.getTeam());
+            for(ClassCourse classCourse : noClassList){
+                for(int i = -2 ; i <= 2 ; i++){
+                    int weekChange = classCourse.getWeek()+i ;
+                    if(weekChange > 5){
+                        weekChange = weekChange - 5;
+                    }
+                    if(weekChange < 1){
+                        weekChange = weekChange + 5;
+                    }
+                    List<ClassCourse> list = classCourseService.selectWeekCourse(classCourse.getClassId(),weekChange,classCourse.getSingleOrDouble(),teacherClass.getCourseName(),teacherClass.getTeam());
+                    //查询当天的课程还能继续派排课
+                    TeacherClass searchTeacher = new TeacherClass();
+                    searchTeacher.setSchoolId(teacherClass.getSchoolId());
+                    searchTeacher.setTeam(teacherClass.getTeam());
+                    searchTeacher.setClassId(teacherClass.getClassId());
+                    searchTeacher.setTeacherName(teacherClass.getTeacherName());
+                    searchTeacher.setCourseName(teacherClass.getCourseName());
+                    TeacherClass resultTeacherClass = teacherClassService.selectByTeacher(searchTeacher);
+                    if(resultTeacherClass.getTimes() > 5 && list.size() >= 2){
+                        continue;
+                    }
+                    if(resultTeacherClass.getTimes() <= 5 && list.size() >= 1){
+                        continue;
+                    }
+                    for(int j = -1 ; j<=1 ; j++){
+                        int  courseNumberChange = classCourse.getCourseNumber() + j ;
+                        if(courseNumberChange > maxCourseNumber){
+                            continue;
+                        }
+                        if(courseNumberChange < 1){
+                            continue;
+                        }
+                        if(changeClass(classCourse,teacherClass,weekChange,courseNumberChange)){
+                            flag = true;
+                            break;
+                        }
+                    }
+                    if(flag){
+                        break;
+                    }
+                }
+                if(flag){
+                    break;
+                }
+            }
+            if(flag){
+                times-- ;
+            }
+        }
+    }
+
+    private boolean changeClass(ClassCourse classCourse , TeacherClass teacherClass , int weekChange ,int courseNumberChange){
+        String team = classCourse.getTeam();
+        int week = classCourse.getWeek();
+        int courseNumber = classCourse.getCourseNumber();
+        ClassCourse searchClass = new ClassCourse();
+        searchClass.setSingleOrDouble(classCourse.getSingleOrDouble());
+        searchClass.setClassId(classCourse.getClassId());
+        searchClass.setWeek(weekChange);
+        searchClass.setCourseNumber(courseNumberChange);
+        searchClass.setTeam(team);
+        ClassCourse nextClass = classCourseService.selectClassCourse(searchClass);
+        if(StringUtils.isBlank(nextClass.getCourseName())){
+            //替换的课 本来就没课
+            String className =teacherClass.getCourseName();
+            String nextNameClass = nextClass.getCourseName();
+            classCourse.setCourseOpenId(courseService.selectBySchoolIdAndCourseName(classCourse.getSchoolId(),nextNameClass).getCourseId());
+            classCourse.setCourseName(nextNameClass);
+            nextClass.setCourseOpenId(courseService.selectBySchoolIdAndCourseName(classCourse.getSchoolId(),className).getCourseId());
+            nextClass.setCourseName(className);
+            classCourseService.updateByPrimaryKey(classCourse);
+            classCourseService.updateByPrimaryKey(nextClass);
+
+            TeacherCourse teacherCourse = new TeacherCourse();
+            teacherCourse.setTeam(team);
+            teacherCourse.setSchoolId(classCourse.getSchoolId());
+            teacherCourse.setSingleOrDouble(classCourse.getSingleOrDouble());
+            teacherCourse.setGrade(classCourse.getGrade());
+            teacherCourse.setWeek(weekChange);
+            teacherCourse.setCourseNumber(courseNumberChange);
+            teacherCourse.setCourseName(className);
+            teacherCourse.setTeacherName(teacherClass.getTeacherName());
+            teacherCourse.setClassId(classCourse.getClassId()+"");
+            teacherCourseService.updateTeacherCourse(teacherCourse);
+            return true ;
+        }else {
+            //增加判断  不排课的课程不能替换 合班的课程不能替换  联课的可能不能替换
+            if(!nextClass.getCourseName().equals("不排课")){
+                JoinClass joinClass = new JoinClass();
+                joinClass.setSchoolId(nextClass.getSchoolId());
+                joinClass.setTeam(nextClass.getTeam());
+                joinClass.setCourseId(nextClass.getCourseId());
+                joinClass.setClassId(nextClass.getClassId());
+                List<JoinClass> joinClasses = joinClassService.selectByCourse(joinClass);
+                boolean joinClassFlag = joinClasses != null && joinClasses.size() > 0 ;
+                TeacherClass searchTeacherClass = new TeacherClass();
+                searchTeacherClass.setSchoolId(nextClass.getSchoolId());
+                searchTeacherClass.setTeam(nextClass.getTeam());
+                searchTeacherClass.setCourseName(nextClass.getCourseName());
+                List<TeacherClass> teacherClasses = teacherClassService.selectByCourseName(searchTeacherClass);
+                boolean joinTimesFlag = teacherClasses.get(0).getJoinTimes()>0?true:false;
+                if(nextClass.getCourseName().equals("不排课") || joinClassFlag || joinTimesFlag){
+                    //这些课 不能替换
+                }else {
+                    TeacherClass replaceClassTeacher = new TeacherClass();
+                    replaceClassTeacher.setSchoolId(classCourse.getSchoolId());
+                    replaceClassTeacher.setGrade(classCourse.getGrade());
+                    replaceClassTeacher.setClassId(classCourse.getClassId());
+                    replaceClassTeacher.setCourseName(nextClass.getCourseName());
+                    replaceClassTeacher.setTeam(team);
+                    String nextTeacher = teacherClassService.selectByCourseAndClass(replaceClassTeacher).getTeacherName();
+
+                    //原课的老师 下一节课是否有课 ；下一节课的老师 上一节是否有课
+                    TeacherCourse searchTeacher = new TeacherCourse();
+                    searchTeacher.setSchoolId(classCourse.getSchoolId());
+                    searchTeacher.setSingleOrDouble(classCourse.getSingleOrDouble());
+                    searchTeacher.setTeacherName(teacherClass.getTeacherName());
+                    searchTeacher.setWeek(weekChange);
+                    searchTeacher.setCourseNumber(courseNumberChange);
+                    searchTeacher.setTeam(team);
+                    TeacherCourse teacherCourse = teacherCourseService.selectTeacherCourse(searchTeacher);
+
+                    TeacherCourse nextTeacherCourseSearch = new TeacherCourse();
+                    nextTeacherCourseSearch.setSchoolId(classCourse.getSchoolId());
+                    nextTeacherCourseSearch.setSingleOrDouble(classCourse.getSingleOrDouble());
+                    nextTeacherCourseSearch.setTeacherName(nextTeacher);
+                    nextTeacherCourseSearch.setWeek(week);
+                    nextTeacherCourseSearch.setCourseNumber(courseNumber);
+                    nextTeacherCourseSearch.setTeam(team);
+                    TeacherCourse nextTeacherCourse = teacherCourseService.selectTeacherCourse(nextTeacherCourseSearch);
+                    if(StringUtils.isBlank(nextTeacherCourse.getCourseName()) && StringUtils.isBlank(teacherCourse.getCourseName())){
+                        //则上下替换课程  班级课程上下替换，老师课程交换
+                        String className =teacherClass.getCourseName();
+                        String nextClassName = nextClass.getCourseName();
+                        classCourse.setCourseName(nextClassName);
+                        nextClass.setCourseName(className);
+                        classCourseService.updateByPrimaryKey(classCourse);
+                        classCourseService.updateByPrimaryKey(nextClass);
+
+                        teacherCourse.setGrade(teacherClass.getGrade());
+                        teacherCourse.setCourseName(className);
+                        teacherCourse.setClassId(teacherClass.getClassId()+"");
+                        teacherCourseService.updateTeacherCourse(teacherCourse);
+
+                        nextTeacherCourse.setGrade(nextClass.getGrade());
+                        nextTeacherCourse.setCourseName(nextClassName);
+                        nextTeacherCourse.setClassId(nextClass.getClassId()+"");
+                        teacherCourseService.updateTeacherCourse(nextTeacherCourse);
+
+                        nextTeacherCourse.setWeek(weekChange);
+                        nextTeacherCourse.setCourseNumber(courseNumberChange);
+                        nextTeacherCourse.setCourseName(null);
+                        nextTeacherCourse.setClassId(null);
+                        teacherCourseService.updateTeacherCourse(nextTeacherCourse);
+                        return true ;
+                    }
+                }
+            }
+        }
+        return  false ;
+    }
+
+    //所谓权重  节次优先级
+    private List<Integer> reSort(List<Integer> list , int number){
+        int index = -1 ;
+        for(Integer i = 0 ; i < list.size() ;i++){
+            if(list.get(i) == number){
+                index = i ;
+                break ;
+            }
+        }
+        list.remove(index);
+        list.add(number);
+        return list ;
+    }
+
+    //查所在课表中 返回某天某节课
+    private ClassCourse getClassCourse(List<ClassCourse> list  , int week , int courseNumber){
+        ClassCourse result = null ;
+        for(ClassCourse classCourse : list){
+            if(classCourse.getWeek() == week && classCourse.getCourseNumber() == courseNumber){
+                result = classCourse ;
+                break;
+            }
+        }
+        return result;
+    }
+
+    //生成教师排课表
+    private void insertTeacherCourse(boolean isDouble , TeacherCourse teacherCourse){
+        List<TeacherCourse> list = new ArrayList<>();
+        //单周课表必生成
+        list.addAll(createWeekTeacherCourse(teacherCourse,false));
+        if(isDouble){
+            list.addAll(createWeekTeacherCourse(teacherCourse,true));
+        }
+        teacherCourseService.insertBatch(list);
+    }
+
+    // 创建教师 周课表 单周isDouble false 双周isDouble true
+    private List<TeacherCourse> createWeekTeacherCourse(TeacherCourse teacherCourse , boolean isDouble){
+        int singleOrDouble = 1 ;
+        if(isDouble){
+            singleOrDouble = 2;
+        }
+        Date date =new Date();
+        List<TeacherCourse> list = new ArrayList<>();
+        int courseNumMax = classCourseService.selectMaxCourseNumber(teacherCourse.getSchoolId(),teacherCourse.getTeam());
+        for (int i = 1; i <= 7; i++) {
+            for(int j = 1 ; j <= courseNumMax ; j++){
+                TeacherCourse temp = new TeacherCourse() ;
+                temp.setTeam(teacherCourse.getTeam());
+                temp.setSchoolId(teacherCourse.getSchoolId());
+                temp.setClassId(teacherCourse.getClassId());
+                temp.setGrade(teacherCourse.getGrade());
+                temp.setTeacherName(teacherCourse.getTeacherName());
+                temp.setWeek(i);
+                temp.setCourseNumber(j);
+                temp.setCreateTime(date);
+                temp.setSingleOrDouble(singleOrDouble);
+                list.add(temp);
+            }
+        }
+        return list ;
+    }
+
+}
@@ -0,0 +1,301 @@
+package com.sincere.independence.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.sincere.common.util.HttpClientUtils;
+import com.sincere.common.vo.BaseVo;
+import com.sincere.common.vo.independence.paike.InitRepVo;
+import com.sincere.independence.model.*;
+import com.sincere.independence.service.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@RestController
+@RequestMapping(value = "/init")
+@Api(value = "排课表")
+public class ScheduleInitController {
+
+    @Autowired
+    ClassModelService classModelService;
+
+    @Autowired
+    TeacherClassService teacherClassService;
+
+    @Autowired
+    CourseService courseService ;
+
+    @Autowired
+    TeacherService teacherService;
+
+    @Autowired
+    ScheduleService scheduleService;
+
+    @Autowired
+    TeacherCourseService teacherCourseService;
+
+    @Autowired
+    JoinClassService joinClassService;
+
+    @Autowired
+    ClassCourseService classCourseService;
+
+    @Value("${remoting.url}")
+    private String url ;
+
+    @ApiOperation("创建排课计划 ")
+    @RequestMapping(value = "createSchedule", method = RequestMethod.GET)
+    public int createSchedule(@RequestParam("team")String team , @RequestParam("scheduleName") String scheduleName ,
+                                        @RequestParam("schoolId") int schoolId){
+        Schedule schedule = new Schedule();
+        schedule.setTeam(team);
+        schedule.setScheduleName(scheduleName);
+        schedule.setSchoolId(schoolId);
+        Schedule temp = scheduleService.selectBySchoolAndTeam(schedule);
+        if(temp == null){
+            scheduleService.insert(schedule);
+        }else {
+            return 0 ;
+        }
+        temp = scheduleService.selectBySchoolAndTeam(schedule);
+        initMessage(schedule.getSchoolId());
+        return temp.getId();
+    }
+
+    @ApiOperation("更新计划")
+    @RequestMapping(value = "updateSchedule", method = RequestMethod.GET)
+    public BaseVo updateSchedule(@RequestParam("scheduleId") int scheduleId , @RequestParam("scheduleName")String scheduleName,
+                                 @RequestParam("team")String team){
+        BaseVo baseVo = new BaseVo();
+        Schedule schedule = scheduleService.selectById(scheduleId);
+        schedule.setScheduleName(scheduleName);
+        schedule.setTeam(team);
+        scheduleService.update(schedule);
+        return baseVo;
+    }
+
+    @ApiOperation("复制")
+    @RequestMapping(value = "copySchedule", method = RequestMethod.GET)
+    public BaseVo copySchedule(@RequestParam("scheduleId") int scheduleId , @RequestParam("scheduleName")String scheduleName,
+                               @RequestParam("team")String team){
+        BaseVo baseVo = new BaseVo();
+        Schedule schedule = scheduleService.selectById(scheduleId);
+        if(schedule == null){
+            baseVo.setMessage("原始课表不存在");
+            baseVo.setSuccess(false);
+            return  baseVo;
+        }
+        Schedule temp = new Schedule();
+        temp.setSchoolId(schedule.getSchoolId());
+        temp.setTeam(team);
+        Schedule result = scheduleService.selectBySchoolAndTeam(temp);
+        if(result != null){
+            baseVo.setMessage("该学年学期已创建课表计划");
+            baseVo.setSuccess(false);
+            return  baseVo;
+        }
+        temp.setScheduleName(scheduleName);
+        scheduleService.insert(temp);
+        Date date = new Date();
+        //复制 classCourse  teacherClass teacherCourse
+        List<ClassCourse> classCourses = classCourseService.copyClassCourse(schedule.getSchoolId(),schedule.getTeam());
+        for(ClassCourse classCourse :classCourses){
+            classCourse.setSchoolId(temp.getSchoolId());
+            classCourse.setTeam(temp.getTeam());
+            classCourse.setCreateTime(date);
+        }
+        classCourseService.insertBatch(classCourses);
+        TeacherClass teacherClass = new TeacherClass();
+        teacherClass.setSchoolId(schedule.getSchoolId());
+        teacherClass.setTeam(schedule.getTeam());
+        List<TeacherClass> teacherClasses = teacherClassService.selectBySchoolAndTeam(teacherClass);
+        for(TeacherClass teacherClass1 :teacherClasses){
+            teacherClass1.setSchoolId(temp.getSchoolId());
+            teacherClass1.setTeam(temp.getTeam());
+            teacherClass1.setCreateTime(date);
+        }
+        teacherClassService.insertBatch(teacherClasses);
+
+        List<TeacherCourse> teacherCourses = teacherCourseService.selectBySchoolIdAndTeam(schedule.getSchoolId(),schedule.getTeam());
+        for(TeacherCourse teacherCourse : teacherCourses){
+            teacherCourse.setSchoolId(temp.getSchoolId());
+            teacherCourse.setTeam(temp.getTeam());
+            teacherCourse.setCreateTime(date);
+        }
+        teacherCourseService.insertBatch(teacherCourses);
+        return baseVo;
+    }
+
+    @ApiOperation("删除排课计划")
+    @RequestMapping(value = "deleteSchedule", method = RequestMethod.GET)
+    public BaseVo deleteSchedule(@RequestParam("scheduleId") int scheduleId){
+        BaseVo baseVo = new BaseVo();
+        Schedule schedule = scheduleService.selectById(scheduleId);
+        if(schedule == null){
+            baseVo.setSuccess(false);
+            baseVo.setMessage("无排课计划");
+            return  baseVo;
+        }
+        teacherCourseService.deleteBySchoolIdAndTeam(schedule.getSchoolId(),schedule.getTeam());
+        joinClassService.deleteBySchoolIdAndTeam(schedule.getSchoolId(),schedule.getTeam());
+        classCourseService.deleteBySchoolIdAndTeam(schedule.getSchoolId(),schedule.getTeam());
+        TeacherClass teacherClass = new TeacherClass();
+        teacherClass.setSchoolId(schedule.getSchoolId());
+        teacherClass.setTeam(schedule.getTeam());
+        teacherClassService.deleteBySchoolAndTeam(teacherClass);
+        courseService.initSchoolId(schedule.getSchoolId());
+        scheduleService.deleteBySchedule(schedule.getId());
+        return baseVo;
+    }
+
+    @ApiOperation("获取基础信息")
+    @RequestMapping(value = "getInitMessage", method = RequestMethod.GET)
+    public InitRepVo getInitMessage(@RequestParam("scheduleId") int scheduleId){
+        InitRepVo initRepVo = new InitRepVo();
+        Schedule schedule = scheduleService.selectById(scheduleId);
+        if(schedule == null){
+            initRepVo.setSuccess(false);
+            initRepVo.setMessage("没有改排课计划");
+            return initRepVo;
+        }
+        List<Course> courses = courseService.selectBySchoolId2(schedule.getSchoolId());
+        List<Teacher> teachers = teacherService.selectBySchoolId(schedule.getSchoolId());
+        List<ClassModel> classModels = classModelService.selectBySchoolId(schedule.getSchoolId());
+        initRepVo.setClassNumber(classModels.size());
+        initRepVo.setCourseNumber(courses.size());
+        initRepVo.setTeacherNumber(teachers.size());
+        return initRepVo;
+    }
+
+    @Transactional
+    @ApiOperation("教师授课信息")
+    @RequestMapping(value = "initTeacherCourse", method = RequestMethod.POST)
+    public boolean initTeacherCourse(@RequestBody List<TeacherClass> teacherClasses){
+        BaseVo baseVo = new BaseVo();
+        Schedule search = new Schedule();
+        search.setSchoolId(teacherClasses.get(0).getSchoolId());
+        search.setTeam(teacherClasses.get(0).getTeam());
+        Schedule schedule = scheduleService.selectBySchoolAndTeam(search);
+        teacherClassService.insertBatch(teacherClasses);
+        schedule.setSpeed(3);
+        scheduleService.updateSpeed(schedule);
+        return true;
+    }
+
+    private void initMessage(int schoolId){
+        JSONObject teacherList = HttpClientUtils.httpGet(url+"/api/EasyN/GetSchoolTeacher?SchoolId="+schoolId);
+        List<JSONObject> openTeacherList = (List<JSONObject>)teacherList.get("data");
+        List<Teacher> teachers = new ArrayList<>();
+        for(JSONObject json :openTeacherList){
+            Teacher teacher = new Teacher();
+            teacher.setSchoolId(Integer.valueOf(json.get("school_id").toString()));
+            teacher.setTeacherId(Integer.valueOf(json.get("teacher_id").toString()));
+            teacher.setTeacherName(json.get("name").toString());
+            teachers.add(teacher);
+        }
+        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<>();
+        for(JSONObject json :openClasses){
+            ClassModel classModel = new ClassModel();
+            classModel.setSchoolId(Integer.valueOf(json.get("school_id").toString()));
+            classModel.setClassId(Integer.valueOf(json.get("class_id").toString()));
+            classModel.setGrade(json.get("gardeName").toString());
+            classModel.setClassName(json.get("class_name").toString());
+            classModels.add(classModel);
+        }
+        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<>();
+        for(JSONObject json :openCourses){
+            Course course = new Course();
+            course.setSchoolId(Integer.valueOf(json.get("school_id").toString()));
+            course.setCourseId(Integer.valueOf(json.get("subject_id").toString()));
+            course.setCourseName(json.get("subject_name").toString());
+            course.setCourseType(0);
+            courses.add(course);
+        }
+        initCourse(courses,schoolId);
+    }
+
+    public BaseVo initCourse(List<Course> courseList ,int schoolId){
+        BaseVo baseVo = new BaseVo();
+        courseService.deleteSchoolId(schoolId);
+        for(Course course : courseList){
+            if(course.getCourseId() == 0 || StringUtils.isBlank(course.getCourseName())){
+                baseVo.setSuccess(false);
+                baseVo.setMessage("缺少参数");
+                break;
+            }
+        }
+        if(baseVo.isSuccess()){
+            courseService.insertBatch(courseList);
+            baseVo.setSuccess(true);
+            return baseVo;
+        }else {
+            return baseVo;
+        }
+    }
+
+    public BaseVo initClass(List<ClassModel> classList , int schoolId){
+        BaseVo baseVo = new BaseVo();
+        classModelService.deleteSchool(schoolId);
+        for(ClassModel classModel : classList){
+            if(classModel.getClassId() == 0 || StringUtils.isBlank(classModel.getClassName()) ||
+                    StringUtils.isBlank(classModel.getGrade()) || classModel.getSchoolId() == 0){
+                baseVo.setSuccess(false);
+                baseVo.setMessage("缺少参数");
+                break;
+            }
+        }
+        if(baseVo.isSuccess()){
+            classModelService.insertBatch(classList);
+            baseVo.setSuccess(true);
+            return baseVo;
+        }else {
+            return baseVo;
+        }
+    }
+
+    public BaseVo initTeacher(List<Teacher> teacherList , int schoolId){
+        List<Teacher> result = new ArrayList<>();
+        for(Teacher teacher : teacherList){
+            boolean isExist = false;
+            for(Teacher t : result){
+                if(t.getTeacherName().equals(teacher.getTeacherName())){
+                    isExist = true;
+                }
+            }
+            if(!isExist && StringUtils.isNotBlank(teacher.getTeacherName())){
+                result.add(teacher);
+            }
+        }
+        BaseVo baseVo = new BaseVo();
+        teacherService.deleteSchool(schoolId);
+        for(Teacher teacher : result){
+            if(teacher.getSchoolId() == 0 || StringUtils.isBlank(teacher.getTeacherName()) ||
+                    teacher.getTeacherId() == 0){
+                baseVo.setSuccess(false);
+                baseVo.setMessage("缺少参数");
+                break;
+            }
+        }
+        if(baseVo.isSuccess()){
+            teacherService.insertBatch(result);
+            baseVo.setSuccess(true);
+            return baseVo;
+        }else {
+            return baseVo;
+        }
+    }
+
+}
@@ -0,0 +1,391 @@
+package com.sincere.independence.controller;
+
+import com.sincere.common.dto.independence.*;
+import com.sincere.common.vo.BaseVo;
+import com.sincere.common.vo.independence.paike.*;
+import com.sincere.independence.model.*;
+import com.sincere.independence.service.*;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/11 0011 14:00
+ */
+@RestController
+public class ScheduleMessageController {
+
+    @Autowired
+    ScheduleService scheduleService;
+
+    @Autowired
+    CourseService courseService;
+
+    @Autowired
+    ClassCourseService classCourseService;
+
+    @Autowired
+    ClassModelService classModelService;
+
+    @Autowired
+    JoinClassService joinClassService;
+
+    @Autowired
+    TeacherClassService teacherClassService;
+
+    @RequestMapping(value = "getScheduleList", method = RequestMethod.GET)
+    public ScheduleListRepVo getScheduleList(@RequestParam("schoolId") int schoolId){
+        ScheduleListRepVo scheduleListRepVo = new ScheduleListRepVo();
+        List<Schedule> scheduleList = scheduleService.selectBySchool(schoolId) ;
+        List<ScheduleDto> scheduleDtos = new ArrayList<>();
+        for(Schedule schedule:scheduleList){
+            scheduleDtos.add(initSchedule(schedule));
+        }
+        scheduleListRepVo.setData(scheduleDtos);
+        return scheduleListRepVo;
+    }
+
+    private ScheduleDto initSchedule(Schedule schedule){
+        ScheduleDto scheduleDto = new ScheduleDto();
+        scheduleDto.setId(schedule.getId());
+        scheduleDto.setScheduleName(schedule.getScheduleName());
+        scheduleDto.setSchoolId(schedule.getSchoolId());
+        scheduleDto.setTeam(schedule.getTeam());
+        scheduleDto.setCreateTime(schedule.getCreateTime());
+        scheduleDto.setUpdateTime(schedule.getUpdateTime());
+        scheduleDto.setSpeed(schedule.getSpeed());
+        scheduleDto.setMorning(schedule.getMorning());
+        scheduleDto.setAfternoon(schedule.getAfternoon());
+        scheduleDto.setNight(schedule.getNight());
+        return scheduleDto ;
+    }
+
+    @RequestMapping(value = "getClassList", method = RequestMethod.GET)
+    public ClassRepVo getClassList(@RequestParam("schoolId") int schoolId){
+        ClassRepVo classRepVo = new ClassRepVo();
+        List<ClassModel> classModels = classModelService.selectBySchoolId(schoolId);
+        List<ClassModelDto> list = new ArrayList<>();
+        for(ClassModel classModel :classModels){
+            list.add(initClassModel(classModel));
+        }
+        classRepVo.setData(list);
+        return classRepVo;
+    }
+
+    private ClassModelDto initClassModel(ClassModel classModel){
+        ClassModelDto classModelDto = new ClassModelDto();
+        classModelDto.setClassId(classModel.getClassId());
+        classModelDto.setClassName(classModel.getClassName());
+        classModelDto.setGrade(classModel.getGrade());
+        classModelDto.setSchoolId(classModel.getSchoolId());
+        return classModelDto;
+    }
+
+    @RequestMapping(value = "getCourseList", method = RequestMethod.GET)
+    public CourseRepVo getCourseList(@RequestParam("scheduleId") int scheduleId){
+        CourseRepVo courseRepVo = new CourseRepVo();
+        Schedule schedule = scheduleService.selectById(scheduleId);
+        if(schedule == null){
+            courseRepVo.setSuccess(false);
+            courseRepVo.setMessage("请先创建计划");
+            return courseRepVo;
+        }
+        List<Course> list = courseService.selectBySchoolId(schedule.getSchoolId());
+        List<CourseDto> courseDtos = new ArrayList<>();
+        for(Course course : list){
+            courseDtos.add(initCourse(course));
+        }
+        courseRepVo.setData(courseDtos);
+        return courseRepVo;
+    }
+
+    private CourseDto initCourse(Course course){
+        CourseDto courseDto = new CourseDto();
+        courseDto.setCourseId(course.getCourseId());
+        courseDto.setCourseName(course.getCourseName());
+        courseDto.setCourseType(course.getCourseType());
+        courseDto.setId(course.getId());
+        courseDto.setSchoolId(course.getSchoolId());
+        return courseDto;
+    }
+
+    @RequestMapping(value = "getCourseClassList", method = RequestMethod.GET)
+    public List<GetCourseClassListRepVo> getCourseClassList(@RequestParam("scheduleId") int scheduleId , @RequestParam("courseId") int courseId){
+        List<GetCourseClassListRepVo> repVos = new ArrayList<>();
+        Schedule schedule = scheduleService.selectById(scheduleId);
+        if(schedule == null){
+            return null;
+        }
+        TeacherClass search = new TeacherClass();
+        search.setSchoolId(schedule.getSchoolId());
+        search.setTeam(schedule.getTeam());
+        String courseName =courseService.selectBySchoolIdAndCourseId(schedule.getSchoolId(),courseId).getCourseName();
+        search.setCourseName(courseName);
+        List<TeacherClass> list = teacherClassService.selectByCourseName(search);
+        for(TeacherClass teacherClass : list){
+            GetCourseClassListRepVo repVo = new GetCourseClassListRepVo();
+            repVo.setClassId(teacherClass.getClassId());
+            repVo.setClassName(classModelService.selectByPrimaryKey(teacherClass.getClassId()).getClassName());
+            repVo.setCourseId(courseId);
+            repVo.setCourseName(courseName);
+            repVo.setTeacherName(teacherClass.getTeacherName());
+            repVos.add(repVo);
+        }
+        return repVos;
+    }
+
+    @ApiOperation("获取班级排课课程")
+    @RequestMapping(value = "getClassCourseList", method = RequestMethod.GET)
+    public ClassCourseRepVo getClassCourseList(@RequestParam("scheduleId") int scheduleId , @RequestParam("classId") int classId){
+        ClassCourseRepVo classCourseRepVo = new ClassCourseRepVo();
+        Schedule schedule = scheduleService.selectById(scheduleId);
+        if(schedule == null){
+            classCourseRepVo.setSuccess(false);
+            classCourseRepVo.setMessage("请先创建计划");
+            return classCourseRepVo;
+        }
+        ClassCourse search = new ClassCourse();
+        search.setClassId(classId);
+        search.setSingleOrDouble(1);
+        search.setTeam(schedule.getTeam());
+        List<ClassCourse> list = classCourseService.selectByClassIdAndSingleOrDouble(search);
+        List<ClassCourseDto> classCourseDtos = new ArrayList<>();
+        for(ClassCourse classCourse : list){
+            classCourseDtos.add(initClassCourse(classCourse));
+        }
+        classCourseRepVo.setData(classCourseDtos);
+
+        int max = schedule.getMorning() + schedule.getAfternoon() + schedule.getNight() ;
+        for(int i = 1 ; i < 6 ; i++){
+            System.out.print("周"+i+"    ");
+            for(int j = 1 ; j < max ; j++){
+                System.out.print(getClassCourse(list,i,j).getCourseName() + "   ");
+            }
+            System.out.println();
+        }
+        return classCourseRepVo;
+    }
+
+    private ClassCourseDto initClassCourse(ClassCourse classCourse){
+        ClassCourseDto classCourseDto = new ClassCourseDto();
+        classCourseDto.setClassId(classCourse.getClassId());
+        classCourseDto.setSchoolId(classCourse.getSchoolId());
+        classCourseDto.setTeam(classCourse.getTeam());
+        classCourseDto.setGrade(classCourse.getGrade());
+        classCourseDto.setCourseId(classCourse.getCourseId());
+        classCourseDto.setSingleOrDouble(classCourse.getSingleOrDouble());
+        classCourseDto.setWeek(classCourse.getWeek());
+        classCourseDto.setCourseNumber(classCourse.getCourseNumber());
+        classCourseDto.setCourseName(classCourse.getCourseName());
+        return classCourseDto;
+    }
+
+    //查所在课表中 返回某天某节课
+    private ClassCourse getClassCourse(List<ClassCourse> list  , int week , int courseNumber){
+        ClassCourse result = null ;
+        for(ClassCourse classCourse : list){
+            if(classCourse.getWeek() == week && classCourse.getCourseNumber() == courseNumber){
+                result = classCourse ;
+                break;
+            }
+        }
+        return result;
+    }
+
+
+    @ApiOperation("获取合班信息")
+    @RequestMapping(value = "getJoinList", method = RequestMethod.GET)
+    public JoinRepVo getJoinList(@RequestParam("scheduleId") int scheduleId){
+        JoinRepVo joinRepVo = new JoinRepVo();
+        Schedule schedule = scheduleService.selectById(scheduleId);
+        JoinClass joinClass = new JoinClass();
+        joinClass.setSchoolId(schedule.getSchoolId());
+        joinClass.setTeam(schedule.getTeam());
+        List<JoinClass> list = joinClassService.selectByCourse(joinClass);
+        List<JoinDetail> joinDetails = new ArrayList<>();
+        for(JoinClass temp : list){
+            boolean flag = false ;
+            ClassModel classModel = classModelService.selectByPrimaryKey(temp.getClassId());
+            for(JoinDetail joinDetail : joinDetails){
+                if(temp.getCourseGroup() == joinDetail.getCourseGroup()){
+                    flag = true;
+                    if(!joinDetail.getClassName().contains(classModel.getClassName())){
+                        joinDetail.setClassName(joinDetail.getClassName()+","+classModel.getClassName());
+                    }
+                }
+            }
+            if(!flag){
+                JoinDetail joinDetail = new JoinDetail();
+                joinDetail.setCourseGroup(temp.getCourseGroup());
+                joinDetail.setClassName(classModel.getClassName());
+                joinDetail.setCourseName(temp.getCourseName());
+                TeacherClass search = new TeacherClass();
+                search.setSchoolId(schedule.getSchoolId());
+                search.setTeam(schedule.getTeam());
+                search.setClassId(temp.getClassId());
+                search.setCourseName(temp.getCourseName());
+                joinDetail.setTeacherName(teacherClassService.selectByCourseAndClass(search).getTeacherName());
+                joinDetails.add(joinDetail);
+            }
+        }
+        joinRepVo.setData(joinDetails);
+        return joinRepVo;
+    }
+
+    @ApiOperation("获取导入任课信息")
+    @RequestMapping(value = "getTeacherClassList", method = RequestMethod.GET)
+    public TeacherCourseRepVo getTeacherClassList(@RequestParam("scheduleId") int scheduleId){
+        TeacherCourseRepVo teacherCourseRepVo = new TeacherCourseRepVo();
+        Schedule schedule = scheduleService.selectById(scheduleId);
+        TeacherClass temp = new TeacherClass();
+        temp.setSchoolId(schedule.getSchoolId());
+        temp.setTeam(schedule.getTeam());
+        List<ClassCourseVO> data = new ArrayList<>();
+        List<String> courseNameList = new ArrayList<>();
+        List<TeacherClass> teacherClasses = teacherClassService.selectBySchoolAndTeam(temp);
+        for(TeacherClass teacherClass :teacherClasses){
+            TeacherClassDto teacherClassDto = initTeacherClass(teacherClass);
+            boolean isExist = false;
+            if(!courseNameList.contains(teacherClass.getCourseName())){
+                courseNameList.add(teacherClass.getCourseName());
+            }
+            for(ClassCourseVO classCourseVO : data){
+                if(classCourseVO.getClassId() == teacherClass.getClassId()){
+                    isExist = true ;
+                    ClassCourseDetailVo classCourseDetailVo = new ClassCourseDetailVo(teacherClassDto);
+                    List<ClassCourseDetailVo> classCourseDetailVos = classCourseVO.getList();
+                    classCourseDetailVos.add(classCourseDetailVo);
+                    classCourseVO.setAllCount(classCourseVO.getAllCount()+teacherClass.getTimes());
+                    classCourseVO.setList(classCourseDetailVos);
+                }
+            }
+            if(!isExist){
+                ClassCourseVO classCourseVO = new ClassCourseVO();
+                classCourseVO.setClassId(teacherClass.getClassId());
+                classCourseVO.setAllCount(teacherClass.getTimes());
+                classCourseVO.setClassName(classModelService.selectByPrimaryKey(teacherClass.getClassId()).getClassName());
+                List<ClassCourseDetailVo> classCourseDetailVos = new ArrayList<>();
+                classCourseDetailVos.add(new ClassCourseDetailVo(teacherClassDto));
+                classCourseVO.setList(classCourseDetailVos);
+                data.add(classCourseVO);
+            }
+        }
+        teacherCourseRepVo.setData(data);
+        teacherCourseRepVo.setCourseNameList(courseNameList);
+        return teacherCourseRepVo;
+    }
+
+    private TeacherClassDto initTeacherClass(TeacherClass teacherClass){
+        TeacherClassDto teacherClassDto = new TeacherClassDto();
+        teacherClassDto.setClassId(teacherClass.getClassId());
+        teacherClassDto.setCourseName(teacherClass.getCourseName());
+        teacherClassDto.setCreateTime(teacherClass.getCreateTime());
+        teacherClassDto.setGrade(teacherClass.getGrade());
+        teacherClassDto.setJoinTimes(teacherClass.getJoinTimes());
+        teacherClassDto.setTimes(teacherClass.getTimes());
+        teacherClassDto.settClassId(teacherClass.gettClassId());
+        teacherClassDto.setTeacherId(teacherClass.getTeacherId());
+        teacherClassDto.setTeacherName(teacherClass.getTeacherName());
+        teacherClassDto.setSchoolId(teacherClass.getSchoolId());
+        teacherClassDto.setTeam(teacherClass.getTeam());
+        teacherClassDto.setStatus(teacherClass.getStatus());
+        return teacherClassDto;
+    }
+
+    @ApiOperation("获取主课，副科，公共课列表")
+    @RequestMapping(value = "getCourseTypeList", method = RequestMethod.GET)
+    public GetCourseTypeListRepVo getCourseTypeList(@RequestParam("scheduleId") int scheduleId){
+        GetCourseTypeListRepVo getCourseTypeListRepVo = new GetCourseTypeListRepVo();
+        List<CourseTypeListVO> data = new ArrayList<>();
+        Schedule schedule = scheduleService.selectById(scheduleId);
+        if(schedule == null){
+            getCourseTypeListRepVo.setSuccess(false);
+            getCourseTypeListRepVo.setMessage("请先创建计划");
+            return getCourseTypeListRepVo;
+        }
+        for(int i = 1 ; i <=3 ; i++){
+            CourseTypeListVO vo = new CourseTypeListVO();
+            vo.setCourseType(i);
+            switch (i){
+                case 1 :
+                    vo.setCourseTypeName("主课");
+                    break;
+                case 2:
+                    vo.setCourseTypeName("副科");
+                    break;
+                case 3:
+                    vo.setCourseTypeName("公共课");
+                    break;
+            }
+            Course course = new Course();
+            course.setSchoolId(schedule.getSchoolId());
+            course.setCourseType(i);
+            List<Course> courses = courseService.selectByCourse(course) ;
+            List<CourseDto> courseDtos = new ArrayList<>();
+            for(Course course1 : courses){
+                courseDtos.add(initCourse(course1));
+            }
+            vo.setList(courseDtos);
+            data.add(vo);
+        }
+        getCourseTypeListRepVo.setData(data);
+        getCourseTypeListRepVo.setScheduleId(schedule.getSchoolId());
+        return getCourseTypeListRepVo;
+    }
+
+    @ApiOperation("获取未设置学科类型的科目")
+    @RequestMapping(value = "getUnCourseList", method = RequestMethod.GET)
+    public CourseRepVo getUnCourseList(@RequestParam("scheduleId") int scheduleId){
+        CourseRepVo courseRepVo = new CourseRepVo();
+        Schedule schedule = scheduleService.selectById(scheduleId);
+        if(schedule == null){
+            courseRepVo.setSuccess(false);
+            courseRepVo.setMessage("请先创建计划");
+            return courseRepVo;
+        }
+        Course course = new Course();
+        course.setSchoolId(schedule.getSchoolId());
+        course.setCourseType(0);
+        List<Course> courses = courseService.selectByCourse(course) ;
+        List<CourseDto> courseDtos = new ArrayList<>();
+        for(Course course1 : courses){
+            courseDtos.add(initCourse(course1));
+        }
+        courseRepVo.setData(courseDtos);
+        return courseRepVo;
+    }
+
+    @ApiOperation("删除设置的 主课 副科 公共课")
+    @RequestMapping(value = "deleteCourseType", method = RequestMethod.GET)
+    public BaseVo deleteCourseType(@RequestParam("scheduleId") int scheduleId , @RequestParam("courseId") int courseId){
+        BaseVo baseVo = new BaseVo();
+        Schedule schedule = scheduleService.selectById(scheduleId);
+        if(schedule == null){
+            baseVo.setSuccess(false);
+            baseVo.setMessage("请先创建计划");
+            return baseVo;
+        }
+        if(teacherClassService.selectHasSchedule(schedule.getSchoolId(),schedule.getTeam()) > 0){
+            baseVo.setSuccess(false);
+            baseVo.setMessage("已经排课，不能再删除");
+            return baseVo;
+        }
+        courseService.updateCourseType(courseId,0,schedule.getSchoolId());
+        return baseVo;
+    }
+
+    @RequestMapping(value = "getSchedule", method = RequestMethod.GET)
+    public ScheduleDto getSchedule(@RequestParam("scheduleId") int scheduleId){
+        Schedule schedule = scheduleService.selectById(scheduleId);
+        return initSchedule(schedule);
+    }
+
+}
@@ -0,0 +1,29 @@
+package com.sincere.independence.mapper;
+
+import com.sincere.independence.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);
+
+    List<AnalyseDetail> selectByAnalyseId(int analyseId);
+
+    Double selectDifficult(AnalyseDetail analyseDetail);
+
+    Double selectSumType(AnalyseDetail analyseDetail);
+
+    List<AnalyseDetail> selectDifficultDetail(AnalyseDetail analyseDetail);
+
+    List<String> selectQuestionType(int analyseId);
+
+    List<String> selectQuestionNumberByType(AnalyseDetail analyseDetail);
+
+    List<String> selectQuestionNumberByDifficult(AnalyseDetail analyseDetail);
+}
@@ -0,0 +1,17 @@
+package com.sincere.independence.mapper;
+
+import com.sincere.independence.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);
+
+    List<AnalyseDimensional> selectByDimensional(AnalyseDimensional analyseDimensional);
+}
@@ -0,0 +1,23 @@
+package com.sincere.independence.mapper;
+
+import com.sincere.independence.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);
+
+    int update(Analyse analyse);
+
+    int updateChapter(Analyse analyse);
+}
@@ -0,0 +1,17 @@
+package com.sincere.independence.mapper;
+
+import com.sincere.independence.model.Chapter;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/24 0024 9:04
+ */
+public interface ChapterMapper {
+
+    int insertBatch(List<Chapter> list);
+
+    List<Chapter> selectByAnalyse(int analyseId);
+}
@@ -0,0 +1,36 @@
+package com.sincere.independence.mapper;
+
+import com.sincere.independence.model.ClassCourse;
+
+import java.util.List;
+
+public interface ClassCourseMapper {
+
+    int updateByPrimaryKey(ClassCourse record);
+
+    int insertBatch(List<ClassCourse> list);
+
+    ClassCourse selectClassCourse(ClassCourse classCourse);
+
+    int selectSingleOrDouble(ClassCourse classCourse);
+
+    int selectMaxCourseNumber(ClassCourse classCourse);
+
+    List<ClassCourse> selectByClassIdAndSingleOrDouble(ClassCourse classCourse);
+
+    List<ClassCourse> selectCourseByClassIdAndWeek(ClassCourse classCourse);
+
+    int updatePublicOreElective(ClassCourse classCourse);
+
+    List<ClassCourse> selectNoCourse(ClassCourse classCourse);
+
+    List<ClassCourse> selectWeekCourse(ClassCourse classCourse);
+
+    List<ClassCourse> selectClassCourseByClass(ClassCourse classCourse);
+
+    int deleteBySchoolIdAndTeam(ClassCourse classCourse);
+
+    int recallClassCourse(ClassCourse classCourse);
+
+    List<ClassCourse> copyClassCourse(ClassCourse classCourse);
+}
 \ No newline at end of file
@@ -0,0 +1,22 @@
+package com.sincere.independence.mapper;
+
+import com.sincere.independence.model.ClassModel;
+
+import java.util.List;
+
+public interface ClassModelMapper {
+
+    ClassModel selectByPrimaryKey(Integer classId);
+
+    int updateByPrimaryKey(ClassModel record);
+
+    List<ClassModel> selectBySchoolId(int schoolId);
+
+    int insertBatch(List<ClassModel> list);
+
+    ClassModel selectBySchoolIdAndClassNameAndGrade(ClassModel classModel);
+
+    List<ClassModel> selectBySchoolIdAndGrade(ClassModel classModel);
+
+    int deleteSchool(int schoolId);
+}
 \ No newline at end of file
@@ -0,0 +1,27 @@
+package com.sincere.independence.mapper;
+
+import com.sincere.independence.model.Course;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/9 0009 9:40
+ */
+public interface CourseMapper {
+
+    int insertBatch(List<Course> list);
+
+    List<Course> selectBySchoolId(int schoolId);
+
+    List<Course> selectBySchoolId2(int schoolId);
+
+    List<Course> selectByCourse(Course course);
+
+    int updateCourseType(Course course);
+
+    int deleteSchoolId(int schoolId);
+
+    int initSchoolId(int schoolId);
+}
@@ -0,0 +1,19 @@
+package com.sincere.independence.mapper;
+
+import com.sincere.independence.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);
+
+    List<Dimensional> selectByAnalyse(Dimensional dimensional);
+}
@@ -0,0 +1,25 @@
+package com.sincere.independence.mapper;
+
+import com.sincere.independence.model.JoinClass;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/10 0010 8:29
+ */
+public interface JoinClassMapper {
+
+    int insertBatch(List<JoinClass> list);
+
+    Integer selectMaxGroup();
+
+    List<JoinClass> selectByCourse(JoinClass joinClass);
+
+    List<JoinClass> selectByCourseGroup(int courseGroup);
+
+    int deleteCourseGroup(int courseGroup);
+
+    int deleteBySchoolIdAndTeam(JoinClass joinClass);
+}
	@@ -19,6 +19,16 @@		@@ -19,6 +19,16 @@
19		19
20	<dependencies>	20	<dependencies>
21	<dependency>	21	<dependency>
		22	+ <groupId>redis.clients</groupId>
		23	+ <artifactId>jedis</artifactId>
		24	+ <version>2.9.0</version>
		25	+ </dependency>
		26	+ <dependency>
		27	+ <groupId>org.apache.httpcomponents</groupId>
		28	+ <artifactId>httpclient</artifactId>
		29	+ <version>4.3</version>
		30	+ </dependency>
		31	+ <dependency>
22	<groupId>org.apache.tomcat.embed</groupId>	32	<groupId>org.apache.tomcat.embed</groupId>
23	<artifactId>tomcat-embed-core</artifactId>	33	<artifactId>tomcat-embed-core</artifactId>
24	</dependency>	34	</dependency>
	@@ -40,6 +50,16 @@		@@ -40,6 +50,16 @@
40	<artifactId>commons-collections</artifactId>	50	<artifactId>commons-collections</artifactId>
41	<version>3.2.2</version>	51	<version>3.2.2</version>
42	</dependency>	52	</dependency>
		53	+ <dependency>
		54	+ <groupId>io.springfox</groupId>
		55	+ <artifactId>springfox-swagger2</artifactId>
		56	+ <version>2.5.0</version>
		57	+ </dependency>
		58	+ <dependency>
		59	+ <groupId>io.springfox</groupId>
		60	+ <artifactId>springfox-swagger-ui</artifactId>
		61	+ <version>2.5.0</version>
		62	+ </dependency>
43	</dependencies>	63	</dependencies>
44		64
45	<build>	65	<build>
@@ -0,0 +1,76 @@		@@ -0,0 +1,76 @@
	1	+package com.sincere.common.dto.independence;
	2	+
	3	+import java.io.Serializable;
	4	+import java.util.Date;
	5	+
	6	+/**
	7	+ * @author chen
	8	+ * @version 1.0
	9	+ * @date 2019/11/13 0013 10:05
	10	+ */
	11	+public class AnalyseDetailDto implements Serializable {
	12	+
	13	+ private int id ;
	14	+ private int analyseId ;
	15	+ private String questionNumber ;
	16	+ private String questionType ;
	17	+ private int difficult ;
	18	+ private Double score ;
	19	+ private Date createTime ;
	20	+
	21	+ public int getId() {
	22	+ return id;
	23	+ }
	24	+
	25	+ public void setId(int id) {
	26	+ this.id = id;
	27	+ }
	28	+
	29	+ public int getAnalyseId() {
	30	+ return analyseId;
	31	+ }
	32	+
	33	+ public void setAnalyseId(int analyseId) {
	34	+ this.analyseId = analyseId;
	35	+ }
	36	+
	37	+ public String getQuestionNumber() {
	38	+ return questionNumber;
	39	+ }
	40	+
	41	+ public void setQuestionNumber(String questionNumber) {
	42	+ this.questionNumber = questionNumber;
	43	+ }
	44	+
	45	+ public int getDifficult() {
	46	+ return difficult;
	47	+ }
	48	+
	49	+ public void setDifficult(int difficult) {
	50	+ this.difficult = difficult;
	51	+ }
	52	+
	53	+ public Double getScore() {
	54	+ return score;
	55	+ }
	56	+
	57	+ public void setScore(Double score) {
	58	+ this.score = score;
	59	+ }
	60	+
	61	+ public Date getCreateTime() {
	62	+ return createTime;
	63	+ }
	64	+
	65	+ public void setCreateTime(Date createTime) {
	66	+ this.createTime = createTime;
	67	+ }
	68	+
	69	+ public String getQuestionType() {
	70	+ return questionType;
	71	+ }
	72	+
	73	+ public void setQuestionType(String questionType) {
	74	+ this.questionType = questionType;
	75	+ }
	76	+}
@@ -0,0 +1,67 @@		@@ -0,0 +1,67 @@
	1	+package com.sincere.common.dto.independence;
	2	+
	3	+import java.io.Serializable;
	4	+import java.util.Date;
	5	+
	6	+/**
	7	+ * @author chen
	8	+ * @version 1.0
	9	+ * @date 2019/11/13 0013 10:19
	10	+ */
	11	+public class AnalyseDimensionalDto implements Serializable {
	12	+
	13	+ private int id ;
	14	+ private int analyseId ;
	15	+ private String questionNumber ;
	16	+ private int dimensionalId ;
	17	+ private Double 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 getDimensionalId() {
	45	+ return dimensionalId;
	46	+ }
	47	+
	48	+ public void setDimensionalId(int dimensionalId) {
	49	+ this.dimensionalId = dimensionalId;
	50	+ }
	51	+
	52	+ public Double getScore() {
	53	+ return score;
	54	+ }
	55	+
	56	+ public void setScore(Double 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	+}
@@ -0,0 +1,85 @@		@@ -0,0 +1,85 @@
	1	+package com.sincere.common.dto.independence;
	2	+
	3	+import java.io.Serializable;
	4	+import java.util.Date;
	5	+
	6	+/**
	7	+ * @author chen
	8	+ * @version 1.0
	9	+ * @date 2019/11/13 0013 9:39
	10	+ */
	11	+public class AnalyseDto implements Serializable {
	12	+
	13	+ private int id ;
	14	+ private String examName ;
	15	+ private String examTime ;
	16	+ private String courseName ;
	17	+ private Date createTime ;
	18	+ private Double maxScore ;
	19	+ private String grade ;
	20	+ private String examScope ;
	21	+
	22	+ public int getId() {
	23	+ return id;
	24	+ }
	25	+
	26	+ public void setId(int id) {
	27	+ this.id = id;
	28	+ }
	29	+
	30	+ public String getExamName() {
	31	+ return examName;
	32	+ }
	33	+
	34	+ public void setExamName(String examName) {
	35	+ this.examName = examName;
	36	+ }
	37	+
	38	+ public String getExamTime() {
	39	+ return examTime;
	40	+ }
	41	+
	42	+ public void setExamTime(String examTime) {
	43	+ this.examTime = examTime;
	44	+ }
	45	+
	46	+ public String getCourseName() {
	47	+ return courseName;
	48	+ }
	49	+
	50	+ public void setCourseName(String courseName) {
	51	+ this.courseName = courseName;
	52	+ }
	53	+
	54	+ public Date getCreateTime() {
	55	+ return createTime;
	56	+ }
	57	+
	58	+ public void setCreateTime(Date createTime) {
	59	+ this.createTime = createTime;
	60	+ }
	61	+
	62	+ public Double getMaxScore() {
	63	+ return maxScore;
	64	+ }
	65	+
	66	+ public void setMaxScore(Double maxScore) {
	67	+ this.maxScore = maxScore;
	68	+ }
	69	+
	70	+ public String getGrade() {
	71	+ return grade;
	72	+ }
	73	+
	74	+ public void setGrade(String grade) {
	75	+ this.grade = grade;
	76	+ }
	77	+
	78	+ public String getExamScope() {
	79	+ return examScope;
	80	+ }
	81	+
	82	+ public void setExamScope(String examScope) {
	83	+ this.examScope = examScope;
	84	+ }
	85	+}
@@ -0,0 +1,132 @@		@@ -0,0 +1,132 @@
	1	+package com.sincere.common.dto.independence;
	2	+
	3	+import java.io.Serializable;
	4	+import java.util.Date;
	5	+
	6	+/**
	7	+ * @author chen
	8	+ * @version 1.0
	9	+ * @date 2019/11/13 0013 16:46
	10	+ */
	11	+public class ClassCourseDto implements Serializable {
	12	+
	13	+ private Integer courseId;
	14	+
	15	+ private Integer schoolId;
	16	+
	17	+ private String grade;
	18	+
	19	+ private Integer classId;
	20	+
	21	+ private Integer singleOrDouble;
	22	+
	23	+ private Integer week;
	24	+
	25	+ private Integer courseNumber;
	26	+
	27	+ private String courseName;
	28	+
	29	+ private Date createTime;
	30	+
	31	+ private Date updateTime;
	32	+
	33	+ private String team ;
	34	+
	35	+ private int courseOpenId ;
	36	+
	37	+ public Integer getCourseId() {
	38	+ return courseId;
	39	+ }
	40	+
	41	+ public void setCourseId(Integer courseId) {
	42	+ this.courseId = courseId;
	43	+ }
	44	+
	45	+ public Integer getSchoolId() {
	46	+ return schoolId;
	47	+ }
	48	+
	49	+ public void setSchoolId(Integer schoolId) {
	50	+ this.schoolId = schoolId;
	51	+ }
	52	+
	53	+ public String getGrade() {
	54	+ return grade;
	55	+ }
	56	+
	57	+ public void setGrade(String grade) {
	58	+ this.grade = grade;
	59	+ }
	60	+
	61	+ public Integer getClassId() {
	62	+ return classId;
	63	+ }
	64	+
	65	+ public void setClassId(Integer classId) {
	66	+ this.classId = classId;
	67	+ }
	68	+
	69	+ public Integer getSingleOrDouble() {
	70	+ return singleOrDouble;
	71	+ }
	72	+
	73	+ public void setSingleOrDouble(Integer singleOrDouble) {
	74	+ this.singleOrDouble = singleOrDouble;
	75	+ }
	76	+
	77	+ public Integer getWeek() {
	78	+ return week;
	79	+ }
	80	+
	81	+ public void setWeek(Integer week) {
	82	+ this.week = week;
	83	+ }
	84	+
	85	+ public Integer getCourseNumber() {
	86	+ return courseNumber;
	87	+ }
	88	+
	89	+ public void setCourseNumber(Integer courseNumber) {
	90	+ this.courseNumber = courseNumber;
	91	+ }
	92	+
	93	+ public String getCourseName() {
	94	+ return courseName;
	95	+ }
	96	+
	97	+ public void setCourseName(String courseName) {
	98	+ this.courseName = courseName == null ? null : courseName.trim();
	99	+ }
	100	+
	101	+ public Date getCreateTime() {
	102	+ return createTime;
	103	+ }
	104	+
	105	+ public void setCreateTime(Date createTime) {
	106	+ this.createTime = createTime;
	107	+ }
	108	+
	109	+ public Date getUpdateTime() {
	110	+ return updateTime;
	111	+ }
	112	+
	113	+ public void setUpdateTime(Date updateTime) {
	114	+ this.updateTime = updateTime;
	115	+ }
	116	+
	117	+ public String getTeam() {
	118	+ return team;
	119	+ }
	120	+
	121	+ public void setTeam(String team) {
	122	+ this.team = team;
	123	+ }
	124	+
	125	+ public int getCourseOpenId() {
	126	+ return courseOpenId;
	127	+ }
	128	+
	129	+ public void setCourseOpenId(int courseOpenId) {
	130	+ this.courseOpenId = courseOpenId;
	131	+ }
	132	+}
@@ -0,0 +1,51 @@		@@ -0,0 +1,51 @@
	1	+package com.sincere.common.dto.independence;
	2	+
	3	+import java.io.Serializable;
	4	+
	5	+/**
	6	+ * @author chen
	7	+ * @version 1.0
	8	+ * @date 2019/11/13 0013 16:35
	9	+ */
	10	+public class ClassModelDto implements Serializable {
	11	+
	12	+ private Integer classId;
	13	+
	14	+ private Integer schoolId;
	15	+
	16	+ private String grade;
	17	+
	18	+ private String className;
	19	+
	20	+ public Integer getClassId() {
	21	+ return classId;
	22	+ }
	23	+
	24	+ public void setClassId(Integer classId) {
	25	+ this.classId = classId;
	26	+ }
	27	+
	28	+ public Integer getSchoolId() {
	29	+ return schoolId;
	30	+ }
	31	+
	32	+ public void setSchoolId(Integer schoolId) {
	33	+ this.schoolId = schoolId;
	34	+ }
	35	+
	36	+ public String getGrade() {
	37	+ return grade;
	38	+ }
	39	+
	40	+ public void setGrade(String grade) {
	41	+ this.grade = grade;
	42	+ }
	43	+
	44	+ public String getClassName() {
	45	+ return className;
	46	+ }
	47	+
	48	+ public void setClassName(String className) {
	49	+ this.className = className == null ? null : className.trim();
	50	+ }
	51	+}
@@ -0,0 +1,57 @@		@@ -0,0 +1,57 @@
	1	+package com.sincere.common.dto.independence;
	2	+
	3	+import java.io.Serializable;
	4	+
	5	+/**
	6	+ * @author chen
	7	+ * @version 1.0
	8	+ * @date 2019/11/13 0013 16:38
	9	+ */
	10	+public class CourseDto implements Serializable {
	11	+
	12	+ private int id ;
	13	+ private int schoolId ;
	14	+ private int courseId ;
	15	+ private String courseName ;
	16	+ private int courseType;
	17	+
	18	+ public int getCourseId() {
	19	+ return courseId;
	20	+ }
	21	+
	22	+ public void setCourseId(int courseId) {
	23	+ this.courseId = courseId;
	24	+ }
	25	+
	26	+ public String getCourseName() {
	27	+ return courseName;
	28	+ }
	29	+
	30	+ public void setCourseName(String courseName) {
	31	+ this.courseName = courseName;
	32	+ }
	33	+
	34	+ public int getId() {
	35	+ return id;
	36	+ }
	37	+
	38	+ public void setId(int id) {
	39	+ this.id = id;
	40	+ }
	41	+
	42	+ public int getSchoolId() {
	43	+ return schoolId;
	44	+ }
	45	+
	46	+ public void setSchoolId(int schoolId) {
	47	+ this.schoolId = schoolId;
	48	+ }
	49	+
	50	+ public int getCourseType() {
	51	+ return courseType;
	52	+ }
	53	+
	54	+ public void setCourseType(int courseType) {
	55	+ this.courseType = courseType;
	56	+ }
	57	+}
@@ -0,0 +1,30 @@		@@ -0,0 +1,30 @@
	1	+package com.sincere.common.dto.independence;
	2	+
	3	+import java.io.Serializable;
	4	+
	5	+/**
	6	+ * @author chen
	7	+ * @version 1.0
	8	+ * @date 2019/11/13 0013 9:04
	9	+ */
	10	+public class GetLearnDto implements Serializable {
	11	+
	12	+ private int analyseId ;
	13	+ private String schoolName ;
	14	+
	15	+ public int getAnalyseId() {
	16	+ return analyseId;
	17	+ }
	18	+
	19	+ public void setAnalyseId(int analyseId) {
	20	+ this.analyseId = analyseId;
	21	+ }
	22	+
	23	+ public String getSchoolName() {
	24	+ return schoolName;
	25	+ }
	26	+
	27	+ public void setSchoolName(String schoolName) {
	28	+ this.schoolName = schoolName;
	29	+ }
	30	+}
@@ -0,0 +1,75 @@		@@ -0,0 +1,75 @@
	1	+package com.sincere.common.dto.independence;
	2	+
	3	+import java.io.Serializable;
	4	+
	5	+/**
	6	+ * @author chen
	7	+ * @version 1.0
	8	+ * @date 2019/11/13 0013 15:32
	9	+ */
	10	+public class JoinClassDto implements Serializable {
	11	+
	12	+ private int id ;
	13	+ private int schoolId ;
	14	+ private int classId ;
	15	+ private String team ;
	16	+ private int courseId ;
	17	+ private String courseName ;
	18	+ private int courseGroup ;
	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 getSchoolId() {
	29	+ return schoolId;
	30	+ }
	31	+
	32	+ public void setSchoolId(int schoolId) {
	33	+ this.schoolId = schoolId;
	34	+ }
	35	+
	36	+ public int getClassId() {
	37	+ return classId;
	38	+ }
	39	+
	40	+ public void setClassId(int classId) {
	41	+ this.classId = classId;
	42	+ }
	43	+
	44	+ public String getTeam() {
	45	+ return team;
	46	+ }
	47	+
	48	+ public void setTeam(String team) {
	49	+ this.team = team;
	50	+ }
	51	+
	52	+ public int getCourseId() {
	53	+ return courseId;
	54	+ }
	55	+
	56	+ public void setCourseId(int courseId) {
	57	+ this.courseId = courseId;
	58	+ }
	59	+
	60	+ public String getCourseName() {
	61	+ return courseName;
	62	+ }
	63	+
	64	+ public void setCourseName(String courseName) {
	65	+ this.courseName = courseName;
	66	+ }
	67	+
	68	+ public int getCourseGroup() {
	69	+ return courseGroup;
	70	+ }
	71	+
	72	+ public void setCourseGroup(int courseGroup) {
	73	+ this.courseGroup = courseGroup;
	74	+ }
	75	+}
@@ -0,0 +1,48 @@		@@ -0,0 +1,48 @@
	1	+package com.sincere.common.dto.independence;
	2	+
	3	+import java.io.Serializable;
	4	+
	5	+/**
	6	+ * @author chen
	7	+ * @version 1.0
	8	+ * @date 2019/11/13 0013 9:46
	9	+ */
	10	+public class LeagueDto implements Serializable {
	11	+
	12	+ private int id ;
	13	+ private int analyseId ;
	14	+ private String league ;
	15	+ private String schoolName ;
	16	+
	17	+ public int getId() {
	18	+ return id;
	19	+ }
	20	+
	21	+ public void setId(int id) {
	22	+ this.id = id;
	23	+ }
	24	+
	25	+ public int getAnalyseId() {
	26	+ return analyseId;
	27	+ }
	28	+
	29	+ public void setAnalyseId(int analyseId) {
	30	+ this.analyseId = analyseId;
	31	+ }
	32	+
	33	+ public String getLeague() {
	34	+ return league;
	35	+ }
	36	+
	37	+ public void setLeague(String league) {
	38	+ this.league = league;
	39	+ }
	40	+
	41	+ public String getSchoolName() {
	42	+ return schoolName;
	43	+ }
	44	+
	45	+ public void setSchoolName(String schoolName) {
	46	+ this.schoolName = schoolName;
	47	+ }
	48	+}