From 4e11972d5a454c88827397d43b475b6c4683cfba Mon Sep 17 00:00:00 2001 From: chenyuan Date: Fri, 7 Aug 2026 18:58:15 +0800 Subject: [PATCH] feat: validate market opportunity selection step three --- .../stu/StudentTrainingAnswerController.java | 17 ++++++++ ...tySelectionStepThreeValidationRequest.java | 18 ++++++++ ...itySelectionStepThreeValidationResult.java | 10 +++++ ...tOpportunitySelectionStepThreeService.java | 9 ++++ ...ortunitySelectionStepThreeServiceImpl.java | 41 +++++++++++++++++++ .../StudentTrainingAnswerControllerTest.java | 15 +++++++ ...nitySelectionStepThreeServiceImplTest.java | 39 ++++++++++++++++++ 7 files changed, 149 insertions(+) create mode 100644 src/main/java/com/sztzjy/linkCommerce/entity/dto/MarketOpportunitySelectionStepThreeValidationRequest.java create mode 100644 src/main/java/com/sztzjy/linkCommerce/entity/dto/MarketOpportunitySelectionStepThreeValidationResult.java create mode 100644 src/main/java/com/sztzjy/linkCommerce/service/MarketOpportunitySelectionStepThreeService.java create mode 100644 src/main/java/com/sztzjy/linkCommerce/service/impl/MarketOpportunitySelectionStepThreeServiceImpl.java create mode 100644 src/test/java/com/sztzjy/linkCommerce/service/impl/MarketOpportunitySelectionStepThreeServiceImplTest.java 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 d23a3f3..6690949 100644 --- a/src/main/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerController.java +++ b/src/main/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerController.java @@ -10,6 +10,8 @@ import com.sztzjy.linkCommerce.entity.dto.MarketOpportunitySelectionStepOneCheck import com.sztzjy.linkCommerce.entity.dto.MarketOpportunitySelectionStepOneCheckResult; import com.sztzjy.linkCommerce.entity.dto.MarketOpportunitySelectionStepTwoValidationRequest; import com.sztzjy.linkCommerce.entity.dto.MarketOpportunitySelectionStepTwoValidationResult; +import com.sztzjy.linkCommerce.entity.dto.MarketOpportunitySelectionStepThreeValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.MarketOpportunitySelectionStepThreeValidationResult; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepTwoValidationRequest; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepTwoValidationResult; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepThreeValidationRequest; @@ -27,6 +29,7 @@ import com.sztzjy.linkCommerce.entity.dto.ProductDevelopmentFactorsStepFourValid import com.sztzjy.linkCommerce.service.NewProductSurveyStepOneService; import com.sztzjy.linkCommerce.service.MarketOpportunitySelectionStepOneService; import com.sztzjy.linkCommerce.service.MarketOpportunitySelectionStepTwoService; +import com.sztzjy.linkCommerce.service.MarketOpportunitySelectionStepThreeService; import com.sztzjy.linkCommerce.service.NewProductSurveyStepTwoService; import com.sztzjy.linkCommerce.service.NewProductSurveyStepThreeService; import com.sztzjy.linkCommerce.service.NewProductSurveyStepFourService; @@ -60,6 +63,9 @@ public class StudentTrainingAnswerController { @Autowired private MarketOpportunitySelectionStepTwoService marketOpportunitySelectionStepTwoService; + @Autowired + private MarketOpportunitySelectionStepThreeService marketOpportunitySelectionStepThreeService; + @Autowired private NewProductSurveyStepTwoService newProductSurveyStepTwoService; @@ -139,6 +145,17 @@ public class StudentTrainingAnswerController { } } + @PostMapping("/market-opportunity-selection/step-3/validate") + @ApiOperation("市场机会识别与选品第三步校验") + public ResultEntity validateMarketOpportunitySelectionStepThree( + @RequestBody MarketOpportunitySelectionStepThreeValidationRequest answer, HttpServletRequest request) { + try { + return new ResultEntity<>(HttpStatus.OK, "校验通过", marketOpportunitySelectionStepThreeService.validate(answer, TokenProvider.getJWTUser(request))); + } catch (ServiceException e) { + return new ResultEntity<>(e.getCode(), e.getMessage()); + } + } + @PostMapping("/new-product-survey/step-2/validate") @ApiOperation("新产品调查与分析第二步校验") public ResultEntity validateNewProductSurveyStepTwo( diff --git a/src/main/java/com/sztzjy/linkCommerce/entity/dto/MarketOpportunitySelectionStepThreeValidationRequest.java b/src/main/java/com/sztzjy/linkCommerce/entity/dto/MarketOpportunitySelectionStepThreeValidationRequest.java new file mode 100644 index 0000000..c2f264f --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/entity/dto/MarketOpportunitySelectionStepThreeValidationRequest.java @@ -0,0 +1,18 @@ +package com.sztzjy.linkCommerce.entity.dto; + +import java.math.BigDecimal; +import java.util.List; + +public class MarketOpportunitySelectionStepThreeValidationRequest { + private List scores; + public List getScores() { return scores; } + public void setScores(List scores) { this.scores = scores; } + public static class Score { + private String id; + private BigDecimal score; + public String getId() { return id; } + public void setId(String id) { this.id = id; } + public BigDecimal getScore() { return score; } + public void setScore(BigDecimal score) { this.score = score; } + } +} diff --git a/src/main/java/com/sztzjy/linkCommerce/entity/dto/MarketOpportunitySelectionStepThreeValidationResult.java b/src/main/java/com/sztzjy/linkCommerce/entity/dto/MarketOpportunitySelectionStepThreeValidationResult.java new file mode 100644 index 0000000..a76d025 --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/entity/dto/MarketOpportunitySelectionStepThreeValidationResult.java @@ -0,0 +1,10 @@ +package com.sztzjy.linkCommerce.entity.dto; + +public class MarketOpportunitySelectionStepThreeValidationResult { + 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/MarketOpportunitySelectionStepThreeService.java b/src/main/java/com/sztzjy/linkCommerce/service/MarketOpportunitySelectionStepThreeService.java new file mode 100644 index 0000000..1caeb9f --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/service/MarketOpportunitySelectionStepThreeService.java @@ -0,0 +1,9 @@ +package com.sztzjy.linkCommerce.service; + +import com.sztzjy.linkCommerce.config.security.JwtUser; +import com.sztzjy.linkCommerce.entity.dto.MarketOpportunitySelectionStepThreeValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.MarketOpportunitySelectionStepThreeValidationResult; + +public interface MarketOpportunitySelectionStepThreeService { + MarketOpportunitySelectionStepThreeValidationResult validate(MarketOpportunitySelectionStepThreeValidationRequest request, JwtUser user); +} diff --git a/src/main/java/com/sztzjy/linkCommerce/service/impl/MarketOpportunitySelectionStepThreeServiceImpl.java b/src/main/java/com/sztzjy/linkCommerce/service/impl/MarketOpportunitySelectionStepThreeServiceImpl.java new file mode 100644 index 0000000..0e83dd9 --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/service/impl/MarketOpportunitySelectionStepThreeServiceImpl.java @@ -0,0 +1,41 @@ +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.StudentTrainingAnswer; +import com.sztzjy.linkCommerce.entity.dto.MarketOpportunitySelectionStepThreeValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.MarketOpportunitySelectionStepThreeValidationResult; +import com.sztzjy.linkCommerce.service.MarketOpportunitySelectionStepThreeService; +import com.sztzjy.linkCommerce.service.StudentTrainingAnswerService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.LinkedHashSet; +import java.util.Set; + +@Service +public class MarketOpportunitySelectionStepThreeServiceImpl implements MarketOpportunitySelectionStepThreeService { + private static final String TASK_KEY = "market-opportunity-selection"; + private static final Set PRODUCT_IDS = new LinkedHashSet<>(Arrays.asList("smart-fitness-mirror", "smart-bathroom-mirror", "smart-beauty-mirror")); + @Autowired private StudentTrainingAnswerService studentTrainingAnswerService; + + @Override + public MarketOpportunitySelectionStepThreeValidationResult validate(MarketOpportunitySelectionStepThreeValidationRequest request, JwtUser user) { + if (user == null || StringUtils.isBlank(user.getUserId())) throw new ServiceException(HttpStatus.UNAUTHORIZED, "请先登录后再校验"); + if (user.getRoleId() != 4) throw new ServiceException(HttpStatus.FORBIDDEN, "仅学生可进行实训校验"); + StudentTrainingAnswer savedAnswer = studentTrainingAnswerService.get(TASK_KEY, null, user); + if (savedAnswer == null || StringUtils.isBlank(savedAnswer.getStep2Answer())) throw new ServiceException(HttpStatus.BAD_REQUEST, "请先完成并保存第 2 步指标权重设定"); + if (request == null || request.getScores() == null || request.getScores().size() != PRODUCT_IDS.size()) throw new ServiceException(HttpStatus.BAD_REQUEST, "请为三类产品填写综合得分"); + Set submittedIds = new LinkedHashSet<>(); + for (MarketOpportunitySelectionStepThreeValidationRequest.Score item : request.getScores()) { + String id = item == null ? "" : StringUtils.trimToEmpty(item.getId()); BigDecimal score = item == null ? null : item.getScore(); + if (!PRODUCT_IDS.contains(id) || !submittedIds.add(id) || score == null || score.compareTo(BigDecimal.ZERO) < 0 || score.compareTo(new BigDecimal("100")) > 0) throw new ServiceException(HttpStatus.BAD_REQUEST, "综合得分需为 0 至 100 的数值"); + } + if (!submittedIds.equals(PRODUCT_IDS)) throw new ServiceException(HttpStatus.BAD_REQUEST, "提交的产品品类不完整"); + MarketOpportunitySelectionStepThreeValidationResult result = new MarketOpportunitySelectionStepThreeValidationResult(); result.setValid(true); result.setMessage("校验通过"); return result; + } +} diff --git a/src/test/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerControllerTest.java b/src/test/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerControllerTest.java index 501edd4..7353a0e 100644 --- a/src/test/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerControllerTest.java +++ b/src/test/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerControllerTest.java @@ -9,6 +9,8 @@ import com.sztzjy.linkCommerce.entity.dto.MarketOpportunitySelectionStepOneCheck import com.sztzjy.linkCommerce.entity.dto.MarketOpportunitySelectionStepOneCheckResult; import com.sztzjy.linkCommerce.entity.dto.MarketOpportunitySelectionStepTwoValidationRequest; import com.sztzjy.linkCommerce.entity.dto.MarketOpportunitySelectionStepTwoValidationResult; +import com.sztzjy.linkCommerce.entity.dto.MarketOpportunitySelectionStepThreeValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.MarketOpportunitySelectionStepThreeValidationResult; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepTwoValidationRequest; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepTwoValidationResult; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepThreeValidationRequest; @@ -24,6 +26,7 @@ import com.sztzjy.linkCommerce.entity.dto.ProductDevelopmentFactorsStepThreeVali import com.sztzjy.linkCommerce.service.NewProductSurveyStepOneService; import com.sztzjy.linkCommerce.service.MarketOpportunitySelectionStepOneService; import com.sztzjy.linkCommerce.service.MarketOpportunitySelectionStepTwoService; +import com.sztzjy.linkCommerce.service.MarketOpportunitySelectionStepThreeService; import com.sztzjy.linkCommerce.service.NewProductSurveyStepTwoService; import com.sztzjy.linkCommerce.service.NewProductSurveyStepThreeService; import com.sztzjy.linkCommerce.service.NewProductSurveyStepFourService; @@ -87,6 +90,18 @@ class StudentTrainingAnswerControllerTest { verify(service).validate(any(MarketOpportunitySelectionStepTwoValidationRequest.class), any(JwtUser.class)); } + @Test + void validateMarketOpportunitySelectionStepThreeUsesTheAuthenticatedStudentAndReturnsTheValidationResult() { + StudentTrainingAnswerController controller = new StudentTrainingAnswerController(); + MarketOpportunitySelectionStepThreeService service = mock(MarketOpportunitySelectionStepThreeService.class); + ReflectionTestUtils.setField(controller, "marketOpportunitySelectionStepThreeService", service); + MarketOpportunitySelectionStepThreeValidationResult validation = new MarketOpportunitySelectionStepThreeValidationResult(); validation.setValid(true); + when(service.validate(any(MarketOpportunitySelectionStepThreeValidationRequest.class), any(JwtUser.class))).thenReturn(validation); + ResultEntity result = controller.validateMarketOpportunitySelectionStepThree(new MarketOpportunitySelectionStepThreeValidationRequest(), authenticatedStudentRequest()); + assertEquals(HttpStatus.OK, result.getStatusCode()); assertEquals(validation, result.getBody().getData()); + verify(service).validate(any(MarketOpportunitySelectionStepThreeValidationRequest.class), any(JwtUser.class)); + } + @Test void validateStepTwoUsesTheAuthenticatedStudentAndReturnsTheValidationResult() { StudentTrainingAnswerController controller = new StudentTrainingAnswerController(); diff --git a/src/test/java/com/sztzjy/linkCommerce/service/impl/MarketOpportunitySelectionStepThreeServiceImplTest.java b/src/test/java/com/sztzjy/linkCommerce/service/impl/MarketOpportunitySelectionStepThreeServiceImplTest.java new file mode 100644 index 0000000..9eb4f43 --- /dev/null +++ b/src/test/java/com/sztzjy/linkCommerce/service/impl/MarketOpportunitySelectionStepThreeServiceImplTest.java @@ -0,0 +1,39 @@ +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.StudentTrainingAnswer; +import com.sztzjy.linkCommerce.entity.dto.MarketOpportunitySelectionStepThreeValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.MarketOpportunitySelectionStepThreeValidationResult; +import com.sztzjy.linkCommerce.service.StudentTrainingAnswerService; +import org.junit.jupiter.api.Test; +import org.springframework.test.util.ReflectionTestUtils; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Arrays; + +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +class MarketOpportunitySelectionStepThreeServiceImplTest { + @Test + void validateAcceptsScoresInRangeAfterStepTwoIsSaved() { + MarketOpportunitySelectionStepThreeValidationResult result = serviceWithStepTwo().validate(completedRequest(), student()); + assertTrue(result.isValid()); + } + @Test + void validateRejectsScoresOutsideRangeAndMissingStepTwo() { + MarketOpportunitySelectionStepThreeValidationRequest invalid = completedRequest(); invalid.getScores().get(0).setScore(new BigDecimal("100.01")); + assertThrows(ServiceException.class, () -> serviceWithStepTwo().validate(invalid, student())); + MarketOpportunitySelectionStepThreeServiceImpl service = new MarketOpportunitySelectionStepThreeServiceImpl(); StudentTrainingAnswerService answers = mock(StudentTrainingAnswerService.class); ReflectionTestUtils.setField(service, "studentTrainingAnswerService", answers); when(answers.get(anyString(), any(), any(JwtUser.class))).thenReturn(null); + assertThrows(ServiceException.class, () -> service.validate(completedRequest(), student())); + } + private MarketOpportunitySelectionStepThreeServiceImpl serviceWithStepTwo() { MarketOpportunitySelectionStepThreeServiceImpl service = new MarketOpportunitySelectionStepThreeServiceImpl(); StudentTrainingAnswerService answers = mock(StudentTrainingAnswerService.class); StudentTrainingAnswer answer = new StudentTrainingAnswer(); answer.setStep2Answer("{\"weights\":{}}"); when(answers.get(anyString(), any(), any(JwtUser.class))).thenReturn(answer); ReflectionTestUtils.setField(service, "studentTrainingAnswerService", answers); return service; } + private MarketOpportunitySelectionStepThreeValidationRequest completedRequest() { MarketOpportunitySelectionStepThreeValidationRequest request = new MarketOpportunitySelectionStepThreeValidationRequest(); ArrayList scores = new ArrayList<>(); Arrays.asList("smart-fitness-mirror", "smart-bathroom-mirror", "smart-beauty-mirror").forEach(id -> { MarketOpportunitySelectionStepThreeValidationRequest.Score score = new MarketOpportunitySelectionStepThreeValidationRequest.Score(); score.setId(id); score.setScore(new BigDecimal("86.50")); scores.add(score); }); request.setScores(scores); return request; } + private JwtUser student() { JwtUser user = new JwtUser(); user.setUserId("stu-1"); user.setRoleId(4); return user; } +}