Merge branch 'master' of https://git.iwintrue.com/liaoxg/zxyj

zxyj-backend/src/main/java/com/zxyj/config/GlobalExceptionHandler.java

@@ -0,0 +1,14 @@
+package com.zxyj.config;
+
+import com.zxyj.common.Result;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+@RestControllerAdvice
+public class GlobalExceptionHandler {
+
+    @ExceptionHandler(IllegalArgumentException.class)
+    public Result<Void> handleIllegalArgumentException(IllegalArgumentException e) {
+        return Result.error(400, e.getMessage());
+    }
+}

zxyj-backend/src/main/java/com/zxyj/controller/TaskTemplatePackageController.java

@@ -123,7 +123,7 @@ public class TaskTemplatePackageController {
      * 获取套餐的任务项列表
      */
     @Operation(summary = "获取套餐的任务项列表")
-    @PostMapping("/{id}/items")
+    @PostMapping("/{id}/item-list")
     public Result<List<TaskTemplateItem>> getPackageItems(@PathVariable Long id) {
         List<TaskTemplateItem> items = packageService.getPackageItems(id);
         return Result.success(items);

zxyj-backend/src/main/java/com/zxyj/controller/family/ParentController.java

@@ -36,7 +36,7 @@ public class ParentController {
     /**
      * 家长心愿单 - 获取列表（所有家庭成员的心愿）
      */
-    @PostMapping("/wishlist")
+    @PostMapping("/wishlist/list")
     public Result<List<RewardDTO>> getParentWishlist(@RequestAttribute("userId") Long userId) {
         User user = userService.getUserInfo(userId);
         if (user == null || user.getFamilyId() == null) {

zxyj-backend/src/main/java/com/zxyj/controller/family/UserController.java

@@ -146,7 +146,7 @@ public class UserController {
     }
 
     @Operation(summary = "获取孩子列表")
-    @PostMapping("/children")
+    @PostMapping("/children/list")
     public Result<List<ChildInfoDTO>> getChildren(javax.servlet.http.HttpServletRequest request) {
         Long userId = getUserId(request);
         List<ChildInfoDTO> children = userService.getChildren(userId);

zxyj-backend/src/main/java/com/zxyj/controller/guide/TeacherController.java

@@ -51,7 +51,7 @@ public class TeacherController {
    * 获取教师任务列表
    */
     @Operation(summary = "获取教师任务列表")
-    @PostMapping("/tasks")
+    @PostMapping("/tasks/list")
     public Result<List<TaskDTO>> getTaskList(@RequestAttribute("userId") Long teacherId) {
     // TODO: Implement getTaskList in TeacherService
     // List<TaskDTO> tasks = teacherService.getTaskList(teacherId);
@@ -76,7 +76,7 @@ public class TeacherController {
    * 获取教师班级列表
    */
     @Operation(summary = "获取教师班级列表")
-    @PostMapping("/classes")
+    @PostMapping("/classes/list")
     public Result<List<ClassInfoDTO>> getClassList(@RequestAttribute("userId") Long teacherId) {
     // TODO: Implement getClassList in TeacherService
     // List<ClassInfoDTO> classes = teacherService.getClassList(teacherId);
@@ -101,7 +101,7 @@ public class TeacherController {
    * 添加学生到班级
    */
     @Operation(summary = "添加学生到班级")
-    @PostMapping("/classes/{classId}/students")
+    @PostMapping("/classes/{classId}/students/add")
     public Result<Boolean> addStudentToClass(@RequestAttribute("userId") Long teacherId,
       @PathVariable Long classId,
       @RequestBody Map<String, Long> body) {

zxyj-backend/src/main/java/com/zxyj/controller/reward/RewardWishlistController.java

@@ -16,7 +16,7 @@ import java.util.Map;
 
 @Tag(name = "家长心愿单管理")
 @RestController
-@RequestMapping("/api/parent/wishlist")
+@RequestMapping("/api/reward-wishlist")
 public class RewardWishlistController {
 
     @Resource

zxyj-backend/src/main/java/com/zxyj/controller/task/TaskReminderController.java

@@ -18,7 +18,7 @@ import java.util.Map;
  */
 @Tag(name = "任务提醒统计", description = "任务提醒、历史查询、统计分析接口")
 @RestController
-@RequestMapping("/api/tasks")
+@RequestMapping("/api/task-reminders")
 public class TaskReminderController {
 
     @Resource

zxyj-backend/src/main/java/com/zxyj/service/UserService.java

@@ -621,10 +621,17 @@ private WechatService wechatService;
             return null;
         }
 
+        if (dto.getNickname() == null || dto.getNickname().trim().isEmpty()) {
+            throw new IllegalArgumentException("孩子昵称不能为空");
+        }
+        if (dto.getAge() == null || dto.getAge() < 1 || dto.getAge() > 18) {
+            throw new IllegalArgumentException("请输入有效的年龄(1-18岁)");
+        }
+
         Child child = new Child();
         child.setUserId(userId);
         child.setFamilyId(user.getFamilyId());
-        child.setNickname(dto.getNickname());
+        child.setNickname(dto.getNickname().trim());
         child.setAge(dto.getAge());
         child.setBirthday(dto.getBirthday());
         child.setGender(dto.getGender());