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..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 @@ -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,8 +20,8 @@ public class ApiAppletAmountController { private IAppletAmountLogService appletAmountLogService; @ApiOperation("小程序-金额流水信息列表数据查询") - @PostMapping("/amountLogList") - public AjaxResult amountLogList(@RequestBody AppletAmountLog appletAmountLog){ + @GetMapping("/amountLogList") + 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 6dbb052..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 @@ -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,22 +30,22 @@ public class ApiAppletConfigController { private IAppletTrainService appletTrainService; @ApiOperation("小程序-配置信息列表数据查询") - @PostMapping("/configList") - public AjaxResult configList(@RequestBody AppletConfig appletConfig){ + @GetMapping("/configList") + public AjaxResult configList(AppletConfig appletConfig){ List configList = appletConfigService.selectAppletConfigList(appletConfig); return AjaxResult.success("配置信息列表数据",configList); } @ApiOperation("小程序-平台&服务介绍列表数据查询") - @PostMapping("/serviceList") - public AjaxResult serviceList(@RequestBody AppletService appletService){ + @GetMapping("/serviceList") + public AjaxResult serviceList(AppletService appletService){ List serviceList = appletServiceService.selectAppletServiceList(appletService); return AjaxResult.success("台&服务介绍列表数据",serviceList); } @ApiOperation("小程序-服务培训列表数据查询") - @PostMapping("/trainList") - public AjaxResult trainList(@RequestBody AppletTrain appletTrain){ + @GetMapping("/trainList") + 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 9703123..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 @@ -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") - public AjaxResult questionList(@RequestBody AppletQuestion question){ + @GetMapping("/questionList") + public AjaxResult questionList(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,15 +56,15 @@ public class ApiAppletExaminationController { } @ApiOperation("伴宠师工作台-查询宠物类型列表") - @PostMapping("/petTypeList") - public AjaxResult petTypeList(@RequestBody AppletPetType appletPetType){ + @GetMapping("/petTypeList") + public AjaxResult petTypeList(AppletPetType appletPetType){ List petTypeList = appletPetTypeService.selectAppletPetTypeList(appletPetType); return AjaxResult.success("宠物类型列表数据",petTypeList); } @ApiOperation("伴宠师工作台-查询专业执照列表") - @PostMapping("/licenseList") - public AjaxResult licenseList(@RequestBody AppletLicense appletLicense){ + @GetMapping("/licenseList") + public AjaxResult licenseList(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); @@ -97,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)); } @@ -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); @@ -127,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 ea9ccc5..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,14 +2,13 @@ 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; -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; @@ -19,30 +18,33 @@ import java.util.List; public class ApiAppletUserTeacherController { @Autowired private IAppUsersService appUsersService; + @Autowired + private IAppletUsersTeacherService appletUsersTeacherService; + @ApiOperation("伴宠师工作台-伴宠师列表数据查询") - @PostMapping("/userList") - public AjaxResult userList(@RequestBody AppUsers user){ - List userList = appUsersService.selectAppUsersList(user); - return AjaxResult.success("宠师列表数据",userList); + @GetMapping("/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) {