陈杰 / smartCampus

Download as
Browse Code »

Commit 5cba275ed7f26aed3f825e5c2b2f89a410aeec21

Authored by 陈杰
1 parent 1de4a428
Exists in master

个人学情

Showing 53 changed files with 1463 additions and 980 deletions   Show diff stats
src/main/java/com/jevon/controller/LearnController.java
  Diff comments   View file @5cba275
@@ -4,6 +4,7 @@ import com.jevon.enums.DifficultEnums; @@ -4,6 +4,7 @@ import com.jevon.enums.DifficultEnums;
4 import com.jevon.enums.DimensionalEnums; 4 import com.jevon.enums.DimensionalEnums;
5 import com.jevon.model.*; 5 import com.jevon.model.*;
6 import com.jevon.service.*; 6 import com.jevon.service.*;
  7 +import com.jevon.utils.HttpClientUtils;
7 import com.jevon.vo.BaseVo; 8 import com.jevon.vo.BaseVo;
8 import com.jevon.vo.excel.ExamExcelVo; 9 import com.jevon.vo.excel.ExamExcelVo;
9 import com.jevon.vo.excel.ScoreExcelVo; 10 import com.jevon.vo.excel.ScoreExcelVo;
@@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
25 26
26 import java.io.File; 27 import java.io.File;
27 import java.io.FileInputStream; 28 import java.io.FileInputStream;
  29 +import java.io.InputStream;
28 import java.util.*; 30 import java.util.*;
29 31
30 /** 32 /**
@@ -127,16 +129,18 @@ public class LearnController { @@ -127,16 +129,18 @@ public class LearnController {
127 List<AnalyseDimensional> analyseDimensionals = new ArrayList<>(); 129 List<AnalyseDimensional> analyseDimensionals = new ArrayList<>();
128 Float maxScore = 0f; 130 Float maxScore = 0f;
129 Analyse analyse = analyseService.selectById(initAnalyseReqVo.getAnalyseId()); 131 Analyse analyse = analyseService.selectById(initAnalyseReqVo.getAnalyseId());
130 - String fileUrl = initAnalyseReqVo.getUrl();  
131 - fileUrl = fileUrl.replace(url, staticUrl);  
132 - File excelFile = new File(fileUrl); 132 + File excelFile = new File(initAnalyseReqVo.getUrl());
133 // 获得工作簿 133 // 获得工作簿
134 String file = excelFile.getName(); 134 String file = excelFile.getName();
135 Workbook workbook = null; 135 Workbook workbook = null;
  136 + InputStream inputStream = HttpClientUtils.GetFileInputStream(initAnalyseReqVo.getUrl());
  137 + if(inputStream == null){
  138 + return;
  139 + }
136 if (file.endsWith("xls")) { 140 if (file.endsWith("xls")) {
137 - workbook = new HSSFWorkbook(new FileInputStream(excelFile)); 141 + workbook = new HSSFWorkbook(inputStream);
138 } else { 142 } else {
139 - workbook = new XSSFWorkbook(new FileInputStream(excelFile)); 143 + workbook = new XSSFWorkbook(inputStream);
140 } 144 }
141 // 获得工作表 145 // 获得工作表
142 Sheet sheet = workbook.getSheetAt(0); 146 Sheet sheet = workbook.getSheetAt(0);
@@ -232,16 +236,18 @@ public class LearnController { @@ -232,16 +236,18 @@ public class LearnController {
232 for(AnalyseDetail analyseDetail : analyseDetails){ 236 for(AnalyseDetail analyseDetail : analyseDetails){
233 scoreMap.put(analyseDetail.getQuestionNumber(),analyseDetail.getScore()); 237 scoreMap.put(analyseDetail.getQuestionNumber(),analyseDetail.getScore());
234 } 238 }
235 - String fileUrl = initScoreReqVo.getUrl();  
236 - fileUrl = fileUrl.replace(url, staticUrl);  
237 - File excelFile = new File(fileUrl); 239 + File excelFile = new File(initScoreReqVo.getUrl());
238 // 获得工作簿 240 // 获得工作簿
239 String file = excelFile.getName(); 241 String file = excelFile.getName();
240 Workbook workbook = null; 242 Workbook workbook = null;
  243 + InputStream inputStream = HttpClientUtils.GetFileInputStream(initScoreReqVo.getUrl());
  244 + if(inputStream == null){
  245 + return false ;
  246 + }
241 if (file.endsWith("xls")) { 247 if (file.endsWith("xls")) {
242 - workbook = new HSSFWorkbook(new FileInputStream(excelFile)); 248 + workbook = new HSSFWorkbook(inputStream);
243 } else { 249 } else {
244 - workbook = new XSSFWorkbook(new FileInputStream(excelFile)); 250 + workbook = new XSSFWorkbook(inputStream);
245 } 251 }
246 // 获得工作表 252 // 获得工作表
247 for(int number = 0 ; number < workbook.getNumberOfSheets() ; number++){ 253 for(int number = 0 ; number < workbook.getNumberOfSheets() ; number++){
src/main/java/com/jevon/controller/LearnStatController.java
  Diff comments   View file @5cba275
@@ -6,7 +6,7 @@ import com.jevon.model.*; @@ -6,7 +6,7 @@ import com.jevon.model.*;
6 import com.jevon.service.*; 6 import com.jevon.service.*;
7 import com.jevon.vo.rep.SuggestRepVo; 7 import com.jevon.vo.rep.SuggestRepVo;
8 import com.jevon.vo.req.GetLearnReqVo; 8 import com.jevon.vo.req.GetLearnReqVo;
9 -import com.jevon.wordDTO.*; 9 +import com.jevon.vo.school.*;
10 import io.swagger.annotations.Api; 10 import io.swagger.annotations.Api;
11 import io.swagger.annotations.ApiOperation; 11 import io.swagger.annotations.ApiOperation;
12 import org.springframework.beans.factory.annotation.Autowired; 12 import org.springframework.beans.factory.annotation.Autowired;
src/main/java/com/jevon/controller/LearnStudentController.java 0 → 100644
  Diff comments   View file @5cba275
@@ -0,0 +1,180 @@ @@ -0,0 +1,180 @@
  1 +package com.jevon.controller;
  2 +
  3 +import com.jevon.enums.DifficultEnums;
  4 +import com.jevon.enums.DimensionalEnums;
  5 +import com.jevon.model.Analyse;
  6 +import com.jevon.model.AnalyseDimensional;
  7 +import com.jevon.model.Dimensional;
  8 +import com.jevon.model.Student;
  9 +import com.jevon.service.*;
  10 +import com.jevon.vo.req.StudentReqVo;
  11 +import com.jevon.vo.school.Form6;
  12 +import com.jevon.vo.student.Form1;
  13 +import com.jevon.vo.student.Form2;
  14 +import com.jevon.vo.student.Form3;
  15 +import io.swagger.annotations.Api;
  16 +import io.swagger.annotations.ApiOperation;
  17 +import org.springframework.beans.factory.annotation.Autowired;
  18 +import org.springframework.web.bind.annotation.RequestBody;
  19 +import org.springframework.web.bind.annotation.RequestMapping;
  20 +import org.springframework.web.bind.annotation.RequestMethod;
  21 +import org.springframework.web.bind.annotation.RestController;
  22 +
  23 +import java.util.ArrayList;
  24 +import java.util.HashMap;
  25 +import java.util.List;
  26 +import java.util.Map;
  27 +
  28 +/**
  29 + * @author chen
  30 + * @version 1.0
  31 + * @date 2019/11/1 0001 10:38
  32 + */
  33 +@RestController
  34 +@RequestMapping(value = "/getStudent")
  35 +@Api(value = "学生报告")
  36 +public class LearnStudentController {
  37 +
  38 + @Autowired
  39 + AnalyseService analyseService;
  40 +
  41 + @Autowired
  42 + DimensionalService dimensionalService;
  43 +
  44 + @Autowired
  45 + AnalyseDimensionalService analyseDimensionalService;
  46 +
  47 + @Autowired
  48 + AnalyseDetailService analyseDetailService;
  49 +
  50 + @Autowired
  51 + StudentDetailService studentDetailService;
  52 +
  53 + @Autowired
  54 + StudentService studentService;
  55 +
  56 + @Autowired
  57 + LeagueService leagueService;
  58 +
  59 + @Autowired
  60 + ChapterService chapterService;
  61 +
  62 + @ApiOperation("getForm1")
  63 + @RequestMapping(value = "getForm1", method = RequestMethod.POST)
  64 + public Form1 getStudent1(@RequestBody StudentReqVo studentReqVo){
  65 + Form1 form1 = new Form1();
  66 + Analyse analyse = analyseService.selectById(studentReqVo.getAnalyseId());
  67 + Student student = studentService.selectStudent(analyse.getId(),studentReqVo.getSchoolName(),studentReqVo.getStudentNumber());
  68 + List<Student> schoolStudent = studentService.selectByClassName(analyse.getId(),studentReqVo.getSchoolName(),null);
  69 + List<Student> classStudent = studentService.selectByClassName(analyse.getId(),studentReqVo.getSchoolName(),student.getClassName());
  70 + Double highestScore = studentService.selectClassMaxScore(analyse.getId(),student.getSchoolName(),student.getClassName());
  71 + int schoolRank = 0 , classRank = 0 ;
  72 + for (int i = 0; i < schoolStudent.size() ; i++) {
  73 + if(schoolStudent.get(i).getStudentNumber().equals(student.getStudentNumber())){
  74 + schoolRank = i+1 ;
  75 + }
  76 + }
  77 + for (int i = 0; i < classStudent.size() ; i++) {
  78 + if(classStudent.get(i).getStudentNumber().equals(student.getStudentNumber())){
  79 + classRank = i+1 ;
  80 + }
  81 + }
  82 + Double rank = new Double(classStudent.size()-classRank) / new Double(classStudent.size()) ;
  83 + form1.setClassName(student.getClassName());
  84 + form1.setMaxScore(highestScore);
  85 + form1.setScore(student.getScore());
  86 + form1.setRank(rank);
  87 + form1.setClassRank(classRank);
  88 + form1.setSchoolRank(schoolRank);
  89 + return form1;
  90 + }
  91 +
  92 + @ApiOperation("getForm2")
  93 + @RequestMapping(value = "getForm2", method = RequestMethod.POST)
  94 + public Form2 getStudent2(@RequestBody StudentReqVo studentReqVo){
  95 + Form2 form2 = new Form2();
  96 + Analyse analyse = analyseService.selectById(studentReqVo.getAnalyseId());
  97 + Student student = studentService.selectStudent(analyse.getId(),studentReqVo.getSchoolName(),studentReqVo.getStudentNumber());
  98 + List<Student> classStudent = studentService.selectByClassName(analyse.getId(),studentReqVo.getSchoolName(),student.getClassName());
  99 +
  100 + Map<String , List<Double>> typeMap = new HashMap<>();
  101 + List<String> questionTypes = analyseDetailService.selectQuestionType(analyse.getId());
  102 + for(String questionType : questionTypes){
  103 + List<Double> list = new ArrayList<>();
  104 + Double maxScore = analyseDetailService.selectSumType(analyse.getId(),questionType);
  105 + List<String> numberList = analyseDetailService.selectQuestionNumberByType(analyse.getId(),questionType);
  106 + Double score = studentDetailService.selectStudentSumScore(analyse.getId(),student.getSchoolName(),student.getStudentNumber(),numberList);
  107 + Double highestScore = new Double(0);
  108 + for(Student temp : classStudent){
  109 + Double tempScore = studentDetailService.selectStudentSumScore(analyse.getId(),temp.getSchoolName(),temp.getStudentNumber(),numberList);
  110 + if(tempScore > highestScore){
  111 + highestScore = tempScore ;
  112 + }
  113 + }
  114 + list.add(maxScore);
  115 + list.add(highestScore);
  116 + list.add(score);
  117 + typeMap.put(questionType,list);
  118 + }
  119 + Map<String , List<Double>> difficultMap = new HashMap<>();
  120 + for(DifficultEnums difficultEnum : DifficultEnums.values()){
  121 + List<Double> list = new ArrayList<>();
  122 + Double maxScore = analyseDetailService.selectDifficult(analyse.getId(),difficultEnum.getDifficultType());
  123 + List<String> numberList = analyseDetailService.selectQuestionNumberByDifficult(analyse.getId(),difficultEnum.getDifficultType());
  124 + Double score = studentDetailService.selectStudentSumScore(analyse.getId(),student.getSchoolName(),student.getStudentNumber(),numberList);
  125 + Double highestScore = new Double(0);
  126 + for(Student temp : classStudent){
  127 + Double tempScore = studentDetailService.selectStudentSumScore(analyse.getId(),temp.getSchoolName(),temp.getStudentNumber(),numberList);
  128 + if(tempScore > highestScore){
  129 + highestScore = tempScore ;
  130 + }
  131 + }
  132 + list.add(maxScore);
  133 + list.add(highestScore);
  134 + list.add(score);
  135 + difficultMap.put(difficultEnum.getDifficultShow(),list);
  136 + }
  137 + form2.setDifficultMap(difficultMap);
  138 + form2.setTypeMap(typeMap);
  139 + return form2;
  140 + }
  141 +
  142 + @ApiOperation("getForm3")
  143 + @RequestMapping(value = "getForm3", method = RequestMethod.POST)
  144 + public Form3 getStudent3(@RequestBody StudentReqVo studentReqVo){
  145 + Form3 form3 = new Form3();
  146 + Analyse analyse = analyseService.selectById(studentReqVo.getAnalyseId());
  147 + Student student = studentService.selectStudent(analyse.getId(),studentReqVo.getSchoolName(),studentReqVo.getStudentNumber());
  148 + List<Student> classStudent = studentService.selectByClassName(analyse.getId(),studentReqVo.getSchoolName(),student.getClassName());
  149 + List<Dimensional> knowledgeList = dimensionalService.selectByAnalyse(analyse.getId(), DimensionalEnums.knowledge.getDimensionalType());
  150 + List<String> goodList = new ArrayList<>();
  151 + List<String> badList = new ArrayList<>();
  152 + for(Dimensional dimensional : knowledgeList) {
  153 + Form6 form6 = new Form6();
  154 + form6.setDimensional(dimensional.getDimensionalName());
  155 + List<AnalyseDimensional> analyseDimensionals = analyseDimensionalService.selectByDimensional(analyse.getId(), dimensional.getId());
  156 + Double score = 0d;
  157 + List<String> examNumberList = new ArrayList<>();
  158 + for (AnalyseDimensional analyseDimensional : analyseDimensionals) {
  159 + score = score + analyseDimensional.getScore();
  160 + examNumberList.add(analyseDimensional.getQuestionNumber());
  161 + }
  162 + Double sumScore = studentDetailService.selectClassSumScore(analyse.getId(),student.getSchoolName(),student.getClassName(),examNumberList);
  163 + Double classAvg = sumScore / new Double(classStudent.size()) ;
  164 + Double tempScore = studentDetailService.selectStudentSumScore(analyse.getId(),student.getSchoolName(),student.getStudentNumber(),examNumberList);
  165 + if(tempScore / classAvg > 1.1){
  166 + goodList.add(dimensional.getDimensionalName());
  167 + }
  168 + if(tempScore / classAvg < 0.9){
  169 + badList.add(dimensional.getDimensionalName());
  170 + }
  171 + }
  172 + form3.setGoodList(goodList);
  173 + form3.setBadList(badList);
  174 + return form3;
  175 + }
  176 +
  177 +
  178 +
  179 +
  180 +}
