优化代码

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysLogininforController.java

@@ -37,8 +37,7 @@ public class SysLogininforController extends BaseController
     @GetMapping("/list")
     public TableDataInfo<SysLogininfor> list(SysLogininfor logininfor)
     {
-        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
-        return null;
+        return logininforService.selectPage(logininfor);
     }
 
     @Log(title = "登录日志", businessType = BusinessType.EXPORT)

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysLogininforService.java

@@ -1,7 +1,8 @@
 package com.xunmei.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.system.api.domain.SysDictType;
+import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.system.api.domain.SysArea;
 import com.xunmei.system.api.domain.SysLogininfor;
 
 import java.util.List;
@@ -13,6 +14,13 @@ import java.util.List;
  */
 public interface ISysLogininforService extends IService<SysLogininfor>
 {
+
+    /**
+     * 分页数据
+     * @param logininfor
+     * @return
+     */
+    TableDataInfo<SysLogininfor> selectPage(SysLogininfor logininfor);
     /**
      * 新增系统登录日志
      *

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysOperLogService.java

@@ -1,6 +1,8 @@
 package com.xunmei.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.system.api.domain.SysLogininfor;
 import com.xunmei.system.api.domain.SysOperLog;
 import com.xunmei.system.domain.SysNotice;
 
@@ -13,6 +15,13 @@ import java.util.List;
  */
 public interface ISysOperLogService extends IService<SysOperLog>
 {
+
+    /**
+     * 分页数据
+     * @param operLog
+     * @return
+     */
+    TableDataInfo<SysOperLog> selectPage(SysOperLog operLog);
     /**
      * 新增操作日志
      *

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysLogininforServiceImpl.java

@@ -1,6 +1,11 @@
 package com.xunmei.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.system.api.domain.SysArea;
+import com.xunmei.system.api.domain.SysDictData;
 import com.xunmei.system.api.domain.SysDictType;
 import com.xunmei.system.api.domain.SysLogininfor;
 import com.xunmei.system.mapper.SysDictTypeMapper;
@@ -13,48 +18,57 @@ import java.util.List;
 
 /**
  * 系统访问日志情况信息 服务层处理
- * 
+ *
  * @author xunmei
  */
 @Service
-public class SysLogininforServiceImpl extends ServiceImpl<SysLogininforMapper, SysLogininfor> implements ISysLogininforService
-{
+public class SysLogininforServiceImpl extends ServiceImpl<SysLogininforMapper, SysLogininfor> implements ISysLogininforService {
 
     @Autowired
     private SysLogininforMapper logininforMapper;
 
+    @Override
+    public TableDataInfo<SysLogininfor> selectPage(SysLogininfor logininfor) {
+        Page<SysLogininfor> page;
+        if (logininfor.getPageNum() != null && logininfor.getPageSize() != null) {
+            page = new Page<>(logininfor.getPageNum(), logininfor.getPageSize());
+        } else {
+            page = new Page<>();
+        }
+        QueryWrapper<SysLogininfor> where = new QueryWrapper<>(logininfor);
+        baseMapper.selectPage(page, where);
+        return TableDataInfo.build(page);
+    }
+
     /**
      * 新增系统登录日志
-     * 
+     *
      * @param logininfor 访问日志对象
      */
     @Override
-    public int insertLogininfor(SysLogininfor logininfor)
-    {
+    public int insertLogininfor(SysLogininfor logininfor) {
         return logininforMapper.insertLogininfor(logininfor);
     }
 
     /**
      * 查询系统登录日志集合
-     * 
+     *
      * @param logininfor 访问日志对象
      * @return 登录记录集合
      */
     @Override
-    public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor)
-    {
+    public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor) {
         return logininforMapper.selectLogininforList(logininfor);
     }
 
     /**
      * 批量删除系统登录日志
-     * 
+     *
      * @param infoIds 需要删除的登录日志ID
      * @return 结果
      */
     @Override
-    public int deleteLogininforByIds(Long[] infoIds)
-    {
+    public int deleteLogininforByIds(Long[] infoIds) {
         return logininforMapper.deleteLogininforByIds(infoIds);
     }
 
@@ -62,8 +76,7 @@ public class SysLogininforServiceImpl extends ServiceImpl<SysLogininforMapper, S
      * 清空系统登录日志
      */
     @Override
-    public void cleanLogininfor()
-    {
+    public void cleanLogininfor() {
         logininforMapper.cleanLogininfor();
     }
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOperLogServiceImpl.java

@@ -1,6 +1,10 @@
 package com.xunmei.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.system.api.domain.SysLogininfor;
 import com.xunmei.system.api.domain.SysOperLog;
 import com.xunmei.system.domain.SysNotice;
 import com.xunmei.system.mapper.SysNoticeMapper;
@@ -13,60 +17,68 @@ import java.util.List;
 
 /**
  * 操作日志 服务层处理
- * 
+ *
  * @author xunmei
  */
 @Service
-public class SysOperLogServiceImpl extends ServiceImpl<SysOperLogMapper, SysOperLog> implements ISysOperLogService
-{
+public class SysOperLogServiceImpl extends ServiceImpl<SysOperLogMapper, SysOperLog> implements ISysOperLogService {
     @Autowired
     private SysOperLogMapper operLogMapper;
 
+    @Override
+    public TableDataInfo<SysOperLog> selectPage(SysOperLog operLog) {
+        Page<SysOperLog> page;
+        if (operLog.getPageNum() != null && operLog.getPageSize() != null) {
+            page = new Page<>(operLog.getPageNum(), operLog.getPageSize());
+        } else {
+            page = new Page<>();
+        }
+        QueryWrapper<SysOperLog> where = new QueryWrapper<>(operLog);
+        baseMapper.selectPage(page, where);
+        return TableDataInfo.build(page);
+    }
+
     /**
      * 新增操作日志
-     * 
+     *
      * @param operLog 操作日志对象
      * @return 结果
      */
     @Override
-    public int insertOperlog(SysOperLog operLog)
-    {
+    public int insertOperlog(SysOperLog operLog) {
         return operLogMapper.insertOperlog(operLog);
     }
 
     /**
      * 查询系统操作日志集合
-     * 
+     *
      * @param operLog 操作日志对象
      * @return 操作日志集合
      */
     @Override
-    public List<SysOperLog> selectOperLogList(SysOperLog operLog)
-    {
+    public List<SysOperLog> selectOperLogList(SysOperLog operLog) {
         return operLogMapper.selectOperLogList(operLog);
     }
 
     /**
      * 批量删除系统操作日志
-     * 
+     *
      * @param operIds 需要删除的操作日志ID
      * @return 结果
      */
     @Override
-    public int deleteOperLogByIds(Long[] operIds)
-    {
+    public int deleteOperLogByIds(Long[] operIds) {
         return operLogMapper.deleteOperLogByIds(operIds);
     }
 
     /**
      * 查询操作日志详细
-     * 
+     *
      * @param operId 操作ID
      * @return 操作日志对象
      */
     @Override
-    public SysOperLog selectOperLogById(Long operId)
-    {
+    public SysOperLog selectOperLogById(Long operId) {
         return operLogMapper.selectOperLogById(operId);
     }
 
@@ -74,8 +86,7 @@ public class SysOperLogServiceImpl extends ServiceImpl<SysOperLogMapper, SysOper
      * 清空操作日志
      */
     @Override
-    public void cleanOperLog()
-    {
+    public void cleanOperLog() {
         operLogMapper.cleanOperLog();
     }
 }