diff --git a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/TrainingScoreController.java b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/TrainingScoreController.java index d297f17..87dd9df 100644 --- a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/TrainingScoreController.java +++ b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/TrainingScoreController.java @@ -46,12 +46,12 @@ public class TrainingScoreController { @PostMapping("/addScore") - private void addScore(@RequestBody JSONObject jsonObject){ + private void addScore(@RequestBody JSONObject jsonObject) { String controlsName = jsonObject.getString("controlsName"); Long userId = jsonObject.getLong("userId"); //检查状态是否提交且变更的值是否有数据 如果返回值为false 则执行更新操作 SysTrainingScore sysTrainingScore = trainingScoreService.checkStatusAndControlsName(userId, controlsName); - if(sysTrainingScore!=null){ + if (sysTrainingScore != null) { //更新userid的进度和分数 sysTrainingScore.calculateDataScore(); trainingScoreService.updateByPrimaryKeySelective(sysTrainingScore); @@ -60,23 +60,23 @@ public class TrainingScoreController { //查询实训进度 @PostMapping("/selectScore") - private List selectScore(@RequestBody JSONObject jsonObject){ + private List selectScore(@RequestBody JSONObject jsonObject) { Long userId = jsonObject.getLong("userId"); SysTrainingScore sysTrainingScore = trainingScoreService.selectByUserId(userId); - TrainingScoreVo trainingScoreVo=new TrainingScoreVo(sysTrainingScore); + TrainingScoreVo trainingScoreVo = new TrainingScoreVo(sysTrainingScore); List list = trainingScoreVo.ReturnTrainingScore(trainingScoreVo); return list; } //查询实训成绩 @PostMapping("/selectTotalScore") - private List selectTotalScore(@RequestBody JSONObject jsonObject){ + private List selectTotalScore(@RequestBody JSONObject jsonObject) { Long userId = jsonObject.getLong("userId"); SysTrainingScore sysTrainingScore = trainingScoreService.selectByUserId(userId); - if ("".equals(sysTrainingScore.getTrainingReportScore()) || sysTrainingScore.getTrainingReportScore()==null){ + if ("".equals(sysTrainingScore.getTrainingReportScore()) || sysTrainingScore.getTrainingReportScore() == null) { return null; } - TrainingTotalScoreVo totalScoreVo=new TrainingTotalScoreVo(sysTrainingScore); + TrainingTotalScoreVo totalScoreVo = new TrainingTotalScoreVo(sysTrainingScore); totalScoreVo.setTotalscore(sysTrainingScore.getTotalscore()); totalScoreVo.setTrainingReportScore(sysTrainingScore.getTrainingReportScore()); List list = totalScoreVo.ReturnTrainingTotalScore(totalScoreVo); @@ -85,7 +85,7 @@ public class TrainingScoreController { //重新实训 @PostMapping("/restartTraining") - private String restartTraining(@RequestBody JSONObject jsonObject){ + private String restartTraining(@RequestBody JSONObject jsonObject) { Long userId = jsonObject.getLong("userId"); trainingScoreService.deleteByUserId(userId); trainingScoreService.insertByUserId(userId); @@ -101,8 +101,11 @@ public class TrainingScoreController { } for (int i = 0; i < trainingScoreList.size(); i++) { SysTrainingScore sysTrainingScore = trainingScoreList.get(i); + if (sysTrainingScore.getReportContent()==null){ + continue; + } String reportContent = sysTrainingScore.getReportContent(); - int wordCount = reportContent.replace(" ","").length(); // 获取文本的字数 + int wordCount = reportContent.replace(" ", "").length(); // 获取文本的字数 int score; if (wordCount <= 50) { @@ -114,7 +117,7 @@ public class TrainingScoreController { } else { score = 100; // 超过350字直接满分 } - SysTrainingScore trainingScore=new SysTrainingScore(); + SysTrainingScore trainingScore = new SysTrainingScore(); trainingScore.setId(sysTrainingScore.getId()); trainingScore.setTrainingReportScore(score); trainingScoreService.updateByPrimaryKeySelective(trainingScore); @@ -140,20 +143,20 @@ public class TrainingScoreController { //学生端实验报告回显 @GetMapping("/getSubmitAndSaveReport") - public AjaxResult getSubmitAndSaveReport(@RequestParam Long userId){ + public String getSubmitAndSaveReport(@RequestParam Long userId) { SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample(); trainingScoreExample.createCriteria().andUseridEqualTo(userId); - List sysTrainingScores = trainingScoreMapper.selectByExample(trainingScoreExample); - if (!sysTrainingScores.isEmpty()){ + List sysTrainingScores = trainingScoreMapper.selectByExampleWithBLOBs(trainingScoreExample); + if (!sysTrainingScores.isEmpty()) { SysTrainingScore sysTrainingScore = sysTrainingScores.get(0); - return AjaxResult.success(sysTrainingScore.getReportContent()); + return sysTrainingScore.getReportContent(); } return null; } // 老师端文件下载 @GetMapping("/downloadReport") - public AjaxResult downloadReport(@RequestParam Long id,HttpServletResponse response) { + public AjaxResult downloadReport(@RequestParam Long id, HttpServletResponse response) { return trainingScoreService.downloadReport(response, id); } @@ -170,27 +173,23 @@ public class TrainingScoreController { } // 老师端按班级导出 - @PostMapping("/exportByClass") - public void exportByClass(HttpServletResponse response,@RequestBody String className) { + @GetMapping("/exportByClass") + public void exportByClass(HttpServletResponse response, @RequestParam String className) { // 根据班级名称查询对应的用户列表 List userList = sysUserMapper.selectClassStuNumberNameByClass(className); SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample(); List sysTrainingScores = trainingScoreMapper.selectByExample(trainingScoreExample); List reportDtoList = new ArrayList<>(); if (!userList.isEmpty()) { - for (SysUser sysUser : userList) { - if (!sysTrainingScores.isEmpty()) { - for (SysTrainingScore sysTrainingScore : sysTrainingScores) { + for (SysTrainingScore sysTrainingScore : sysTrainingScores) { + for (SysUser sysUser : userList) { + if (sysUser.getUserId().equals(sysTrainingScore.getUserid())) { ReportDto reportDto = new ReportDto(); reportDto.setFileName(sysTrainingScore.getReportFilename()); - if (sysTrainingScore.getReportSubmissionScore() == null) { - reportDto.setTrainingReportScore(0.0); - } - if (sysTrainingScore.getTrainingOperationScore() == null) { - reportDto.setTrainingOperationScore(0.0); - } - reportDto.setTrainingReportScore(sysTrainingScore.getTrainingReportScore().doubleValue()); - reportDto.setTrainingOperationScore(sysTrainingScore.getTrainingOperationScore().doubleValue()); + reportDto.setTrainingReportScore(sysTrainingScore.getTrainingReportScore() == null ? 0.0 : + sysTrainingScore.getTrainingReportScore().doubleValue()); + reportDto.setTrainingOperationScore(sysTrainingScore.getTrainingOperationScore() == null ? 0.0 : + sysTrainingScore.getTrainingOperationScore().doubleValue()); reportDto.setScoreTotal(sysTrainingScore.getTotalscore()); reportDto.setName(sysUser.getUserName()); reportDto.setStuClass(sysUser.getStuClass()); @@ -260,16 +259,16 @@ public class TrainingScoreController { // 老师端右侧成绩(为经过权重计算) @GetMapping("/getReportScore") - public Map getWeightReport(){ + public Map getWeightReport() { SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample(); List sysTrainingScores = trainingScoreMapper.selectByExample(trainingScoreExample); - Map resultScores= new HashMap<>(); - if (!sysTrainingScores.isEmpty()){ + Map resultScores = new HashMap<>(); + if (!sysTrainingScores.isEmpty()) { for (SysTrainingScore sysTrainingScore : sysTrainingScores) { if (sysTrainingScore.getTrainingReportScore() != null) { Integer trainingReportScore = sysTrainingScore.getTrainingReportScore(); Long userid = sysTrainingScore.getUserid(); - resultScores.put(userid,trainingReportScore); + resultScores.put(userid, trainingReportScore); } } return resultScores; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/ReportDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/ReportDto.java index 62048e6..305b92c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/ReportDto.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/ReportDto.java @@ -1,13 +1,22 @@ package com.ruoyi.system.domain.vo; +import com.ruoyi.common.annotation.Excel; + public class ReportDto { + @Excel(name = "班级") private String stuClass; + @Excel(name = "学号") private String stuNumber; + @Excel(name = "姓名") private String name; + @Excel(name = "实验报告成绩") private Double trainingReportScore; //报告提交成绩 + @Excel(name = "实验操作成绩") private Double trainingOperationScore; //实验操作成绩 + @Excel(name = "总成绩") private Double scoreTotal; //总成绩 + @Excel(name = "报告名称") private String fileName; //上传报告名称 private Long userId; @@ -77,7 +86,6 @@ public class ReportDto { } - public Double getScoreTotal() { return scoreTotal; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTrainingScoreServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTrainingScoreServiceImpl.java index 921eca5..a9d891a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTrainingScoreServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTrainingScoreServiceImpl.java @@ -129,74 +129,74 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService { // return new PageInfo<>(reportDtoList); // } -@Override -public PageInfo teacherGetReport(Integer index, Integer size, Double reportWeight, Double operatorWeight, String keyWord, String stuClass) { - PageHelper.startPage(index, size); - List reportDtoList = new ArrayList<>(); - if (stuClass != null || keyWord != null) { - List users = sysUserMapper.selectByNameStuNum(stuClass, keyWord); - for (SysUser user : users) { + @Override + public PageInfo teacherGetReport(Integer index, Integer size, Double reportWeight, Double operatorWeight, String keyWord, String stuClass) { + PageHelper.startPage(index, size); + List reportDtoList = new ArrayList<>(); + if (stuClass != null || keyWord != null) { + List users = sysUserMapper.selectByNameStuNum(stuClass, keyWord); + for (SysUser user : users) { + SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample(); + trainingScoreExample.createCriteria().andUseridEqualTo(user.getUserId()); + List sysTrainingScores = trainingScoreMapper.selectByExample(trainingScoreExample); + if (!sysTrainingScores.isEmpty()) { + SysTrainingScore sysTrainingScore = sysTrainingScores.get(0); + // 检查是否已经存在分数 + if (sysTrainingScore.getTotalscore() != null && + sysTrainingScore.getTrainingReportScore() != null && + sysTrainingScore.getTrainingOperationScore() != null) { + // 使用数据库中的分数创建ReportDto + ReportDto reportDto = new ReportDto( + user.getStuClass(), + user.getStudentNumber(), + user.getUserName(), + sysTrainingScore.getTrainingReportScore().doubleValue(), + sysTrainingScore.getTrainingOperationScore().doubleValue(), + sysTrainingScore.getTotalscore(), + sysTrainingScore.getReportFilename() + ); + reportDto.setUserId(user.getUserId()); + reportDtoList.add(reportDto); + } else { + // 进行计算分数的逻辑，调用createReportDto方法 + ReportDto reportDto = createReportDto(sysTrainingScore, user, reportWeight, operatorWeight); + reportDtoList.add(reportDto); + } + } + } + return new PageInfo<>(reportDtoList); + } + List userList = sysUserMapper.selectClassStuNumberName(); + for (SysUser sysUser : userList) { SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample(); - trainingScoreExample.createCriteria().andUseridEqualTo(user.getUserId()); + trainingScoreExample.createCriteria().andUseridEqualTo(sysUser.getUserId()); List sysTrainingScores = trainingScoreMapper.selectByExample(trainingScoreExample); if (!sysTrainingScores.isEmpty()) { SysTrainingScore sysTrainingScore = sysTrainingScores.get(0); - // 检查是否已经存在分数 if (sysTrainingScore.getTotalscore() != null && sysTrainingScore.getTrainingReportScore() != null && sysTrainingScore.getTrainingOperationScore() != null) { // 使用数据库中的分数创建ReportDto ReportDto reportDto = new ReportDto( - user.getStuClass(), - user.getStudentNumber(), - user.getUserName(), + sysUser.getStuClass(), + sysUser.getStudentNumber(), + sysUser.getUserName(), sysTrainingScore.getTrainingReportScore().doubleValue(), sysTrainingScore.getTrainingOperationScore().doubleValue(), sysTrainingScore.getTotalscore(), sysTrainingScore.getReportFilename() ); - reportDto.setUserId(user.getUserId()); + reportDto.setUserId(sysUser.getUserId()); reportDtoList.add(reportDto); } else { // 进行计算分数的逻辑，调用createReportDto方法 - ReportDto reportDto = createReportDto(sysTrainingScore, user, reportWeight, operatorWeight); + ReportDto reportDto = createReportDto(sysTrainingScore, sysUser, reportWeight, operatorWeight); reportDtoList.add(reportDto); } } } return new PageInfo<>(reportDtoList); } - List userList = sysUserMapper.selectClassStuNumberName(); - for (SysUser sysUser : userList) { - SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample(); - trainingScoreExample.createCriteria().andUseridEqualTo(sysUser.getUserId()); - List sysTrainingScores = trainingScoreMapper.selectByExample(trainingScoreExample); - if (!sysTrainingScores.isEmpty()) { - SysTrainingScore sysTrainingScore = sysTrainingScores.get(0); - if (sysTrainingScore.getTotalscore() != null && - sysTrainingScore.getTrainingReportScore() != null && - sysTrainingScore.getTrainingOperationScore() != null) { - // 使用数据库中的分数创建ReportDto - ReportDto reportDto = new ReportDto( - sysUser.getStuClass(), - sysUser.getStudentNumber(), - sysUser.getUserName(), - sysTrainingScore.getTrainingReportScore().doubleValue(), - sysTrainingScore.getTrainingOperationScore().doubleValue(), - sysTrainingScore.getTotalscore(), - sysTrainingScore.getReportFilename() - ); - reportDto.setUserId(sysUser.getUserId()); - reportDtoList.add(reportDto); - } else { - // 进行计算分数的逻辑，调用createReportDto方法 - ReportDto reportDto = createReportDto(sysTrainingScore, sysUser, reportWeight, operatorWeight); - reportDtoList.add(reportDto); - } - } - } - return new PageInfo<>(reportDtoList); -} @Override public List selectAllReportContent() { @@ -214,7 +214,7 @@ public PageInfo teacherGetReport(Integer index, Integer size, Double reportDto.setStuClass(user.getStuClass()); reportDto.setStuNumber(user.getStudentNumber()); reportDto.setUserId(user.getUserId()); - if (reportScore != null &&reportScore!=0 && trainingOperationScore != null&&trainingOperationScore != 0) { + if (reportScore != null && trainingOperationScore != null) { SysGradeWeight sysGradeWeight = gradeWeightMapper.selectByPrimaryKey(1L); Double oldReportWeight = sysGradeWeight.getReportWeight(); Double oldOperatorWeight = sysGradeWeight.getOperatorWeight(); @@ -245,13 +245,21 @@ public PageInfo teacherGetReport(Integer index, Integer size, Double sysTrainingScore.setTrainingOperationScore(resultOperationScore.intValue()); trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore); gradeWeightMapper.updateByPrimaryKeySelective(sysGradeWeight); + return reportDto; + } //当两个成绩有一个时，也需要查询返回已有的 (不能算权重) 只有一个时不计算权重 否则查询一次就会算一次哦 + else if (reportScore != null) { // 当只有报告成绩可用时 + reportDto.setTrainingReportScore(reportScore.doubleValue()); + trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore); + return reportDto; + } else if (trainingOperationScore != null) { // 当只有操作成绩可用时 + reportDto.setTrainingOperationScore(trainingOperationScore.doubleValue()); + trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore); + return reportDto; } else { - reportDto.setScoreTotal(null); + return reportDto; } - return reportDto; } - //上传 @Override public AjaxResult uploadReport(MultipartFile file, String fileName, Long id) { @@ -295,7 +303,7 @@ public PageInfo teacherGetReport(Integer index, Integer size, Double return AjaxResult.error("请先上传再提交"); } sysTrainingScore.setReportContent(content); - trainingScoreMapper.updateByExample(sysTrainingScore, trainingScoreExample); + trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore); } return AjaxResult.success("提交成功"); } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysTrainingScoreMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysTrainingScoreMapper.xml index ab301f1..0296c3f 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysTrainingScoreMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysTrainingScoreMapper.xml @@ -5,7 +5,7 @@ @@ -83,7 +83,7 @@ @@ -91,7 +91,7 @@ @@ -125,7 +125,7 @@ @@ -159,38 +159,38 @@ - id, userid, data_collection_step_description, data_collection_toolbar_button, data_collection_progress, - data_collection_score, data_collection_time, text_segmentation_step_description, - text_segmentation_toolbar_button, text_segmentation_analysis_train_button, text_segmentation_progress, - text_segmentation_score, text_segmentation_time, partofspeech_tagging_step_description, - partofspeech_tagging_toolbar_button, partofspeech_tagging_analysis_train_button, - partofspeech_tagging_progress, partofspeech_tagging_score, partofspeech_tagging_time, - category_management_step_description, category_management_add_button, category_management_progress, - category_management_score, category_management_time, text_classification_step_description, - text_classification_article_classification_button, text_classification_create_article_button, - text_classification_toolbar_details_button, text_classification_progress, text_classification_score, - text_classification_time, text_summarization_step_description, text_summarization_article_summary_button, - text_summarization_create_article_button, text_summarization_toolbar_details_button, - text_summarization_progress, text_summarization_score, text_summarization_time, similarity_calculation_step_description, - similarity_calculation_add_button_top, similarity_calculation_add_button_bottom, - similarity_calculation_calculate_similarity_button, similarity_calculation_progress, - similarity_calculation_score, similarity_calculation_time, sentiment_analysis_step_description, - sentiment_analysis_select_button, sentiment_analysis_sentiment_analysis_button, sentiment_analysis_create_sentiment_word_button, - sentiment_analysis_progress, sentiment_analysis_score, sentiment_analysis_time, data_visualization_step_description, - data_visualization_word_cloud_button, data_visualization_social_network_analysis_button, - data_visualization_sentiment_analysis_button, data_visualization_progress, data_visualization_score, - data_visualization_time, report_submission_experience_page_save_button, report_submission_upload_report_button, - report_submission_submit_button, report_submission_progress, report_submission_score, - report_submission_time, report_upload_path, report_filename, status, training_operation_score, + id, userid, data_collection_step_description, data_collection_toolbar_button, data_collection_progress, + data_collection_score, data_collection_time, text_segmentation_step_description, + text_segmentation_toolbar_button, text_segmentation_analysis_train_button, text_segmentation_progress, + text_segmentation_score, text_segmentation_time, partofspeech_tagging_step_description, + partofspeech_tagging_toolbar_button, partofspeech_tagging_analysis_train_button, + partofspeech_tagging_progress, partofspeech_tagging_score, partofspeech_tagging_time, + category_management_step_description, category_management_add_button, category_management_progress, + category_management_score, category_management_time, text_classification_step_description, + text_classification_article_classification_button, text_classification_create_article_button, + text_classification_toolbar_details_button, text_classification_progress, text_classification_score, + text_classification_time, text_summarization_step_description, text_summarization_article_summary_button, + text_summarization_create_article_button, text_summarization_toolbar_details_button, + text_summarization_progress, text_summarization_score, text_summarization_time, similarity_calculation_step_description, + similarity_calculation_add_button_top, similarity_calculation_add_button_bottom, + similarity_calculation_calculate_similarity_button, similarity_calculation_progress, + similarity_calculation_score, similarity_calculation_time, sentiment_analysis_step_description, + sentiment_analysis_select_button, sentiment_analysis_sentiment_analysis_button, sentiment_analysis_create_sentiment_word_button, + sentiment_analysis_progress, sentiment_analysis_score, sentiment_analysis_time, data_visualization_step_description, + data_visualization_word_cloud_button, data_visualization_social_network_analysis_button, + data_visualization_sentiment_analysis_button, data_visualization_progress, data_visualization_score, + data_visualization_time, report_submission_experience_page_save_button, report_submission_upload_report_button, + report_submission_submit_button, report_submission_progress, report_submission_score, + report_submission_time, report_upload_path, report_filename, status, training_operation_score, training_report_score, totalscore report_content @@ -201,7 +201,7 @@ select @@ -222,7 +222,7 @@ select @@ -241,9 +241,9 @@ - select + select , @@ -254,7 +254,7 @@ delete from sys_training_score where id = #{id,jdbcType=VARCHAR} @@ -263,7 +263,7 @@ delete from sys_training_score @@ -274,84 +274,84 @@ - insert into sys_training_score (id, userid, data_collection_step_description, - data_collection_toolbar_button, data_collection_progress, - data_collection_score, data_collection_time, - text_segmentation_step_description, text_segmentation_toolbar_button, - text_segmentation_analysis_train_button, text_segmentation_progress, - text_segmentation_score, text_segmentation_time, - partofspeech_tagging_step_description, partofspeech_tagging_toolbar_button, - partofspeech_tagging_analysis_train_button, partofspeech_tagging_progress, - partofspeech_tagging_score, partofspeech_tagging_time, - category_management_step_description, category_management_add_button, - category_management_progress, category_management_score, - category_management_time, text_classification_step_description, - text_classification_article_classification_button, text_classification_create_article_button, - text_classification_toolbar_details_button, text_classification_progress, - text_classification_score, text_classification_time, - text_summarization_step_description, text_summarization_article_summary_button, - text_summarization_create_article_button, text_summarization_toolbar_details_button, - text_summarization_progress, text_summarization_score, - text_summarization_time, similarity_calculation_step_description, - similarity_calculation_add_button_top, similarity_calculation_add_button_bottom, - similarity_calculation_calculate_similarity_button, similarity_calculation_progress, - similarity_calculation_score, similarity_calculation_time, - sentiment_analysis_step_description, sentiment_analysis_select_button, - sentiment_analysis_sentiment_analysis_button, sentiment_analysis_create_sentiment_word_button, - sentiment_analysis_progress, sentiment_analysis_score, - sentiment_analysis_time, data_visualization_step_description, - data_visualization_word_cloud_button, data_visualization_social_network_analysis_button, - data_visualization_sentiment_analysis_button, data_visualization_progress, - data_visualization_score, data_visualization_time, - report_submission_experience_page_save_button, report_submission_upload_report_button, - report_submission_submit_button, report_submission_progress, - report_submission_score, report_submission_time, - report_upload_path, report_filename, status, - training_operation_score, training_report_score, + insert into sys_training_score (id, userid, data_collection_step_description, + data_collection_toolbar_button, data_collection_progress, + data_collection_score, data_collection_time, + text_segmentation_step_description, text_segmentation_toolbar_button, + text_segmentation_analysis_train_button, text_segmentation_progress, + text_segmentation_score, text_segmentation_time, + partofspeech_tagging_step_description, partofspeech_tagging_toolbar_button, + partofspeech_tagging_analysis_train_button, partofspeech_tagging_progress, + partofspeech_tagging_score, partofspeech_tagging_time, + category_management_step_description, category_management_add_button, + category_management_progress, category_management_score, + category_management_time, text_classification_step_description, + text_classification_article_classification_button, text_classification_create_article_button, + text_classification_toolbar_details_button, text_classification_progress, + text_classification_score, text_classification_time, + text_summarization_step_description, text_summarization_article_summary_button, + text_summarization_create_article_button, text_summarization_toolbar_details_button, + text_summarization_progress, text_summarization_score, + text_summarization_time, similarity_calculation_step_description, + similarity_calculation_add_button_top, similarity_calculation_add_button_bottom, + similarity_calculation_calculate_similarity_button, similarity_calculation_progress, + similarity_calculation_score, similarity_calculation_time, + sentiment_analysis_step_description, sentiment_analysis_select_button, + sentiment_analysis_sentiment_analysis_button, sentiment_analysis_create_sentiment_word_button, + sentiment_analysis_progress, sentiment_analysis_score, + sentiment_analysis_time, data_visualization_step_description, + data_visualization_word_cloud_button, data_visualization_social_network_analysis_button, + data_visualization_sentiment_analysis_button, data_visualization_progress, + data_visualization_score, data_visualization_time, + report_submission_experience_page_save_button, report_submission_upload_report_button, + report_submission_submit_button, report_submission_progress, + report_submission_score, report_submission_time, + report_upload_path, report_filename, status, + training_operation_score, training_report_score, totalscore, report_content) - values (#{id,jdbcType=VARCHAR}, #{userid,jdbcType=BIGINT}, #{dataCollectionStepDescription,jdbcType=VARCHAR}, - #{dataCollectionToolbarButton,jdbcType=VARCHAR}, #{dataCollectionProgress,jdbcType=VARCHAR}, - #{dataCollectionScore,jdbcType=INTEGER}, #{dataCollectionTime,jdbcType=TIMESTAMP}, - #{textSegmentationStepDescription,jdbcType=VARCHAR}, #{textSegmentationToolbarButton,jdbcType=VARCHAR}, - #{textSegmentationAnalysisTrainButton,jdbcType=VARCHAR}, #{textSegmentationProgress,jdbcType=VARCHAR}, - #{textSegmentationScore,jdbcType=INTEGER}, #{textSegmentationTime,jdbcType=TIMESTAMP}, - #{partofspeechTaggingStepDescription,jdbcType=VARCHAR}, #{partofspeechTaggingToolbarButton,jdbcType=VARCHAR}, - #{partofspeechTaggingAnalysisTrainButton,jdbcType=VARCHAR}, #{partofspeechTaggingProgress,jdbcType=VARCHAR}, - #{partofspeechTaggingScore,jdbcType=INTEGER}, #{partofspeechTaggingTime,jdbcType=TIMESTAMP}, - #{categoryManagementStepDescription,jdbcType=VARCHAR}, #{categoryManagementAddButton,jdbcType=VARCHAR}, - #{categoryManagementProgress,jdbcType=VARCHAR}, #{categoryManagementScore,jdbcType=INTEGER}, - #{categoryManagementTime,jdbcType=TIMESTAMP}, #{textClassificationStepDescription,jdbcType=VARCHAR}, - #{textClassificationArticleClassificationButton,jdbcType=VARCHAR}, #{textClassificationCreateArticleButton,jdbcType=VARCHAR}, - #{textClassificationToolbarDetailsButton,jdbcType=VARCHAR}, #{textClassificationProgress,jdbcType=VARCHAR}, - #{textClassificationScore,jdbcType=INTEGER}, #{textClassificationTime,jdbcType=TIMESTAMP}, - #{textSummarizationStepDescription,jdbcType=VARCHAR}, #{textSummarizationArticleSummaryButton,jdbcType=VARCHAR}, - #{textSummarizationCreateArticleButton,jdbcType=VARCHAR}, #{textSummarizationToolbarDetailsButton,jdbcType=VARCHAR}, - #{textSummarizationProgress,jdbcType=VARCHAR}, #{textSummarizationScore,jdbcType=INTEGER}, - #{textSummarizationTime,jdbcType=TIMESTAMP}, #{similarityCalculationStepDescription,jdbcType=VARCHAR}, - #{similarityCalculationAddButtonTop,jdbcType=VARCHAR}, #{similarityCalculationAddButtonBottom,jdbcType=VARCHAR}, - #{similarityCalculationCalculateSimilarityButton,jdbcType=VARCHAR}, #{similarityCalculationProgress,jdbcType=VARCHAR}, - #{similarityCalculationScore,jdbcType=INTEGER}, #{similarityCalculationTime,jdbcType=TIMESTAMP}, - #{sentimentAnalysisStepDescription,jdbcType=VARCHAR}, #{sentimentAnalysisSelectButton,jdbcType=VARCHAR}, - #{sentimentAnalysisSentimentAnalysisButton,jdbcType=VARCHAR}, #{sentimentAnalysisCreateSentimentWordButton,jdbcType=VARCHAR}, - #{sentimentAnalysisProgress,jdbcType=VARCHAR}, #{sentimentAnalysisScore,jdbcType=INTEGER}, - #{sentimentAnalysisTime,jdbcType=TIMESTAMP}, #{dataVisualizationStepDescription,jdbcType=VARCHAR}, - #{dataVisualizationWordCloudButton,jdbcType=VARCHAR}, #{dataVisualizationSocialNetworkAnalysisButton,jdbcType=VARCHAR}, - #{dataVisualizationSentimentAnalysisButton,jdbcType=VARCHAR}, #{dataVisualizationProgress,jdbcType=VARCHAR}, - #{dataVisualizationScore,jdbcType=INTEGER}, #{dataVisualizationTime,jdbcType=TIMESTAMP}, - #{reportSubmissionExperiencePageSaveButton,jdbcType=VARCHAR}, #{reportSubmissionUploadReportButton,jdbcType=VARCHAR}, - #{reportSubmissionSubmitButton,jdbcType=VARCHAR}, #{reportSubmissionProgress,jdbcType=VARCHAR}, - #{reportSubmissionScore,jdbcType=INTEGER}, #{reportSubmissionTime,jdbcType=TIMESTAMP}, - #{reportUploadPath,jdbcType=VARCHAR}, #{reportFilename,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, - #{trainingOperationScore,jdbcType=INTEGER}, #{trainingReportScore,jdbcType=INTEGER}, + values (#{id,jdbcType=VARCHAR}, #{userid,jdbcType=BIGINT}, #{dataCollectionStepDescription,jdbcType=VARCHAR}, + #{dataCollectionToolbarButton,jdbcType=VARCHAR}, #{dataCollectionProgress,jdbcType=VARCHAR}, + #{dataCollectionScore,jdbcType=INTEGER}, #{dataCollectionTime,jdbcType=TIMESTAMP}, + #{textSegmentationStepDescription,jdbcType=VARCHAR}, #{textSegmentationToolbarButton,jdbcType=VARCHAR}, + #{textSegmentationAnalysisTrainButton,jdbcType=VARCHAR}, #{textSegmentationProgress,jdbcType=VARCHAR}, + #{textSegmentationScore,jdbcType=INTEGER}, #{textSegmentationTime,jdbcType=TIMESTAMP}, + #{partofspeechTaggingStepDescription,jdbcType=VARCHAR}, #{partofspeechTaggingToolbarButton,jdbcType=VARCHAR}, + #{partofspeechTaggingAnalysisTrainButton,jdbcType=VARCHAR}, #{partofspeechTaggingProgress,jdbcType=VARCHAR}, + #{partofspeechTaggingScore,jdbcType=INTEGER}, #{partofspeechTaggingTime,jdbcType=TIMESTAMP}, + #{categoryManagementStepDescription,jdbcType=VARCHAR}, #{categoryManagementAddButton,jdbcType=VARCHAR}, + #{categoryManagementProgress,jdbcType=VARCHAR}, #{categoryManagementScore,jdbcType=INTEGER}, + #{categoryManagementTime,jdbcType=TIMESTAMP}, #{textClassificationStepDescription,jdbcType=VARCHAR}, + #{textClassificationArticleClassificationButton,jdbcType=VARCHAR}, #{textClassificationCreateArticleButton,jdbcType=VARCHAR}, + #{textClassificationToolbarDetailsButton,jdbcType=VARCHAR}, #{textClassificationProgress,jdbcType=VARCHAR}, + #{textClassificationScore,jdbcType=INTEGER}, #{textClassificationTime,jdbcType=TIMESTAMP}, + #{textSummarizationStepDescription,jdbcType=VARCHAR}, #{textSummarizationArticleSummaryButton,jdbcType=VARCHAR}, + #{textSummarizationCreateArticleButton,jdbcType=VARCHAR}, #{textSummarizationToolbarDetailsButton,jdbcType=VARCHAR}, + #{textSummarizationProgress,jdbcType=VARCHAR}, #{textSummarizationScore,jdbcType=INTEGER}, + #{textSummarizationTime,jdbcType=TIMESTAMP}, #{similarityCalculationStepDescription,jdbcType=VARCHAR}, + #{similarityCalculationAddButtonTop,jdbcType=VARCHAR}, #{similarityCalculationAddButtonBottom,jdbcType=VARCHAR}, + #{similarityCalculationCalculateSimilarityButton,jdbcType=VARCHAR}, #{similarityCalculationProgress,jdbcType=VARCHAR}, + #{similarityCalculationScore,jdbcType=INTEGER}, #{similarityCalculationTime,jdbcType=TIMESTAMP}, + #{sentimentAnalysisStepDescription,jdbcType=VARCHAR}, #{sentimentAnalysisSelectButton,jdbcType=VARCHAR}, + #{sentimentAnalysisSentimentAnalysisButton,jdbcType=VARCHAR}, #{sentimentAnalysisCreateSentimentWordButton,jdbcType=VARCHAR}, + #{sentimentAnalysisProgress,jdbcType=VARCHAR}, #{sentimentAnalysisScore,jdbcType=INTEGER}, + #{sentimentAnalysisTime,jdbcType=TIMESTAMP}, #{dataVisualizationStepDescription,jdbcType=VARCHAR}, + #{dataVisualizationWordCloudButton,jdbcType=VARCHAR}, #{dataVisualizationSocialNetworkAnalysisButton,jdbcType=VARCHAR}, + #{dataVisualizationSentimentAnalysisButton,jdbcType=VARCHAR}, #{dataVisualizationProgress,jdbcType=VARCHAR}, + #{dataVisualizationScore,jdbcType=INTEGER}, #{dataVisualizationTime,jdbcType=TIMESTAMP}, + #{reportSubmissionExperiencePageSaveButton,jdbcType=VARCHAR}, #{reportSubmissionUploadReportButton,jdbcType=VARCHAR}, + #{reportSubmissionSubmitButton,jdbcType=VARCHAR}, #{reportSubmissionProgress,jdbcType=VARCHAR}, + #{reportSubmissionScore,jdbcType=INTEGER}, #{reportSubmissionTime,jdbcType=TIMESTAMP}, + #{reportUploadPath,jdbcType=VARCHAR}, #{reportFilename,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, + #{trainingOperationScore,jdbcType=INTEGER}, #{trainingReportScore,jdbcType=INTEGER}, #{totalscore,jdbcType=DOUBLE}, #{reportContent,jdbcType=LONGVARCHAR}) insert into sys_training_score @@ -795,7 +795,7 @@ select count(*) from sys_training_score @@ -806,7 +806,7 @@ update sys_training_score @@ -1035,7 +1035,7 @@ update sys_training_score set id = #{record.id,jdbcType=VARCHAR}, @@ -1118,7 +1118,7 @@ update sys_training_score set id = #{record.id,jdbcType=VARCHAR}, @@ -1200,7 +1200,7 @@ update sys_training_score @@ -1424,7 +1424,7 @@ update sys_training_score set userid = #{userid,jdbcType=BIGINT}, @@ -1504,7 +1504,7 @@ update sys_training_score set userid = #{userid,jdbcType=BIGINT}, diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 1f1aaf8..d391f30 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -101,20 +101,21 @@ - + SELECT DISTINCT stuclass FROM sys_user