Skip to content

Commit

Permalink
feat 修改page接口的请求方式
Browse files Browse the repository at this point in the history
  • Loading branch information
wyt1215819315 committed Dec 18, 2023
1 parent 2ef2288 commit afe350b
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 33 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
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 javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
Expand All @@ -33,14 +31,14 @@ public class LoginController {
private UserService userService;

@ApiOperation("用户名密码登录")
@RequestMapping("/formLogin")
@PostMapping("/formLogin")
@SaIgnore
public AjaxResult formLogin(@Validated @RequestBody LoginModel loginModel) {
return loginService.formLogin(loginModel);
}

@ApiOperation("获取图形验证码")
@RequestMapping("/getImageCaptcha")
@GetMapping("/getImageCaptcha")
@SaIgnore
public void getImageCaptcha(HttpServletResponse response) throws IOException {
loginService.getValidCode(response);
Expand All @@ -63,7 +61,7 @@ public AjaxResult me() {
}

@ApiOperation("修改密码")
@RequestMapping("/editSelfPassword")
@PostMapping("/editSelfPassword")
public AjaxResult editSelfPassword(@RequestBody SysUserVo sysUserVo) {
if (StrUtil.isBlank(sysUserVo.getPassword())) {
return AjaxResult.doError("密码不能为空!");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.github.system.auth.vo.RegModel;
import com.github.system.base.dto.AjaxResult;
import org.springframework.validation.annotation.Validated;
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;
Expand All @@ -19,7 +20,7 @@ public class RegController {
private RegService regService;

@SaIgnore
@RequestMapping("/doReg")
@PostMapping("/doReg")
public AjaxResult doReg(@RequestBody @Validated RegModel regModel) {
return regService.doReg(regModel);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ public class SysConfigController {
@Resource
private SysConfigService sysConfigService;

@RequestMapping("/page")
public Page<SysConfig> page(@RequestBody Page<SysConfig> page) {
@GetMapping("/page")
public Page<SysConfig> page(Page<SysConfig> page) {
return sysConfigService.page(page);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ public class SysUserController {
private UserService userService;

@ApiOperation("分页查询")
@RequestMapping("/page")
public Page<SysUser> page(@RequestBody Page<SysUser> page, @RequestBody SysUserVo sysUserVo) {
@GetMapping("/page")
public Page<SysUser> page(Page<SysUser> page, SysUserVo sysUserVo) {
LambdaQueryWrapper<SysUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.select(SysUser.class, i -> !"password".equals(i.getProperty()));
lambdaQueryWrapper.eq(StrUtil.isNotEmpty(sysUserVo.getUsername()), SysUser::getUsername, sysUserVo.getUsername());
Expand All @@ -43,7 +43,7 @@ public AjaxResult delete(@PathVariable Long id) {
}

@ApiOperation("更新")
@RequestMapping("/update")
@PostMapping("/update")
public AjaxResult update(@RequestBody SysUserVo sysUserVo) {
if (userService.checkIfAdmin(sysUserVo.getId())) {
return AjaxResult.doError("不能修改管理员用户!");
Expand All @@ -52,7 +52,7 @@ public AjaxResult update(@RequestBody SysUserVo sysUserVo) {
}

@ApiOperation("新增")
@RequestMapping("/save")
@PostMapping("/save")
public AjaxResult save(@RequestBody SysUserVo sysUserVo) {
return AjaxResult.status(userService.saveUser(sysUserVo));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ public class QuartzJobController {
private SysQuartzJobService sysQuartzJobService;


@RequestMapping("/page")
@GetMapping("/page")
@ApiOperation("定时任务调度分页查询")
public Page<SysQuartzJob> page(@RequestBody Page<SysQuartzJob> page, SysQuartzJobVo sysQuartzJobVo) {
public Page<SysQuartzJob> page(Page<SysQuartzJob> page, SysQuartzJobVo sysQuartzJobVo) {
LambdaQueryWrapper<SysQuartzJob> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(StrUtil.isNotEmpty(sysQuartzJobVo.getJobName()), SysQuartzJob::getJobName, sysQuartzJobVo.getJobName());
lambdaQueryWrapper.eq(sysQuartzJobVo.getStatus() != null, SysQuartzJob::getStatus, sysQuartzJobVo.getStatus());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ public class QuartzJobLogController {
private SysQuartzJobLogService sysQuartzJobLogService;


@RequestMapping("/page")
@GetMapping("/page")
@ApiOperation("定时任务调度日志表集合查询")
public Page<SysQuartzJobLog> page(@RequestBody Page<SysQuartzJobLog> page, @RequestBody(required = false) SysQuartzJobVo sysQuartzJobVo) {
public Page<SysQuartzJobLog> page(Page<SysQuartzJobLog> page, SysQuartzJobVo sysQuartzJobVo) {
LambdaQueryWrapper<SysQuartzJobLog> lambdaQueryWrapper = new LambdaQueryWrapper<>();
List<String> excludeField = List.of("exceptionInfo");
lambdaQueryWrapper.select(SysQuartzJobLog.class, i -> !excludeField.contains(i.getProperty()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class AutoIndexController {
private AutoIndexService autoIndexService;

@ApiOperation("列表")
@RequestMapping("/list")
@GetMapping("/list")
public List<AutoIndex> list() {
return autoIndexService.userList();
}
Expand Down Expand Up @@ -60,15 +60,15 @@ public List<CustomFormDisplayDto> getSettingColumn(@PathVariable String indexId)
}

@ApiOperation("管理员分页列表")
@RequestMapping("/admin/page")
@GetMapping("/admin/page")
@SaCheckRole("ADMIN")
public Page<AutoIndex> adminPage(@RequestBody Page<AutoIndex> page) {
public Page<AutoIndex> adminPage(Page<AutoIndex> page) {
LambdaQueryWrapper<AutoIndex> lambdaQueryWrapper = new LambdaQueryWrapper<>();
return autoIndexService.page(page, lambdaQueryWrapper);
}

@ApiOperation("修改")
@RequestMapping("/admin/update")
@PostMapping("/admin/update")
@SaCheckRole("ADMIN")
public AjaxResult adminUpdate(@RequestBody AutoIndex autoIndex) {
if (autoIndexService.updateById(autoIndex)) {
Expand All @@ -78,7 +78,7 @@ public AjaxResult adminUpdate(@RequestBody AutoIndex autoIndex) {
}

@ApiOperation("修改开启状态")
@RequestMapping("/admin/changeEnable")
@PostMapping("/admin/changeEnable")
@SaCheckRole("ADMIN")
public AjaxResult adminChangeEnable(@RequestBody AutoIndex autoIndex) {
AutoIndex entity = autoIndexService.getById(autoIndex.getId());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ public class AutoTaskController {
private AutoTaskService autoTaskService;

@ApiOperation("任务分页查询")
@RequestMapping("/{indexId}/page")
public Page<AutoTaskDto> taskPage(@RequestBody Page<AutoTask> page, @PathVariable String indexId) throws Exception {
@GetMapping("/{indexId}/page")
public Page<AutoTaskDto> taskPage(Page<AutoTask> page, @PathVariable String indexId) throws Exception {
return autoTaskService.taskPage(page, indexId);
}

@ApiOperation("我的任务列表分页")
@RequestMapping("/mine/page")
public Page<AutoTaskDto> minePage(@RequestBody Page<AutoTask> page) throws Exception {
@GetMapping("/mine/page")
public Page<AutoTaskDto> minePage(Page<AutoTask> page) throws Exception {
return autoTaskService.minePage(page);
}

Expand Down Expand Up @@ -59,25 +59,25 @@ public AjaxResult run(@PathVariable Long taskId) throws Exception {
}

@ApiOperation("校验任务")
@RequestMapping("/{indexId}/check")
@PostMapping("/{indexId}/check")
public AjaxResult checkUser(@PathVariable Long indexId, @RequestBody AutoTaskVo autoTaskVo) throws Exception {
return AjaxResult.doSuccess(autoTaskService.checkOrSaveUser(indexId, autoTaskVo, false));
}

@ApiOperation("校验任务并保存")
@RequestMapping("/{indexId}/checkAndSave")
@PostMapping("/{indexId}/checkAndSave")
public AjaxResult checkUserAndSave(@PathVariable Long indexId, @RequestBody AutoTaskVo autoTaskVo) throws Exception {
return AjaxResult.doSuccess(autoTaskService.checkOrSaveUser(indexId, autoTaskVo, true));
}

@ApiOperation("校验任务并更新")
@RequestMapping("/checkAndUpdate")
@PostMapping("/checkAndUpdate")
public AjaxResult checkUserAndSave(@RequestBody AutoTaskVo autoTaskVo) throws Exception {
return AjaxResult.doSuccess(autoTaskService.checkAndUpdate(autoTaskVo, true));
}

@ApiOperation("编辑情况下的校验任务")
@RequestMapping("/checkUserWithTask")
@PostMapping("/checkUserWithTask")
public AjaxResult checkUserWithTask(@RequestBody AutoTaskVo autoTaskVo) throws Exception {
return AjaxResult.doSuccess(autoTaskService.checkAndUpdate(autoTaskVo, false));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ public class TaskLogController {

@ApiOperation("列表")
@SaCheckRole("ADMIN")
@RequestMapping("/list")
public Page<HistoryTaskLog> list(@RequestBody Page<HistoryTaskLog> page, @RequestBody HistoryTaskLogVo historyTaskLogVo) {
@GetMapping("/list")
public Page<HistoryTaskLog> list(Page<HistoryTaskLog> page, HistoryTaskLogVo historyTaskLogVo) {
LambdaQueryWrapper<HistoryTaskLog> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.select(HistoryTaskLog.class, i -> !"text".equals(i.getProperty()));
lambdaQueryWrapper.eq(StrUtil.isNotEmpty(historyTaskLogVo.getType()), HistoryTaskLog::getType, historyTaskLogVo.getType());
Expand Down

0 comments on commit afe350b

Please sign in to comment.