From 0ca16900f2e1b7375e34964eee13197106c11700 Mon Sep 17 00:00:00 2001 From: 侯瑞军 <411269194@kidgrow.com> Date: Thu, 02 Apr 2020 19:26:53 +0800 Subject: [PATCH] 将生成的代码更新到项目(user_center opration_center) --- kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserLogsController.java | 52 +++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 41 insertions(+), 11 deletions(-) diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserLogsController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserLogsController.java index 4bee7c6..c0ad40f 100644 --- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserLogsController.java +++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserLogsController.java @@ -1,7 +1,7 @@ package com.kidgrow.usercenter.controller; import java.util.Map; - +import com.kidgrow.common.controller.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; @@ -14,6 +14,8 @@ import com.kidgrow.usercenter.service.ISysUserLogsService; import com.kidgrow.common.model.*; +import org.springframework.validation.BindingResult; +import javax.validation.Valid; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; @@ -26,7 +28,7 @@ * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br> * @Description: 系统用户登录日志表 * @Project: 用户中心 - * @CreateDate: Created in 2020-03-09 10:13:23 <br> + * @CreateDate: Created in 2020-04-02 18:32:36 <br> * @Author: <a href="4345453@kidgrow.com">liuke</a> * @version: 1.0 */ @@ -34,7 +36,7 @@ @RestController @RequestMapping("/sysuserlogs") @Api(tags = "系统用户登录日志表") -public class SysUserLogsController { +public class SysUserLogsController extends BaseController{ @Autowired private ISysUserLogsService sysUserLogsService; @@ -47,8 +49,12 @@ @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer") }) @GetMapping - public PageResult list(@RequestParam Map<String, Object> params) { - return sysUserLogsService.findList(params); + public ResultBody<PageResult> list(@RequestParam Map<String, Object> params) { + if(params.size()==0){ + params.put("page",1); + params.put("limit",10); + } + return ResultBody.ok().data(sysUserLogsService.findList(params)); } /** @@ -56,8 +62,18 @@ */ @ApiOperation(value = "查询") @GetMapping("/{id}") - public ResultBody findUserById(@PathVariable Long id) { + public ResultBody findById(@PathVariable Long id) { SysUserLogs model = sysUserLogsService.getById(id); + return ResultBody.ok().data(model).msg("查询成功"); + } + + /** + * 根据SysUserLogs当做查询条件进行查询 + */ + @ApiOperation(value = "根据SysUserLogs当做查询条件进行查询") + @PostMapping("/query") + public ResultBody findByObject(@RequestBody SysUserLogs sysUserLogs) { + SysUserLogs model = sysUserLogsService.findByObject(sysUserLogs); return ResultBody.ok().data(model).msg("查询成功"); } @@ -66,9 +82,18 @@ */ @ApiOperation(value = "保存") @PostMapping - public ResultBody save(@RequestBody SysUserLogs sysUserLogs) { - sysUserLogsService.saveOrUpdate(sysUserLogs); - return ResultBody.ok().msg("保存成功"); + public ResultBody save(@Valid @RequestBody SysUserLogs sysUserLogs, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage()); + } else { + boolean v= sysUserLogsService.saveOrUpdate(sysUserLogs); + if(v) { + return ResultBody.ok().data(sysUserLogs).msg("保存成功"); + } + else { + return ResultBody.failed().msg("保存失败"); + } + } } /** @@ -77,7 +102,12 @@ @ApiOperation(value = "删除") @DeleteMapping("/{id}") public ResultBody delete(@PathVariable Long id) { - sysUserLogsService.removeById(id); - return ResultBody.ok().msg("删除成功"); + boolean v= sysUserLogsService.removeById(id); + if(v) { + return ResultBody.ok().msg("删除成功"); + } + else { + return ResultBody.failed().msg("删除失败"); + } } } -- Gitblit v1.8.0