WinTeachTeam
/
IESExtension
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 五育数据整合

Browse Source
develop
hhb@hotmail.com 2 weeks ago
parent 192c05460e
commit 527f6ecd69
8 changed files with 89 additions and 55 deletions
Show Stats Download Patch File Download Diff File

3
src/main/java/cn/teammodel/controller/admin/controller/FiveEducationController.java
Unescape View File

@ -7,6 +7,7 @@ import cn.teammodel.model.dto.admin.common.FiveDto;
import cn.teammodel.model.dto.admin.exam.OverViewDto; import cn.teammodel.model.dto.admin.exam.OverViewDto;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -22,7 +23,7 @@ import java.util.Map;
public class FiveEducationController { public class FiveEducationController {
@Resource @Resource
private FiveEducationService fiveEducationService; private FiveEducationService fiveEducationService;
@RequestMapping("getAnalysis") @PostMapping("getAnalysis")
@ApiOperation("获取五育看板详细内容") @ApiOperation("获取五育看板详细内容")
public R<Map<String, Object>> getAnalysis(@Valid @RequestBody FiveDto fiveDto, HttpServletRequest request) { public R<Map<String, Object>> getAnalysis(@Valid @RequestBody FiveDto fiveDto, HttpServletRequest request) {
Map<String, Object> res = fiveEducationService.getAnalysis(fiveDto,request); Map<String, Object> res = fiveEducationService.getAnalysis(fiveDto,request);

9
src/main/java/cn/teammodel/controller/admin/controller/LaborEducationController.java
Unescape View File

@ -3,6 +3,7 @@ package cn.teammodel.controller.admin.controller;
import cn.teammodel.common.R; import cn.teammodel.common.R;
import cn.teammodel.controller.admin.service.ExamService; import cn.teammodel.controller.admin.service.ExamService;
import cn.teammodel.controller.admin.service.LaborEducationService; import cn.teammodel.controller.admin.service.LaborEducationService;
import cn.teammodel.model.dto.admin.Moral.MoralDto;
import cn.teammodel.model.dto.admin.exam.OverViewDto; import cn.teammodel.model.dto.admin.exam.OverViewDto;
import cn.teammodel.model.dto.admin.labor.FindDto; import cn.teammodel.model.dto.admin.labor.FindDto;
import cn.teammodel.model.dto.admin.labor.LaborDto; import cn.teammodel.model.dto.admin.labor.LaborDto;
@ -27,7 +28,7 @@ public class LaborEducationController {
private LaborEducationService laborEducationService; private LaborEducationService laborEducationService;
@PostMapping("getLaborAnalysis") @PostMapping("getLaborAnalysis")
@ApiOperation("获取德育看板详细内容") @ApiOperation("获取德育看板详细内容")
public R<Map<String, Object>> getLaborAnalysis(@Valid @RequestBody LaborDto laborDto, HttpServletRequest request) { public R<Map<String, Object>> getLaborAnalysis(@Valid @RequestBody MoralDto laborDto, HttpServletRequest request) {
Map<String, Object> res = laborEducationService.getAnalysis(laborDto,request); Map<String, Object> res = laborEducationService.getAnalysis(laborDto,request);
return R.success(res); return R.success(res);
} }
@ -39,20 +40,20 @@ public class LaborEducationController {
} }
@PostMapping("getStudentSemesterScores") @PostMapping("getStudentSemesterScores")
@ApiOperation("分学期比对分析") @ApiOperation("分学期比对分析")
public R<Map<String, Object>> getStudentSemesterScores(@Valid @RequestBody LaborDto laborDto, HttpServletRequest request) { public R<Map<String, Object>> getStudentSemesterScores(@Valid @RequestBody MoralDto laborDto, HttpServletRequest request) {
Map<String, Object> res = laborEducationService.getStudentSemesterScores(laborDto,request); Map<String, Object> res = laborEducationService.getStudentSemesterScores(laborDto,request);
return R.success(res); return R.success(res);
} }
@PostMapping("getStudentMonthlyScores") @PostMapping("getStudentMonthlyScores")
@ApiOperation("按月比对分析") @ApiOperation("按月比对分析")
public R<Map<String,List<Map<String, Object>>>> getStudentMonthlyScores(@Valid @RequestBody LaborDto laborDto, HttpServletRequest request) { public R<Map<String,List<Map<String, Object>>>> getStudentMonthlyScores(@Valid @RequestBody MoralDto laborDto, HttpServletRequest request) {
Map<String,List<Map<String, Object>>> res = laborEducationService.getStudentMonthlyScores(laborDto,request); Map<String,List<Map<String, Object>>> res = laborEducationService.getStudentMonthlyScores(laborDto,request);
return R.success(res); return R.success(res);
} }
@PostMapping("getExamDetails") @PostMapping("getExamDetails")
@ApiOperation("获取指定考试数据") @ApiOperation("获取指定考试数据")
public R<Map<String, Object>> getExamDetails(@Valid @RequestBody LaborDto laborDto, HttpServletRequest request) { public R<Map<String, Object>> getExamDetails(@Valid @RequestBody MoralDto laborDto, HttpServletRequest request) {
Map<String, Object> res = laborEducationService.getExamDetails(laborDto,request); Map<String, Object> res = laborEducationService.getExamDetails(laborDto,request);
return R.success(res); return R.success(res);
} }

8
src/main/java/cn/teammodel/controller/admin/controller/MoralEducationController.java
Unescape View File

@ -26,7 +26,7 @@ public class MoralEducationController {
private MoralEducationService moralEducationService; private MoralEducationService moralEducationService;
@PostMapping("getMoralAnalysis") @PostMapping("getMoralAnalysis")
@ApiOperation("获取劳育看板详细内容") @ApiOperation("获取劳育看板详细内容")
public R<Map<String, Object>> getMoralAnalysis(@Valid @RequestBody MoralDto moralDto, HttpServletRequest request) { public R<Map<String, Object>> getMoralAnalysis(@Valid @RequestBody LaborDto moralDto, HttpServletRequest request) {
Map<String, Object> res = moralEducationService.getAnalysis(moralDto,request); Map<String, Object> res = moralEducationService.getAnalysis(moralDto,request);
return R.success(res); return R.success(res);
} }
@ -38,21 +38,21 @@ public class MoralEducationController {
} }
@PostMapping("getStudentSemesterScores") @PostMapping("getStudentSemesterScores")
@ApiOperation("分学期比对分析") @ApiOperation("分学期比对分析")
public R<Map<String, Object>> getStudentSemesterScores(@Valid @RequestBody MoralDto moralDto, HttpServletRequest request) { public R<Map<String, Object>> getStudentSemesterScores(@Valid @RequestBody LaborDto moralDto, HttpServletRequest request) {
Map<String, Object> res = moralEducationService.getStudentSemesterScores(moralDto,request); Map<String, Object> res = moralEducationService.getStudentSemesterScores(moralDto,request);
return R.success(res); return R.success(res);
} }
@PostMapping("getStudentMonthlyScores") @PostMapping("getStudentMonthlyScores")
@ApiOperation("按月比对分析") @ApiOperation("按月比对分析")
public R<Map<String,List<Map<String, Object>>>> getStudentMonthlyScores(@Valid @RequestBody MoralDto moralDto, HttpServletRequest request) { public R<Map<String,List<Map<String, Object>>>> getStudentMonthlyScores(@Valid @RequestBody LaborDto moralDto, HttpServletRequest request) {
Map<String,List<Map<String, Object>>> res = moralEducationService.getStudentMonthlyScores(moralDto,request); Map<String,List<Map<String, Object>>> res = moralEducationService.getStudentMonthlyScores(moralDto,request);
return R.success(res); return R.success(res);
} }
@PostMapping("getExamDetails") @PostMapping("getExamDetails")
@ApiOperation("获取指定考试数据") @ApiOperation("获取指定考试数据")
public R<Map<String, Object>> getExamDetails(@Valid @RequestBody MoralDto moralDto, HttpServletRequest request) { public R<Map<String, Object>> getExamDetails(@Valid @RequestBody LaborDto moralDto, HttpServletRequest request) {
Map<String, Object> res = moralEducationService.getExamDetails(moralDto,request); Map<String, Object> res = moralEducationService.getExamDetails(moralDto,request);
return R.success(res); return R.success(res);
} }

9
src/main/java/cn/teammodel/controller/admin/service/LaborEducationService.java
Unescape View File

@ -1,5 +1,6 @@
package cn.teammodel.controller.admin.service; package cn.teammodel.controller.admin.service;
import cn.teammodel.model.dto.admin.Moral.MoralDto;
import cn.teammodel.model.dto.admin.exam.OverViewDto; import cn.teammodel.model.dto.admin.exam.OverViewDto;
import cn.teammodel.model.dto.admin.labor.FindDto; import cn.teammodel.model.dto.admin.labor.FindDto;
import cn.teammodel.model.dto.admin.labor.LaborDto; import cn.teammodel.model.dto.admin.labor.LaborDto;
@ -10,9 +11,9 @@ import java.util.List;
import java.util.Map; import java.util.Map;
public interface LaborEducationService { public interface LaborEducationService {
Map<String,Object> getAnalysis(LaborDto laborDto, HttpServletRequest request); Map<String,Object> getAnalysis(MoralDto laborDto, HttpServletRequest request);
Map<String,Object> getDetails(FindDto findDto, HttpServletRequest request); Map<String,Object> getDetails(FindDto findDto, HttpServletRequest request);
Map<String,Object> getStudentSemesterScores(LaborDto laborDto, HttpServletRequest request); Map<String,Object> getStudentSemesterScores(MoralDto laborDto, HttpServletRequest request);
Map<String,List<Map<String, Object>>> getStudentMonthlyScores(LaborDto laborDto,HttpServletRequest request); Map<String,List<Map<String, Object>>> getStudentMonthlyScores(MoralDto laborDto,HttpServletRequest request);
Map<String,Object> getExamDetails(LaborDto laborDto,HttpServletRequest request); Map<String,Object> getExamDetails(MoralDto laborDto,HttpServletRequest request);
} }

9
src/main/java/cn/teammodel/controller/admin/service/MoralEducationService.java
Unescape View File

@ -2,15 +2,16 @@ package cn.teammodel.controller.admin.service;
import cn.teammodel.model.dto.admin.Moral.MoralDto; import cn.teammodel.model.dto.admin.Moral.MoralDto;
import cn.teammodel.model.dto.admin.labor.FindDto; import cn.teammodel.model.dto.admin.labor.FindDto;
import cn.teammodel.model.dto.admin.labor.LaborDto;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
public interface MoralEducationService { public interface MoralEducationService {
Map<String,Object> getAnalysis(MoralDto moralDto, HttpServletRequest request); Map<String,Object> getAnalysis(LaborDto moralDto, HttpServletRequest request);
Map<String,Object> getDetails(FindDto findDto, HttpServletRequest request); Map<String,Object> getDetails(FindDto findDto, HttpServletRequest request);
Map<String,Object> getStudentSemesterScores(MoralDto moralDto, HttpServletRequest request); Map<String,Object> getStudentSemesterScores(LaborDto moralDto, HttpServletRequest request);
Map<String,List<Map<String, Object>>> getStudentMonthlyScores(MoralDto moralDto,HttpServletRequest request); Map<String,List<Map<String, Object>>> getStudentMonthlyScores(LaborDto moralDto,HttpServletRequest request);
Map<String,Object> getExamDetails(MoralDto moralDto,HttpServletRequest request); Map<String,Object> getExamDetails(LaborDto moralDto,HttpServletRequest request);
} }

8
src/main/java/cn/teammodel/controller/admin/service/impl/FiveEducationServiceImpl.java
Unescape View File

@ -48,16 +48,16 @@ public class FiveEducationServiceImpl implements FiveEducationService {
}*/ }*/
// 3. 德育分析（异步执行） // 3. 德育分析（异步执行）
if (dto.getLaborDto() != null) { if (dto.getMoralDto() != null) {
futures.add(CompletableFuture.runAsync(() -> { futures.add(CompletableFuture.runAsync(() -> {
integratedResult.put("moralAnalysis", laborEducationService.getAnalysis(dto.getLaborDto(), request)); integratedResult.put("moralAnalysis", laborEducationService.getAnalysis(dto.getMoralDto(), request));
}, executor)); }, executor));
} }
// 4. 劳育分析（异步执行） // 4. 劳育分析（异步执行）
if (dto.getMoralDto() != null) { if (dto.getLaborDto() != null) {
futures.add(CompletableFuture.runAsync(() -> { futures.add(CompletableFuture.runAsync(() -> {
integratedResult.put("laborAnalysis", moralLaborService.getAnalysis(dto.getMoralDto(), request)); integratedResult.put("laborAnalysis", moralLaborService.getAnalysis(dto.getLaborDto(), request));
}, executor)); }, executor));
} }

49
src/main/java/cn/teammodel/controller/admin/service/impl/LaborEducationServiceImpl.java
Unescape View File

@ -5,12 +5,12 @@ import cn.teammodel.common.PK;
import cn.teammodel.config.exception.ServiceException; import cn.teammodel.config.exception.ServiceException;
import cn.teammodel.controller.admin.service.CommonService; import cn.teammodel.controller.admin.service.CommonService;
import cn.teammodel.controller.admin.service.LaborEducationService; import cn.teammodel.controller.admin.service.LaborEducationService;
import cn.teammodel.model.dto.admin.Moral.MoralDto;
import cn.teammodel.model.dto.admin.common.GCDto; import cn.teammodel.model.dto.admin.common.GCDto;
import cn.teammodel.model.dto.admin.common.GroupDto; import cn.teammodel.model.dto.admin.common.GroupDto;
import cn.teammodel.model.dto.admin.common.RGroupList; import cn.teammodel.model.dto.admin.common.RGroupList;
import cn.teammodel.model.dto.admin.common.RMember; import cn.teammodel.model.dto.admin.common.RMember;
import cn.teammodel.model.dto.admin.labor.FindDto; import cn.teammodel.model.dto.admin.labor.FindDto;
import cn.teammodel.model.dto.admin.labor.LaborDto;
import cn.teammodel.model.entity.appraise.Appraise; import cn.teammodel.model.entity.appraise.Appraise;
import cn.teammodel.model.entity.appraise.AppraiseTreeNode; import cn.teammodel.model.entity.appraise.AppraiseTreeNode;
import cn.teammodel.model.entity.common.Exam; import cn.teammodel.model.entity.common.Exam;
@ -82,7 +82,7 @@ public class LaborEducationServiceImpl implements LaborEducationService {
LaborEducationServiceImpl.environment = env; // 在初始化时将非静态字段赋值给静态字段 LaborEducationServiceImpl.environment = env; // 在初始化时将非静态字段赋值给静态字段
} }
@Override @Override
public Map<String, Object> getAnalysis(LaborDto laborDto, HttpServletRequest request) { public Map<String, Object> getAnalysis(MoralDto laborDto, HttpServletRequest request) {
//根据具体参数查询相关课列内容 //根据具体参数查询相关课列内容
List<LessonRecord> records; List<LessonRecord> records;
@ -184,6 +184,7 @@ public class LaborEducationServiceImpl implements LaborEducationService {
} }
} }
} }
List<ExamClassResult> examResults = new ArrayList<>(); List<ExamClassResult> examResults = new ArrayList<>();
if (!examIds.isEmpty()) { if (!examIds.isEmpty()) {
examResults = examClassResultRepository.findAll(String.format(PK.CLASS_RESULT, laborDto.getCode()),examIds); examResults = examClassResultRepository.findAll(String.format(PK.CLASS_RESULT, laborDto.getCode()),examIds);
@ -242,7 +243,7 @@ public class LaborEducationServiceImpl implements LaborEducationService {
return resMap; return resMap;
} }
@Override @Override
public Map<String, Object> getExamDetails(LaborDto laborDto, HttpServletRequest request) { public Map<String, Object> getExamDetails(MoralDto laborDto, HttpServletRequest request) {
Map<String, Object> resMap = new HashMap<>(); Map<String, Object> resMap = new HashMap<>();
try { try {
List<ExamClassResult> examResults = new ArrayList<>(); List<ExamClassResult> examResults = new ArrayList<>();
@ -668,8 +669,8 @@ public class LaborEducationServiceImpl implements LaborEducationService {
double defaultScore = 60.0; double defaultScore = 60.0;
if (parentNode == null) { if (parentNode == null) {
// 若知识块无对应父节点，归入全局默认块 // 若知识块无对应父节点，归入全局默认块
parentNodeScoreRates.merge("默认块", defaultScore, Double::sum); //parentNodeScoreRates.merge("默认块", defaultScore, Double::sum);
parentNodeScoreCount.merge("默认块", 1, Integer::sum); //parentNodeScoreCount.merge("默认块", 1, Integer::sum);
} else { } else {
// 归入知识块对应的父节点 // 归入知识块对应的父节点
parentNodeScoreRates.merge(parentNode.getName(), defaultScore, Double::sum); parentNodeScoreRates.merge(parentNode.getName(), defaultScore, Double::sum);
@ -1502,7 +1503,7 @@ public class LaborEducationServiceImpl implements LaborEducationService {
//获取每月各个知识库综合得分以及整体得分内容 //获取每月各个知识库综合得分以及整体得分内容
public Map<String,List<Map<String, Object>>> getStudentMonthlyScores(LaborDto laborDto,HttpServletRequest request) { public Map<String,List<Map<String, Object>>> getStudentMonthlyScores(MoralDto laborDto,HttpServletRequest request) {
// 1. 获取基础信息 // 1. 获取基础信息
String schoolId = SecurityUtil.getLoginUser().getSchoolId(); String schoolId = SecurityUtil.getLoginUser().getSchoolId();
String studentId = laborDto.getStudentId(); String studentId = laborDto.getStudentId();
@ -1677,7 +1678,7 @@ public Map<String,List<Map<String, Object>>> getStudentMonthlyScores(LaborDto la
return result; return result;
} }
private List<LessonRecord> getLessonRecords(LaborDto laborDto, String schoolId) { private List<LessonRecord> getLessonRecords(MoralDto laborDto, String schoolId) {
LessonRecordQueryService queryService = new LessonRecordQueryService(lessonRecordRepository); LessonRecordQueryService queryService = new LessonRecordQueryService(lessonRecordRepository);
try { try {
return queryService.queryLessonsInParallel( return queryService.queryLessonsInParallel(
@ -1696,7 +1697,7 @@ public Map<String,List<Map<String, Object>>> getStudentMonthlyScores(LaborDto la
} }
} }
private List<ExamVo> getExamsWithKnowledge(LaborDto laborDto, List<LessonRecord> records, private List<ExamVo> getExamsWithKnowledge(MoralDto laborDto, List<LessonRecord> records,
Map<String, List<List<String>>> examKnowledgeMap, Map<String, List<List<String>>> examKnowledgeMap,
Map<String, List<Double>> points) { Map<String, List<Double>> points) {
if (records == null || records.isEmpty()) { if (records == null || records.isEmpty()) {
@ -1912,7 +1913,21 @@ public Map<String,List<Map<String, Object>>> getStudentMonthlyScores(LaborDto la
// 按知识块名称排序（可选） // 按知识块名称排序（可选）
scoreList.sort(Comparator.comparing(m -> (String) m.get("name"))); scoreList.sort(Comparator.comparing(m -> (String) m.get("name")));
//所有知识块score求平均
double totalScore = 0.0;
int count = 0;
for (Map<String, Object> scoreEntry : scoreList) {
if (scoreEntry.get("score") instanceof Double) {
totalScore += (Double) scoreEntry.get("score");
count++;
}
}
double averageScore = count > 0 ? totalScore / count : 0.0;
//保留两位小数
averageScore = Double.parseDouble(String.format("%.2f", averageScore));
monthEntry.put("averageScore", averageScore);
monthEntry.put("types", scoreList); monthEntry.put("types", scoreList);
return monthEntry; return monthEntry;
}).sorted(Comparator.comparingInt(m -> (Integer) m.get("month"))) }).sorted(Comparator.comparingInt(m -> (Integer) m.get("month")))
@ -2084,7 +2099,7 @@ public Map<String,List<Map<String, Object>>> getStudentMonthlyScores(LaborDto la
} }
// 分学期比对，分析 学期数据 // 分学期比对，分析 学期数据
public Map<String, Object> getStudentSemesterScores(LaborDto laborDto,HttpServletRequest request) { public Map<String, Object> getStudentSemesterScores(MoralDto laborDto,HttpServletRequest request) {
// 1. 获取学期配置 // 1. 获取学期配置
List<School.Semester> semesters = schoolRepository.findSemestersById(laborDto.getCode(), laborDto.getPeriodId()); List<School.Semester> semesters = schoolRepository.findSemestersById(laborDto.getCode(), laborDto.getPeriodId());
List<SemesterConfig> configs = new ArrayList<>(); List<SemesterConfig> configs = new ArrayList<>();
@ -2111,7 +2126,7 @@ public Map<String,List<Map<String, Object>>> getStudentMonthlyScores(LaborDto la
return combineAllResults(laborDto, studentResult, classResult); return combineAllResults(laborDto, studentResult, classResult);
} }
private Map<String, Object> combineAllResults(LaborDto dto, private Map<String, Object> combineAllResults(MoralDto dto,
Map<String, Object> studentResult, Map<String, Object> studentResult,
Map<String, Object> classResult) { Map<String, Object> classResult) {
Map<String, Object> finalResult = new LinkedHashMap<>(); Map<String, Object> finalResult = new LinkedHashMap<>();
@ -2127,7 +2142,7 @@ public Map<String,List<Map<String, Object>>> getStudentMonthlyScores(LaborDto la
return finalResult; return finalResult;
} }
private Map<String, Object> processIndividual(LaborDto dto, private Map<String, Object> processIndividual(MoralDto dto,
SemesterPeriod current, SemesterPeriod current,
SemesterPeriod last, SemesterPeriod last,
HttpServletRequest request) { HttpServletRequest request) {
@ -2137,12 +2152,12 @@ public Map<String,List<Map<String, Object>>> getStudentMonthlyScores(LaborDto la
return combineResults(dto, currentData, lastData); return combineResults(dto, currentData, lastData);
} }
private Map<String, Object> processClass(LaborDto dto, private Map<String, Object> processClass(MoralDto dto,
SemesterPeriod current, SemesterPeriod current,
SemesterPeriod last, SemesterPeriod last,
HttpServletRequest request) { HttpServletRequest request) {
// 克隆DTO并清除学生ID // 克隆DTO并清除学生ID
LaborDto classDto = new LaborDto(); MoralDto classDto = new MoralDto();
classDto.setCode(dto.getCode()); classDto.setCode(dto.getCode());
classDto.setPeriodId(dto.getPeriodId()); classDto.setPeriodId(dto.getPeriodId());
classDto.setClassId(dto.getClassId()); classDto.setClassId(dto.getClassId());
@ -2164,7 +2179,7 @@ public Map<String,List<Map<String, Object>>> getStudentMonthlyScores(LaborDto la
return combineClassResults(classDto, currentData, lastData); return combineClassResults(classDto, currentData, lastData);
} }
private Map<String, Object> combineClassResults(LaborDto dto, private Map<String, Object> combineClassResults(MoralDto dto,
Map<String, Object> current, Map<String, Object> current,
Map<String, Object> last) { Map<String, Object> last) {
Map<String, Object> result = new LinkedHashMap<>(); Map<String, Object> result = new LinkedHashMap<>();
@ -2177,7 +2192,7 @@ public Map<String,List<Map<String, Object>>> getStudentMonthlyScores(LaborDto la
return result; return result;
} }
private List<Map<String, Object>> buildClassScoreBlocks(LaborDto dto, private List<Map<String, Object>> buildClassScoreBlocks(MoralDto dto,
Map<String, Object> current, Map<String, Object> current,
Map<String, Object> last) { Map<String, Object> last) {
@ -2342,7 +2357,7 @@ public Map<String,List<Map<String, Object>>> getStudentMonthlyScores(LaborDto la
} }
// 处理学期数据 // 处理学期数据
private Map<String, Object> processSemesterData(LaborDto laborDto, private Map<String, Object> processSemesterData(MoralDto laborDto,
SemesterPeriod semester, SemesterPeriod semester,
HttpServletRequest request, HttpServletRequest request,
boolean isCurrent, boolean isCurrent,
@ -2443,7 +2458,7 @@ public Map<String,List<Map<String, Object>>> getStudentMonthlyScores(LaborDto la
} }
// 结果合并方法 // 结果合并方法
private Map<String, Object> combineResults(LaborDto laborDto, private Map<String, Object> combineResults(MoralDto laborDto,
Map<String, Object> currentData, Map<String, Object> currentData,
Map<String, Object> lastData) { Map<String, Object> lastData) {
Map<String, Object> result = new LinkedHashMap<>(); Map<String, Object> result = new LinkedHashMap<>();

49
src/main/java/cn/teammodel/controller/admin/service/impl/MoralEducationServiceImpl.java
Unescape View File

@ -5,7 +5,6 @@ import cn.teammodel.common.PK;
import cn.teammodel.config.exception.ServiceException; import cn.teammodel.config.exception.ServiceException;
import cn.teammodel.controller.admin.service.CommonService; import cn.teammodel.controller.admin.service.CommonService;
import cn.teammodel.controller.admin.service.MoralEducationService; import cn.teammodel.controller.admin.service.MoralEducationService;
import cn.teammodel.model.dto.admin.Moral.MoralDto;
import cn.teammodel.model.dto.admin.common.GCDto; import cn.teammodel.model.dto.admin.common.GCDto;
import cn.teammodel.model.dto.admin.common.GroupDto; import cn.teammodel.model.dto.admin.common.GroupDto;
import cn.teammodel.model.dto.admin.common.RGroupList; import cn.teammodel.model.dto.admin.common.RGroupList;
@ -83,7 +82,7 @@ public class MoralEducationServiceImpl implements MoralEducationService {
MoralEducationServiceImpl.environment = env; // 在初始化时将非静态字段赋值给静态字段 MoralEducationServiceImpl.environment = env; // 在初始化时将非静态字段赋值给静态字段
} }
@Override @Override
public Map<String, Object> getAnalysis(MoralDto moralDto, HttpServletRequest request) { public Map<String, Object> getAnalysis(LaborDto moralDto, HttpServletRequest request) {
//根据具体参数查询相关课列内容 //根据具体参数查询相关课列内容
List<LessonRecord> records; List<LessonRecord> records;
@ -243,7 +242,7 @@ public class MoralEducationServiceImpl implements MoralEducationService {
return resMap; return resMap;
} }
@Override @Override
public Map<String, Object> getExamDetails(MoralDto moralDto, HttpServletRequest request) { public Map<String, Object> getExamDetails(LaborDto moralDto, HttpServletRequest request) {
Map<String, Object> resMap = new HashMap<>(); Map<String, Object> resMap = new HashMap<>();
try { try {
List<ExamClassResult> examResults = new ArrayList<>(); List<ExamClassResult> examResults = new ArrayList<>();
@ -669,8 +668,8 @@ public class MoralEducationServiceImpl implements MoralEducationService {
double defaultScore = 60.0; double defaultScore = 60.0;
if (parentNode == null) { if (parentNode == null) {
// 若知识块无对应父节点，归入全局默认块 // 若知识块无对应父节点，归入全局默认块
parentNodeScoreRates.merge("默认块", defaultScore, Double::sum); //parentNodeScoreRates.merge("默认块", defaultScore, Double::sum);
parentNodeScoreCount.merge("默认块", 1, Integer::sum); //parentNodeScoreCount.merge("默认块", 1, Integer::sum);
} else { } else {
// 归入知识块对应的父节点 // 归入知识块对应的父节点
parentNodeScoreRates.merge(parentNode.getName(), defaultScore, Double::sum); parentNodeScoreRates.merge(parentNode.getName(), defaultScore, Double::sum);
@ -1503,7 +1502,7 @@ public class MoralEducationServiceImpl implements MoralEducationService {
//获取每月各个知识库综合得分以及整体得分内容 //获取每月各个知识库综合得分以及整体得分内容
public Map<String,List<Map<String, Object>>> getStudentMonthlyScores(MoralDto moralDto,HttpServletRequest request) { public Map<String,List<Map<String, Object>>> getStudentMonthlyScores(LaborDto moralDto,HttpServletRequest request) {
// 1. 获取基础信息 // 1. 获取基础信息
String schoolId = SecurityUtil.getLoginUser().getSchoolId(); String schoolId = SecurityUtil.getLoginUser().getSchoolId();
String studentId = moralDto.getStudentId(); String studentId = moralDto.getStudentId();
@ -1676,7 +1675,7 @@ public class MoralEducationServiceImpl implements MoralEducationService {
return result; return result;
} }
private List<LessonRecord> getLessonRecords(MoralDto moralDto, String schoolId) { private List<LessonRecord> getLessonRecords(LaborDto moralDto, String schoolId) {
LessonRecordQueryService queryService = new LessonRecordQueryService(lessonRecordRepository); LessonRecordQueryService queryService = new LessonRecordQueryService(lessonRecordRepository);
try { try {
return queryService.queryLessonsInParallel( return queryService.queryLessonsInParallel(
@ -1695,7 +1694,7 @@ public class MoralEducationServiceImpl implements MoralEducationService {
} }
} }
private List<ExamVo> getExamsWithKnowledge(MoralDto moralDto, List<LessonRecord> records, private List<ExamVo> getExamsWithKnowledge(LaborDto moralDto, List<LessonRecord> records,
Map<String, List<List<String>>> examKnowledgeMap, Map<String, List<List<String>>> examKnowledgeMap,
Map<String, List<Double>> points) { Map<String, List<Double>> points) {
if (records == null || records.isEmpty()) { if (records == null || records.isEmpty()) {
@ -1909,6 +1908,22 @@ public class MoralEducationServiceImpl implements MoralEducationService {
// 按知识块名称排序（可选） // 按知识块名称排序（可选）
scoreList.sort(Comparator.comparing(m -> (String) m.get("name"))); scoreList.sort(Comparator.comparing(m -> (String) m.get("name")));
//所有知识块score求平均
double totalScore = 0.0;
int count = 0;
for (Map<String, Object> scoreEntry : scoreList) {
if (scoreEntry.get("score") instanceof Double) {
totalScore += (Double) scoreEntry.get("score");
count++;
}
}
double averageScore = count > 0 ? totalScore / count : 0.0;
//保留两位小数
averageScore = Double.parseDouble(String.format("%.2f", averageScore));
monthEntry.put("averageScore", averageScore);
monthEntry.put("types", scoreList); monthEntry.put("types", scoreList);
return monthEntry; return monthEntry;
}).sorted(Comparator.comparingInt(m -> (Integer) m.get("month"))) }).sorted(Comparator.comparingInt(m -> (Integer) m.get("month")))
@ -2080,7 +2095,7 @@ public class MoralEducationServiceImpl implements MoralEducationService {
} }
// 分学期比对，分析 学期数据 // 分学期比对，分析 学期数据
public Map<String, Object> getStudentSemesterScores(MoralDto moralDto,HttpServletRequest request) { public Map<String, Object> getStudentSemesterScores(LaborDto moralDto,HttpServletRequest request) {
// 1. 获取学期配置 // 1. 获取学期配置
List<School.Semester> semesters = schoolRepository.findSemestersById(moralDto.getCode(), moralDto.getPeriodId()); List<School.Semester> semesters = schoolRepository.findSemestersById(moralDto.getCode(), moralDto.getPeriodId());
List<SemesterConfig> configs = new ArrayList<>(); List<SemesterConfig> configs = new ArrayList<>();
@ -2107,7 +2122,7 @@ public class MoralEducationServiceImpl implements MoralEducationService {
return combineAllResults(moralDto, studentResult, classResult); return combineAllResults(moralDto, studentResult, classResult);
} }
private Map<String, Object> combineAllResults(MoralDto dto, private Map<String, Object> combineAllResults(LaborDto dto,
Map<String, Object> studentResult, Map<String, Object> studentResult,
Map<String, Object> classResult) { Map<String, Object> classResult) {
Map<String, Object> finalResult = new LinkedHashMap<>(); Map<String, Object> finalResult = new LinkedHashMap<>();
@ -2123,7 +2138,7 @@ public class MoralEducationServiceImpl implements MoralEducationService {
return finalResult; return finalResult;
} }
private Map<String, Object> processIndividual(MoralDto dto, private Map<String, Object> processIndividual(LaborDto dto,
SemesterPeriod current, SemesterPeriod current,
SemesterPeriod last, SemesterPeriod last,
HttpServletRequest request) { HttpServletRequest request) {
@ -2133,12 +2148,12 @@ public class MoralEducationServiceImpl implements MoralEducationService {
return combineResults(dto, currentData, lastData); return combineResults(dto, currentData, lastData);
} }
private Map<String, Object> processClass(MoralDto dto, private Map<String, Object> processClass(LaborDto dto,
SemesterPeriod current, SemesterPeriod current,
SemesterPeriod last, SemesterPeriod last,
HttpServletRequest request) { HttpServletRequest request) {
// 克隆DTO并清除学生ID // 克隆DTO并清除学生ID
MoralDto classDto = new MoralDto(); LaborDto classDto = new LaborDto();
classDto.setCode(dto.getCode()); classDto.setCode(dto.getCode());
classDto.setPeriodId(dto.getPeriodId()); classDto.setPeriodId(dto.getPeriodId());
classDto.setClassId(dto.getClassId()); classDto.setClassId(dto.getClassId());
@ -2160,7 +2175,7 @@ public class MoralEducationServiceImpl implements MoralEducationService {
return combineClassResults(classDto, currentData, lastData); return combineClassResults(classDto, currentData, lastData);
} }
private Map<String, Object> combineClassResults(MoralDto dto, private Map<String, Object> combineClassResults(LaborDto dto,
Map<String, Object> current, Map<String, Object> current,
Map<String, Object> last) { Map<String, Object> last) {
Map<String, Object> result = new LinkedHashMap<>(); Map<String, Object> result = new LinkedHashMap<>();
@ -2173,7 +2188,7 @@ public class MoralEducationServiceImpl implements MoralEducationService {
return result; return result;
} }
private List<Map<String, Object>> buildClassScoreBlocks(MoralDto dto, private List<Map<String, Object>> buildClassScoreBlocks(LaborDto dto,
Map<String, Object> current, Map<String, Object> current,
Map<String, Object> last) { Map<String, Object> last) {
@ -2338,7 +2353,7 @@ public class MoralEducationServiceImpl implements MoralEducationService {
} }
// 处理学期数据 // 处理学期数据
private Map<String, Object> processSemesterData(MoralDto moralDto, private Map<String, Object> processSemesterData(LaborDto moralDto,
SemesterPeriod semester, SemesterPeriod semester,
HttpServletRequest request, HttpServletRequest request,
boolean isCurrent, boolean isCurrent,
@ -2439,7 +2454,7 @@ public class MoralEducationServiceImpl implements MoralEducationService {
} }
// 结果合并方法 // 结果合并方法
private Map<String, Object> combineResults(MoralDto moralDto, private Map<String, Object> combineResults(LaborDto moralDto,
Map<String, Object> currentData, Map<String, Object> currentData,
Map<String, Object> lastData) { Map<String, Object> lastData) {
Map<String, Object> result = new LinkedHashMap<>(); Map<String, Object> result = new LinkedHashMap<>();

Write Preview
Loading…
Cancel
Save