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 6e1c0a4..ba10ecd 100644 --- a/src/main/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerController.java +++ b/src/main/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerController.java @@ -10,9 +10,12 @@ import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepTwoValidationReque import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepTwoValidationResult; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepThreeValidationRequest; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepThreeValidationResult; +import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepFourValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepFourValidationResult; import com.sztzjy.linkCommerce.service.NewProductSurveyStepOneService; import com.sztzjy.linkCommerce.service.NewProductSurveyStepTwoService; import com.sztzjy.linkCommerce.service.NewProductSurveyStepThreeService; +import com.sztzjy.linkCommerce.service.NewProductSurveyStepFourService; import com.sztzjy.linkCommerce.service.StudentTrainingAnswerService; import com.sztzjy.linkCommerce.util.ResultEntity; import io.swagger.annotations.Api; @@ -39,6 +42,9 @@ public class StudentTrainingAnswerController { @Autowired private NewProductSurveyStepThreeService newProductSurveyStepThreeService; + @Autowired + private NewProductSurveyStepFourService newProductSurveyStepFourService; + @GetMapping("/{taskKey}") @ApiOperation("查询当前学生指定实训任务答案") public ResultEntity detail(@PathVariable String taskKey, @@ -101,6 +107,18 @@ public class StudentTrainingAnswerController { } } + @PostMapping("/new-product-survey/step-4/validate") + @ApiOperation("新产品调查与分析第四步校验") + public ResultEntity validateNewProductSurveyStepFour( + @RequestBody NewProductSurveyStepFourValidationRequest answer, HttpServletRequest request) { + try { + JwtUser user = TokenProvider.getJWTUser(request); + return new ResultEntity<>(HttpStatus.OK, "校验通过", newProductSurveyStepFourService.validate(answer, user)); + } catch (ServiceException e) { + return new ResultEntity<>(e.getCode(), e.getMessage()); + } + } + @DeleteMapping("/{taskKey}") @ApiOperation("删除当前学生指定实训任务答案") public ResultEntity delete(@PathVariable String taskKey, diff --git a/src/main/java/com/sztzjy/linkCommerce/entity/dto/NewProductSurveyStepFourValidationRequest.java b/src/main/java/com/sztzjy/linkCommerce/entity/dto/NewProductSurveyStepFourValidationRequest.java new file mode 100644 index 0000000..919a2d9 --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/entity/dto/NewProductSurveyStepFourValidationRequest.java @@ -0,0 +1,14 @@ +package com.sztzjy.linkCommerce.entity.dto; + +public class NewProductSurveyStepFourValidationRequest { + private String coreValue; + private String tangibleValue; + private String extendedValue; + + public String getCoreValue() { return coreValue; } + public void setCoreValue(String coreValue) { this.coreValue = coreValue; } + public String getTangibleValue() { return tangibleValue; } + public void setTangibleValue(String tangibleValue) { this.tangibleValue = tangibleValue; } + public String getExtendedValue() { return extendedValue; } + public void setExtendedValue(String extendedValue) { this.extendedValue = extendedValue; } +} diff --git a/src/main/java/com/sztzjy/linkCommerce/entity/dto/NewProductSurveyStepFourValidationResult.java b/src/main/java/com/sztzjy/linkCommerce/entity/dto/NewProductSurveyStepFourValidationResult.java new file mode 100644 index 0000000..67c8747 --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/entity/dto/NewProductSurveyStepFourValidationResult.java @@ -0,0 +1,11 @@ +package com.sztzjy.linkCommerce.entity.dto; + +public class NewProductSurveyStepFourValidationResult { + 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/NewProductSurveyStepFourService.java b/src/main/java/com/sztzjy/linkCommerce/service/NewProductSurveyStepFourService.java new file mode 100644 index 0000000..7e57266 --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/service/NewProductSurveyStepFourService.java @@ -0,0 +1,9 @@ +package com.sztzjy.linkCommerce.service; + +import com.sztzjy.linkCommerce.config.security.JwtUser; +import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepFourValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepFourValidationResult; + +public interface NewProductSurveyStepFourService { + NewProductSurveyStepFourValidationResult validate(NewProductSurveyStepFourValidationRequest request, JwtUser user); +} diff --git a/src/main/java/com/sztzjy/linkCommerce/service/impl/NewProductSurveyStepFourServiceImpl.java b/src/main/java/com/sztzjy/linkCommerce/service/impl/NewProductSurveyStepFourServiceImpl.java new file mode 100644 index 0000000..92c236e --- /dev/null +++ b/src/main/java/com/sztzjy/linkCommerce/service/impl/NewProductSurveyStepFourServiceImpl.java @@ -0,0 +1,48 @@ +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.NewProductSurveyStepFourValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepFourValidationResult; +import com.sztzjy.linkCommerce.service.NewProductSurveyStepFourService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; + +@Service +public class NewProductSurveyStepFourServiceImpl implements NewProductSurveyStepFourService { + @Override + public NewProductSurveyStepFourValidationResult validate(NewProductSurveyStepFourValidationRequest request, JwtUser user) { + requireStudent(user); + if (request == null) { + throw badRequest("请完成三层次AI应用价值分析"); + } + requireNonBlank(request.getCoreValue(), "请填写核心层AI应用价值分析"); + requireNonBlank(request.getTangibleValue(), "请填写有形层AI应用价值分析"); + requireNonBlank(request.getExtendedValue(), "请填写延伸层AI应用价值分析"); + + NewProductSurveyStepFourValidationResult result = new NewProductSurveyStepFourValidationResult(); + 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, "仅学生可提交实训答案"); + } + } + + private void requireNonBlank(String value, String message) { + if (StringUtils.isBlank(value)) { + throw badRequest(message); + } + } + + private ServiceException badRequest(String message) { + return new ServiceException(HttpStatus.BAD_REQUEST, message); + } +} 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 ecdff0d..1dd2a3f 100644 --- a/src/test/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerControllerTest.java +++ b/src/test/java/com/sztzjy/linkCommerce/controller/stu/StudentTrainingAnswerControllerTest.java @@ -9,9 +9,12 @@ import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepTwoValidationReque import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepTwoValidationResult; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepThreeValidationRequest; import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepThreeValidationResult; +import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepFourValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepFourValidationResult; import com.sztzjy.linkCommerce.service.NewProductSurveyStepOneService; import com.sztzjy.linkCommerce.service.NewProductSurveyStepTwoService; import com.sztzjy.linkCommerce.service.NewProductSurveyStepThreeService; +import com.sztzjy.linkCommerce.service.NewProductSurveyStepFourService; import com.sztzjy.linkCommerce.util.ResultEntity; import org.junit.jupiter.api.Test; import org.springframework.http.HttpStatus; @@ -79,6 +82,23 @@ class StudentTrainingAnswerControllerTest { verify(service).validate(any(NewProductSurveyStepThreeValidationRequest.class), any(JwtUser.class)); } + @Test + void validateStepFourUsesTheAuthenticatedStudentAndReturnsTheValidationResult() { + StudentTrainingAnswerController controller = new StudentTrainingAnswerController(); + NewProductSurveyStepFourService service = mock(NewProductSurveyStepFourService.class); + ReflectionTestUtils.setField(controller, "newProductSurveyStepFourService", service); + NewProductSurveyStepFourValidationResult validation = new NewProductSurveyStepFourValidationResult(); + validation.setValid(true); + when(service.validate(any(NewProductSurveyStepFourValidationRequest.class), any(JwtUser.class))).thenReturn(validation); + + NewProductSurveyStepFourValidationRequest answer = new NewProductSurveyStepFourValidationRequest(); + ResultEntity result = controller.validateNewProductSurveyStepFour(answer, authenticatedStudentRequest()); + + assertEquals(HttpStatus.OK, result.getStatusCode()); + assertEquals(validation, result.getBody().getData()); + verify(service).validate(any(NewProductSurveyStepFourValidationRequest.class), any(JwtUser.class)); + } + private HttpServletRequest authenticatedStudentRequest() { JwtUser user = new JwtUser(); user.setUserId("stu-1"); diff --git a/src/test/java/com/sztzjy/linkCommerce/service/impl/NewProductSurveyStepFourServiceImplTest.java b/src/test/java/com/sztzjy/linkCommerce/service/impl/NewProductSurveyStepFourServiceImplTest.java new file mode 100644 index 0000000..8401163 --- /dev/null +++ b/src/test/java/com/sztzjy/linkCommerce/service/impl/NewProductSurveyStepFourServiceImplTest.java @@ -0,0 +1,59 @@ +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.NewProductSurveyStepFourValidationRequest; +import com.sztzjy.linkCommerce.entity.dto.NewProductSurveyStepFourValidationResult; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class NewProductSurveyStepFourServiceImplTest { + + @Test + void acceptsStudentWithAllThreeNonBlankValues() { + NewProductSurveyStepFourServiceImpl service = new NewProductSurveyStepFourServiceImpl(); + + NewProductSurveyStepFourValidationResult result = service.validate(request("核心分析", "有形分析", "延伸分析"), student()); + + assertTrue(result.isValid()); + } + + @Test + void rejectsBlankValuesForEachLayer() { + NewProductSurveyStepFourServiceImpl service = new NewProductSurveyStepFourServiceImpl(); + + assertThrows(ServiceException.class, () -> service.validate(request(" ", "有形分析", "延伸分析"), student())); + assertThrows(ServiceException.class, () -> service.validate(request("核心分析", "\t", "延伸分析"), student())); + assertThrows(ServiceException.class, () -> service.validate(request("核心分析", "有形分析", ""), student())); + } + + @Test + void rejectsNonStudent() { + NewProductSurveyStepFourServiceImpl service = new NewProductSurveyStepFourServiceImpl(); + + assertThrows(ServiceException.class, () -> service.validate(request("核心分析", "有形分析", "延伸分析"), teacher())); + } + + private NewProductSurveyStepFourValidationRequest request(String coreValue, String tangibleValue, String extendedValue) { + NewProductSurveyStepFourValidationRequest request = new NewProductSurveyStepFourValidationRequest(); + request.setCoreValue(coreValue); + request.setTangibleValue(tangibleValue); + request.setExtendedValue(extendedValue); + 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; + } +}