diff --git a/src/main/java/com/jevon/controller/LearnController.java b/src/main/java/com/jevon/controller/LearnController.java index aaea4d9..0f5d31c 100644 --- a/src/main/java/com/jevon/controller/LearnController.java +++ b/src/main/java/com/jevon/controller/LearnController.java @@ -4,6 +4,7 @@ import com.jevon.enums.DifficultEnums; import com.jevon.enums.DimensionalEnums; import com.jevon.model.*; import com.jevon.service.*; +import com.jevon.utils.HttpClientUtils; import com.jevon.vo.BaseVo; import com.jevon.vo.excel.ExamExcelVo; import com.jevon.vo.excel.ScoreExcelVo; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController; import java.io.File; import java.io.FileInputStream; +import java.io.InputStream; import java.util.*; /** @@ -127,16 +129,18 @@ public class LearnController { List analyseDimensionals = new ArrayList<>(); Float maxScore = 0f; Analyse analyse = analyseService.selectById(initAnalyseReqVo.getAnalyseId()); - String fileUrl = initAnalyseReqVo.getUrl(); - fileUrl = fileUrl.replace(url, staticUrl); - File excelFile = new File(fileUrl); + File excelFile = new File(initAnalyseReqVo.getUrl()); // 获得工作簿 String file = excelFile.getName(); Workbook workbook = null; + InputStream inputStream = HttpClientUtils.GetFileInputStream(initAnalyseReqVo.getUrl()); + if(inputStream == null){ + return; + } if (file.endsWith("xls")) { - workbook = new HSSFWorkbook(new FileInputStream(excelFile)); + workbook = new HSSFWorkbook(inputStream); } else { - workbook = new XSSFWorkbook(new FileInputStream(excelFile)); + workbook = new XSSFWorkbook(inputStream); } // 获得工作表 Sheet sheet = workbook.getSheetAt(0); @@ -232,16 +236,18 @@ public class LearnController { for(AnalyseDetail analyseDetail : analyseDetails){ scoreMap.put(analyseDetail.getQuestionNumber(),analyseDetail.getScore()); } - String fileUrl = initScoreReqVo.getUrl(); - fileUrl = fileUrl.replace(url, staticUrl); - File excelFile = new File(fileUrl); + File excelFile = new File(initScoreReqVo.getUrl()); // 获得工作簿 String file = excelFile.getName(); Workbook workbook = null; + InputStream inputStream = HttpClientUtils.GetFileInputStream(initScoreReqVo.getUrl()); + if(inputStream == null){ + return false ; + } if (file.endsWith("xls")) { - workbook = new HSSFWorkbook(new FileInputStream(excelFile)); + workbook = new HSSFWorkbook(inputStream); } else { - workbook = new XSSFWorkbook(new FileInputStream(excelFile)); + workbook = new XSSFWorkbook(inputStream); } // 获得工作表 for(int number = 0 ; number < workbook.getNumberOfSheets() ; number++){ diff --git a/src/main/java/com/jevon/controller/LearnStatController.java b/src/main/java/com/jevon/controller/LearnStatController.java index 9665ae8..ae0560b 100644 --- a/src/main/java/com/jevon/controller/LearnStatController.java +++ b/src/main/java/com/jevon/controller/LearnStatController.java @@ -6,7 +6,7 @@ import com.jevon.model.*; import com.jevon.service.*; import com.jevon.vo.rep.SuggestRepVo; import com.jevon.vo.req.GetLearnReqVo; -import com.jevon.wordDTO.*; +import com.jevon.vo.school.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/jevon/controller/LearnStudentController.java b/src/main/java/com/jevon/controller/LearnStudentController.java new file mode 100644 index 0000000..8308398 --- /dev/null +++ b/src/main/java/com/jevon/controller/LearnStudentController.java @@ -0,0 +1,180 @@ +package com.jevon.controller; + +import com.jevon.enums.DifficultEnums; +import com.jevon.enums.DimensionalEnums; +import com.jevon.model.Analyse; +import com.jevon.model.AnalyseDimensional; +import com.jevon.model.Dimensional; +import com.jevon.model.Student; +import com.jevon.service.*; +import com.jevon.vo.req.StudentReqVo; +import com.jevon.vo.school.Form6; +import com.jevon.vo.student.Form1; +import com.jevon.vo.student.Form2; +import com.jevon.vo.student.Form3; +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.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author chen + * @version 1.0 + * @date 2019/11/1 0001 10:38 + */ +@RestController +@RequestMapping(value = "/getStudent") +@Api(value = "学生报告") +public class LearnStudentController { + + @Autowired + AnalyseService analyseService; + + @Autowired + DimensionalService dimensionalService; + + @Autowired + AnalyseDimensionalService analyseDimensionalService; + + @Autowired + AnalyseDetailService analyseDetailService; + + @Autowired + StudentDetailService studentDetailService; + + @Autowired + StudentService studentService; + + @Autowired + LeagueService leagueService; + + @Autowired + ChapterService chapterService; + + @ApiOperation("getForm1") + @RequestMapping(value = "getForm1", method = RequestMethod.POST) + public Form1 getStudent1(@RequestBody StudentReqVo studentReqVo){ + Form1 form1 = new Form1(); + Analyse analyse = analyseService.selectById(studentReqVo.getAnalyseId()); + Student student = studentService.selectStudent(analyse.getId(),studentReqVo.getSchoolName(),studentReqVo.getStudentNumber()); + List schoolStudent = studentService.selectByClassName(analyse.getId(),studentReqVo.getSchoolName(),null); + List classStudent = studentService.selectByClassName(analyse.getId(),studentReqVo.getSchoolName(),student.getClassName()); + Double highestScore = studentService.selectClassMaxScore(analyse.getId(),student.getSchoolName(),student.getClassName()); + int schoolRank = 0 , classRank = 0 ; + for (int i = 0; i < schoolStudent.size() ; i++) { + if(schoolStudent.get(i).getStudentNumber().equals(student.getStudentNumber())){ + schoolRank = i+1 ; + } + } + for (int i = 0; i < classStudent.size() ; i++) { + if(classStudent.get(i).getStudentNumber().equals(student.getStudentNumber())){ + classRank = i+1 ; + } + } + Double rank = new Double(classStudent.size()-classRank) / new Double(classStudent.size()) ; + form1.setClassName(student.getClassName()); + form1.setMaxScore(highestScore); + form1.setScore(student.getScore()); + form1.setRank(rank); + form1.setClassRank(classRank); + form1.setSchoolRank(schoolRank); + return form1; + } + + @ApiOperation("getForm2") + @RequestMapping(value = "getForm2", method = RequestMethod.POST) + public Form2 getStudent2(@RequestBody StudentReqVo studentReqVo){ + Form2 form2 = new Form2(); + Analyse analyse = analyseService.selectById(studentReqVo.getAnalyseId()); + Student student = studentService.selectStudent(analyse.getId(),studentReqVo.getSchoolName(),studentReqVo.getStudentNumber()); + List classStudent = studentService.selectByClassName(analyse.getId(),studentReqVo.getSchoolName(),student.getClassName()); + + Map> typeMap = new HashMap<>(); + List questionTypes = analyseDetailService.selectQuestionType(analyse.getId()); + for(String questionType : questionTypes){ + List list = new ArrayList<>(); + Double maxScore = analyseDetailService.selectSumType(analyse.getId(),questionType); + List numberList = analyseDetailService.selectQuestionNumberByType(analyse.getId(),questionType); + Double score = studentDetailService.selectStudentSumScore(analyse.getId(),student.getSchoolName(),student.getStudentNumber(),numberList); + Double highestScore = new Double(0); + for(Student temp : classStudent){ + Double tempScore = studentDetailService.selectStudentSumScore(analyse.getId(),temp.getSchoolName(),temp.getStudentNumber(),numberList); + if(tempScore > highestScore){ + highestScore = tempScore ; + } + } + list.add(maxScore); + list.add(highestScore); + list.add(score); + typeMap.put(questionType,list); + } + Map> difficultMap = new HashMap<>(); + for(DifficultEnums difficultEnum : DifficultEnums.values()){ + List list = new ArrayList<>(); + Double maxScore = analyseDetailService.selectDifficult(analyse.getId(),difficultEnum.getDifficultType()); + List numberList = analyseDetailService.selectQuestionNumberByDifficult(analyse.getId(),difficultEnum.getDifficultType()); + Double score = studentDetailService.selectStudentSumScore(analyse.getId(),student.getSchoolName(),student.getStudentNumber(),numberList); + Double highestScore = new Double(0); + for(Student temp : classStudent){ + Double tempScore = studentDetailService.selectStudentSumScore(analyse.getId(),temp.getSchoolName(),temp.getStudentNumber(),numberList); + if(tempScore > highestScore){ + highestScore = tempScore ; + } + } + list.add(maxScore); + list.add(highestScore); + list.add(score); + difficultMap.put(difficultEnum.getDifficultShow(),list); + } + form2.setDifficultMap(difficultMap); + form2.setTypeMap(typeMap); + return form2; + } + + @ApiOperation("getForm3") + @RequestMapping(value = "getForm3", method = RequestMethod.POST) + public Form3 getStudent3(@RequestBody StudentReqVo studentReqVo){ + Form3 form3 = new Form3(); + Analyse analyse = analyseService.selectById(studentReqVo.getAnalyseId()); + Student student = studentService.selectStudent(analyse.getId(),studentReqVo.getSchoolName(),studentReqVo.getStudentNumber()); + List classStudent = studentService.selectByClassName(analyse.getId(),studentReqVo.getSchoolName(),student.getClassName()); + List knowledgeList = dimensionalService.selectByAnalyse(analyse.getId(), DimensionalEnums.knowledge.getDimensionalType()); + List goodList = new ArrayList<>(); + List badList = new ArrayList<>(); + for(Dimensional dimensional : knowledgeList) { + Form6 form6 = new Form6(); + form6.setDimensional(dimensional.getDimensionalName()); + List analyseDimensionals = analyseDimensionalService.selectByDimensional(analyse.getId(), dimensional.getId()); + Double score = 0d; + List examNumberList = new ArrayList<>(); + for (AnalyseDimensional analyseDimensional : analyseDimensionals) { + score = score + analyseDimensional.getScore(); + examNumberList.add(analyseDimensional.getQuestionNumber()); + } + Double sumScore = studentDetailService.selectClassSumScore(analyse.getId(),student.getSchoolName(),student.getClassName(),examNumberList); + Double classAvg = sumScore / new Double(classStudent.size()) ; + Double tempScore = studentDetailService.selectStudentSumScore(analyse.getId(),student.getSchoolName(),student.getStudentNumber(),examNumberList); + if(tempScore / classAvg > 1.1){ + goodList.add(dimensional.getDimensionalName()); + } + if(tempScore / classAvg < 0.9){ + badList.add(dimensional.getDimensionalName()); + } + } + form3.setGoodList(goodList); + form3.setBadList(badList); + return form3; + } + + + + +} diff --git a/src/main/java/com/jevon/mapper/AnalyseDetailMapper.java b/src/main/java/com/jevon/mapper/AnalyseDetailMapper.java index 85c49ce..1838f0e 100644 --- a/src/main/java/com/jevon/mapper/AnalyseDetailMapper.java +++ b/src/main/java/com/jevon/mapper/AnalyseDetailMapper.java @@ -22,4 +22,8 @@ public interface AnalyseDetailMapper { List selectDifficultDetail(AnalyseDetail analyseDetail); List selectQuestionType(int analyseId); + + List selectQuestionNumberByType(AnalyseDetail analyseDetail); + + List selectQuestionNumberByDifficult(AnalyseDetail analyseDetail); } diff --git a/src/main/java/com/jevon/mapper/StudentMapper.java b/src/main/java/com/jevon/mapper/StudentMapper.java index 9ec4749..cbf6761 100644 --- a/src/main/java/com/jevon/mapper/StudentMapper.java +++ b/src/main/java/com/jevon/mapper/StudentMapper.java @@ -13,6 +13,8 @@ public interface StudentMapper { int insertBatch(List list); + Student selectStudent(Student student); + List selectByStudent(Student student); int selectCountByScore(Student student); diff --git a/src/main/java/com/jevon/service/AnalyseDetailService.java b/src/main/java/com/jevon/service/AnalyseDetailService.java index 2848485..a308918 100644 --- a/src/main/java/com/jevon/service/AnalyseDetailService.java +++ b/src/main/java/com/jevon/service/AnalyseDetailService.java @@ -23,4 +23,7 @@ public interface AnalyseDetailService { List selectQuestionType(int analyseId); + List selectQuestionNumberByType(int analyseId , String questionType); + + List selectQuestionNumberByDifficult(int analyseId , int difficult); } diff --git a/src/main/java/com/jevon/service/StudentDetailService.java b/src/main/java/com/jevon/service/StudentDetailService.java index 0da0957..c6edcdb 100644 --- a/src/main/java/com/jevon/service/StudentDetailService.java +++ b/src/main/java/com/jevon/service/StudentDetailService.java @@ -17,6 +17,10 @@ public interface StudentDetailService { 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); diff --git a/src/main/java/com/jevon/service/StudentService.java b/src/main/java/com/jevon/service/StudentService.java index 3f040e3..5ede864 100644 --- a/src/main/java/com/jevon/service/StudentService.java +++ b/src/main/java/com/jevon/service/StudentService.java @@ -13,6 +13,8 @@ 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); @@ -25,6 +27,8 @@ public interface StudentService { 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); diff --git a/src/main/java/com/jevon/service/impl/AnalyseDetailServiceImpl.java b/src/main/java/com/jevon/service/impl/AnalyseDetailServiceImpl.java index c217682..b541052 100644 --- a/src/main/java/com/jevon/service/impl/AnalyseDetailServiceImpl.java +++ b/src/main/java/com/jevon/service/impl/AnalyseDetailServiceImpl.java @@ -71,4 +71,20 @@ public class AnalyseDetailServiceImpl implements AnalyseDetailService { 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/src/main/java/com/jevon/service/impl/StudentDetailServiceImpl.java b/src/main/java/com/jevon/service/impl/StudentDetailServiceImpl.java index 82cc432..ff176dd 100644 --- a/src/main/java/com/jevon/service/impl/StudentDetailServiceImpl.java +++ b/src/main/java/com/jevon/service/impl/StudentDetailServiceImpl.java @@ -60,6 +60,26 @@ public class StudentDetailServiceImpl implements StudentDetailService { } @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); diff --git a/src/main/java/com/jevon/service/impl/StudentServiceImpl.java b/src/main/java/com/jevon/service/impl/StudentServiceImpl.java index 518ba4f..2cd95c1 100644 --- a/src/main/java/com/jevon/service/impl/StudentServiceImpl.java +++ b/src/main/java/com/jevon/service/impl/StudentServiceImpl.java @@ -39,6 +39,15 @@ public class StudentServiceImpl implements StudentService { } @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); @@ -91,6 +100,15 @@ public class StudentServiceImpl implements StudentService { } @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); diff --git a/src/main/java/com/jevon/utils/HttpClientUtils.java b/src/main/java/com/jevon/utils/HttpClientUtils.java index 57ef47a..9a850db 100644 --- a/src/main/java/com/jevon/utils/HttpClientUtils.java +++ b/src/main/java/com/jevon/utils/HttpClientUtils.java @@ -13,6 +13,10 @@ 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.MalformedURLException; +import java.net.URL; /** * HttpClient4.3工具类 @@ -142,4 +146,20 @@ public class HttpClientUtils { 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/src/main/java/com/jevon/vo/req/StudentReqVo.java b/src/main/java/com/jevon/vo/req/StudentReqVo.java new file mode 100644 index 0000000..316d0af --- /dev/null +++ b/src/main/java/com/jevon/vo/req/StudentReqVo.java @@ -0,0 +1,37 @@ +package com.jevon.vo.req; + +/** + * @author chen + * @version 1.0 + * @date 2019/11/1 0001 10:46 + */ +public class StudentReqVo { + + private int analyseId ; + private String schoolName ; + private String studentNumber ; + + 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; + } + + public String getStudentNumber() { + return studentNumber; + } + + public void setStudentNumber(String studentNumber) { + this.studentNumber = studentNumber; + } +} diff --git a/src/main/java/com/jevon/vo/school/Form1.java b/src/main/java/com/jevon/vo/school/Form1.java new file mode 100644 index 0000000..a7faa50 --- /dev/null +++ b/src/main/java/com/jevon/vo/school/Form1.java @@ -0,0 +1,44 @@ +package com.jevon.vo.school; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 15:37 + */ +@ApiModel +public class Form1 { + + @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/src/main/java/com/jevon/vo/school/Form1RepVO.java b/src/main/java/com/jevon/vo/school/Form1RepVO.java new file mode 100644 index 0000000..3734b1b --- /dev/null +++ b/src/main/java/com/jevon/vo/school/Form1RepVO.java @@ -0,0 +1,37 @@ +package com.jevon.vo.school; + +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 { + + @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/src/main/java/com/jevon/vo/school/Form2.java b/src/main/java/com/jevon/vo/school/Form2.java new file mode 100644 index 0000000..4b422f3 --- /dev/null +++ b/src/main/java/com/jevon/vo/school/Form2.java @@ -0,0 +1,84 @@ +package com.jevon.vo.school; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/18 0018 16:10 + */ +@ApiModel +public class Form2 { + + @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/src/main/java/com/jevon/vo/school/Form2RepVO.java b/src/main/java/com/jevon/vo/school/Form2RepVO.java new file mode 100644 index 0000000..8948ccf --- /dev/null +++ b/src/main/java/com/jevon/vo/school/Form2RepVO.java @@ -0,0 +1,26 @@ +package com.jevon.vo.school; + +import com.jevon.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/src/main/java/com/jevon/vo/school/Form3.java b/src/main/java/com/jevon/vo/school/Form3.java new file mode 100644 index 0000000..459833d --- /dev/null +++ b/src/main/java/com/jevon/vo/school/Form3.java @@ -0,0 +1,94 @@ +package com.jevon.vo.school; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/21 0021 9:03 + */ +@ApiModel +public class Form3 { + + @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/src/main/java/com/jevon/vo/school/Form3RepVO.java b/src/main/java/com/jevon/vo/school/Form3RepVO.java new file mode 100644 index 0000000..68b56f7 --- /dev/null +++ b/src/main/java/com/jevon/vo/school/Form3RepVO.java @@ -0,0 +1,23 @@ +package com.jevon.vo.school; + +import com.jevon.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/src/main/java/com/jevon/vo/school/Form4.java b/src/main/java/com/jevon/vo/school/Form4.java new file mode 100644 index 0000000..02aa330 --- /dev/null +++ b/src/main/java/com/jevon/vo/school/Form4.java @@ -0,0 +1,64 @@ +package com.jevon.vo.school; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/21 0021 9:51 + */ +@ApiModel +public class Form4 { + + @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/src/main/java/com/jevon/vo/school/Form4RepVO.java b/src/main/java/com/jevon/vo/school/Form4RepVO.java new file mode 100644 index 0000000..0fe13c4 --- /dev/null +++ b/src/main/java/com/jevon/vo/school/Form4RepVO.java @@ -0,0 +1,25 @@ +package com.jevon.vo.school; + +import com.jevon.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/src/main/java/com/jevon/vo/school/Form5.java b/src/main/java/com/jevon/vo/school/Form5.java new file mode 100644 index 0000000..211ed6d --- /dev/null +++ b/src/main/java/com/jevon/vo/school/Form5.java @@ -0,0 +1,134 @@ +package com.jevon.vo.school; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/21 0021 9:59 + */ +@ApiModel +public class Form5 { + @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/src/main/java/com/jevon/vo/school/Form5RepVO.java b/src/main/java/com/jevon/vo/school/Form5RepVO.java new file mode 100644 index 0000000..9ad6791 --- /dev/null +++ b/src/main/java/com/jevon/vo/school/Form5RepVO.java @@ -0,0 +1,25 @@ +package com.jevon.vo.school; + +import com.jevon.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/src/main/java/com/jevon/vo/school/Form6.java b/src/main/java/com/jevon/vo/school/Form6.java new file mode 100644 index 0000000..cec448b --- /dev/null +++ b/src/main/java/com/jevon/vo/school/Form6.java @@ -0,0 +1,135 @@ +package com.jevon.vo.school; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/21 0021 11:25 + */ +@ApiModel +public class Form6 { + @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/src/main/java/com/jevon/vo/school/Form6RepVO.java b/src/main/java/com/jevon/vo/school/Form6RepVO.java new file mode 100644 index 0000000..a6cacc4 --- /dev/null +++ b/src/main/java/com/jevon/vo/school/Form6RepVO.java @@ -0,0 +1,25 @@ +package com.jevon.vo.school; + +import com.jevon.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/src/main/java/com/jevon/vo/school/Form7.java b/src/main/java/com/jevon/vo/school/Form7.java new file mode 100644 index 0000000..596b3f3 --- /dev/null +++ b/src/main/java/com/jevon/vo/school/Form7.java @@ -0,0 +1,44 @@ +package com.jevon.vo.school; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/21 0021 14:58 + */ +@ApiModel +public class Form7 { + + @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/src/main/java/com/jevon/vo/school/Form7RepVO.java b/src/main/java/com/jevon/vo/school/Form7RepVO.java new file mode 100644 index 0000000..cf7b1bf --- /dev/null +++ b/src/main/java/com/jevon/vo/school/Form7RepVO.java @@ -0,0 +1,87 @@ +package com.jevon.vo.school; + +import com.jevon.model.Chapter; +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 { + + @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/src/main/java/com/jevon/vo/school/Form8.java b/src/main/java/com/jevon/vo/school/Form8.java new file mode 100644 index 0000000..162aafb --- /dev/null +++ b/src/main/java/com/jevon/vo/school/Form8.java @@ -0,0 +1,64 @@ +package com.jevon.vo.school; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/21 0021 15:14 + */ +@ApiModel +public class Form8 { + + @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/src/main/java/com/jevon/vo/school/Form8RepVO.java b/src/main/java/com/jevon/vo/school/Form8RepVO.java new file mode 100644 index 0000000..8fbeef5 --- /dev/null +++ b/src/main/java/com/jevon/vo/school/Form8RepVO.java @@ -0,0 +1,25 @@ +package com.jevon.vo.school; + +import com.jevon.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/src/main/java/com/jevon/vo/school/Table1.java b/src/main/java/com/jevon/vo/school/Table1.java new file mode 100644 index 0000000..b8b3173 --- /dev/null +++ b/src/main/java/com/jevon/vo/school/Table1.java @@ -0,0 +1,33 @@ +package com.jevon.vo.school; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @author chen + * @version 1.0 + * @date 2019/10/21 0021 8:34 + */ +@ApiModel +public class Table1 { + @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/src/main/java/com/jevon/vo/student/Form1.java b/src/main/java/com/jevon/vo/student/Form1.java new file mode 100644 index 0000000..4e8af91 --- /dev/null +++ b/src/main/java/com/jevon/vo/student/Form1.java @@ -0,0 +1,74 @@ +package com.jevon.vo.student; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @author chen + * @version 1.0 + * @date 2019/11/1 0001 11:08 + */ +@ApiModel +public class Form1 { + + @ApiModelProperty(value = "班级名称") + private String className ; + @ApiModelProperty(value = "最高分") + private Double maxScore ; + @ApiModelProperty(value = "自己得分") + private Double score ; + @ApiModelProperty(value = "打败了多少学生") + private Double rank ; + @ApiModelProperty(value = "学校排名") + private int schoolRank ; + @ApiModelProperty(value = "班级排名") + private int classRank ; + + public String getClassName() { + return className; + } + + public void setClassName(String className) { + this.className = className; + } + + public Double getMaxScore() { + return maxScore; + } + + public void setMaxScore(Double maxScore) { + this.maxScore = maxScore; + } + + public Double getScore() { + return score; + } + + public void setScore(Double score) { + this.score = score; + } + + public Double getRank() { + return rank; + } + + public void setRank(Double rank) { + this.rank = rank; + } + + public int getSchoolRank() { + return schoolRank; + } + + public void setSchoolRank(int schoolRank) { + this.schoolRank = schoolRank; + } + + public int getClassRank() { + return classRank; + } + + public void setClassRank(int classRank) { + this.classRank = classRank; + } +} diff --git a/src/main/java/com/jevon/vo/student/Form2.java b/src/main/java/com/jevon/vo/student/Form2.java new file mode 100644 index 0000000..98de393 --- /dev/null +++ b/src/main/java/com/jevon/vo/student/Form2.java @@ -0,0 +1,37 @@ +package com.jevon.vo.student; + +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/11/1 0001 11:34 + */ +@ApiModel +public class Form2 { + + @ApiModelProperty(value = "不同题型得分，list中第一个为满分，第二个为最高分 第三个为自己得分") + private Map> typeMap ; + @ApiModelProperty(value = "不同难度得分，list中第一个为满分，第二个为最高分 第三个为自己得分") + private Map> difficultMap ; + + public Map> getTypeMap() { + return typeMap; + } + + public void setTypeMap(Map> typeMap) { + this.typeMap = typeMap; + } + + public Map> getDifficultMap() { + return difficultMap; + } + + public void setDifficultMap(Map> difficultMap) { + this.difficultMap = difficultMap; + } +} diff --git a/src/main/java/com/jevon/vo/student/Form3.java b/src/main/java/com/jevon/vo/student/Form3.java new file mode 100644 index 0000000..717ea9c --- /dev/null +++ b/src/main/java/com/jevon/vo/student/Form3.java @@ -0,0 +1,36 @@ +package com.jevon.vo.student; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.util.List; + +/** + * @author chen + * @version 1.0 + * @date 2019/11/1 0001 13:37 + */ +@ApiModel +public class Form3 { + + @ApiModelProperty(value = "掌握较好") + private List goodList ; + @ApiModelProperty(value = "待改进") + private List badList ; + + public List getGoodList() { + return goodList; + } + + public void setGoodList(List goodList) { + this.goodList = goodList; + } + + public List getBadList() { + return badList; + } + + public void setBadList(List badList) { + this.badList = badList; + } +} diff --git a/src/main/java/com/jevon/wordDTO/Form1.java b/src/main/java/com/jevon/wordDTO/Form1.java deleted file mode 100644 index 17270ae..0000000 --- a/src/main/java/com/jevon/wordDTO/Form1.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.jevon.wordDTO; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/18 0018 15:37 - */ -@ApiModel -public class Form1 { - - @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/src/main/java/com/jevon/wordDTO/Form1RepVO.java b/src/main/java/com/jevon/wordDTO/Form1RepVO.java deleted file mode 100644 index 85cd571..0000000 --- a/src/main/java/com/jevon/wordDTO/Form1RepVO.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.jevon.wordDTO; - -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 { - - @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/src/main/java/com/jevon/wordDTO/Form2.java b/src/main/java/com/jevon/wordDTO/Form2.java deleted file mode 100644 index ba020e7..0000000 --- a/src/main/java/com/jevon/wordDTO/Form2.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.jevon.wordDTO; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/18 0018 16:10 - */ -@ApiModel -public class Form2 { - - @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/src/main/java/com/jevon/wordDTO/Form2RepVO.java b/src/main/java/com/jevon/wordDTO/Form2RepVO.java deleted file mode 100644 index 43991f1..0000000 --- a/src/main/java/com/jevon/wordDTO/Form2RepVO.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.jevon.wordDTO; - -import com.jevon.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/src/main/java/com/jevon/wordDTO/Form3.java b/src/main/java/com/jevon/wordDTO/Form3.java deleted file mode 100644 index 54e8d78..0000000 --- a/src/main/java/com/jevon/wordDTO/Form3.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.jevon.wordDTO; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/21 0021 9:03 - */ -@ApiModel -public class Form3 { - - @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/src/main/java/com/jevon/wordDTO/Form3RepVO.java b/src/main/java/com/jevon/wordDTO/Form3RepVO.java deleted file mode 100644 index 8041fa0..0000000 --- a/src/main/java/com/jevon/wordDTO/Form3RepVO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.jevon.wordDTO; - -import com.jevon.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/src/main/java/com/jevon/wordDTO/Form4.java b/src/main/java/com/jevon/wordDTO/Form4.java deleted file mode 100644 index 648e8f9..0000000 --- a/src/main/java/com/jevon/wordDTO/Form4.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.jevon.wordDTO; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/21 0021 9:51 - */ -@ApiModel -public class Form4 { - - @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/src/main/java/com/jevon/wordDTO/Form4RepVO.java b/src/main/java/com/jevon/wordDTO/Form4RepVO.java deleted file mode 100644 index e518759..0000000 --- a/src/main/java/com/jevon/wordDTO/Form4RepVO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.jevon.wordDTO; - -import com.jevon.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/src/main/java/com/jevon/wordDTO/Form5.java b/src/main/java/com/jevon/wordDTO/Form5.java deleted file mode 100644 index 7fec740..0000000 --- a/src/main/java/com/jevon/wordDTO/Form5.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.jevon.wordDTO; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/21 0021 9:59 - */ -@ApiModel -public class Form5 { - @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/src/main/java/com/jevon/wordDTO/Form5RepVO.java b/src/main/java/com/jevon/wordDTO/Form5RepVO.java deleted file mode 100644 index 558e289..0000000 --- a/src/main/java/com/jevon/wordDTO/Form5RepVO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.jevon.wordDTO; - -import com.jevon.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/src/main/java/com/jevon/wordDTO/Form6.java b/src/main/java/com/jevon/wordDTO/Form6.java deleted file mode 100644 index ce15030..0000000 --- a/src/main/java/com/jevon/wordDTO/Form6.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.jevon.wordDTO; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/21 0021 11:25 - */ -@ApiModel -public class Form6 { - @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/src/main/java/com/jevon/wordDTO/Form6RepVO.java b/src/main/java/com/jevon/wordDTO/Form6RepVO.java deleted file mode 100644 index e745428..0000000 --- a/src/main/java/com/jevon/wordDTO/Form6RepVO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.jevon.wordDTO; - -import com.jevon.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/src/main/java/com/jevon/wordDTO/Form7.java b/src/main/java/com/jevon/wordDTO/Form7.java deleted file mode 100644 index 7bd6ff6..0000000 --- a/src/main/java/com/jevon/wordDTO/Form7.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.jevon.wordDTO; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/21 0021 14:58 - */ -@ApiModel -public class Form7 { - - @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/src/main/java/com/jevon/wordDTO/Form7RepVO.java b/src/main/java/com/jevon/wordDTO/Form7RepVO.java deleted file mode 100644 index 2e8a3c5..0000000 --- a/src/main/java/com/jevon/wordDTO/Form7RepVO.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.jevon.wordDTO; - -import com.jevon.model.Chapter; -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 { - - @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/src/main/java/com/jevon/wordDTO/Form8.java b/src/main/java/com/jevon/wordDTO/Form8.java deleted file mode 100644 index 1323779..0000000 --- a/src/main/java/com/jevon/wordDTO/Form8.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.jevon.wordDTO; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/21 0021 15:14 - */ -@ApiModel -public class Form8 { - - @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/src/main/java/com/jevon/wordDTO/Form8RepVO.java b/src/main/java/com/jevon/wordDTO/Form8RepVO.java deleted file mode 100644 index 3e23bd6..0000000 --- a/src/main/java/com/jevon/wordDTO/Form8RepVO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.jevon.wordDTO; - -import com.jevon.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/src/main/java/com/jevon/wordDTO/Table1.java b/src/main/java/com/jevon/wordDTO/Table1.java deleted file mode 100644 index 7767d0a..0000000 --- a/src/main/java/com/jevon/wordDTO/Table1.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.jevon.wordDTO; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * @author chen - * @version 1.0 - * @date 2019/10/21 0021 8:34 - */ -@ApiModel -public class Table1 { - @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/src/main/resources/mapping/AnalyseDetailMapper.xml b/src/main/resources/mapping/AnalyseDetailMapper.xml index ef962ec..f17dbb3 100644 --- a/src/main/resources/mapping/AnalyseDetailMapper.xml +++ b/src/main/resources/mapping/AnalyseDetailMapper.xml @@ -27,6 +27,10 @@ select sum(score) from sz_learn_analyse_detail where analyse_id = #{analyseId} and difficult =#{difficult} + + @@ -38,4 +42,8 @@ + + \ No newline at end of file diff --git a/src/main/resources/mapping/StudentDetailMapper.xml b/src/main/resources/mapping/StudentDetailMapper.xml index ba32442..629a1d6 100644 --- a/src/main/resources/mapping/StudentDetailMapper.xml +++ b/src/main/resources/mapping/StudentDetailMapper.xml @@ -34,6 +34,12 @@ and school_name = #{schoolName} + + and class_name = #{className} + + + and student_number =#{studentNumber} + and exam_number = #{examNumber} diff --git a/src/main/resources/mapping/StudentMapper.xml b/src/main/resources/mapping/StudentMapper.xml index ba41521..4ad53fd 100644 --- a/src/main/resources/mapping/StudentMapper.xml +++ b/src/main/resources/mapping/StudentMapper.xml @@ -23,6 +23,11 @@ + +