diff --git a/src/main/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerController.java b/src/main/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerController.java index 88d0ea5..7d1e8f3 100644 --- a/src/main/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerController.java +++ b/src/main/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerController.java @@ -39,6 +39,8 @@ import com.sztzjy.linkCommerce.entity.dto.ConsumerBehaviorStepFourValidationResu import com.sztzjy.linkCommerce.entity.dto.ConsumerBehaviorWordPreviewResult; import com.sztzjy.linkCommerce.entity.dto.FeatureConversionStepOneValidationRequest; import com.sztzjy.linkCommerce.entity.dto.FeatureConversionStepOneValidationResult; +import com.sztzjy.linkCommerce.entity.dto.FeatureConversionStepTwoValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.FeatureConversionStepTwoValidationResult; import com.sztzjy.linkCommerce.service.NewProductSurveyStepOneService; import com.sztzjy.linkCommerce.service.MarketOpportunitySelectionStepOneService; import com.sztzjy.linkCommerce.service.MarketOpportunitySelectionStepTwoService; @@ -56,6 +58,7 @@ import com.sztzjy.linkCommerce.service.ConsumerBehaviorStepTwoService; import com.sztzjy.linkCommerce.service.ConsumerBehaviorStepThreeService; import com.sztzjy.linkCommerce.service.ConsumerBehaviorStepFourService; import com.sztzjy.linkCommerce.service.FeatureConversionStepOneService; +import com.sztzjy.linkCommerce.service.FeatureConversionStepTwoService; import com.sztzjy.linkCommerce.service.StudentTrainingAnswerService; import com.sztzjy.linkCommerce.util.ResultEntity; import io.swagger.annotations.Api; @@ -123,6 +126,9 @@ public class StudentTrainingAnswerController { @Autowired private FeatureConversionStepOneService featureConversionStepOneService; + @Autowired + private FeatureConversionStepTwoService featureConversionStepTwoService; + @GetMapping("/{taskKey}") @ApiOperation("查询当前学生指定实训任务答案") public ResultEntity detail(@PathVariable String taskKey, @@ -338,6 +344,17 @@ public class StudentTrainingAnswerController { } } + @PostMapping("/feature-conversion/step-2/validate") + @ApiOperation("需求转化为功能第二步校验") + public ResultEntity validateFeatureConversionStepTwo( + @RequestBody FeatureConversionStepTwoValidationRequest answer, HttpServletRequest request) { + try { + return new ResultEntity<>(HttpStatus.OK, "校验完成", featureConversionStepTwoService.validate(answer, TokenProvider.getJWTUser(request))); + } catch (ServiceException e) { + return new ResultEntity<>(e.getCode(), e.getMessage()); + } + } + @PostMapping(value = "/consumer-behavior/step-3/word-preview", consumes = "multipart/form-data") @ApiOperation("消费者需求与行为第三步Word预览") public ResultEntity previewConsumerBehaviorStepThreeWord( diff --git a/src/main/java/com/sztzjy/linkCommerce/entity/dto/FeatureConversionStepTwoValidationRequest.java b/src/main/java/com/sztzjy/linkCommerce/entity/dto/FeatureConversionStepTwoValidationRequest.java new file mode 100644 index 0000000..726e7dd --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/entity/dto/FeatureConversionStepTwoValidationRequest.java @@ -0,0 +1,52 @@ +package com.sztzjy.linkCommerce.entity.dto; + +import java.util.List; + +public class FeatureConversionStepTwoValidationRequest { + private List sourceDefinitions; + private List rows; + + public List getSourceDefinitions() { + return sourceDefinitions; + } + + public void setSourceDefinitions(List sourceDefinitions) { + this.sourceDefinitions = sourceDefinitions; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RiceScoreRow { + private String requirementId; + private String name; + private String kano; + private Double reach; + private Double impact; + private Double confidence; + private Double effort; + private String riceScore; + + public String getRequirementId() { return requirementId; } + public void setRequirementId(String requirementId) { this.requirementId = requirementId; } + public String getName() { return name; } + public void setName(String name) { this.name = name; } + public String getKano() { return kano; } + public void setKano(String kano) { this.kano = kano; } + public Double getReach() { return reach; } + public void setReach(Double reach) { this.reach = reach; } + public Double getImpact() { return impact; } + public void setImpact(Double impact) { this.impact = impact; } + public Double getConfidence() { return confidence; } + public void setConfidence(Double confidence) { this.confidence = confidence; } + public Double getEffort() { return effort; } + public void setEffort(Double effort) { this.effort = effort; } + public String getRiceScore() { return riceScore; } + public void setRiceScore(String riceScore) { this.riceScore = riceScore; } + } +} diff --git a/src/main/java/com/sztzjy/linkCommerce/entity/dto/FeatureConversionStepTwoValidationResult.java b/src/main/java/com/sztzjy/linkCommerce/entity/dto/FeatureConversionStepTwoValidationResult.java new file mode 100644 index 0000000..25acca7 --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/entity/dto/FeatureConversionStepTwoValidationResult.java @@ -0,0 +1,11 @@ +package com.sztzjy.linkCommerce.entity.dto; + +public class FeatureConversionStepTwoValidationResult { + private boolean valid; + private String message; + + public boolean isValid() { return valid; } + public void setValid(boolean valid) { this.valid = valid; } + public String getMessage() { return message; } + public void setMessage(String message) { this.message = message; } +} diff --git a/src/main/java/com/sztzjy/linkCommerce/service/FeatureConversionStepTwoService.java b/src/main/java/com/sztzjy/linkCommerce/service/FeatureConversionStepTwoService.java new file mode 100644 index 0000000..422ccfb --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/service/FeatureConversionStepTwoService.java @@ -0,0 +1,9 @@ +package com.sztzjy.linkCommerce.service; + +import com.sztzjy.linkCommerce.config.security.JwtUser; +import com.sztzjy.linkCommerce.entity.dto.FeatureConversionStepTwoValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.FeatureConversionStepTwoValidationResult; + +public interface FeatureConversionStepTwoService { + FeatureConversionStepTwoValidationResult validate(FeatureConversionStepTwoValidationRequest request, JwtUser user); +} diff --git a/src/main/java/com/sztzjy/linkCommerce/service/impl/FeatureConversionStepTwoServiceImpl.java b/src/main/java/com/sztzjy/linkCommerce/service/impl/FeatureConversionStepTwoServiceImpl.java new file mode 100644 index 0000000..eb64922 --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/service/impl/FeatureConversionStepTwoServiceImpl.java @@ -0,0 +1,82 @@ +package com.sztzjy.linkCommerce.service.impl; + +import com.sztzjy.linkCommerce.config.exception.handler.ServiceException; +import com.sztzjy.linkCommerce.config.security.JwtUser; +import com.sztzjy.linkCommerce.entity.dto.FeatureConversionStepTwoValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.FeatureConversionStepTwoValidationResult; +import com.sztzjy.linkCommerce.service.FeatureConversionStepTwoService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.Arrays; +import java.util.List; + +@Service +public class FeatureConversionStepTwoServiceImpl implements FeatureConversionStepTwoService { + private static final int MIN_ROWS = 8; + private static final int MAX_ROWS = 12; + private static final List KANO_TYPES = Arrays.asList("基本型", "期望型", "兴奋型", "无差异型", "反向型"); + + @Override + public FeatureConversionStepTwoValidationResult validate(FeatureConversionStepTwoValidationRequest request, JwtUser user) { + requireStudent(user); + List sourceDefinitions = request == null ? null : request.getSourceDefinitions(); + List rows = request == null ? null : request.getRows(); + if (sourceDefinitions == null || rows == null || rows.size() < MIN_ROWS || rows.size() > MAX_ROWS || sourceDefinitions.size() != rows.size()) { + throw badRequest("RICE 评分行数必须与第一步需求转化表一致，且为 8 至 12 行"); + } + for (int index = 0; index < rows.size(); index++) { + String expectedId = String.format("F%02d", index + 1); + String expectedName = sourceDefinitions.get(index); + FeatureConversionStepTwoValidationRequest.RiceScoreRow row = rows.get(index); + if (row == null || StringUtils.isBlank(expectedName) || !expectedId.equals(row.getRequirementId()) || !expectedName.equals(row.getName())) { + throw badRequest("需求 ID 与功能名称必须与第一步的功能定义保持一致"); + } + if (!KANO_TYPES.contains(row.getKano()) || !isScore(row.getReach()) || !isScore(row.getImpact()) + || !isConfidence(row.getConfidence()) || row.getEffort() == null || row.getEffort() <= 0 || !isRiceScoreValid(row)) { + throw badRequest("请完整填写 KANO、Reach、Impact、Confidence、Effort，并确认 RICE 得分正确"); + } + } + FeatureConversionStepTwoValidationResult result = new FeatureConversionStepTwoValidationResult(); + result.setValid(true); + result.setMessage("RICE 评分填写完整。"); + return result; + } + + private boolean isScore(Double value) { + return value != null && value >= 1 && value <= 5 && value == Math.rint(value); + } + + private boolean isConfidence(Double value) { + return value != null && value >= 1 && value <= 100 && value == Math.rint(value); + } + + private boolean isRiceScoreValid(FeatureConversionStepTwoValidationRequest.RiceScoreRow row) { + if (StringUtils.isBlank(row.getRiceScore())) return false; + try { + BigDecimal expected = BigDecimal.valueOf(row.getReach()) + .multiply(BigDecimal.valueOf(row.getImpact())) + .multiply(BigDecimal.valueOf(row.getConfidence()).movePointLeft(2)) + .divide(BigDecimal.valueOf(row.getEffort()), 2, RoundingMode.HALF_UP); + return expected.compareTo(new BigDecimal(row.getRiceScore())) == 0; + } catch (NumberFormatException error) { + return false; + } + } + + private void requireStudent(JwtUser user) { + if (user == null || StringUtils.isBlank(user.getUserId())) { + throw new ServiceException(HttpStatus.UNAUTHORIZED, "请先登录后再提交"); + } + if (user.getRoleId() != 4) { + throw new ServiceException(HttpStatus.FORBIDDEN, "仅学生可以提交实训答案"); + } + } + + private ServiceException badRequest(String message) { + return new ServiceException(HttpStatus.BAD_REQUEST, message); + } +} diff --git a/src/test/java/com/sztzjy/linkCommerce/service/impl/FeatureConversionStepTwoServiceImplTest.java b/src/test/java/com/sztzjy/linkCommerce/service/impl/FeatureConversionStepTwoServiceImplTest.java new file mode 100644 index 0000000..93b219c --- /dev/null +++ b/src/test/java/com/sztzjy/linkCommerce/service/impl/FeatureConversionStepTwoServiceImplTest.java @@ -0,0 +1,70 @@ +package com.sztzjy.linkCommerce.service.impl; + +import com.sztzjy.linkCommerce.config.exception.handler.ServiceException; +import com.sztzjy.linkCommerce.config.security.JwtUser; +import com.sztzjy.linkCommerce.entity.dto.FeatureConversionStepTwoValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.FeatureConversionStepTwoValidationResult; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class FeatureConversionStepTwoServiceImplTest { + private final FeatureConversionStepTwoServiceImpl service = new FeatureConversionStepTwoServiceImpl(); + + @Test + void acceptsSynchronizedRiceRows() { + FeatureConversionStepTwoValidationResult result = service.validate(request(), student()); + + assertTrue(result.isValid()); + } + + @Test + void rejectsNameNotSynchronizedWithStepOne() { + FeatureConversionStepTwoValidationRequest request = request(); + request.getRows().get(0).setName("手动修改的功能"); + + assertThrows(ServiceException.class, () -> service.validate(request, student())); + } + + @Test + void rejectsInvalidRiceScore() { + FeatureConversionStepTwoValidationRequest request = request(); + request.getRows().get(0).setRiceScore("15.99"); + + assertThrows(ServiceException.class, () -> service.validate(request, student())); + } + + private FeatureConversionStepTwoValidationRequest request() { + FeatureConversionStepTwoValidationRequest request = new FeatureConversionStepTwoValidationRequest(); + List definitions = new ArrayList<>(); + List rows = new ArrayList<>(); + for (int index = 0; index < 8; index++) { + String definition = "功能定义" + (index + 1); + definitions.add(definition); + FeatureConversionStepTwoValidationRequest.RiceScoreRow row = new FeatureConversionStepTwoValidationRequest.RiceScoreRow(); + row.setRequirementId(String.format("F%02d", index + 1)); + row.setName(definition); + row.setKano("基本型"); + row.setReach(5D); + row.setImpact(4D); + row.setConfidence(80D); + row.setEffort(1D); + row.setRiceScore("16.00"); + rows.add(row); + } + request.setSourceDefinitions(definitions); + request.setRows(rows); + return request; + } + + private JwtUser student() { + JwtUser user = new JwtUser(); + user.setUserId("stu-1"); + user.setRoleId(4); + return user; + } +}