diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTrainingScore.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTrainingScore.java index d4f87c7..dff8a58 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTrainingScore.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTrainingScore.java @@ -2372,6 +2372,7 @@ public class SysTrainingScore { } public void calculateDataScore() { + Date date = new Date(); dataCollectionScore=0; textSegmentationScore=0; partofspeechTaggingScore=0; @@ -2399,6 +2400,7 @@ public class SysTrainingScore { double result = (double) flag / 2 * 100; String formattedResult = df.format(result / 100); dataCollectionProgress=formattedResult; + dataCollectionTime=date; } flag=0; @@ -2418,6 +2420,7 @@ public class SysTrainingScore { double result = (double) flag / 3 * 100; String formattedResult = df.format(result / 100); textSegmentationProgress=formattedResult; + textSegmentationTime=date; } flag=0; @@ -2437,6 +2440,7 @@ public class SysTrainingScore { double result = (double) flag / 3 * 100; String formattedResult = df.format(result / 100); partofspeechTaggingProgress=formattedResult; + partofspeechTaggingTime=date; } @@ -2453,6 +2457,7 @@ public class SysTrainingScore { double result = (double) flag / 2 * 100; String formattedResult = df.format(result / 100); categoryManagementProgress=formattedResult; + categoryManagementTime=date; } flag=0; @@ -2476,6 +2481,7 @@ public class SysTrainingScore { double result = (double) flag / 4 * 100; String formattedResult = df.format(result / 100); textClassificationProgress=formattedResult; + textClassificationTime=date; } flag=0; @@ -2499,6 +2505,7 @@ public class SysTrainingScore { double result = (double) flag / 4 * 100; String formattedResult = df.format(result / 100); textSummarizationProgress=formattedResult; + textSummarizationTime=date; } flag=0; @@ -2522,6 +2529,7 @@ public class SysTrainingScore { double result = (double) flag / 4 * 100; String formattedResult = df.format(result / 100); similarityCalculationProgress=formattedResult; + similarityCalculationTime=date; } flag=0; @@ -2545,6 +2553,7 @@ public class SysTrainingScore { double result = (double) flag / 4 * 100; String formattedResult = df.format(result / 100); sentimentAnalysisProgress=formattedResult; + sentimentAnalysisTime=date; } flag=0; @@ -2568,6 +2577,7 @@ public class SysTrainingScore { double result = (double) flag / 4 * 100; String formattedResult = df.format(result / 100); dataVisualizationProgress=formattedResult; + dataVisualizationTime=date; } flag=0; @@ -2587,6 +2597,7 @@ public class SysTrainingScore { double result = (double) flag / 3 * 100; String formattedResult = df.format(result / 100); reportSubmissionProgress=formattedResult; + reportSubmissionTime=date; } trainingOperationScore=dataCollectionScore+textSegmentationScore+partofspeechTaggingScore+categoryManagementScore+textClassificationScore diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTrainingScoreService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTrainingScoreService.java index 8cad9f8..40e7ced 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTrainingScoreService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTrainingScoreService.java @@ -18,4 +18,5 @@ public interface ISysTrainingScoreService { void updateByPrimaryKeySelective(SysTrainingScore sysTrainingScore); SysTrainingScore selectByUserId(Long userId); + } 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 89e06d8..d83466e 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 @@ -53,7 +53,8 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService { trainingScore.setId(sysTrainingScore.getId()); trainingScore.set(controlsName, String.valueOf(score)); trainingScoreMapper.updateByPrimaryKeySelective(trainingScore); - return trainingScore; + sysTrainingScore.set(controlsName, String.valueOf(score)); + return sysTrainingScore; } return null; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index aec7cb4..8380e2c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -4,6 +4,9 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; import javax.validation.Validator; + +import com.ruoyi.system.domain.SysTrainingScore; +import com.ruoyi.system.mapper.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -22,11 +25,6 @@ import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.domain.SysUserPost; import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.mapper.SysPostMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysUserMapper; -import com.ruoyi.system.mapper.SysUserPostMapper; -import com.ruoyi.system.mapper.SysUserRoleMapper; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysUserService; @@ -61,6 +59,9 @@ public class SysUserServiceImpl implements ISysUserService @Autowired protected Validator validator; + @Autowired + SysTrainingScoreMapper trainingScoreMapper; + /** * 根据条件分页查询用户列表 * @@ -261,6 +262,10 @@ public class SysUserServiceImpl implements ISysUserService insertUserPost(user); // 新增用户与角色管理 insertUserRole(user); + //新增实训成绩 + SysTrainingScore sysTrainingScore=new SysTrainingScore(); + sysTrainingScore.setUserid(user.getUserId()); + trainingScoreMapper.insert(sysTrainingScore); return rows; }