From 2c533c51234c61b4895143564be983f08c4d12f9 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Sat, 29 Mar 2025 03:55:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1=E3=80=81=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=94=B9=E6=88=90get=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applet/contoller/ApiAppletAmountController.java | 7 ++----- .../applet/contoller/ApiAppletConfigController.java | 11 ++++------- .../contoller/ApiAppletExaminationController.java | 17 +++++++---------- .../contoller/ApiAppletUserTeacherController.java | 7 ++----- 4 files changed, 15 insertions(+), 27 deletions(-) diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAmountController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAmountController.java index 8f9f98d..c2722cd 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAmountController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAmountController.java @@ -7,10 +7,7 @@ import com.ruoyi.model.service.IAppletAmountLogService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -23,7 +20,7 @@ public class ApiAppletAmountController { private IAppletAmountLogService appletAmountLogService; @ApiOperation("小程序-金额流水信息列表数据查询") - @PostMapping("/amountLogList") + @GetMapping("/amountLogList") public AjaxResult amountLogList(@RequestBody AppletAmountLog appletAmountLog){ List amountLogList = appletAmountLogService.selectAppletAmountLogList(appletAmountLog); return AjaxResult.success("金额流水信息列表数据",amountLogList); diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletConfigController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletConfigController.java index 6dbb052..41c2bd4 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletConfigController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletConfigController.java @@ -9,10 +9,7 @@ import com.ruoyi.model.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -33,21 +30,21 @@ public class ApiAppletConfigController { private IAppletTrainService appletTrainService; @ApiOperation("小程序-配置信息列表数据查询") - @PostMapping("/configList") + @GetMapping("/configList") public AjaxResult configList(@RequestBody AppletConfig appletConfig){ List configList = appletConfigService.selectAppletConfigList(appletConfig); return AjaxResult.success("配置信息列表数据",configList); } @ApiOperation("小程序-平台&服务介绍列表数据查询") - @PostMapping("/serviceList") + @GetMapping("/serviceList") public AjaxResult serviceList(@RequestBody AppletService appletService){ List serviceList = appletServiceService.selectAppletServiceList(appletService); return AjaxResult.success("台&服务介绍列表数据",serviceList); } @ApiOperation("小程序-服务培训列表数据查询") - @PostMapping("/trainList") + @GetMapping("/trainList") public AjaxResult trainList(@RequestBody AppletTrain appletTrain){ List trainList = appletTrainService.selectAppletTrainList(appletTrain); return AjaxResult.success("服务培训列表数据",trainList); diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletExaminationController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletExaminationController.java index 9703123..bf3fe1e 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletExaminationController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletExaminationController.java @@ -6,10 +6,7 @@ import com.ruoyi.model.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -43,14 +40,14 @@ public class ApiAppletExaminationController { private IAppletAnswerTrainService appletAnswerTrainService; @ApiOperation("伴宠师工作台-题目列表数据查询") - @PostMapping("/questionList") + @GetMapping("/questionList") public AjaxResult questionList(@RequestBody AppletQuestion question){ List questionList = appletQuestionService.selectAppletQuestionList(question); return AjaxResult.success("题目列表数据",questionList); } @ApiOperation("伴宠师工作台-根据题目id查询题目答案") - @PostMapping("/insertUser") + @GetMapping("/insertUser") public AjaxResult answerListByQuestionId(long questionId){ AppletAnswer appletAnswer = new AppletAnswer(); appletAnswer.setQuestionId(questionId); @@ -59,14 +56,14 @@ public class ApiAppletExaminationController { } @ApiOperation("伴宠师工作台-查询宠物类型列表") - @PostMapping("/petTypeList") + @GetMapping("/petTypeList") public AjaxResult petTypeList(@RequestBody AppletPetType appletPetType){ List petTypeList = appletPetTypeService.selectAppletPetTypeList(appletPetType); return AjaxResult.success("宠物类型列表数据",petTypeList); } @ApiOperation("伴宠师工作台-查询专业执照列表") - @PostMapping("/licenseList") + @GetMapping("/licenseList") public AjaxResult licenseList(@RequestBody AppletLicense appletLicense){ List licenseList = appletLicenseService.selectAppletLicenseList(appletLicense); return AjaxResult.success("专业执照列表数据",licenseList); @@ -80,7 +77,7 @@ public class ApiAppletExaminationController { // } @ApiOperation("伴宠师工作台-根据题目id查询基本考核答案") - @PostMapping("/answeBaseByQuestionId") + @GetMapping("/answeBaseByQuestionId") public AjaxResult answeBaseByQuestionId(Long questionId, Long userId){ AppletAnswerBase answerBase = new AppletAnswerBase(); answerBase.setQuestionId(questionId); @@ -115,7 +112,7 @@ public class ApiAppletExaminationController { // } @ApiOperation("伴宠师工作台-根据题目id查询培训考核答案") - @PostMapping("/answeTrainByQuestionId") + @GetMapping("/answeTrainByQuestionId") public AjaxResult answeTrainByQuestionId(Long questionId, Long userId){ AppletAnswerTrain answerTrain = new AppletAnswerTrain(); answerTrain.setQuestionId(questionId); diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletUserTeacherController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletUserTeacherController.java index ea9ccc5..fe62040 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletUserTeacherController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletUserTeacherController.java @@ -6,10 +6,7 @@ import com.ruoyi.model.service.IAppUsersService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -21,7 +18,7 @@ public class ApiAppletUserTeacherController { private IAppUsersService appUsersService; @ApiOperation("伴宠师工作台-伴宠师列表数据查询") - @PostMapping("/userList") + @GetMapping("/userList") public AjaxResult userList(@RequestBody AppUsers user){ List userList = appUsersService.selectAppUsersList(user); return AjaxResult.success("宠师列表数据",userList); From 613f51f03f1062689bc550ec4707bc59f003a6b2 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Sat, 29 Mar 2025 04:06:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1=E3=80=81=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8E=BB=E9=99=A4@RequestBody?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/applet/contoller/ApiAppletAmountController.java | 2 +- .../com/ruoyi/applet/contoller/ApiAppletConfigController.java | 6 +++--- .../ruoyi/applet/contoller/ApiAppletExaminationController.java | 10 +++++----- .../ruoyi/applet/contoller/ApiAppletUserTeacherController.java | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAmountController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAmountController.java index c2722cd..a66eb76 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAmountController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAmountController.java @@ -21,7 +21,7 @@ public class ApiAppletAmountController { @ApiOperation("小程序-金额流水信息列表数据查询") @GetMapping("/amountLogList") - public AjaxResult amountLogList(@RequestBody AppletAmountLog appletAmountLog){ + public AjaxResult amountLogList(AppletAmountLog appletAmountLog){ List amountLogList = appletAmountLogService.selectAppletAmountLogList(appletAmountLog); return AjaxResult.success("金额流水信息列表数据",amountLogList); } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletConfigController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletConfigController.java index 41c2bd4..3fb0bf3 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletConfigController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletConfigController.java @@ -31,21 +31,21 @@ public class ApiAppletConfigController { @ApiOperation("小程序-配置信息列表数据查询") @GetMapping("/configList") - public AjaxResult configList(@RequestBody AppletConfig appletConfig){ + public AjaxResult configList(AppletConfig appletConfig){ List configList = appletConfigService.selectAppletConfigList(appletConfig); return AjaxResult.success("配置信息列表数据",configList); } @ApiOperation("小程序-平台&服务介绍列表数据查询") @GetMapping("/serviceList") - public AjaxResult serviceList(@RequestBody AppletService appletService){ + public AjaxResult serviceList(AppletService appletService){ List serviceList = appletServiceService.selectAppletServiceList(appletService); return AjaxResult.success("台&服务介绍列表数据",serviceList); } @ApiOperation("小程序-服务培训列表数据查询") @GetMapping("/trainList") - public AjaxResult trainList(@RequestBody AppletTrain appletTrain){ + public AjaxResult trainList(AppletTrain appletTrain){ List trainList = appletTrainService.selectAppletTrainList(appletTrain); return AjaxResult.success("服务培训列表数据",trainList); } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletExaminationController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletExaminationController.java index bf3fe1e..912f5cf 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletExaminationController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletExaminationController.java @@ -41,7 +41,7 @@ public class ApiAppletExaminationController { @ApiOperation("伴宠师工作台-题目列表数据查询") @GetMapping("/questionList") - public AjaxResult questionList(@RequestBody AppletQuestion question){ + public AjaxResult questionList(AppletQuestion question){ List questionList = appletQuestionService.selectAppletQuestionList(question); return AjaxResult.success("题目列表数据",questionList); } @@ -57,14 +57,14 @@ public class ApiAppletExaminationController { @ApiOperation("伴宠师工作台-查询宠物类型列表") @GetMapping("/petTypeList") - public AjaxResult petTypeList(@RequestBody AppletPetType appletPetType){ + public AjaxResult petTypeList(AppletPetType appletPetType){ List petTypeList = appletPetTypeService.selectAppletPetTypeList(appletPetType); return AjaxResult.success("宠物类型列表数据",petTypeList); } @ApiOperation("伴宠师工作台-查询专业执照列表") @GetMapping("/licenseList") - public AjaxResult licenseList(@RequestBody AppletLicense appletLicense){ + public AjaxResult licenseList(AppletLicense appletLicense){ List licenseList = appletLicenseService.selectAppletLicenseList(appletLicense); return AjaxResult.success("专业执照列表数据",licenseList); } @@ -94,7 +94,7 @@ public class ApiAppletExaminationController { @ApiOperation("伴宠师工作台-添加用户基本考核答案") @PostMapping("/addBaseAnswer") - public AjaxResult addBaseAnswer(@RequestBody AppletAnswerBase answerBase){ + public AjaxResult addBaseAnswer(AppletAnswerBase answerBase){ return toAjax(appletAnswerBaseService.insertAppletAnswerBase(answerBase)); } @@ -124,7 +124,7 @@ public class ApiAppletExaminationController { @ApiOperation("伴宠师工作台-添加用户培训考核答案") @PostMapping("/addTrainAnswer") - public AjaxResult addTrainAnswer(@RequestBody AppletAnswerTrain answerTrain){ + public AjaxResult addTrainAnswer(AppletAnswerTrain answerTrain){ return toAjax(appletAnswerTrainService.insertAppletAnswerTrain(answerTrain)); } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletUserTeacherController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletUserTeacherController.java index fe62040..4832828 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletUserTeacherController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletUserTeacherController.java @@ -19,7 +19,7 @@ public class ApiAppletUserTeacherController { @ApiOperation("伴宠师工作台-伴宠师列表数据查询") @GetMapping("/userList") - public AjaxResult userList(@RequestBody AppUsers user){ + public AjaxResult userList(AppUsers user){ List userList = appUsersService.selectAppUsersList(user); return AjaxResult.success("宠师列表数据",userList); } From fa4f95817d0a9aad0c884e514d048d2108ca53b5 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Sat, 29 Mar 2025 04:24:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1=E3=80=81=E4=BC=B4=E5=AE=A0=E5=B8=88?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contoller/ApiAppletUserTeacherController.java | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletUserTeacherController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletUserTeacherController.java index 4832828..3634ec3 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletUserTeacherController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletUserTeacherController.java @@ -2,7 +2,9 @@ package com.ruoyi.applet.contoller; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.model.domain.AppUsers; +import com.ruoyi.model.domain.AppletUsersTeacher; import com.ruoyi.model.service.IAppUsersService; +import com.ruoyi.model.service.IAppletUsersTeacherService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -16,30 +18,33 @@ import java.util.List; public class ApiAppletUserTeacherController { @Autowired private IAppUsersService appUsersService; + @Autowired + private IAppletUsersTeacherService appletUsersTeacherService; + @ApiOperation("伴宠师工作台-伴宠师列表数据查询") @GetMapping("/userList") - public AjaxResult userList(AppUsers user){ - List userList = appUsersService.selectAppUsersList(user); - return AjaxResult.success("宠师列表数据",userList); + public AjaxResult userList(AppletUsersTeacher usersTeacher){ + List userList = appletUsersTeacherService.selectAppletUsersTeacherList(usersTeacher); + return AjaxResult.success("伴宠师列表数据",userList); } @ApiOperation("伴宠师工作台-伴宠师基本信息添加") @PostMapping("/insertUser") - public AjaxResult insertUser(@RequestBody AppUsers user){ - return toAjax(appUsersService.insertAppUsers(user)); + public AjaxResult insertUser(@RequestBody AppletUsersTeacher usersTeacher){ + return toAjax(appletUsersTeacherService.insertAppletUsersTeacher(usersTeacher)); } @ApiOperation("伴宠师工作台-伴宠师基本信息修改") @PostMapping("/udpateUser") - public AjaxResult udpateUser(@RequestBody AppUsers user){ - return toAjax(appUsersService.updateAppUsers(user)); + public AjaxResult udpateUser(@RequestBody AppletUsersTeacher usersTeacher){ + return toAjax(appletUsersTeacherService.updateAppletUsersTeacher(usersTeacher)); } @ApiOperation("伴宠师工作台-伴宠师基本信息删除") @PostMapping("/deleteUser") public AjaxResult deleteUser(long id){ - return toAjax(appUsersService.deleteAppUsersByUserId(id)); + return toAjax(appletUsersTeacherService.deleteAppletUsersTeacherById(id)); } protected AjaxResult toAjax(int rows) {