From 665e0b8a26225b94f7d118ffffb45ec8ceba462f Mon Sep 17 00:00:00 2001 From: chenyuan Date: Fri, 7 Aug 2026 16:35:32 +0800 Subject: [PATCH] feat: validate industry demand analysis step one --- .../stu/StudentTrainingAnswerController.java | 17 ++++++++ ...emandAnalysisStepOneValidationRequest.java | 17 ++++++++ ...DemandAnalysisStepOneValidationResult.java | 10 +++++ .../IndustryDemandAnalysisStepOneService.java | 9 +++++ ...ustryDemandAnalysisStepOneServiceImpl.java | 31 ++++++++++++++ .../StudentTrainingAnswerControllerTest.java | 20 ++++++++++ ...yDemandAnalysisStepOneServiceImplTest.java | 40 +++++++++++++++++++ 7 files changed, 144 insertions(+) create mode 100644 src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepOneValidationRequest.java create mode 100644 src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepOneValidationResult.java create mode 100644 src/main/java/com/sztzjy/linkCommerce/service/IndustryDemandAnalysisStepOneService.java create mode 100644 src/main/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepOneServiceImpl.java create mode 100644 src/test/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepOneServiceImplTest.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 cbf8e22..40b347b 100644 --- a/src/main/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerController.java +++ b/src/main/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerController.java @@ -4,6 +4,8 @@ import com.sztzjy.linkCommerce.config.exception.handler.ServiceException; import com.sztzjy.linkCommerce.config.security.JwtUser; import com.sztzjy.linkCommerce.config.security.TokenProvider; import com.sztzjy.linkCommerce.entity.StudentTrainingAnswer; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepOneValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepOneValidationResult; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepOneCheckRequest; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepOneCheckResult; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepTwoValidationRequest; @@ -29,6 +31,7 @@ import com.sztzjy.linkCommerce.service.ProductDevelopmentFactorsStepTwoService; import com.sztzjy.linkCommerce.service.ProductDevelopmentFactorsStepThreeService; import com.sztzjy.linkCommerce.service.ProductDevelopmentFactorsStepFourService; import com.sztzjy.linkCommerce.service.StudentTrainingAnswerService; +import com.sztzjy.linkCommerce.service.IndustryDemandAnalysisStepOneService; import com.sztzjy.linkCommerce.util.ResultEntity; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -45,6 +48,9 @@ public class StudentTrainingAnswerController { @Autowired private StudentTrainingAnswerService studentTrainingAnswerService; + @Autowired + private IndustryDemandAnalysisStepOneService industryDemandAnalysisStepOneService; + @Autowired private NewProductSurveyStepOneService newProductSurveyStepOneService; @@ -93,6 +99,17 @@ public class StudentTrainingAnswerController { } } + @PostMapping("/industry-demand-analysis/step-1/validate") + @ApiOperation("行业需求分析第一步校验") + public ResultEntity validateIndustryDemandAnalysisStepOne( + @RequestBody IndustryDemandAnalysisStepOneValidationRequest answer, HttpServletRequest request) { + try { + return new ResultEntity<>(HttpStatus.OK, "校验通过", industryDemandAnalysisStepOneService.validate(answer, TokenProvider.getJWTUser(request))); + } catch (ServiceException e) { + return new ResultEntity<>(e.getCode(), e.getMessage()); + } + } + @PostMapping("/new-product-survey/step-1/check") @ApiOperation("新产品调查与分析第一步判题") public ResultEntity checkNewProductSurveyStepOne( diff --git a/src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepOneValidationRequest.java b/src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepOneValidationRequest.java new file mode 100644 index 0000000..48830aa --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepOneValidationRequest.java @@ -0,0 +1,17 @@ +package com.sztzjy.linkCommerce.entity.dto; + +public class IndustryDemandAnalysisStepOneValidationRequest { + private String political; + private String economic; + private String social; + private String technology; + + public String getPolitical() { return political; } + public void setPolitical(String political) { this.political = political; } + public String getEconomic() { return economic; } + public void setEconomic(String economic) { this.economic = economic; } + public String getSocial() { return social; } + public void setSocial(String social) { this.social = social; } + public String getTechnology() { return technology; } + public void setTechnology(String technology) { this.technology = technology; } +} diff --git a/src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepOneValidationResult.java b/src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepOneValidationResult.java new file mode 100644 index 0000000..e006bd4 --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepOneValidationResult.java @@ -0,0 +1,10 @@ +package com.sztzjy.linkCommerce.entity.dto; + +public class IndustryDemandAnalysisStepOneValidationResult { + 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/IndustryDemandAnalysisStepOneService.java b/src/main/java/com/sztzjy/linkCommerce/service/IndustryDemandAnalysisStepOneService.java new file mode 100644 index 0000000..c16bc6e --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/service/IndustryDemandAnalysisStepOneService.java @@ -0,0 +1,9 @@ +package com.sztzjy.linkCommerce.service; + +import com.sztzjy.linkCommerce.config.security.JwtUser; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepOneValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepOneValidationResult; + +public interface IndustryDemandAnalysisStepOneService { + IndustryDemandAnalysisStepOneValidationResult validate(IndustryDemandAnalysisStepOneValidationRequest request, JwtUser user); +} diff --git a/src/main/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepOneServiceImpl.java b/src/main/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepOneServiceImpl.java new file mode 100644 index 0000000..dfd34f8 --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepOneServiceImpl.java @@ -0,0 +1,31 @@ +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.IndustryDemandAnalysisStepOneValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepOneValidationResult; +import com.sztzjy.linkCommerce.service.IndustryDemandAnalysisStepOneService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; + +@Service +public class IndustryDemandAnalysisStepOneServiceImpl implements IndustryDemandAnalysisStepOneService { + @Override + public IndustryDemandAnalysisStepOneValidationResult validate(IndustryDemandAnalysisStepOneValidationRequest request, JwtUser user) { + requireStudent(user); + if (request == null || StringUtils.isBlank(request.getPolitical()) || StringUtils.isBlank(request.getEconomic()) + || StringUtils.isBlank(request.getSocial()) || StringUtils.isBlank(request.getTechnology())) { + throw new ServiceException(HttpStatus.BAD_REQUEST, "请完整填写政治、经济、社会和技术环境信息"); + } + IndustryDemandAnalysisStepOneValidationResult result = new IndustryDemandAnalysisStepOneValidationResult(); + result.setValid(true); + result.setMessage("校验通过"); + return result; + } + + 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, "仅学生可进行实训校验"); + } +} 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 801bc42..26325e2 100644 --- a/src/test/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerControllerTest.java +++ b/src/test/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerControllerTest.java @@ -3,6 +3,8 @@ package com.sztzjy.linkCommerce.controller.stu; import com.sztzjy.linkCommerce.config.Constant; import com.sztzjy.linkCommerce.config.security.JwtUser; import com.sztzjy.linkCommerce.config.security.TokenProvider; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepOneValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepOneValidationResult; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepOneCheckRequest; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepOneCheckResult; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepTwoValidationRequest; @@ -18,6 +20,7 @@ import com.sztzjy.linkCommerce.entity.dto.ProductDevelopmentFactorsStepTwoValida import com.sztzjy.linkCommerce.entity.dto.ProductDevelopmentFactorsStepThreeValidationRequest; import com.sztzjy.linkCommerce.entity.dto.ProductDevelopmentFactorsStepThreeValidationResult; import com.sztzjy.linkCommerce.service.NewProductSurveyStepOneService; +import com.sztzjy.linkCommerce.service.IndustryDemandAnalysisStepOneService; import com.sztzjy.linkCommerce.service.NewProductSurveyStepTwoService; import com.sztzjy.linkCommerce.service.NewProductSurveyStepThreeService; import com.sztzjy.linkCommerce.service.NewProductSurveyStepFourService; @@ -40,6 +43,23 @@ import static org.mockito.Mockito.when; class StudentTrainingAnswerControllerTest { + @Test + void validateIndustryDemandAnalysisStepOneUsesTheAuthenticatedStudentAndReturnsTheValidationResult() { + StudentTrainingAnswerController controller = new StudentTrainingAnswerController(); + IndustryDemandAnalysisStepOneService service = mock(IndustryDemandAnalysisStepOneService.class); + ReflectionTestUtils.setField(controller, "industryDemandAnalysisStepOneService", service); + IndustryDemandAnalysisStepOneValidationResult validation = new IndustryDemandAnalysisStepOneValidationResult(); + validation.setValid(true); + when(service.validate(any(IndustryDemandAnalysisStepOneValidationRequest.class), any(JwtUser.class))).thenReturn(validation); + + ResultEntity result = controller + .validateIndustryDemandAnalysisStepOne(new IndustryDemandAnalysisStepOneValidationRequest(), authenticatedStudentRequest()); + + assertEquals(HttpStatus.OK, result.getStatusCode()); + assertEquals(validation, result.getBody().getData()); + verify(service).validate(any(IndustryDemandAnalysisStepOneValidationRequest.class), any(JwtUser.class)); + } + @Test void checkStepOneUsesTheAuthenticatedStudentAndReturnsTheGrade() { StudentTrainingAnswerController controller = new StudentTrainingAnswerController(); diff --git a/src/test/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepOneServiceImplTest.java b/src/test/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepOneServiceImplTest.java new file mode 100644 index 0000000..8f8041c --- /dev/null +++ b/src/test/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepOneServiceImplTest.java @@ -0,0 +1,40 @@ +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.IndustryDemandAnalysisStepOneValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepOneValidationResult; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class IndustryDemandAnalysisStepOneServiceImplTest { + @Test + void validateAcceptsAllFourPestDimensions() { + IndustryDemandAnalysisStepOneServiceImpl service = new IndustryDemandAnalysisStepOneServiceImpl(); + IndustryDemandAnalysisStepOneValidationResult result = service.validate(completedRequest(), student()); + assertTrue(result.isValid()); + } + + @Test + void validateRejectsMissingDimensionAndNonStudent() { + IndustryDemandAnalysisStepOneServiceImpl service = new IndustryDemandAnalysisStepOneServiceImpl(); + IndustryDemandAnalysisStepOneValidationRequest missingTechnology = completedRequest(); + missingTechnology.setTechnology(" "); + assertThrows(ServiceException.class, () -> service.validate(missingTechnology, student())); + assertThrows(ServiceException.class, () -> service.validate(completedRequest(), teacher())); + } + + private IndustryDemandAnalysisStepOneValidationRequest completedRequest() { + IndustryDemandAnalysisStepOneValidationRequest request = new IndustryDemandAnalysisStepOneValidationRequest(); + request.setPolitical("行业相关政策、认证和数据合规要求。"); + request.setEconomic("市场规模、供应链成本与商业模式信息。"); + request.setSocial("用户健康管理需求和消费趋势变化。"); + request.setTechnology("设备互联、AI算法和平台能力信息。"); + return request; + } + + private JwtUser student() { JwtUser user = new JwtUser(); user.setUserId("stu-1"); user.setRoleId(4); return user; } + private JwtUser teacher() { JwtUser user = student(); user.setRoleId(3); return user; } +}