diff --git a/cloud/common/pom.xml b/cloud/common/pom.xml index 79499df..1f9bd63 100644 --- a/cloud/common/pom.xml +++ b/cloud/common/pom.xml @@ -19,6 +19,16 @@ + redis.clients + jedis + 2.9.0 + + + org.apache.httpcomponents + httpclient + 4.3 + + org.apache.tomcat.embed tomcat-embed-core @@ -40,6 +50,16 @@ commons-collections 3.2.2 + + io.springfox + springfox-swagger2 + 2.5.0 + + + io.springfox + springfox-swagger-ui + 2.5.0 + diff --git a/cloud/common/src/main/java/com/sincere/common/dto/independence/AnalyseDetailDto.java b/cloud/common/src/main/java/com/sincere/common/dto/independence/AnalyseDetailDto.java new file mode 100644 index 0000000..f3503a6 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/dto/independence/AnalyseDetailDto.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/dto/independence/AnalyseDimensionalDto.java b/cloud/common/src/main/java/com/sincere/common/dto/independence/AnalyseDimensionalDto.java new file mode 100644 index 0000000..45361b3 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/dto/independence/AnalyseDimensionalDto.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/dto/independence/AnalyseDto.java b/cloud/common/src/main/java/com/sincere/common/dto/independence/AnalyseDto.java new file mode 100644 index 0000000..f6353ff --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/dto/independence/AnalyseDto.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/dto/independence/ChapterDto.java b/cloud/common/src/main/java/com/sincere/common/dto/independence/ChapterDto.java new file mode 100644 index 0000000..8f2f614 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/dto/independence/ChapterDto.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/dto/independence/ClassCourseDto.java b/cloud/common/src/main/java/com/sincere/common/dto/independence/ClassCourseDto.java new file mode 100644 index 0000000..a784c0a --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/dto/independence/ClassCourseDto.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/dto/independence/ClassModelDto.java b/cloud/common/src/main/java/com/sincere/common/dto/independence/ClassModelDto.java new file mode 100644 index 0000000..d31fc16 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/dto/independence/ClassModelDto.java @@ -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(); + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/dto/independence/CourseDto.java b/cloud/common/src/main/java/com/sincere/common/dto/independence/CourseDto.java new file mode 100644 index 0000000..aac57b2 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/dto/independence/CourseDto.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/dto/independence/GetLearnDto.java b/cloud/common/src/main/java/com/sincere/common/dto/independence/GetLearnDto.java new file mode 100644 index 0000000..e82a47c --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/dto/independence/GetLearnDto.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/dto/independence/JoinClassDto.java b/cloud/common/src/main/java/com/sincere/common/dto/independence/JoinClassDto.java new file mode 100644 index 0000000..0b89397 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/dto/independence/JoinClassDto.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/dto/independence/LeagueDto.java b/cloud/common/src/main/java/com/sincere/common/dto/independence/LeagueDto.java new file mode 100644 index 0000000..05654b2 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/dto/independence/LeagueDto.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/dto/independence/ScheduleDto.java b/cloud/common/src/main/java/com/sincere/common/dto/independence/ScheduleDto.java new file mode 100644 index 0000000..7617ffc --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/dto/independence/ScheduleDto.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/dto/independence/StudentDetailDto.java b/cloud/common/src/main/java/com/sincere/common/dto/independence/StudentDetailDto.java new file mode 100644 index 0000000..85cbebd --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/dto/independence/StudentDetailDto.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/dto/independence/StudentDto.java b/cloud/common/src/main/java/com/sincere/common/dto/independence/StudentDto.java new file mode 100644 index 0000000..7f818bb --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/dto/independence/StudentDto.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/dto/independence/TeacherClassDto.java b/cloud/common/src/main/java/com/sincere/common/dto/independence/TeacherClassDto.java new file mode 100644 index 0000000..270eedb --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/dto/independence/TeacherClassDto.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/enums/DifficultEnums.java b/cloud/common/src/main/java/com/sincere/common/enums/DifficultEnums.java new file mode 100644 index 0000000..be5cabb --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/enums/DifficultEnums.java @@ -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 "" ; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/enums/DimensionalEnums.java b/cloud/common/src/main/java/com/sincere/common/enums/DimensionalEnums.java new file mode 100644 index 0000000..0fd4200 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/enums/DimensionalEnums.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/util/HttpClientUtils.java b/cloud/common/src/main/java/com/sincere/common/util/HttpClientUtils.java new file mode 100644 index 0000000..c138e63 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/util/HttpClientUtils.java @@ -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 diff --git a/cloud/common/src/main/java/com/sincere/common/util/RedisUtils.java b/cloud/common/src/main/java/com/sincere/common/util/RedisUtils.java new file mode 100644 index 0000000..f38d33f --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/util/RedisUtils.java @@ -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); + } + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/util/SerializeUtil.java b/cloud/common/src/main/java/com/sincere/common/util/SerializeUtil.java new file mode 100644 index 0000000..8845226 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/util/SerializeUtil.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/BaseVo.java b/cloud/common/src/main/java/com/sincere/common/vo/BaseVo.java new file mode 100644 index 0000000..46ef4cb --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/BaseVo.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/ClassCourseDetailVo.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/ClassCourseDetailVo.java new file mode 100644 index 0000000..96b4902 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/ClassCourseDetailVo.java @@ -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; + } + +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/ClassCourseRepVo.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/ClassCourseRepVo.java new file mode 100644 index 0000000..6cbad20 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/ClassCourseRepVo.java @@ -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 data; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/ClassCourseVO.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/ClassCourseVO.java new file mode 100644 index 0000000..8303354 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/ClassCourseVO.java @@ -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 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 getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/ClassRepVo.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/ClassRepVo.java new file mode 100644 index 0000000..0f652aa --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/ClassRepVo.java @@ -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 data ; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/CourseGroupReqVo.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/CourseGroupReqVo.java new file mode 100644 index 0000000..3961b5a --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/CourseGroupReqVo.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/CourseRepVo.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/CourseRepVo.java new file mode 100644 index 0000000..1a12765 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/CourseRepVo.java @@ -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 data ; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public CourseRepVo(){ + super(); + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/CourseTypeListVO.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/CourseTypeListVO.java new file mode 100644 index 0000000..9c44bf1 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/CourseTypeListVO.java @@ -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 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 getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/FirstReqVo.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/FirstReqVo.java new file mode 100644 index 0000000..1fd6902 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/FirstReqVo.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/GetCourseClassListRepVo.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/GetCourseClassListRepVo.java new file mode 100644 index 0000000..be7c605 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/GetCourseClassListRepVo.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/GetCourseTypeListRepVo.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/GetCourseTypeListRepVo.java new file mode 100644 index 0000000..dd05e6a --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/GetCourseTypeListRepVo.java @@ -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 data ; + + public int getScheduleId() { + return scheduleId; + } + + public void setScheduleId(int scheduleId) { + this.scheduleId = scheduleId; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/InitRepVo.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/InitRepVo.java new file mode 100644 index 0000000..d677762 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/InitRepVo.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/JoinClassReqVo.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/JoinClassReqVo.java new file mode 100644 index 0000000..688ca96 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/JoinClassReqVo.java @@ -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 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 getClassIdList() { + return classIdList; + } + + public void setClassIdList(List classIdList) { + this.classIdList = classIdList; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/JoinDetail.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/JoinDetail.java new file mode 100644 index 0000000..86d6bd6 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/JoinDetail.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/JoinRepVo.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/JoinRepVo.java new file mode 100644 index 0000000..c83ecfa --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/JoinRepVo.java @@ -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 data ; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/NoScheduleReqVo.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/NoScheduleReqVo.java new file mode 100644 index 0000000..5c0712b --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/NoScheduleReqVo.java @@ -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 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 getList() { + return list; + } + + public void setList(List 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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/ParallelClassReqVo.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/ParallelClassReqVo.java new file mode 100644 index 0000000..3f15b1c --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/ParallelClassReqVo.java @@ -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 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 getIntervalList() { + return intervalList; + } + + public void setIntervalList(List 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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/RecallReqVo.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/RecallReqVo.java new file mode 100644 index 0000000..55fd77d --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/RecallReqVo.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/ScheduleListRepVo.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/ScheduleListRepVo.java new file mode 100644 index 0000000..aeb0b3d --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/ScheduleListRepVo.java @@ -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 data ; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + public ScheduleListRepVo(){ + super(); + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/SetTypeReqVo.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/SetTypeReqVo.java new file mode 100644 index 0000000..5425c1a --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/SetTypeReqVo.java @@ -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 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 getCourseIdList() { + return courseIdList; + } + + public void setCourseIdList(List courseIdList) { + this.courseIdList = courseIdList; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/TeacherCourseRepVo.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/TeacherCourseRepVo.java new file mode 100644 index 0000000..1faa9f8 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/paike/TeacherCourseRepVo.java @@ -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 data ; + private List courseNameList ; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public List getCourseNameList() { + return courseNameList; + } + + public void setCourseNameList(List courseNameList) { + this.courseNameList = courseNameList; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form1.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form1.java new file mode 100644 index 0000000..71e9381 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form1.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form1RepVO.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form1RepVO.java new file mode 100644 index 0000000..058f0ce --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form1RepVO.java @@ -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 map ; + @ApiModelProperty(value="分数段详情") + private List list ; + + public Map getMap() { + return map; + } + + public void setMap(Map map) { + this.map = map; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form2.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form2.java new file mode 100644 index 0000000..8134780 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form2.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form2RepVO.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form2RepVO.java new file mode 100644 index 0000000..00511de --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form2RepVO.java @@ -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 data ; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form3.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form3.java new file mode 100644 index 0000000..07807e8 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form3.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form3RepVO.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form3RepVO.java new file mode 100644 index 0000000..f5a1ff5 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form3RepVO.java @@ -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 data ; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form4.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form4.java new file mode 100644 index 0000000..899e657 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form4.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form4RepVO.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form4RepVO.java new file mode 100644 index 0000000..e96da13 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form4RepVO.java @@ -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 data ; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form5.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form5.java new file mode 100644 index 0000000..d03f961 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form5.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form5RepVO.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form5RepVO.java new file mode 100644 index 0000000..cdf3770 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form5RepVO.java @@ -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 data ; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form6.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form6.java new file mode 100644 index 0000000..0317324 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form6.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form6RepVO.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form6RepVO.java new file mode 100644 index 0000000..04aa62a --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form6RepVO.java @@ -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 data ; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form7.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form7.java new file mode 100644 index 0000000..80fa9d3 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form7.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form7RepVO.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form7RepVO.java new file mode 100644 index 0000000..e035127 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form7RepVO.java @@ -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 list ; + @ApiModelProperty(value = "难度列表对应分值") + private List difficultList ; + @ApiModelProperty(value = "题型类型对应分值") + private List 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 getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public List getDifficultList() { + return difficultList; + } + + public void setDifficultList(List difficultList) { + this.difficultList = difficultList; + } + + public List getTypeList() { + return typeList; + } + + public void setTypeList(List 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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form8.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form8.java new file mode 100644 index 0000000..43080d0 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form8.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form8RepVO.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form8RepVO.java new file mode 100644 index 0000000..8abb5cc --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Form8RepVO.java @@ -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 data ; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/school/SuggestRepVo.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/SuggestRepVo.java new file mode 100644 index 0000000..d4ac84d --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/SuggestRepVo.java @@ -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 lessKnowledgeList ; + @ApiModelProperty(value = "知识点得分率不到70%") + private List midKnowledgeList ; + @ApiModelProperty(value = "学习能力得分率＜69%") + private List lessAbilityList ; + @ApiModelProperty(value = "学习能力得分率在70%≤η＜80%") + private List midAbilityList ; + @ApiModelProperty(value = "学习能力得分率≥80%") + private List highAbilityList ; + @ApiModelProperty(value = "探究技能方面得分率＜69%") + private List lessSkillList ; + @ApiModelProperty(value = "探究技能方面得分率在70%≤η＜80%") + private List midSkillList ; + @ApiModelProperty(value = "探究技能方面得分率≥80%") + private List highSkillList ; + @ApiModelProperty(value = "选择题错误率>15%") + private List errorList ; + + public List getErrorList() { + return errorList; + } + + public void setErrorList(List 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 getLessKnowledgeList() { + return lessKnowledgeList; + } + + public void setLessKnowledgeList(List lessKnowledgeList) { + this.lessKnowledgeList = lessKnowledgeList; + } + + public List getMidKnowledgeList() { + return midKnowledgeList; + } + + public void setMidKnowledgeList(List midKnowledgeList) { + this.midKnowledgeList = midKnowledgeList; + } + + public List getLessAbilityList() { + return lessAbilityList; + } + + public void setLessAbilityList(List lessAbilityList) { + this.lessAbilityList = lessAbilityList; + } + + public List getMidAbilityList() { + return midAbilityList; + } + + public void setMidAbilityList(List midAbilityList) { + this.midAbilityList = midAbilityList; + } + + public List getHighAbilityList() { + return highAbilityList; + } + + public void setHighAbilityList(List highAbilityList) { + this.highAbilityList = highAbilityList; + } + + public List getLessSkillList() { + return lessSkillList; + } + + public void setLessSkillList(List lessSkillList) { + this.lessSkillList = lessSkillList; + } + + public List getMidSkillList() { + return midSkillList; + } + + public void setMidSkillList(List midSkillList) { + this.midSkillList = midSkillList; + } + + public List getHighSkillList() { + return highSkillList; + } + + public void setHighSkillList(List highSkillList) { + this.highSkillList = highSkillList; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Table1.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Table1.java new file mode 100644 index 0000000..dd181e5 --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Table1.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Table2.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Table2.java new file mode 100644 index 0000000..00bc70b --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Table2.java @@ -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; + } +} diff --git a/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Table2RepVO.java b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Table2RepVO.java new file mode 100644 index 0000000..dc5058b --- /dev/null +++ b/cloud/common/src/main/java/com/sincere/common/vo/independence/school/Table2RepVO.java @@ -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 data ; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } +} diff --git a/cloud/common/src/main/resources/conf.properties b/cloud/common/src/main/resources/conf.properties new file mode 100644 index 0000000..de8d9c0 --- /dev/null +++ b/cloud/common/src/main/resources/conf.properties @@ -0,0 +1,4 @@ +#redis +redis.host=121.40.109.21 +redis.port=6379 +redis.password=123456 \ No newline at end of file diff --git a/cloud/independence/pom.xml b/cloud/independence/pom.xml new file mode 100644 index 0000000..fbf0f83 --- /dev/null +++ b/cloud/independence/pom.xml @@ -0,0 +1,181 @@ + + + + cloud + com.sincere + 1.0.0 + + 4.0.0 + + independence + + + + com.sincere + common + 0.0.1-SNAPSHOT + + + com.googlecode.rapid-framework + rapid-core + 4.0.5 + + + org.apache.commons + commons-lang3 + 3.3.2 + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.cloud + spring-cloud-starter-feign + 1.3.6.RELEASE + + + org.springframework.cloud + spring-cloud-openfeign-core + 2.1.2.RELEASE + + + io.springfox + springfox-swagger2 + 2.5.0 + + + io.springfox + springfox-swagger-ui + 2.5.0 + + + + org.slf4j + slf4j-api + 1.7.13 + + + + + commons-net + commons-net + 2.0 + + + org.apache.poi + poi + 4.1.0 + + + + org.apache.poi + poi-ooxml + 4.1.0 + + + com.fasterxml.jackson.core + jackson-core + 2.6.5 + + + com.fasterxml.jackson.core + jackson-databind + 2.6.5 + + + com.fasterxml.jackson.core + jackson-annotations + 2.6.5 + + + + + + independence + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + UTF-8 + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + com.jevon.Application + true + lib/ + + + ./config/ + + + + config/** + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy + package + + copy-dependencies + + + + ${project.build.directory}/lib + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.5 + + UTF-8 + + + + + maven-source-plugin + 2.2 + + true + + + + compile + + jar + + + + + + + + \ No newline at end of file diff --git a/cloud/independence/src/main/java/com/sincere/independence/IndependenceApplication.java b/cloud/independence/src/main/java/com/sincere/independence/IndependenceApplication.java new file mode 100644 index 0000000..db3b2e5 --- /dev/null +++ b/cloud/independence/src/main/java/com/sincere/independence/IndependenceApplication.java @@ -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); + } + +} diff --git a/cloud/independence/src/main/java/com/sincere/independence/Swagger2.java b/cloud/independence/src/main/java/com/sincere/independence/Swagger2.java new file mode 100644 index 0000000..d87d7c9 --- /dev/null +++ b/cloud/independence/src/main/java/com/sincere/independence/Swagger2.java @@ -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(); + } +} diff --git a/cloud/independence/src/main/java/com/sincere/independence/controller/LearnController.java b/cloud/independence/src/main/java/com/sincere/independence/controller/LearnController.java new file mode 100644 index 0000000..1361b99 --- /dev/null +++ b/cloud/independence/src/main/java/com/sincere/independence/controller/LearnController.java @@ -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 getList(){ + return learnFeign.getList(new AnalyseDto()); + } + + @ApiOperation("获取详情,微信入口") + @RequestMapping(value = "getDetail", method = RequestMethod.GET) + public List getAnalyseId(String grade , String schoolName){ + List result = new ArrayList<>(); + AnalyseDto search = new AnalyseDto(); + String[] msg = grade.split(","); + for(String gradeMsg : msg){ + search.setGrade(initGrade(gradeMsg,schoolName)); + List analyseList = learnFeign.getList(search); + if(analyseList != null && analyseList.size() > 0){ + for(AnalyseDto analyse :analyseList){ + List 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 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 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 analyseDetails = new ArrayList<>(); + List 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 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 analyseDetails = learnFeign.isImportExam(analyse.getId()); + Map 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 studentDetails = new ArrayList<>(); + List students = new ArrayList<>(); + Date date = new Date(); + int rows = sheet.getPhysicalNumberOfRows(); + Map 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 leagues = learnFeign.getLeagueByAnalyse(analyseId); + List getLeagues = new ArrayList<>(); + for(LeagueDto league : leagues){ + boolean isExist = false ; + for(GetLeague getLeague : getLeagues){ + if(getLeague.getLeagueName().equals(league.getLeague())){ + isExist = true ; + List list = getLeague.getLeagues(); + list.add(league); + getLeague.setLeagues(list); + } + } + if(!isExist){ + GetLeague getLeague = new GetLeague(); + getLeague.setLeagueName(league.getLeague()); + List 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 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 getSchoolName(int analyseId){ + return learnFeign.getSchoolName(analyseId); + } +} diff --git a/cloud/independence/src/main/java/com/sincere/independence/controller/LearnStatController.java b/cloud/independence/src/main/java/com/sincere/independence/controller/LearnStatController.java new file mode 100644 index 0000000..5df282a --- /dev/null +++ b/cloud/independence/src/main/java/com/sincere/independence/controller/LearnStatController.java @@ -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 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 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); + } + +} diff --git a/cloud/independence/src/main/java/com/sincere/independence/feign/LearnFeign.java b/cloud/independence/src/main/java/com/sincere/independence/feign/LearnFeign.java new file mode 100644 index 0000000..61f564c --- /dev/null +++ b/cloud/independence/src/main/java/com/sincere/independence/feign/LearnFeign.java @@ -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 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 getLeagueByAnalyse(@RequestParam("analyseId") int analyseId); + + @RequestMapping(value = "/learn/init/isImportExam", method = RequestMethod.GET) + List isImportExam(@RequestParam("analyseId") int analyseId); + + @RequestMapping(value = "/learn/init/insertBatchAnalyseDetail", method = RequestMethod.POST) + boolean insertBatchAnalyseDetail(@RequestBody List analyseDetailDtos); + + @RequestMapping(value = "/learn/init/insertBatchAnalyseDimensional", method = RequestMethod.POST) + boolean insertBatchAnalyseDimensional(@RequestBody List 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 studentDtos); + + @RequestMapping(value = "/learn/init/insertBatchStudentDetail", method = RequestMethod.POST) + boolean insertBatchStudentDetail(@RequestBody List 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 getSchoolName(@RequestParam("analyseId")int analyseId); + + @RequestMapping(value = "/learn/init/initChapter", method = RequestMethod.POST) + boolean initChapter(@RequestBody List 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 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 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); +} diff --git a/cloud/independence/src/main/java/com/sincere/independence/filter/AllowOriginFilter.java b/cloud/independence/src/main/java/com/sincere/independence/filter/AllowOriginFilter.java new file mode 100644 index 0000000..34c5f1c --- /dev/null +++ b/cloud/independence/src/main/java/com/sincere/independence/filter/AllowOriginFilter.java @@ -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() { + } +} + + diff --git a/cloud/independence/src/main/java/com/sincere/independence/vo/ChapterReq.java b/cloud/independence/src/main/java/com/sincere/independence/vo/ChapterReq.java new file mode 100644 index 0000000..23dc58e --- /dev/null +++ b/cloud/independence/src/main/java/com/sincere/independence/vo/ChapterReq.java @@ -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; + } +} diff --git a/cloud/independence/src/main/java/com/sincere/independence/vo/ChapterReqVo.java b/cloud/independence/src/main/java/com/sincere/independence/vo/ChapterReqVo.java new file mode 100644 index 0000000..f143bf3 --- /dev/null +++ b/cloud/independence/src/main/java/com/sincere/independence/vo/ChapterReqVo.java @@ -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 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 getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public Double getMaxScore() { + return maxScore; + } + + public void setMaxScore(Double maxScore) { + this.maxScore = maxScore; + } +} diff --git a/cloud/independence/src/main/java/com/sincere/independence/vo/CreateExamReqVo.java b/cloud/independence/src/main/java/com/sincere/independence/vo/CreateExamReqVo.java new file mode 100644 index 0000000..aa18073 --- /dev/null +++ b/cloud/independence/src/main/java/com/sincere/independence/vo/CreateExamReqVo.java @@ -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; + } +} diff --git a/cloud/independence/src/main/java/com/sincere/independence/vo/CreateLeagueReqVo.java b/cloud/independence/src/main/java/com/sincere/independence/vo/CreateLeagueReqVo.java new file mode 100644 index 0000000..6c40bf7 --- /dev/null +++ b/cloud/independence/src/main/java/com/sincere/independence/vo/CreateLeagueReqVo.java @@ -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; + } +} diff --git a/cloud/independence/src/main/java/com/sincere/independence/vo/GetLeague.java b/cloud/independence/src/main/java/com/sincere/independence/vo/GetLeague.java new file mode 100644 index 0000000..115c540 --- /dev/null +++ b/cloud/independence/src/main/java/com/sincere/independence/vo/GetLeague.java @@ -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 leagues ; + + public String getLeagueName() { + return leagueName; + } + + public void setLeagueName(String leagueName) { + this.leagueName = leagueName; + } + + public List getLeagues() { + return leagues; + } + + public void setLeagues(List leagues) { + this.leagues = leagues; + } +} diff --git a/cloud/independence/src/main/java/com/sincere/independence/vo/GetLeagueRepVo.java b/cloud/independence/src/main/java/com/sincere/independence/vo/GetLeagueRepVo.java new file mode 100644 index 0000000..2c005b9 --- /dev/null +++ b/cloud/independence/src/main/java/com/sincere/independence/vo/GetLeagueRepVo.java @@ -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 data ; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } +} diff --git a/cloud/independence/src/main/java/com/sincere/independence/vo/InitAnalyseReqVo.java b/cloud/independence/src/main/java/com/sincere/independence/vo/InitAnalyseReqVo.java new file mode 100644 index 0000000..2d741d6 --- /dev/null +++ b/cloud/independence/src/main/java/com/sincere/independence/vo/InitAnalyseReqVo.java @@ -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; + } +} diff --git a/cloud/independence/src/main/java/com/sincere/independence/vo/InitScoreReqVo.java b/cloud/independence/src/main/java/com/sincere/independence/vo/InitScoreReqVo.java new file mode 100644 index 0000000..3af2e37 --- /dev/null +++ b/cloud/independence/src/main/java/com/sincere/independence/vo/InitScoreReqVo.java @@ -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; + } +} diff --git a/cloud/independence/src/main/java/com/sincere/independence/vo/UpdateExamReqVo.java b/cloud/independence/src/main/java/com/sincere/independence/vo/UpdateExamReqVo.java new file mode 100644 index 0000000..469fdef --- /dev/null +++ b/cloud/independence/src/main/java/com/sincere/independence/vo/UpdateExamReqVo.java @@ -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; + } +} diff --git a/cloud/independence/src/main/java/com/sincere/independence/vo/excel/ExamExcelVo.java b/cloud/independence/src/main/java/com/sincere/independence/vo/excel/ExamExcelVo.java new file mode 100644 index 0000000..98e7653 --- /dev/null +++ b/cloud/independence/src/main/java/com/sincere/independence/vo/excel/ExamExcelVo.java @@ -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 ; + } + } +} diff --git a/cloud/independence/src/main/java/com/sincere/independence/vo/excel/ExcelVo.java b/cloud/independence/src/main/java/com/sincere/independence/vo/excel/ExcelVo.java new file mode 100644 index 0000000..f0e2041 --- /dev/null +++ b/cloud/independence/src/main/java/com/sincere/independence/vo/excel/ExcelVo.java @@ -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) { + } +} diff --git a/cloud/independence/src/main/java/com/sincere/independence/vo/excel/ScoreExcelVo.java b/cloud/independence/src/main/java/com/sincere/independence/vo/excel/ScoreExcelVo.java new file mode 100644 index 0000000..e42431b --- /dev/null +++ b/cloud/independence/src/main/java/com/sincere/independence/vo/excel/ScoreExcelVo.java @@ -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(); + } + } +} diff --git a/cloud/independence/src/main/resources/application.yaml b/cloud/independence/src/main/resources/application.yaml new file mode 100644 index 0000000..4a58736 --- /dev/null +++ b/cloud/independence/src/main/resources/application.yaml @@ -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/ + diff --git a/cloud/independence/src/main/resources/logback.xml b/cloud/independence/src/main/resources/logback.xml new file mode 100644 index 0000000..0dd9aeb --- /dev/null +++ b/cloud/independence/src/main/resources/logback.xml @@ -0,0 +1,61 @@ + + +     +     + +     + + + +     +     +         +         +             +             [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] %highlight([%-5level] %logger{50} - %msg%n) +             UTF-8 +         +     + +     +     +         +         +             +             ${LOG_HOME}/${PROJECT_NAME}.system-dev.%d{yyyy-MM-dd HH}.%i.log +             +             30 +             +             100MB +         + +         +             +             [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] %logger{50} - %msg%n +             UTF-8 +         +     +     +        +    + +    +    +    +    +    +    +    + + +    +    +    +    +    +    +        +        +    + + \ No newline at end of file diff --git a/cloud/pom.xml b/cloud/pom.xml index ab2b9ef..a8e5e8a 100644 --- a/cloud/pom.xml +++ b/cloud/pom.xml @@ -24,10 +24,12 @@ dahua consumer haikangface - smartCampus_search - xiaoan_search + search_independence + search_smartCampus + search_xiaoan mypulsar weigeng + independence diff --git a/cloud/search_independence/pom.xml b/cloud/search_independence/pom.xml new file mode 100644 index 0000000..d2b61b8 --- /dev/null +++ b/cloud/search_independence/pom.xml @@ -0,0 +1,146 @@ + + + + cloud + com.sincere + 1.0.0 + + 4.0.0 + + search_independence + + + + com.sincere + common + 0.0.1-SNAPSHOT + + + org.apache.httpcomponents + httpclient + 4.3 + + + com.microsoft.sqlserver + mssql-jdbc + 6.4.0.jre8 + + + com.alibaba + fastjson + 1.2.16 + + + org.apache.commons + commons-lang3 + 3.3.2 + + + + + org.slf4j + slf4j-api + 1.7.13 + + + + commons-net + commons-net + 2.0 + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 1.3.0 + + + + + + search_smartCampus + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + UTF-8 + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + com.sincere.smartSearch.SmartSearchApplication + true + lib/ + + + ./config/ + + + + config/** + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy + package + + copy-dependencies + + + + ${project.build.directory}/lib + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.5 + + UTF-8 + + + + + maven-source-plugin + 2.2 + + true + + + + compile + + jar + + + + + + + + \ No newline at end of file diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/IndependenceSearchApplication.java b/cloud/search_independence/src/main/java/com/sincere/independence/IndependenceSearchApplication.java new file mode 100644 index 0000000..535f39f --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/IndependenceSearchApplication.java @@ -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); + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/controller/LearnController.java b/cloud/search_independence/src/main/java/com/sincere/independence/controller/LearnController.java new file mode 100644 index 0000000..68bcc71 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/controller/LearnController.java @@ -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 getList(@RequestBody AnalyseDto analyseDto){ + List list = analyseService.select(new Analyse(analyseDto)); + List 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 getLeagueByAnalyse(@RequestParam("analyseId") int analyseId){ + List leagues = leagueService.selectByAnalyseId(analyseId); + List 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 isImportExam(@RequestParam("analyseId") int analyseId){ + List analyseDetails = analyseDetailService.selectByAnalyseId(analyseId); + List 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 analyseDetailDtos){ + List 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 analyseDimensionalDtos){ + List 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 studentDtos){ + List 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 studentDetailDtos){ + List 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 getSchoolName(@RequestParam("analyseId")int analyseId){ + return studentService.selectSchoolNameByAnalyse(analyseId); + } + + @RequestMapping(value = "initChapter", method = RequestMethod.POST) + public boolean initChapter(@RequestBody List chapterDtos){ + List list = new ArrayList<>(); + for(ChapterDto chapterDto : chapterDtos){ + list.add(new Chapter(chapterDto)); + } + chapterService.insertBatch(list); + return true ; + } + +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/controller/LearnStatController.java b/cloud/search_independence/src/main/java/com/sincere/independence/controller/LearnStatController.java new file mode 100644 index 0000000..dfa3956 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/controller/LearnStatController.java @@ -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 chapters = chapterService.selectByAnalyse(analyse.getId()); + List 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 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 typeList = new ArrayList<>(); + List 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 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 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 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 leagues = leagueService.getLeagueBySchoolName(analyse.getId(),GetLearnDto.getSchoolName()); + if(leagues == null){ + repVO.setSuccess(false); + repVO.setMessage("请先设定联盟校"); + return repVO; + } + List allStudents = studentService.selectBySchoolName(GetLearnDto.getAnalyseId(),null,null); + List leagueStudents = studentService.selectBySchoolName(GetLearnDto.getAnalyseId(),leagues,null); + List 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 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 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 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 classNamList = studentService.selectClassNameBySchool(GetLearnDto.getAnalyseId(),GetLearnDto.getSchoolName()); + for(String className : classNamList){ + List 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 getForm2_1_3(@RequestBody GetLearnDto GetLearnDto){ + Analyse analyse = analyseService.selectById(GetLearnDto.getAnalyseId()); + List 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 list1 = new ArrayList<>(); + for(int i =0 ; i leagues = leagueService.getLeagueBySchoolName(analyse.getId(),GetLearnDto.getSchoolName()); + if(leagues == null){ + repVO.setSuccess(false); + repVO.setMessage("请先设定联盟校"); + return repVO; + } + List list = new ArrayList<>(); + List 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 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 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 leagues = leagueService.getLeagueBySchoolName(analyse.getId(),GetLearnDto.getSchoolName()); + if(leagues == null){ + repVO.setSuccess(false); + repVO.setMessage("请先设定联盟校"); + return repVO; + } + List 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 leagues = leagueService.getLeagueBySchoolName(analyse.getId(),GetLearnDto.getSchoolName()); + if(leagues == null){ + repVO.setSuccess(false); + repVO.setMessage("请先设定联盟校"); + return repVO; + } + List allHighStudent = new ArrayList<>(); + List allLowStudent = new ArrayList<>(); + List 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 leagueHighStudent = new ArrayList<>(); + List leagueLowStudent = new ArrayList<>(); + List 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 highStudent = new ArrayList<>(); + List lowStudent = new ArrayList<>(); + List 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 list = new ArrayList<>(); + + List 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 leagues = leagueService.getLeagueBySchoolName(analyse.getId(),GetLearnDto.getSchoolName()); + if(leagues == null){ + repVO.setSuccess(false); + repVO.setMessage("请先设定联盟校"); + return repVO; + } + List list = new ArrayList<>(); + List allStudents = studentService.selectBySchoolName(analyse.getId(),null,null); + List leagueStudents = studentService.selectBySchoolName(analyse.getId(),leagues,null); + List 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 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 getForm2_2_5(@RequestBody GetLearnDto GetLearnDto){ + Analyse analyse = analyseService.selectById(GetLearnDto.getAnalyseId()); + //分数段 + Double maxScore = analyse.getMaxScore(); + Map 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 knowledges = knowledgeService.selectAll(); + List 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 data = sort(table2List); + table2RepVO.setData(data); + return table2RepVO; + } + + private List sort(List target){ + List 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 leagues = leagueService.getLeagueBySchoolName(analyse.getId(),GetLearnDto.getSchoolName()); + if(leagues == null){ + repVO.setSuccess(false); + repVO.setMessage("请先设定区"); + return repVO; + } + List allHighStudent = new ArrayList<>(); + List allLowStudent = new ArrayList<>(); + List 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 leagueHighStudent = new ArrayList<>(); + List leagueLowStudent = new ArrayList<>(); + List 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 highStudent = new ArrayList<>(); + List lowStudent = new ArrayList<>(); + List 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 list = new ArrayList<>(); + + List knowledgeList = dimensionalService.selectByAnalyse(analyse.getId(),dimensionalType); + for(Dimensional dimensional : knowledgeList){ + Form6 form6 = new Form6(); + form6.setDimensional(dimensional.getDimensionalName()); + List analyseDimensionals = analyseDimensionalService.selectByDimensional(analyse.getId(),dimensional.getId()); + Double score = 0d; + StringBuffer examNumber = new StringBuffer(); + List 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 highStudent = new ArrayList<>(); + List lowStudent = new ArrayList<>(); + List 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 list = new ArrayList<>(); + List knowledgeList = dimensionalService.selectByAnalyse(analyse.getId(),dimensionalType); + for(Dimensional dimensional : knowledgeList){ + Form6 form6 = new Form6(); + form6.setDimensional(dimensional.getDimensionalName()); + List analyseDimensionals = analyseDimensionalService.selectByDimensional(analyse.getId(),dimensional.getId()); + Double score = 0d; + StringBuffer examNumber = new StringBuffer(); + List 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 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 lessKnowledgeList = new ArrayList<>(); //不足50% + List 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 lessAbilityList = new ArrayList<>(); //不足70% + List midAbilityList = new ArrayList<>(); //70-80% + List 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 lessSkillList = new ArrayList<>(); //不足70% + List midSkillList = new ArrayList<>(); //70-80% + List 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 getErrorRate(int analyseId , String schoolName , int studentSize){ + List errorList = new ArrayList<>(); + List 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("

本次检测总体情况").append(suggestRepVo.getAssess()).append("，难度系数是0") + .append(suggestRepVo.getDifficultyDegree()).append("，优秀率是").append(suggestRepVo.getExcellentRate()).append("%。") + .append("对有关知识，总体掌握情况比较好。

从考试结果分析，各知识点掌握程度较好，唯"); + 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("

探究技能方面："); + 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("

学习能力上："); + 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("

后续复习巩固可以从抓好基础、提高能力和注重应用上下功夫。提升"); + 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("等方面的能力；重视将知识应用到具体的实践中，尤其是做好试题审题和思路分析的引导，教师自己开发一些新情景的试题。

"); + 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 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 lessKnowledgeList = new ArrayList<>(); //不足50% + List 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 lessAbilityList = new ArrayList<>(); //不足70% + List midAbilityList = new ArrayList<>(); //70-80% + List 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 lessSkillList = new ArrayList<>(); //不足70% + List midSkillList = new ArrayList<>(); //70-80% + List 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("

本次检测总体情况").append(suggestRepVo.getAssess()).append("，难度系数是0") + .append(suggestRepVo.getDifficultyDegree()).append("，优秀率是").append(suggestRepVo.getExcellentRate()).append("%。") + .append("对有关知识，总体掌握情况比较好。

从考试结果分析，各知识点掌握程度较好，唯......"); + stringBuffer.append("

后续复习巩固可以从抓好基础、提高能力和注重应用上下功夫......

"); + return stringBuffer.toString(); + } + +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/controller/ScheduleController.java b/cloud/search_independence/src/main/java/com/sincere/independence/controller/ScheduleController.java new file mode 100644 index 0000000..3e87426 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/controller/ScheduleController.java @@ -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 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 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 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 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 list = classModelService.selectBySchoolIdAndGrade(schedule.getSchoolId(),parallelClassReqVo.getGrade()); + stringBuffer.append("本次不排课设置，共涉及"+list.size()+"个班"); + }else { + List 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 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 courseList = courseService.selectByCourse(course); + List 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 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 joinList = new ArrayList<>(); + for(int i = 1 ; i <= 5 ; i++) { + joinList.add(i); + } + Set 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 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 joinClasses = joinClassService.selectByCourse(joinClass); + if(joinClasses != null && joinClasses.size() > 0){ + List 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 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 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 setClassCourse(boolean isDouble , int i , FirstReqVo firstReqVo){ + List 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 joinList ,TeacherClass teacherClass , + List list , List limitList ,int functionTimes){ + List 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 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 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 joinClasses = joinClassService.selectByCourse(joinClass); + if(joinClasses != null && joinClasses.size() > 0){ + //说明是合班的课程 + boolean isClash = false ; + List joinClassList = new ArrayList<>(); + List 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 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 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 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 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 reSort(List 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 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 list = new ArrayList<>(); + //单周课表必生成 + list.addAll(createWeekTeacherCourse(teacherCourse,false)); + if(isDouble){ + list.addAll(createWeekTeacherCourse(teacherCourse,true)); + } + teacherCourseService.insertBatch(list); + } + + // 创建教师 周课表 单周isDouble false 双周isDouble true + private List createWeekTeacherCourse(TeacherCourse teacherCourse , boolean isDouble){ + int singleOrDouble = 1 ; + if(isDouble){ + singleOrDouble = 2; + } + Date date =new Date(); + List 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 ; + } + +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/controller/ScheduleInitController.java b/cloud/search_independence/src/main/java/com/sincere/independence/controller/ScheduleInitController.java new file mode 100644 index 0000000..4c6ccb8 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/controller/ScheduleInitController.java @@ -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 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 teacherClasses = teacherClassService.selectBySchoolAndTeam(teacherClass); + for(TeacherClass teacherClass1 :teacherClasses){ + teacherClass1.setSchoolId(temp.getSchoolId()); + teacherClass1.setTeam(temp.getTeam()); + teacherClass1.setCreateTime(date); + } + teacherClassService.insertBatch(teacherClasses); + + List 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 courses = courseService.selectBySchoolId2(schedule.getSchoolId()); + List teachers = teacherService.selectBySchoolId(schedule.getSchoolId()); + List 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 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 openTeacherList = (List)teacherList.get("data"); + List 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 openClasses = (List)classList.get("data"); + List 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 openCourses = (List)courseList.get("data"); + List 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 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 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 teacherList , int schoolId){ + List 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; + } + } + +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/controller/ScheduleMessageController.java b/cloud/search_independence/src/main/java/com/sincere/independence/controller/ScheduleMessageController.java new file mode 100644 index 0000000..d22d046 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/controller/ScheduleMessageController.java @@ -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 scheduleList = scheduleService.selectBySchool(schoolId) ; + List 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 classModels = classModelService.selectBySchoolId(schoolId); + List 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 list = courseService.selectBySchoolId(schedule.getSchoolId()); + List 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 getCourseClassList(@RequestParam("scheduleId") int scheduleId , @RequestParam("courseId") int courseId){ + List 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 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 list = classCourseService.selectByClassIdAndSingleOrDouble(search); + List 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 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 list = joinClassService.selectByCourse(joinClass); + List 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 data = new ArrayList<>(); + List courseNameList = new ArrayList<>(); + List 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 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 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 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 courses = courseService.selectByCourse(course) ; + List 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 courses = courseService.selectByCourse(course) ; + List 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); + } + +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/mapper/AnalyseDetailMapper.java b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/AnalyseDetailMapper.java new file mode 100644 index 0000000..3a16547 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/AnalyseDetailMapper.java @@ -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 list); + + List selectByAnalyseId(int analyseId); + + Double selectDifficult(AnalyseDetail analyseDetail); + + Double selectSumType(AnalyseDetail analyseDetail); + + List selectDifficultDetail(AnalyseDetail analyseDetail); + + List selectQuestionType(int analyseId); + + List selectQuestionNumberByType(AnalyseDetail analyseDetail); + + List selectQuestionNumberByDifficult(AnalyseDetail analyseDetail); +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/mapper/AnalyseDimensionalMapper.java b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/AnalyseDimensionalMapper.java new file mode 100644 index 0000000..cbbe1c5 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/AnalyseDimensionalMapper.java @@ -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 list); + + List selectByDimensional(AnalyseDimensional analyseDimensional); +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/mapper/AnalyseMapper.java b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/AnalyseMapper.java new file mode 100644 index 0000000..5c99d80 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/AnalyseMapper.java @@ -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 select(Analyse analyse); + + Analyse selectById(int id); + + int update(Analyse analyse); + + int updateChapter(Analyse analyse); +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/mapper/ChapterMapper.java b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/ChapterMapper.java new file mode 100644 index 0000000..bb950a9 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/ChapterMapper.java @@ -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 list); + + List selectByAnalyse(int analyseId); +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/mapper/ClassCourseMapper.java b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/ClassCourseMapper.java new file mode 100644 index 0000000..79b1de2 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/ClassCourseMapper.java @@ -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 list); + + ClassCourse selectClassCourse(ClassCourse classCourse); + + int selectSingleOrDouble(ClassCourse classCourse); + + int selectMaxCourseNumber(ClassCourse classCourse); + + List selectByClassIdAndSingleOrDouble(ClassCourse classCourse); + + List selectCourseByClassIdAndWeek(ClassCourse classCourse); + + int updatePublicOreElective(ClassCourse classCourse); + + List selectNoCourse(ClassCourse classCourse); + + List selectWeekCourse(ClassCourse classCourse); + + List selectClassCourseByClass(ClassCourse classCourse); + + int deleteBySchoolIdAndTeam(ClassCourse classCourse); + + int recallClassCourse(ClassCourse classCourse); + + List copyClassCourse(ClassCourse classCourse); +} \ No newline at end of file diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/mapper/ClassModelMapper.java b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/ClassModelMapper.java new file mode 100644 index 0000000..712b9b2 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/ClassModelMapper.java @@ -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 selectBySchoolId(int schoolId); + + int insertBatch(List list); + + ClassModel selectBySchoolIdAndClassNameAndGrade(ClassModel classModel); + + List selectBySchoolIdAndGrade(ClassModel classModel); + + int deleteSchool(int schoolId); +} \ No newline at end of file diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/mapper/CourseMapper.java b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/CourseMapper.java new file mode 100644 index 0000000..6e101bb --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/CourseMapper.java @@ -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 list); + + List selectBySchoolId(int schoolId); + + List selectBySchoolId2(int schoolId); + + List selectByCourse(Course course); + + int updateCourseType(Course course); + + int deleteSchoolId(int schoolId); + + int initSchoolId(int schoolId); +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/mapper/DimensionalMapper.java b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/DimensionalMapper.java new file mode 100644 index 0000000..10c5cc8 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/DimensionalMapper.java @@ -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 select(Dimensional dimensional); + + List selectByAnalyse(Dimensional dimensional); +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/mapper/JoinClassMapper.java b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/JoinClassMapper.java new file mode 100644 index 0000000..2529b62 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/JoinClassMapper.java @@ -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 list); + + Integer selectMaxGroup(); + + List selectByCourse(JoinClass joinClass); + + List selectByCourseGroup(int courseGroup); + + int deleteCourseGroup(int courseGroup); + + int deleteBySchoolIdAndTeam(JoinClass joinClass); +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/mapper/KnowledgeMapper.java b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/KnowledgeMapper.java new file mode 100644 index 0000000..ac70afc --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/KnowledgeMapper.java @@ -0,0 +1,19 @@ +package com.sincere.independence.mapper; + +import com.sincere.independence.model.Knowledge; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/11/4 0004 11:46 + */ +public interface KnowledgeMapper { + + int insertBatch(List list); + + Knowledge selectByKnowledge(String knowledge); + + List selectAll(); +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/mapper/LeagueMapper.java b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/LeagueMapper.java new file mode 100644 index 0000000..f8dbb72 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/LeagueMapper.java @@ -0,0 +1,23 @@ +package com.sincere.independence.mapper; + +import com.sincere.independence.model.League; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/22 0022 8:59 + */ +public interface LeagueMapper { + + int insert(League league); + + League selectById(int id); + + int insertBatch(List list); + + int update(League league); + + List selectByLeague(League league); +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/mapper/ScheduleMapper.java b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/ScheduleMapper.java new file mode 100644 index 0000000..50451d7 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/ScheduleMapper.java @@ -0,0 +1,29 @@ +package com.sincere.independence.mapper; + +import com.sincere.independence.model.Schedule; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/10 0010 11:19 + */ +public interface ScheduleMapper { + + int insert(Schedule schedule); + + List selectBySchool(int schoolId); + + int updateSpeed(Schedule schedule); + + Schedule selectById(int id); + + Schedule selectBySchoolAndTeam(Schedule schedule); + + int deleteBySchedule(int id); + + int updateZuoxi(Schedule schedule); + + int update(Schedule schedule); +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/mapper/StudentDetailMapper.java b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/StudentDetailMapper.java new file mode 100644 index 0000000..b907b29 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/StudentDetailMapper.java @@ -0,0 +1,19 @@ +package com.sincere.independence.mapper; + +import com.sincere.independence.model.StudentDetail; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 13:42 + */ +public interface StudentDetailMapper { + + int insertBatch(List list); + + Double selectSumScore(StudentDetail studentDetail); + + int selectTrueByExamNumber(StudentDetail studentDetail); +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/mapper/StudentMapper.java b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/StudentMapper.java new file mode 100644 index 0000000..432212c --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/StudentMapper.java @@ -0,0 +1,39 @@ +package com.sincere.independence.mapper; + +import com.sincere.independence.model.Student; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 13:42 + */ +public interface StudentMapper { + + int insertBatch(List list); + + Student selectStudent(Student student); + + List selectByStudent(Student student); + + int selectCountByScore(Student student); + + List selectClassNameBySchool(Student student); + + List selectSchoolNameByAnalyse(int analyseId); + + //最高分 + Double selectMaxScore(Student student); + //最低分 + Double selectMinScore(Student student); + //平均分 + Double selectAvgScore(Student student); + //众数 + List selectModeNumber(Student student); + //中位数 + Double selectMedian(Student student); + //标准差 + Double selectStdev(Student student); + +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/mapper/TeacherClassMapper.java b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/TeacherClassMapper.java new file mode 100644 index 0000000..f7fdf94 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/TeacherClassMapper.java @@ -0,0 +1,25 @@ +package com.sincere.independence.mapper; + +import com.sincere.independence.model.TeacherClass; + +import java.util.List; + +public interface TeacherClassMapper { + + int insert(TeacherClass record); + + int updateByPrimaryKey(TeacherClass record); + + int insertBatch(List teacherClasses); + + int deleteBySchoolAndTeam(TeacherClass teacherClass); + + int updateSchedule(int tClassId); + + int selectHasSchedule(TeacherClass teacherClass); + + int recallTeacherClass(int tClassId); + + + List selectByTeacherClass(TeacherClass teacherClass); +} \ No newline at end of file diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/mapper/TeacherCourseMapper.java b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/TeacherCourseMapper.java new file mode 100644 index 0000000..deaf7be --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/TeacherCourseMapper.java @@ -0,0 +1,26 @@ +package com.sincere.independence.mapper; + +import com.sincere.independence.model.TeacherCourse; + +import java.util.List; + +public interface TeacherCourseMapper { + + int updateByPrimaryKey(TeacherCourse record); + + int insertBatch(List list); + + int selectTeacherDayCourseNumber(TeacherCourse teacherCourse); + + TeacherCourse selectTeacherCourse(TeacherCourse teacherCourse); + + int updateTeacherCourse(TeacherCourse teacherCourse); + + int isCreateCourse(TeacherCourse teacherCourse); + + int deleteBySchoolIdAndTeam(TeacherCourse teacherCourse); + + int recallTeacherCourse(TeacherCourse teacherCourse); + + List selectBySchoolIdAndTeam(TeacherCourse teacherCourse); +} \ No newline at end of file diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/mapper/TeacherMapper.java b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/TeacherMapper.java new file mode 100644 index 0000000..81ab101 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/mapper/TeacherMapper.java @@ -0,0 +1,22 @@ +package com.sincere.independence.mapper; + +import com.sincere.independence.model.Teacher; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/9 0009 13:54 + */ +public interface TeacherMapper { + + + int insertBatch(List list); + + List selectBySchoolId(int schoolId); + + int deleteSchool(int schoolId); + + List selectByTeacher(Teacher teacher); +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/model/Analyse.java b/cloud/search_independence/src/main/java/com/sincere/independence/model/Analyse.java new file mode 100644 index 0000000..0da24a5 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/model/Analyse.java @@ -0,0 +1,103 @@ +package com.sincere.independence.model; + +import com.sincere.common.dto.independence.AnalyseDto; +import org.apache.commons.lang3.StringUtils; + +import java.io.Serializable; +import java.util.Date; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 10:55 + */ +public class Analyse 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 Analyse() { + } + + public Analyse(AnalyseDto analyseDto){ + this.examName = analyseDto.getExamName(); + this.grade = analyseDto.getGrade(); + this.examTime = analyseDto.getExamTime(); + this.createTime = analyseDto.getCreateTime(); + this.maxScore = analyseDto.getMaxScore(); + this.courseName= analyseDto.getCourseName(); + this.examScope = analyseDto.getExamScope(); + this.id = analyseDto.getId(); + + } + + 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; + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/model/AnalyseDetail.java b/cloud/search_independence/src/main/java/com/sincere/independence/model/AnalyseDetail.java new file mode 100644 index 0000000..a750f8a --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/model/AnalyseDetail.java @@ -0,0 +1,91 @@ +package com.sincere.independence.model; + +import com.sincere.common.dto.independence.AnalyseDetailDto; + +import java.io.Serializable; +import java.util.Date; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 8:38 + */ +public class AnalyseDetail implements Serializable { + + private int id ; + private int analyseId ; + private String questionNumber ; + private String questionType ; + private int difficult ; + private Double score ; + private Date createTime ; + + public AnalyseDetail() { + } + + public AnalyseDetail(AnalyseDetailDto analyseDetailDto) { + this.id = analyseDetailDto.getId(); + this.analyseId = analyseDetailDto.getAnalyseId(); + this.questionNumber = analyseDetailDto.getQuestionNumber(); + this.questionType = analyseDetailDto.getQuestionType(); + this.difficult = analyseDetailDto.getDifficult(); + this.score = analyseDetailDto.getScore(); + this.createTime = analyseDetailDto.getCreateTime(); + } + + 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; + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/model/AnalyseDimensional.java b/cloud/search_independence/src/main/java/com/sincere/independence/model/AnalyseDimensional.java new file mode 100644 index 0000000..b7db3c4 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/model/AnalyseDimensional.java @@ -0,0 +1,82 @@ +package com.sincere.independence.model; + +import com.sincere.common.dto.independence.AnalyseDimensionalDto; + +import java.io.Serializable; +import java.util.Date; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 8:42 + */ +public class AnalyseDimensional implements Serializable { + + private int id ; + private int analyseId ; + private String questionNumber ; + private int dimensionalId ; + private Double score ; + private Date createTime ; + + public AnalyseDimensional() { + } + + public AnalyseDimensional(AnalyseDimensionalDto analyseDimensionalDto) { + this.id = analyseDimensionalDto.getId(); + this.analyseId = analyseDimensionalDto.getAnalyseId(); + this.createTime = analyseDimensionalDto.getCreateTime(); + this.dimensionalId = analyseDimensionalDto.getDimensionalId(); + this.score = analyseDimensionalDto.getScore(); + this.questionNumber = analyseDimensionalDto.getQuestionNumber(); + } + + 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; + } + +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/model/Chapter.java b/cloud/search_independence/src/main/java/com/sincere/independence/model/Chapter.java new file mode 100644 index 0000000..6a21f2e --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/model/Chapter.java @@ -0,0 +1,80 @@ +package com.sincere.independence.model; + +import com.sincere.common.dto.independence.ChapterDto; + +import java.io.Serializable; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/24 0024 9:03 + */ +public class Chapter implements Serializable { + + private int id ; + private int analyseId ; + private int chapterNumber ; + private String chapterName ; + private Double chapterScore ; + + private Double percent ; + + public Chapter() { + } + + public Chapter(ChapterDto chapterDto) { + this.id = chapterDto.getId(); + this.analyseId =chapterDto.getAnalyseId() ; + this.chapterNumber = chapterDto.getChapterNumber(); + this.chapterName = chapterDto.getChapterName(); + this.chapterScore = chapterDto.getChapterScore(); + } + + 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; + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/model/ClassCourse.java b/cloud/search_independence/src/main/java/com/sincere/independence/model/ClassCourse.java new file mode 100644 index 0000000..5a1fd37 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/model/ClassCourse.java @@ -0,0 +1,126 @@ +package com.sincere.independence.model; + +import java.io.Serializable; +import java.util.Date; + +public class ClassCourse 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; + } +} \ No newline at end of file diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/model/ClassModel.java b/cloud/search_independence/src/main/java/com/sincere/independence/model/ClassModel.java new file mode 100644 index 0000000..50eca0f --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/model/ClassModel.java @@ -0,0 +1,46 @@ +package com.sincere.independence.model; + +import java.io.Serializable; + +public class ClassModel 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(); + } + +} \ No newline at end of file diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/model/Course.java b/cloud/search_independence/src/main/java/com/sincere/independence/model/Course.java new file mode 100644 index 0000000..cfe840e --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/model/Course.java @@ -0,0 +1,58 @@ +package com.sincere.independence.model; + +import java.io.Serializable; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/9 0009 9:39 + */ +public class Course 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; + } + +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/model/Dimensional.java b/cloud/search_independence/src/main/java/com/sincere/independence/model/Dimensional.java new file mode 100644 index 0000000..dfa9c4d --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/model/Dimensional.java @@ -0,0 +1,59 @@ +package com.sincere.independence.model; + +import java.io.Serializable; +import java.util.Date; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 8:37 + */ +public class Dimensional implements Serializable { + + private int id ; + private int dimensionalType ; + private String dimensionalName; + private Date createTime ; + //查询用 + private int analyseId ; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getDimensionalType() { + return dimensionalType; + } + + public void setDimensionalType(int dimensionalType) { + this.dimensionalType = dimensionalType; + } + + public String getDimensionalName() { + return dimensionalName; + } + + public void setDimensionalName(String dimensionalName) { + this.dimensionalName = dimensionalName; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public int getAnalyseId() { + return analyseId; + } + + public void setAnalyseId(int analyseId) { + this.analyseId = analyseId; + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/model/JoinClass.java b/cloud/search_independence/src/main/java/com/sincere/independence/model/JoinClass.java new file mode 100644 index 0000000..95b5e0f --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/model/JoinClass.java @@ -0,0 +1,90 @@ +package com.sincere.independence.model; + +import com.sincere.common.dto.independence.JoinClassDto; + +import java.io.Serializable; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/10 0010 8:27 + */ +public class JoinClass implements Serializable { + + private int id ; + private int schoolId ; + private int classId ; + private String team ; + private int courseId ; + private String courseName ; + private int courseGroup ; + + public JoinClass() { + } + + public JoinClass(JoinClassDto joinClassDto) { + this.id = joinClassDto.getId(); + this.schoolId = joinClassDto.getSchoolId(); + this.classId = joinClassDto.getClassId(); + this.team = joinClassDto.getTeam(); + this.courseGroup = joinClassDto.getCourseGroup(); + this.courseId = joinClassDto.getCourseId(); + this.courseName = joinClassDto.getCourseName(); + } + + 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; + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/model/Knowledge.java b/cloud/search_independence/src/main/java/com/sincere/independence/model/Knowledge.java new file mode 100644 index 0000000..ba36152 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/model/Knowledge.java @@ -0,0 +1,67 @@ +package com.sincere.independence.model; + +import java.io.Serializable; +import java.util.Date; + +/** + * @author chen + * @version 1.0 + * @date 2019/11/4 0004 11:45 + */ +public class Knowledge implements Serializable { + + private int id ; + private String knowledge ; + private String detail ; + private String rate ; + private String avg ; + private Date updateTime ; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getKnowledge() { + return knowledge; + } + + public void setKnowledge(String knowledge) { + this.knowledge = knowledge; + } + + 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; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getDetail() { + return detail; + } + + public void setDetail(String detail) { + this.detail = detail; + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/model/League.java b/cloud/search_independence/src/main/java/com/sincere/independence/model/League.java new file mode 100644 index 0000000..51f650e --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/model/League.java @@ -0,0 +1,59 @@ +package com.sincere.independence.model; + +import com.sincere.common.dto.independence.LeagueDto; + +import java.io.Serializable; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/22 0022 8:59 + */ +public class League implements Serializable { + + private int id ; + private int analyseId ; + private String league ; + private String schoolName ; + + public League() { + } + + public League(LeagueDto leagueDto) { + this.analyseId = leagueDto.getAnalyseId(); + this.league = leagueDto.getLeague(); + this.schoolName = leagueDto.getSchoolName(); + } + + 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; + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/model/Schedule.java b/cloud/search_independence/src/main/java/com/sincere/independence/model/Schedule.java new file mode 100644 index 0000000..24a96e2 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/model/Schedule.java @@ -0,0 +1,121 @@ +package com.sincere.independence.model; + +import com.sincere.common.dto.independence.ScheduleDto; + +import java.io.Serializable; +import java.util.Date; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/10 0010 11:17 + */ +public class Schedule 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 Schedule() { + } + + public Schedule(ScheduleDto scheduleDto) { + this.id = scheduleDto.getId(); + this.scheduleName =scheduleDto.getScheduleName(); + this.schoolId = scheduleDto.getSchoolId(); + this.team = scheduleDto.getTeam(); + this.createTime = scheduleDto.getCreateTime(); + this.updateTime = scheduleDto.getUpdateTime(); + this.speed = scheduleDto.getSpeed(); + this.morning = scheduleDto.getMorning(); + this.afternoon = scheduleDto.getAfternoon(); + this.night = scheduleDto.getNight(); + } + + + 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; + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/model/Student.java b/cloud/search_independence/src/main/java/com/sincere/independence/model/Student.java new file mode 100644 index 0000000..ae5a4f7 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/model/Student.java @@ -0,0 +1,140 @@ +package com.sincere.independence.model; + +import com.sincere.common.dto.independence.StudentDto; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 13:38 + */ +public class Student 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 ; + + private double begin ; + private double end ; + private List schoolNames ; + + public Student(StudentDto studentDto) { + this.id = studentDto.getId(); + this.openId = studentDto.getOpenId(); + this.schoolName = studentDto.getSchoolName(); + this.className = studentDto.getClassName(); + this.studentName = studentDto.getStudentName(); + this.studentNumber = studentDto.getStudentNumber(); + this.analyseId = studentDto.getAnalyseId(); + this.score = studentDto.getScore(); + this.createTime = studentDto.getCreateTime(); + } + + public Student() { + } + + 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; + } + + public double getBegin() { + return begin; + } + + public void setBegin(double begin) { + this.begin = begin; + } + + public double getEnd() { + return end; + } + + public void setEnd(double end) { + this.end = end; + } + + public List getSchoolNames() { + return schoolNames; + } + + public void setSchoolNames(List schoolNames) { + this.schoolNames = schoolNames; + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/model/StudentDetail.java b/cloud/search_independence/src/main/java/com/sincere/independence/model/StudentDetail.java new file mode 100644 index 0000000..4b73ecb --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/model/StudentDetail.java @@ -0,0 +1,161 @@ +package com.sincere.independence.model; + +import com.sincere.common.dto.independence.StudentDetailDto; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 13:38 + */ +public class StudentDetail 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 错误 + + //查询用 高分段 低分段学生考号 + private List studentNumbers ; + private List schoolNames ; + private List examNumbers ; + + public StudentDetail(StudentDetailDto studentDetailDto) { + this.id = studentDetailDto.getId(); + this.openId = studentDetailDto.getOpenId(); + this.schoolName = studentDetailDto.getSchoolName(); + this.className = studentDetailDto.getClassName(); + this.studentName = studentDetailDto.getStudentName(); + this.studentNumber = studentDetailDto.getStudentNumber(); + this.analyseId = studentDetailDto.getAnalyseId(); + this.examNumber = studentDetailDto.getExamNumber(); + this.score = studentDetailDto.getScore(); + this.correct = studentDetailDto.getCorrect(); + this.createTime = studentDetailDto.getCreateTime(); + } + + public StudentDetail() { + } + + 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 List getStudentNumbers() { + return studentNumbers; + } + + public void setStudentNumbers(List studentNumbers) { + this.studentNumbers = studentNumbers; + } + + public List getSchoolNames() { + return schoolNames; + } + + public void setSchoolNames(List schoolNames) { + this.schoolNames = schoolNames; + } + + public List getExamNumbers() { + return examNumbers; + } + + public void setExamNumbers(List examNumbers) { + this.examNumbers = examNumbers; + } + + public int getCorrect() { + return correct; + } + + public void setCorrect(int correct) { + this.correct = correct; + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/model/Teacher.java b/cloud/search_independence/src/main/java/com/sincere/independence/model/Teacher.java new file mode 100644 index 0000000..1f5c336 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/model/Teacher.java @@ -0,0 +1,48 @@ +package com.sincere.independence.model; + +import java.io.Serializable; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/9 0009 13:53 + */ +public class Teacher implements Serializable { + + private int id ; + private int schoolId ; + private int teacherId ; + private String teacherName ; + + 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 getTeacherId() { + return teacherId; + } + + public void setTeacherId(int teacherId) { + this.teacherId = teacherId; + } + + public String getTeacherName() { + return teacherName; + } + + public void setTeacherName(String teacherName) { + this.teacherName = teacherName; + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/model/TeacherClass.java b/cloud/search_independence/src/main/java/com/sincere/independence/model/TeacherClass.java new file mode 100644 index 0000000..3225777 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/model/TeacherClass.java @@ -0,0 +1,126 @@ +package com.sincere.independence.model; + +import java.io.Serializable; +import java.util.Date; + +public class TeacherClass 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; + } +} \ No newline at end of file diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/model/TeacherCourse.java b/cloud/search_independence/src/main/java/com/sincere/independence/model/TeacherCourse.java new file mode 100644 index 0000000..6667565 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/model/TeacherCourse.java @@ -0,0 +1,118 @@ +package com.sincere.independence.model; + +import java.io.Serializable; +import java.util.Date; + +public class TeacherCourse implements Serializable { + private Integer tClassId; + + private Integer schoolId; + + private String grade; + + private String teacherName; + + private Integer singleOrDouble; + + private Integer week; + + private Integer courseNumber; + + private String classId; + + private String courseName; + + private Date createTime; + + private String team ; + + public Integer gettClassId() { + return tClassId; + } + + public void settClassId(Integer tClassId) { + this.tClassId = tClassId; + } + + 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 getTeacherName() { + return teacherName; + } + + public void setTeacherName(String teacherName) { + this.teacherName = teacherName == null ? null : teacherName.trim(); + } + + 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 getClassId() { + return classId; + } + + public void setClassId(String classId) { + this.classId = classId; + } + + 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 String getTeam() { + return team; + } + + public void setTeam(String team) { + this.team = team; + } + + +} \ No newline at end of file diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/AnalyseDetailService.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/AnalyseDetailService.java new file mode 100644 index 0000000..43c90e5 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/AnalyseDetailService.java @@ -0,0 +1,29 @@ +package com.sincere.independence.service; + +import com.sincere.independence.model.AnalyseDetail; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 11:25 + */ +public interface AnalyseDetailService { + + int insertBatch(List list); + + List selectByAnalyseId(int analyseId); + + Double selectDifficult(int analyseId, int difficult); + + Double selectSumType(int analyseId, String questionType); + + List selectDifficultDetail(int analyseId, int difficult); + + List selectQuestionType(int analyseId); + + List selectQuestionNumberByType(int analyseId, String questionType); + + List selectQuestionNumberByDifficult(int analyseId, int difficult); +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/AnalyseDimensionalService.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/AnalyseDimensionalService.java new file mode 100644 index 0000000..6dc09a1 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/AnalyseDimensionalService.java @@ -0,0 +1,18 @@ +package com.sincere.independence.service; + +import com.sincere.independence.model.AnalyseDimensional; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 11:25 + */ +public interface AnalyseDimensionalService { + + int insertBatch(List list); + + List selectByDimensional(int analyseId, int dimensionalId); + +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/AnalyseService.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/AnalyseService.java new file mode 100644 index 0000000..473d175 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/AnalyseService.java @@ -0,0 +1,23 @@ +package com.sincere.independence.service; + +import com.sincere.independence.model.Analyse; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 10:59 + */ +public interface AnalyseService { + + int insert(Analyse analyse); + + List select(Analyse analyse); + + Analyse selectById(int id); + + int update(Analyse analyse); + + int updateChapter(int id, String examTime, String examScope); +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/ChapterService.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/ChapterService.java new file mode 100644 index 0000000..ba1ab10 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/ChapterService.java @@ -0,0 +1,17 @@ +package com.sincere.independence.service; + +import com.sincere.independence.model.Chapter; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/24 0024 9:09 + */ +public interface ChapterService { + + int insertBatch(List list); + + List selectByAnalyse(int analyseId); +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/ClassCourseService.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/ClassCourseService.java new file mode 100644 index 0000000..3a53caf --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/ClassCourseService.java @@ -0,0 +1,55 @@ +package com.sincere.independence.service; + +import com.sincere.independence.model.ClassCourse; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/9/24 0024 11:44 + */ +public interface ClassCourseService { + + int insertBatch(List classCourses); + + boolean insertSchoolClass(List classCourses); + + //通过 singleOrDouble , classId , week , courseNumber 获取某一天第几节课 + ClassCourse selectClassCourse(ClassCourse classCourse); + + int updateByPrimaryKey(ClassCourse record); + + //grade 获取该年段是单双周排课 boolean true 为双周 + boolean selectSingleOrDouble(ClassCourse classCourse); + + //获取每天课数 + int selectMaxCourseNumber(int schoolId, String team); + + //通过classID 单双周 获取该班课表 + List selectByClassIdAndSingleOrDouble(ClassCourse classCourse); + + //查询当前班某天是否已有某课 + int selectCourseByClassIdAndWeek(ClassCourse classCourse); + + //更新公共课以及选修课 + int updatePublicOreElective(ClassCourse classCourse); + + //查询未排课 + List selectNoCourse(int classId, String team); + + //查询改天 是否有某课 + List selectWeekCourse(int classId, int week, int singOrDouble, String courseName, String team); + + //查询不排课的课程 + List selectClassCourseByClass(ClassCourse classCourse); + + int deleteBySchoolIdAndTeam(int schoolId, String team); + + //撤回 + int recallClassCourse(ClassCourse classCourse); + + List copyClassCourse(int schoolId, String team); + + +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/ClassModelService.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/ClassModelService.java new file mode 100644 index 0000000..48139b2 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/ClassModelService.java @@ -0,0 +1,25 @@ +package com.sincere.independence.service; + +import com.sincere.independence.model.ClassModel; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/9/25 0025 8:59 + */ +public interface ClassModelService { + + ClassModel selectByPrimaryKey(Integer classId); + + int insertBatch(List list); + + ClassModel selectBySchoolIdAndClassNameAndGrade(ClassModel classModel); + + List selectBySchoolId(int schoolId); + + List selectBySchoolIdAndGrade(int schoolId, String grade); + + int deleteSchool(int schoolId); +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/CourseService.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/CourseService.java new file mode 100644 index 0000000..d314fde --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/CourseService.java @@ -0,0 +1,32 @@ +package com.sincere.independence.service; + +import com.sincere.independence.model.Course; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/9 0009 9:44 + */ +public interface CourseService { + + int insertBatch(List list); + + List selectBySchoolId(int schoolId); + + List selectBySchoolId2(int schoolId); + + List selectByCourse(Course course); + + Course selectBySchoolIdAndCourseId(int schoolId, int courseId); + + Course selectBySchoolIdAndCourseName(int schoolId, String courseName); + + int updateCourseType(int courseId, int courseType, int schoolId); + + int deleteSchoolId(int schoolId); + + int initSchoolId(int schoolId); + +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/DimensionalService.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/DimensionalService.java new file mode 100644 index 0000000..3ff9595 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/DimensionalService.java @@ -0,0 +1,22 @@ +package com.sincere.independence.service; + +import com.sincere.independence.model.Dimensional; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 10:24 + */ +public interface DimensionalService { + + int insert(Dimensional dimensional); + + List select(Dimensional dimensional); + + Dimensional selectByTypeAndName(int type, String name); + + List selectByAnalyse(int analyseId, int dimensionalType); + +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/JoinClassService.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/JoinClassService.java new file mode 100644 index 0000000..05d5d4a --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/JoinClassService.java @@ -0,0 +1,23 @@ +package com.sincere.independence.service; + +import com.sincere.independence.model.JoinClass; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/10 0010 8:35 + */ +public interface JoinClassService { + + int insertBatch(List list); + + List selectByCourse(JoinClass joinClass); + + List selectByCourseGroup(int courseGroup); + + int deleteBySchoolIdAndTeam(int schoolId, String team); + + int deleteCourseGroup(int courseGroup); +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/KnowledgeService.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/KnowledgeService.java new file mode 100644 index 0000000..d564262 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/KnowledgeService.java @@ -0,0 +1,19 @@ +package com.sincere.independence.service; + +import com.sincere.independence.model.Knowledge; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/11/4 0004 11:51 + */ +public interface KnowledgeService { + + int insertBatch(List list); + + Knowledge selectByKnowledge(String knowledge); + + List selectAll(); +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/LeagueService.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/LeagueService.java new file mode 100644 index 0000000..ebf9fff --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/LeagueService.java @@ -0,0 +1,26 @@ +package com.sincere.independence.service; + +import com.sincere.independence.model.League; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/22 0022 9:08 + */ +public interface LeagueService { + + int insert(League league); + + int insertBatch(List list); + + int update(int id, String league); + + int initLeagueSchool(int id, String schoolName); + + List selectByAnalyseId(int analyseId); + + List getLeagueBySchoolName(int analyseId, String schoolName); + +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/ScheduleService.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/ScheduleService.java new file mode 100644 index 0000000..7b46bec --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/ScheduleService.java @@ -0,0 +1,29 @@ +package com.sincere.independence.service; + +import com.sincere.independence.model.Schedule; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/10 0010 11:26 + */ +public interface ScheduleService { + int insert(Schedule schedule); + + List selectBySchool(int schoolId); + + int updateSpeed(Schedule schedule); + + Schedule selectById(int id); + + Schedule selectBySchoolAndTeam(Schedule schedule); + + int deleteBySchedule(int id); + + int updateZuoxi(Schedule schedule); + + int update(Schedule schedule); + +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/StudentDetailService.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/StudentDetailService.java new file mode 100644 index 0000000..48a3d15 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/StudentDetailService.java @@ -0,0 +1,30 @@ +package com.sincere.independence.service; + +import com.sincere.independence.model.StudentDetail; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 13:46 + */ +public interface StudentDetailService { + + int insertBatch(List list); + + Double selectSumScore(int analyseId, List league, String schoolName, String examNumber); + + Double selectSumScore(int analyseId, List league, String schoolName, List examNumbers); + + Double selectStudentSumScore(int analyseId, String schoolName, String studentNumber, List examNumbers); + + Double selectClassSumScore(int analyseId, String schoolName, String className, List examNumbers); + + int selectTrueByExamNumber(int analyseId, String schoolName, String examNumber); + + int selectTrueByExamNumber(int analyseId, List league, String schoolName, String examNumber, List studentNumbers); + + int selectTrueByExamNumber(int analyseId, List league, String schoolName, List examNumbers, List studentNumbers); + +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/StudentService.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/StudentService.java new file mode 100644 index 0000000..7c90ba2 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/StudentService.java @@ -0,0 +1,43 @@ +package com.sincere.independence.service; + +import com.sincere.independence.model.Student; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 15:16 + */ +public interface StudentService { + + int insertBatch(List list); + + Student selectStudent(int analyseId, String schoolName, String studentNumber); + + public List selectBySchoolName(int analyseId, List league, String schoolName); + + List selectByClassName(int analyseId, String schoolName, String className); + + public int selectCountByScore(int analyseId, List league, String schoolName, double begin, double end); + + int selectCountBySchoolScore(int analyseId, String schoolName, String className, double begin, double end); + + List selectClassNameBySchool(int analyseId, String schoolName); + + List selectSchoolNameByAnalyse(int analyseId); + + Double selectClassMaxScore(int analyseId, String schoolName, String className); + + Double selectMaxScore(int analyseId, List league, String schoolName); + + Double selectMinScore(int analyseId, List league, String schoolName); + + Double selectAvgScore(int analyseId, List league, String schoolName); + //众数 + Double selectModeNumber(int analyseId, List league, String schoolName); + //中位数 + Double selectMedian(int analyseId, List league, String schoolName); + //标准差 + Double selectStdev(int analyseId, List league, String schoolName); +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/TeacherClassService.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/TeacherClassService.java new file mode 100644 index 0000000..7f9cc71 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/TeacherClassService.java @@ -0,0 +1,41 @@ +package com.sincere.independence.service; + +import com.sincere.independence.model.TeacherClass; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/9/29 0029 11:04 + */ +public interface TeacherClassService { + + int insert(TeacherClass teacherClass); + + int insertBatch(List teacherClasses); + + List selectByCourseName(TeacherClass teacherClass); + + TeacherClass selectByTeacher(TeacherClass teacherClass); + + //通过学校 年段 班级 课程 获取对应授课老师 + TeacherClass selectByCourseAndClass(TeacherClass teacherClass); + + List selectBySchoolAndTeam(TeacherClass teacherClass); + + int deleteBySchoolAndTeam(TeacherClass teacherClass); + + TeacherClass selectById(int tClassId); + + int updateSchedule(int tClassId); + + //查询是否已排课 + int selectHasSchedule(int schoolId, String team); + + int recallTeacherClass(int tClassId); + + //查询该老师一周的课程，并计算平均每天最多课 + int selectTeacherDayClass(int schoolId, String team, String teacherName); + +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/TeacherCourseService.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/TeacherCourseService.java new file mode 100644 index 0000000..07e4b65 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/TeacherCourseService.java @@ -0,0 +1,38 @@ +package com.sincere.independence.service; + +import com.sincere.independence.model.TeacherCourse; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/9/25 0025 14:45 + */ +public interface TeacherCourseService { + + int insertBatch(List list); + + int updateByPrimaryKey(TeacherCourse record); + + //更新老师某一天某一节课 + int updateTeacherCourse(TeacherCourse teacherCourse); + + //查询老师某一天某一节课 + TeacherCourse selectTeacherCourse(TeacherCourse teacherCourse); + + //查询老师某一天课程数 + int selectTeacherDayCourseNumber(TeacherCourse teacherCourse); + + //查询老师是否已创建课表 + int isCreateCourse(TeacherCourse teacherCourse); + + //删除排课计划数据 + int deleteBySchoolIdAndTeam(int schoolId, String team); + + //撤回 + int recallTeacherCourse(TeacherCourse teacherCourse); + + List selectBySchoolIdAndTeam(int schoolId, String team); + +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/TeacherService.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/TeacherService.java new file mode 100644 index 0000000..e12f080 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/TeacherService.java @@ -0,0 +1,22 @@ +package com.sincere.independence.service; + +import com.sincere.independence.model.Teacher; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/9 0009 13:56 + */ +public interface TeacherService { + + int insertBatch(List list); + + List selectBySchoolId(int schoolId); + + int deleteSchool(int schoolId); + + Teacher selectByTeacher(Teacher teacher); + +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/AnalyseDetailServiceImpl.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/AnalyseDetailServiceImpl.java new file mode 100644 index 0000000..3314d7d --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/AnalyseDetailServiceImpl.java @@ -0,0 +1,90 @@ +package com.sincere.independence.service.impl; + +import com.sincere.independence.mapper.AnalyseDetailMapper; +import com.sincere.independence.model.AnalyseDetail; +import com.sincere.independence.service.AnalyseDetailService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 11:26 + */ +@Service +public class AnalyseDetailServiceImpl implements AnalyseDetailService { + + @Autowired + AnalyseDetailMapper analyseDetailMapper; + + @Override + public int insertBatch(List list) { + int i = 0 ; + List result = new ArrayList<>(); + for(AnalyseDetail analyseDetail :list){ + i++ ; + result.add(analyseDetail); + if(i % 100 == 0){ + analyseDetailMapper.insertBatch(result); + result = new ArrayList<>(); + } + } + if(result.size() > 0){ + analyseDetailMapper.insertBatch(result); + } + return 1 ; + } + + @Override + public List selectByAnalyseId(int analyseId) { + return analyseDetailMapper.selectByAnalyseId(analyseId); + } + + @Override + public Double selectDifficult(int analyseId, int difficult) { + AnalyseDetail analyseDetail = new AnalyseDetail(); + analyseDetail.setDifficult(difficult); + analyseDetail.setAnalyseId(analyseId); + return analyseDetailMapper.selectDifficult(analyseDetail); + } + + @Override + public Double selectSumType(int analyseId, String questionType) { + AnalyseDetail analyseDetail = new AnalyseDetail(); + analyseDetail.setQuestionType(questionType); + analyseDetail.setAnalyseId(analyseId); + return analyseDetailMapper.selectSumType(analyseDetail); + } + + @Override + public List selectDifficultDetail(int analyseId, int difficult) { + AnalyseDetail analyseDetail = new AnalyseDetail(); + analyseDetail.setDifficult(difficult); + analyseDetail.setAnalyseId(analyseId); + return analyseDetailMapper.selectDifficultDetail(analyseDetail); + } + + @Override + public List selectQuestionType(int analyseId) { + return analyseDetailMapper.selectQuestionType(analyseId); + } + + @Override + public List selectQuestionNumberByType(int analyseId, String questionType) { + AnalyseDetail analyseDetail = new AnalyseDetail(); + analyseDetail.setQuestionType(questionType); + analyseDetail.setAnalyseId(analyseId); + return analyseDetailMapper.selectQuestionNumberByType(analyseDetail); + } + + @Override + public List selectQuestionNumberByDifficult(int analyseId, int difficult) { + AnalyseDetail analyseDetail = new AnalyseDetail(); + analyseDetail.setDifficult(difficult); + analyseDetail.setAnalyseId(analyseId); + return analyseDetailMapper.selectQuestionNumberByDifficult(analyseDetail); + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/AnalyseDimensionalServiceImpl.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/AnalyseDimensionalServiceImpl.java new file mode 100644 index 0000000..5fdd098 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/AnalyseDimensionalServiceImpl.java @@ -0,0 +1,48 @@ +package com.sincere.independence.service.impl; + +import com.sincere.independence.mapper.AnalyseDimensionalMapper; +import com.sincere.independence.model.AnalyseDimensional; +import com.sincere.independence.service.AnalyseDimensionalService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 11:27 + */ +@Service +public class AnalyseDimensionalServiceImpl implements AnalyseDimensionalService { + + @Autowired + AnalyseDimensionalMapper analyseDimensionalMapper; + + @Override + public int insertBatch(List list) { + int i = 0 ; + List result = new ArrayList<>(); + for(AnalyseDimensional analyseDetail :list){ + i++ ; + result.add(analyseDetail); + if(i % 100 == 0){ + analyseDimensionalMapper.insertBatch(result); + result = new ArrayList<>(); + } + } + if(result.size() > 0){ + analyseDimensionalMapper.insertBatch(result); + } + return 1 ; + } + + @Override + public List selectByDimensional(int analyseId, int dimensionalId) { + AnalyseDimensional analyseDimensional = new AnalyseDimensional(); + analyseDimensional.setAnalyseId(analyseId); + analyseDimensional.setDimensionalId(dimensionalId); + return analyseDimensionalMapper.selectByDimensional(analyseDimensional); + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/AnalyseServiceImpl.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/AnalyseServiceImpl.java new file mode 100644 index 0000000..6af2f04 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/AnalyseServiceImpl.java @@ -0,0 +1,50 @@ +package com.sincere.independence.service.impl; + +import com.sincere.independence.mapper.AnalyseMapper; +import com.sincere.independence.model.Analyse; +import com.sincere.independence.service.AnalyseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 10:59 + */ +@Service +public class AnalyseServiceImpl implements AnalyseService { + + @Autowired + AnalyseMapper analyseMapper; + + @Override + public int insert(Analyse analyse) { + return analyseMapper.insert(analyse); + } + + @Override + public List select(Analyse analyse) { + return analyseMapper.select(analyse); + } + + @Override + public Analyse selectById(int id) { + return analyseMapper.selectById(id); + } + + @Override + public int update(Analyse analyse) { + return analyseMapper.update(analyse); + } + + @Override + public int updateChapter(int id, String examTime, String examScope) { + Analyse analyse = new Analyse(); + analyse.setId(id); + analyse.setExamTime(examTime); + analyse.setExamScope(examScope); + return analyseMapper.updateChapter(analyse); + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/ChapterServiceImpl.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/ChapterServiceImpl.java new file mode 100644 index 0000000..c81fd98 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/ChapterServiceImpl.java @@ -0,0 +1,31 @@ +package com.sincere.independence.service.impl; + +import com.sincere.independence.mapper.ChapterMapper; +import com.sincere.independence.model.Chapter; +import com.sincere.independence.service.ChapterService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/24 0024 9:09 + */ +@Service +public class ChapterServiceImpl implements ChapterService { + + @Autowired + ChapterMapper chapterMapper; + + @Override + public int insertBatch(List list) { + return chapterMapper.insertBatch(list); + } + + @Override + public List selectByAnalyse(int analyseId) { + return chapterMapper.selectByAnalyse(analyseId); + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/ClassCourseServiceImpl.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/ClassCourseServiceImpl.java new file mode 100644 index 0000000..efaea87 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/ClassCourseServiceImpl.java @@ -0,0 +1,144 @@ +package com.sincere.independence.service.impl; + +import com.sincere.independence.mapper.ClassCourseMapper; +import com.sincere.independence.mapper.ClassModelMapper; +import com.sincere.independence.model.ClassCourse; +import com.sincere.independence.model.ClassModel; +import com.sincere.independence.service.ClassCourseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/9/24 0024 11:45 + */ +@Service("classCourseService") +public class ClassCourseServiceImpl implements ClassCourseService { + + @Autowired + ClassCourseMapper classCourseMapper ; + + @Autowired + ClassModelMapper classModelMapper; + + @Override + public int insertBatch(List classCourses) { + int i = 0 ; + List result = new ArrayList<>(); + for(ClassCourse classCourse :classCourses){ + i++ ; + result.add(classCourse); + if(i % 100 == 0){ + classCourseMapper.insertBatch(result); + result = new ArrayList<>(); + } + } + if(result.size()>0){ + classCourseMapper.insertBatch(result); + } + return 1; + } + + @Override + public boolean insertSchoolClass(List classCourses) { + List classModels = classModelMapper.selectBySchoolId(classCourses.get(0).getSchoolId()); + Date date = new Date(); + for(ClassModel classModel : classModels){ + for(ClassCourse classCourse : classCourses){ + classCourse.setGrade(classModel.getGrade()); + classCourse.setClassId(classModel.getClassId()); + classCourse.setCreateTime(date); + } + classCourseMapper.insertBatch(classCourses); + } + return true; + } + + @Override + public ClassCourse selectClassCourse(ClassCourse classCourse) { + return classCourseMapper.selectClassCourse(classCourse); + } + + @Override + public int updateByPrimaryKey(ClassCourse record) { + return classCourseMapper.updateByPrimaryKey(record); + } + + @Override + public boolean selectSingleOrDouble(ClassCourse classCourse) { + return classCourseMapper.selectSingleOrDouble(classCourse) > 1 ; + } + + @Override + public int selectMaxCourseNumber(int schoolId , String team) { + ClassCourse classCourse = new ClassCourse(); + classCourse.setSchoolId(schoolId); + classCourse.setTeam(team); + return classCourseMapper.selectMaxCourseNumber(classCourse); + } + + @Override + public List selectByClassIdAndSingleOrDouble(ClassCourse classCourse) { + return classCourseMapper.selectByClassIdAndSingleOrDouble(classCourse); + } + + @Override + public int selectCourseByClassIdAndWeek(ClassCourse classCourse) { + return classCourseMapper.selectCourseByClassIdAndWeek(classCourse).size(); + } + + @Override + public int updatePublicOreElective(ClassCourse classCourse) { + return classCourseMapper.updatePublicOreElective(classCourse); + } + + @Override + public List selectNoCourse(int classId , String team) { + ClassCourse classCourse = new ClassCourse(); + classCourse.setClassId(classId); + classCourse.setTeam(team); + return classCourseMapper.selectNoCourse(classCourse); + } + + @Override + public List selectWeekCourse(int classId, int week, int singOrDouble, String courseName , String team) { + ClassCourse classCourse = new ClassCourse(); + classCourse.setClassId(classId); + classCourse.setWeek(week); + classCourse.setSingleOrDouble(singOrDouble); + classCourse.setCourseName(courseName); + classCourse.setTeam(team); + return classCourseMapper.selectWeekCourse(classCourse); + } + + @Override + public List selectClassCourseByClass(ClassCourse classCourse) { + return classCourseMapper.selectClassCourseByClass(classCourse); + } + + @Override + public int deleteBySchoolIdAndTeam(int schoolId, String team) { + ClassCourse classCourse = new ClassCourse(); + classCourse.setSchoolId(schoolId); + classCourse.setTeam(team); + return classCourseMapper.deleteBySchoolIdAndTeam(classCourse); + } + + @Override + public int recallClassCourse(ClassCourse classCourse) { + return classCourseMapper.recallClassCourse(classCourse); + } + + @Override + public List copyClassCourse(int schoolId ,String team) { + ClassCourse classCourse = new ClassCourse(); + classCourse.setSchoolId(schoolId); + classCourse.setTeam(team); + return classCourseMapper.copyClassCourse(classCourse); + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/ClassModelServiceImpl.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/ClassModelServiceImpl.java new file mode 100644 index 0000000..19056fb --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/ClassModelServiceImpl.java @@ -0,0 +1,54 @@ +package com.sincere.independence.service.impl; + +import com.sincere.independence.mapper.ClassModelMapper; +import com.sincere.independence.model.ClassModel; +import com.sincere.independence.service.ClassModelService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/9/25 0025 9:00 + */ +@Service("classModelService") +public class ClassModelServiceImpl implements ClassModelService { + + @Autowired + ClassModelMapper classModelMapper; + + @Override + public ClassModel selectByPrimaryKey(Integer classId) { + return classModelMapper.selectByPrimaryKey(classId); + } + + @Override + public int insertBatch(List list) { + return classModelMapper.insertBatch(list); + } + + @Override + public ClassModel selectBySchoolIdAndClassNameAndGrade(ClassModel classModel) { + return classModelMapper.selectBySchoolIdAndClassNameAndGrade(classModel); + } + + @Override + public List selectBySchoolIdAndGrade(int schoolId , String grade ) { + ClassModel classModel = new ClassModel(); + classModel.setSchoolId(schoolId); + classModel.setGrade(grade); + return classModelMapper.selectBySchoolIdAndGrade(classModel); + } + + @Override + public List selectBySchoolId(int schoolId) { + return classModelMapper.selectBySchoolId(schoolId); + } + + @Override + public int deleteSchool(int schoolId) { + return classModelMapper.deleteSchool(schoolId); + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/CourseServiceImpl.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/CourseServiceImpl.java new file mode 100644 index 0000000..1775439 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/CourseServiceImpl.java @@ -0,0 +1,86 @@ +package com.sincere.independence.service.impl; + +import com.sincere.independence.mapper.CourseMapper; +import com.sincere.independence.model.Course; +import com.sincere.independence.service.CourseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/9 0009 9:45 + */ +@Service("courseService") +public class CourseServiceImpl implements CourseService { + + @Autowired + CourseMapper courseMapper; + + @Override + public int insertBatch(List list) { + return courseMapper.insertBatch(list); + } + + @Override + public List selectBySchoolId(int schoolId) { + return courseMapper.selectBySchoolId(schoolId); + } + + @Override + public List selectBySchoolId2(int schoolId) { + return courseMapper.selectBySchoolId2(schoolId); + } + + @Override + public List selectByCourse(Course course) { + return courseMapper.selectByCourse(course); + } + + @Override + public Course selectBySchoolIdAndCourseId(int schoolId, int courseId) { + Course course = new Course(); + course.setSchoolId(schoolId); + course.setCourseId(courseId); + List list = courseMapper.selectByCourse(course) ; + if(list != null && list.size() > 0){ + return list.get(0); + }else { + return null ; + } + } + + @Override + public Course selectBySchoolIdAndCourseName(int schoolId, String courseName) { + Course course = new Course(); + course.setSchoolId(schoolId); + course.setCourseName(courseName); + List list = courseMapper.selectByCourse(course) ; + if(list != null && list.size() > 0){ + return list.get(0); + }else { + return null ; + } + } + + @Override + public int updateCourseType(int courseId , int courseType , int schoolId) { + Course course = new Course(); + course.setCourseId(courseId); + course.setCourseType(courseType); + course.setSchoolId(schoolId); + return courseMapper.updateCourseType(course); + } + + @Override + public int deleteSchoolId(int schoolId) { + return courseMapper.deleteSchoolId(schoolId); + } + + @Override + public int initSchoolId(int schoolId) { + return courseMapper.initSchoolId(schoolId); + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/DimensionalServiceImpl.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/DimensionalServiceImpl.java new file mode 100644 index 0000000..679e842 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/DimensionalServiceImpl.java @@ -0,0 +1,51 @@ +package com.sincere.independence.service.impl; + +import com.sincere.independence.mapper.DimensionalMapper; +import com.sincere.independence.model.Dimensional; +import com.sincere.independence.service.DimensionalService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 10:25 + */ +@Service +public class DimensionalServiceImpl implements DimensionalService { + + @Autowired + DimensionalMapper dimensionalMapper; + + @Override + public int insert(Dimensional dimensional) { + return dimensionalMapper.insert(dimensional); + } + + @Override + public List select(Dimensional dimensional) { + return dimensionalMapper.select(dimensional); + } + + @Override + public Dimensional selectByTypeAndName(int type, String name) { + Dimensional dimensional = new Dimensional(); + dimensional.setDimensionalType(type); + dimensional.setDimensionalName(name); + List list = dimensionalMapper.select(dimensional); + if(list != null &&list.size() > 0){ + return list.get(0); + } + return null; + } + + @Override + public List selectByAnalyse(int analyseId, int dimensionalType) { + Dimensional dimensional = new Dimensional(); + dimensional.setDimensionalType(dimensionalType); + dimensional.setAnalyseId(analyseId); + return dimensionalMapper.selectByAnalyse(dimensional); + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/JoinCLassServiceImpl.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/JoinCLassServiceImpl.java new file mode 100644 index 0000000..e3d7397 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/JoinCLassServiceImpl.java @@ -0,0 +1,58 @@ +package com.sincere.independence.service.impl; + +import com.sincere.independence.mapper.JoinClassMapper; +import com.sincere.independence.model.JoinClass; +import com.sincere.independence.service.JoinClassService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/10 0010 8:35 + */ +@Service("joinClassService") +public class JoinCLassServiceImpl implements JoinClassService { + + @Autowired + JoinClassMapper joinClassMapper; + + @Override + public int insertBatch(List list) { + Integer maxGroup = joinClassMapper.selectMaxGroup(); + if(maxGroup == null){ + maxGroup = 1 ; + }else { + maxGroup = maxGroup + 1 ; + } + for(JoinClass joinClass : list){ + joinClass.setCourseGroup(maxGroup); + } + return joinClassMapper.insertBatch(list); + } + + @Override + public List selectByCourse(JoinClass joinClass) { + return joinClassMapper.selectByCourse(joinClass); + } + + @Override + public List selectByCourseGroup(int courseGroup) { + return joinClassMapper.selectByCourseGroup(courseGroup); + } + + @Override + public int deleteBySchoolIdAndTeam(int schoolId, String team) { + JoinClass joinClass = new JoinClass(); + joinClass.setTeam(team); + joinClass.setSchoolId(schoolId); + return joinClassMapper.deleteBySchoolIdAndTeam(joinClass); + } + + @Override + public int deleteCourseGroup(int courseGroup) { + return joinClassMapper.deleteCourseGroup(courseGroup); + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/KnowledgeServiceImpl.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/KnowledgeServiceImpl.java new file mode 100644 index 0000000..65cfd7c --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/KnowledgeServiceImpl.java @@ -0,0 +1,36 @@ +package com.sincere.independence.service.impl; + +import com.sincere.independence.mapper.KnowledgeMapper; +import com.sincere.independence.model.Knowledge; +import com.sincere.independence.service.KnowledgeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/11/4 0004 11:52 + */ +@Service +public class KnowledgeServiceImpl implements KnowledgeService { + + @Autowired + KnowledgeMapper knowledgeMapper ; + + @Override + public int insertBatch(List list) { + return knowledgeMapper.insertBatch(list); + } + + @Override + public Knowledge selectByKnowledge(String knowledge) { + return knowledgeMapper.selectByKnowledge(knowledge); + } + + @Override + public List selectAll() { + return knowledgeMapper.selectAll(); + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/LeagueServiceImpl.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/LeagueServiceImpl.java new file mode 100644 index 0000000..0497c02 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/LeagueServiceImpl.java @@ -0,0 +1,102 @@ +package com.sincere.independence.service.impl; + +import com.sincere.independence.mapper.LeagueMapper; +import com.sincere.independence.model.League; +import com.sincere.independence.service.LeagueService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/22 0022 9:09 + */ +@Service +public class LeagueServiceImpl implements LeagueService { + + @Autowired + LeagueMapper leagueMapper; + + @Override + public int insert(League league) { + return leagueMapper.insert(league); + } + + @Override + public int insertBatch(List list) { + return leagueMapper.insertBatch(list); + } + + @Override + public int update(int id, String league) { + League update = new League(); + update.setId(id); + update.setLeague(league); + return leagueMapper.update(update); + } + + @Override + public int initLeagueSchool(int id, String schoolName) { + League result = leagueMapper.selectById(id) ; + League search = new League(); + search.setAnalyseId(result.getAnalyseId()); + search.setSchoolName(schoolName); + List leagues = leagueMapper.selectByLeague(search) ; + if(leagues != null & leagues.size() >0){ + return 0 ; + }else { + search.setLeague(result.getLeague()); + search.setSchoolName(null); + List list = leagueMapper.selectByLeague(search); + boolean isCreate = true ; + for(League temp : list){ + if(StringUtils.isBlank(temp.getSchoolName())){ + temp.setSchoolName(schoolName); + leagueMapper.update(temp); + isCreate = false; + break; + } + } + if(isCreate){ + League createLeague = new League(); + createLeague.setAnalyseId(result.getAnalyseId()); + createLeague.setLeague(result.getLeague()); + createLeague.setSchoolName(schoolName); + leagueMapper.insert(createLeague); + } + return 1; + } + } + + @Override + public List selectByAnalyseId(int analyseId) { + League league = new League(); + league.setAnalyseId(analyseId); + return leagueMapper.selectByLeague(league); + } + + + @Override + public List getLeagueBySchoolName(int analyseId, String schoolName) { + League league = new League(); + league.setAnalyseId(analyseId); + league.setSchoolName(schoolName); + List leagues = leagueMapper.selectByLeague(league); + if(leagues != null && leagues.size() > 0){ + League search = new League(); + search.setAnalyseId(analyseId); + search.setLeague(leagues.get(0).getLeague()); + List result = leagueMapper.selectByLeague(search); + List leagueSchoolName = new ArrayList<>(); + for(League league1 : result){ + leagueSchoolName.add(league1.getSchoolName()); + } + return leagueSchoolName ; + } + return null; + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/ScheduleServiceImpl.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/ScheduleServiceImpl.java new file mode 100644 index 0000000..cb388bb --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/ScheduleServiceImpl.java @@ -0,0 +1,64 @@ +package com.sincere.independence.service.impl; + +import com.sincere.independence.mapper.ScheduleMapper; +import com.sincere.independence.model.Schedule; +import com.sincere.independence.service.ScheduleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/10 0010 11:26 + */ +@Service("scheduleService") +public class ScheduleServiceImpl implements ScheduleService { + + @Autowired + ScheduleMapper scheduleMapper; + + @Override + public int insert(Schedule schedule) { + schedule.setCreateTime(new Date()); + schedule.setSpeed(0); + return scheduleMapper.insert(schedule); + } + + @Override + public List selectBySchool(int schoolId) { + return scheduleMapper.selectBySchool(schoolId); + } + + @Override + public int updateSpeed(Schedule schedule) { + return scheduleMapper.updateSpeed(schedule); + } + + @Override + public Schedule selectById(int id) { + return scheduleMapper.selectById(id); + } + + @Override + public Schedule selectBySchoolAndTeam(Schedule schedule) { + return scheduleMapper.selectBySchoolAndTeam(schedule); + } + + @Override + public int deleteBySchedule(int id) { + return scheduleMapper.deleteBySchedule(id); + } + + @Override + public int updateZuoxi(Schedule schedule) { + return scheduleMapper.updateZuoxi(schedule); + } + + @Override + public int update(Schedule schedule) { + return scheduleMapper.update(schedule); + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/StudentDetailServiceImpl.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/StudentDetailServiceImpl.java new file mode 100644 index 0000000..d53c255 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/StudentDetailServiceImpl.java @@ -0,0 +1,112 @@ +package com.sincere.independence.service.impl; + +import com.sincere.independence.mapper.StudentDetailMapper; +import com.sincere.independence.model.StudentDetail; +import com.sincere.independence.service.StudentDetailService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 13:47 + */ +@Service +public class StudentDetailServiceImpl implements StudentDetailService { + + @Autowired + StudentDetailMapper studentDetailMapper; + + @Override + public int insertBatch(List list) { + int i = 0 ; + List result = new ArrayList<>(); + for(StudentDetail studentDetail :list){ + i++ ; + result.add(studentDetail); + if(i % 100 == 0){ + studentDetailMapper.insertBatch(result); + result = new ArrayList<>(); + } + } + if(result.size()>0){ + studentDetailMapper.insertBatch(result); + } + return 1 ; + } + + @Override + public Double selectSumScore(int analyseId, List league , String schoolName, String examNumber) { + StudentDetail studentDetail = new StudentDetail(); + studentDetail.setAnalyseId(analyseId); + studentDetail.setSchoolName(schoolName); + studentDetail.setExamNumber(examNumber); + studentDetail.setSchoolNames(league); + return studentDetailMapper.selectSumScore(studentDetail); + } + + + @Override + public Double selectSumScore(int analyseId, List league, String schoolName, List examNumbers) { + StudentDetail studentDetail = new StudentDetail(); + studentDetail.setAnalyseId(analyseId); + studentDetail.setSchoolName(schoolName); + studentDetail.setExamNumbers(examNumbers); + studentDetail.setSchoolNames(league); + return studentDetailMapper.selectSumScore(studentDetail); + } + + @Override + public Double selectStudentSumScore(int analyseId, String schoolName, String studentNumber, List examNumbers) { + StudentDetail studentDetail = new StudentDetail(); + studentDetail.setAnalyseId(analyseId); + studentDetail.setSchoolName(schoolName); + studentDetail.setExamNumbers(examNumbers); + studentDetail.setStudentNumber(studentNumber); + return studentDetailMapper.selectSumScore(studentDetail); + } + + @Override + public Double selectClassSumScore(int analyseId, String schoolName, String className, List examNumbers) { + StudentDetail studentDetail = new StudentDetail(); + studentDetail.setAnalyseId(analyseId); + studentDetail.setSchoolName(schoolName); + studentDetail.setExamNumbers(examNumbers); + studentDetail.setClassName(className); + return studentDetailMapper.selectSumScore(studentDetail); + } + + @Override + public int selectTrueByExamNumber(int analyseId, String schoolName, String examNumber) { + StudentDetail studentDetail = new StudentDetail(); + studentDetail.setAnalyseId(analyseId); + studentDetail.setSchoolName(schoolName); + studentDetail.setExamNumber(examNumber); + return studentDetailMapper.selectTrueByExamNumber(studentDetail); + } + + @Override + public int selectTrueByExamNumber(int analyseId,List league , String schoolName, String examNumber, List studentNumbers) { + StudentDetail studentDetail = new StudentDetail(); + studentDetail.setAnalyseId(analyseId); + studentDetail.setSchoolName(schoolName); + studentDetail.setExamNumber(examNumber); + studentDetail.setStudentNumbers(studentNumbers); + studentDetail.setSchoolNames(league); + return studentDetailMapper.selectTrueByExamNumber(studentDetail); + } + + @Override + public int selectTrueByExamNumber(int analyseId, List league, String schoolName, List examNumbers, List studentNumbers) { + StudentDetail studentDetail = new StudentDetail(); + studentDetail.setAnalyseId(analyseId); + studentDetail.setSchoolName(schoolName); + studentDetail.setExamNumbers(examNumbers); + studentDetail.setStudentNumbers(studentNumbers); + studentDetail.setSchoolNames(league); + return studentDetailMapper.selectTrueByExamNumber(studentDetail); + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/StudentServiceImpl.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/StudentServiceImpl.java new file mode 100644 index 0000000..a3ce33e --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/StudentServiceImpl.java @@ -0,0 +1,169 @@ +package com.sincere.independence.service.impl; + +import com.sincere.independence.mapper.StudentMapper; +import com.sincere.independence.model.Student; +import com.sincere.independence.service.StudentService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 15:16 + */ +@Service +public class StudentServiceImpl implements StudentService { + + @Autowired + StudentMapper studentMapper; + + @Override + public int insertBatch(List list) { + int i = 0 ; + List result = new ArrayList<>(); + for(Student student :list){ + i++ ; + result.add(student); + if(i % 100 == 0){ + studentMapper.insertBatch(result); + result = new ArrayList<>(); + } + } + if(result.size()>0){ + studentMapper.insertBatch(result); + } + return 1 ; + } + + @Override + public Student selectStudent(int analyseId, String schoolName, String studentNumber) { + Student student = new Student(); + student.setAnalyseId(analyseId); + student.setSchoolName(schoolName); + student.setStudentNumber(studentNumber); + return studentMapper.selectStudent(student); + } + + @Override + public List selectBySchoolName(int analyseId , List league , String schoolName) { + Student student = new Student(); + student.setAnalyseId(analyseId); + student.setSchoolName(schoolName); + student.setSchoolNames(league); + return studentMapper.selectByStudent(student); + } + + @Override + public List selectByClassName(int analyseId, String schoolName, String className) { + Student student = new Student(); + student.setAnalyseId(analyseId); + student.setSchoolName(schoolName); + student.setClassName(className); + return studentMapper.selectByStudent(student); + } + + @Override + public int selectCountByScore(int analyseId, List league , String schoolName, double begin, double end) { + Student student = new Student(); + student.setAnalyseId(analyseId); + student.setSchoolName(schoolName); + student.setBegin(begin); + student.setEnd(end); + student.setSchoolNames(league); + return studentMapper.selectCountByScore(student); + } + + @Override + public int selectCountBySchoolScore(int analyseId, String schoolName, String className, double begin, double end) { + Student student = new Student(); + student.setAnalyseId(analyseId); + student.setSchoolName(schoolName); + student.setClassName(className); + student.setBegin(begin); + student.setEnd(end); + return studentMapper.selectCountByScore(student); } + + @Override + public List selectClassNameBySchool(int analyseId, String schoolName) { + Student student = new Student(); + student.setAnalyseId(analyseId); + student.setSchoolName(schoolName); + return studentMapper.selectClassNameBySchool(student); + } + + @Override + public List selectSchoolNameByAnalyse(int analyseId) { + return studentMapper.selectSchoolNameByAnalyse(analyseId); + } + + @Override + public Double selectClassMaxScore(int analyseId, String schoolName, String className) { + Student student = new Student(); + student.setAnalyseId(analyseId); + student.setSchoolName(schoolName); + student.setClassName(className); + return studentMapper.selectMaxScore(student); + } + + @Override + public Double selectMaxScore(int analyseId,List league , String schoolName) { + Student student = new Student(); + student.setAnalyseId(analyseId); + student.setSchoolName(schoolName); + student.setSchoolNames(league); + return studentMapper.selectMaxScore(student); + } + + @Override + public Double selectMinScore(int analyseId, List league ,String schoolName) { + Student student = new Student(); + student.setAnalyseId(analyseId); + student.setSchoolName(schoolName); + student.setSchoolNames(league); + return studentMapper.selectMinScore(student); + } + + @Override + public Double selectAvgScore(int analyseId,List league , String schoolName) { + Student student = new Student(); + student.setAnalyseId(analyseId); + student.setSchoolName(schoolName); + student.setSchoolNames(league); + return studentMapper.selectAvgScore(student); + } + + @Override + public Double selectModeNumber(int analyseId,List league , String schoolName) { + Student student = new Student(); + student.setAnalyseId(analyseId); + student.setSchoolName(schoolName); + student.setSchoolNames(league); + List list = studentMapper.selectModeNumber(student); + if(list.size() > 1){ + return null ; + }else { + return list.get(0); + } + } + + @Override + public Double selectMedian(int analyseId,List league , String schoolName) { + Student student = new Student(); + student.setAnalyseId(analyseId); + student.setSchoolName(schoolName); + student.setSchoolNames(league); + return studentMapper.selectMedian(student); + } + + @Override + public Double selectStdev(int analyseId,List league , String schoolName) { + Student student = new Student(); + student.setAnalyseId(analyseId); + student.setSchoolName(schoolName); + student.setSchoolNames(league); + return studentMapper.selectStdev(student); + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/TeacherClassServiceImpl.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/TeacherClassServiceImpl.java new file mode 100644 index 0000000..5fce283 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/TeacherClassServiceImpl.java @@ -0,0 +1,128 @@ +package com.sincere.independence.service.impl; + +import com.sincere.independence.mapper.TeacherClassMapper; +import com.sincere.independence.model.TeacherClass; +import com.sincere.independence.service.TeacherClassService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/9/29 0029 11:31 + */ +@Service("teacherClassService") +public class TeacherClassServiceImpl implements TeacherClassService { + + @Autowired + TeacherClassMapper teacherClassMapper; + + @Override + public int insert(TeacherClass teacherClass) { + return teacherClassMapper.insert(teacherClass); + } + + @Override + public int insertBatch(List teacherClasses) { + int i = 0 ; + List result = new ArrayList<>(); + for(TeacherClass teacherClass :teacherClasses){ + i++ ; + result.add(teacherClass); + if(i % 100 == 0){ + teacherClassMapper.insertBatch(result); + result = new ArrayList<>(); + } + } + if(result.size()>0){ + teacherClassMapper.insertBatch(result); + } + return 1; + } + + @Override + public List selectByCourseName(TeacherClass teacherClass) { + TeacherClass search = new TeacherClass(); + search.setTeam(teacherClass.getTeam()); + search.setSchoolId(teacherClass.getSchoolId()); + search.setCourseName(teacherClass.getCourseName()); + return teacherClassMapper.selectByTeacherClass(search); + } + + @Override + public TeacherClass selectByTeacher(TeacherClass teacherClass) { + TeacherClass search = new TeacherClass(); + search.setTeam(teacherClass.getTeam()); + search.setSchoolId(teacherClass.getSchoolId()); + search.setCourseName(teacherClass.getCourseName()); + search.setTeacherName(teacherClass.getTeacherName()); + search.setClassId(teacherClass.getClassId()); + return teacherClassMapper.selectByTeacherClass(search).get(0); + } + + @Override + public TeacherClass selectByCourseAndClass(TeacherClass teacherClass) { + TeacherClass search = new TeacherClass(); + search.setTeam(teacherClass.getTeam()); + search.setSchoolId(teacherClass.getSchoolId()); + search.setCourseName(teacherClass.getCourseName()); + search.setGrade(teacherClass.getGrade()); + search.setClassId(teacherClass.getClassId()); + return teacherClassMapper.selectByTeacherClass(search).get(0); + } + + @Override + public List selectBySchoolAndTeam(TeacherClass teacherClass) { + TeacherClass search = new TeacherClass(); + search.setTeam(teacherClass.getTeam()); + search.setSchoolId(teacherClass.getSchoolId()); + return teacherClassMapper.selectByTeacherClass(search); + } + + @Override + public int deleteBySchoolAndTeam(TeacherClass teacherClass) { + return teacherClassMapper.deleteBySchoolAndTeam(teacherClass); + } + + @Override + public TeacherClass selectById(int tClassId) { + TeacherClass search = new TeacherClass(); + search.settClassId(tClassId); + return teacherClassMapper.selectByTeacherClass(search).get(0); + } + + @Override + public int updateSchedule(int tClassId) { + return teacherClassMapper.updateSchedule(tClassId); + } + + @Override + public int selectHasSchedule(int schoolId, String team) { + TeacherClass teacherClass = new TeacherClass(); + teacherClass.setSchoolId(schoolId); + teacherClass.setTeam(team); + return teacherClassMapper.selectHasSchedule(teacherClass); + } + + @Override + public int recallTeacherClass(int tClassId) { + return teacherClassMapper.recallTeacherClass(tClassId); + } + + @Override + public int selectTeacherDayClass(int schoolId, String team, String teacherName) { + TeacherClass search = new TeacherClass() ; + search.setSchoolId(schoolId); + search.setTeam(team); + search.setTeacherName(teacherName); + List list = teacherClassMapper.selectByTeacherClass(search); + int sumClassNumber = 0 ; + for(TeacherClass teacherClass :list){ + sumClassNumber += teacherClass.getTimes(); + } + return (sumClassNumber/5) +1; + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/TeacherCourseServiceImpl.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/TeacherCourseServiceImpl.java new file mode 100644 index 0000000..10c85d9 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/TeacherCourseServiceImpl.java @@ -0,0 +1,85 @@ +package com.sincere.independence.service.impl; + +import com.sincere.independence.mapper.TeacherCourseMapper; +import com.sincere.independence.model.TeacherCourse; +import com.sincere.independence.service.TeacherCourseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/9/25 0025 14:46 + */ +@Service("teacherCourseService") +public class TeacherCourseServiceImpl implements TeacherCourseService { + + @Autowired + TeacherCourseMapper teacherCourseMapper; + @Override + public int insertBatch(List list) { + int i = 0 ; + List result = new ArrayList<>(); + for(TeacherCourse teacherClass :list){ + i++ ; + result.add(teacherClass); + if(i % 100 == 0){ + teacherCourseMapper.insertBatch(result); + result = new ArrayList<>(); + } + } + if(result.size()>0){ + teacherCourseMapper.insertBatch(result); + } + return 1; + } + + @Override + public int updateByPrimaryKey(TeacherCourse record) { + return teacherCourseMapper.updateByPrimaryKey(record); + } + + @Override + public int updateTeacherCourse(TeacherCourse teacherCourse) { + return teacherCourseMapper.updateTeacherCourse(teacherCourse); + } + + @Override + public TeacherCourse selectTeacherCourse(TeacherCourse teacherCourse) { + return teacherCourseMapper.selectTeacherCourse(teacherCourse); + } + + @Override + public int selectTeacherDayCourseNumber(TeacherCourse teacherCourse) { + return teacherCourseMapper.selectTeacherDayCourseNumber(teacherCourse); + } + + @Override + public int isCreateCourse(TeacherCourse teacherCourse) { + return teacherCourseMapper.isCreateCourse(teacherCourse); + } + + @Override + public int deleteBySchoolIdAndTeam(int schoolId, String team) { + TeacherCourse teacherCourse = new TeacherCourse(); + teacherCourse.setSchoolId(schoolId); + teacherCourse.setTeacherName(team); + return teacherCourseMapper.deleteBySchoolIdAndTeam(teacherCourse); + } + + @Override + public int recallTeacherCourse(TeacherCourse teacherCourse) { + return teacherCourseMapper.recallTeacherCourse(teacherCourse); + } + + @Override + public List selectBySchoolIdAndTeam(int schoolId, String team) { + TeacherCourse teacherCourse = new TeacherCourse(); + teacherCourse.setSchoolId(schoolId); + teacherCourse.setTeam(team); + return teacherCourseMapper.selectBySchoolIdAndTeam(teacherCourse); + } +} diff --git a/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/TeacherServiceImpl.java b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/TeacherServiceImpl.java new file mode 100644 index 0000000..f005301 --- /dev/null +++ b/cloud/search_independence/src/main/java/com/sincere/independence/service/impl/TeacherServiceImpl.java @@ -0,0 +1,42 @@ +package com.sincere.independence.service.impl; + +import com.sincere.independence.mapper.TeacherMapper; +import com.sincere.independence.model.Teacher; +import com.sincere.independence.service.TeacherService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/9 0009 13:59 + */ +@Service("teacherService") +public class TeacherServiceImpl implements TeacherService { + + @Autowired + TeacherMapper teacherMapper; + + @Override + public int insertBatch(List list) { + return teacherMapper.insertBatch(list); + } + + @Override + public List selectBySchoolId(int schoolId) { + return teacherMapper.selectBySchoolId(schoolId); + } + + @Override + public int deleteSchool(int schoolId) { + return teacherMapper.deleteSchool(schoolId); + } + + @Override + public Teacher selectByTeacher(Teacher teacher) { + return teacherMapper.selectByTeacher(teacher).get(0); + } + +} diff --git a/cloud/search_independence/src/main/resources/application.yml b/cloud/search_independence/src/main/resources/application.yml new file mode 100644 index 0000000..8cddfc5 --- /dev/null +++ b/cloud/search_independence/src/main/resources/application.yml @@ -0,0 +1,29 @@ +server: + port: 7779 +spring: + application: + name: independenceSearch + datasource: + username: SZJXTUSER + password: xst200919 + url: jdbc:sqlserver://60.190.202.57:14333;database=SmartPaike + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver +##mybatis +mybatis: + mapper-locations: classpath:mapper/*.xml + type-aliases-package: com.sincere.independence.model + check-config-location: true + +eureka: + instance: + hostname: localhost + lease-expiration-duration-in-seconds: 60 + lease-renewal-interval-in-seconds: 10 + client: + service-url: + defaultZone: http://localhost:8761/eureka/,http://localhost:8762/eureka/ + +remoting: +# url: http://60.190.202.57:1000 + url: http://campus.myjxt.com + diff --git a/cloud/search_independence/src/main/resources/logback.xml b/cloud/search_independence/src/main/resources/logback.xml new file mode 100644 index 0000000..305ba1f --- /dev/null +++ b/cloud/search_independence/src/main/resources/logback.xml @@ -0,0 +1,61 @@ + + +     +     + +     + + + +     +     +         +         +             +             [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] %highlight([%-5level] %logger{50} - %msg%n) +             UTF-8 +         +     + +     +     +         +         +             +             ${LOG_HOME}/${PROJECT_NAME}.system-dev.%d{yyyy-MM-dd HH}.%i.log +             +             30 +             +             100MB +         + +         +             +             [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] %logger{50} - %msg%n +             UTF-8 +         +     +     +        +    + +    +    +    +    +    +    +    + + +    +    +    +    +    +    +        +        +    + + \ No newline at end of file diff --git a/cloud/search_independence/src/main/resources/mapper/AnalyseDetailMapper.xml b/cloud/search_independence/src/main/resources/mapper/AnalyseDetailMapper.xml new file mode 100644 index 0000000..d115c93 --- /dev/null +++ b/cloud/search_independence/src/main/resources/mapper/AnalyseDetailMapper.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + insert into sz_learn_analyse_detail (analyse_id, question_number,question_type,difficult,score,create_time) + values + + (#{emp.analyseId},#{emp.questionNumber},#{emp.questionType},#{emp.difficult},#{emp.score},#{emp.createTime}) + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cloud/search_independence/src/main/resources/mapper/AnalyseDimensionalMapper.xml b/cloud/search_independence/src/main/resources/mapper/AnalyseDimensionalMapper.xml new file mode 100644 index 0000000..9697f84 --- /dev/null +++ b/cloud/search_independence/src/main/resources/mapper/AnalyseDimensionalMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + insert into sz_learn_analyse_dimensional (analyse_id, question_number,dimensional_id,score,create_time) + values + + (#{emp.analyseId},#{emp.questionNumber},#{emp.dimensionalId},#{emp.score},#{emp.createTime}) + + + + + \ No newline at end of file diff --git a/cloud/search_independence/src/main/resources/mapper/AnalyseMapper.xml b/cloud/search_independence/src/main/resources/mapper/AnalyseMapper.xml new file mode 100644 index 0000000..f0e1bda --- /dev/null +++ b/cloud/search_independence/src/main/resources/mapper/AnalyseMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + insert into sz_learn_analyse (exam_name, exam_time,course_name,create_time,grade) + values (#{examName},#{examTime},#{courseName},#{createTime},#{grade}) + + + + update sz_learn_analyse + + + exam_name = #{examName}, + + + exam_time = #{examTime}, + + + grade = #{grade}, + + + max_score = #{maxScore}, + + + where id = #{id} + + + + + + + + update sz_learn_analyse set exam_time = #{examTime} , exam_scope = #{examScope} where id = #{id} + + \ No newline at end of file diff --git a/cloud/search_independence/src/main/resources/mapper/ChapterMapper.xml b/cloud/search_independence/src/main/resources/mapper/ChapterMapper.xml new file mode 100644 index 0000000..c3d8867 --- /dev/null +++ b/cloud/search_independence/src/main/resources/mapper/ChapterMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + insert into sz_learn_analyse_chapter (analyse_id, chapter_number,chapter_name,chapter_score) + values + + (#{emp.analyseId}, #{emp.chapterNumber}, #{emp.chapterName}, #{emp.chapterScore}) + + + + + + \ No newline at end of file diff --git a/cloud/search_independence/src/main/resources/mapper/ClassCourseMapper.xml b/cloud/search_independence/src/main/resources/mapper/ClassCourseMapper.xml new file mode 100644 index 0000000..d5ee3f2 --- /dev/null +++ b/cloud/search_independence/src/main/resources/mapper/ClassCourseMapper.xml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + course_id, school_id, grade, class_id, single_or_double, week, course_number, course_name, + create_time, update_time,team,course_open_id + + + + insert into sz_sch_class_course ( school_id, grade, + class_id, single_or_double, week, + course_number, course_name, create_time, + update_time,team,course_open_id) + values + + (#{emp.schoolId,jdbcType=INTEGER}, #{emp.grade,jdbcType=INTEGER}, + #{emp.classId,jdbcType=INTEGER}, #{emp.singleOrDouble,jdbcType=INTEGER}, #{emp.week,jdbcType=INTEGER}, + #{emp.courseNumber,jdbcType=INTEGER}, #{emp.courseName,jdbcType=VARCHAR}, #{emp.createTime,jdbcType=TIMESTAMP}, + #{emp.updateTime,jdbcType=TIMESTAMP},#{emp.team,jdbcType=VARCHAR}, #{emp.courseOpenId,jdbcType=INTEGER}) + + + + + update sz_sch_class_course set course_name = null where school_id = #{schoolId} + and course_name = #{courseName} + + + + + + + + + + + + + + + + + + + delete from sz_sch_class_course where team =#{team} and school_id = #{schoolId} + + + + + + update sz_sch_class_course set course_name = #{courseName} where team =#{team} and school_id = #{schoolId} and grade = #{grade} + and week=#{week} and course_number = #{courseNumber} and single_or_double = #{singleOrDouble} + + + + update sz_sch_class_course + set school_id = #{schoolId,jdbcType=INTEGER}, + grade = #{grade,jdbcType=INTEGER}, + class_id = #{classId,jdbcType=INTEGER}, + single_or_double = #{singleOrDouble,jdbcType=INTEGER}, + week = #{week,jdbcType=INTEGER}, + course_number = #{courseNumber,jdbcType=INTEGER}, + course_name = #{courseName,jdbcType=VARCHAR}, + course_open_id = #{courseOpenId,jdbcType=INTEGER}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP} + where course_id = #{courseId,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/cloud/search_independence/src/main/resources/mapper/ClassModelMapper.xml b/cloud/search_independence/src/main/resources/mapper/ClassModelMapper.xml new file mode 100644 index 0000000..e1ea8bd --- /dev/null +++ b/cloud/search_independence/src/main/resources/mapper/ClassModelMapper.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + class_id, school_id, grade, class_name + + + + + insert into sz_sch_class (class_id, school_id, grade, + class_name) + values + + (#{emp.classId,jdbcType=INTEGER}, #{emp.schoolId,jdbcType=INTEGER}, #{emp.grade,jdbcType=VARCHAR}, + #{emp.className,jdbcType=VARCHAR}) + + + + update sz_sch_class + set school_id = #{schoolId,jdbcType=INTEGER}, + grade = #{grade,jdbcType=VARCHAR}, + class_name = #{className,jdbcType=VARCHAR}, + where class_id = #{classId,jdbcType=INTEGER} + + + + + + + + delete from sz_sch_class where school_id = #{schoolId} + + + \ No newline at end of file diff --git a/cloud/search_independence/src/main/resources/mapper/CourseMapper.xml b/cloud/search_independence/src/main/resources/mapper/CourseMapper.xml new file mode 100644 index 0000000..c71895c --- /dev/null +++ b/cloud/search_independence/src/main/resources/mapper/CourseMapper.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + insert into sz_sch_course ( school_id , course_id, course_name,course_type) + values + + (#{emp.schoolId,jdbcType=INTEGER}, #{emp.courseId,jdbcType=INTEGER}, #{emp.courseName,jdbcType=VARCHAR},0) + + + + + + + + + delete from sz_sch_course where school_Id =#{schoolId} + + + + update sz_sch_course set course_type = 0 where school_Id =#{schoolId} + + + + + + update sz_sch_course set course_type =#{courseType} where course_id = #{courseId} and school_id = #{schoolId} + + + \ No newline at end of file diff --git a/cloud/search_independence/src/main/resources/mapper/DimensionalMapper.xml b/cloud/search_independence/src/main/resources/mapper/DimensionalMapper.xml new file mode 100644 index 0000000..a13f872 --- /dev/null +++ b/cloud/search_independence/src/main/resources/mapper/DimensionalMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + insert into sz_learn_dimensional (dimensional_type, dimensional_name,create_time) + values (#{dimensionalType},#{dimensionalName},#{createTime}) + + + + + + \ No newline at end of file diff --git a/cloud/search_independence/src/main/resources/mapper/JoinClassMapper.xml b/cloud/search_independence/src/main/resources/mapper/JoinClassMapper.xml new file mode 100644 index 0000000..71c565b --- /dev/null +++ b/cloud/search_independence/src/main/resources/mapper/JoinClassMapper.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + insert into sz_sch_join_class ( school_id ,class_id,team, course_id, course_name,course_group) + values + + (#{emp.schoolId,jdbcType=INTEGER}, #{emp.classId,jdbcType=INTEGER}, #{emp.team,jdbcType=VARCHAR} + , #{emp.courseId,jdbcType=INTEGER}, #{emp.courseName,jdbcType=VARCHAR}, #{emp.courseGroup,jdbcType=INTEGER}) + + + + + + + + + delete from sz_sch_join_class where course_group = #{courseGroup} + + + + delete from sz_sch_join_class where school_id = #{schoolId} and team = #{team} + + + + + \ No newline at end of file diff --git a/cloud/search_independence/src/main/resources/mapper/KnowledgeMapper.xml b/cloud/search_independence/src/main/resources/mapper/KnowledgeMapper.xml new file mode 100644 index 0000000..f46c6d1 --- /dev/null +++ b/cloud/search_independence/src/main/resources/mapper/KnowledgeMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + insert into sz_learn_knowledge (knowledge,detail, rate,knowledge_avg,update_time) + values + + (#{emp.knowledge},#{emp.detail},#{emp.rate},#{emp.avg},#{emp.updateTime}) + + + + + + + + \ No newline at end of file diff --git a/cloud/search_independence/src/main/resources/mapper/LeagueMapper.xml b/cloud/search_independence/src/main/resources/mapper/LeagueMapper.xml new file mode 100644 index 0000000..9c32cf3 --- /dev/null +++ b/cloud/search_independence/src/main/resources/mapper/LeagueMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + insert into sz_learn_league (analyse_id, league,school_name) + values + (#{analyseId,jdbcType=INTEGER}, #{league,jdbcType=INTEGER}, #{schoolName,jdbcType=VARCHAR}) + + + + insert into sz_learn_league (analyse_id, league,school_name) + values + + (#{emp.analyseId,jdbcType=INTEGER}, #{emp.league,jdbcType=INTEGER}, #{emp.schoolName,jdbcType=VARCHAR}) + + + + + + + update sz_learn_league set league = #{league} , school_name = #{schoolName} where id = #{id} + + + + \ No newline at end of file diff --git a/cloud/search_independence/src/main/resources/mapper/ScheduleMapper.xml b/cloud/search_independence/src/main/resources/mapper/ScheduleMapper.xml new file mode 100644 index 0000000..8c43864 --- /dev/null +++ b/cloud/search_independence/src/main/resources/mapper/ScheduleMapper.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + insert into sz_schedule ( schedule_name , school_id, team,create_time,speed) + values (#{scheduleName},#{schoolId},#{team},#{createTime},#{speed}) + + + + + + + + + + delete sz_schedule where id =#{id} + + + + update sz_schedule set speed = #{speed} where id =#{id} + + + + update sz_schedule set schedule_name = #{scheduleName} , team =#{team} where id =#{id} + + + + update sz_schedule set morning = #{morning} , afternoon =#{afternoon} , night=#{night} where id =#{id} + + \ No newline at end of file diff --git a/cloud/search_independence/src/main/resources/mapper/StudentDetailMapper.xml b/cloud/search_independence/src/main/resources/mapper/StudentDetailMapper.xml new file mode 100644 index 0000000..2eff3b7 --- /dev/null +++ b/cloud/search_independence/src/main/resources/mapper/StudentDetailMapper.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + insert into sz_learn_student_detail (school_name, class_name,student_name, + student_number,analyse_id,exam_number,score,create_time,correct) + values + + (#{emp.schoolName},#{emp.className},#{emp.studentName}, + #{emp.studentNumber},#{emp.analyseId},#{emp.examNumber},#{emp.score},#{emp.createTime},#{emp.correct}) + + + + + + + + + \ No newline at end of file diff --git a/cloud/search_independence/src/main/resources/mapper/StudentMapper.xml b/cloud/search_independence/src/main/resources/mapper/StudentMapper.xml new file mode 100644 index 0000000..0b41f17 --- /dev/null +++ b/cloud/search_independence/src/main/resources/mapper/StudentMapper.xml @@ -0,0 +1,240 @@ + + + + + + + + + + + + + + + + + insert into sz_learn_student (school_name, class_name,student_name, + student_number,analyse_id,score,create_time) + values + + (#{emp.schoolName},#{emp.className},#{emp.studentName}, + #{emp.studentNumber},#{emp.analyseId},#{emp.score},#{emp.createTime}) + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cloud/search_independence/src/main/resources/mapper/TeacherClassMapper.xml b/cloud/search_independence/src/main/resources/mapper/TeacherClassMapper.xml new file mode 100644 index 0000000..dd08779 --- /dev/null +++ b/cloud/search_independence/src/main/resources/mapper/TeacherClassMapper.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + insert into sz_sch_teacher_class (teacher_id, teacher_name, + school_id, grade, class_id, + course_name, times, join_times, + create_time team,status) + values ( #{teacherId,jdbcType=INTEGER}, #{teacherName,jdbcType=VARCHAR}, + #{schoolId,jdbcType=INTEGER}, #{grade,jdbcType=INTEGER}, #{classId,jdbcType=INTEGER}, + #{courseName,jdbcType=VARCHAR}, #{times,jdbcType=INTEGER}, #{joinTimes,jdbcType=INTEGER}, + #{createTime,jdbcType=TIMESTAMP},#{team,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}) + + + insert into sz_sch_teacher_class ( teacher_id, teacher_name, + school_id, grade, class_id, + course_name, times, join_times, + create_time,team,status) + values + + ( #{emp.teacherId,jdbcType=INTEGER}, #{emp.teacherName,jdbcType=VARCHAR}, + #{emp.schoolId,jdbcType=INTEGER}, #{emp.grade,jdbcType=INTEGER}, #{emp.classId,jdbcType=INTEGER}, + #{emp.courseName,jdbcType=VARCHAR}, #{emp.times,jdbcType=INTEGER}, #{emp.joinTimes,jdbcType=INTEGER}, + #{emp.createTime,jdbcType=TIMESTAMP},#{emp.team,jdbcType=VARCHAR}, #{emp.status,jdbcType=INTEGER}) + + + + + + + update sz_sch_teacher_class set status = 1 where t_class_id =#{tClassId} + + + update sz_sch_teacher_class set status = 0 where t_class_id =#{tClassId} + + + + delete from sz_sch_teacher_class where team =#{team} and school_id = #{schoolId} + + + + + + update sz_sch_teacher_class + set teacher_id = #{teacherId,jdbcType=INTEGER}, + teacher_name = #{teacherName,jdbcType=VARCHAR}, + school_id = #{schoolId,jdbcType=INTEGER}, + grade = #{grade,jdbcType=INTEGER}, + class_id = #{classId,jdbcType=INTEGER}, + course_name = #{courseName,jdbcType=VARCHAR}, + times = #{times,jdbcType=INTEGER}, + join_times = #{joinTimes,jdbcType=INTEGER}, + create_time = #{createTime,jdbcType=TIMESTAMP} + where t_class_id = #{tClassId,jdbcType=INTEGER} + + + \ No newline at end of file diff --git a/cloud/search_independence/src/main/resources/mapper/TeacherCourseMapper.xml b/cloud/search_independence/src/main/resources/mapper/TeacherCourseMapper.xml new file mode 100644 index 0000000..c291392 --- /dev/null +++ b/cloud/search_independence/src/main/resources/mapper/TeacherCourseMapper.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + t_class_id, school_id, grade, teacher_name, single_or_double, week, course_number, + class_id, course_name, create_time ,team + + + + insert into sz_sch_teacher_course (school_id, grade, + teacher_name, single_or_double, week, + course_number, class_id, course_name, + create_time,team) + values + + (#{emp.schoolId,jdbcType=INTEGER}, #{emp.grade,jdbcType=VARCHAR}, + #{emp.teacherName,jdbcType=VARCHAR}, #{emp.singleOrDouble,jdbcType=INTEGER}, #{emp.week,jdbcType=INTEGER}, + #{emp.courseNumber,jdbcType=INTEGER}, #{emp.classId,jdbcType=VARCHAR}, #{emp.courseName,jdbcType=VARCHAR}, + #{emp.createTime,jdbcType=TIMESTAMP},#{emp.team,jdbcType=VARCHAR}) + + + + + + update sz_sch_teacher_course + set course_name = #{courseName,jdbcType=VARCHAR} , class_id = #{classId,jdbcType=VARCHAR} , grade=#{grade} + where team =#{team} and school_id = #{schoolId,jdbcType=INTEGER} + and teacher_name = #{teacherName,jdbcType=VARCHAR} + and week = #{week,jdbcType=INTEGER} + and course_number = #{courseNumber,jdbcType=INTEGER} + and single_or_double = #{singleOrDouble,jdbcType=INTEGER} + + + + update sz_sch_teacher_course + set course_name = null , class_id = null , grade= null + where team =#{team} and school_id = #{schoolId,jdbcType=INTEGER} + and teacher_name = #{teacherName} and course_name = #{courseName} + + + + + + + update sz_sch_teacher_course + set school_id = #{schoolId,jdbcType=INTEGER}, + grade = #{grade,jdbcType=VARCHAR}, + teacher_name = #{teacherName,jdbcType=VARCHAR}, + single_or_double = #{singleOrDouble,jdbcType=INTEGER}, + week = #{week,jdbcType=INTEGER}, + course_number = #{courseNumber,jdbcType=INTEGER}, + class_id = #{classId,jdbcType=VARCHAR}, + course_name = #{courseName,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP} + where t_class_id = #{tClassId,jdbcType=INTEGER} + + + + + + delete from sz_sch_teacher_course where school_id = #{schoolId} and team = #{team} + + \ No newline at end of file diff --git a/cloud/search_independence/src/main/resources/mapper/TeacherMapper.xml b/cloud/search_independence/src/main/resources/mapper/TeacherMapper.xml new file mode 100644 index 0000000..18e9a4c --- /dev/null +++ b/cloud/search_independence/src/main/resources/mapper/TeacherMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + insert into sz_sch_teacher ( school_id , teacher_id, teacher_name) + values + + (#{emp.schoolId,jdbcType=INTEGER}, #{emp.teacherId,jdbcType=INTEGER}, #{emp.teacherName,jdbcType=VARCHAR}) + + + + + + + delete from sz_sch_teacher where school_Id =#{schoolId} + + + + + \ No newline at end of file diff --git a/cloud/search_smartCampus/pom.xml b/cloud/search_smartCampus/pom.xml new file mode 100644 index 0000000..f232c73 --- /dev/null +++ b/cloud/search_smartCampus/pom.xml @@ -0,0 +1,208 @@ + + + + cloud + com.sincere + 1.0.0 + + 4.0.0 + + search_smartCampus + + + + com.sincere + common + 0.0.1-SNAPSHOT + + + io.netty + netty-all + 4.1.33.Final + + + org.apache.mina + mina-core + 2.1.3 + + + com.microsoft.sqlserver + mssql-jdbc + 6.4.0.jre8 + + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-aop + + + + com.googlecode.rapid-framework + rapid-core + 4.0.5 + + + org.apache.commons + commons-lang3 + 3.3.2 + + + + org.slf4j + slf4j-api + 1.7.13 + + + + commons-net + commons-net + 2.0 + + + org.apache.poi + poi + 4.1.0 + + + + org.apache.poi + poi-ooxml + 4.1.0 + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 1.3.0 + + + com.alibaba + druid + 1.0.11 + + + io.springfox + springfox-swagger2 + 2.6.1 + + + io.springfox + springfox-swagger-ui + 2.6.1 + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + + + search_smartCampus + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + UTF-8 + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + com.sincere.smartSearch.SmartSearchApplication + true + lib/ + + + ./config/ + + + + config/** + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy + package + + copy-dependencies + + + + ${project.build.directory}/lib + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.5 + + UTF-8 + + + + + maven-source-plugin + 2.2 + + true + + + + compile + + jar + + + + + + + \ No newline at end of file diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/SmartSearchApplication.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/SmartSearchApplication.java new file mode 100644 index 0000000..09a4069 --- /dev/null +++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/SmartSearchApplication.java @@ -0,0 +1,21 @@ +package com.sincere.smartSearch; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.netflix.eureka.EnableEurekaClient; + +/** + * @author chen + * @version 1.0 + * @date 2019/11/7 0007 15:06 + */ +@EnableEurekaClient +@SpringBootApplication +@MapperScan("com.sincere.smartSearch.mapper") +public class SmartSearchApplication { + + public static void main(String[] args) { + SpringApplication.run(SmartSearchApplication.class, args); + } +} diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/controller/WgController.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/controller/WgController.java new file mode 100644 index 0000000..a521ab8 --- /dev/null +++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/controller/WgController.java @@ -0,0 +1,114 @@ +package com.sincere.smartSearch.controller; + +import com.sincere.common.dto.smartCampus.SchoolDto; +import com.sincere.common.dto.smartCampus.StudentCardDto; +import com.sincere.common.dto.smartCampus.UpdateCardDto; +import com.sincere.common.dto.smartCampus.UserDto; +import com.sincere.smartSearch.model.School; +import com.sincere.smartSearch.model.StudentCard; +import com.sincere.smartSearch.model.UpdateCard; +import com.sincere.smartSearch.model.User; +import com.sincere.smartSearch.service.DeviceService; +import com.sincere.smartSearch.service.WgUserSearchService; +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.nio.file.attribute.UserDefinedFileAttributeView; + +/** + * @author chen + * @version 1.0 + * @date 2019/11/7 0007 15:47 + */ +@RestController +@RequestMapping("/sm/wg") +public class WgController { + + @Autowired + DeviceService deviceService; + + @Autowired + WgUserSearchService wgUserSearchService; + + @RequestMapping(value = "updateLinkTime",method = RequestMethod.GET) + int updateLinkTime(@RequestParam("sno") String sno){ + return deviceService.updateLinkTime(sno); + } + + @RequestMapping(value = "selectOutOrderId",method = RequestMethod.GET) + String selectOutOrderId(@RequestParam("type") int type, @RequestParam("insideOrderId") int insideOrderId){ + return deviceService.selectOutOrderId(type,insideOrderId); + } + + @RequestMapping(value = "checkLeave",method = RequestMethod.GET) + String checkLeave(@RequestParam("cardNo") String cardNo){ + return wgUserSearchService.checkLeave(cardNo); + } + + @RequestMapping(value = "selectSchoolBySchoolId",method = RequestMethod.GET) + SchoolDto selectSchoolBySchoolId(@RequestParam("schoolId") int schoolId){ + School school = wgUserSearchService.selectSchoolBySchoolId(schoolId); + return toSchoolDto(school); + } + + @RequestMapping(value = "selectUserByCardNum",method = RequestMethod.GET) + UserDto selectUserByCardNum(@RequestParam("cardNum") String cardNum){ + User user = wgUserSearchService.selectUserByCardNum(cardNum); + return toUserDto(user); + } + + @RequestMapping(value = "selectUpdateCardByUpdateId",method = RequestMethod.GET) + UpdateCardDto selectUpdateCardByUpdateId(@RequestParam("updateId") int updateId){ + UpdateCard updateCard = wgUserSearchService.selectUpdateCardByUpdateId(updateId); + return toUpdateCardDto(updateCard); + } + + @RequestMapping(value = "selectStudentCard",method = RequestMethod.GET) + StudentCardDto selectStudentCard(@RequestParam("cardNum") String cardNum){ + StudentCard studentCard = wgUserSearchService.selectStudentCard(cardNum); + return toStudentCardDto(studentCard); + } + + + private SchoolDto toSchoolDto(School school){ + SchoolDto schoolDto = new SchoolDto(); + if(school != null){ + schoolDto.setSchoolId(school.getSchoolId()); + schoolDto.setSchoolName(school.getSchoolName()); + } + return schoolDto; + } + + private UserDto toUserDto(User user){ + UserDto userDto = new UserDto(); + if(user != null){ + userDto.setClassId(user.getClassId()); + userDto.setName(user.getName()); + userDto.setSchoolId(user.getSchoolId()); + userDto.setStudentId(user.getStudentId()); + } + return userDto; + } + + private UpdateCardDto toUpdateCardDto(UpdateCard updateCard){ + UpdateCardDto updateCardDto = new UpdateCardDto(); + if(updateCard != null){ + updateCardDto.setId(updateCard.getId()); + updateCardDto.setOldCard(updateCard.getOldCard()); + updateCard.setUserType(updateCard.getUserType()); + } + return updateCardDto; + } + + private StudentCardDto toStudentCardDto(StudentCard studentCard){ + StudentCardDto studentCardDto = new StudentCardDto(); + if(studentCard != null){ + studentCardDto.setCardNum(studentCard.getCardNum()); + studentCardDto.setCardType(studentCard.getCardType()); + } + return studentCardDto; + } +} diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/mapper/DeviceMapper.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/mapper/DeviceMapper.java new file mode 100644 index 0000000..95118d0 --- /dev/null +++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/mapper/DeviceMapper.java @@ -0,0 +1,18 @@ +package com.sincere.smartSearch.mapper; + +import com.sincere.smartSearch.model.DeviceLink; +import com.sincere.smartSearch.model.DeviceOrder; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/12 0012 16:27 + */ +public interface DeviceMapper { + + int updateLinkTime(DeviceLink deviceLink); + + int insertLink(DeviceLink deviceLink); + + String selectOutOrderId(DeviceOrder deviceOrder); +} diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/mapper/WgUserSearchMapper.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/mapper/WgUserSearchMapper.java new file mode 100644 index 0000000..2d6758e --- /dev/null +++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/mapper/WgUserSearchMapper.java @@ -0,0 +1,26 @@ +package com.sincere.smartSearch.mapper; + +import com.sincere.smartSearch.model.School; +import com.sincere.smartSearch.model.StudentCard; +import com.sincere.smartSearch.model.UpdateCard; +import com.sincere.smartSearch.model.User; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/14 0014 14:36 + */ +public interface WgUserSearchMapper { + + String checkLeave(String cardNo); + + School selectSchoolBySchoolId(int schoolId); + + List selectUserByCardNum(String cardNum); + + UpdateCard selectUpdateCardByUpdateId(int updateId); + + List selectStudentCard(String cardNum); +} diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/model/DeviceLink.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/model/DeviceLink.java new file mode 100644 index 0000000..14affb9 --- /dev/null +++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/model/DeviceLink.java @@ -0,0 +1,39 @@ +package com.sincere.smartSearch.model; + +import java.util.Date; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/12 0012 16:24 + */ +public class DeviceLink { + + private String deviceNo ; + private Date lastTime ; + private int isRelation ; + + public String getDeviceNo() { + return deviceNo; + } + + public void setDeviceNo(String deviceNo) { + this.deviceNo = deviceNo; + } + + public Date getLastTime() { + return lastTime; + } + + public void setLastTime(Date lastTime) { + this.lastTime = lastTime; + } + + public int getIsRelation() { + return isRelation; + } + + public void setIsRelation(int isRelation) { + this.isRelation = isRelation; + } +} diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/model/DeviceOrder.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/model/DeviceOrder.java new file mode 100644 index 0000000..993d31a --- /dev/null +++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/model/DeviceOrder.java @@ -0,0 +1,28 @@ +package com.sincere.smartSearch.model; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/29 0029 10:23 + */ +public class DeviceOrder { + + private int type ; + private int insideOrderId ; + + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } + + public int getInsideOrderId() { + return insideOrderId; + } + + public void setInsideOrderId(int insideOrderId) { + this.insideOrderId = insideOrderId; + } +} diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/model/School.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/model/School.java new file mode 100644 index 0000000..6bd8624 --- /dev/null +++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/model/School.java @@ -0,0 +1,29 @@ +package com.sincere.smartSearch.model; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/14 0014 14:37 + */ +public class School { + + private int schoolId ; + private String schoolName ; + + public int getSchoolId() { + return schoolId; + } + + public void setSchoolId(int schoolId) { + this.schoolId = schoolId; + } + + public String getSchoolName() { + return schoolName; + } + + public void setSchoolName(String schoolName) { + this.schoolName = schoolName; + } + +} diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/model/StudentCard.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/model/StudentCard.java new file mode 100644 index 0000000..7e737da --- /dev/null +++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/model/StudentCard.java @@ -0,0 +1,27 @@ +package com.sincere.smartSearch.model; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/14 0014 14:50 + */ +public class StudentCard { + private String cardType ; + private String cardNum ; + + public String getCardType() { + return cardType; + } + + public void setCardType(String cardType) { + this.cardType = cardType; + } + + public String getCardNum() { + return cardNum; + } + + public void setCardNum(String cardNum) { + this.cardNum = cardNum; + } +} diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/model/UpdateCard.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/model/UpdateCard.java new file mode 100644 index 0000000..cfa3b48 --- /dev/null +++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/model/UpdateCard.java @@ -0,0 +1,36 @@ +package com.sincere.smartSearch.model; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/14 0014 14:46 + */ +public class UpdateCard { + private int id ; + private int userType ; + private String oldCard ; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getUserType() { + return userType; + } + + public void setUserType(int userType) { + this.userType = userType; + } + + public String getOldCard() { + return oldCard; + } + + public void setOldCard(String oldCard) { + this.oldCard = oldCard; + } +} diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/model/User.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/model/User.java new file mode 100644 index 0000000..397c576 --- /dev/null +++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/model/User.java @@ -0,0 +1,46 @@ +package com.sincere.smartSearch.model; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/14 0014 14:41 + */ +public class User { + + private int schoolId; + private int classId ; + private String name ; + private int studentId ; + + 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 getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getStudentId() { + return studentId; + } + + public void setStudentId(int studentId) { + this.studentId = studentId; + } +} diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/DeviceService.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/DeviceService.java new file mode 100644 index 0000000..4af02ea --- /dev/null +++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/DeviceService.java @@ -0,0 +1,15 @@ +package com.sincere.smartSearch.service; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/12 0012 16:30 + */ +public interface DeviceService { + + int updateLinkTime(String sno); + + + String selectOutOrderId(int type, int insideOrderId); + +} diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/WgUserSearchService.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/WgUserSearchService.java new file mode 100644 index 0000000..8c0cd69 --- /dev/null +++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/WgUserSearchService.java @@ -0,0 +1,22 @@ +package com.sincere.smartSearch.service; + +import com.sincere.smartSearch.model.*; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/14 0014 14:55 + */ +public interface WgUserSearchService { + + + String checkLeave(String cardNo); + + School selectSchoolBySchoolId(int schoolId); + + User selectUserByCardNum(String cardNum); + + UpdateCard selectUpdateCardByUpdateId(int updateId); + + StudentCard selectStudentCard(String cardNum); +} diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/impl/DeviceServiceImpl.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/impl/DeviceServiceImpl.java new file mode 100644 index 0000000..74c79f4 --- /dev/null +++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/impl/DeviceServiceImpl.java @@ -0,0 +1,43 @@ +package com.sincere.smartSearch.service.impl; + +import com.sincere.smartSearch.mapper.DeviceMapper; +import com.sincere.smartSearch.model.DeviceLink; +import com.sincere.smartSearch.model.DeviceOrder; +import com.sincere.smartSearch.service.DeviceService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/12 0012 16:31 + */ +@Service("deviceService") +public class DeviceServiceImpl implements DeviceService { + + @Autowired + DeviceMapper deviceMapper; + + @Override + public int updateLinkTime(String sno) { + DeviceLink deviceLink = new DeviceLink(); + deviceLink.setDeviceNo(sno); + deviceLink.setLastTime(new Date()); + if(deviceMapper.updateLinkTime(deviceLink) > 0){ + //已存在,更新即可 + }else { + deviceMapper.insertLink(deviceLink); + } + return 1 ; + } + + @Override + public String selectOutOrderId(int type, int insideOrderId) { + DeviceOrder deviceOrder = new DeviceOrder(); + deviceOrder.setType(type); + deviceOrder.setInsideOrderId(insideOrderId); + return deviceMapper.selectOutOrderId(deviceOrder); + } +} diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/impl/WgUserSearchServiceImpl.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/impl/WgUserSearchServiceImpl.java new file mode 100644 index 0000000..b7dc49a --- /dev/null +++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/impl/WgUserSearchServiceImpl.java @@ -0,0 +1,60 @@ +package com.sincere.smartSearch.service.impl; + +import com.sincere.smartSearch.mapper.WgUserSearchMapper; +import com.sincere.smartSearch.model.School; +import com.sincere.smartSearch.model.StudentCard; +import com.sincere.smartSearch.model.UpdateCard; +import com.sincere.smartSearch.model.User; +import com.sincere.smartSearch.service.WgUserSearchService; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/14 0014 14:55 + */ +@Service("wgUserSearchService") +public class WgUserSearchServiceImpl implements WgUserSearchService { + + @Autowired + WgUserSearchMapper searchMapper; + + + @Override + public String checkLeave(String cardNo) { + return searchMapper.checkLeave(cardNo); + } + + @Override + public School selectSchoolBySchoolId(int schoolId) { + return searchMapper.selectSchoolBySchoolId(schoolId); + } + + @Override + public User selectUserByCardNum(String cardNum) { + try{ + return searchMapper.selectUserByCardNum(cardNum).get(0); + }catch (Exception e){ + } + return new User(); + } + + @Override + public UpdateCard selectUpdateCardByUpdateId(int updateId) { + return searchMapper.selectUpdateCardByUpdateId(updateId); + } + + @Override + public StudentCard selectStudentCard(String cardNum) { + List list = searchMapper.selectStudentCard(cardNum) ; + if(list != null && list.size() > 0){ + return list.get(0); + }else { + return new StudentCard(); + } + } +} diff --git a/cloud/search_smartCampus/src/main/resources/application.yml b/cloud/search_smartCampus/src/main/resources/application.yml new file mode 100644 index 0000000..fbb7c59 --- /dev/null +++ b/cloud/search_smartCampus/src/main/resources/application.yml @@ -0,0 +1,27 @@ +server: + port: 7777 +spring: + application: + name: smartCampusSearch + datasource: + username: SZJXTUSER + password: xst200919 + url: jdbc:sqlserver://60.190.202.57:14333;database=SmartCampusSZ + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver +##mybatis +mybatis: + mapper-locations: classpath:mapper/*.xml + type-aliases-package: com.sincere.smartSearch.model + check-config-location: true + +eureka: + instance: + hostname: localhost + lease-expiration-duration-in-seconds: 60 + lease-renewal-interval-in-seconds: 10 + client: + service-url: + defaultZone: http://localhost:8761/eureka/,http://localhost:8762/eureka/ + + + diff --git a/cloud/search_smartCampus/src/main/resources/logback.xml b/cloud/search_smartCampus/src/main/resources/logback.xml new file mode 100644 index 0000000..e3953ee --- /dev/null +++ b/cloud/search_smartCampus/src/main/resources/logback.xml @@ -0,0 +1,61 @@ + + +     +     + +     + + + +     +     +         +         +             +             [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] %highlight([%-5level] %logger{50} - %msg%n) +             UTF-8 +         +     + +     +     +         +         +             +             ${LOG_HOME}/${PROJECT_NAME}.system-dev.%d{yyyy-MM-dd HH}.%i.log +             +             30 +             +             100MB +         + +         +             +             [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] %logger{50} - %msg%n +             UTF-8 +         +     +     +        +    + +    +    +    +    +    +    +    + + +    +    +    +    +    +    +        +        +    + + \ No newline at end of file diff --git a/cloud/search_smartCampus/src/main/resources/mapper/DeviceMapper.xml b/cloud/search_smartCampus/src/main/resources/mapper/DeviceMapper.xml new file mode 100644 index 0000000..d21d2f4 --- /dev/null +++ b/cloud/search_smartCampus/src/main/resources/mapper/DeviceMapper.xml @@ -0,0 +1,17 @@ + + + + + + update AC_DeviceLink set LastTime =#{lastTime} where DeviceNo = #{deviceNo} + + + + insert into AC_DeviceLink(DeviceNo,LastTime,IsRelation) + values (#{deviceNo},#{lastTime},0) + + + + \ No newline at end of file diff --git a/cloud/search_smartCampus/src/main/resources/mapper/WgUserSearchMapper.xml b/cloud/search_smartCampus/src/main/resources/mapper/WgUserSearchMapper.xml new file mode 100644 index 0000000..01b4897 --- /dev/null +++ b/cloud/search_smartCampus/src/main/resources/mapper/WgUserSearchMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cloud/search_xiaoan/pom.xml b/cloud/search_xiaoan/pom.xml new file mode 100644 index 0000000..afe3983 --- /dev/null +++ b/cloud/search_xiaoan/pom.xml @@ -0,0 +1,209 @@ + + + + cloud + com.sincere + 1.0.0 + + 4.0.0 + + search_xiaoan + + + com.sincere + common + 0.0.1-SNAPSHOT + + + + io.netty + netty-all + 4.1.33.Final + + + org.apache.mina + mina-core + 2.1.3 + + + com.microsoft.sqlserver + mssql-jdbc + 6.4.0.jre8 + + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-aop + + + + com.googlecode.rapid-framework + rapid-core + 4.0.5 + + + org.apache.commons + commons-lang3 + 3.3.2 + + + + org.slf4j + slf4j-api + 1.7.13 + + + + commons-net + commons-net + 2.0 + + + org.apache.poi + poi + 4.1.0 + + + + org.apache.poi + poi-ooxml + 4.1.0 + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 1.3.0 + + + com.alibaba + druid + 1.0.11 + + + io.springfox + springfox-swagger2 + 2.6.1 + + + io.springfox + springfox-swagger-ui + 2.6.1 + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + + + search_xiaoan + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + UTF-8 + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + com.jevon.Application + true + lib/ + + + ./config/ + + + + config/** + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy + package + + copy-dependencies + + + + ${project.build.directory}/lib + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.5 + + UTF-8 + + + + + maven-source-plugin + 2.2 + + true + + + + compile + + jar + + + + + + + + \ No newline at end of file diff --git a/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/XiaoanSearchApplication.java b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/XiaoanSearchApplication.java new file mode 100644 index 0000000..d11e133 --- /dev/null +++ b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/XiaoanSearchApplication.java @@ -0,0 +1,21 @@ +package com.sincere.xiaoanSearch; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.netflix.eureka.EnableEurekaClient; + +/** + * @author chen + * @version 1.0 + * @date 2019/11/11 0011 15:40 + */ +@EnableEurekaClient +@SpringBootApplication +@MapperScan("com.sincere.xiaoanSearch.mapper") +public class XiaoanSearchApplication { + + public static void main(String[] args) { + SpringApplication.run(XiaoanSearchApplication.class, args); + } +} diff --git a/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/controller/WgController.java b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/controller/WgController.java new file mode 100644 index 0000000..e4d573b --- /dev/null +++ b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/controller/WgController.java @@ -0,0 +1,99 @@ +package com.sincere.xiaoanSearch.controller; + +import com.sincere.common.dto.xiaoan.*; +import com.sincere.xiaoanSearch.model.*; +import com.sincere.xiaoanSearch.service.CheckInService; +import com.sincere.xiaoanSearch.service.WgService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author chen + * @version 1.0 + * @date 2019/11/11 0011 15:53 + */ +@RestController +@RequestMapping("/xa/wg") +public class WgController { + + @Autowired + CheckInService checkInService; + + @Autowired + WgService wgService; + + @RequestMapping(value = "checkIn",method = RequestMethod.POST) + public CheckOutDto checkIn(@RequestBody CheckInDto checkInDto){ + CheckIn checkIn = new CheckIn(checkInDto); + checkInService.checkIn(checkIn); + CheckOutDto checkOutDto = new CheckOutDto(); + checkOutDto.setIsSuccess(checkIn.getIsSuccess()); + checkOutDto.setOut(checkIn.getOut()); + return checkOutDto; + } + + @RequestMapping(value = "insertMessage",method = RequestMethod.POST) + public long insertMessage(@RequestBody SendMessageDto sendMessageDto){ + SendMessage sendMessage = new SendMessage(sendMessageDto); + wgService.insertMessage(sendMessage); + return sendMessage.getId(); + } + + @RequestMapping(value = "selectById",method = RequestMethod.GET) + SendMessageDto selectById(@RequestParam("id") long id){ + SendMessage sendMessage = wgService.selectById(id); + return toSendMessageDto(sendMessage); + } + + @RequestMapping(value = "selectMessage",method = RequestMethod.GET) + SendMessageDto selectMessage(@RequestParam("deviceId") String deviceId, @RequestParam("index") long index,@RequestParam("functionId") String functionId){ + SendMessage sendMessage = wgService.selectMessage(deviceId,index,functionId); + return toSendMessageDto(sendMessage); + } + + @RequestMapping(value = "updateMessage",method = RequestMethod.GET) + int updateMessage(@RequestParam("id") long id, @RequestParam("result") String result, @RequestParam("correct") int correct){ + return wgService.updateMessage(id,result,correct); + } + + @RequestMapping(value = "insertPassFail",method = RequestMethod.POST) + int insertPassFail(@RequestBody PassFailDto passFailDto){ + return wgService.insertPassFail(new PassFail(passFailDto)); + } + + @RequestMapping(value = "insertSendSuccess",method = RequestMethod.POST) + int insertSendSuccess(@RequestBody SendSuccessDto sendSuccessDto){ + return wgService.insertSendSuccess(new SendSuccess(sendSuccessDto)); + } + + @RequestMapping(value = "insertSendFail",method = RequestMethod.POST) + int insertSendFail(@RequestBody SendFailDto sendFailDto){ + return wgService.insertSendFail(new SendFail(sendFailDto)); + } + + @RequestMapping(value = "deleteSendFail",method = RequestMethod.POST) + int deleteSendFail(@RequestBody SendFailDto sendFailDto){ + return wgService.deleteSendFail(new SendFail(sendFailDto)); + } + + @RequestMapping(value = "updateSendSuccess",method = RequestMethod.POST) + int updateSendSuccess(@RequestBody SendSuccessDto sendSuccessDto){ + return wgService.updateSendSuccess(new SendSuccess(sendSuccessDto)); + } + + public SendMessageDto toSendMessageDto(SendMessage sendMessage){ + SendMessageDto sendMessageDto = new SendMessageDto(); + if(sendMessage != null){ + sendMessageDto.setId(sendMessage.getId()); + sendMessageDto.setDeviceId(sendMessage.getDeviceId()); + sendMessageDto.setCardNo(sendMessage.getCardNo()); + sendMessageDto.setIndex(sendMessage.getIndex()); + sendMessageDto.setSend(sendMessage.getSend()); + sendMessageDto.setResult(sendMessage.getResult()); + sendMessageDto.setCorrect(sendMessage.getCorrect()); + sendMessageDto.setCreateTime(sendMessage.getCreateTime()); + sendMessageDto.setFunctionId(sendMessage.getFunctionId()); + } + return sendMessageDto ; + } +} diff --git a/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/mapper/CheckMapper.java b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/mapper/CheckMapper.java new file mode 100644 index 0000000..ccad4e0 --- /dev/null +++ b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/mapper/CheckMapper.java @@ -0,0 +1,14 @@ +package com.sincere.xiaoanSearch.mapper; + +import com.sincere.xiaoanSearch.model.CheckIn; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/14 0014 14:36 + */ +public interface CheckMapper { + + void checkIn(CheckIn checkIn); + +} diff --git a/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/mapper/SendMessageMapper.java b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/mapper/SendMessageMapper.java new file mode 100644 index 0000000..d01291f --- /dev/null +++ b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/mapper/SendMessageMapper.java @@ -0,0 +1,22 @@ +package com.sincere.xiaoanSearch.mapper; + + +import com.sincere.xiaoanSearch.model.SendMessage; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/29 0029 14:00 + */ +public interface SendMessageMapper { + + SendMessage selectById(long id); + + List selectMessage(SendMessage sendMessage); + + int insert(SendMessage sendMessage); + + int update(SendMessage sendMessage); +} diff --git a/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/mapper/WgResultMapper.java b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/mapper/WgResultMapper.java new file mode 100644 index 0000000..4537c82 --- /dev/null +++ b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/mapper/WgResultMapper.java @@ -0,0 +1,24 @@ +package com.sincere.xiaoanSearch.mapper; + + +import com.sincere.xiaoanSearch.model.PassFail; +import com.sincere.xiaoanSearch.model.SendFail; +import com.sincere.xiaoanSearch.model.SendSuccess; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/14 0014 15:00 + */ +public interface WgResultMapper { + + int insertPassFail(PassFail passFail); + + int insertSendSuccess(SendSuccess sendSuccess); + + int insertSendFail(SendFail sendFail); + + int deleteSendFail(SendFail sendFail); + + int updateSendSuccess(SendSuccess sendSuccess); +} diff --git a/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/model/CheckIn.java b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/model/CheckIn.java new file mode 100644 index 0000000..28ba103 --- /dev/null +++ b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/model/CheckIn.java @@ -0,0 +1,84 @@ +package com.sincere.xiaoanSearch.model; + +import com.sincere.common.dto.xiaoan.CheckInDto; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/30 0030 10:26 + */ +public class CheckIn { + + private String deviceId ; + private String cardNo ; + private int funNo ; + private int flag ; + private String checkTime ; + + private String out; + private int isSuccess ; + + public CheckIn(CheckInDto checkInDto){ + this.deviceId = checkInDto.getDeviceId(); + this.cardNo = checkInDto.getCardNo(); + this.funNo = checkInDto.getFunNo(); + this.flag = checkInDto.getFlag() ; + this.checkTime = checkInDto.getCheckTime() ; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public int getFlag() { + return flag; + } + + public void setFlag(int flag) { + this.flag = flag; + } + + public String getCheckTime() { + return checkTime; + } + + public void setCheckTime(String checkTime) { + this.checkTime = checkTime; + } + + public String getOut() { + return out; + } + + public void setOut(String out) { + this.out = out; + } + + public int getIsSuccess() { + return isSuccess; + } + + public void setIsSuccess(int isSuccess) { + this.isSuccess = isSuccess; + } + + public int getFunNo() { + return funNo; + } + + public void setFunNo(int funNo) { + this.funNo = funNo; + } +} diff --git a/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/model/PassFail.java b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/model/PassFail.java new file mode 100644 index 0000000..d9b1442 --- /dev/null +++ b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/model/PassFail.java @@ -0,0 +1,87 @@ +package com.sincere.xiaoanSearch.model; + +import com.sincere.common.dto.xiaoan.PassFailDto; + +import java.util.Date; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/14 0014 14:58 + */ +public class PassFail { + + private String cardNum ; + private String deviceId ; + private String direction ; + private String resultIntro ; + private Date createTime ; + private int schoolId ; + private Date inTime ; + + public PassFail(PassFailDto passFailDto){ + this.cardNum = passFailDto.getCardNum(); + this.deviceId = passFailDto.getDeviceId(); + this.direction = passFailDto.getDirection(); + this.resultIntro = passFailDto.getResultIntro(); + this.createTime = passFailDto.getCreateTime(); + this.schoolId = passFailDto.getSchoolId(); + this.inTime = passFailDto.getInTime(); + } + + public String getCardNum() { + return cardNum; + } + + public void setCardNum(String cardNum) { + this.cardNum = cardNum; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getDirection() { + return direction; + } + + public void setDirection(String direction) { + this.direction = direction; + } + + public String getResultIntro() { + return resultIntro; + } + + public void setResultIntro(String resultIntro) { + this.resultIntro = resultIntro; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public int getSchoolId() { + return schoolId; + } + + public void setSchoolId(int schoolId) { + this.schoolId = schoolId; + } + + public Date getInTime() { + return inTime; + } + + public void setInTime(Date inTime) { + this.inTime = inTime; + } +} diff --git a/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/model/SendFail.java b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/model/SendFail.java new file mode 100644 index 0000000..44e9f3f --- /dev/null +++ b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/model/SendFail.java @@ -0,0 +1,214 @@ +package com.sincere.xiaoanSearch.model; + +import com.sincere.common.dto.smartCampus.SchoolDto; +import com.sincere.common.dto.smartCampus.StudentCardDto; +import com.sincere.common.dto.smartCampus.UpdateCardDto; +import com.sincere.common.dto.smartCampus.UserDto; +import com.sincere.common.dto.xiaoan.SendFailDto; + +import java.util.Date; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/14 0014 15:18 + */ +public class SendFail { + + private String deviceId ; + private String cardNum ; + private String oldCardNum ; + private String cardType ; + private int customerId ; + private int userType ; + private int classId ; + private String schoolName ; + private int studentType ; + private int openFlag ; + private int status ; + private int updateId ; + private Date createTime ; + private int sex ; + private String name ; + private int failType ; + private String failContent ; + private int schoolId ; + private int shiduan ; + + public SendFail(SendFailDto sendFailDto){ + this.deviceId = sendFailDto.getDeviceId(); + this.cardNum = sendFailDto.getCardNum(); + this.oldCardNum = sendFailDto.getOldCardNum(); + this.cardType = sendFailDto.getCardType(); + this.customerId = sendFailDto.getCustomerId(); + this.userType = sendFailDto.getUserType(); + this.classId = sendFailDto.getClassId(); + this.schoolName = sendFailDto.getSchoolName(); + this.studentType = sendFailDto.getStudentType(); + this.openFlag = sendFailDto.getOpenFlag(); + this.status = sendFailDto.getStatus(); + this.updateId = sendFailDto.getUpdateId(); + this.createTime = sendFailDto.getCreateTime(); + this.sex = sendFailDto.getSex(); + this.name = sendFailDto.getName(); + this.schoolId = sendFailDto.getSchoolId(); + this.shiduan =sendFailDto.getShiduan(); + this.failType = sendFailDto.getFailType(); + this.failContent = sendFailDto.getFailContent(); + } + + public SendFail() { + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getCardNum() { + return cardNum; + } + + public void setCardNum(String cardNum) { + this.cardNum = cardNum; + } + + public String getOldCardNum() { + return oldCardNum; + } + + public void setOldCardNum(String oldCardNum) { + this.oldCardNum = oldCardNum; + } + + public String getCardType() { + return cardType; + } + + public void setCardType(String cardType) { + this.cardType = cardType; + } + + public int getCustomerId() { + return customerId; + } + + public void setCustomerId(int customerId) { + this.customerId = customerId; + } + + public int getUserType() { + return userType; + } + + public void setUserType(int userType) { + this.userType = userType; + } + + public int getClassId() { + return classId; + } + + public void setClassId(int classId) { + this.classId = classId; + } + + public String getSchoolName() { + return schoolName; + } + + public void setSchoolName(String schoolName) { + this.schoolName = schoolName; + } + + public int getStudentType() { + return studentType; + } + + public void setStudentType(int studentType) { + this.studentType = studentType; + } + + public int getOpenFlag() { + return openFlag; + } + + public void setOpenFlag(int openFlag) { + this.openFlag = openFlag; + } + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + + public int getUpdateId() { + return updateId; + } + + public void setUpdateId(int updateId) { + this.updateId = updateId; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public int getSex() { + return sex; + } + + public void setSex(int sex) { + this.sex = sex; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getSchoolId() { + return schoolId; + } + + public void setSchoolId(int schoolId) { + this.schoolId = schoolId; + } + + public int getShiduan() { + return shiduan; + } + + public void setShiduan(int shiduan) { + this.shiduan = shiduan; + } + + public int getFailType() { + return failType; + } + + public void setFailType(int failType) { + this.failType = failType; + } + + public String getFailContent() { + return failContent; + } + + public void setFailContent(String failContent) { + this.failContent = failContent; + } +} diff --git a/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/model/SendMessage.java b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/model/SendMessage.java new file mode 100644 index 0000000..082cae3 --- /dev/null +++ b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/model/SendMessage.java @@ -0,0 +1,109 @@ +package com.sincere.xiaoanSearch.model; + +import com.sincere.common.dto.xiaoan.SendMessageDto; + +import java.util.Date; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/29 0029 13:59 + */ +public class SendMessage { + + private long id ; + private String deviceId ; + private String cardNo ; + private long index ; + private String send ; + private String result ; + private int correct ; + private Date createTime ; + private String functionId ; + + public SendMessage() { + } + + public SendMessage(SendMessageDto sendMessageDto){ + this.deviceId = sendMessageDto.getDeviceId(); + this.cardNo = sendMessageDto.getCardNo(); + this.index = sendMessageDto.getIndex(); + this.send = sendMessageDto.getSend(); + this.result = sendMessageDto.getResult(); + this.correct = sendMessageDto.getCorrect(); + this.createTime = sendMessageDto.getCreateTime(); + this.functionId = sendMessageDto.getFunctionId(); + } + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public long getIndex() { + return index; + } + + public void setIndex(long index) { + this.index = index; + } + + public String getSend() { + return send; + } + + public void setSend(String send) { + this.send = send; + } + + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result; + } + + public int getCorrect() { + return correct; + } + + public void setCorrect(int correct) { + this.correct = correct; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getFunctionId() { + return functionId; + } + + public void setFunctionId(String functionId) { + this.functionId = functionId; + } +} diff --git a/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/model/SendSuccess.java b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/model/SendSuccess.java new file mode 100644 index 0000000..5487516 --- /dev/null +++ b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/model/SendSuccess.java @@ -0,0 +1,195 @@ +package com.sincere.xiaoanSearch.model; + + +import com.sincere.common.dto.smartCampus.SchoolDto; +import com.sincere.common.dto.smartCampus.StudentCardDto; +import com.sincere.common.dto.smartCampus.UpdateCardDto; +import com.sincere.common.dto.smartCampus.UserDto; +import com.sincere.common.dto.xiaoan.SendSuccessDto; + +import java.util.Date; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/14 0014 15:18 + */ +public class SendSuccess { + + private String deviceId ; + private String cardNum ; + private String oldCardNum ; + private String cardType ; + private int customerId ; + private int userType ; + private int classId ; + private String schoolName ; + private int studentType ; + private int openFlag ; + private int status ; + private int updateId ; + private Date createTime ; + private int sex ; + private String name ; + private int schoolId ; + private int shiduan ; + + public SendSuccess() { + } + + public SendSuccess(SendSuccessDto sendSuccessDto){ + this.deviceId = sendSuccessDto.getDeviceId(); + this.cardNum = sendSuccessDto.getCardNum(); + this.oldCardNum = sendSuccessDto.getOldCardNum(); + this.cardType = sendSuccessDto.getCardType(); + this.customerId = sendSuccessDto.getCustomerId(); + this.userType = sendSuccessDto.getUserType(); + this.classId = sendSuccessDto.getClassId(); + this.schoolName = sendSuccessDto.getSchoolName(); + this.studentType = sendSuccessDto.getStudentType(); + this.openFlag = sendSuccessDto.getOpenFlag(); + this.status = sendSuccessDto.getStatus(); + this.updateId = sendSuccessDto.getUpdateId(); + this.createTime = sendSuccessDto.getCreateTime(); + this.sex = sendSuccessDto.getSex(); + this.name = sendSuccessDto.getName(); + this.schoolId = sendSuccessDto.getSchoolId(); + this.shiduan =sendSuccessDto.getShiduan(); + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getCardNum() { + return cardNum; + } + + public void setCardNum(String cardNum) { + this.cardNum = cardNum; + } + + public String getOldCardNum() { + return oldCardNum; + } + + public void setOldCardNum(String oldCardNum) { + this.oldCardNum = oldCardNum; + } + + public String getCardType() { + return cardType; + } + + public void setCardType(String cardType) { + this.cardType = cardType; + } + + public int getCustomerId() { + return customerId; + } + + public void setCustomerId(int customerId) { + this.customerId = customerId; + } + + public int getUserType() { + return userType; + } + + public void setUserType(int userType) { + this.userType = userType; + } + + public int getClassId() { + return classId; + } + + public void setClassId(int classId) { + this.classId = classId; + } + + public String getSchoolName() { + return schoolName; + } + + public void setSchoolName(String schoolName) { + this.schoolName = schoolName; + } + + public int getStudentType() { + return studentType; + } + + public void setStudentType(int studentType) { + this.studentType = studentType; + } + + public int getOpenFlag() { + return openFlag; + } + + public void setOpenFlag(int openFlag) { + this.openFlag = openFlag; + } + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + + public int getUpdateId() { + return updateId; + } + + public void setUpdateId(int updateId) { + this.updateId = updateId; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public int getSex() { + return sex; + } + + public void setSex(int sex) { + this.sex = sex; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getSchoolId() { + return schoolId; + } + + public void setSchoolId(int schoolId) { + this.schoolId = schoolId; + } + + public int getShiduan() { + return shiduan; + } + + public void setShiduan(int shiduan) { + this.shiduan = shiduan; + } +} diff --git a/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/service/CheckInService.java b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/service/CheckInService.java new file mode 100644 index 0000000..4fa0c48 --- /dev/null +++ b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/service/CheckInService.java @@ -0,0 +1,14 @@ +package com.sincere.xiaoanSearch.service; + + +import com.sincere.xiaoanSearch.model.CheckIn; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/14 0014 14:55 + */ +public interface CheckInService { + + void checkIn(CheckIn checkIn); +} diff --git a/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/service/WgService.java b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/service/WgService.java new file mode 100644 index 0000000..dffe964 --- /dev/null +++ b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/service/WgService.java @@ -0,0 +1,33 @@ +package com.sincere.xiaoanSearch.service; + +import com.sincere.xiaoanSearch.model.PassFail; +import com.sincere.xiaoanSearch.model.SendFail; +import com.sincere.xiaoanSearch.model.SendMessage; +import com.sincere.xiaoanSearch.model.SendSuccess; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/14 0014 15:48 + */ +public interface WgService { + + int insertMessage(SendMessage sendMessage); + + SendMessage selectById(long id); + + SendMessage selectMessage(String deviceId, long index, String functionId); + + int updateMessage(long id, String result, int correct); + + + int insertPassFail(PassFail passFail); + + int insertSendSuccess(SendSuccess sendSuccess); + + int insertSendFail(SendFail sendFail); + + int deleteSendFail(SendFail sendFail); + + int updateSendSuccess(SendSuccess sendSuccess); +} diff --git a/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/service/impl/CheckInServiceImpl.java b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/service/impl/CheckInServiceImpl.java new file mode 100644 index 0000000..eaf6e20 --- /dev/null +++ b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/service/impl/CheckInServiceImpl.java @@ -0,0 +1,27 @@ +package com.sincere.xiaoanSearch.service.impl; + +import com.sincere.xiaoanSearch.mapper.CheckMapper; +import com.sincere.xiaoanSearch.model.CheckIn; +import com.sincere.xiaoanSearch.service.CheckInService; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/14 0014 14:55 + */ +@Service("checkInService") +public class CheckInServiceImpl implements CheckInService { + + + @Autowired + CheckMapper checkMapper; + + @Override + public void checkIn(CheckIn checkIn) { + checkMapper.checkIn(checkIn); + } + +} diff --git a/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/service/impl/WgServiceImpl.java b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/service/impl/WgServiceImpl.java new file mode 100644 index 0000000..3f8ca66 --- /dev/null +++ b/cloud/search_xiaoan/src/main/java/com/sincere/xiaoanSearch/service/impl/WgServiceImpl.java @@ -0,0 +1,101 @@ +package com.sincere.xiaoanSearch.service.impl; + +import com.sincere.xiaoanSearch.mapper.SendMessageMapper; +import com.sincere.xiaoanSearch.mapper.WgResultMapper; +import com.sincere.xiaoanSearch.model.PassFail; +import com.sincere.xiaoanSearch.model.SendFail; +import com.sincere.xiaoanSearch.model.SendMessage; +import com.sincere.xiaoanSearch.model.SendSuccess; +import com.sincere.xiaoanSearch.service.WgService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/14 0014 15:48 + */ +@Service("wgService") +public class WgServiceImpl implements WgService { + + @Autowired + WgResultMapper wgResultMapper; + + @Autowired + SendMessageMapper sendMessageMapper; + + @Override + public int insertMessage(SendMessage sendMessage) { + return sendMessageMapper.insert(sendMessage); + } + + @Override + public SendMessage selectById(long id) { + return sendMessageMapper.selectById(id); + } + + @Override + public SendMessage selectMessage(String deviceId,long index, String functionId) { + SendMessage sendMessage = new SendMessage(); + sendMessage.setDeviceId(deviceId); + sendMessage.setIndex(index); + sendMessage.setFunctionId(functionId); + return sendMessageMapper.selectMessage(sendMessage).get(0); + } + + @Override + public int updateMessage(long id, String result, int correct) { + SendMessage sendMessage = new SendMessage(); + sendMessage.setId(id); + sendMessage.setResult(result); + sendMessage.setCorrect(correct); + return sendMessageMapper.update(sendMessage); + } + + @Override + public int insertPassFail(PassFail passFail) { + return wgResultMapper.insertPassFail(passFail); + } + + @Override + public int insertSendSuccess(SendSuccess sendSuccess) { + SendSuccess updateSuccess = new SendSuccess(); + updateSuccess.setCardNum(sendSuccess.getCardNum()); + updateSuccess.setDeviceId(sendSuccess.getDeviceId()); + updateSuccess.setShiduan(sendSuccess.getShiduan()); + wgResultMapper.updateSendSuccess(updateSuccess); + SendFail updateFail = new SendFail(); + updateFail.setCardNum(sendSuccess.getCardNum()); + updateFail.setDeviceId(sendSuccess.getDeviceId()); + updateFail.setShiduan(sendSuccess.getShiduan()); + wgResultMapper.deleteSendFail(updateFail); + + return wgResultMapper.insertSendSuccess(sendSuccess); + } + + @Override + public int insertSendFail(SendFail sendFail) { + SendSuccess updateSuccess = new SendSuccess(); + updateSuccess.setCardNum(sendFail.getCardNum()); + updateSuccess.setDeviceId(sendFail.getDeviceId()); + updateSuccess.setShiduan(sendFail.getShiduan()); + wgResultMapper.updateSendSuccess(updateSuccess); + SendFail updateFail = new SendFail(); + updateFail.setCardNum(sendFail.getCardNum()); + updateFail.setDeviceId(sendFail.getDeviceId()); + updateFail.setShiduan(sendFail.getShiduan()); + wgResultMapper.deleteSendFail(updateFail); + + return wgResultMapper.insertSendFail(sendFail); + } + + @Override + public int deleteSendFail(SendFail sendFail) { + return wgResultMapper.deleteSendFail(sendFail); + } + + @Override + public int updateSendSuccess(SendSuccess sendSuccess) { + return wgResultMapper.updateSendSuccess(sendSuccess); + } +} diff --git a/cloud/search_xiaoan/src/main/resources/application.yml b/cloud/search_xiaoan/src/main/resources/application.yml new file mode 100644 index 0000000..c9fcda4 --- /dev/null +++ b/cloud/search_xiaoan/src/main/resources/application.yml @@ -0,0 +1,27 @@ +server: + port: 7778 +spring: + application: + name: xiaoanSearch + datasource: + username: SZJXTUSER + password: xst200919 + url: jdbc:sqlserver://60.190.202.57:14333;database=xiaoanhxy + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver +##mybatis +mybatis: + mapper-locations: classpath:mapper/*.xml + type-aliases-package: com.sincere.xianaoSearch.model + check-config-location: true + +eureka: + instance: + hostname: localhost + lease-expiration-duration-in-seconds: 60 + lease-renewal-interval-in-seconds: 10 + client: + service-url: + defaultZone: http://localhost:8761/eureka/,http://localhost:8762/eureka/ + + + diff --git a/cloud/search_xiaoan/src/main/resources/logback.xml b/cloud/search_xiaoan/src/main/resources/logback.xml new file mode 100644 index 0000000..bdad794 --- /dev/null +++ b/cloud/search_xiaoan/src/main/resources/logback.xml @@ -0,0 +1,61 @@ + + +     +     + +     + + + +     +     +         +         +             +             [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] %highlight([%-5level] %logger{50} - %msg%n) +             UTF-8 +         +     + +     +     +         +         +             +             ${LOG_HOME}/${PROJECT_NAME}.system-dev.%d{yyyy-MM-dd HH}.%i.log +             +             30 +             +             100MB +         + +         +             +             [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] %logger{50} - %msg%n +             UTF-8 +         +     +     +        +    + +    +    +    +    +    +    +    + + +    +    +    +    +    +    +        +        +    + + \ No newline at end of file diff --git a/cloud/search_xiaoan/src/main/resources/mapper/SearchMapper.xml b/cloud/search_xiaoan/src/main/resources/mapper/SearchMapper.xml new file mode 100644 index 0000000..06ef670 --- /dev/null +++ b/cloud/search_xiaoan/src/main/resources/mapper/SearchMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + {call AttendanceService( + #{deviceId,mode=IN} , #{cardNo,mode=IN} , #{funNo,mode=IN}, #{flag,mode=IN} , #{checkTime,mode=IN}, + #{out,mode=OUT,jdbcType=VARCHAR,resultMap=resultMap},#{isSuccess,mode=OUT,jdbcType=INTEGER,resultMap=resultMap} + )} + + + \ No newline at end of file diff --git a/cloud/search_xiaoan/src/main/resources/mapper/SendMessageMapper.xml b/cloud/search_xiaoan/src/main/resources/mapper/SendMessageMapper.xml new file mode 100644 index 0000000..1cf6679 --- /dev/null +++ b/cloud/search_xiaoan/src/main/resources/mapper/SendMessageMapper.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + insert into WG_send_message (device_id,card_no,serial_number,send,result,correct,create_time,function_id) + values (#{deviceId},#{cardNo},#{index},#{send},#{result},#{correct},#{createTime},#{functionId}) + + + + + + + + update WG_send_message set result = #{result} , correct =#{correct} + where id = #{id} + + \ No newline at end of file diff --git a/cloud/search_xiaoan/src/main/resources/mapper/WgResultMapper.xml b/cloud/search_xiaoan/src/main/resources/mapper/WgResultMapper.xml new file mode 100644 index 0000000..481e51a --- /dev/null +++ b/cloud/search_xiaoan/src/main/resources/mapper/WgResultMapper.xml @@ -0,0 +1,38 @@ + + + + + + INSERT INTO WG_PassFail (cardNum, deviceID, direction, resultIntro, createTime , schoolID,inTime) + VALUES (#{cardNum},#{deviceId},#{direction},#{resultIntro},#{createTime},#{schoolId},#{inTime}) + + + + INSERT INTO WG_SendSuccess (deviceID, cardNum, oldCardNum, cardType, customerID, userType, classID, schoolName, studentType, openFlag, status, updateID, createTime, sex, name,schoolID,shiduan) + values (#{deviceId} , #{cardNum}, #{oldCardNum},#{cardType},#{customerId},#{userType},#{classId},#{schoolName},#{studentType},#{openFlag},#{status},#{updateId},#{createTime},#{sex},#{name},#{schoolId},#{shiduan}) + + + + update WG_SendSuccess set status = 0 + + + and deviceID = #{deviceId} + + + and cardNum = #{cardNum} + + + and shiduan = #{shiduan} + + + + + + INSERT INTO WG_SendFail (deviceID, cardNum, cardType, customerID, userType, classID, schoolName, studentType, openFlag, status, updateID, createTime, sex, name , failType, failContent,schoolID,shiduan) + values (#{deviceId} , #{cardNum}, #{cardType},#{customerId},#{userType},#{classId},#{schoolName},#{studentType},#{openFlag},#{status},#{updateId},#{createTime},#{sex},#{name},#{failType},#{failContent},#{schoolId},#{shiduan}) + + + + delete WG_SendFail where deviceID = #{deviceId} and cardNum = #{cardNum} and shiduan=#{shiduan} + + \ No newline at end of file diff --git a/cloud/smartCampus_search/pom.xml b/cloud/smartCampus_search/pom.xml deleted file mode 100644 index 6e0e4ad..0000000 --- a/cloud/smartCampus_search/pom.xml +++ /dev/null @@ -1,208 +0,0 @@ - - - - cloud - com.sincere - 1.0.0 - - 4.0.0 - - smartCampus_search - - - - com.sincere - common - 0.0.1-SNAPSHOT - - - io.netty - netty-all - 4.1.33.Final - - - org.apache.mina - mina-core - 2.1.3 - - - com.microsoft.sqlserver - mssql-jdbc - 6.4.0.jre8 - - - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-aop - - - - com.googlecode.rapid-framework - rapid-core - 4.0.5 - - - org.apache.commons - commons-lang3 - 3.3.2 - - - - org.slf4j - slf4j-api - 1.7.13 - - - - commons-net - commons-net - 2.0 - - - org.apache.poi - poi - 4.1.0 - - - - org.apache.poi - poi-ooxml - 4.1.0 - - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - 1.3.0 - - - com.alibaba - druid - 1.0.11 - - - io.springfox - springfox-swagger2 - 2.6.1 - - - io.springfox - springfox-swagger-ui - 2.6.1 - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - - - - - smartCampusSearch - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - UTF-8 - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - com.sincere.smartSearch.SmartSearchApplication - true - lib/ - - - ./config/ - - - - config/** - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - package - - copy-dependencies - - - - ${project.build.directory}/lib - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - 2.5 - - UTF-8 - - - - - maven-source-plugin - 2.2 - - true - - - - compile - - jar - - - - - - - \ No newline at end of file diff --git a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/SmartSearchApplication.java b/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/SmartSearchApplication.java deleted file mode 100644 index 09a4069..0000000 --- a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/SmartSearchApplication.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.sincere.smartSearch; - -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.netflix.eureka.EnableEurekaClient; - -/** - * @author chen - * @version 1.0 - * @date 2019/11/7 0007 15:06 - */ -@EnableEurekaClient -@SpringBootApplication -@MapperScan("com.sincere.smartSearch.mapper") -public class SmartSearchApplication { - - public static void main(String[] args) { - SpringApplication.run(SmartSearchApplication.class, args); - } -} diff --git a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/controller/WgController.java b/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/controller/WgController.java deleted file mode 100644 index a521ab8..0000000 --- a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/controller/WgController.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.sincere.smartSearch.controller; - -import com.sincere.common.dto.smartCampus.SchoolDto; -import com.sincere.common.dto.smartCampus.StudentCardDto; -import com.sincere.common.dto.smartCampus.UpdateCardDto; -import com.sincere.common.dto.smartCampus.UserDto; -import com.sincere.smartSearch.model.School; -import com.sincere.smartSearch.model.StudentCard; -import com.sincere.smartSearch.model.UpdateCard; -import com.sincere.smartSearch.model.User; -import com.sincere.smartSearch.service.DeviceService; -import com.sincere.smartSearch.service.WgUserSearchService; -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.nio.file.attribute.UserDefinedFileAttributeView; - -/** - * @author chen - * @version 1.0 - * @date 2019/11/7 0007 15:47 - */ -@RestController -@RequestMapping("/sm/wg") -public class WgController { - - @Autowired - DeviceService deviceService; - - @Autowired - WgUserSearchService wgUserSearchService; - - @RequestMapping(value = "updateLinkTime",method = RequestMethod.GET) - int updateLinkTime(@RequestParam("sno") String sno){ - return deviceService.updateLinkTime(sno); - } - - @RequestMapping(value = "selectOutOrderId",method = RequestMethod.GET) - String selectOutOrderId(@RequestParam("type") int type, @RequestParam("insideOrderId") int insideOrderId){ - return deviceService.selectOutOrderId(type,insideOrderId); - } - - @RequestMapping(value = "checkLeave",method = RequestMethod.GET) - String checkLeave(@RequestParam("cardNo") String cardNo){ - return wgUserSearchService.checkLeave(cardNo); - } - - @RequestMapping(value = "selectSchoolBySchoolId",method = RequestMethod.GET) - SchoolDto selectSchoolBySchoolId(@RequestParam("schoolId") int schoolId){ - School school = wgUserSearchService.selectSchoolBySchoolId(schoolId); - return toSchoolDto(school); - } - - @RequestMapping(value = "selectUserByCardNum",method = RequestMethod.GET) - UserDto selectUserByCardNum(@RequestParam("cardNum") String cardNum){ - User user = wgUserSearchService.selectUserByCardNum(cardNum); - return toUserDto(user); - } - - @RequestMapping(value = "selectUpdateCardByUpdateId",method = RequestMethod.GET) - UpdateCardDto selectUpdateCardByUpdateId(@RequestParam("updateId") int updateId){ - UpdateCard updateCard = wgUserSearchService.selectUpdateCardByUpdateId(updateId); - return toUpdateCardDto(updateCard); - } - - @RequestMapping(value = "selectStudentCard",method = RequestMethod.GET) - StudentCardDto selectStudentCard(@RequestParam("cardNum") String cardNum){ - StudentCard studentCard = wgUserSearchService.selectStudentCard(cardNum); - return toStudentCardDto(studentCard); - } - - - private SchoolDto toSchoolDto(School school){ - SchoolDto schoolDto = new SchoolDto(); - if(school != null){ - schoolDto.setSchoolId(school.getSchoolId()); - schoolDto.setSchoolName(school.getSchoolName()); - } - return schoolDto; - } - - private UserDto toUserDto(User user){ - UserDto userDto = new UserDto(); - if(user != null){ - userDto.setClassId(user.getClassId()); - userDto.setName(user.getName()); - userDto.setSchoolId(user.getSchoolId()); - userDto.setStudentId(user.getStudentId()); - } - return userDto; - } - - private UpdateCardDto toUpdateCardDto(UpdateCard updateCard){ - UpdateCardDto updateCardDto = new UpdateCardDto(); - if(updateCard != null){ - updateCardDto.setId(updateCard.getId()); - updateCardDto.setOldCard(updateCard.getOldCard()); - updateCard.setUserType(updateCard.getUserType()); - } - return updateCardDto; - } - - private StudentCardDto toStudentCardDto(StudentCard studentCard){ - StudentCardDto studentCardDto = new StudentCardDto(); - if(studentCard != null){ - studentCardDto.setCardNum(studentCard.getCardNum()); - studentCardDto.setCardType(studentCard.getCardType()); - } - return studentCardDto; - } -} diff --git a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/mapper/DeviceMapper.java b/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/mapper/DeviceMapper.java deleted file mode 100644 index 95118d0..0000000 --- a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/mapper/DeviceMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.sincere.smartSearch.mapper; - -import com.sincere.smartSearch.model.DeviceLink; -import com.sincere.smartSearch.model.DeviceOrder; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/12 0012 16:27 - */ -public interface DeviceMapper { - - int updateLinkTime(DeviceLink deviceLink); - - int insertLink(DeviceLink deviceLink); - - String selectOutOrderId(DeviceOrder deviceOrder); -} diff --git a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/mapper/WgUserSearchMapper.java b/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/mapper/WgUserSearchMapper.java deleted file mode 100644 index 2d6758e..0000000 --- a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/mapper/WgUserSearchMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.sincere.smartSearch.mapper; - -import com.sincere.smartSearch.model.School; -import com.sincere.smartSearch.model.StudentCard; -import com.sincere.smartSearch.model.UpdateCard; -import com.sincere.smartSearch.model.User; - -import java.util.List; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/14 0014 14:36 - */ -public interface WgUserSearchMapper { - - String checkLeave(String cardNo); - - School selectSchoolBySchoolId(int schoolId); - - List selectUserByCardNum(String cardNum); - - UpdateCard selectUpdateCardByUpdateId(int updateId); - - List selectStudentCard(String cardNum); -} diff --git a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/model/DeviceLink.java b/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/model/DeviceLink.java deleted file mode 100644 index 14affb9..0000000 --- a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/model/DeviceLink.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.sincere.smartSearch.model; - -import java.util.Date; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/12 0012 16:24 - */ -public class DeviceLink { - - private String deviceNo ; - private Date lastTime ; - private int isRelation ; - - public String getDeviceNo() { - return deviceNo; - } - - public void setDeviceNo(String deviceNo) { - this.deviceNo = deviceNo; - } - - public Date getLastTime() { - return lastTime; - } - - public void setLastTime(Date lastTime) { - this.lastTime = lastTime; - } - - public int getIsRelation() { - return isRelation; - } - - public void setIsRelation(int isRelation) { - this.isRelation = isRelation; - } -} diff --git a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/model/DeviceOrder.java b/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/model/DeviceOrder.java deleted file mode 100644 index 993d31a..0000000 --- a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/model/DeviceOrder.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.sincere.smartSearch.model; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/29 0029 10:23 - */ -public class DeviceOrder { - - private int type ; - private int insideOrderId ; - - public int getType() { - return type; - } - - public void setType(int type) { - this.type = type; - } - - public int getInsideOrderId() { - return insideOrderId; - } - - public void setInsideOrderId(int insideOrderId) { - this.insideOrderId = insideOrderId; - } -} diff --git a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/model/School.java b/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/model/School.java deleted file mode 100644 index 6bd8624..0000000 --- a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/model/School.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.sincere.smartSearch.model; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/14 0014 14:37 - */ -public class School { - - private int schoolId ; - private String schoolName ; - - public int getSchoolId() { - return schoolId; - } - - public void setSchoolId(int schoolId) { - this.schoolId = schoolId; - } - - public String getSchoolName() { - return schoolName; - } - - public void setSchoolName(String schoolName) { - this.schoolName = schoolName; - } - -} diff --git a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/model/StudentCard.java b/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/model/StudentCard.java deleted file mode 100644 index 7e737da..0000000 --- a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/model/StudentCard.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.sincere.smartSearch.model; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/14 0014 14:50 - */ -public class StudentCard { - private String cardType ; - private String cardNum ; - - public String getCardType() { - return cardType; - } - - public void setCardType(String cardType) { - this.cardType = cardType; - } - - public String getCardNum() { - return cardNum; - } - - public void setCardNum(String cardNum) { - this.cardNum = cardNum; - } -} diff --git a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/model/UpdateCard.java b/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/model/UpdateCard.java deleted file mode 100644 index cfa3b48..0000000 --- a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/model/UpdateCard.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.sincere.smartSearch.model; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/14 0014 14:46 - */ -public class UpdateCard { - private int id ; - private int userType ; - private String oldCard ; - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public int getUserType() { - return userType; - } - - public void setUserType(int userType) { - this.userType = userType; - } - - public String getOldCard() { - return oldCard; - } - - public void setOldCard(String oldCard) { - this.oldCard = oldCard; - } -} diff --git a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/model/User.java b/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/model/User.java deleted file mode 100644 index 397c576..0000000 --- a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/model/User.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.sincere.smartSearch.model; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/14 0014 14:41 - */ -public class User { - - private int schoolId; - private int classId ; - private String name ; - private int studentId ; - - 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 getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getStudentId() { - return studentId; - } - - public void setStudentId(int studentId) { - this.studentId = studentId; - } -} diff --git a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/service/DeviceService.java b/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/service/DeviceService.java deleted file mode 100644 index 4af02ea..0000000 --- a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/service/DeviceService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.sincere.smartSearch.service; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/12 0012 16:30 - */ -public interface DeviceService { - - int updateLinkTime(String sno); - - - String selectOutOrderId(int type, int insideOrderId); - -} diff --git a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/service/WgUserSearchService.java b/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/service/WgUserSearchService.java deleted file mode 100644 index 8c0cd69..0000000 --- a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/service/WgUserSearchService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.sincere.smartSearch.service; - -import com.sincere.smartSearch.model.*; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/14 0014 14:55 - */ -public interface WgUserSearchService { - - - String checkLeave(String cardNo); - - School selectSchoolBySchoolId(int schoolId); - - User selectUserByCardNum(String cardNum); - - UpdateCard selectUpdateCardByUpdateId(int updateId); - - StudentCard selectStudentCard(String cardNum); -} diff --git a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/service/impl/DeviceServiceImpl.java b/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/service/impl/DeviceServiceImpl.java deleted file mode 100644 index 74c79f4..0000000 --- a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/service/impl/DeviceServiceImpl.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.sincere.smartSearch.service.impl; - -import com.sincere.smartSearch.mapper.DeviceMapper; -import com.sincere.smartSearch.model.DeviceLink; -import com.sincere.smartSearch.model.DeviceOrder; -import com.sincere.smartSearch.service.DeviceService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/12 0012 16:31 - */ -@Service("deviceService") -public class DeviceServiceImpl implements DeviceService { - - @Autowired - DeviceMapper deviceMapper; - - @Override - public int updateLinkTime(String sno) { - DeviceLink deviceLink = new DeviceLink(); - deviceLink.setDeviceNo(sno); - deviceLink.setLastTime(new Date()); - if(deviceMapper.updateLinkTime(deviceLink) > 0){ - //已存在,更新即可 - }else { - deviceMapper.insertLink(deviceLink); - } - return 1 ; - } - - @Override - public String selectOutOrderId(int type, int insideOrderId) { - DeviceOrder deviceOrder = new DeviceOrder(); - deviceOrder.setType(type); - deviceOrder.setInsideOrderId(insideOrderId); - return deviceMapper.selectOutOrderId(deviceOrder); - } -} diff --git a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/service/impl/WgUserSearchServiceImpl.java b/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/service/impl/WgUserSearchServiceImpl.java deleted file mode 100644 index b7dc49a..0000000 --- a/cloud/smartCampus_search/src/main/java/com/sincere/smartSearch/service/impl/WgUserSearchServiceImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.sincere.smartSearch.service.impl; - -import com.sincere.smartSearch.mapper.WgUserSearchMapper; -import com.sincere.smartSearch.model.School; -import com.sincere.smartSearch.model.StudentCard; -import com.sincere.smartSearch.model.UpdateCard; -import com.sincere.smartSearch.model.User; -import com.sincere.smartSearch.service.WgUserSearchService; -import org.slf4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/14 0014 14:55 - */ -@Service("wgUserSearchService") -public class WgUserSearchServiceImpl implements WgUserSearchService { - - @Autowired - WgUserSearchMapper searchMapper; - - - @Override - public String checkLeave(String cardNo) { - return searchMapper.checkLeave(cardNo); - } - - @Override - public School selectSchoolBySchoolId(int schoolId) { - return searchMapper.selectSchoolBySchoolId(schoolId); - } - - @Override - public User selectUserByCardNum(String cardNum) { - try{ - return searchMapper.selectUserByCardNum(cardNum).get(0); - }catch (Exception e){ - } - return new User(); - } - - @Override - public UpdateCard selectUpdateCardByUpdateId(int updateId) { - return searchMapper.selectUpdateCardByUpdateId(updateId); - } - - @Override - public StudentCard selectStudentCard(String cardNum) { - List list = searchMapper.selectStudentCard(cardNum) ; - if(list != null && list.size() > 0){ - return list.get(0); - }else { - return new StudentCard(); - } - } -} diff --git a/cloud/smartCampus_search/src/main/resources/application.yml b/cloud/smartCampus_search/src/main/resources/application.yml deleted file mode 100644 index fbb7c59..0000000 --- a/cloud/smartCampus_search/src/main/resources/application.yml +++ /dev/null @@ -1,27 +0,0 @@ -server: - port: 7777 -spring: - application: - name: smartCampusSearch - datasource: - username: SZJXTUSER - password: xst200919 - url: jdbc:sqlserver://60.190.202.57:14333;database=SmartCampusSZ - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver -##mybatis -mybatis: - mapper-locations: classpath:mapper/*.xml - type-aliases-package: com.sincere.smartSearch.model - check-config-location: true - -eureka: - instance: - hostname: localhost - lease-expiration-duration-in-seconds: 60 - lease-renewal-interval-in-seconds: 10 - client: - service-url: - defaultZone: http://localhost:8761/eureka/,http://localhost:8762/eureka/ - - - diff --git a/cloud/smartCampus_search/src/main/resources/logback.xml b/cloud/smartCampus_search/src/main/resources/logback.xml deleted file mode 100644 index e3953ee..0000000 --- a/cloud/smartCampus_search/src/main/resources/logback.xml +++ /dev/null @@ -1,61 +0,0 @@ - - -     -     - -     - - - -     -     -         -         -             -             [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] %highlight([%-5level] %logger{50} - %msg%n) -             UTF-8 -         -     - -     -     -         -         -             -             ${LOG_HOME}/${PROJECT_NAME}.system-dev.%d{yyyy-MM-dd HH}.%i.log -             -             30 -             -             100MB -         - -         -             -             [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] %logger{50} - %msg%n -             UTF-8 -         -     -     -        -    - -    -    -    -    -    -    -    - - -    -    -    -    -    -    -        -        -    - - \ No newline at end of file diff --git a/cloud/smartCampus_search/src/main/resources/mapper/DeviceMapper.xml b/cloud/smartCampus_search/src/main/resources/mapper/DeviceMapper.xml deleted file mode 100644 index d21d2f4..0000000 --- a/cloud/smartCampus_search/src/main/resources/mapper/DeviceMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - update AC_DeviceLink set LastTime =#{lastTime} where DeviceNo = #{deviceNo} - - - - insert into AC_DeviceLink(DeviceNo,LastTime,IsRelation) - values (#{deviceNo},#{lastTime},0) - - - - \ No newline at end of file diff --git a/cloud/smartCampus_search/src/main/resources/mapper/WgUserSearchMapper.xml b/cloud/smartCampus_search/src/main/resources/mapper/WgUserSearchMapper.xml deleted file mode 100644 index 01b4897..0000000 --- a/cloud/smartCampus_search/src/main/resources/mapper/WgUserSearchMapper.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cloud/weigeng/pom.xml b/cloud/weigeng/pom.xml index 74c6112..82e343e 100644 --- a/cloud/weigeng/pom.xml +++ b/cloud/weigeng/pom.xml @@ -81,15 +81,87 @@ + + weigeng + + - org.springframework.boot - spring-boot-maven-plugin + org.apache.maven.plugins + maven-compiler-plugin + 3.1 - true + 1.8 + 1.8 + UTF-8 - + + + + org.apache.maven.plugins + maven-jar-plugin + + + + com.com.sincere.weigeng.WeigengApplication + true + lib/ + + + ./config/ + + + + config/** + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy + package + + copy-dependencies + + + + ${project.build.directory}/lib + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.5 + + UTF-8 + + + + + maven-source-plugin + 2.2 + + true + + + + compile + + jar + + + + diff --git a/cloud/xiaoan_search/pom.xml b/cloud/xiaoan_search/pom.xml deleted file mode 100644 index c503aa3..0000000 --- a/cloud/xiaoan_search/pom.xml +++ /dev/null @@ -1,209 +0,0 @@ - - - - cloud - com.sincere - 1.0.0 - - 4.0.0 - - xiaoan_search - - - com.sincere - common - 0.0.1-SNAPSHOT - - - - io.netty - netty-all - 4.1.33.Final - - - org.apache.mina - mina-core - 2.1.3 - - - com.microsoft.sqlserver - mssql-jdbc - 6.4.0.jre8 - - - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-aop - - - - com.googlecode.rapid-framework - rapid-core - 4.0.5 - - - org.apache.commons - commons-lang3 - 3.3.2 - - - - org.slf4j - slf4j-api - 1.7.13 - - - - commons-net - commons-net - 2.0 - - - org.apache.poi - poi - 4.1.0 - - - - org.apache.poi - poi-ooxml - 4.1.0 - - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - 1.3.0 - - - com.alibaba - druid - 1.0.11 - - - io.springfox - springfox-swagger2 - 2.6.1 - - - io.springfox - springfox-swagger-ui - 2.6.1 - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - - - - - xianao_search - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - UTF-8 - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - com.jevon.Application - true - lib/ - - - ./config/ - - - - config/** - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - package - - copy-dependencies - - - - ${project.build.directory}/lib - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - 2.5 - - UTF-8 - - - - - maven-source-plugin - 2.2 - - true - - - - compile - - jar - - - - - - - - \ No newline at end of file diff --git a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/XiaoanSearchApplication.java b/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/XiaoanSearchApplication.java deleted file mode 100644 index d11e133..0000000 --- a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/XiaoanSearchApplication.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.sincere.xiaoanSearch; - -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.netflix.eureka.EnableEurekaClient; - -/** - * @author chen - * @version 1.0 - * @date 2019/11/11 0011 15:40 - */ -@EnableEurekaClient -@SpringBootApplication -@MapperScan("com.sincere.xiaoanSearch.mapper") -public class XiaoanSearchApplication { - - public static void main(String[] args) { - SpringApplication.run(XiaoanSearchApplication.class, args); - } -} diff --git a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/controller/WgController.java b/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/controller/WgController.java deleted file mode 100644 index e4d573b..0000000 --- a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/controller/WgController.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.sincere.xiaoanSearch.controller; - -import com.sincere.common.dto.xiaoan.*; -import com.sincere.xiaoanSearch.model.*; -import com.sincere.xiaoanSearch.service.CheckInService; -import com.sincere.xiaoanSearch.service.WgService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -/** - * @author chen - * @version 1.0 - * @date 2019/11/11 0011 15:53 - */ -@RestController -@RequestMapping("/xa/wg") -public class WgController { - - @Autowired - CheckInService checkInService; - - @Autowired - WgService wgService; - - @RequestMapping(value = "checkIn",method = RequestMethod.POST) - public CheckOutDto checkIn(@RequestBody CheckInDto checkInDto){ - CheckIn checkIn = new CheckIn(checkInDto); - checkInService.checkIn(checkIn); - CheckOutDto checkOutDto = new CheckOutDto(); - checkOutDto.setIsSuccess(checkIn.getIsSuccess()); - checkOutDto.setOut(checkIn.getOut()); - return checkOutDto; - } - - @RequestMapping(value = "insertMessage",method = RequestMethod.POST) - public long insertMessage(@RequestBody SendMessageDto sendMessageDto){ - SendMessage sendMessage = new SendMessage(sendMessageDto); - wgService.insertMessage(sendMessage); - return sendMessage.getId(); - } - - @RequestMapping(value = "selectById",method = RequestMethod.GET) - SendMessageDto selectById(@RequestParam("id") long id){ - SendMessage sendMessage = wgService.selectById(id); - return toSendMessageDto(sendMessage); - } - - @RequestMapping(value = "selectMessage",method = RequestMethod.GET) - SendMessageDto selectMessage(@RequestParam("deviceId") String deviceId, @RequestParam("index") long index,@RequestParam("functionId") String functionId){ - SendMessage sendMessage = wgService.selectMessage(deviceId,index,functionId); - return toSendMessageDto(sendMessage); - } - - @RequestMapping(value = "updateMessage",method = RequestMethod.GET) - int updateMessage(@RequestParam("id") long id, @RequestParam("result") String result, @RequestParam("correct") int correct){ - return wgService.updateMessage(id,result,correct); - } - - @RequestMapping(value = "insertPassFail",method = RequestMethod.POST) - int insertPassFail(@RequestBody PassFailDto passFailDto){ - return wgService.insertPassFail(new PassFail(passFailDto)); - } - - @RequestMapping(value = "insertSendSuccess",method = RequestMethod.POST) - int insertSendSuccess(@RequestBody SendSuccessDto sendSuccessDto){ - return wgService.insertSendSuccess(new SendSuccess(sendSuccessDto)); - } - - @RequestMapping(value = "insertSendFail",method = RequestMethod.POST) - int insertSendFail(@RequestBody SendFailDto sendFailDto){ - return wgService.insertSendFail(new SendFail(sendFailDto)); - } - - @RequestMapping(value = "deleteSendFail",method = RequestMethod.POST) - int deleteSendFail(@RequestBody SendFailDto sendFailDto){ - return wgService.deleteSendFail(new SendFail(sendFailDto)); - } - - @RequestMapping(value = "updateSendSuccess",method = RequestMethod.POST) - int updateSendSuccess(@RequestBody SendSuccessDto sendSuccessDto){ - return wgService.updateSendSuccess(new SendSuccess(sendSuccessDto)); - } - - public SendMessageDto toSendMessageDto(SendMessage sendMessage){ - SendMessageDto sendMessageDto = new SendMessageDto(); - if(sendMessage != null){ - sendMessageDto.setId(sendMessage.getId()); - sendMessageDto.setDeviceId(sendMessage.getDeviceId()); - sendMessageDto.setCardNo(sendMessage.getCardNo()); - sendMessageDto.setIndex(sendMessage.getIndex()); - sendMessageDto.setSend(sendMessage.getSend()); - sendMessageDto.setResult(sendMessage.getResult()); - sendMessageDto.setCorrect(sendMessage.getCorrect()); - sendMessageDto.setCreateTime(sendMessage.getCreateTime()); - sendMessageDto.setFunctionId(sendMessage.getFunctionId()); - } - return sendMessageDto ; - } -} diff --git a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/mapper/CheckMapper.java b/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/mapper/CheckMapper.java deleted file mode 100644 index ccad4e0..0000000 --- a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/mapper/CheckMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.sincere.xiaoanSearch.mapper; - -import com.sincere.xiaoanSearch.model.CheckIn; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/14 0014 14:36 - */ -public interface CheckMapper { - - void checkIn(CheckIn checkIn); - -} diff --git a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/mapper/SendMessageMapper.java b/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/mapper/SendMessageMapper.java deleted file mode 100644 index d01291f..0000000 --- a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/mapper/SendMessageMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.sincere.xiaoanSearch.mapper; - - -import com.sincere.xiaoanSearch.model.SendMessage; - -import java.util.List; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/29 0029 14:00 - */ -public interface SendMessageMapper { - - SendMessage selectById(long id); - - List selectMessage(SendMessage sendMessage); - - int insert(SendMessage sendMessage); - - int update(SendMessage sendMessage); -} diff --git a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/mapper/WgResultMapper.java b/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/mapper/WgResultMapper.java deleted file mode 100644 index 4537c82..0000000 --- a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/mapper/WgResultMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.sincere.xiaoanSearch.mapper; - - -import com.sincere.xiaoanSearch.model.PassFail; -import com.sincere.xiaoanSearch.model.SendFail; -import com.sincere.xiaoanSearch.model.SendSuccess; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/14 0014 15:00 - */ -public interface WgResultMapper { - - int insertPassFail(PassFail passFail); - - int insertSendSuccess(SendSuccess sendSuccess); - - int insertSendFail(SendFail sendFail); - - int deleteSendFail(SendFail sendFail); - - int updateSendSuccess(SendSuccess sendSuccess); -} diff --git a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/model/CheckIn.java b/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/model/CheckIn.java deleted file mode 100644 index 28ba103..0000000 --- a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/model/CheckIn.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.sincere.xiaoanSearch.model; - -import com.sincere.common.dto.xiaoan.CheckInDto; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/30 0030 10:26 - */ -public class CheckIn { - - private String deviceId ; - private String cardNo ; - private int funNo ; - private int flag ; - private String checkTime ; - - private String out; - private int isSuccess ; - - public CheckIn(CheckInDto checkInDto){ - this.deviceId = checkInDto.getDeviceId(); - this.cardNo = checkInDto.getCardNo(); - this.funNo = checkInDto.getFunNo(); - this.flag = checkInDto.getFlag() ; - this.checkTime = checkInDto.getCheckTime() ; - } - - public String getDeviceId() { - return deviceId; - } - - public void setDeviceId(String deviceId) { - this.deviceId = deviceId; - } - - public String getCardNo() { - return cardNo; - } - - public void setCardNo(String cardNo) { - this.cardNo = cardNo; - } - - public int getFlag() { - return flag; - } - - public void setFlag(int flag) { - this.flag = flag; - } - - public String getCheckTime() { - return checkTime; - } - - public void setCheckTime(String checkTime) { - this.checkTime = checkTime; - } - - public String getOut() { - return out; - } - - public void setOut(String out) { - this.out = out; - } - - public int getIsSuccess() { - return isSuccess; - } - - public void setIsSuccess(int isSuccess) { - this.isSuccess = isSuccess; - } - - public int getFunNo() { - return funNo; - } - - public void setFunNo(int funNo) { - this.funNo = funNo; - } -} diff --git a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/model/PassFail.java b/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/model/PassFail.java deleted file mode 100644 index d9b1442..0000000 --- a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/model/PassFail.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.sincere.xiaoanSearch.model; - -import com.sincere.common.dto.xiaoan.PassFailDto; - -import java.util.Date; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/14 0014 14:58 - */ -public class PassFail { - - private String cardNum ; - private String deviceId ; - private String direction ; - private String resultIntro ; - private Date createTime ; - private int schoolId ; - private Date inTime ; - - public PassFail(PassFailDto passFailDto){ - this.cardNum = passFailDto.getCardNum(); - this.deviceId = passFailDto.getDeviceId(); - this.direction = passFailDto.getDirection(); - this.resultIntro = passFailDto.getResultIntro(); - this.createTime = passFailDto.getCreateTime(); - this.schoolId = passFailDto.getSchoolId(); - this.inTime = passFailDto.getInTime(); - } - - public String getCardNum() { - return cardNum; - } - - public void setCardNum(String cardNum) { - this.cardNum = cardNum; - } - - public String getDeviceId() { - return deviceId; - } - - public void setDeviceId(String deviceId) { - this.deviceId = deviceId; - } - - public String getDirection() { - return direction; - } - - public void setDirection(String direction) { - this.direction = direction; - } - - public String getResultIntro() { - return resultIntro; - } - - public void setResultIntro(String resultIntro) { - this.resultIntro = resultIntro; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public int getSchoolId() { - return schoolId; - } - - public void setSchoolId(int schoolId) { - this.schoolId = schoolId; - } - - public Date getInTime() { - return inTime; - } - - public void setInTime(Date inTime) { - this.inTime = inTime; - } -} diff --git a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/model/SendFail.java b/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/model/SendFail.java deleted file mode 100644 index 44e9f3f..0000000 --- a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/model/SendFail.java +++ /dev/null @@ -1,214 +0,0 @@ -package com.sincere.xiaoanSearch.model; - -import com.sincere.common.dto.smartCampus.SchoolDto; -import com.sincere.common.dto.smartCampus.StudentCardDto; -import com.sincere.common.dto.smartCampus.UpdateCardDto; -import com.sincere.common.dto.smartCampus.UserDto; -import com.sincere.common.dto.xiaoan.SendFailDto; - -import java.util.Date; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/14 0014 15:18 - */ -public class SendFail { - - private String deviceId ; - private String cardNum ; - private String oldCardNum ; - private String cardType ; - private int customerId ; - private int userType ; - private int classId ; - private String schoolName ; - private int studentType ; - private int openFlag ; - private int status ; - private int updateId ; - private Date createTime ; - private int sex ; - private String name ; - private int failType ; - private String failContent ; - private int schoolId ; - private int shiduan ; - - public SendFail(SendFailDto sendFailDto){ - this.deviceId = sendFailDto.getDeviceId(); - this.cardNum = sendFailDto.getCardNum(); - this.oldCardNum = sendFailDto.getOldCardNum(); - this.cardType = sendFailDto.getCardType(); - this.customerId = sendFailDto.getCustomerId(); - this.userType = sendFailDto.getUserType(); - this.classId = sendFailDto.getClassId(); - this.schoolName = sendFailDto.getSchoolName(); - this.studentType = sendFailDto.getStudentType(); - this.openFlag = sendFailDto.getOpenFlag(); - this.status = sendFailDto.getStatus(); - this.updateId = sendFailDto.getUpdateId(); - this.createTime = sendFailDto.getCreateTime(); - this.sex = sendFailDto.getSex(); - this.name = sendFailDto.getName(); - this.schoolId = sendFailDto.getSchoolId(); - this.shiduan =sendFailDto.getShiduan(); - this.failType = sendFailDto.getFailType(); - this.failContent = sendFailDto.getFailContent(); - } - - public SendFail() { - } - - public String getDeviceId() { - return deviceId; - } - - public void setDeviceId(String deviceId) { - this.deviceId = deviceId; - } - - public String getCardNum() { - return cardNum; - } - - public void setCardNum(String cardNum) { - this.cardNum = cardNum; - } - - public String getOldCardNum() { - return oldCardNum; - } - - public void setOldCardNum(String oldCardNum) { - this.oldCardNum = oldCardNum; - } - - public String getCardType() { - return cardType; - } - - public void setCardType(String cardType) { - this.cardType = cardType; - } - - public int getCustomerId() { - return customerId; - } - - public void setCustomerId(int customerId) { - this.customerId = customerId; - } - - public int getUserType() { - return userType; - } - - public void setUserType(int userType) { - this.userType = userType; - } - - public int getClassId() { - return classId; - } - - public void setClassId(int classId) { - this.classId = classId; - } - - public String getSchoolName() { - return schoolName; - } - - public void setSchoolName(String schoolName) { - this.schoolName = schoolName; - } - - public int getStudentType() { - return studentType; - } - - public void setStudentType(int studentType) { - this.studentType = studentType; - } - - public int getOpenFlag() { - return openFlag; - } - - public void setOpenFlag(int openFlag) { - this.openFlag = openFlag; - } - - public int getStatus() { - return status; - } - - public void setStatus(int status) { - this.status = status; - } - - public int getUpdateId() { - return updateId; - } - - public void setUpdateId(int updateId) { - this.updateId = updateId; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public int getSex() { - return sex; - } - - public void setSex(int sex) { - this.sex = sex; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getSchoolId() { - return schoolId; - } - - public void setSchoolId(int schoolId) { - this.schoolId = schoolId; - } - - public int getShiduan() { - return shiduan; - } - - public void setShiduan(int shiduan) { - this.shiduan = shiduan; - } - - public int getFailType() { - return failType; - } - - public void setFailType(int failType) { - this.failType = failType; - } - - public String getFailContent() { - return failContent; - } - - public void setFailContent(String failContent) { - this.failContent = failContent; - } -} diff --git a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/model/SendMessage.java b/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/model/SendMessage.java deleted file mode 100644 index 082cae3..0000000 --- a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/model/SendMessage.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.sincere.xiaoanSearch.model; - -import com.sincere.common.dto.xiaoan.SendMessageDto; - -import java.util.Date; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/29 0029 13:59 - */ -public class SendMessage { - - private long id ; - private String deviceId ; - private String cardNo ; - private long index ; - private String send ; - private String result ; - private int correct ; - private Date createTime ; - private String functionId ; - - public SendMessage() { - } - - public SendMessage(SendMessageDto sendMessageDto){ - this.deviceId = sendMessageDto.getDeviceId(); - this.cardNo = sendMessageDto.getCardNo(); - this.index = sendMessageDto.getIndex(); - this.send = sendMessageDto.getSend(); - this.result = sendMessageDto.getResult(); - this.correct = sendMessageDto.getCorrect(); - this.createTime = sendMessageDto.getCreateTime(); - this.functionId = sendMessageDto.getFunctionId(); - } - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public String getDeviceId() { - return deviceId; - } - - public void setDeviceId(String deviceId) { - this.deviceId = deviceId; - } - - public String getCardNo() { - return cardNo; - } - - public void setCardNo(String cardNo) { - this.cardNo = cardNo; - } - - public long getIndex() { - return index; - } - - public void setIndex(long index) { - this.index = index; - } - - public String getSend() { - return send; - } - - public void setSend(String send) { - this.send = send; - } - - public String getResult() { - return result; - } - - public void setResult(String result) { - this.result = result; - } - - public int getCorrect() { - return correct; - } - - public void setCorrect(int correct) { - this.correct = correct; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public String getFunctionId() { - return functionId; - } - - public void setFunctionId(String functionId) { - this.functionId = functionId; - } -} diff --git a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/model/SendSuccess.java b/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/model/SendSuccess.java deleted file mode 100644 index 5487516..0000000 --- a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/model/SendSuccess.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.sincere.xiaoanSearch.model; - - -import com.sincere.common.dto.smartCampus.SchoolDto; -import com.sincere.common.dto.smartCampus.StudentCardDto; -import com.sincere.common.dto.smartCampus.UpdateCardDto; -import com.sincere.common.dto.smartCampus.UserDto; -import com.sincere.common.dto.xiaoan.SendSuccessDto; - -import java.util.Date; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/14 0014 15:18 - */ -public class SendSuccess { - - private String deviceId ; - private String cardNum ; - private String oldCardNum ; - private String cardType ; - private int customerId ; - private int userType ; - private int classId ; - private String schoolName ; - private int studentType ; - private int openFlag ; - private int status ; - private int updateId ; - private Date createTime ; - private int sex ; - private String name ; - private int schoolId ; - private int shiduan ; - - public SendSuccess() { - } - - public SendSuccess(SendSuccessDto sendSuccessDto){ - this.deviceId = sendSuccessDto.getDeviceId(); - this.cardNum = sendSuccessDto.getCardNum(); - this.oldCardNum = sendSuccessDto.getOldCardNum(); - this.cardType = sendSuccessDto.getCardType(); - this.customerId = sendSuccessDto.getCustomerId(); - this.userType = sendSuccessDto.getUserType(); - this.classId = sendSuccessDto.getClassId(); - this.schoolName = sendSuccessDto.getSchoolName(); - this.studentType = sendSuccessDto.getStudentType(); - this.openFlag = sendSuccessDto.getOpenFlag(); - this.status = sendSuccessDto.getStatus(); - this.updateId = sendSuccessDto.getUpdateId(); - this.createTime = sendSuccessDto.getCreateTime(); - this.sex = sendSuccessDto.getSex(); - this.name = sendSuccessDto.getName(); - this.schoolId = sendSuccessDto.getSchoolId(); - this.shiduan =sendSuccessDto.getShiduan(); - } - - public String getDeviceId() { - return deviceId; - } - - public void setDeviceId(String deviceId) { - this.deviceId = deviceId; - } - - public String getCardNum() { - return cardNum; - } - - public void setCardNum(String cardNum) { - this.cardNum = cardNum; - } - - public String getOldCardNum() { - return oldCardNum; - } - - public void setOldCardNum(String oldCardNum) { - this.oldCardNum = oldCardNum; - } - - public String getCardType() { - return cardType; - } - - public void setCardType(String cardType) { - this.cardType = cardType; - } - - public int getCustomerId() { - return customerId; - } - - public void setCustomerId(int customerId) { - this.customerId = customerId; - } - - public int getUserType() { - return userType; - } - - public void setUserType(int userType) { - this.userType = userType; - } - - public int getClassId() { - return classId; - } - - public void setClassId(int classId) { - this.classId = classId; - } - - public String getSchoolName() { - return schoolName; - } - - public void setSchoolName(String schoolName) { - this.schoolName = schoolName; - } - - public int getStudentType() { - return studentType; - } - - public void setStudentType(int studentType) { - this.studentType = studentType; - } - - public int getOpenFlag() { - return openFlag; - } - - public void setOpenFlag(int openFlag) { - this.openFlag = openFlag; - } - - public int getStatus() { - return status; - } - - public void setStatus(int status) { - this.status = status; - } - - public int getUpdateId() { - return updateId; - } - - public void setUpdateId(int updateId) { - this.updateId = updateId; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public int getSex() { - return sex; - } - - public void setSex(int sex) { - this.sex = sex; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getSchoolId() { - return schoolId; - } - - public void setSchoolId(int schoolId) { - this.schoolId = schoolId; - } - - public int getShiduan() { - return shiduan; - } - - public void setShiduan(int shiduan) { - this.shiduan = shiduan; - } -} diff --git a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/service/CheckInService.java b/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/service/CheckInService.java deleted file mode 100644 index 4fa0c48..0000000 --- a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/service/CheckInService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.sincere.xiaoanSearch.service; - - -import com.sincere.xiaoanSearch.model.CheckIn; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/14 0014 14:55 - */ -public interface CheckInService { - - void checkIn(CheckIn checkIn); -} diff --git a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/service/WgService.java b/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/service/WgService.java deleted file mode 100644 index dffe964..0000000 --- a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/service/WgService.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.sincere.xiaoanSearch.service; - -import com.sincere.xiaoanSearch.model.PassFail; -import com.sincere.xiaoanSearch.model.SendFail; -import com.sincere.xiaoanSearch.model.SendMessage; -import com.sincere.xiaoanSearch.model.SendSuccess; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/14 0014 15:48 - */ -public interface WgService { - - int insertMessage(SendMessage sendMessage); - - SendMessage selectById(long id); - - SendMessage selectMessage(String deviceId, long index, String functionId); - - int updateMessage(long id, String result, int correct); - - - int insertPassFail(PassFail passFail); - - int insertSendSuccess(SendSuccess sendSuccess); - - int insertSendFail(SendFail sendFail); - - int deleteSendFail(SendFail sendFail); - - int updateSendSuccess(SendSuccess sendSuccess); -} diff --git a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/service/impl/CheckInServiceImpl.java b/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/service/impl/CheckInServiceImpl.java deleted file mode 100644 index eaf6e20..0000000 --- a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/service/impl/CheckInServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.sincere.xiaoanSearch.service.impl; - -import com.sincere.xiaoanSearch.mapper.CheckMapper; -import com.sincere.xiaoanSearch.model.CheckIn; -import com.sincere.xiaoanSearch.service.CheckInService; -import org.slf4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/14 0014 14:55 - */ -@Service("checkInService") -public class CheckInServiceImpl implements CheckInService { - - - @Autowired - CheckMapper checkMapper; - - @Override - public void checkIn(CheckIn checkIn) { - checkMapper.checkIn(checkIn); - } - -} diff --git a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/service/impl/WgServiceImpl.java b/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/service/impl/WgServiceImpl.java deleted file mode 100644 index 3f8ca66..0000000 --- a/cloud/xiaoan_search/src/main/java/com/sincere/xiaoanSearch/service/impl/WgServiceImpl.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.sincere.xiaoanSearch.service.impl; - -import com.sincere.xiaoanSearch.mapper.SendMessageMapper; -import com.sincere.xiaoanSearch.mapper.WgResultMapper; -import com.sincere.xiaoanSearch.model.PassFail; -import com.sincere.xiaoanSearch.model.SendFail; -import com.sincere.xiaoanSearch.model.SendMessage; -import com.sincere.xiaoanSearch.model.SendSuccess; -import com.sincere.xiaoanSearch.service.WgService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/14 0014 15:48 - */ -@Service("wgService") -public class WgServiceImpl implements WgService { - - @Autowired - WgResultMapper wgResultMapper; - - @Autowired - SendMessageMapper sendMessageMapper; - - @Override - public int insertMessage(SendMessage sendMessage) { - return sendMessageMapper.insert(sendMessage); - } - - @Override - public SendMessage selectById(long id) { - return sendMessageMapper.selectById(id); - } - - @Override - public SendMessage selectMessage(String deviceId,long index, String functionId) { - SendMessage sendMessage = new SendMessage(); - sendMessage.setDeviceId(deviceId); - sendMessage.setIndex(index); - sendMessage.setFunctionId(functionId); - return sendMessageMapper.selectMessage(sendMessage).get(0); - } - - @Override - public int updateMessage(long id, String result, int correct) { - SendMessage sendMessage = new SendMessage(); - sendMessage.setId(id); - sendMessage.setResult(result); - sendMessage.setCorrect(correct); - return sendMessageMapper.update(sendMessage); - } - - @Override - public int insertPassFail(PassFail passFail) { - return wgResultMapper.insertPassFail(passFail); - } - - @Override - public int insertSendSuccess(SendSuccess sendSuccess) { - SendSuccess updateSuccess = new SendSuccess(); - updateSuccess.setCardNum(sendSuccess.getCardNum()); - updateSuccess.setDeviceId(sendSuccess.getDeviceId()); - updateSuccess.setShiduan(sendSuccess.getShiduan()); - wgResultMapper.updateSendSuccess(updateSuccess); - SendFail updateFail = new SendFail(); - updateFail.setCardNum(sendSuccess.getCardNum()); - updateFail.setDeviceId(sendSuccess.getDeviceId()); - updateFail.setShiduan(sendSuccess.getShiduan()); - wgResultMapper.deleteSendFail(updateFail); - - return wgResultMapper.insertSendSuccess(sendSuccess); - } - - @Override - public int insertSendFail(SendFail sendFail) { - SendSuccess updateSuccess = new SendSuccess(); - updateSuccess.setCardNum(sendFail.getCardNum()); - updateSuccess.setDeviceId(sendFail.getDeviceId()); - updateSuccess.setShiduan(sendFail.getShiduan()); - wgResultMapper.updateSendSuccess(updateSuccess); - SendFail updateFail = new SendFail(); - updateFail.setCardNum(sendFail.getCardNum()); - updateFail.setDeviceId(sendFail.getDeviceId()); - updateFail.setShiduan(sendFail.getShiduan()); - wgResultMapper.deleteSendFail(updateFail); - - return wgResultMapper.insertSendFail(sendFail); - } - - @Override - public int deleteSendFail(SendFail sendFail) { - return wgResultMapper.deleteSendFail(sendFail); - } - - @Override - public int updateSendSuccess(SendSuccess sendSuccess) { - return wgResultMapper.updateSendSuccess(sendSuccess); - } -} diff --git a/cloud/xiaoan_search/src/main/resources/application.yml b/cloud/xiaoan_search/src/main/resources/application.yml deleted file mode 100644 index c9fcda4..0000000 --- a/cloud/xiaoan_search/src/main/resources/application.yml +++ /dev/null @@ -1,27 +0,0 @@ -server: - port: 7778 -spring: - application: - name: xiaoanSearch - datasource: - username: SZJXTUSER - password: xst200919 - url: jdbc:sqlserver://60.190.202.57:14333;database=xiaoanhxy - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver -##mybatis -mybatis: - mapper-locations: classpath:mapper/*.xml - type-aliases-package: com.sincere.xianaoSearch.model - check-config-location: true - -eureka: - instance: - hostname: localhost - lease-expiration-duration-in-seconds: 60 - lease-renewal-interval-in-seconds: 10 - client: - service-url: - defaultZone: http://localhost:8761/eureka/,http://localhost:8762/eureka/ - - - diff --git a/cloud/xiaoan_search/src/main/resources/logback.xml b/cloud/xiaoan_search/src/main/resources/logback.xml deleted file mode 100644 index e3953ee..0000000 --- a/cloud/xiaoan_search/src/main/resources/logback.xml +++ /dev/null @@ -1,61 +0,0 @@ - - -     -     - -     - - - -     -     -         -         -             -             [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] %highlight([%-5level] %logger{50} - %msg%n) -             UTF-8 -         -     - -     -     -         -         -             -             ${LOG_HOME}/${PROJECT_NAME}.system-dev.%d{yyyy-MM-dd HH}.%i.log -             -             30 -             -             100MB -         - -         -             -             [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] %logger{50} - %msg%n -             UTF-8 -         -     -     -        -    - -    -    -    -    -    -    -    - - -    -    -    -    -    -    -        -        -    - - \ No newline at end of file diff --git a/cloud/xiaoan_search/src/main/resources/mapper/SearchMapper.xml b/cloud/xiaoan_search/src/main/resources/mapper/SearchMapper.xml deleted file mode 100644 index 06ef670..0000000 --- a/cloud/xiaoan_search/src/main/resources/mapper/SearchMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - {call AttendanceService( - #{deviceId,mode=IN} , #{cardNo,mode=IN} , #{funNo,mode=IN}, #{flag,mode=IN} , #{checkTime,mode=IN}, - #{out,mode=OUT,jdbcType=VARCHAR,resultMap=resultMap},#{isSuccess,mode=OUT,jdbcType=INTEGER,resultMap=resultMap} - )} - - - \ No newline at end of file diff --git a/cloud/xiaoan_search/src/main/resources/mapper/SendMessageMapper.xml b/cloud/xiaoan_search/src/main/resources/mapper/SendMessageMapper.xml deleted file mode 100644 index 1cf6679..0000000 --- a/cloud/xiaoan_search/src/main/resources/mapper/SendMessageMapper.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - insert into WG_send_message (device_id,card_no,serial_number,send,result,correct,create_time,function_id) - values (#{deviceId},#{cardNo},#{index},#{send},#{result},#{correct},#{createTime},#{functionId}) - - - - - - - - update WG_send_message set result = #{result} , correct =#{correct} - where id = #{id} - - \ No newline at end of file diff --git a/cloud/xiaoan_search/src/main/resources/mapper/WgResultMapper.xml b/cloud/xiaoan_search/src/main/resources/mapper/WgResultMapper.xml deleted file mode 100644 index 481e51a..0000000 --- a/cloud/xiaoan_search/src/main/resources/mapper/WgResultMapper.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - INSERT INTO WG_PassFail (cardNum, deviceID, direction, resultIntro, createTime , schoolID,inTime) - VALUES (#{cardNum},#{deviceId},#{direction},#{resultIntro},#{createTime},#{schoolId},#{inTime}) - - - - INSERT INTO WG_SendSuccess (deviceID, cardNum, oldCardNum, cardType, customerID, userType, classID, schoolName, studentType, openFlag, status, updateID, createTime, sex, name,schoolID,shiduan) - values (#{deviceId} , #{cardNum}, #{oldCardNum},#{cardType},#{customerId},#{userType},#{classId},#{schoolName},#{studentType},#{openFlag},#{status},#{updateId},#{createTime},#{sex},#{name},#{schoolId},#{shiduan}) - - - - update WG_SendSuccess set status = 0 - - - and deviceID = #{deviceId} - - - and cardNum = #{cardNum} - - - and shiduan = #{shiduan} - - - - - - INSERT INTO WG_SendFail (deviceID, cardNum, cardType, customerID, userType, classID, schoolName, studentType, openFlag, status, updateID, createTime, sex, name , failType, failContent,schoolID,shiduan) - values (#{deviceId} , #{cardNum}, #{cardType},#{customerId},#{userType},#{classId},#{schoolName},#{studentType},#{openFlag},#{status},#{updateId},#{createTime},#{sex},#{name},#{failType},#{failContent},#{schoolId},#{shiduan}) - - - - delete WG_SendFail where deviceID = #{deviceId} and cardNum = #{cardNum} and shiduan=#{shiduan} - - \ No newline at end of file -- libgit2 0.21.0