KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix-bug-202303' into fix-bug-202303

Browse Source
This commit is contained in:
zhaoxiao
2023-03-06 14:05:00 +08:00
parent d564f67722 ce55f03e70
commit fd3aee7b31
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysLogController.java
+9 -9
View File
@@ -12,10 +12,7 @@ import com.jero.modules.system.entity.SysLog;
import com.jero.modules.system.entity.SysRole; import com.jero.modules.system.entity.SysRole;
import com.jero.modules.system.service.ISysLogService; import com.jero.modules.system.service.ISysLogService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -47,12 +44,13 @@ public class SysLogController {
* @param req * @param req
* @return * @return
*/ */
@RequestMapping(value = "/page", method = RequestMethod.GET) // @RequestMapping(value = "/page", method = RequestMethod.GET)
@GetMapping("/page")
public Result<IPage<SysLog>> queryPageList(SysLog syslog,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, public Result<IPage<SysLog>> queryPageList(SysLog syslog,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
Result<IPage<SysLog>> result = new Result<IPage<SysLog>>(); Result<IPage<SysLog>> result = new Result<>();
QueryWrapper<SysLog> queryWrapper = QueryGenerator.initQueryWrapper(syslog, req.getParameterMap()); QueryWrapper<SysLog> queryWrapper = QueryGenerator.initQueryWrapper(syslog, req.getParameterMap());
Page<SysLog> page = new Page<SysLog>(pageNo, pageSize); Page<SysLog> page = new Page<>(pageNo, pageSize);
//日志关键词 //日志关键词
String keyWord = req.getParameter("keyWord"); String keyWord = req.getParameter("keyWord");
if(oConvertUtils.isNotEmpty(keyWord)) { if(oConvertUtils.isNotEmpty(keyWord)) {
@@ -74,7 +72,8 @@ public class SysLogController {
* @param id * @param id
* @return * @return
*/ */
@RequestMapping(value = "/delete", method = RequestMethod.DELETE) // @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@DeleteMapping("/delete")
public Result<Object> delete(@RequestParam(name="id",required=true) String id) { public Result<Object> delete(@RequestParam(name="id",required=true) String id) {
SysLog sysLog = sysLogService.getById(id); SysLog sysLog = sysLogService.getById(id);
if(sysLog==null) { if(sysLog==null) {
@@ -93,7 +92,8 @@ public class SysLogController {
* @param ids * @param ids
* @return * @return
*/ */
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) // @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@DeleteMapping("/deleteBatch")
public Result<Object> deleteBatch(@RequestParam(name="ids",required=true) String ids) { public Result<Object> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
if(ids==null || "".equals(ids.trim())) { if(ids==null || "".equals(ids.trim())) {
return Result.error("参数不识别！"); return Result.error("参数不识别！");