src/main/java/com/jevon/mapper/AnalyseDetailMapper.java
  Diff comments   View file @5cba275
@@ -22,4 +22,8 @@ public interface AnalyseDetailMapper { @@ -22,4 +22,8 @@ public interface AnalyseDetailMapper {
22 List<AnalyseDetail> selectDifficultDetail(AnalyseDetail analyseDetail); 22 List<AnalyseDetail> selectDifficultDetail(AnalyseDetail analyseDetail);
23 23
24 List<String> selectQuestionType(int analyseId); 24 List<String> selectQuestionType(int analyseId);
  25 +
  26 + List<String> selectQuestionNumberByType(AnalyseDetail analyseDetail);
  27 +
  28 + List<String> selectQuestionNumberByDifficult(AnalyseDetail analyseDetail);
25 } 29 }
src/main/java/com/jevon/mapper/StudentMapper.java
  Diff comments   View file @5cba275
@@ -13,6 +13,8 @@ public interface StudentMapper { @@ -13,6 +13,8 @@ public interface StudentMapper {
13 13
14 int insertBatch(List<Student> list); 14 int insertBatch(List<Student> list);
15 15
  16 + Student selectStudent(Student student);
  17 +
16 List<Student> selectByStudent(Student student); 18 List<Student> selectByStudent(Student student);
17 19
18 int selectCountByScore(Student student); 20 int selectCountByScore(Student student);
src/main/java/com/jevon/service/AnalyseDetailService.java
  Diff comments   View file @5cba275
@@ -23,4 +23,7 @@ public interface AnalyseDetailService { @@ -23,4 +23,7 @@ public interface AnalyseDetailService {
23 23
24 List<String> selectQuestionType(int analyseId); 24 List<String> selectQuestionType(int analyseId);
25 25
  26 + List<String> selectQuestionNumberByType(int analyseId , String questionType);
  27 +
  28 + List<String> selectQuestionNumberByDifficult(int analyseId , int difficult);
26 } 29 }
src/main/java/com/jevon/service/StudentDetailService.java
  Diff comments   View file @5cba275
@@ -17,6 +17,10 @@ public interface StudentDetailService { @@ -17,6 +17,10 @@ public interface StudentDetailService {
17 17
18 Double selectSumScore(int analyseId, List<String> league , String schoolName, List<String> examNumbers); 18 Double selectSumScore(int analyseId, List<String> league , String schoolName, List<String> examNumbers);
19 19
  20 + Double selectStudentSumScore(int analyseId, String schoolName , String studentNumber , List<String> examNumbers);
  21 +
  22 + Double selectClassSumScore(int analyseId, String schoolName , String className , List<String> examNumbers);
  23 +
20 int selectTrueByExamNumber(int analyseId , String schoolName , String examNumber); 24 int selectTrueByExamNumber(int analyseId , String schoolName , String examNumber);
21 25
22 int selectTrueByExamNumber(int analyseId , List<String> league , String schoolName , String examNumber , List<String> studentNumbers); 26 int selectTrueByExamNumber(int analyseId , List<String> league , String schoolName , String examNumber , List<String> studentNumbers);
src/main/java/com/jevon/service/StudentService.java
  Diff comments   View file @5cba275
@@ -13,6 +13,8 @@ public interface StudentService { @@ -13,6 +13,8 @@ public interface StudentService {
13 13
14 int insertBatch(List<Student> list); 14 int insertBatch(List<Student> list);
15 15
  16 + Student selectStudent(int analyseId , String schoolName , String studentNumber);
  17 +
16 public List<Student> selectBySchoolName(int analyseId,List<String> league , String schoolName); 18 public List<Student> selectBySchoolName(int analyseId,List<String> league , String schoolName);
17 19
18 List<Student> selectByClassName(int analyseId , String schoolName ,String className); 20 List<Student> selectByClassName(int analyseId , String schoolName ,String className);
@@ -25,6 +27,8 @@ public interface StudentService { @@ -25,6 +27,8 @@ public interface StudentService {
25 27
26 List<String> selectSchoolNameByAnalyse(int analyseId); 28 List<String> selectSchoolNameByAnalyse(int analyseId);
27 29
  30 + Double selectClassMaxScore(int analyseId ,String schoolName , String className);
  31 +
28 Double selectMaxScore(int analyseId, List<String> league ,String schoolName); 32 Double selectMaxScore(int analyseId, List<String> league ,String schoolName);
29 33
30 Double selectMinScore(int analyseId, List<String> league ,String schoolName); 34 Double selectMinScore(int analyseId, List<String> league ,String schoolName);
src/main/java/com/jevon/service/impl/AnalyseDetailServiceImpl.java
  Diff comments   View file @5cba275
@@ -71,4 +71,20 @@ public class AnalyseDetailServiceImpl implements AnalyseDetailService { @@ -71,4 +71,20 @@ public class AnalyseDetailServiceImpl implements AnalyseDetailService {
71 public List<String> selectQuestionType(int analyseId) { 71 public List<String> selectQuestionType(int analyseId) {
72 return analyseDetailMapper.selectQuestionType(analyseId); 72 return analyseDetailMapper.selectQuestionType(analyseId);
73 } 73 }
  74 +
  75 + @Override
  76 + public List<String> selectQuestionNumberByType(int analyseId, String questionType) {
  77 + AnalyseDetail analyseDetail = new AnalyseDetail();
  78 + analyseDetail.setQuestionType(questionType);
  79 + analyseDetail.setAnalyseId(analyseId);
  80 + return analyseDetailMapper.selectQuestionNumberByType(analyseDetail);
  81 + }
  82 +
  83 + @Override
  84 + public List<String> selectQuestionNumberByDifficult(int analyseId, int difficult) {
  85 + AnalyseDetail analyseDetail = new AnalyseDetail();
  86 + analyseDetail.setDifficult(difficult);
  87 + analyseDetail.setAnalyseId(analyseId);
  88 + return analyseDetailMapper.selectQuestionNumberByDifficult(analyseDetail);
  89 + }
74 } 90 }
src/main/java/com/jevon/service/impl/StudentDetailServiceImpl.java
  Diff comments   View file @5cba275
@@ -60,6 +60,26 @@ public class StudentDetailServiceImpl implements StudentDetailService { @@ -60,6 +60,26 @@ public class StudentDetailServiceImpl implements StudentDetailService {
60 } 60 }
61 61
62 @Override 62 @Override
  63 + public Double selectStudentSumScore(int analyseId, String schoolName, String studentNumber, List<String> examNumbers) {
  64 + StudentDetail studentDetail = new StudentDetail();
  65 + studentDetail.setAnalyseId(analyseId);
  66 + studentDetail.setSchoolName(schoolName);
  67 + studentDetail.setExamNumbers(examNumbers);
  68 + studentDetail.setStudentNumber(studentNumber);
  69 + return studentDetailMapper.selectSumScore(studentDetail);
  70 + }
  71 +
  72 + @Override
  73 + public Double selectClassSumScore(int analyseId, String schoolName, String className, List<String> examNumbers) {
  74 + StudentDetail studentDetail = new StudentDetail();
  75 + studentDetail.setAnalyseId(analyseId);
  76 + studentDetail.setSchoolName(schoolName);
  77 + studentDetail.setExamNumbers(examNumbers);
  78 + studentDetail.setClassName(className);
  79 + return studentDetailMapper.selectSumScore(studentDetail);
  80 + }
  81 +
  82 + @Override
63 public int selectTrueByExamNumber(int analyseId, String schoolName, String examNumber) { 83 public int selectTrueByExamNumber(int analyseId, String schoolName, String examNumber) {
64 StudentDetail studentDetail = new StudentDetail(); 84 StudentDetail studentDetail = new StudentDetail();
65 studentDetail.setAnalyseId(analyseId); 85 studentDetail.setAnalyseId(analyseId);
src/main/java/com/jevon/service/impl/StudentServiceImpl.java
  Diff comments   View file @5cba275
@@ -39,6 +39,15 @@ public class StudentServiceImpl implements StudentService { @@ -39,6 +39,15 @@ public class StudentServiceImpl implements StudentService {
39 } 39 }
40 40
41 @Override 41 @Override
  42 + public Student selectStudent(int analyseId, String schoolName, String studentNumber) {
  43 + Student student = new Student();
  44 + student.setAnalyseId(analyseId);
  45 + student.setSchoolName(schoolName);
  46 + student.setStudentNumber(studentNumber);
  47 + return studentMapper.selectStudent(student);
  48 + }
  49 +
  50 + @Override
42 public List<Student> selectBySchoolName(int analyseId , List<String> league , String schoolName) { 51 public List<Student> selectBySchoolName(int analyseId , List<String> league , String schoolName) {
43 Student student = new Student(); 52 Student student = new Student();
44 student.setAnalyseId(analyseId); 53 student.setAnalyseId(analyseId);
@@ -91,6 +100,15 @@ public class StudentServiceImpl implements StudentService { @@ -91,6 +100,15 @@ public class StudentServiceImpl implements StudentService {
91 } 100 }
92 101
93 @Override 102 @Override
  103 + public Double selectClassMaxScore(int analyseId, String schoolName, String className) {
  104 + Student student = new Student();
  105 + student.setAnalyseId(analyseId);
  106 + student.setSchoolName(schoolName);
  107 + student.setClassName(className);
  108 + return studentMapper.selectMaxScore(student);
  109 + }
  110 +
  111 + @Override
94 public Double selectMaxScore(int analyseId,List<String> league , String schoolName) { 112 public Double selectMaxScore(int analyseId,List<String> league , String schoolName) {
95 Student student = new Student(); 113 Student student = new Student();
96 student.setAnalyseId(analyseId); 114 student.setAnalyseId(analyseId);
src/main/java/com/jevon/utils/HttpClientUtils.java
  Diff comments   View file @5cba275
@@ -13,6 +13,10 @@ import org.apache.http.impl.client.HttpClients; @@ -13,6 +13,10 @@ import org.apache.http.impl.client.HttpClients;
13 import org.apache.http.util.EntityUtils; 13 import org.apache.http.util.EntityUtils;
14 14
15 import java.io.IOException; 15 import java.io.IOException;
  16 +import java.io.InputStream;
  17 +import java.net.HttpURLConnection;
  18 +import java.net.MalformedURLException;
  19 +import java.net.URL;
16 20
17 /** 21 /**
18 * HttpClient4.3工具类 22 * HttpClient4.3工具类
@@ -142,4 +146,20 @@ public class HttpClientUtils { @@ -142,4 +146,20 @@ public class HttpClientUtils {
142 return jsonResult; 146 return jsonResult;
143 } 147 }
144 148
  149 +
  150 + public static InputStream GetFileInputStream(String fileUrl){
  151 + try{
  152 + URL url = new URL(fileUrl);
  153 + HttpURLConnection conn = (HttpURLConnection)url.openConnection();
  154 + //设置超时间为3秒
  155 + conn.setConnectTimeout(8*1000);
  156 + //得到输入流
  157 + InputStream inputStream = conn.getInputStream();
  158 +
  159 + return inputStream ;
  160 + }catch (Exception e){
  161 +
  162 + }
  163 + return null ;
  164 + }
145 } 165 }
146 \ No newline at end of file 166 \ No newline at end of file
src/main/java/com/jevon/vo/req/StudentReqVo.java 0 → 100644
  Diff comments   View file @5cba275
@@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
  1 +package com.jevon.vo.req;
  2 +
  3 +/**
  4 + * @author chen
  5 + * @version 1.0
  6 + * @date 2019/11/1 0001 10:46
  7 + */
  8 +public class StudentReqVo {
  9 +
  10 + private int analyseId ;
  11 + private String schoolName ;
  12 + private String studentNumber ;
  13 +
  14 + public int getAnalyseId() {
  15 + return analyseId;
  16 + }
  17 +
  18 + public void setAnalyseId(int analyseId) {
  19 + this.analyseId = analyseId;
  20 + }
  21 +
  22 + public String getSchoolName() {
  23 + return schoolName;
  24 + }
  25 +
  26 + public void setSchoolName(String schoolName) {
  27 + this.schoolName = schoolName;
  28 + }
  29 +
  30 + public String getStudentNumber() {
  31 + return studentNumber;
  32 + }
  33 +
  34 + public void setStudentNumber(String studentNumber) {
  35 + this.studentNumber = studentNumber;
  36 + }
  37 +}
src/main/java/com/jevon/vo/school/Form1.java 0 → 100644
  Diff comments   View file @5cba275
@@ -0,0 +1,44 @@ @@ -0,0 +1,44 @@
  1 +package com.jevon.vo.school;
  2 +
  3 +import io.swagger.annotations.ApiModel;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +/**
  7 + * @author chen
  8 + * @version 1.0
  9 + * @date 2019/10/18 0018 15:37
  10 + */
  11 +@ApiModel
  12 +public class Form1 {
  13 +
  14 + @ApiModelProperty(value="等级")
  15 + private String level ;
  16 + @ApiModelProperty(value="人数")
  17 + private int number ;
  18 + @ApiModelProperty(value="比例")
  19 + private double prop ;
  20 +
  21 + public String getLevel() {
  22 + return level;
  23 + }
  24 +
  25 + public void setLevel(String level) {
  26 + this.level = level;
  27 + }
  28 +
  29 + public int getNumber() {
  30 + return number;
  31 + }
  32 +
  33 + public void setNumber(int number) {
  34 + this.number = number;
  35 + }
  36 +
  37 + public double getProp() {
  38 + return prop;
  39 + }
  40 +
  41 + public void setProp(double prop) {
  42 + this.prop = prop;
  43 + }
  44 +}
src/main/java/com/jevon/vo/school/Form1RepVO.java 0 → 100644
  Diff comments   View file @5cba275
@@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
  1 +package com.jevon.vo.school;
  2 +
  3 +import io.swagger.annotations.ApiModel;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +import java.util.List;
  7 +import java.util.Map;
  8 +
  9 +/**
  10 + * @author chen
  11 + * @version 1.0
  12 + * @date 2019/10/18 0018 15:46
  13 + */
  14 +@ApiModel
  15 +public class Form1RepVO {
  16 +
  17 + @ApiModelProperty(value="分数段区间")
  18 + private Map<String ,String> map ;
  19 + @ApiModelProperty(value="分数段详情")
  20 + private List<Form1> list ;
  21 +
  22 + public Map<String, String> getMap() {
  23 + return map;
  24 + }
  25 +
  26 + public void setMap(Map<String, String> map) {
  27 + this.map = map;
  28 + }
  29 +
  30 + public List<Form1> getList() {
  31 + return list;
  32 + }
  33 +
  34 + public void setList(List<Form1> list) {
  35 + this.list = list;
  36 + }
  37 +}
src/main/java/com/jevon/vo/school/Form2.java 0 → 100644
  Diff comments   View file @5cba275
@@ -0,0 +1,84 @@ @@ -0,0 +1,84 @@
  1 +package com.jevon.vo.school;
  2 +
  3 +import io.swagger.annotations.ApiModel;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +/**
  7 + * @author chen
  8 + * @version 1.0
  9 + * @date 2019/10/18 0018 16:10
  10 + */
  11 +@ApiModel
  12 +public class Form2 {
  13 +
  14 + @ApiModelProperty(value="名称")
  15 + private String name ;
  16 + @ApiModelProperty(value="参考人数")
  17 + private int studentNumber ;
  18 + @ApiModelProperty(value="参考人数占比")
  19 + private double studentProp ;
  20 + @ApiModelProperty(value="高分段人数")
  21 + private int highNumber ;
  22 + @ApiModelProperty(value="高分段人数占比")
  23 + private double highProp ;
  24 + @ApiModelProperty(value="低分段人数")
  25 + private int lowNumber ;
  26 + @ApiModelProperty(value="低分段人数占比")
  27 + private double lowProp ;
  28 +
  29 + public String getName() {
  30 + return name;
  31 + }
  32 +
  33 + public void setName(String name) {
  34 + this.name = name;
  35 + }
  36 +
  37 + public int getStudentNumber() {
  38 + return studentNumber;
  39 + }
  40 +
  41 + public void setStudentNumber(int studentNumber) {
  42 + this.studentNumber = studentNumber;
  43 + }
  44 +
  45 + public int getHighNumber() {
  46 + return highNumber;
  47 + }
  48 +
  49 + public void setHighNumber(int highNumber) {
  50 + this.highNumber = highNumber;
  51 + }
  52 +
  53 + public double getHighProp() {
  54 + return highProp;
  55 + }
  56 +
  57 + public void setHighProp(double highProp) {
  58 + this.highProp = highProp;
  59 + }
  60 +
  61 + public int getLowNumber() {
  62 + return lowNumber;
  63 + }
  64 +
  65 + public void setLowNumber(int lowNumber) {
  66 + this.lowNumber = lowNumber;
  67 + }
  68 +
  69 + public double getLowProp() {
  70 + return lowProp;
  71 + }
  72 +
  73 + public void setLowProp(double lowProp) {
  74 + this.lowProp = lowProp;
  75 + }
  76 +
  77 + public double getStudentProp() {
  78 + return studentProp;
  79 + }
  80 +
  81 + public void setStudentProp(double studentProp) {
  82 + this.studentProp = studentProp;
  83 + }
  84 +}
src/main/java/com/jevon/vo/school/Form2RepVO.java 0 → 100644
  Diff comments   View file @5cba275
@@ -0,0 +1,26 @@ @@ -0,0 +1,26 @@
  1 +package com.jevon.vo.school;
  2 +
  3 +import com.jevon.vo.BaseVo;
  4 +import io.swagger.annotations.ApiModel;
  5 +import io.swagger.annotations.ApiModelProperty;
  6 +
  7 +import java.util.List;
  8 +
  9 +/**
  10 + * @author chen
  11 + * @version 1.0
  12 + * @date 2019/10/22 0022 9:51
  13 + */
  14 +@ApiModel
  15 +public class Form2RepVO extends BaseVo {
  16 + @ApiModelProperty(value="数据")
  17 + private List<Form2> data ;
  18 +
  19 + public List<Form2> getData() {
  20 + return data;
  21 + }
  22 +
  23 + public void setData(List<Form2> data) {
  24 + this.data = data;
  25 + }
  26 +}
src/main/java/com/jevon/vo/school/Form3.java 0 → 100644
  Diff comments   View file @5cba275
@@ -0,0 +1,94 @@ @@ -0,0 +1,94 @@
  1 +package com.jevon.vo.school;
  2 +
  3 +import io.swagger.annotations.ApiModel;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +/**
  7 + * @author chen
  8 + * @version 1.0
  9 + * @date 2019/10/21 0021 9:03
  10 + */
  11 +@ApiModel
  12 +public class Form3 {
  13 +
  14 + @ApiModelProperty(value="名称")
  15 + private String name ;
  16 + @ApiModelProperty(value="最高分")
  17 + private Double maxScore ;
  18 + @ApiModelProperty(value="平均分")
  19 + private Double average ;
  20 + @ApiModelProperty(value="最低分")
  21 + private Double minScore ;
  22 + @ApiModelProperty(value="优秀率")
  23 + private Double apercent ;
  24 + @ApiModelProperty(value="良好率")
  25 + private Double bpercent ;
  26 + @ApiModelProperty(value="及格率")
  27 + private Double cpercent ;
  28 + @ApiModelProperty(value="不及格率")
  29 + private Double dpercent ;
  30 +
  31 + public String getName() {
  32 + return name;
  33 + }
  34 +
  35 + public void setName(String name) {
  36 + this.name = name;
  37 + }
  38 +
  39 + public Double getMaxScore() {
  40 + return maxScore;
  41 + }
  42 +
  43 + public void setMaxScore(Double maxScore) {
  44 + this.maxScore = maxScore;
  45 + }
  46 +
  47 + public Double getAverage() {
  48 + return average;
  49 + }
  50 +
  51 + public void setAverage(Double average) {
  52 + this.average = average;
  53 + }
  54 +
  55 + public Double getMinScore() {
  56 + return minScore;
  57 + }
  58 +
  59 + public void setMinScore(Double minScore) {
  60 + this.minScore = minScore;
  61 + }
  62 +
  63 + public Double getApercent() {
  64 + return apercent;
  65 + }
  66 +
  67 + public void setApercent(Double apercent) {
  68 + this.apercent = apercent;
  69 + }
  70 +
  71 + public Double getBpercent() {
  72 + return bpercent;
  73 + }
  74 +
  75 + public void setBpercent(Double bpercent) {
  76 + this.bpercent = bpercent;
  77 + }
  78 +
  79 + public Double getCpercent() {
  80 + return cpercent;
  81 + }
  82 +
  83 + public void setCpercent(Double cpercent) {
  84 + this.cpercent = cpercent;
  85 + }
  86 +
  87 + public Double getDpercent() {
  88 + return dpercent;
  89 + }
  90 +
  91 + public void setDpercent(Double dpercent) {
  92 + this.dpercent = dpercent;
  93 + }
  94 +}
src/main/java/com/jevon/vo/school/Form3RepVO.java 0 → 100644
  Diff comments   View file @5cba275
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
  1 +package com.jevon.vo.school;
  2 +
  3 +import com.jevon.vo.BaseVo;
  4 +
  5 +import java.util.List;
  6 +
  7 +/**
  8 + * @author chen
  9 + * @version 1.0
  10 + * @date 2019/10/22 0022 10:14
  11 + */
  12 +public class Form3RepVO extends BaseVo {
  13 +
  14 + private List<Form3> data ;
  15 +
  16 + public List<Form3> getData() {
  17 + return data;
  18 + }
  19 +
  20 + public void setData(List<Form3> data) {
  21 + this.data = data;
  22 + }
  23 +}
src/main/java/com/jevon/vo/school/Form4.java 0 → 100644
  Diff comments   View file @5cba275
@@ -0,0 +1,64 @@ @@ -0,0 +1,64 @@
  1 +package com.jevon.vo.school;
  2 +
  3 +import io.swagger.annotations.ApiModel;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +/**
  7 + * @author chen
  8 + * @version 1.0
  9 + * @date 2019/10/21 0021 9:51
  10 + */
  11 +@ApiModel
  12 +public class Form4 {
  13 +
  14 + @ApiModelProperty(value="名称")
  15 + private String name ;
  16 + @ApiModelProperty(value="众数")
  17 + private Double modeNumber ;
  18 + @ApiModelProperty(value="中位数")
  19 + private Double medianNumber ;
  20 + @ApiModelProperty(value="标准差")
  21 + private Double stdev ;
  22 + @ApiModelProperty(value="平均分")
  23 + private Double avgNumber ;
  24 +
  25 + public String getName() {
  26 + return name;
  27 + }
  28 +
  29 + public void setName(String name) {
  30 + this.name = name;
  31 + }
  32 +
  33 + public Double getModeNumber() {
  34 + return modeNumber;
  35 + }
  36 +
  37 + public void setModeNumber(Double modeNumber) {
  38 + this.modeNumber = modeNumber;
  39 + }
  40 +
  41 + public Double getMedianNumber() {
  42 + return medianNumber;
  43 + }
  44 +
  45 + public void setMedianNumber(Double medianNumber) {
  46 + this.medianNumber = medianNumber;
  47 + }
  48 +
  49 + public Double getStdev() {
  50 + return stdev;
  51 + }
  52 +
  53 + public void setStdev(Double stdev) {
  54 + this.stdev = stdev;
  55 + }
  56 +
  57 + public Double getAvgNumber() {
  58 + return avgNumber;
  59 + }
  60 +
  61 + public void setAvgNumber(Double avgNumber) {
  62 + this.avgNumber = avgNumber;
  63 + }
  64 +}
src/main/java/com/jevon/vo/school/Form4RepVO.java 0 → 100644
  Diff comments   View file @5cba275
@@ -0,0 +1,25 @@ @@ -0,0 +1,25 @@
  1 +package com.jevon.vo.school;
  2 +
  3 +import com.jevon.vo.BaseVo;
  4 +import io.swagger.annotations.ApiModel;
  5 +
  6 +import java.util.List;
  7 +
  8 +/**
  9 + * @author chen
  10 + * @version 1.0
  11 + * @date 2019/10/22 0022 10:23
  12 + */
  13 +@ApiModel
  14 +public class Form4RepVO extends BaseVo {
  15 +
  16 + private List<Form4> data ;
  17 +
  18 + public List<Form4> getData() {
  19 + return data;
  20 + }
  21 +
  22 + public void setData(List<Form4> data) {
  23 + this.data = data;
  24 + }
  25 +}
src/main/java/com/jevon/vo/school/Form5.java 0 → 100644
  Diff comments   View file @5cba275
@@ -0,0 +1,134 @@ @@ -0,0 +1,134 @@
  1 +package com.jevon.vo.school;
  2 +
  3 +import io.swagger.annotations.ApiModel;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +/**
  7 + * @author chen
  8 + * @version 1.0
  9 + * @date 2019/10/21 0021 9:59
  10 + */
  11 +@ApiModel
  12 +public class Form5 {
  13 + @ApiModelProperty(value="题号")
  14 + private String examNumber ;
  15 + @ApiModelProperty(value="难度")
  16 + private String difficultName ;
  17 + @ApiModelProperty(value="分值")
  18 + private Double score ;
  19 + @ApiModelProperty(value="得分率 区")
  20 + private Double allRate ;
  21 + @ApiModelProperty(value="得分率 联盟校")
  22 + private Double leagueRate ;
  23 + @ApiModelProperty(value="得分率 本校")
  24 + private Double schoolRate ;
  25 + @ApiModelProperty(value="平均分 区")
  26 + private Double allAvg ;
  27 + @ApiModelProperty(value="平均分 联盟校")
  28 + private Double leagueAvg ;
  29 + @ApiModelProperty(value="平均分 本校")
  30 + private Double schoolAvg ;
  31 + @ApiModelProperty(value="区分度 区")
  32 + private Double allDist ;
  33 + @ApiModelProperty(value="区分度 联盟校")
  34 + private Double leagueDist ;
  35 + @ApiModelProperty(value="区分度 本校")
  36 + private Double schoolDist ;
  37 +
  38 +
  39 + public String getExamNumber() {
  40 + return examNumber;
  41 + }
  42 +
  43 + public void setExamNumber(String examNumber) {
  44 + this.examNumber = examNumber;
  45 + }
  46 +
  47 + public Double getScore() {
  48 + return score;
  49 + }
  50 +
  51 + public void setScore(Double score) {
  52 + this.score = score;
  53 + }
  54 +
  55 + public Double getAllRate() {
  56 + return allRate;
  57 + }
  58 +
  59 + public void setAllRate(Double allRate) {
  60 + this.allRate = allRate;
  61 + }
  62 +
  63 + public Double getSchoolRate() {
  64 + return schoolRate;
  65 + }
  66 +
  67 + public void setSchoolRate(Double schoolRate) {
  68 + this.schoolRate = schoolRate;
  69 + }
  70 +
  71 + public Double getAllAvg() {
  72 + return allAvg;
  73 + }
  74 +
  75 + public void setAllAvg(Double allAvg) {
  76 + this.allAvg = allAvg;
  77 + }
  78 +
  79 + public Double getSchoolAvg() {
  80 + return schoolAvg;
  81 + }
  82 +
  83 + public void setSchoolAvg(Double schoolAvg) {
  84 + this.schoolAvg = schoolAvg;
  85 + }
  86 +
  87 + public Double getAllDist() {
  88 + return allDist;
  89 + }
  90 +
  91 + public void setAllDist(Double allDist) {
  92 + this.allDist = allDist;
  93 + }
  94 +
  95 + public Double getSchoolDist() {
  96 + return schoolDist;
  97 + }
  98 +
  99 + public void setSchoolDist(Double schoolDist) {
  100 + this.schoolDist = schoolDist;
  101 + }
  102 +
  103 + public String getDifficultName() {
  104 + return difficultName;
  105 + }
  106 +
  107 + public void setDifficultName(String difficultName) {
  108 + this.difficultName = difficultName;
  109 + }
  110 +
  111 + public Double getLeagueRate() {
  112 + return leagueRate;
  113 + }
  114 +
  115 + public void setLeagueRate(Double leagueRate) {
  116 + this.leagueRate = leagueRate;
  117 + }
  118 +
  119 + public Double getLeagueAvg() {
  120 + return leagueAvg;
  121 + }
  122 +
  123 + public void setLeagueAvg(Double leagueAvg) {
  124 + this.leagueAvg = leagueAvg;
  125 + }
  126 +
  127 + public Double getLeagueDist() {
  128 + return leagueDist;
  129 + }
  130 +
  131 + public void setLeagueDist(Double leagueDist) {
  132 + this.leagueDist = leagueDist;
  133 + }
  134 +}
src/main/java/com/jevon/vo/school/Form5RepVO.java 0 → 100644
  Diff comments   View file @5cba275
@@ -0,0 +1,25 @@ @@ -0,0 +1,25 @@
  1 +package com.jevon.vo.school;
  2 +
  3 +import com.jevon.vo.BaseVo;
  4 +import io.swagger.annotations.ApiModel;
  5 +
  6 +import java.util.List;
  7 +
  8 +/**
  9 + * @author chen
  10 + * @version 1.0
  11 + * @date 2019/10/22 0022 10:28
  12 + */
  13 +@ApiModel
  14 +public class Form5RepVO extends BaseVo {
  15 +
  16 + private List<Form5> data ;
  17 +
  18 + public List<Form5> getData() {
  19 + return data;
  20 + }
  21 +
  22 + public void setData(List<Form5> data) {
  23 + this.data = data;
  24 + }
  25 +}
src/main/java/com/jevon/vo/school/Form6.java 0 → 100644
  Diff comments   View file @5cba275
@@ -0,0 +1,135 @@ @@ -0,0 +1,135 @@
  1 +package com.jevon.vo.school;
  2 +
  3 +import io.swagger.annotations.ApiModel;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +/**
  7 + * @author chen
  8 + * @version 1.0
  9 + * @date 2019/10/21 0021 11:25
  10 + */
  11 +@ApiModel
  12 +public class Form6 {
  13 + @ApiModelProperty(value="维度名称")
  14 + private String dimensional ;
  15 + @ApiModelProperty(value="分值")
  16 + private Double score ;
  17 + @ApiModelProperty(value="得分率 区")
  18 + private Double allRate ;
  19 + @ApiModelProperty(value="得分率 联盟校")
  20 + private Double leagueRate ;
  21 + @ApiModelProperty(value="得分率 本校")
  22 + private Double schoolRate ;
  23 + @ApiModelProperty(value="平均分 区")
  24 + private Double allAvg ;
  25 + @ApiModelProperty(value="平均分 联盟校")
  26 + private Double leagueAvg ;
  27 + @ApiModelProperty(value="平均分 本校")
  28 + private Double schoolAvg ;
  29 + @ApiModelProperty(value="区分度 区")
  30 + private Double allDist ;
  31 + @ApiModelProperty(value="区分度 联盟校")
  32 + private Double leagueDist ;
  33 + @ApiModelProperty(value="区分度 本校")
  34 + private Double schoolDist ;
  35 +
  36 +
  37 + private String examNumber ;
  38 +
  39 +
  40 + public Double getScore() {
  41 + return score;
  42 + }
  43 +
  44 + public void setScore(Double score) {
  45 + this.score = score;
  46 + }
  47 +
  48 + public Double getAllRate() {
  49 + return allRate;
  50 + }
  51 +
  52 + public void setAllRate(Double allRate) {
  53 + this.allRate = allRate;
  54 + }
  55 +
  56 + public Double getSchoolRate() {
  57 + return schoolRate;
  58 + }
  59 +
  60 + public void setSchoolRate(Double schoolRate) {
  61 + this.schoolRate = schoolRate;
  62 + }
  63 +
  64 + public Double getAllAvg() {
  65 + return allAvg;
  66 + }
  67 +
  68 + public void setAllAvg(Double allAvg) {
  69 + this.allAvg = allAvg;
  70 + }
  71 +
  72 + public Double getSchoolAvg() {
  73 + return schoolAvg;
  74 + }
  75 +
  76 + public void setSchoolAvg(Double schoolAvg) {
  77 + this.schoolAvg = schoolAvg;
  78 + }
  79 +
  80 + public Double getAllDist() {
  81 + return allDist;
  82 + }
  83 +
  84 + public void setAllDist(Double allDist) {
  85 + this.allDist = allDist;
  86 + }
  87 +
  88 + public Double getSchoolDist() {
  89 + return schoolDist;
  90 + }
  91 +
  92 + public void setSchoolDist(Double schoolDist) {
  93 + this.schoolDist = schoolDist;
  94 + }
  95 +
  96 + public String getExamNumber() {
  97 + return examNumber;
  98 + }
  99 +
  100 + public void setExamNumber(String examNumber) {
  101 + this.examNumber = examNumber;
  102 + }
  103 +
  104 + public String getDimensional() {
  105 + return dimensional;
  106 + }
  107 +
  108 + public void setDimensional(String dimensional) {
  109 + this.dimensional = dimensional;
  110 + }
  111 +
  112 + public Double getLeagueRate() {
  113 + return leagueRate;
  114 + }
  115 +
  116 + public void setLeagueRate(Double leagueRate) {
  117 + this.leagueRate = leagueRate;
  118 + }
  119 +
  120 + public Double getLeagueAvg() {
  121 + return leagueAvg;
  122 + }
  123 +
  124 + public void setLeagueAvg(Double leagueAvg) {
  125 + this.leagueAvg = leagueAvg;
  126 + }
  127 +
  128 + public Double getLeagueDist() {
  129 + return leagueDist;
  130 + }
  131 +
  132 + public void setLeagueDist(Double leagueDist) {
  133 + this.leagueDist = leagueDist;
  134 + }
  135 +}
src/main/java/com/jevon/vo/school/Form6RepVO.java 0 → 100644
  Diff comments   View file @5cba275
@@ -0,0 +1,25 @@ @@ -0,0 +1,25 @@
  1 +package com.jevon.vo.school;
  2 +
  3 +import com.jevon.vo.BaseVo;
  4 +import io.swagger.annotations.ApiModel;
  5 +
  6 +import java.util.List;
  7 +
  8 +/**
  9 + * @author chen
  10 + * @version 1.0
  11 + * @date 2019/10/22 0022 10:51
  12 + */
  13 +@ApiModel
  14 +public class Form6RepVO extends BaseVo {
  15 +
  16 + private List<Form6> data ;
  17 +
  18 + public List<Form6> getData() {
  19 + return data;
  20 + }
  21 +
  22 + public void setData(List<Form6> data) {
  23 + this.data = data;
  24 + }
  25 +}
src/main/java/com/jevon/vo/school/Form7.java 0 → 100644
  Diff comments   View file @5cba275
@@ -0,0 +1,44 @@ @@ -0,0 +1,44 @@
  1 +package com.jevon.vo.school;
  2 +
  3 +import io.swagger.annotations.ApiModel;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +/**
  7 + * @author chen
  8 + * @version 1.0
  9 + * @date 2019/10/21 0021 14:58
  10 + */
  11 +@ApiModel
  12 +public class Form7 {
  13 +
  14 + @ApiModelProperty(value = "名称")
  15 + private String name ;
  16 + @ApiModelProperty(value = "分值")
  17 + private Double score ;
  18 + @ApiModelProperty(value = "占比")
  19 + private Double percent ;
  20 +
  21 + public Double getScore() {
  22 + return score;
  23 + }
  24 +
  25 + public void setScore(Double score) {
  26 + this.score = score;
  27 + }
  28 +
  29 + public String getName() {
  30 + return name;
  31 + }
  32 +
  33 + public void setName(String name) {
  34 + this.name = name;
  35 + }
  36 +
  37 + public Double getPercent() {
  38 + return percent;
  39 + }
  40 +
  41 + public void setPercent(Double percent) {
  42 + this.percent = percent;
  43 + }
  44 +}
src/main/java/com/jevon/vo/school/Form7RepVO.java 0 → 100644
  Diff comments   View file @5cba275
@@ -0,0 +1,87 @@ @@ -0,0 +1,87 @@
  1 +package com.jevon.vo.school;
  2 +
  3 +import com.jevon.model.Chapter;
  4 +import io.swagger.annotations.ApiModel;
  5 +import io.swagger.annotations.ApiModelProperty;
  6 +
  7 +import java.util.List;
  8 +
  9 +/**
  10 + * @author chen
  11 + * @version 1.0
  12 + * @date 2019/10/24 0024 9:20
  13 + */
  14 +@ApiModel
  15 +public class Form7RepVO {
  16 +
  17 + @ApiModelProperty(value = "举例七年级上册")
  18 + private String examScope ;
  19 + @ApiModelProperty(value = "科目")
  20 + private String courseName ;
  21 + @ApiModelProperty(value = "满分")
  22 + private Double maxScore ;
  23 + @ApiModelProperty(value = "考试时长")
  24 + private String examTime ;
  25 + @ApiModelProperty(value = "章节列表对应分值")
  26 + private List<Chapter> list ;
  27 + @ApiModelProperty(value = "难度列表对应分值")
  28 + private List<Form7> difficultList ;
  29 + @ApiModelProperty(value = "题型类型对应分值")
  30 + private List<Form7> typeList ;
  31 +
  32 + public String getExamScope() {
  33 + return examScope;
  34 + }
  35 +
  36 + public void setExamScope(String examScope) {
  37 + this.examScope = examScope;
  38 + }
  39 +
  40 + public String getCourseName() {
  41 + return courseName;
  42 + }
  43 +
  44 + public void setCourseName(String courseName) {
  45 + this.courseName = courseName;
  46 + }
  47 +
  48 + public List<Chapter> getList() {
  49 + return list;
  50 + }
  51 +
  52 + public void setList(List<Chapter> list) {
  53 + this.list = list;
  54 + }
  55 +
  56 + public List<Form7> getDifficultList() {
  57 + return difficultList;
  58 + }
  59 +
  60 + public void setDifficultList(List<Form7> difficultList) {
  61 + this.difficultList = difficultList;
  62 + }
  63 +
  64 + public List<Form7> getTypeList() {
  65 + return typeList;
  66 + }
  67 +
  68 + public void setTypeList(List<Form7> typeList) {
  69 + this.typeList = typeList;
  70 + }
  71 +
  72 + public Double getMaxScore() {
  73 + return maxScore;
  74 + }
  75 +
  76 + public void setMaxScore(Double maxScore) {
  77 + this.maxScore = maxScore;
  78 + }
  79 +
  80 + public String getExamTime() {
  81 + return examTime;
  82 + }
  83 +
  84 + public void setExamTime(String examTime) {
  85 + this.examTime = examTime;
  86 + }
  87 +}
src/main/java/com/jevon/vo/school/Form8.java 0 → 100644
  Diff comments   View file @5cba275
@@ -0,0 +1,64 @@ @@ -0,0 +1,64 @@
  1 +package com.jevon.vo.school;
  2 +
  3 +import io.swagger.annotations.ApiModel;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +/**
  7 + * @author chen
  8 + * @version 1.0
  9 + * @date 2019/10/21 0021 15:14
  10 + */
  11 +@ApiModel
  12 +public class Form8 {
  13 +
  14 + @ApiModelProperty(value="题目难度")
  15 + private String difficultName ;
  16 + @ApiModelProperty(value="分值")
  17 + private Double score ;
  18 + @ApiModelProperty(value="得分率 区")
  19 + private Double allRate ;
  20 + @ApiModelProperty(value="得分率 联盟校")
  21 + private Double leagueRate ;
  22 + @ApiModelProperty(value="得分率 本校")
  23 + private Double schoolRate ;
  24 +
  25 + public String getDifficultName() {
  26 + return difficultName;
  27 + }
  28 +
  29 + public void setDifficultName(String difficultName) {
  30 + this.difficultName = difficultName;
  31 + }
  32 +
  33 + public Double getScore() {
  34 + return score;
  35 + }
  36 +
  37 + public void setScore(Double score) {
  38 + this.score = score;
  39 + }
  40 +
  41 + public Double getAllRate() {
  42 + return allRate;
  43 + }
  44 +
  45 + public void setAllRate(Double allRate) {
  46 + this.allRate = allRate;
  47 + }
  48 +
  49 + public Double getSchoolRate() {
  50 + return schoolRate;
  51 + }
  52 +
  53 + public void setSchoolRate(Double schoolRate) {
  54 + this.schoolRate = schoolRate;
  55 + }
  56 +
  57 + public Double getLeagueRate() {
  58 + return leagueRate;
  59 + }
  60 +
  61 + public void setLeagueRate(Double leagueRate) {
  62 + this.leagueRate = leagueRate;
  63 + }
  64 +}
src/main/java/com/jevon/vo/school/Form8RepVO.java 0 → 100644
  Diff comments   View file @5cba275
@@ -0,0 +1,25 @@ @@ -0,0 +1,25 @@
  1 +package com.jevon.vo.school;
  2 +
  3 +import com.jevon.vo.BaseVo;
  4 +import io.swagger.annotations.ApiModel;
  5 +
  6 +import java.util.List;
  7 +
  8 +/**
  9 + * @author chen
  10 + * @version 1.0
  11 + * @date 2019/10/22 0022 10:47
  12 + */
  13 +@ApiModel
  14 +public class Form8RepVO extends BaseVo {
  15 +
  16 + private List<Form8> data ;
  17 +
  18 + public List<Form8> getData() {
  19 + return data;
  20 + }
  21 +
  22 + public void setData(List<Form8> data) {
  23 + this.data = data;
  24 + }
  25 +}
src/main/java/com/jevon/vo/school/Table1.java 0 → 100644
  Diff comments   View file @5cba275
@@ -0,0 +1,33 @@ @@ -0,0 +1,33 @@
  1 +package com.jevon.vo.school;
  2 +
  3 +import io.swagger.annotations.ApiModel;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +/**
  7 + * @author chen
  8 + * @version 1.0
  9 + * @date 2019/10/21 0021 8:34
  10 + */
  11 +@ApiModel
  12 +public class Table1 {
  13 + @ApiModelProperty(value="分数段")
  14 + private String score ;
  15 + @ApiModelProperty(value="人数")
  16 + private int number ;
  17 +
  18 + public String getScore() {
  19 + return score;
  20 + }
  21 +
  22 + public void setScore(String score) {
  23 + this.score = score;
  24 + }
  25 +
  26 + public int getNumber() {
  27 + return number;
  28 + }
  29 +
  30 + public void setNumber(int number) {
  31 + this.number = number;
  32 + }
  33 +}
src/main/java/com/jevon/vo/student/Form1.java 0 → 100644
  Diff comments   View file @5cba275
@@ -0,0 +1,74 @@ @@ -0,0 +1,74 @@
  1 +package com.jevon.vo.student;
  2 +
  3 +import io.swagger.annotations.ApiModel;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +/**
  7 + * @author chen
  8 + * @version 1.0
  9 + * @date 2019/11/1 0001 11:08
  10 + */
  11 +@ApiModel
  12 +public class Form1 {
  13 +
  14 + @ApiModelProperty(value = "班级名称")
  15 + private String className ;
  16 + @ApiModelProperty(value = "最高分")
  17 + private Double maxScore ;
  18 + @ApiModelProperty(value = "自己得分")
  19 + private Double score ;
  20 + @ApiModelProperty(value = "打败了多少学生")
  21 + private Double rank ;
  22 + @ApiModelProperty(value = "学校排名")
  23 + private int schoolRank ;
  24 + @ApiModelProperty(value = "班级排名")
  25 + private int classRank ;
  26 +
  27 + public String getClassName() {
  28 + return className;
  29 + }
  30 +
  31 + public void setClassName(String className) {
  32 + this.className = className;
  33 + }
  34 +
  35 + public Double getMaxScore() {
  36 + return maxScore;
  37 + }
  38 +
  39 + public void setMaxScore(Double maxScore) {
  40 + this.maxScore = maxScore;
  41 + }
  42 +
  43 + public Double getScore() {
  44 + return score;
  45 + }
  46 +
  47 + public void setScore(Double score) {
  48 + this.score = score;
  49 + }
  50 +
  51 + public Double getRank() {
  52 + return rank;
  53 + }
  54 +
  55 + public void setRank(Double rank) {
  56 + this.rank = rank;
  57 + }
  58 +
  59 + public int getSchoolRank() {
  60 + return schoolRank;
  61 + }
  62 +
  63 + public void setSchoolRank(int schoolRank) {
  64 + this.schoolRank = schoolRank;
  65 + }
  66 +
  67 + public int getClassRank() {
  68 + return classRank;
  69 + }
  70 +
  71 + public void setClassRank(int classRank) {
  72 + this.classRank = classRank;
  73 + }
  74 +}
src/main/java/com/jevon/vo/student/Form2.java 0 → 100644
  Diff comments   View file @5cba275
@@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
  1 +package com.jevon.vo.student;
  2 +
  3 +import io.swagger.annotations.ApiModel;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +import java.util.List;
  7 +import java.util.Map;
  8 +
  9 +/**
  10 + * @author chen
  11 + * @version 1.0
  12 + * @date 2019/11/1 0001 11:34
  13 + */
  14 +@ApiModel
  15 +public class Form2 {
  16 +
  17 + @ApiModelProperty(value = "不同题型得分，list中第一个为满分，第二个为最高分 第三个为自己得分")
  18 + private Map<String , List<Double>> typeMap ;
  19 + @ApiModelProperty(value = "不同难度得分，list中第一个为满分，第二个为最高分 第三个为自己得分")
  20 + private Map<String , List<Double>> difficultMap ;
  21 +
  22 + public Map<String, List<Double>> getTypeMap() {
  23 + return typeMap;
  24 + }
  25 +
  26 + public void setTypeMap(Map<String, List<Double>> typeMap) {
  27 + this.typeMap = typeMap;
  28 + }
  29 +
  30 + public Map<String, List<Double>> getDifficultMap() {
  31 + return difficultMap;
  32 + }
  33 +
  34 + public void setDifficultMap(Map<String, List<Double>> difficultMap) {
  35 + this.difficultMap = difficultMap;
  36 + }
  37 +}
src/main/java/com/jevon/vo/student/Form3.java 0 → 100644
  Diff comments   View file @5cba275
@@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
  1 +package com.jevon.vo.student;
  2 +
  3 +import io.swagger.annotations.ApiModel;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +import java.util.List;
  7 +
  8 +/**
  9 + * @author chen
  10 + * @version 1.0
  11 + * @date 2019/11/1 0001 13:37
  12 + */
  13 +@ApiModel
  14 +public class Form3 {
  15 +
  16 + @ApiModelProperty(value = "掌握较好")
  17 + private List<String> goodList ;
  18 + @ApiModelProperty(value = "待改进")
  19 + private List<String> badList ;
  20 +
  21 + public List<String> getGoodList() {
  22 + return goodList;
  23 + }
  24 +
  25 + public void setGoodList(List<String> goodList) {
  26 + this.goodList = goodList;
  27 + }
  28 +
  29 + public List<String> getBadList() {
  30 + return badList;
  31 + }
  32 +
  33 + public void setBadList(List<String> badList) {
  34 + this.badList = badList;
  35 + }
  36 +}
src/main/java/com/jevon/wordDTO/Form1.java
View file @1de4a42
@@ -1,44 +0,0 @@ @@ -1,44 +0,0 @@
1 -package com.jevon.wordDTO;  
2 -  
3 -import io.swagger.annotations.ApiModel;  
4 -import io.swagger.annotations.ApiModelProperty;  
5 -  
6 -/**  
7 - * @author chen  
8 - * @version 1.0  
9 - * @date 2019/10/18 0018 15:37  
10 - */  
11 -@ApiModel  
12 -public class Form1 {  
13 -  
14 - @ApiModelProperty(value="等级")  
15 - private String level ;  
16 - @ApiModelProperty(value="人数")  
17 - private int number ;  
18 - @ApiModelProperty(value="比例")  
19 - private double prop ;  
20 -  
21 - public String getLevel() {  
22 - return level;  
23 - }  
24 -  
25 - public void setLevel(String level) {  
26 - this.level = level;  
27 - }  
28 -  
29 - public int getNumber() {  
30 - return number;  
31 - }  
32 -  
33 - public void setNumber(int number) {  
34 - this.number = number;  
35 - }  
36 -  
37 - public double getProp() {  
38 - return prop;  
39 - }  
40 -  
41 - public void setProp(double prop) {  
42 - this.prop = prop;  
43 - }  
44 -}  
src/main/java/com/jevon/wordDTO/Form1RepVO.java
View file @1de4a42
@@ -1,37 +0,0 @@ @@ -1,37 +0,0 @@
1 -package com.jevon.wordDTO;  
2 -  
3 -import io.swagger.annotations.ApiModel;  
4 -import io.swagger.annotations.ApiModelProperty;  
5 -  
6 -import java.util.List;  
7 -import java.util.Map;  
8 -  
9 -/**  
10 - * @author chen  
11 - * @version 1.0  
12 - * @date 2019/10/18 0018 15:46  
13 - */  
14 -@ApiModel  
15 -public class Form1RepVO {  
16 -  
17 - @ApiModelProperty(value="分数段区间")  
18 - private Map<String ,String> map ;  
19 - @ApiModelProperty(value="分数段详情")  
20 - private List<Form1> list ;  
21 -  
22 - public Map<String, String> getMap() {  
23 - return map;  
24 - }  
25 -  
26 - public void setMap(Map<String, String> map) {  
27 - this.map = map;  
28 - }  
29 -  
30 - public List<Form1> getList() {  
31 - return list;  
32 - }  
33 -  
34 - public void setList(List<Form1> list) {  
35 - this.list = list;  
36 - }  
37 -}  
src/main/java/com/jevon/wordDTO/Form2.java
View file @1de4a42
@@ -1,84 +0,0 @@ @@ -1,84 +0,0 @@
1 -package com.jevon.wordDTO;  
2 -  
3 -import io.swagger.annotations.ApiModel;  
4 -import io.swagger.annotations.ApiModelProperty;  
5 -  
6 -/**  
7 - * @author chen  
8 - * @version 1.0  
9 - * @date 2019/10/18 0018 16:10  
10 - */  
11 -@ApiModel  
12 -public class Form2 {  
13 -  
14 - @ApiModelProperty(value="名称")  
15 - private String name ;  
16 - @ApiModelProperty(value="参考人数")  
17 - private int studentNumber ;  
18 - @ApiModelProperty(value="参考人数占比")  
19 - private double studentProp ;  
20 - @ApiModelProperty(value="高分段人数")  
21 - private int highNumber ;  
22 - @ApiModelProperty(value="高分段人数占比")  
23 - private double highProp ;  
24 - @ApiModelProperty(value="低分段人数")  
25 - private int lowNumber ;  
26 - @ApiModelProperty(value="低分段人数占比")  
27 - private double lowProp ;  
28 -  
29 - public String getName() {  
30 - return name;  
31 - }  
32 -  
33 - public void setName(String name) {  
34 - this.name = name;  
35 - }  
36 -  
37 - public int getStudentNumber() {  
38 - return studentNumber;  
39 - }  
40 -  
41 - public void setStudentNumber(int studentNumber) {  
42 - this.studentNumber = studentNumber;  
43 - }  
44 -  
45 - public int getHighNumber() {  
46 - return highNumber;  
47 - }  
48 -  
49 - public void setHighNumber(int highNumber) {  
50 - this.highNumber = highNumber;  
51 - }  
52 -  
53 - public double getHighProp() {  
54 - return highProp;  
55 - }  
56 -  
57 - public void setHighProp(double highProp) {  
58 - this.highProp = highProp;  
59 - }  
60 -  
61 - public int getLowNumber() {  
62 - return lowNumber;  
63 - }  
64 -  
65 - public void setLowNumber(int lowNumber) {  
66 - this.lowNumber = lowNumber;  
67 - }  
68 -  
69 - public double getLowProp() {  
70 - return lowProp;  
71 - }  
72 -  
73 - public void setLowProp(double lowProp) {  
74 - this.lowProp = lowProp;  
75 - }  
76 -  
77 - public double getStudentProp() {  
78 - return studentProp;  
79 - }  
80 -  
81 - public void setStudentProp(double studentProp) {  
82 - this.studentProp = studentProp;  
83 - }  
84 -}  
src/main/java/com/jevon/wordDTO/Form2RepVO.java
View file @1de4a42
@@ -1,26 +0,0 @@ @@ -1,26 +0,0 @@
1 -package com.jevon.wordDTO;  
2 -  
3 -import com.jevon.vo.BaseVo;  
4 -import io.swagger.annotations.ApiModel;  
5 -import io.swagger.annotations.ApiModelProperty;  
6 -  
7 -import java.util.List;  
8 -  
9 -/**  
10 - * @author chen  
11 - * @version 1.0  
12 - * @date 2019/10/22 0022 9:51  
13 - */  
14 -@ApiModel  
15 -public class Form2RepVO extends BaseVo {  
16 - @ApiModelProperty(value="数据")  
17 - private List<Form2> data ;  
18 -  
19 - public List<Form2> getData() {  
20 - return data;  
21 - }  
22 -  
23 - public void setData(List<Form2> data) {  
24 - this.data = data;  
25 - }  
26 -}  
src/main/java/com/jevon/wordDTO/Form3.java
View file @1de4a42
@@ -1,94 +0,0 @@ @@ -1,94 +0,0 @@
1 -package com.jevon.wordDTO;  
2 -  
3 -import io.swagger.annotations.ApiModel;  
4 -import io.swagger.annotations.ApiModelProperty;  
5 -  
6 -/**  
7 - * @author chen  
8 - * @version 1.0  
9 - * @date 2019/10/21 0021 9:03  
10 - */  
11 -@ApiModel  
12 -public class Form3 {  
13 -  
14 - @ApiModelProperty(value="名称")  
15 - private String name ;  
16 - @ApiModelProperty(value="最高分")  
17 - private Double maxScore ;  
18 - @ApiModelProperty(value="平均分")  
19 - private Double average ;  
20 - @ApiModelProperty(value="最低分")  
21 - private Double minScore ;  
22 - @ApiModelProperty(value="优秀率")  
23 - private Double apercent ;  
24 - @ApiModelProperty(value="良好率")  
25 - private Double bpercent ;  
26 - @ApiModelProperty(value="及格率")  
27 - private Double cpercent ;  
28 - @ApiModelProperty(value="不及格率")  
29 - private Double dpercent ;  
30 -  
31 - public String getName() {  
32 - return name;  
33 - }  
34 -  
35 - public void setName(String name) {  
36 - this.name = name;  
37 - }  
38 -  
39 - public Double getMaxScore() {  
40 - return maxScore;  
41 - }  
42 -  
43 - public void setMaxScore(Double maxScore) {  
44 - this.maxScore = maxScore;  
45 - }  
46 -  
47 - public Double getAverage() {  
48 - return average;  
49 - }  
50 -  
51 - public void setAverage(Double average) {  
52 - this.average = average;  
53 - }  
54 -  
55 - public Double getMinScore() {  
56 - return minScore;  
57 - }  
58 -  
59 - public void setMinScore(Double minScore) {  
60 - this.minScore = minScore;  
61 - }  
62 -  
63 - public Double getApercent() {  
64 - return apercent;  
65 - }  
66 -  
67 - public void setApercent(Double apercent) {  
68 - this.apercent = apercent;  
69 - }  
70 -  
71 - public Double getBpercent() {  
72 - return bpercent;  
73 - }  
74 -  
75 - public void setBpercent(Double bpercent) {  
76 - this.bpercent = bpercent;  
77 - }  
78 -  
79 - public Double getCpercent() {  
80 - return cpercent;  
81 - }  
82 -  
83 - public void setCpercent(Double cpercent) {  
84 - this.cpercent = cpercent;  
85 - }  
86 -  
87 - public Double getDpercent() {  
88 - return dpercent;  
89 - }  
90 -  
91 - public void setDpercent(Double dpercent) {  
92 - this.dpercent = dpercent;  
93 - }  
94 -}  
src/main/java/com/jevon/wordDTO/Form3RepVO.java
View file @1de4a42
@@ -1,23 +0,0 @@ @@ -1,23 +0,0 @@
1 -package com.jevon.wordDTO;  
2 -  
3 -import com.jevon.vo.BaseVo;  
4 -  
5 -import java.util.List;  
6 -  
7 -/**  
8 - * @author chen  
9 - * @version 1.0  
10 - * @date 2019/10/22 0022 10:14  
11 - */  
12 -public class Form3RepVO extends BaseVo {  
13 -  
14 - private List<Form3> data ;  
15 -  
16 - public List<Form3> getData() {  
17 - return data;  
18 - }  
19 -  
20 - public void setData(List<Form3> data) {  
21 - this.data = data;  
22 - }  
23 -}  
src/main/java/com/jevon/wordDTO/Form4.java
View file @1de4a42
@@ -1,64 +0,0 @@ @@ -1,64 +0,0 @@
1 -package com.jevon.wordDTO;  
2 -  
3 -import io.swagger.annotations.ApiModel;  
4 -import io.swagger.annotations.ApiModelProperty;  
5 -  
6 -/**  
7 - * @author chen  
8 - * @version 1.0  
9 - * @date 2019/10/21 0021 9:51  
10 - */  
11 -@ApiModel  
12 -public class Form4 {  
13 -  
14 - @ApiModelProperty(value="名称")  
15 - private String name ;  
16 - @ApiModelProperty(value="众数")  
17 - private Double modeNumber ;  
18 - @ApiModelProperty(value="中位数")  
19 - private Double medianNumber ;  
20 - @ApiModelProperty(value="标准差")  
21 - private Double stdev ;  
22 - @ApiModelProperty(value="平均分")  
23 - private Double avgNumber ;  
24 -  
25 - public String getName() {  
26 - return name;  
27 - }  
28 -  
29 - public void setName(String name) {  
30 - this.name = name;  
31 - }  
32 -  
33 - public Double getModeNumber() {  
34 - return modeNumber;  
35 - }  
36 -  
37 - public void setModeNumber(Double modeNumber) {  
38 - this.modeNumber = modeNumber;  
39 - }  
40 -  
41 - public Double getMedianNumber() {  
42 - return medianNumber;  
43 - }  
44 -  
45 - public void setMedianNumber(Double medianNumber) {  
46 - this.medianNumber = medianNumber;  
47 - }  
48 -  
49 - public Double getStdev() {  
50 - return stdev;  
51 - }  
52 -  
53 - public void setStdev(Double stdev) {  
54 - this.stdev = stdev;  
55 - }  
56 -  
57 - public Double getAvgNumber() {  
58 - return avgNumber;  
59 - }  
60 -  
61 - public void setAvgNumber(Double avgNumber) {  
62 - this.avgNumber = avgNumber;  
63 - }  
64 -}  
src/main/java/com/jevon/wordDTO/Form4RepVO.java
View file @1de4a42
@@ -1,25 +0,0 @@ @@ -1,25 +0,0 @@
1 -package com.jevon.wordDTO;  
2 -  
3 -import com.jevon.vo.BaseVo;  
4 -import io.swagger.annotations.ApiModel;  
5 -  
6 -import java.util.List;  
7 -  
8 -/**  
9 - * @author chen  
10 - * @version 1.0  
11 - * @date 2019/10/22 0022 10:23  
12 - */  
13 -@ApiModel  
14 -public class Form4RepVO extends BaseVo {  
15 -  
16 - private List<Form4> data ;  
17 -  
18 - public List<Form4> getData() {  
19 - return data;  
20 - }  
21 -  
22 - public void setData(List<Form4> data) {  
23 - this.data = data;  
24 - }  
25 -}  
src/main/java/com/jevon/wordDTO/Form5.java
View file @1de4a42
@@ -1,134 +0,0 @@ @@ -1,134 +0,0 @@
1 -package com.jevon.wordDTO;  
2 -  
3 -import io.swagger.annotations.ApiModel;  
4 -import io.swagger.annotations.ApiModelProperty;  
5 -  
6 -/**  
7 - * @author chen  
8 - * @version 1.0  
9 - * @date 2019/10/21 0021 9:59  
10 - */  
11 -@ApiModel  
12 -public class Form5 {  
13 - @ApiModelProperty(value="题号")  
14 - private String examNumber ;  
15 - @ApiModelProperty(value="难度")  
16 - private String difficultName ;  
17 - @ApiModelProperty(value="分值")  
18 - private Double score ;  
19 - @ApiModelProperty(value="得分率 区")  
20 - private Double allRate ;  
21 - @ApiModelProperty(value="得分率 联盟校")  
22 - private Double leagueRate ;  
23 - @ApiModelProperty(value="得分率 本校")  
24 - private Double schoolRate ;  
25 - @ApiModelProperty(value="平均分 区")  
26 - private Double allAvg ;  
27 - @ApiModelProperty(value="平均分 联盟校")  
28 - private Double leagueAvg ;  
29 - @ApiModelProperty(value="平均分 本校")  
30 - private Double schoolAvg ;  
31 - @ApiModelProperty(value="区分度 区")  
32 - private Double allDist ;  
33 - @ApiModelProperty(value="区分度 联盟校")  
34 - private Double leagueDist ;  
35 - @ApiModelProperty(value="区分度 本校")  
36 - private Double schoolDist ;  
37 -  
38 -  
39 - public String getExamNumber() {  
40 - return examNumber;  
41 - }  
42 -  
43 - public void setExamNumber(String examNumber) {  
44 - this.examNumber = examNumber;  
45 - }  
46 -  
47 - public Double getScore() {  
48 - return score;  
49 - }  
50 -  
51 - public void setScore(Double score) {  
52 - this.score = score;  
53 - }  
54 -  
55 - public Double getAllRate() {  
56 - return allRate;  
57 - }  
58 -  
59 - public void setAllRate(Double allRate) {  
60 - this.allRate = allRate;  
61 - }  
62 -  
63 - public Double getSchoolRate() {  
64 - return schoolRate;  
65 - }  
66 -  
67 - public void setSchoolRate(Double schoolRate) {  
68 - this.schoolRate = schoolRate;  
69 - }  
70 -  
71 - public Double getAllAvg() {  
72 - return allAvg;  
73 - }  
74 -  
75 - public void setAllAvg(Double allAvg) {  
76 - this.allAvg = allAvg;  
77 - }  
78 -  
79 - public Double getSchoolAvg() {  
80 - return schoolAvg;  
81 - }  
82 -  
83 - public void setSchoolAvg(Double schoolAvg) {  
84 - this.schoolAvg = schoolAvg;  
85 - }  
86 -  
87 - public Double getAllDist() {  
88 - return allDist;  
89 - }  
90 -  
91 - public void setAllDist(Double allDist) {  
92 - this.allDist = allDist;  
93 - }  
94 -  
95 - public Double getSchoolDist() {  
96 - return schoolDist;  
97 - }  
98 -  
99 - public void setSchoolDist(Double schoolDist) {  
100 - this.schoolDist = schoolDist;  
101 - }  
102 -  
103 - public String getDifficultName() {  
104 - return difficultName;  
105 - }  
106 -  
107 - public void setDifficultName(String difficultName) {  
108 - this.difficultName = difficultName;  
109 - }  
110 -  
111 - public Double getLeagueRate() {  
112 - return leagueRate;  
113 - }  
114 -  
115 - public void setLeagueRate(Double leagueRate) {  
116 - this.leagueRate = leagueRate;  
117 - }  
118 -  
119 - public Double getLeagueAvg() {  
120 - return leagueAvg;  
121 - }  
122 -  
123 - public void setLeagueAvg(Double leagueAvg) {  
124 - this.leagueAvg = leagueAvg;  
125 - }  
126 -  
127 - public Double getLeagueDist() {  
128 - return leagueDist;  
129 - }  
130 -  
131 - public void setLeagueDist(Double leagueDist) {  
132 - this.leagueDist = leagueDist;  
133 - }  
134 -}  
src/main/java/com/jevon/wordDTO/Form5RepVO.java
View file @1de4a42
@@ -1,25 +0,0 @@ @@ -1,25 +0,0 @@
1 -package com.jevon.wordDTO;  
2 -  
3 -import com.jevon.vo.BaseVo;  
4 -import io.swagger.annotations.ApiModel;  
5 -  
6 -import java.util.List;  
7 -  
8 -/**  
9 - * @author chen  
10 - * @version 1.0  
11 - * @date 2019/10/22 0022 10:28  
12 - */  
13 -@ApiModel  
14 -public class Form5RepVO extends BaseVo {  
15 -  
16 - private List<Form5> data ;  
17 -  
18 - public List<Form5> getData() {  
19 - return data;  
20 - }  
21 -  
22 - public void setData(List<Form5> data) {  
23 - this.data = data;  
24 - }  
25 -}  
src/main/java/com/jevon/wordDTO/Form6.java
View file @1de4a42
@@ -1,135 +0,0 @@ @@ -1,135 +0,0 @@
1 -package com.jevon.wordDTO;  
2 -  
3 -import io.swagger.annotations.ApiModel;  
4 -import io.swagger.annotations.ApiModelProperty;  
5 -  
6 -/**  
7 - * @author chen  
8 - * @version 1.0  
9 - * @date 2019/10/21 0021 11:25  
10 - */  
11 -@ApiModel  
12 -public class Form6 {  
13 - @ApiModelProperty(value="维度名称")  
14 - private String dimensional ;  
15 - @ApiModelProperty(value="分值")  
16 - private Double score ;  
17 - @ApiModelProperty(value="得分率 区")  
18 - private Double allRate ;  
19 - @ApiModelProperty(value="得分率 联盟校")  
20 - private Double leagueRate ;  
21 - @ApiModelProperty(value="得分率 本校")  
22 - private Double schoolRate ;  
23 - @ApiModelProperty(value="平均分 区")  
24 - private Double allAvg ;  
25 - @ApiModelProperty(value="平均分 联盟校")  
26 - private Double leagueAvg ;  
27 - @ApiModelProperty(value="平均分 本校")  
28 - private Double schoolAvg ;  
29 - @ApiModelProperty(value="区分度 区")  
30 - private Double allDist ;  
31 - @ApiModelProperty(value="区分度 联盟校")  
32 - private Double leagueDist ;  
33 - @ApiModelProperty(value="区分度 本校")  
34 - private Double schoolDist ;  
35 -  
36 -  
37 - private String examNumber ;  
38 -  
39 -  
40 - public Double getScore() {  
41 - return score;  
42 - }  
43 -  
44 - public void setScore(Double score) {  
45 - this.score = score;  
46 - }  
47 -  
48 - public Double getAllRate() {  
49 - return allRate;  
50 - }  
51 -  
52 - public void setAllRate(Double allRate) {  
53 - this.allRate = allRate;  
54 - }  
55 -  
56 - public Double getSchoolRate() {  
57 - return schoolRate;  
58 - }  
59 -  
60 - public void setSchoolRate(Double schoolRate) {  
61 - this.schoolRate = schoolRate;  
62 - }  
63 -  
64 - public Double getAllAvg() {  
65 - return allAvg;  
66 - }  
67 -  
68 - public void setAllAvg(Double allAvg) {  
69 - this.allAvg = allAvg;  
70 - }  
71 -  
72 - public Double getSchoolAvg() {  
73 - return schoolAvg;  
74 - }  
75 -  
76 - public void setSchoolAvg(Double schoolAvg) {  
77 - this.schoolAvg = schoolAvg;  
78 - }  
79 -  
80 - public Double getAllDist() {  
81 - return allDist;  
82 - }  
83 -  
84 - public void setAllDist(Double allDist) {  
85 - this.allDist = allDist;  
86 - }  
87 -  
88 - public Double getSchoolDist() {  
89 - return schoolDist;  
90 - }  
91 -  
92 - public void setSchoolDist(Double schoolDist) {  
93 - this.schoolDist = schoolDist;  
94 - }  
95 -  
96 - public String getExamNumber() {  
97 - return examNumber;  
98 - }  
99 -  
100 - public void setExamNumber(String examNumber) {  
101 - this.examNumber = examNumber;  
102 - }  
103 -  
104 - public String getDimensional() {  
105 - return dimensional;  
106 - }  
107 -  
108 - public void setDimensional(String dimensional) {  
109 - this.dimensional = dimensional;  
110 - }  
111 -  
112 - public Double getLeagueRate() {  
113 - return leagueRate;  
114 - }  
115 -  
116 - public void setLeagueRate(Double leagueRate) {  
117 - this.leagueRate = leagueRate;  
118 - }  
119 -  
120 - public Double getLeagueAvg() {  
121 - return leagueAvg;  
122 - }  
123 -  
124 - public void setLeagueAvg(Double leagueAvg) {  
125 - this.leagueAvg = leagueAvg;  
126 - }  
127 -  
128 - public Double getLeagueDist() {  
129 - return leagueDist;  
130 - }  
131 -  
132 - public void setLeagueDist(Double leagueDist) {  
133 - this.leagueDist = leagueDist;  
134 - }  
135 -}  
src/main/java/com/jevon/wordDTO/Form6RepVO.java
View file @1de4a42
@@ -1,25 +0,0 @@ @@ -1,25 +0,0 @@
1 -package com.jevon.wordDTO;  
2 -  
3 -import com.jevon.vo.BaseVo;  
4 -import io.swagger.annotations.ApiModel;  
5 -  
6 -import java.util.List;  
7 -  
8 -/**  
9 - * @author chen  
10 - * @version 1.0  
11 - * @date 2019/10/22 0022 10:51  
12 - */  
13 -@ApiModel  
14 -public class Form6RepVO extends BaseVo {  
15 -  
16 - private List<Form6> data ;  
17 -  
18 - public List<Form6> getData() {  
19 - return data;  
20 - }  
21 -  
22 - public void setData(List<Form6> data) {  
23 - this.data = data;  
24 - }  
25 -}  
src/main/java/com/jevon/wordDTO/Form7.java
View file @1de4a42
@@ -1,44 +0,0 @@ @@ -1,44 +0,0 @@
1 -package com.jevon.wordDTO;  
2 -  
3 -import io.swagger.annotations.ApiModel;  
4 -import io.swagger.annotations.ApiModelProperty;  
5 -  
6 -/**  
7 - * @author chen  
8 - * @version 1.0  
9 - * @date 2019/10/21 0021 14:58  
10 - */  
11 -@ApiModel  
12 -public class Form7 {  
13 -  
14 - @ApiModelProperty(value = "名称")  
15 - private String name ;  
16 - @ApiModelProperty(value = "分值")  
17 - private Double score ;  
18 - @ApiModelProperty(value = "占比")  
19 - private Double percent ;  
20 -  
21 - public Double getScore() {  
22 - return score;  
23 - }  
24 -  
25 - public void setScore(Double score) {  
26 - this.score = score;  
27 - }  
28 -  
29 - public String getName() {  
30 - return name;  
31 - }  
32 -  
33 - public void setName(String name) {  
34 - this.name = name;  
35 - }  
36 -  
37 - public Double getPercent() {  
38 - return percent;  
39 - }  
40 -  
41 - public void setPercent(Double percent) {  
42 - this.percent = percent;  
43 - }  
44 -}  
src/main/java/com/jevon/wordDTO/Form7RepVO.java
View file @1de4a42
@@ -1,87 +0,0 @@ @@ -1,87 +0,0 @@
1 -package com.jevon.wordDTO;  
2 -  
3 -import com.jevon.model.Chapter;  
4 -import io.swagger.annotations.ApiModel;  
5 -import io.swagger.annotations.ApiModelProperty;  
6 -  
7 -import java.util.List;  
8 -  
9 -/**  
10 - * @author chen  
11 - * @version 1.0  
12 - * @date 2019/10/24 0024 9:20  
13 - */  
14 -@ApiModel  
15 -public class Form7RepVO {  
16 -  
17 - @ApiModelProperty(value = "举例七年级上册")  
18 - private String examScope ;  
19 - @ApiModelProperty(value = "科目")  
20 - private String courseName ;  
21 - @ApiModelProperty(value = "满分")  
22 - private Double maxScore ;  
23 - @ApiModelProperty(value = "考试时长")  
24 - private String examTime ;  
25 - @ApiModelProperty(value = "章节列表对应分值")  
26 - private List<Chapter> list ;  
27 - @ApiModelProperty(value = "难度列表对应分值")  
28 - private List<Form7> difficultList ;  
29 - @ApiModelProperty(value = "题型类型对应分值")  
30 - private List<Form7> typeList ;  
31 -  
32 - public String getExamScope() {  
33 - return examScope;  
34 - }  
35 -  
36 - public void setExamScope(String examScope) {  
37 - this.examScope = examScope;  
38 - }  
39 -  
40 - public String getCourseName() {  
41 - return courseName;  
42 - }  
43 -  
44 - public void setCourseName(String courseName) {  
45 - this.courseName = courseName;  
46 - }  
47 -  
48 - public List<Chapter> getList() {  
49 - return list;  
50 - }  
51 -  
52 - public void setList(List<Chapter> list) {  
53 - this.list = list;  
54 - }  
55 -  
56 - public List<Form7> getDifficultList() {  
57 - return difficultList;  
58 - }  
59 -  
60 - public void setDifficultList(List<Form7> difficultList) {  
61 - this.difficultList = difficultList;  
62 - }  
63 -  
64 - public List<Form7> getTypeList() {  
65 - return typeList;  
66 - }  
67 -  
68 - public void setTypeList(List<Form7> typeList) {  
69 - this.typeList = typeList;  
70 - }  
71 -  
72 - public Double getMaxScore() {  
73 - return maxScore;  
74 - }  
75 -  
76 - public void setMaxScore(Double maxScore) {  
77 - this.maxScore = maxScore;  
78 - }  
79 -  
80 - public String getExamTime() {  
81 - return examTime;  
82 - }  
83 -  
84 - public void setExamTime(String examTime) {  
85 - this.examTime = examTime;  
86 - }  
87 -}  
src/main/java/com/jevon/wordDTO/Form8.java
View file @1de4a42
@@ -1,64 +0,0 @@ @@ -1,64 +0,0 @@
1 -package com.jevon.wordDTO;  
2 -  
3 -import io.swagger.annotations.ApiModel;  
4 -import io.swagger.annotations.ApiModelProperty;  
5 -  
6 -/**  
7 - * @author chen  
8 - * @version 1.0  
9 - * @date 2019/10/21 0021 15:14  
10 - */  
11 -@ApiModel  
12 -public class Form8 {  
13 -  
14 - @ApiModelProperty(value="题目难度")  
15 - private String difficultName ;  
16 - @ApiModelProperty(value="分值")  
17 - private Double score ;  
18 - @ApiModelProperty(value="得分率 区")  
19 - private Double allRate ;  
20 - @ApiModelProperty(value="得分率 联盟校")  
21 - private Double leagueRate ;  
22 - @ApiModelProperty(value="得分率 本校")  
23 - private Double schoolRate ;  
24 -  
25 - public String getDifficultName() {  
26 - return difficultName;  
27 - }  
28 -  
29 - public void setDifficultName(String difficultName) {  
30 - this.difficultName = difficultName;  
31 - }  
32 -  
33 - public Double getScore() {  
34 - return score;  
35 - }  
36 -  
37 - public void setScore(Double score) {  
38 - this.score = score;  
39 - }  
40 -  
41 - public Double getAllRate() {  
42 - return allRate;  
43 - }  
44 -  
45 - public void setAllRate(Double allRate) {  
46 - this.allRate = allRate;  
47 - }  
48 -  
49 - public Double getSchoolRate() {  
50 - return schoolRate;  
51 - }  
52 -  
53 - public void setSchoolRate(Double schoolRate) {  
54 - this.schoolRate = schoolRate;  
55 - }  
56 -  
57 - public Double getLeagueRate() {  
58 - return leagueRate;  
59 - }  
60 -  
61 - public void setLeagueRate(Double leagueRate) {  
62 - this.leagueRate = leagueRate;  
63 - }  
64 -}  
src/main/java/com/jevon/wordDTO/Form8RepVO.java
View file @1de4a42
@@ -1,25 +0,0 @@ @@ -1,25 +0,0 @@
1 -package com.jevon.wordDTO;  
2 -  
3 -import com.jevon.vo.BaseVo;  
4 -import io.swagger.annotations.ApiModel;  
5 -  
6 -import java.util.List;  
7 -  
8 -/**  
9 - * @author chen  
10 - * @version 1.0  
11 - * @date 2019/10/22 0022 10:47  
12 - */  
13 -@ApiModel  
14 -public class Form8RepVO extends BaseVo {  
15 -  
16 - private List<Form8> data ;  
17 -  
18 - public List<Form8> getData() {  
19 - return data;  
20 - }  
21 -  
22 - public void setData(List<Form8> data) {  
23 - this.data = data;  
24 - }  
25 -}  
src/main/java/com/jevon/wordDTO/Table1.java
View file @1de4a42
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
1 -package com.jevon.wordDTO;  
2 -  
3 -import io.swagger.annotations.ApiModel;  
4 -import io.swagger.annotations.ApiModelProperty;  
5 -  
6 -/**  
7 - * @author chen  
8 - * @version 1.0  
9 - * @date 2019/10/21 0021 8:34  
10 - */  
11 -@ApiModel  
12 -public class Table1 {  
13 - @ApiModelProperty(value="分数段")  
14 - private String score ;  
15 - @ApiModelProperty(value="人数")  
16 - private int number ;  
17 -  
18 - public String getScore() {  
19 - return score;  
20 - }  
21 -  
22 - public void setScore(String score) {  
23 - this.score = score;  
24 - }  
25 -  
26 - public int getNumber() {  
27 - return number;  
28 - }  
29 -  
30 - public void setNumber(int number) {  
31 - this.number = number;  
32 - }  
33 -}  
src/main/resources/mapping/AnalyseDetailMapper.xml
  Diff comments   View file @5cba275
@@ -27,6 +27,10 @@ @@ -27,6 +27,10 @@
27 select sum(score) from sz_learn_analyse_detail where analyse_id = #{analyseId} and difficult =#{difficult} 27 select sum(score) from sz_learn_analyse_detail where analyse_id = #{analyseId} and difficult =#{difficult}
28 </select> 28 </select>
29 29
  30 + <select id="selectQuestionNumberByDifficult" parameterType="com.jevon.model.AnalyseDetail" resultType="java.lang.String">
  31 + select question_number from sz_learn_analyse_detail where analyse_id = #{analyseId} and difficult =#{difficult}
  32 + </select>
  33 +
30 <select id="selectDifficultDetail" parameterType="com.jevon.model.AnalyseDetail" resultMap="BaseResultMap"> 34 <select id="selectDifficultDetail" parameterType="com.jevon.model.AnalyseDetail" resultMap="BaseResultMap">
31 select * from sz_learn_analyse_detail where analyse_id = #{analyseId} and difficult =#{difficult} 35 select * from sz_learn_analyse_detail where analyse_id = #{analyseId} and difficult =#{difficult}
32 </select> 36 </select>
@@ -38,4 +42,8 @@ @@ -38,4 +42,8 @@
38 <select id="selectSumType" parameterType="com.jevon.model.AnalyseDetail" resultType="java.lang.Double"> 42 <select id="selectSumType" parameterType="com.jevon.model.AnalyseDetail" resultType="java.lang.Double">
39 select sum(score) from sz_learn_analyse_detail where analyse_id = #{analyseId} and question_type =#{questionType} 43 select sum(score) from sz_learn_analyse_detail where analyse_id = #{analyseId} and question_type =#{questionType}
40 </select> 44 </select>
  45 +
  46 + <select id="selectQuestionNumberByType" parameterType="com.jevon.model.AnalyseDetail" resultType="java.lang.String">
  47 + select question_number from sz_learn_analyse_detail where analyse_id = #{analyseId} and question_type =#{questionType}
  48 + </select>
41 </mapper> 49 </mapper>
42 \ No newline at end of file 50 \ No newline at end of file
src/main/resources/mapping/StudentDetailMapper.xml
  Diff comments   View file @5cba275
@@ -34,6 +34,12 @@ @@ -34,6 +34,12 @@
34 <if test="schoolName != null"> 34 <if test="schoolName != null">
35 and school_name = #{schoolName} 35 and school_name = #{schoolName}
36 </if> 36 </if>
  37 + <if test="className != null">
  38 + and class_name = #{className}
  39 + </if>
  40 + <if test="studentNumber != null">
  41 + and student_number =#{studentNumber}
  42 + </if>
37 <if test="examNumber != null"> 43 <if test="examNumber != null">
38 and exam_number = #{examNumber} 44 and exam_number = #{examNumber}
39 </if> 45 </if>
src/main/resources/mapping/StudentMapper.xml
  Diff comments   View file @5cba275
@@ -23,6 +23,11 @@ @@ -23,6 +23,11 @@
23 </foreach> 23 </foreach>
24 </insert> 24 </insert>
25 25
  26 + <select id="selectStudent" parameterType="com.jevon.model.Student" resultMap="BaseResultMap">
  27 + select * from sz_learn_student where analyse_id = #{analyseId} and school_name = #{schoolName}
  28 + and student_number = #{studentNumber}
  29 + </select>
  30 +
26 <select id="selectByStudent" parameterType="com.jevon.model.Student" resultMap="BaseResultMap"> 31 <select id="selectByStudent" parameterType="com.jevon.model.Student" resultMap="BaseResultMap">
27 select * from sz_learn_student 32 select * from sz_learn_student
28 <where> 33 <where>
@@ -90,6 +95,9 @@ @@ -90,6 +95,9 @@
90 <if test="schoolName != null"> 95 <if test="schoolName != null">
91 and school_name = #{schoolName} 96 and school_name = #{schoolName}
92 </if> 97 </if>
  98 + <if test="className !=null">
  99 + and class_name = #{className}
  100 + </if>
93 <if test="schoolNames != null and schoolNames.size()>0"> 101 <if test="schoolNames != null and schoolNames.size()>0">
94 AND school_name IN 102 AND school_name IN
95 <foreach item="item" index="index" collection="schoolNames" open="(" close=")" separator=","> 103 <foreach item="item" index="index" collection="schoolNames" open="(" close=")" separator=",">