Browse Source

bug修复

master
luogw 1 month ago
parent
commit
26943dd235
  1. 6
      src/main/java/com/project/appeal/domain/service/Impl/CheckAppealDomainServiceImpl.java
  2. 12
      src/main/java/com/project/interaction/domain/service/impl/PostToGenerateQuestionDomainServiceImpl.java
  3. 2
      src/main/java/com/project/task/domain/service/impl/SaveOrUpdateTaskDomainServiceImpl.java
  4. 1
      src/main/resources/application-dev.yml
  5. 1
      src/main/resources/application-test.yml

6
src/main/java/com/project/appeal/domain/service/Impl/CheckAppealDomainServiceImpl.java

@ -37,9 +37,6 @@ public class CheckAppealDomainServiceImpl implements CheckAppealDomainService {
if (ObjectUtil.isEmpty(appealDTO.getId()) && StringUtils.isBlank(appealDTO.getRemark())){ if (ObjectUtil.isEmpty(appealDTO.getId()) && StringUtils.isBlank(appealDTO.getRemark())){
throw new MissingParameterException("缺少申诉理由"); throw new MissingParameterException("缺少申诉理由");
} }
if (ObjectUtil.isEmpty(appealDTO.getId()) && appealDTO.getRemark().length() > 500){
throw new MissingParameterException("申诉理由不能超过500字符");
}
if (ObjectUtil.isEmpty(appealDTO.getId()) && !appealDTO.getStatus().equals(AppealStatusEnum.PENDING_REVIEW.getValue())){ if (ObjectUtil.isEmpty(appealDTO.getId()) && !appealDTO.getStatus().equals(AppealStatusEnum.PENDING_REVIEW.getValue())){
throw new BusinessErrorException("申诉状态错误"); throw new BusinessErrorException("申诉状态错误");
@ -50,9 +47,6 @@ public class CheckAppealDomainServiceImpl implements CheckAppealDomainService {
if (!appealDTO.getStatus().equals(AppealStatusEnum.PENDING_REVIEW.getValue()) && StringUtils.isBlank(appealDTO.getReason())){ if (!appealDTO.getStatus().equals(AppealStatusEnum.PENDING_REVIEW.getValue()) && StringUtils.isBlank(appealDTO.getReason())){
throw new BusinessErrorException("缺少审批意见"); throw new BusinessErrorException("缺少审批意见");
} }
if (!appealDTO.getStatus().equals(AppealStatusEnum.PENDING_REVIEW.getValue()) && appealDTO.getReason().length() > 500){
throw new MissingParameterException("审批意见不能超过500字符");
}
//校验题目是否以申诉过 //校验题目是否以申诉过
if (ObjectUtil.isEmpty(appealDTO.getId()) ){ if (ObjectUtil.isEmpty(appealDTO.getId()) ){
QueryWrapper<AppealEntity> entityQueryWrapper = new QueryWrapper<>(); QueryWrapper<AppealEntity> entityQueryWrapper = new QueryWrapper<>();

12
src/main/java/com/project/interaction/domain/service/impl/PostToGenerateQuestionDomainServiceImpl.java

@ -55,6 +55,10 @@ public class PostToGenerateQuestionDomainServiceImpl implements PostToGenerateQu
private final List<Integer> list = Arrays.asList(0, 1, 2, 3); private final List<Integer> list = Arrays.asList(0, 1, 2, 3);
@Value("${question.generation.downgrade:true}")
private Boolean downgrade;
/** /**
* 生成题目 * 生成题目
* 1. 先尝试调用算法服务生成真实题目 * 1. 先尝试调用算法服务生成真实题目
@ -73,6 +77,11 @@ public class PostToGenerateQuestionDomainServiceImpl implements PostToGenerateQu
log.info(">>> [题目生成] 开始生成题目, TaskId: {}, ClusterId: {}, 题型: {}, 数量: {}", log.info(">>> [题目生成] 开始生成题目, TaskId: {}, ClusterId: {}, 题型: {}, 数量: {}",
taskId, clusterId, questionType, num); taskId, clusterId, questionType, num);
if (downgrade){
generateFallbackQuestions(dtoList, questionType, num);
return;
}
try { try {
// 应用限流:获取令牌,超过限流速率则等待 // 应用限流:获取令牌,超过限流速率则等待
long waitStart = System.currentTimeMillis(); long waitStart = System.currentTimeMillis();
@ -96,9 +105,6 @@ public class PostToGenerateQuestionDomainServiceImpl implements PostToGenerateQu
taskId, e.getMessage()); taskId, e.getMessage());
} }
//熔断降级:算法服务失败时使用硬编码生成默认题目
// log.info(">>> [题目生成] 启用熔断降级,生成默认题目");
// generateFallbackQuestions(dtoList, questionType, num);
//发送预警通知 //发送预警通知
notifyUtil.notify(taskId,clusterId); notifyUtil.notify(taskId,clusterId);
} }

2
src/main/java/com/project/task/domain/service/impl/SaveOrUpdateTaskDomainServiceImpl.java

@ -225,7 +225,7 @@ public class SaveOrUpdateTaskDomainServiceImpl implements SaveOrUpdateTaskDomain
// 获取知识点总数用于校验 // 获取知识点总数用于校验
int totalKnowledgePoints = dto.getAccurateGraspNum() + dto.getVagueGraspNum(); int totalKnowledgePoints = dto.getAccurateGraspNum() + dto.getVagueGraspNum();
if (totalQuestions > totalKnowledgePoints) { if (totalQuestions > totalKnowledgePoints) {
throw new BusinessErrorException("题目总数" + totalQuestions + ")不能超过知识点总数(" + totalKnowledgePoints + ")"); throw new BusinessErrorException("题目总数" + totalQuestions + ",不能超过知识点总数" + totalKnowledgePoints);
} }
if (totalQuestions > 100) { if (totalQuestions > 100) {
throw new BusinessErrorException("题目总数不能超过 100 道,当前为:" + totalQuestions); throw new BusinessErrorException("题目总数不能超过 100 道,当前为:" + totalQuestions);

1
src/main/resources/application-dev.yml

@ -86,5 +86,6 @@ question:
generation: generation:
# 限流速率:每秒允许的API请求数 # 限流速率:每秒允许的API请求数
rate-limit: 20 rate-limit: 20
downgrade: false
scheduled-task: scheduled-task:
owner: test owner: test

1
src/main/resources/application-test.yml

@ -84,6 +84,7 @@ question:
generation: generation:
# 限流速率:每秒允许的API请求数 # 限流速率:每秒允许的API请求数
rate-limit: 20 rate-limit: 20
downgrade: true
scheduled-task: scheduled-task:
owner: test owner: test
Loading…
Cancel
Save