diff --git a/src/main/java/com/sztzjy/linkCommerce/controller/stu/IndustryDemandAnalysisController.java b/src/main/java/com/sztzjy/linkCommerce/controller/stu/IndustryDemandAnalysisController.java index 5c06764..a1b21ff 100644 --- a/src/main/java/com/sztzjy/linkCommerce/controller/stu/IndustryDemandAnalysisController.java +++ b/src/main/java/com/sztzjy/linkCommerce/controller/stu/IndustryDemandAnalysisController.java @@ -290,7 +290,6 @@ public class IndustryDemandAnalysisController { } - //fileUtil.download(response,"RFM分析方法data.xls"); } diff --git a/src/main/java/com/sztzjy/linkCommerce/controller/stu/StuDigitalMarketingModelController.java b/src/main/java/com/sztzjy/linkCommerce/controller/stu/StuDigitalMarketingModelController.java index 3b871e3..fde0f3d 100644 --- a/src/main/java/com/sztzjy/linkCommerce/controller/stu/StuDigitalMarketingModelController.java +++ b/src/main/java/com/sztzjy/linkCommerce/controller/stu/StuDigitalMarketingModelController.java @@ -287,7 +287,6 @@ public class StuDigitalMarketingModelController { if (list.get(0) == "" || ("序号").equals(list.get(0))) { continue; } - StuUserComment stuUserComment=new StuUserComment(); Integer uuid = UUID.randomUUID().toString().replaceAll("-", "").hashCode(); uuid = uuid < 0 ? -uuid : uuid;//String.hashCode() 值会为空 @@ -297,7 +296,6 @@ public class StuDigitalMarketingModelController { stuUserComment.setNickName(String.valueOf((list.get(2)))); stuUserComment.setReferenceName(String.valueOf(list.get(3))); stuUserComment.setContentType(String.valueOf(list.get(4))); - stuUserComments.add(stuUserComment); } stuUserCommentMapper.addList(stuUserComments); diff --git a/src/main/java/com/sztzjy/linkCommerce/controller/stu/UserBehaviorProfilingAnaController.java b/src/main/java/com/sztzjy/linkCommerce/controller/stu/UserBehaviorProfilingAnaController.java index c1ff55d..68d8894 100644 --- a/src/main/java/com/sztzjy/linkCommerce/controller/stu/UserBehaviorProfilingAnaController.java +++ b/src/main/java/com/sztzjy/linkCommerce/controller/stu/UserBehaviorProfilingAnaController.java @@ -47,29 +47,10 @@ public class UserBehaviorProfilingAnaController { @ApiOperation("根据对应模块名重新实训") //@AnonymousAccess @GetMapping("/restartByTraining") - public ResultEntity restartByTraining(String module, String userId) { + public ResultEntity restartByTraining(String module, String userId,String project) { - return userBehaviorProfilingAnaService.restartByTraining(module, userId); + return userBehaviorProfilingAnaService.restartByTraining(module, userId,project); } -// -// @PostMapping("/practicalTrainingSubmission") -// //@AnonymousAccess -// @ApiOperation("实训任务提交") -// public ResultDataEntity practicalTrainingSubmission(@ApiParam("用户ID") String userId, -// @ApiParam("任务名称") String taskName, -// @ApiParam("错误次数") Integer numberOfErrors){ -// userBehaviorProfilingAnaService.practicalTrainingSubmission(userId,taskName,numberOfErrors); -// return new ResultDataEntity<>(HttpStatus.OK,"提交成功"); -// } -// -// -// -// @PostMapping("/getAcademicRecord") -// //@AnonymousAccess -// @ApiOperation("学习成绩查询") -// public ResultDataEntity> getAcademicRecord(String userId){ -// List scoreDetailsList=userBehaviorProfilingAnaService.getAcademicRecord(userId); -// return new ResultDataEntity<>(HttpStatus.OK,scoreDetailsList); -// } + } diff --git a/src/main/java/com/sztzjy/linkCommerce/entity/StuMachineLearning.java b/src/main/java/com/sztzjy/linkCommerce/entity/StuMachineLearning.java index 4b34ba8..0cc8dcf 100644 --- a/src/main/java/com/sztzjy/linkCommerce/entity/StuMachineLearning.java +++ b/src/main/java/com/sztzjy/linkCommerce/entity/StuMachineLearning.java @@ -241,6 +241,9 @@ public class StuMachineLearning { private String stepechartlist3; + @ApiModelProperty(notes = "大模块") + private String project; + public Integer getId() { return id; } diff --git a/src/main/java/com/sztzjy/linkCommerce/service/UserBehaviorProfilingAnaService.java b/src/main/java/com/sztzjy/linkCommerce/service/UserBehaviorProfilingAnaService.java index 98aab89..5ad8e86 100644 --- a/src/main/java/com/sztzjy/linkCommerce/service/UserBehaviorProfilingAnaService.java +++ b/src/main/java/com/sztzjy/linkCommerce/service/UserBehaviorProfilingAnaService.java @@ -36,7 +36,7 @@ public interface UserBehaviorProfilingAnaService { * @return */ - ResultEntity restartByTraining(String module, String userId); + ResultEntity restartByTraining(String module, String userId,String project); // /** 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 84cac79..833b7ff 100644 --- a/src/main/java/com/sztzjy/linkCommerce/service/impl/UserBehaviorProfilingAnaServiceImpl.java +++ b/src/main/java/com/sztzjy/linkCommerce/service/impl/UserBehaviorProfilingAnaServiceImpl.java @@ -10,6 +10,7 @@ import com.sztzjy.linkCommerce.config.exception.handler.ServiceException; import com.sztzjy.linkCommerce.entity.*; import com.sztzjy.linkCommerce.entity.dto.StuMachineLearningInfoDTO; import com.sztzjy.linkCommerce.mapper.*; +import com.sztzjy.linkCommerce.service.ScoreService; import com.sztzjy.linkCommerce.service.UserBehaviorProfilingAnaService; import com.sztzjy.linkCommerce.util.BigDecimalUtils; import com.sztzjy.linkCommerce.util.ResultEntity; @@ -33,26 +34,10 @@ public class UserBehaviorProfilingAnaServiceImpl implements UserBehaviorProfilin @Autowired private StuMachineLearningMapper machineLearningMapper; -// @Resource -// BigDecimalUtils bigDecimalUtils; -// -// @Resource -// StuUserMapper stuUserMapper; -// -// @Resource -// StuTrainingTaskSubmissionDetailsMapper stuTrainingTaskSubmissionDetailsMapper; -// -// @Resource -// StuModuleDetailsMapper stuModuleDetailsMapper; -// @Resource -// TchModuleWeithMapper tchModuleWeightMapper; -// -// @Resource -// ScoringUtil scoringUtil; -// @Resource -// StuScoreDetailsMapper stuScoreDetailsMapper; -// @Resource -// StuLearningAssessmentMapper learningAssessmentMapper; + @Autowired + private ScoreService scoreService; + + /** * 用户行为画像分析自动保存 @@ -64,9 +49,10 @@ public class UserBehaviorProfilingAnaServiceImpl implements UserBehaviorProfilin @Override public ResultEntity analysisByAutoSave(StuMachineLearning learning) { + //首次提交 Boolean flag = false; - if (learning.getStuMachineLearningInfoDTOList()!=null) { + if (learning.getStuMachineLearningInfoDTOList() != null) { flag = true; } @@ -76,90 +62,67 @@ public class UserBehaviorProfilingAnaServiceImpl implements UserBehaviorProfilin if (!machineLearningList.isEmpty()) { - if (machineLearningList.get(0).getSubState() == null) { - machineLearningList.get(0).setSubState(0); - } - + //只是自动保存了没有提交 if (machineLearningList.get(0).getSubState() == 1) { - return new ResultEntity<>(HttpStatus.OK, "保存成功！"); - } - - //已经有数据 - StuMachineLearning machineLearning = machineLearningList.get(0); - - Integer id = machineLearning.getId(); - - BeanUtils.copyProperties(learning, machineLearning); - machineLearning.setId(id); - if (flag) - { - //讲数据转为json - String json = JSONObject.toJSONString(learning.getStuMachineLearningInfoDTOList()); - machineLearning.setActiveUserAnalysis(json); - - } - - if (StringUtils.hasText(learning.getStepechartlist1())) - { - String json = JSONObject.toJSONString(learning.getStepechartlist1()); - machineLearning.setStepechartlist1(json); + return new ResultEntity<>(HttpStatus.ACCEPTED, "请勿重复提交!"); + } else { + StuMachineLearning stuMachineLearning = machineLearningList.get(0); + Integer id = stuMachineLearning.getId(); + BeanUtils.copyProperties(learning, stuMachineLearning); + 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); + } } + } - if (StringUtils.hasText(learning.getStepechartlist2())) - { - String json = JSONObject.toJSONString(learning.getStepechartlist2()); - machineLearning.setStepechartlist2(json); - } - if (StringUtils.hasText(learning.getStepechartlist3())) - { - String json = JSONObject.toJSONString(learning.getStepechartlist3()); - machineLearning.setStepechartlist3(json); - } + //首次提交 + int i = UUID.randomUUID().hashCode(); + i = i < 0 ? -i : i; + //第一次保存 + learning.setId(i); + if (flag) { + //讲数据转为json + String json = JSONObject.toJSONString(learning.getStuMachineLearningInfoDTOList()); + learning.setActiveUserAnalysis(json); - machineLearningMapper.updateByPrimaryKeyWithBLOBs(machineLearning); + } + if (StringUtils.hasText(learning.getStepechartlist1())) { + String json = JSONObject.toJSONString(learning.getStepechartlist1()); + learning.setStepechartlist1(json); + } - return new ResultEntity<>(HttpStatus.OK, "保存成功！"); + if (StringUtils.hasText(learning.getStepechartlist2())) { + String json = JSONObject.toJSONString(learning.getStepechartlist2()); + learning.setStepechartlist2(json); + } - } else { + if (StringUtils.hasText(learning.getStepechartlist3())) { + String json = JSONObject.toJSONString(learning.getStepechartlist3()); + learning.setStepechartlist3(json); + } - int i = UUID.randomUUID().hashCode(); - i = i < 0 ? -i : i; + machineLearningMapper.insertSelective(learning); - //第一次保存 - learning.setId(i); - if (flag) - { - //讲数据转为json - String json = JSONObject.toJSONString(learning.getStuMachineLearningInfoDTOList()); - learning.setActiveUserAnalysis(json); + if (learning.getSubState() == 1) { - } - if (StringUtils.hasText(learning.getStepechartlist1())) - { - String json = JSONObject.toJSONString(learning.getStepechartlist1()); - learning.setStepechartlist1(json); - } + BigDecimal aDouble = BigDecimal.valueOf(100).subtract(Convert.toBigDecimal(learning.getErrorField())); + //算分 + scoreService.insertScore(learning.getUserId(), learning.getProject(), learning.getModule(), aDouble, null); + } - if (StringUtils.hasText(learning.getStepechartlist2())) - { - String json = JSONObject.toJSONString(learning.getStepechartlist2()); - learning.setStepechartlist2(json); - } + return new ResultEntity<>(HttpStatus.OK, "保存成功！"); - if (StringUtils.hasText(learning.getStepechartlist3())) - { - String json = JSONObject.toJSONString(learning.getStepechartlist3()); - learning.setStepechartlist3(json); - } - machineLearningMapper.insertSelective(learning); + } - return new ResultEntity<>(HttpStatus.OK, "保存成功！"); - } - } /** * 查看接口 @@ -213,12 +176,14 @@ public class UserBehaviorProfilingAnaServiceImpl implements UserBehaviorProfilin */ @Override - public ResultEntity restartByTraining(String module, String userId) { + public ResultEntity restartByTraining(String module, String userId,String project) { //删除做题记录 第二次成绩是否有效？ StuMachineLearningExample machineLearningExample = new StuMachineLearningExample(); machineLearningExample.createCriteria().andUserIdEqualTo(userId).andModuleEqualTo(module); - machineLearningMapper.deleteByExample(machineLearningExample); + int i = machineLearningMapper.deleteByExample(machineLearningExample); + + scoreService.deleteScore(userId,project,userId); return new ResultEntity<>(HttpStatus.OK, "重新实训成功！"); }