diff --git a/src/main/java/com/sztzjy/marketing/controller/stu/StuConceptBlockController.java b/src/main/java/com/sztzjy/marketing/controller/stu/StuConceptBlockController.java index e22d2eb..ef86bac 100644 --- a/src/main/java/com/sztzjy/marketing/controller/stu/StuConceptBlockController.java +++ b/src/main/java/com/sztzjy/marketing/controller/stu/StuConceptBlockController.java @@ -13,6 +13,7 @@ import com.sztzjy.marketing.entity.dto.StuLearningAssessmentScoreDTO; import com.sztzjy.marketing.entity.dto.StuScoreDetailsDTO; import com.sztzjy.marketing.mapper.StuResourcesMapper; import com.sztzjy.marketing.service.StuConceptBlockService; +import com.sztzjy.marketing.service.UserBehaviorProfilingAnaService; import com.sztzjy.marketing.util.ResultDataEntity; import com.sztzjy.marketing.util.ResultEntity; import io.swagger.annotations.Api; @@ -42,7 +43,10 @@ public class StuConceptBlockController { @Resource + private StuConceptBlockService stuConceptBlockService; + @Resource + private UserBehaviorProfilingAnaService userBehaviorProfilingAnaService; @Value("${file.path}") private String filePath; @@ -51,25 +55,6 @@ public class StuConceptBlockController { @Resource private StuResourcesMapper stuResourcesMapper; - @PostMapping("/getLearningAssessment") - @AnonymousAccess - @ApiOperation("哈希函数学习测评查看") - public ResultDataEntity> getLearningAssessment(@ApiParam("归属模块") String module, @ApiParam("用户ID") String userId) { - if (module.isEmpty()) { - return new ResultDataEntity<>(HttpStatus.NO_CONTENT, "参数为空"); - } - List list = stuConceptBlockService.getLearningAssessment(module,userId); - return new ResultDataEntity<>(HttpStatus.OK, list); - } - @PostMapping("/hashLearningAssessmentScore") - @AnonymousAccess - @ApiOperation("哈希函数学习测评计分") - public ResultDataEntity hashLearningAssessmentScore(@RequestBody JSONObject jsonObject){ - StuLearningAssessmentScoreDTO stuLearningAssessmentScoreDTO = jsonObject.getObject("stuLearningAssessmentScoreDTO", StuLearningAssessmentScoreDTO.class); - stuConceptBlockService.hashLearningAssessmentScore(stuLearningAssessmentScoreDTO); - return new ResultDataEntity<>(HttpStatus.OK); - } - @AnonymousAccess @ApiOperation("哈希函数资源学习分数统计") @PostMapping("/hashWatchScore") @@ -88,15 +73,30 @@ public class StuConceptBlockController { return new ResultDataEntity<>(HttpStatus.OK); } + @PostMapping("/getLearningAssessment") + @AnonymousAccess + @ApiOperation("哈希函数学习测评查看") + public ResultDataEntity> getLearningAssessment(@ApiParam("用户ID") String module,@ApiParam("用户ID") String userId) { + + List list = stuConceptBlockService.getLearningAssessment(module,userId); + return new ResultDataEntity<>(HttpStatus.OK, list); + } + @PostMapping("/hashLearningAssessmentScore") + @AnonymousAccess + @ApiOperation("哈希函数学习测评计分") + public ResultDataEntity hashLearningAssessmentScore(@RequestBody JSONObject jsonObject){ + StuLearningAssessmentScoreDTO stuLearningAssessmentScoreDTO = jsonObject.getObject("stuLearningAssessmentScoreDTO", StuLearningAssessmentScoreDTO.class); + stuConceptBlockService.hashLearningAssessmentScore(stuLearningAssessmentScoreDTO); + return new ResultDataEntity<>(HttpStatus.OK); + } + @ApiOperation("区块链学习资源查看") @GetMapping("/getBlockResources") @AnonymousAccess - public ResultDataEntity getBlockResources(String module) { - if (module.isEmpty()) { - return new ResultDataEntity(HttpStatus.NO_CONTENT, "参数为空"); - } - List conceptBlockResources = stuConceptBlockService.getConceptBlockResources(module); + public ResultDataEntity getBlockResources() { + + List conceptBlockResources = stuConceptBlockService.getConceptBlockResources(); return new ResultDataEntity(HttpStatus.OK, conceptBlockResources); } @@ -108,9 +108,9 @@ public class StuConceptBlockController { @GetMapping("/getReport") @ApiOperation("获取实训报告详情") @AnonymousAccess - public ResultDataEntity getReport(String userId, String module, String ascription) { + public ResultDataEntity getReport(String userId, String module,String ascription) { - StuPracticalTrainingReport report = stuConceptBlockService.getReport(userId, module,ascription); + StuPracticalTrainingReport report = stuConceptBlockService.getReport(userId,module,ascription); return new ResultDataEntity<>(HttpStatus.OK, report); } @@ -201,13 +201,6 @@ public class StuConceptBlockController { } - @AnonymousAccess - @ApiOperation("哈希函数资源学习分数统计") - @PostMapping("/hashWatchScore") - public ResultDataEntity hashWatchScore(@RequestBody JSONObject jsonObject) { - StuScoreDetailsDTO stuScoreDetailsDTO = jsonObject.getObject("stuScoreDetailsDTO", StuScoreDetailsDTO.class); - stuConceptBlockService.hashWatchScore(stuScoreDetailsDTO); - return new ResultDataEntity<>(HttpStatus.OK); - } + } diff --git a/src/main/java/com/sztzjy/marketing/entity/StuScoreDetailsDTO.java b/src/main/java/com/sztzjy/marketing/entity/StuScoreDetailsDTO.java deleted file mode 100644 index 7778028..0000000 --- a/src/main/java/com/sztzjy/marketing/entity/StuScoreDetailsDTO.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.sztzjy.marketing.entity; - -import com.sztzjy.marketing.config.Constant; -import lombok.Data; - -/** - * @author tz - * @date 2023/9/2 13:34 - */ -@Data -public class StuScoreDetailsDTO { - private String id; - - private String learningProjects; //学习项目 - - private String assessmentItems; //考核项目 - - private String scoringCriteria; //计分标准 - - private Double scoreWeight; //成绩权重 - - private int viewingTime; - - private Double scoreProject; //项目得分 - - private String module; //归属模块 - - private String userId; //用户id - - private String completionStatus; //完成情况 - - public StuScoreDetailsDTO() { - } - - public StuScoreDetailsDTO(StuScoreDetails stuScoreDetails, TchModuleWeith tchConceptualTechnologyWeight) { - this.id=stuScoreDetails.getId(); - this.learningProjects=stuScoreDetails.getLearningProjects(); - this.assessmentItems=stuScoreDetails.getAssessmentItems(); - //根据学习项目判断获取的权重类型 - if (Constant.ZSGY_TCHMODULE.equals(stuScoreDetails.getLearningProjects())){ - this.scoringCriteria= String.valueOf(tchConceptualTechnologyWeight.getSummaryOfKnowledgeScore()); - this.scoreWeight=tchConceptualTechnologyWeight.getSummaryOfKnowledgeWeight().doubleValue(); - }else if (Constant.ZYXX_TCHMODULE.equals(stuScoreDetails.getLearningProjects())){ - this.scoringCriteria= String.valueOf(tchConceptualTechnologyWeight.getResourceLearningScore()); - this.scoreWeight=tchConceptualTechnologyWeight.getResourceLearningWeight().doubleValue(); - }else if (Constant.XXCP_TCHMODULE.equals(stuScoreDetails.getLearningProjects())){ - this.scoringCriteria= String.valueOf(tchConceptualTechnologyWeight.getLearningAssessmentScore()); - this.scoreWeight=tchConceptualTechnologyWeight.getLearningAssessmentWeight().doubleValue(); - }else if (Constant.SYSX_TCHMODULE.equals(stuScoreDetails.getLearningProjects())){ - this.scoringCriteria= String.valueOf(tchConceptualTechnologyWeight.getExperimentalTrainingScore()); - this.scoreWeight=tchConceptualTechnologyWeight.getExperimentalTrainingWeight().doubleValue(); - }else if(Constant.SYBG_TCHMODULE.equals(stuScoreDetails.getLearningProjects())){ - this.scoreWeight=tchConceptualTechnologyWeight.getReportWeight().doubleValue(); - } - this.completionStatus=stuScoreDetails.getCompletionStatus(); - this.scoreProject=stuScoreDetails.getScoreProject(); - - } -} diff --git a/src/main/java/com/sztzjy/marketing/service/StuConceptBlockService.java b/src/main/java/com/sztzjy/marketing/service/StuConceptBlockService.java index a82a0cf..8dd82a6 100644 --- a/src/main/java/com/sztzjy/marketing/service/StuConceptBlockService.java +++ b/src/main/java/com/sztzjy/marketing/service/StuConceptBlockService.java @@ -7,6 +7,7 @@ import com.sztzjy.marketing.entity.StuResources; import com.sztzjy.marketing.entity.dto.StuAssessmentQuestionDetailsDTO; import com.sztzjy.marketing.entity.dto.StuBlockProductWithDTO; import com.sztzjy.marketing.entity.dto.StuLearningAssessmentScoreDTO; +import com.sztzjy.marketing.entity.dto.StuScoreDetailsDTO; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; @@ -19,7 +20,7 @@ public interface StuConceptBlockService { void hashLearningAssessmentScore(StuLearningAssessmentScoreDTO stuLearningAssessmentScoreDTO); //区块链学习资源查看 - List getConceptBlockResources(String module); + List getConceptBlockResources(); diff --git a/src/main/java/com/sztzjy/marketing/service/impl/StuConceptBlockServiceImpl.java b/src/main/java/com/sztzjy/marketing/service/impl/StuConceptBlockServiceImpl.java index 576ee25..a1d7986 100644 --- a/src/main/java/com/sztzjy/marketing/service/impl/StuConceptBlockServiceImpl.java +++ b/src/main/java/com/sztzjy/marketing/service/impl/StuConceptBlockServiceImpl.java @@ -1,7 +1,6 @@ package com.sztzjy.marketing.service.impl; -import cn.hutool.core.convert.Convert; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.IdUtil; @@ -51,7 +50,11 @@ public class StuConceptBlockServiceImpl implements StuConceptBlockService { private StuScoreDetailsMapper stuScoreDetailsMapper; + @Resource + BigDecimalUtils bigDecimalUtils; + @Resource + UserBehaviorProfilingAnaService anaService; @Resource private StuResourcesMapper stuResourcesMapper; @@ -77,18 +80,14 @@ public class StuConceptBlockServiceImpl implements StuConceptBlockService { StuUserMapper stuUserMapper; @Resource ScoringUtil scoringUtil; - @Resource - BigDecimalUtils bigDecimalUtils; - @Resource - UserBehaviorProfilingAnaService anaService; //区块链学习资源查看 @Override - public List getConceptBlockResources(String module) { + public List getConceptBlockResources() { StuResourcesExample resourcesExample = new StuResourcesExample(); - resourcesExample.createCriteria().andModuleEqualTo(module); + resourcesExample.createCriteria().getAllCriteria(); List stuResources = stuResourcesMapper.selectByExample(resourcesExample); return stuResources; }