From 665e0b8a26225b94f7d118ffffb45ec8ceba462f Mon Sep 17 00:00:00 2001 From: chenyuan Date: Fri, 7 Aug 2026 16:35:32 +0800 Subject: [PATCH 1/4] 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; } +} From 3a62dbd3a0209c682f6618eccde2b0a4909e00ab Mon Sep 17 00:00:00 2001 From: chenyuan Date: Fri, 7 Aug 2026 16:44:31 +0800 Subject: [PATCH 2/4] feat: validate industry demand analysis step two --- .../stu/StudentTrainingAnswerController.java | 17 ++++++ ...emandAnalysisStepTwoValidationRequest.java | 17 ++++++ ...DemandAnalysisStepTwoValidationResult.java | 11 ++++ .../IndustryDemandAnalysisStepTwoService.java | 9 +++ ...ustryDemandAnalysisStepTwoServiceImpl.java | 43 +++++++++++++ .../StudentTrainingAnswerControllerTest.java | 20 ++++++ ...yDemandAnalysisStepTwoServiceImplTest.java | 61 +++++++++++++++++++ 7 files changed, 178 insertions(+) create mode 100644 src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepTwoValidationRequest.java create mode 100644 src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepTwoValidationResult.java create mode 100644 src/main/java/com/sztzjy/linkCommerce/service/IndustryDemandAnalysisStepTwoService.java create mode 100644 src/main/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepTwoServiceImpl.java create mode 100644 src/test/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepTwoServiceImplTest.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 40b347b..48d5034 100644 --- a/src/main/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerController.java +++ b/src/main/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerController.java @@ -6,6 +6,8 @@ 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.IndustryDemandAnalysisStepTwoValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepTwoValidationResult; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepOneCheckRequest; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepOneCheckResult; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepTwoValidationRequest; @@ -32,6 +34,7 @@ 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.service.IndustryDemandAnalysisStepTwoService; import com.sztzjy.linkCommerce.util.ResultEntity; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -51,6 +54,9 @@ public class StudentTrainingAnswerController { @Autowired private IndustryDemandAnalysisStepOneService industryDemandAnalysisStepOneService; + @Autowired + private IndustryDemandAnalysisStepTwoService industryDemandAnalysisStepTwoService; + @Autowired private NewProductSurveyStepOneService newProductSurveyStepOneService; @@ -110,6 +116,17 @@ public class StudentTrainingAnswerController { } } + @PostMapping("/industry-demand-analysis/step-2/validate") + @ApiOperation("行业需求分析第二步校验") + public ResultEntity validateIndustryDemandAnalysisStepTwo( + @RequestBody IndustryDemandAnalysisStepTwoValidationRequest answer, HttpServletRequest request) { + try { + return new ResultEntity<>(HttpStatus.OK, "校验通过", industryDemandAnalysisStepTwoService.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/IndustryDemandAnalysisStepTwoValidationRequest.java b/src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepTwoValidationRequest.java new file mode 100644 index 0000000..2465396 --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepTwoValidationRequest.java @@ -0,0 +1,17 @@ +package com.sztzjy.linkCommerce.entity.dto; + +public class IndustryDemandAnalysisStepTwoValidationRequest { + 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/IndustryDemandAnalysisStepTwoValidationResult.java b/src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepTwoValidationResult.java new file mode 100644 index 0000000..5520dee --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepTwoValidationResult.java @@ -0,0 +1,11 @@ +package com.sztzjy.linkCommerce.entity.dto; + +public class IndustryDemandAnalysisStepTwoValidationResult { + 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/IndustryDemandAnalysisStepTwoService.java b/src/main/java/com/sztzjy/linkCommerce/service/IndustryDemandAnalysisStepTwoService.java new file mode 100644 index 0000000..f037e5c --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/service/IndustryDemandAnalysisStepTwoService.java @@ -0,0 +1,9 @@ +package com.sztzjy.linkCommerce.service; + +import com.sztzjy.linkCommerce.config.security.JwtUser; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepTwoValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepTwoValidationResult; + +public interface IndustryDemandAnalysisStepTwoService { + IndustryDemandAnalysisStepTwoValidationResult validate(IndustryDemandAnalysisStepTwoValidationRequest request, JwtUser user); +} diff --git a/src/main/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepTwoServiceImpl.java b/src/main/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepTwoServiceImpl.java new file mode 100644 index 0000000..4e85ed8 --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepTwoServiceImpl.java @@ -0,0 +1,43 @@ +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.IndustryDemandAnalysisStepTwoValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepTwoValidationResult; +import com.sztzjy.linkCommerce.service.IndustryDemandAnalysisStepTwoService; +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; + +@Service +public class IndustryDemandAnalysisStepTwoServiceImpl implements IndustryDemandAnalysisStepTwoService { + private static final String TASK_KEY = "industry-demand-analysis"; + + @Autowired + private StudentTrainingAnswerService studentTrainingAnswerService; + + @Override + public IndustryDemandAnalysisStepTwoValidationResult validate(IndustryDemandAnalysisStepTwoValidationRequest request, JwtUser user) { + requireStudent(user); + StudentTrainingAnswer savedAnswer = studentTrainingAnswerService.get(TASK_KEY, null, user); + if (savedAnswer == null || StringUtils.isBlank(savedAnswer.getStep1Answer())) { + throw new ServiceException(HttpStatus.BAD_REQUEST, "请先完成并保存第 1 步的 PEST 信息归类"); + } + 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, "请为政治、经济、社会和技术环境各补充至少 1 条信息"); + } + IndustryDemandAnalysisStepTwoValidationResult result = new IndustryDemandAnalysisStepTwoValidationResult(); + 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 26325e2..fcdbdbc 100644 --- a/src/test/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerControllerTest.java +++ b/src/test/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerControllerTest.java @@ -5,6 +5,8 @@ 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.IndustryDemandAnalysisStepTwoValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepTwoValidationResult; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepOneCheckRequest; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepOneCheckResult; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepTwoValidationRequest; @@ -21,6 +23,7 @@ import com.sztzjy.linkCommerce.entity.dto.ProductDevelopmentFactorsStepThreeVali import com.sztzjy.linkCommerce.entity.dto.ProductDevelopmentFactorsStepThreeValidationResult; import com.sztzjy.linkCommerce.service.NewProductSurveyStepOneService; import com.sztzjy.linkCommerce.service.IndustryDemandAnalysisStepOneService; +import com.sztzjy.linkCommerce.service.IndustryDemandAnalysisStepTwoService; import com.sztzjy.linkCommerce.service.NewProductSurveyStepTwoService; import com.sztzjy.linkCommerce.service.NewProductSurveyStepThreeService; import com.sztzjy.linkCommerce.service.NewProductSurveyStepFourService; @@ -60,6 +63,23 @@ class StudentTrainingAnswerControllerTest { verify(service).validate(any(IndustryDemandAnalysisStepOneValidationRequest.class), any(JwtUser.class)); } + @Test + void validateIndustryDemandAnalysisStepTwoUsesTheAuthenticatedStudentAndReturnsTheValidationResult() { + StudentTrainingAnswerController controller = new StudentTrainingAnswerController(); + IndustryDemandAnalysisStepTwoService service = mock(IndustryDemandAnalysisStepTwoService.class); + ReflectionTestUtils.setField(controller, "industryDemandAnalysisStepTwoService", service); + IndustryDemandAnalysisStepTwoValidationResult validation = new IndustryDemandAnalysisStepTwoValidationResult(); + validation.setValid(true); + when(service.validate(any(IndustryDemandAnalysisStepTwoValidationRequest.class), any(JwtUser.class))).thenReturn(validation); + + ResultEntity result = controller + .validateIndustryDemandAnalysisStepTwo(new IndustryDemandAnalysisStepTwoValidationRequest(), authenticatedStudentRequest()); + + assertEquals(HttpStatus.OK, result.getStatusCode()); + assertEquals(validation, result.getBody().getData()); + verify(service).validate(any(IndustryDemandAnalysisStepTwoValidationRequest.class), any(JwtUser.class)); + } + @Test void checkStepOneUsesTheAuthenticatedStudentAndReturnsTheGrade() { StudentTrainingAnswerController controller = new StudentTrainingAnswerController(); diff --git a/src/test/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepTwoServiceImplTest.java b/src/test/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepTwoServiceImplTest.java new file mode 100644 index 0000000..ae200ab --- /dev/null +++ b/src/test/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepTwoServiceImplTest.java @@ -0,0 +1,61 @@ +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.IndustryDemandAnalysisStepTwoValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepTwoValidationResult; +import com.sztzjy.linkCommerce.service.StudentTrainingAnswerService; +import org.junit.jupiter.api.Test; +import org.springframework.test.util.ReflectionTestUtils; + +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 IndustryDemandAnalysisStepTwoServiceImplTest { + @Test + void validateAcceptsOneSupplementForEachPestDimensionAfterStepOneIsSaved() { + IndustryDemandAnalysisStepTwoServiceImpl service = serviceWithStepOne(); + IndustryDemandAnalysisStepTwoValidationResult result = service.validate(completedRequest(), student()); + assertTrue(result.isValid()); + } + + @Test + void validateRejectsMissingSupplementAndMissingStepOne() { + IndustryDemandAnalysisStepTwoServiceImpl service = serviceWithStepOne(); + IndustryDemandAnalysisStepTwoValidationRequest missingTechnology = completedRequest(); + missingTechnology.setTechnology(" "); + assertThrows(ServiceException.class, () -> service.validate(missingTechnology, student())); + + IndustryDemandAnalysisStepTwoServiceImpl noStepOneService = new IndustryDemandAnalysisStepTwoServiceImpl(); + StudentTrainingAnswerService answerService = mock(StudentTrainingAnswerService.class); + ReflectionTestUtils.setField(noStepOneService, "studentTrainingAnswerService", answerService); + when(answerService.get(anyString(), any(), any(JwtUser.class))).thenReturn(null); + assertThrows(ServiceException.class, () -> noStepOneService.validate(completedRequest(), student())); + } + + private IndustryDemandAnalysisStepTwoServiceImpl serviceWithStepOne() { + IndustryDemandAnalysisStepTwoServiceImpl service = new IndustryDemandAnalysisStepTwoServiceImpl(); + StudentTrainingAnswerService answerService = mock(StudentTrainingAnswerService.class); + StudentTrainingAnswer savedAnswer = new StudentTrainingAnswer(); + savedAnswer.setStep1Answer("{\"pest\":{\"political\":\"已填写\"}}"); + when(answerService.get(anyString(), any(), any(JwtUser.class))).thenReturn(savedAnswer); + ReflectionTestUtils.setField(service, "studentTrainingAnswerService", answerService); + return service; + } + + private IndustryDemandAnalysisStepTwoValidationRequest completedRequest() { + IndustryDemandAnalysisStepTwoValidationRequest request = new IndustryDemandAnalysisStepTwoValidationRequest(); + 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; } +} From 154c0e8f4252d83a7d08e35f1d37e9e271473a79 Mon Sep 17 00:00:00 2001 From: chenyuan Date: Fri, 7 Aug 2026 16:53:10 +0800 Subject: [PATCH 3/4] feat: validate industry demand analysis step three --- .../stu/StudentTrainingAnswerController.java | 17 +++++ ...andAnalysisStepThreeValidationRequest.java | 26 +++++++ ...mandAnalysisStepThreeValidationResult.java | 11 +++ ...ndustryDemandAnalysisStepThreeService.java | 9 +++ ...tryDemandAnalysisStepThreeServiceImpl.java | 56 +++++++++++++++ .../StudentTrainingAnswerControllerTest.java | 20 ++++++ ...emandAnalysisStepThreeServiceImplTest.java | 70 +++++++++++++++++++ 7 files changed, 209 insertions(+) create mode 100644 src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepThreeValidationRequest.java create mode 100644 src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepThreeValidationResult.java create mode 100644 src/main/java/com/sztzjy/linkCommerce/service/IndustryDemandAnalysisStepThreeService.java create mode 100644 src/main/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepThreeServiceImpl.java create mode 100644 src/test/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepThreeServiceImplTest.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 48d5034..24dd5fc 100644 --- a/src/main/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerController.java +++ b/src/main/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerController.java @@ -8,6 +8,8 @@ import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepOneValidatio import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepOneValidationResult; import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepTwoValidationRequest; import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepTwoValidationResult; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepThreeValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepThreeValidationResult; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepOneCheckRequest; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepOneCheckResult; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepTwoValidationRequest; @@ -35,6 +37,7 @@ import com.sztzjy.linkCommerce.service.ProductDevelopmentFactorsStepFourService; import com.sztzjy.linkCommerce.service.StudentTrainingAnswerService; import com.sztzjy.linkCommerce.service.IndustryDemandAnalysisStepOneService; import com.sztzjy.linkCommerce.service.IndustryDemandAnalysisStepTwoService; +import com.sztzjy.linkCommerce.service.IndustryDemandAnalysisStepThreeService; import com.sztzjy.linkCommerce.util.ResultEntity; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -57,6 +60,9 @@ public class StudentTrainingAnswerController { @Autowired private IndustryDemandAnalysisStepTwoService industryDemandAnalysisStepTwoService; + @Autowired + private IndustryDemandAnalysisStepThreeService industryDemandAnalysisStepThreeService; + @Autowired private NewProductSurveyStepOneService newProductSurveyStepOneService; @@ -127,6 +133,17 @@ public class StudentTrainingAnswerController { } } + @PostMapping("/industry-demand-analysis/step-3/validate") + @ApiOperation("行业需求分析第三步校验") + public ResultEntity validateIndustryDemandAnalysisStepThree( + @RequestBody IndustryDemandAnalysisStepThreeValidationRequest answer, HttpServletRequest request) { + try { + return new ResultEntity<>(HttpStatus.OK, "校验通过", industryDemandAnalysisStepThreeService.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/IndustryDemandAnalysisStepThreeValidationRequest.java b/src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepThreeValidationRequest.java new file mode 100644 index 0000000..0fb3f62 --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepThreeValidationRequest.java @@ -0,0 +1,26 @@ +package com.sztzjy.linkCommerce.entity.dto; + +import java.util.List; + +public class IndustryDemandAnalysisStepThreeValidationRequest { + private List rows; + + public List getRows() { return rows; } + public void setRows(List rows) { this.rows = rows; } + + public static class Row { + private String dimension; + private String opportunities; + private String challenges; + private String strategies; + + public String getDimension() { return dimension; } + public void setDimension(String dimension) { this.dimension = dimension; } + public String getOpportunities() { return opportunities; } + public void setOpportunities(String opportunities) { this.opportunities = opportunities; } + public String getChallenges() { return challenges; } + public void setChallenges(String challenges) { this.challenges = challenges; } + public String getStrategies() { return strategies; } + public void setStrategies(String strategies) { this.strategies = strategies; } + } +} diff --git a/src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepThreeValidationResult.java b/src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepThreeValidationResult.java new file mode 100644 index 0000000..5d3c5c3 --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepThreeValidationResult.java @@ -0,0 +1,11 @@ +package com.sztzjy.linkCommerce.entity.dto; + +public class IndustryDemandAnalysisStepThreeValidationResult { + 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/IndustryDemandAnalysisStepThreeService.java b/src/main/java/com/sztzjy/linkCommerce/service/IndustryDemandAnalysisStepThreeService.java new file mode 100644 index 0000000..bd86dc2 --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/service/IndustryDemandAnalysisStepThreeService.java @@ -0,0 +1,9 @@ +package com.sztzjy.linkCommerce.service; + +import com.sztzjy.linkCommerce.config.security.JwtUser; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepThreeValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepThreeValidationResult; + +public interface IndustryDemandAnalysisStepThreeService { + IndustryDemandAnalysisStepThreeValidationResult validate(IndustryDemandAnalysisStepThreeValidationRequest request, JwtUser user); +} diff --git a/src/main/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepThreeServiceImpl.java b/src/main/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepThreeServiceImpl.java new file mode 100644 index 0000000..78ca60b --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepThreeServiceImpl.java @@ -0,0 +1,56 @@ +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.IndustryDemandAnalysisStepThreeValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepThreeValidationResult; +import com.sztzjy.linkCommerce.service.IndustryDemandAnalysisStepThreeService; +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.util.Arrays; +import java.util.LinkedHashSet; +import java.util.Set; + +@Service +public class IndustryDemandAnalysisStepThreeServiceImpl implements IndustryDemandAnalysisStepThreeService { + private static final String TASK_KEY = "industry-demand-analysis"; + private static final Set DIMENSIONS = new LinkedHashSet<>(Arrays.asList("political", "economic", "social", "technology")); + + @Autowired + private StudentTrainingAnswerService studentTrainingAnswerService; + + @Override + public IndustryDemandAnalysisStepThreeValidationResult validate(IndustryDemandAnalysisStepThreeValidationRequest request, JwtUser user) { + requireStudent(user); + StudentTrainingAnswer savedAnswer = studentTrainingAnswerService.get(TASK_KEY, null, user); + if (savedAnswer == null || StringUtils.isBlank(savedAnswer.getStep1Answer()) || StringUtils.isBlank(savedAnswer.getStep2Answer())) { + throw new ServiceException(HttpStatus.BAD_REQUEST, "请先完成并保存前两步的 PEST 信息归类与补充"); + } + if (request == null || request.getRows() == null || request.getRows().size() != DIMENSIONS.size()) { + throw badRequest("请完成政治、经济、社会和技术四个维度的分析"); + } + Set submitted = new LinkedHashSet<>(); + for (IndustryDemandAnalysisStepThreeValidationRequest.Row row : request.getRows()) { + String dimension = row == null ? "" : StringUtils.trimToEmpty(row.getDimension()); + if (!DIMENSIONS.contains(dimension) || !submitted.add(dimension)) throw badRequest("提交的 PEST 分析维度不完整或重复"); + if (StringUtils.isBlank(row.getOpportunities()) || StringUtils.isBlank(row.getChallenges()) || StringUtils.isBlank(row.getStrategies())) { + throw badRequest("请完成每个 PEST 维度的机遇、挑战和应对思路"); + } + } + IndustryDemandAnalysisStepThreeValidationResult result = new IndustryDemandAnalysisStepThreeValidationResult(); + result.setValid(true); + result.setMessage("校验通过"); + return result; + } + + private ServiceException badRequest(String message) { return new ServiceException(HttpStatus.BAD_REQUEST, message); } + 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 fcdbdbc..bfdc3e2 100644 --- a/src/test/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerControllerTest.java +++ b/src/test/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerControllerTest.java @@ -7,6 +7,8 @@ import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepOneValidatio import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepOneValidationResult; import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepTwoValidationRequest; import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepTwoValidationResult; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepThreeValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepThreeValidationResult; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepOneCheckRequest; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepOneCheckResult; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepTwoValidationRequest; @@ -24,6 +26,7 @@ import com.sztzjy.linkCommerce.entity.dto.ProductDevelopmentFactorsStepThreeVali import com.sztzjy.linkCommerce.service.NewProductSurveyStepOneService; import com.sztzjy.linkCommerce.service.IndustryDemandAnalysisStepOneService; import com.sztzjy.linkCommerce.service.IndustryDemandAnalysisStepTwoService; +import com.sztzjy.linkCommerce.service.IndustryDemandAnalysisStepThreeService; import com.sztzjy.linkCommerce.service.NewProductSurveyStepTwoService; import com.sztzjy.linkCommerce.service.NewProductSurveyStepThreeService; import com.sztzjy.linkCommerce.service.NewProductSurveyStepFourService; @@ -80,6 +83,23 @@ class StudentTrainingAnswerControllerTest { verify(service).validate(any(IndustryDemandAnalysisStepTwoValidationRequest.class), any(JwtUser.class)); } + @Test + void validateIndustryDemandAnalysisStepThreeUsesTheAuthenticatedStudentAndReturnsTheValidationResult() { + StudentTrainingAnswerController controller = new StudentTrainingAnswerController(); + IndustryDemandAnalysisStepThreeService service = mock(IndustryDemandAnalysisStepThreeService.class); + ReflectionTestUtils.setField(controller, "industryDemandAnalysisStepThreeService", service); + IndustryDemandAnalysisStepThreeValidationResult validation = new IndustryDemandAnalysisStepThreeValidationResult(); + validation.setValid(true); + when(service.validate(any(IndustryDemandAnalysisStepThreeValidationRequest.class), any(JwtUser.class))).thenReturn(validation); + + ResultEntity result = controller + .validateIndustryDemandAnalysisStepThree(new IndustryDemandAnalysisStepThreeValidationRequest(), authenticatedStudentRequest()); + + assertEquals(HttpStatus.OK, result.getStatusCode()); + assertEquals(validation, result.getBody().getData()); + verify(service).validate(any(IndustryDemandAnalysisStepThreeValidationRequest.class), any(JwtUser.class)); + } + @Test void checkStepOneUsesTheAuthenticatedStudentAndReturnsTheGrade() { StudentTrainingAnswerController controller = new StudentTrainingAnswerController(); diff --git a/src/test/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepThreeServiceImplTest.java b/src/test/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepThreeServiceImplTest.java new file mode 100644 index 0000000..5e10946 --- /dev/null +++ b/src/test/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepThreeServiceImplTest.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.StudentTrainingAnswer; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepThreeValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepThreeValidationResult; +import com.sztzjy.linkCommerce.service.StudentTrainingAnswerService; +import org.junit.jupiter.api.Test; +import org.springframework.test.util.ReflectionTestUtils; + +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 IndustryDemandAnalysisStepThreeServiceImplTest { + @Test + void validateAcceptsCompleteAnalysisAfterFirstTwoStepsAreSaved() { + IndustryDemandAnalysisStepThreeServiceImpl service = serviceWithFirstTwoSteps(); + IndustryDemandAnalysisStepThreeValidationResult result = service.validate(completedRequest(), student()); + assertTrue(result.isValid()); + } + + @Test + void validateRejectsIncompleteAnalysisAndMissingPrerequisiteAnswers() { + IndustryDemandAnalysisStepThreeServiceImpl service = serviceWithFirstTwoSteps(); + IndustryDemandAnalysisStepThreeValidationRequest incomplete = completedRequest(); + incomplete.getRows().get(0).setStrategies(" "); + assertThrows(ServiceException.class, () -> service.validate(incomplete, student())); + + IndustryDemandAnalysisStepThreeServiceImpl noPrerequisiteService = new IndustryDemandAnalysisStepThreeServiceImpl(); + StudentTrainingAnswerService answerService = mock(StudentTrainingAnswerService.class); + ReflectionTestUtils.setField(noPrerequisiteService, "studentTrainingAnswerService", answerService); + when(answerService.get(anyString(), any(), any(JwtUser.class))).thenReturn(new StudentTrainingAnswer()); + assertThrows(ServiceException.class, () -> noPrerequisiteService.validate(completedRequest(), student())); + } + + private IndustryDemandAnalysisStepThreeServiceImpl serviceWithFirstTwoSteps() { + IndustryDemandAnalysisStepThreeServiceImpl service = new IndustryDemandAnalysisStepThreeServiceImpl(); + StudentTrainingAnswerService answerService = mock(StudentTrainingAnswerService.class); + StudentTrainingAnswer savedAnswer = new StudentTrainingAnswer(); + savedAnswer.setStep1Answer("{\"pest\":{}}"); + savedAnswer.setStep2Answer("{\"supplements\":{}}"); + when(answerService.get(anyString(), any(), any(JwtUser.class))).thenReturn(savedAnswer); + ReflectionTestUtils.setField(service, "studentTrainingAnswerService", answerService); + return service; + } + + private IndustryDemandAnalysisStepThreeValidationRequest completedRequest() { + IndustryDemandAnalysisStepThreeValidationRequest request = new IndustryDemandAnalysisStepThreeValidationRequest(); + request.setRows(Arrays.asList(row("political"), row("economic"), row("social"), row("technology"))); + return request; + } + + private IndustryDemandAnalysisStepThreeValidationRequest.Row row(String dimension) { + IndustryDemandAnalysisStepThreeValidationRequest.Row row = new IndustryDemandAnalysisStepThreeValidationRequest.Row(); + row.setDimension(dimension); + row.setOpportunities("增长机会"); + row.setChallenges("潜在挑战"); + row.setStrategies("应对思路"); + return row; + } + + private JwtUser student() { JwtUser user = new JwtUser(); user.setUserId("stu-1"); user.setRoleId(4); return user; } +} From c9a5d5f3fdda4130584445946e1062fdd8ca91c3 Mon Sep 17 00:00:00 2001 From: chenyuan Date: Fri, 7 Aug 2026 17:01:56 +0800 Subject: [PATCH 4/4] feat: validate industry demand analysis step four --- .../stu/StudentTrainingAnswerController.java | 17 +++++ ...mandAnalysisStepFourValidationRequest.java | 26 ++++++++ ...emandAnalysisStepFourValidationResult.java | 11 ++++ ...IndustryDemandAnalysisStepFourService.java | 9 +++ ...stryDemandAnalysisStepFourServiceImpl.java | 50 ++++++++++++++ .../StudentTrainingAnswerControllerTest.java | 20 ++++++ ...DemandAnalysisStepFourServiceImplTest.java | 65 +++++++++++++++++++ 7 files changed, 198 insertions(+) create mode 100644 src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepFourValidationRequest.java create mode 100644 src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepFourValidationResult.java create mode 100644 src/main/java/com/sztzjy/linkCommerce/service/IndustryDemandAnalysisStepFourService.java create mode 100644 src/main/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepFourServiceImpl.java create mode 100644 src/test/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepFourServiceImplTest.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 24dd5fc..fd9b7b3 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.IndustryDemandAnalysisStepTwoValidatio import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepTwoValidationResult; import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepThreeValidationRequest; import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepThreeValidationResult; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepFourValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepFourValidationResult; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepOneCheckRequest; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepOneCheckResult; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepTwoValidationRequest; @@ -38,6 +40,7 @@ import com.sztzjy.linkCommerce.service.StudentTrainingAnswerService; import com.sztzjy.linkCommerce.service.IndustryDemandAnalysisStepOneService; import com.sztzjy.linkCommerce.service.IndustryDemandAnalysisStepTwoService; import com.sztzjy.linkCommerce.service.IndustryDemandAnalysisStepThreeService; +import com.sztzjy.linkCommerce.service.IndustryDemandAnalysisStepFourService; import com.sztzjy.linkCommerce.util.ResultEntity; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -63,6 +66,9 @@ public class StudentTrainingAnswerController { @Autowired private IndustryDemandAnalysisStepThreeService industryDemandAnalysisStepThreeService; + @Autowired + private IndustryDemandAnalysisStepFourService industryDemandAnalysisStepFourService; + @Autowired private NewProductSurveyStepOneService newProductSurveyStepOneService; @@ -144,6 +150,17 @@ public class StudentTrainingAnswerController { } } + @PostMapping("/industry-demand-analysis/step-4/validate") + @ApiOperation("行业需求分析第四步校验") + public ResultEntity validateIndustryDemandAnalysisStepFour( + @RequestBody IndustryDemandAnalysisStepFourValidationRequest answer, HttpServletRequest request) { + try { + return new ResultEntity<>(HttpStatus.OK, "校验通过", industryDemandAnalysisStepFourService.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/IndustryDemandAnalysisStepFourValidationRequest.java b/src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepFourValidationRequest.java new file mode 100644 index 0000000..de063b0 --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepFourValidationRequest.java @@ -0,0 +1,26 @@ +package com.sztzjy.linkCommerce.entity.dto; + +public class IndustryDemandAnalysisStepFourValidationRequest { + private String overallAssessment; + private String marketDecision; + private String decisionReason; + private String riskOne; + private String riskTwo; + private String otherRisks; + private String summary; + + public String getOverallAssessment() { return overallAssessment; } + public void setOverallAssessment(String overallAssessment) { this.overallAssessment = overallAssessment; } + public String getMarketDecision() { return marketDecision; } + public void setMarketDecision(String marketDecision) { this.marketDecision = marketDecision; } + public String getDecisionReason() { return decisionReason; } + public void setDecisionReason(String decisionReason) { this.decisionReason = decisionReason; } + public String getRiskOne() { return riskOne; } + public void setRiskOne(String riskOne) { this.riskOne = riskOne; } + public String getRiskTwo() { return riskTwo; } + public void setRiskTwo(String riskTwo) { this.riskTwo = riskTwo; } + public String getOtherRisks() { return otherRisks; } + public void setOtherRisks(String otherRisks) { this.otherRisks = otherRisks; } + public String getSummary() { return summary; } + public void setSummary(String summary) { this.summary = summary; } +} diff --git a/src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepFourValidationResult.java b/src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepFourValidationResult.java new file mode 100644 index 0000000..2d3671b --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/entity/dto/IndustryDemandAnalysisStepFourValidationResult.java @@ -0,0 +1,11 @@ +package com.sztzjy.linkCommerce.entity.dto; + +public class IndustryDemandAnalysisStepFourValidationResult { + 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/IndustryDemandAnalysisStepFourService.java b/src/main/java/com/sztzjy/linkCommerce/service/IndustryDemandAnalysisStepFourService.java new file mode 100644 index 0000000..4a373f0 --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/service/IndustryDemandAnalysisStepFourService.java @@ -0,0 +1,9 @@ +package com.sztzjy.linkCommerce.service; + +import com.sztzjy.linkCommerce.config.security.JwtUser; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepFourValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepFourValidationResult; + +public interface IndustryDemandAnalysisStepFourService { + IndustryDemandAnalysisStepFourValidationResult validate(IndustryDemandAnalysisStepFourValidationRequest request, JwtUser user); +} diff --git a/src/main/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepFourServiceImpl.java b/src/main/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepFourServiceImpl.java new file mode 100644 index 0000000..2d6c5a0 --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepFourServiceImpl.java @@ -0,0 +1,50 @@ +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.IndustryDemandAnalysisStepFourValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepFourValidationResult; +import com.sztzjy.linkCommerce.service.IndustryDemandAnalysisStepFourService; +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.util.Arrays; +import java.util.LinkedHashSet; +import java.util.Set; + +@Service +public class IndustryDemandAnalysisStepFourServiceImpl implements IndustryDemandAnalysisStepFourService { + private static final String TASK_KEY = "industry-demand-analysis"; + private static final Set ASSESSMENTS = new LinkedHashSet<>(Arrays.asList("高度友好", "较为友好", "中性", "存在风险", "风险较高")); + private static final Set DECISIONS = new LinkedHashSet<>(Arrays.asList("建议进入", "谨慎进入", "建议暂缓")); + + @Autowired + private StudentTrainingAnswerService studentTrainingAnswerService; + + @Override + public IndustryDemandAnalysisStepFourValidationResult validate(IndustryDemandAnalysisStepFourValidationRequest request, JwtUser user) { + requireStudent(user); + StudentTrainingAnswer savedAnswer = studentTrainingAnswerService.get(TASK_KEY, null, user); + if (savedAnswer == null || StringUtils.isBlank(savedAnswer.getStep1Answer()) || StringUtils.isBlank(savedAnswer.getStep2Answer()) || StringUtils.isBlank(savedAnswer.getStep3Answer())) { + throw new ServiceException(HttpStatus.BAD_REQUEST, "请先完成并保存前 3 步的 PEST 分析"); + } + if (request == null || !ASSESSMENTS.contains(StringUtils.trimToEmpty(request.getOverallAssessment()))) throw badRequest("请选择总体 PEST 环境评估等级"); + if (!DECISIONS.contains(StringUtils.trimToEmpty(request.getMarketDecision())) || StringUtils.isBlank(request.getDecisionReason())) throw badRequest("请选择市场进入结论并说明理由"); + if (StringUtils.isBlank(request.getRiskOne()) || StringUtils.isBlank(request.getRiskTwo())) throw badRequest("请至少填写 2 个核心风险点"); + if (StringUtils.isBlank(request.getSummary())) throw badRequest("请总结 PEST 环境评估结论"); + IndustryDemandAnalysisStepFourValidationResult result = new IndustryDemandAnalysisStepFourValidationResult(); + result.setValid(true); + result.setMessage("校验通过"); + return result; + } + + private ServiceException badRequest(String message) { return new ServiceException(HttpStatus.BAD_REQUEST, message); } + 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 bfdc3e2..f5e20c4 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.IndustryDemandAnalysisStepTwoValidatio import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepTwoValidationResult; import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepThreeValidationRequest; import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepThreeValidationResult; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepFourValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepFourValidationResult; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepOneCheckRequest; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepOneCheckResult; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepTwoValidationRequest; @@ -27,6 +29,7 @@ import com.sztzjy.linkCommerce.service.NewProductSurveyStepOneService; import com.sztzjy.linkCommerce.service.IndustryDemandAnalysisStepOneService; import com.sztzjy.linkCommerce.service.IndustryDemandAnalysisStepTwoService; import com.sztzjy.linkCommerce.service.IndustryDemandAnalysisStepThreeService; +import com.sztzjy.linkCommerce.service.IndustryDemandAnalysisStepFourService; import com.sztzjy.linkCommerce.service.NewProductSurveyStepTwoService; import com.sztzjy.linkCommerce.service.NewProductSurveyStepThreeService; import com.sztzjy.linkCommerce.service.NewProductSurveyStepFourService; @@ -100,6 +103,23 @@ class StudentTrainingAnswerControllerTest { verify(service).validate(any(IndustryDemandAnalysisStepThreeValidationRequest.class), any(JwtUser.class)); } + @Test + void validateIndustryDemandAnalysisStepFourUsesTheAuthenticatedStudentAndReturnsTheValidationResult() { + StudentTrainingAnswerController controller = new StudentTrainingAnswerController(); + IndustryDemandAnalysisStepFourService service = mock(IndustryDemandAnalysisStepFourService.class); + ReflectionTestUtils.setField(controller, "industryDemandAnalysisStepFourService", service); + IndustryDemandAnalysisStepFourValidationResult validation = new IndustryDemandAnalysisStepFourValidationResult(); + validation.setValid(true); + when(service.validate(any(IndustryDemandAnalysisStepFourValidationRequest.class), any(JwtUser.class))).thenReturn(validation); + + ResultEntity result = controller + .validateIndustryDemandAnalysisStepFour(new IndustryDemandAnalysisStepFourValidationRequest(), authenticatedStudentRequest()); + + assertEquals(HttpStatus.OK, result.getStatusCode()); + assertEquals(validation, result.getBody().getData()); + verify(service).validate(any(IndustryDemandAnalysisStepFourValidationRequest.class), any(JwtUser.class)); + } + @Test void checkStepOneUsesTheAuthenticatedStudentAndReturnsTheGrade() { StudentTrainingAnswerController controller = new StudentTrainingAnswerController(); diff --git a/src/test/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepFourServiceImplTest.java b/src/test/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepFourServiceImplTest.java new file mode 100644 index 0000000..a3562c5 --- /dev/null +++ b/src/test/java/com/sztzjy/linkCommerce/service/impl/IndustryDemandAnalysisStepFourServiceImplTest.java @@ -0,0 +1,65 @@ +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.IndustryDemandAnalysisStepFourValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.IndustryDemandAnalysisStepFourValidationResult; +import com.sztzjy.linkCommerce.service.StudentTrainingAnswerService; +import org.junit.jupiter.api.Test; +import org.springframework.test.util.ReflectionTestUtils; + +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 IndustryDemandAnalysisStepFourServiceImplTest { + @Test + void validateAcceptsCompleteConclusionAfterFirstThreeStepsAreSaved() { + IndustryDemandAnalysisStepFourServiceImpl service = serviceWithFirstThreeSteps(); + IndustryDemandAnalysisStepFourValidationResult result = service.validate(completedRequest(), student()); + assertTrue(result.isValid()); + } + + @Test + void validateRejectsMissingCoreRiskAndMissingPrerequisiteAnswers() { + IndustryDemandAnalysisStepFourServiceImpl service = serviceWithFirstThreeSteps(); + IndustryDemandAnalysisStepFourValidationRequest missingRisk = completedRequest(); + missingRisk.setRiskTwo(" "); + assertThrows(ServiceException.class, () -> service.validate(missingRisk, student())); + + IndustryDemandAnalysisStepFourServiceImpl noPrerequisiteService = new IndustryDemandAnalysisStepFourServiceImpl(); + StudentTrainingAnswerService answerService = mock(StudentTrainingAnswerService.class); + ReflectionTestUtils.setField(noPrerequisiteService, "studentTrainingAnswerService", answerService); + when(answerService.get(anyString(), any(), any(JwtUser.class))).thenReturn(new StudentTrainingAnswer()); + assertThrows(ServiceException.class, () -> noPrerequisiteService.validate(completedRequest(), student())); + } + + private IndustryDemandAnalysisStepFourServiceImpl serviceWithFirstThreeSteps() { + IndustryDemandAnalysisStepFourServiceImpl service = new IndustryDemandAnalysisStepFourServiceImpl(); + StudentTrainingAnswerService answerService = mock(StudentTrainingAnswerService.class); + StudentTrainingAnswer savedAnswer = new StudentTrainingAnswer(); + savedAnswer.setStep1Answer("{\"pest\":{}}"); + savedAnswer.setStep2Answer("{\"supplements\":{}}"); + savedAnswer.setStep3Answer("{\"analysis\":{}}"); + when(answerService.get(anyString(), any(), any(JwtUser.class))).thenReturn(savedAnswer); + ReflectionTestUtils.setField(service, "studentTrainingAnswerService", answerService); + return service; + } + + private IndustryDemandAnalysisStepFourValidationRequest completedRequest() { + IndustryDemandAnalysisStepFourValidationRequest request = new IndustryDemandAnalysisStepFourValidationRequest(); + request.setOverallAssessment("较为友好"); + request.setMarketDecision("谨慎进入"); + request.setDecisionReason("市场需求增长，但需要控制合规和成本风险。"); + request.setRiskOne("数据合规风险"); + request.setRiskTwo("供应链成本波动风险"); + request.setSummary("整体环境较为友好，建议在风险控制措施到位后谨慎进入。"); + return request; + } + + private JwtUser student() { JwtUser user = new JwtUser(); user.setUserId("stu-1"); user.setRoleId(4); return user; } +}