diff --git a/src/main/java/com/sztzjy/digital_credit/controller/StuUserPortraitController.java b/src/main/java/com/sztzjy/digital_credit/controller/StuUserPortraitController.java index 075f704..f50d600 100644 --- a/src/main/java/com/sztzjy/digital_credit/controller/StuUserPortraitController.java +++ b/src/main/java/com/sztzjy/digital_credit/controller/StuUserPortraitController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("api/stu/userPortrait") -@Api(tags = "用户画像:用户画像") +@Api(tags = "用户画像") public class StuUserPortraitController { @@ -37,6 +37,19 @@ public class StuUserPortraitController { } + @ApiOperation("用户画像:重新实训") + @AnonymousAccess + @GetMapping("/reTraining") + public ResultEntity reTraining(String userId){ + + return userPortraitControllerService.reTraining(userId); + + } + + + + + diff --git a/src/main/java/com/sztzjy/digital_credit/controller/task/StuTaskController.java b/src/main/java/com/sztzjy/digital_credit/controller/task/StuTaskController.java index 2f09769..94ab8cf 100644 --- a/src/main/java/com/sztzjy/digital_credit/controller/task/StuTaskController.java +++ b/src/main/java/com/sztzjy/digital_credit/controller/task/StuTaskController.java @@ -8,6 +8,7 @@ import com.sztzjy.digital_credit.mapper.StuBreachOfContractTrainingMapper; import com.sztzjy.digital_credit.mapper.StuScoreCenterMapper; import com.sztzjy.digital_credit.mapper.StuUserMapper; import com.sztzjy.digital_credit.mapper.TchClassAverageScoreMapper; +import com.sztzjy.digital_credit.service.StuUserService; import com.sztzjy.digital_credit.util.ResultEntity; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -49,6 +50,8 @@ public class StuTaskController { @Autowired private StuUserMapper userMapper; + @Autowired + StuUserService userService; // 计算每天每个班级的平均成绩 每天00.00执行 @@ -145,6 +148,16 @@ public class StuTaskController { + @Scheduled(fixedDelay = 3600000) + public void updateUserRank(){ + //先查询所有学校id + List schoolIds=userMapper.selectSchool(); + for (int i = 0; i < schoolIds.size(); i++) { + String schoolId = schoolIds.get(i); + userService.totalRank(schoolId); + } + } + } diff --git a/src/main/java/com/sztzjy/digital_credit/mapper/StuUserMapper.java b/src/main/java/com/sztzjy/digital_credit/mapper/StuUserMapper.java index 2164ca6..014cb85 100644 --- a/src/main/java/com/sztzjy/digital_credit/mapper/StuUserMapper.java +++ b/src/main/java/com/sztzjy/digital_credit/mapper/StuUserMapper.java @@ -39,4 +39,7 @@ public interface StuUserMapper { //批量更新排名 void updateBatch(List list); + + @Select("select school_id from stu_user group by school_id") + List selectSchool(); } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/digital_credit/service/StuUserPortraitControllerService.java b/src/main/java/com/sztzjy/digital_credit/service/StuUserPortraitControllerService.java index ba7ff08..707a84f 100644 --- a/src/main/java/com/sztzjy/digital_credit/service/StuUserPortraitControllerService.java +++ b/src/main/java/com/sztzjy/digital_credit/service/StuUserPortraitControllerService.java @@ -25,4 +25,5 @@ public interface StuUserPortraitControllerService { Boolean userPortraitSubState(String userId); + ResultEntity reTraining(String userId); } diff --git a/src/main/java/com/sztzjy/digital_credit/service/impl/StuEnterPriseByInfoEntryServiceImpl.java b/src/main/java/com/sztzjy/digital_credit/service/impl/StuEnterPriseByInfoEntryServiceImpl.java index 1705a40..cfcb418 100644 --- a/src/main/java/com/sztzjy/digital_credit/service/impl/StuEnterPriseByInfoEntryServiceImpl.java +++ b/src/main/java/com/sztzjy/digital_credit/service/impl/StuEnterPriseByInfoEntryServiceImpl.java @@ -19,6 +19,7 @@ import com.sztzjy.digital_credit.entity.*; import com.sztzjy.digital_credit.entity.dto.StuFinancialIndexDTO; import com.sztzjy.digital_credit.mapper.*; import com.sztzjy.digital_credit.service.StuEnterPriseByInfoEntryService; +import com.sztzjy.digital_credit.service.StuPersonalCreditService; import com.sztzjy.digital_credit.service.StuRateService; import com.sztzjy.digital_credit.util.ConvertUtil; import com.sztzjy.digital_credit.util.MyExcelListener; @@ -65,6 +66,9 @@ public class StuEnterPriseByInfoEntryServiceImpl implements StuEnterPriseByInfoE @Autowired private StuOperatingCapacityMapper operatingCapacityMapper; + @Autowired + private StuPersonalCreditService stuPersonalCreditService; + @Autowired @@ -195,7 +199,7 @@ public class StuEnterPriseByInfoEntryServiceImpl implements StuEnterPriseByInfoE stuBaseInfoMapper.updateByPrimaryKeySelective(stuBaseInfo); //计算分数写入用户表 - stuRateService.enterScoreWriteUserByUserId(stuBaseInfo,"基本信息",stuBaseInfo.getUserId()); + stuPersonalCreditService.scoreEntry(stuBaseInfo.getUserId(),"基本信息", BigDecimal.valueOf(24-stuBaseInfo.getErrorNumber())); return new ResultEntity<>(HttpStatus.OK,"保存成功!",stuBaseInfo.getErrorNumber()); @@ -208,7 +212,7 @@ public class StuEnterPriseByInfoEntryServiceImpl implements StuEnterPriseByInfoE //插入数据库 stuBaseInfoMapper.insertSelective(stuBaseInfo); - stuRateService.enterScoreWriteUserByUserId(stuBaseInfo,"基本信息",stuBaseInfo.getUserId()); + stuPersonalCreditService.scoreEntry(stuBaseInfo.getUserId(),"基本信息", BigDecimal.valueOf(24-stuBaseInfo.getErrorNumber())); return new ResultEntity<>(HttpStatus.OK,"保存成功!",stuBaseInfo.getErrorNumber()); } @@ -312,8 +316,9 @@ public class StuEnterPriseByInfoEntryServiceImpl implements StuEnterPriseByInfoE creditRecords.setUpdateTime(new Date()); creditRecordsMapper.updateByPrimaryKeySelective(creditRecords); - //计算分数写入用户表 - stuRateService.enterScoreWriteUserByUserId(creditRecords,"信贷记录",creditRecords.getUserId()); + //计算分数写入用户表 + stuPersonalCreditService.scoreEntry(creditRecords.getUserId(),"信贷记录", BigDecimal.valueOf(16-creditRecords.getErrorNumber())); + return new ResultEntity<>(HttpStatus.OK,"保存成功!",creditRecords.getErrorNumber()); @@ -327,7 +332,8 @@ public class StuEnterPriseByInfoEntryServiceImpl implements StuEnterPriseByInfoE creditRecords.setCreateTime(new Date()); creditRecordsMapper.insertSelective(creditRecords); //计算分数写入用户表 - stuRateService.enterScoreWriteUserByUserId(creditRecords,"信贷记录",creditRecords.getUserId()); + stuPersonalCreditService.scoreEntry(creditRecords.getUserId(),"信贷记录", BigDecimal.valueOf(16-creditRecords.getErrorNumber())); + return new ResultEntity<>(HttpStatus.OK,"保存成功!",creditRecords.getErrorNumber()); } @@ -489,7 +495,9 @@ public class StuEnterPriseByInfoEntryServiceImpl implements StuEnterPriseByInfoE profitAbility.setId(profitAbilityList.get(0).getId()); profitAbilityMapper.updateByPrimaryKeySelective(profitAbility); //计算分数写入用户表 - stuRateService.enterScoreWriteUserByUserId(profitAbility,"盈利能力",profitAbility.getUserId()); + + stuPersonalCreditService.scoreEntry(profitAbility.getUserId(),"盈利能力", BigDecimal.valueOf(7-profitAbility.getErrorNumber())); + return new ResultEntity<>(HttpStatus.OK,"保存成功!",profitAbility.getErrorNumber()); @@ -502,7 +510,7 @@ public class StuEnterPriseByInfoEntryServiceImpl implements StuEnterPriseByInfoE //插入数据库 profitAbilityMapper.insertSelective(profitAbility); //计算分数写入用户表 - stuRateService.enterScoreWriteUserByUserId(profitAbility,"盈利能力",profitAbility.getUserId()); + stuPersonalCreditService.scoreEntry(profitAbility.getUserId(),"盈利能力", BigDecimal.valueOf(7-profitAbility.getErrorNumber())); return new ResultEntity<>(HttpStatus.OK,"保存成功!",profitAbility.getErrorNumber()); } @@ -577,8 +585,8 @@ public class StuEnterPriseByInfoEntryServiceImpl implements StuEnterPriseByInfoE solvencyMapper.updateByPrimaryKeySelective(solvency); //计算分数写入用户表 - stuRateService.enterScoreWriteUserByUserId(solvency,"偿债能力",solvency.getUserId()); + stuPersonalCreditService.scoreEntry(solvency.getUserId(),"偿债能力", BigDecimal.valueOf(7-solvency.getErrorNumber())); return new ResultEntity<>(HttpStatus.OK,"保存成功!",solvency.getErrorNumber()); }else { @@ -589,7 +597,7 @@ public class StuEnterPriseByInfoEntryServiceImpl implements StuEnterPriseByInfoE solvencyMapper.insertSelective(solvency); //计算分数写入用户表 - stuRateService.enterScoreWriteUserByUserId(solvency,"偿债能力",solvency.getUserId()); + stuPersonalCreditService.scoreEntry(solvency.getUserId(),"偿债能力", BigDecimal.valueOf(7-solvency.getErrorNumber())); return new ResultEntity<>(HttpStatus.OK,"保存成功!",solvency.getErrorNumber()); } @@ -663,7 +671,8 @@ public class StuEnterPriseByInfoEntryServiceImpl implements StuEnterPriseByInfoE operatingCapacity.setId(operatingCapacityList.get(0).getId()); operatingCapacityMapper.updateByPrimaryKeySelective(operatingCapacity); //计算分数写入用户表 - stuRateService.enterScoreWriteUserByUserId(operatingCapacity,"营运能力",operatingCapacity.getUserId()); + stuPersonalCreditService.scoreEntry(operatingCapacity.getUserId(),"营运能力", BigDecimal.valueOf(8-operatingCapacity.getErrorNumber())); + return new ResultEntity<>(HttpStatus.OK,"保存成功!",operatingCapacity.getErrorNumber()); @@ -675,7 +684,7 @@ public class StuEnterPriseByInfoEntryServiceImpl implements StuEnterPriseByInfoE //插入数据库 operatingCapacityMapper.insertSelective(operatingCapacity); //计算分数写入用户表 - stuRateService.enterScoreWriteUserByUserId(operatingCapacity,"营运能力",operatingCapacity.getUserId()); + stuPersonalCreditService.scoreEntry(operatingCapacity.getUserId(),"营运能力", BigDecimal.valueOf(8-operatingCapacity.getErrorNumber())); return new ResultEntity<>(HttpStatus.OK,"保存成功!",operatingCapacity.getErrorNumber()); } @@ -755,7 +764,9 @@ public class StuEnterPriseByInfoEntryServiceImpl implements StuEnterPriseByInfoE growthAbilityMapper.updateByPrimaryKeySelective(growthAbility); //计算分数写入用户表 - stuRateService.enterScoreWriteUserByUserId(growthAbility,"成长能力",growthAbility.getUserId()); + stuPersonalCreditService.scoreEntry(growthAbility.getUserId(),"成长能力", BigDecimal.valueOf(1-growthAbility.getErrorNumber())); + + return new ResultEntity<>(HttpStatus.OK,"保存成功!",growthAbility.getErrorNumber()); @@ -767,7 +778,7 @@ public class StuEnterPriseByInfoEntryServiceImpl implements StuEnterPriseByInfoE //插入数据库 growthAbilityMapper.insertSelective(growthAbility); //计算分数写入用户表 - stuRateService.enterScoreWriteUserByUserId(growthAbility,"成长能力",growthAbility.getUserId()); + stuPersonalCreditService.scoreEntry(growthAbility.getUserId(),"成长能力", BigDecimal.valueOf(1-growthAbility.getErrorNumber())); return new ResultEntity<>(HttpStatus.OK,"保存成功!",growthAbility.getErrorNumber()); } } @@ -842,7 +853,10 @@ public class StuEnterPriseByInfoEntryServiceImpl implements StuEnterPriseByInfoE duPontAnalysis.setId(duPontAnalysisList.get(0).getId()); duPontAnalysisMapper.updateByPrimaryKeySelective(duPontAnalysis); //计算分数写入用户表 - stuRateService.enterScoreWriteUserByUserId(duPontAnalysis,"杜邦分析",duPontAnalysis.getUserId()); + + stuPersonalCreditService.scoreEntry(duPontAnalysis.getUserId(),"杜邦分析", BigDecimal.valueOf(4-duPontAnalysis.getErrorNumber())); + + return new ResultEntity<>(HttpStatus.OK,"保存成功!",duPontAnalysis.getErrorNumber()); @@ -853,7 +867,7 @@ public class StuEnterPriseByInfoEntryServiceImpl implements StuEnterPriseByInfoE //插入数据库 duPontAnalysisMapper.insertSelective(duPontAnalysis); //计算分数写入用户表 - stuRateService.enterScoreWriteUserByUserId(duPontAnalysis,"杜邦分析",duPontAnalysis.getUserId()); + stuPersonalCreditService.scoreEntry(duPontAnalysis.getUserId(),"杜邦分析", BigDecimal.valueOf(4-duPontAnalysis.getErrorNumber())); return new ResultEntity<>(HttpStatus.OK,"保存成功!",duPontAnalysis.getErrorNumber()); } } diff --git a/src/main/java/com/sztzjy/digital_credit/service/impl/StuFinancialEarlyWarningServiceImpl.java b/src/main/java/com/sztzjy/digital_credit/service/impl/StuFinancialEarlyWarningServiceImpl.java index 7a4baf8..681fbc2 100644 --- a/src/main/java/com/sztzjy/digital_credit/service/impl/StuFinancialEarlyWarningServiceImpl.java +++ b/src/main/java/com/sztzjy/digital_credit/service/impl/StuFinancialEarlyWarningServiceImpl.java @@ -10,6 +10,7 @@ import com.sztzjy.digital_credit.entity.*; import com.sztzjy.digital_credit.mapper.StuOperationAssetAnalysisModuleMapper; import com.sztzjy.digital_credit.mapper.StuScoreModuleMapper; import com.sztzjy.digital_credit.service.StuFinancialEarlyWarningService; +import com.sztzjy.digital_credit.service.StuPersonalCreditService; import com.sztzjy.digital_credit.service.StuRateService; import com.sztzjy.digital_credit.util.ResultEntity; import org.springframework.beans.BeanUtils; @@ -17,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -34,6 +36,8 @@ public class StuFinancialEarlyWarningServiceImpl implements StuFinancialEarlyWar @Autowired private StuRateService stuRateService; + @Autowired + private StuPersonalCreditService stuPersonalCreditService; /** * Z计分模型 * @param userId @@ -147,7 +151,10 @@ public class StuFinancialEarlyWarningServiceImpl implements StuFinancialEarlyWar //计算分数写入用户表 - stuRateService.enterScoreWriteUserByUserId(scoreModule,"Z计分模型",scoreModule.getUserId()); + + stuPersonalCreditService.scoreEntry(scoreModule.getUserId(),"Z计分模型", BigDecimal.valueOf(12-scoreModule.getErrorNumber())); + + return new ResultEntity<>(HttpStatus.OK,"保存成功!",scoreModule.getErrorNumber()); @@ -161,7 +168,7 @@ public class StuFinancialEarlyWarningServiceImpl implements StuFinancialEarlyWar //插入数据库 scoreModuleMapper.insertSelective(scoreModule); //计算分数写入用户表 - stuRateService.enterScoreWriteUserByUserId(scoreModule,"Z计分模型",scoreModule.getUserId()); + stuPersonalCreditService.scoreEntry(scoreModule.getUserId(),"Z计分模型", BigDecimal.valueOf(12-scoreModule.getErrorNumber())); return new ResultEntity<>(HttpStatus.OK,"保存成功!",scoreModule.getErrorNumber()); @@ -275,7 +282,11 @@ public class StuFinancialEarlyWarningServiceImpl implements StuFinancialEarlyWar analysisModule.setId(moduleList.get(0).getId()); operationAssetAnalysisModuleMapper.updateByPrimaryKeySelective(analysisModule); //计算分数写入用户表 - stuRateService.enterScoreWriteUserByUserId(analysisModule,"营运资产分析模型",analysisModule.getUserId()); + + stuPersonalCreditService.scoreEntry(analysisModule.getUserId(),"营运资产分析模型", BigDecimal.valueOf(10-analysisModule.getErrorNumber())); + + + return new ResultEntity<>(HttpStatus.OK,"保存成功!",analysisModule.getErrorNumber()); @@ -288,7 +299,7 @@ public class StuFinancialEarlyWarningServiceImpl implements StuFinancialEarlyWar //插入数据库 operationAssetAnalysisModuleMapper.insertSelective(analysisModule); //计算分数写入用户表 - stuRateService.enterScoreWriteUserByUserId(analysisModule,"营运资产分析模型",analysisModule.getUserId()); + stuPersonalCreditService.scoreEntry(analysisModule.getUserId(),"营运资产分析模型", BigDecimal.valueOf(10-analysisModule.getErrorNumber())); return new ResultEntity<>(HttpStatus.OK,"保存成功!",analysisModule.getErrorNumber()); } diff --git a/src/main/java/com/sztzjy/digital_credit/service/impl/StuRateServiceImpl.java b/src/main/java/com/sztzjy/digital_credit/service/impl/StuRateServiceImpl.java index 3ddf69b..e88ffa2 100644 --- a/src/main/java/com/sztzjy/digital_credit/service/impl/StuRateServiceImpl.java +++ b/src/main/java/com/sztzjy/digital_credit/service/impl/StuRateServiceImpl.java @@ -7,6 +7,7 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; import com.sztzjy.digital_credit.entity.*; import com.sztzjy.digital_credit.mapper.*; +import com.sztzjy.digital_credit.service.StuPersonalCreditService; import com.sztzjy.digital_credit.service.StuRateService; import com.sztzjy.digital_credit.util.ResultEntity; import org.springframework.beans.BeanUtils; @@ -69,6 +70,9 @@ public class StuRateServiceImpl implements StuRateService { private StuScoreCenterMapper stuScoreCenterMapper; + @Autowired + private StuPersonalCreditService stuPersonalCreditService; + @@ -178,7 +182,10 @@ public class StuRateServiceImpl implements StuRateService { ratingModel.setId(stuRatingModelList.get(0).getId()); ratingModelMapper.updateByPrimaryKeySelective(ratingModel); //计算分数写入用户表 - enterScoreWriteUserByUserId(ratingModel,"评级模型",ratingModel.getUserId()); + + stuPersonalCreditService.scoreEntry(ratingModel.getUserId(),"评级模型", BigDecimal.valueOf(35-ratingModel.getErrorNumber())); + + return new ResultEntity<>(HttpStatus.OK,"保存成功!",ratingModel.getErrorNumber()); @@ -191,7 +198,7 @@ public class StuRateServiceImpl implements StuRateService { //插入数据库 ratingModelMapper.insertSelective(ratingModel); //计算分数写入用户表 - enterScoreWriteUserByUserId(ratingModel,"评级模型",ratingModel.getUserId()); + stuPersonalCreditService.scoreEntry(ratingModel.getUserId(),"评级模型", BigDecimal.valueOf(35-ratingModel.getErrorNumber())); return new ResultEntity<>(HttpStatus.OK,"保存成功!",ratingModel.getErrorNumber()); } @@ -305,7 +312,10 @@ public class StuRateServiceImpl implements StuRateService { ratingResult.setId(ratingResultList.get(0).getId()); resultMapper.updateByPrimaryKeySelective(ratingResult); //计算分数写入用户表 - enterScoreWriteUserByUserId(ratingResult,"评级结果",ratingResult.getUserId()); + + stuPersonalCreditService.scoreEntry(ratingResult.getUserId(),"评级结果", BigDecimal.valueOf(6-ratingResult.getErrorNumber())); + + return new ResultEntity<>(HttpStatus.OK,"保存成功!",ratingResult.getErrorNumber()); @@ -318,7 +328,7 @@ public class StuRateServiceImpl implements StuRateService { //插入数据库 resultMapper.insertSelective(ratingResult); //计算分数写入用户表 - enterScoreWriteUserByUserId(ratingResult,"评级结果",ratingResult.getUserId()); + stuPersonalCreditService.scoreEntry(ratingResult.getUserId(),"评级结果", BigDecimal.valueOf(6-ratingResult.getErrorNumber())); return new ResultEntity<>(HttpStatus.OK,"保存成功!",ratingResult.getErrorNumber()); } @@ -469,11 +479,11 @@ public class StuRateServiceImpl implements StuRateService { } - //获取用户画像总成绩 企业征信总成绩 个人征信总成绩 累加 写入实训案例总成绩 - - BigDecimal allScore = stuUser.getCasePersonalCreditScore().add(stuUser.getCaseCorporateCreditScore()).add(stuUser.getCaseUserProfileSocre()); - //综合案例总成绩 - stuUser.setComprehensiveCaseScore(allScore); +// //获取用户画像总成绩 企业征信总成绩 个人征信总成绩 累加 写入实训案例总成绩 +// +// BigDecimal allScore = stuUser.getCasePersonalCreditScore().add(stuUser.getCaseCorporateCreditScore()).add(stuUser.getCaseUserProfileSocre()); +// //综合案例总成绩 +// stuUser.setComprehensiveCaseScore(allScore); userMapper.updateByPrimaryKeySelective(stuUser); diff --git a/src/main/java/com/sztzjy/digital_credit/service/impl/StuUserPortraitControllerServiceImpl.java b/src/main/java/com/sztzjy/digital_credit/service/impl/StuUserPortraitControllerServiceImpl.java index d8af9b1..c932aeb 100644 --- a/src/main/java/com/sztzjy/digital_credit/service/impl/StuUserPortraitControllerServiceImpl.java +++ b/src/main/java/com/sztzjy/digital_credit/service/impl/StuUserPortraitControllerServiceImpl.java @@ -11,6 +11,7 @@ import com.sztzjy.digital_credit.entity.StuUserPortrait; import com.sztzjy.digital_credit.entity.StuUserPortraitExample; import com.sztzjy.digital_credit.mapper.StuUserMapper; import com.sztzjy.digital_credit.mapper.StuUserPortraitMapper; +import com.sztzjy.digital_credit.service.StuPersonalCreditService; import com.sztzjy.digital_credit.service.StuUserPortraitControllerService; import com.sztzjy.digital_credit.util.ResultEntity; import org.springframework.beans.BeanUtils; @@ -19,9 +20,9 @@ import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.rmi.ServerException; import java.util.HashMap; import java.util.List; +import java.util.Map; @Service public class StuUserPortraitControllerServiceImpl implements StuUserPortraitControllerService { @@ -33,6 +34,11 @@ public class StuUserPortraitControllerServiceImpl implements StuUserPortraitCont @Autowired private StuUserMapper userMapper; + + @Autowired + private StuPersonalCreditService stuPersonalCreditService; + + /** * 自动保存接口(根据module分类) * @param userPortrait @@ -63,8 +69,10 @@ public class StuUserPortraitControllerServiceImpl implements StuUserPortraitCont //根据model算正确分数 portrait = correctScoreCalculationByModule(portrait); + stuPersonalCreditService.scoreEntry(portrait.getUserId(),portrait.getModule(), BigDecimal.valueOf(portrait.getCorrectNumber())); + //将分数保存到用户表,如果重新实训将用户表数据删除 - saveScoreToUser(portrait); + // saveScoreToUser(portrait); } userPortraitMapper.updateByPrimaryKeySelective(portrait); @@ -82,7 +90,8 @@ public class StuUserPortraitControllerServiceImpl implements StuUserPortraitCont userPortrait = correctScoreCalculationByModule(userPortrait); //将分数保存到用户表,如果重新实训将用户表数据删除 - saveScoreToUser(userPortrait); + // saveScoreToUser(userPortrait); + stuPersonalCreditService.scoreEntry(userPortrait.getUserId(),userPortrait.getModule(), BigDecimal.valueOf(userPortrait.getCorrectNumber())); } userPortraitMapper.insertSelective(userPortrait); @@ -92,6 +101,9 @@ public class StuUserPortraitControllerServiceImpl implements StuUserPortraitCont } + + + /** * 用户画像提交状态 * @param userId @@ -117,6 +129,26 @@ public class StuUserPortraitControllerServiceImpl implements StuUserPortraitCont return false; } + /** + * 用户画像重新实训 + * @param userId + * @return + */ + + @Override + public ResultEntity reTraining(String userId) { + //重新实训 查询这张表里所有的数据 然后删除 + + StuUserPortraitExample portraitExample = new StuUserPortraitExample(); + portraitExample.createCriteria().andUserIdEqualTo(userId); + + userPortraitMapper.deleteByExample(portraitExample); + + + + return new ResultEntity<>(HttpStatus.OK,"重新实训成功!"); + } + //将分数保存到用户表,如果重新实训将用户表数据删除 private void saveScoreToUser(StuUserPortrait portrait) { diff --git a/src/main/resources/mappers/StuUserMapper.xml b/src/main/resources/mappers/StuUserMapper.xml index df0a564..35a95d1 100644 --- a/src/main/resources/mappers/StuUserMapper.xml +++ b/src/main/resources/mappers/StuUserMapper.xml @@ -737,83 +737,83 @@ school_name = #{item.schoolName,jdbcType=VARCHAR}, - - loan_cases_score = #{loanCasesScore,jdbcType=DECIMAL}, + + loan_cases_score = #{item.loanCasesScore,jdbcType=DECIMAL}, - - per_situation_score = #{perSituationScore,jdbcType=DECIMAL}, + + per_situation_score = #{item.perSituationScore,jdbcType=DECIMAL}, - - repayment_behavior_score = #{repaymentBehaviorScore,jdbcType=DECIMAL}, + + repayment_behavior_score = #{item.repaymentBehaviorScore,jdbcType=DECIMAL}, - - per_influence_factor_score = #{perInfluenceFactorScore,jdbcType=DECIMAL}, + + per_influence_factor_score = #{item.perInfluenceFactorScore,jdbcType=DECIMAL}, - - per_credit_optimization_socre = #{perCreditOptimizationSocre,jdbcType=DECIMAL}, + + per_credit_optimization_socre = #{item.perCreditOptimizationSocre,jdbcType=DECIMAL}, - - per_credit_rating_socre = #{perCreditRatingSocre,jdbcType=DECIMAL}, + + per_credit_rating_socre = #{item.perCreditRatingSocre,jdbcType=DECIMAL}, - - ent_influence_factor_socre = #{entInfluenceFactorSocre,jdbcType=DECIMAL}, + + ent_influence_factor_socre = #{item.entInfluenceFactorSocre,jdbcType=DECIMAL}, - - ent_credit_optimization_socre = #{entCreditOptimizationSocre,jdbcType=DECIMAL}, + + ent_credit_optimization_socre = #{item.entCreditOptimizationSocre,jdbcType=DECIMAL}, - - ent_credit_rating_socre = #{entCreditRatingSocre,jdbcType=DECIMAL}, + + ent_credit_rating_socre = #{item.entCreditRatingSocre,jdbcType=DECIMAL}, - - case_user_profile_socre = #{caseUserProfileSocre,jdbcType=DECIMAL}, + + case_user_profile_socre = #{item.caseUserProfileSocre,jdbcType=DECIMAL}, - - case_personal_credit_score = #{casePersonalCreditScore,jdbcType=DECIMAL}, + + case_personal_credit_score = #{item.casePersonalCreditScore,jdbcType=DECIMAL}, - - case_corporate_credit_score = #{caseCorporateCreditScore,jdbcType=DECIMAL}, + + case_corporate_credit_score = #{item.caseCorporateCreditScore,jdbcType=DECIMAL}, - - case_corporate_credit_sub_score = #{caseCorporateCreditSubScore,jdbcType=DECIMAL}, + + case_corporate_credit_sub_score = #{item.caseCorporateCreditSubScore,jdbcType=DECIMAL}, - - case_corporate_credit_obj_score = #{caseCorporateCreditObjScore,jdbcType=DECIMAL}, + + case_corporate_credit_obj_score = #{item.caseCorporateCreditObjScore,jdbcType=DECIMAL}, - - case_personal_credit_sub_score = #{casePersonalCreditSubScore,jdbcType=DECIMAL}, + + case_personal_credit_sub_score = #{item.casePersonalCreditSubScore,jdbcType=DECIMAL}, - - case_personal_credit_obj_score = #{casePersonalCreditObjScore,jdbcType=DECIMAL}, + + case_personal_credit_obj_score = #{item.casePersonalCreditObjScore,jdbcType=DECIMAL}, - - credit_portrait_score = #{creditPortraitScore,jdbcType=DECIMAL}, + + credit_portrait_score = #{item.creditPortraitScore,jdbcType=DECIMAL}, - - credit_portrait_rank = #{creditPortraitRank,jdbcType=INTEGER}, + + credit_portrait_rank = #{item.creditPortraitRank,jdbcType=INTEGER}, - - personal_credit_score = #{personalCreditScore,jdbcType=DECIMAL}, + + personal_credit_score = #{item.personalCreditScore,jdbcType=DECIMAL}, - - personal_credit_rank = #{personalCreditRank,jdbcType=INTEGER}, + + personal_credit_rank = #{item.personalCreditRank,jdbcType=INTEGER}, - - corporate_credit_score = #{corporateCreditScore,jdbcType=DECIMAL}, + + corporate_credit_score = #{item.corporateCreditScore,jdbcType=DECIMAL}, - - corporate_credit_rank = #{corporateCreditRank,jdbcType=INTEGER}, + + corporate_credit_rank = #{item.corporateCreditRank,jdbcType=INTEGER}, - - comprehensive_case_score = #{comprehensiveCaseScore,jdbcType=DECIMAL}, + + comprehensive_case_score = #{item.comprehensiveCaseScore,jdbcType=DECIMAL}, - - comprehensive_case_rank = #{comprehensiveCaseRank,jdbcType=INTEGER}, + + comprehensive_case_rank = #{item.comprehensiveCaseRank,jdbcType=INTEGER}, - - total_rank = #{totalRank,jdbcType=INTEGER}, + + total_rank = #{item.totalRank,jdbcType=INTEGER}, - - total_score = #{totalScore,jdbcType=DECIMAL}, + + total_score = #{item.totalScore,jdbcType=DECIMAL}, where user_id = #{item.userId,jdbcType=VARCHAR}