Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

hazard-admin/src/main/java/com/ozs/web/controller/monitor/SysLoginInfoController.java

@@ -54,27 +54,8 @@ public class SysLoginInfoController extends BaseController {
     @PostMapping("/list")
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
     public AjaxResult list(@RequestBody SysLoginInfoVo sysLoginInfoVo) {
-        LambdaQueryWrapper<SysLoginInfo> wrapper = new LambdaQueryWrapper<SysLoginInfo>();
-        if (!ObjectUtils.isEmpty(sysLoginInfoVo.getIpaddr())) {
-            wrapper.like(SysLoginInfo::getIpaddr, sysLoginInfoVo.getIpaddr());
-        }
-        if (!ObjectUtils.isEmpty(sysLoginInfoVo.getUserName())) {
-            wrapper.like(SysLoginInfo::getUserName, sysLoginInfoVo.getUserName());
-        }
-        if (!ObjectUtils.isEmpty(sysLoginInfoVo.getStatus())) {
-            wrapper.like(SysLoginInfo::getStatus, sysLoginInfoVo.getStatus());
-        }
-        if (!ObjectUtils.isEmpty(sysLoginInfoVo.getLoginTime())) {
-            wrapper.like(SysLoginInfo::getLoginTime, sysLoginInfoVo.getLoginTime());
-        }
-        if (!ObjectUtils.isEmpty(sysLoginInfoVo.getStartTime())) {
-            wrapper.ge(SysLoginInfo::getLoginTime, sysLoginInfoVo.getStartTime());
-        }
-        if (!ObjectUtils.isEmpty(sysLoginInfoVo.getEndTime())) {
-            wrapper.le(SysLoginInfo::getLoginTime, sysLoginInfoVo.getEndTime());
-        }
-            wrapper.orderByDesc(SysLoginInfo::getLoginTime);
-        IPage<SysLoginInfo> page = logininforService.page(new Page<>(sysLoginInfoVo.getPageNum(), sysLoginInfoVo.getPageSize()), wrapper);
+        List<SysLoginInfo> list = logininforService.selectLogininforList(sysLoginInfoVo);
+        IPage<SysLoginInfo> page = logininforService.listToPage(list, sysLoginInfoVo.getPageNum().intValue(), sysLoginInfoVo.getPageSize().intValue());
         return AjaxResult.success(page);
     }
 
@@ -89,8 +70,8 @@ public class SysLoginInfoController extends BaseController {
     @Log(title = "登录日志", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysLoginInfo logininfor) {
-        List<SysLoginInfo> list = logininforService.selectLogininforList(logininfor);
+    public void export(HttpServletResponse response, @RequestBody SysLoginInfoVo sysLoginInfoVo) {
+        List<SysLoginInfo> list = logininforService.selectLogininforList(sysLoginInfoVo);
         ExcelUtil<SysLoginInfo> util = new ExcelUtil<SysLoginInfo>(SysLoginInfo.class);
         util.exportExcel(response, list, "登录日志");
     }

hazard-admin/src/main/java/com/ozs/web/controller/monitor/SysOperlogController.java

@@ -55,33 +55,8 @@ public class SysOperlogController extends BaseController {
     @ApiOperation(value = "获取操作日志分页列表")
     @PostMapping("/list")
     public AjaxResult list(@RequestBody SysOperlogVo sysOperlogVo) {
-        LambdaQueryWrapper<SysOperLog> wrapper = new LambdaQueryWrapper<SysOperLog>();
-        if (!ObjectUtils.isEmpty(sysOperlogVo.getOperId())) {
-            wrapper.like(SysOperLog::getOperId, sysOperlogVo.getOperId());
-        }
-        if (!ObjectUtils.isEmpty(sysOperlogVo.getUserId())) {
-            wrapper.like(SysOperLog::getUserId, sysOperlogVo.getUserId());
-        }
-        if (!ObjectUtils.isEmpty(sysOperlogVo.getOperatorType())) {
-            wrapper.like(SysOperLog::getOperatorType, sysOperlogVo.getOperatorType());
-        }
-        if (!ObjectUtils.isEmpty(sysOperlogVo.getTitle())) {
-            wrapper.like(SysOperLog::getTitle, sysOperlogVo.getTitle());
-        }
-        if (!ObjectUtils.isEmpty(sysOperlogVo.getOperTime())) {
-            wrapper.like(SysOperLog::getOperTime, sysOperlogVo.getOperTime());
-        }
-        if (!ObjectUtils.isEmpty(sysOperlogVo.getStartTime())) {
-            wrapper.ge(SysOperLog::getOperTime, sysOperlogVo.getStartTime());
-        }
-        if (!ObjectUtils.isEmpty(sysOperlogVo.getEndTime())) {
-            wrapper.le(SysOperLog::getOperTime, sysOperlogVo.getEndTime());
-        }
-        if (!ObjectUtils.isEmpty(sysOperlogVo.getBusinessType())) {
-            wrapper.eq(SysOperLog::getBusinessType, sysOperlogVo.getBusinessType());
-        }
-            wrapper.orderByDesc(SysOperLog::getOperTime);
-        IPage<SysOperLog> page = operLogService.page(new Page<>(sysOperlogVo.getPageNum(), sysOperlogVo.getPageSize()), wrapper);
+        List<SysOperLog> list = operLogService.selectOperLogList(sysOperlogVo);
+        IPage<SysOperLog> page = operLogService.listToPage(list, sysOperlogVo.getPageNum().intValue(), sysOperlogVo.getPageSize().intValue());
         return AjaxResult.success(page);
     }
 
@@ -96,8 +71,8 @@ public class SysOperlogController extends BaseController {
     @Log(title = "操作日志", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysOperLog operLog) {
-        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+    public void export(HttpServletResponse response, @RequestBody SysOperlogVo sysOperlogVo) {
+        List<SysOperLog> list = operLogService.selectOperLogList(sysOperlogVo);
         ExcelUtil<SysOperLog> util = new ExcelUtil<SysOperLog>(SysOperLog.class);
         util.exportExcel(response, list, "操作日志");
     }