From f5e4340348091f4c3d197cb6f7b3bbddfd8ef977 Mon Sep 17 00:00:00 2001 From: whb <17803890193@163.com> Date: Tue, 13 May 2025 18:06:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=95=BF=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/stu/CptfController.java | 21 +++++++++++++---- .../stu/StudyTimeAndCountController.java | 23 ++++++++++--------- .../UserBehaviorProfilingAnaServiceImpl.java | 2 +- 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/sztzjy/linkCommerce/controller/stu/CptfController.java b/src/main/java/com/sztzjy/linkCommerce/controller/stu/CptfController.java index ea16258..aa9139e 100644 --- a/src/main/java/com/sztzjy/linkCommerce/controller/stu/CptfController.java +++ b/src/main/java/com/sztzjy/linkCommerce/controller/stu/CptfController.java @@ -368,7 +368,6 @@ public class CptfController { } - public Integer calculte(List dataInfoList, Integer ser, String answer) { int count = 0; if (CollectionUtils.isEmpty(dataInfoList)) { @@ -433,12 +432,26 @@ public class CptfController { } else { return new ResultEntity<>(HttpStatus.BAD_REQUEST, "提交失败"); } - - } else { - return new ResultEntity<>(HttpStatus.BAD_REQUEST, "已提交过"); + return new ResultEntity<>(HttpStatus.OK, "提交成功"); } } + @GetMapping("/restartTrainingByAlgorithm") + @ApiOperation("用户数据分析/产品定位-重新实训") + @AnonymousAccess + public ResultEntity restartTrainingByAlgorithm(@RequestParam String userId, @ApiParam("重新实训的模块名") String module,@ApiParam("大模块名")String project) { + + scoreService.deleteScore(userId, project, module); + + AlgorithmStuAnswerExample cpdjStuAnswerExample = new AlgorithmStuAnswerExample(); + cpdjStuAnswerExample.createCriteria().andUserIdEqualTo(userId).andProjectEqualTo(project).andModuleEqualTo(module); + algorithmStuAnswerMapper.deleteByExample(cpdjStuAnswerExample); + return new ResultEntity<>(HttpStatus.OK, "重新实训成功"); + + } + + + } diff --git a/src/main/java/com/sztzjy/linkCommerce/controller/stu/StudyTimeAndCountController.java b/src/main/java/com/sztzjy/linkCommerce/controller/stu/StudyTimeAndCountController.java index 43a863a..5fe0b10 100644 --- a/src/main/java/com/sztzjy/linkCommerce/controller/stu/StudyTimeAndCountController.java +++ b/src/main/java/com/sztzjy/linkCommerce/controller/stu/StudyTimeAndCountController.java @@ -1,5 +1,6 @@ package com.sztzjy.linkCommerce.controller.stu; +import cn.hutool.core.convert.Convert; import com.sztzjy.linkCommerce.annotation.AnonymousAccess; import com.sztzjy.linkCommerce.config.Constant; import com.sztzjy.linkCommerce.entity.*; @@ -35,7 +36,7 @@ public class StudyTimeAndCountController { @PostMapping("/updateStudyTime") @ApiOperation("更新学习时间") @AnonymousAccess - public ResultEntity updateStudyTime(@RequestParam String userId, @RequestParam @ApiParam("项目名称 市场需求挖掘、产品规划") String projectName, @RequestParam int time) { + public ResultEntity updateStudyTime(@RequestParam String userId, @RequestParam @ApiParam("项目名称 市场需求挖掘、产品规划") String projectName, @RequestParam String time) { //先查询有无这个对象 没有则新增对象 StuStudyTimeExample stuStudyTimeExample = new StuStudyTimeExample(); stuStudyTimeExample.createCriteria().andUserIdEqualTo(userId); @@ -56,29 +57,29 @@ public class StudyTimeAndCountController { stuStudyTime.setProductPlanningTime(0); stuStudyTime.setSupplyChannelTime(0); if (Constant.PRO_SCXQWJ.equals(projectName)) { - stuStudyTime.setMarketResearchTime(time); + stuStudyTime.setMarketResearchTime(Convert.toInt(time)); } else if (Constant.PRO_CPGH.equals(projectName)) { - stuStudyTime.setProductPlanningTime(time); + stuStudyTime.setProductPlanningTime(Convert.toInt(time)); } else if (Constant.PRO_CPTFCS.equals(projectName)) { - stuStudyTime.setProductLaunchTestTime(time); + stuStudyTime.setProductLaunchTestTime(Convert.toInt(time)); } else if (Constant.PRO_GYQDGL.equals(projectName)) { - stuStudyTime.setSupplyChannelTime(time); + stuStudyTime.setSupplyChannelTime(Convert.toInt(time)); } else if (Constant.PRO_CPPGYKH.equals(projectName)) { - stuStudyTime.setProductEvaluationTime(time); + stuStudyTime.setProductEvaluationTime(Convert.toInt(time)); } insert = stuStudyTimeMapper.insert(stuStudyTime); } else { StuStudyTime stuStudyTime = stuStudyTimes.get(0); if (Constant.PRO_SCXQWJ.equals(projectName)) { - stuStudyTime.setMarketResearchTime(stuStudyTime.getMarketResearchTime() + time); + stuStudyTime.setMarketResearchTime(stuStudyTime.getMarketResearchTime() + Convert.toInt(time)); } else if (Constant.PRO_CPGH.equals(projectName)) { - stuStudyTime.setProductPlanningTime(stuStudyTime.getProductPlanningTime() + time); + stuStudyTime.setProductPlanningTime(stuStudyTime.getProductPlanningTime() + Convert.toInt(time)); } else if (Constant.PRO_CPTFCS.equals(projectName)) { - stuStudyTime.setProductLaunchTestTime(stuStudyTime.getProductLaunchTestTime() + time); + stuStudyTime.setProductLaunchTestTime(stuStudyTime.getProductLaunchTestTime() + Convert.toInt(time)); } else if (Constant.PRO_GYQDGL.equals(projectName)) { - stuStudyTime.setSupplyChannelTime(stuStudyTime.getSupplyChannelTime() + time); + stuStudyTime.setSupplyChannelTime(stuStudyTime.getSupplyChannelTime() + Convert.toInt(time)); } else if (Constant.PRO_CPPGYKH.equals(projectName)) { - stuStudyTime.setProductEvaluationTime(stuStudyTime.getProductEvaluationTime() + time); + stuStudyTime.setProductEvaluationTime(stuStudyTime.getProductEvaluationTime() + Convert.toInt(time)); } insert = stuStudyTimeMapper.updateByPrimaryKey(stuStudyTime); } diff --git a/src/main/java/com/sztzjy/linkCommerce/service/impl/UserBehaviorProfilingAnaServiceImpl.java b/src/main/java/com/sztzjy/linkCommerce/service/impl/UserBehaviorProfilingAnaServiceImpl.java index f4364a6..a13a155 100644 --- a/src/main/java/com/sztzjy/linkCommerce/service/impl/UserBehaviorProfilingAnaServiceImpl.java +++ b/src/main/java/com/sztzjy/linkCommerce/service/impl/UserBehaviorProfilingAnaServiceImpl.java @@ -71,11 +71,11 @@ public class UserBehaviorProfilingAnaServiceImpl implements UserBehaviorProfilin stuMachineLearning.setId(id); machineLearningMapper.updateByPrimaryKeyWithBLOBs(stuMachineLearning); if (learning.getSubState() == 1) { - BigDecimal aDouble = BigDecimal.valueOf(100).subtract(Convert.toBigDecimal(learning.getErrorField())); //算分 scoreService.insertScore(learning.getUserId(), learning.getProject(), learning.getModule(), aDouble, null); } + return new ResultEntity<>(HttpStatus.OK, "提交成功！"); } }