update

src/main/java/com/zhiqiyun/open/config/BeanConfig.java

@@ -1,5 +1,9 @@
 package com.zhiqiyun.open.config;
 
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.zhiqiyun.open.Application;
 import lombok.extern.slf4j.Slf4j;
 import org.lionsoul.ip2region.DbConfig;
@@ -14,6 +18,21 @@ import java.io.InputStream;
 @Configuration
 public class BeanConfig {
     @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        PaginationInnerInterceptor innerInterceptor = new PaginationInnerInterceptor();
+        innerInterceptor.setDbType(DbType.MYSQL);
+        innerInterceptor.setOverflow(true);
+        interceptor.addInnerInterceptor(innerInterceptor);
+        return interceptor;
+    }
+
+    @Bean
+    public ConfigurationCustomizer configurationCustomizer() {
+        return configuration -> configuration.setUseGeneratedKeys(true);
+    }
+
+    @Bean
     public DbSearcher dbSearcher() throws Exception {
         DbConfig config = new DbConfig();
         InputStream inStream = Application.class.getResourceAsStream("/ip2region.db");

src/main/java/com/zhiqiyun/open/config/OauthInterceptor.java

@@ -2,6 +2,7 @@ package com.zhiqiyun.open.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.zhiqiyun.open.annotation.Permission;
+import com.zhiqiyun.open.core.service.UserOperateLogService;
 import com.zhiqiyun.open.exception.NoLoginException;
 import com.zhiqiyun.open.exception.PermissionDeniedException;
 import com.zhiqiyun.open.core.models.OauthInfo;
@@ -41,7 +42,7 @@ public class OauthInterceptor implements HandlerInterceptor {
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
     @Autowired
-    private UserBaseInfoService userBaseInfoService;
+    private UserOperateLogService userOperateLogService;
 
     @Resource
     private RedisTemplate<String, UserOperateLog> redisTemplate;
@@ -99,7 +100,7 @@ public class OauthInterceptor implements HandlerInterceptor {
         if (userOperateLog != null) {
             userOperateLog.setResponseTime(DateUtil.current());
             userOperateLog.setId(ServletContext.getRequestId());
-            this.threadPoolTaskExecutor.execute(() -> userBaseInfoService.insertOperateLog(userOperateLog));
+            this.threadPoolTaskExecutor.execute(() -> userOperateLogService.save(userOperateLog));
         }
     }
 

src/main/java/com/zhiqiyun/open/core/mapper/RoleInfoMapper.java

@@ -1,5 +1,6 @@
 package com.zhiqiyun.open.core.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhiqiyun.open.core.models.RoleInfo;
 import com.zhiqiyun.open.mybatis.paginator.domain.PageBounds;
 import org.apache.ibatis.annotations.Mapper;
@@ -12,21 +13,7 @@ import java.util.Map;
  * @author jtoms
  */
 @Mapper
-public interface RoleInfoMapper {
-
-    /**
-     * 插入角色信息
-     *
-     * @param roleInfo
-     */
-    void insert(RoleInfo roleInfo);
-
-    /**
-     * 更新角色信息
-     *
-     * @param roleInfo
-     */
-    void updateById(RoleInfo roleInfo);
+public interface RoleInfoMapper extends BaseMapper<RoleInfo> {
 
     /**
      * 删除角色下的权限值
@@ -58,18 +45,18 @@ public interface RoleInfoMapper {
      */
     void deleteBatchIds(@Param("roleIds") List<Long> roleIds);
 
-    /**
-     * 分页查询角色列表
-     *
-     * @param toQueryWrapper
-     * @return
-     */
-    List<RoleInfo> findPage(PageBounds bounds, Map<String, Object> toQueryWrapper);
-
-    /**
-     * 查询所有角色
-     *
-     * @return
-     */
-    List<RoleInfo> findAll();
+//    /**
+//     * 分页查询角色列表
+//     *
+//     * @param toQueryWrapper
+//     * @return
+//     */
+//    List<RoleInfo> findPage(PageBounds bounds, Map<String, Object> toQueryWrapper);
+//
+//    /**
+//     * 查询所有角色
+//     *
+//     * @return
+//     */
+//    List<RoleInfo> findAll();
 }

src/main/java/com/zhiqiyun/open/core/mapper/UserBaseInfoMapper.java

@@ -3,7 +3,6 @@ package com.zhiqiyun.open.core.mapper;
 import com.zhiqiyun.open.core.models.RoleInfo;
 import com.zhiqiyun.open.core.models.UserBaseInfo;
 import com.zhiqiyun.open.core.models.UserLoginLog;
-import com.zhiqiyun.open.core.models.UserOperateLog;
 import com.zhiqiyun.open.mybatis.paginator.domain.PageBounds;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -71,45 +70,29 @@ public interface UserBaseInfoMapper {
      */
     void insertRoles(@Param("uid") Long uid, @Param("listRoles") List<Long> listRoles);
 
-    /**
-     * 查询用户角色
-     *
-     * @param uid
-     * @return
-     */
-    List<RoleInfo> findRoles(@Param("uid") Long uid);
-
-    /**
-     * 插入日志信息
-     *
-     * @param userOperateLog
-     */
-    void insertOperateLog(UserOperateLog userOperateLog);
-
-    /**
-     * 插入登录日志
-     *
-     * @param userLoginLog
-     */
-    void insertLoginLog(UserLoginLog userLoginLog);
-
-    /**
-     * 分页查询登录日志
-     *
-     * @param bounds
-     * @param queryWrapper
-     * @return
-     */
-    List<UserLoginLog> findLoginLogPage(PageBounds bounds, Map<String, Object> queryWrapper);
-
-    /**
-     * 查询用户操作日志
-     *
-     * @param bounds
-     * @param queryWrapper
-     * @return
-     */
-    List<UserOperateLog> findOperateLogPage(PageBounds bounds, Map<String, Object> queryWrapper);
+//    /**
+//     * 查询用户角色
+//     *
+//     * @param uid
+//     * @return
+//     */
+//    List<RoleInfo> findRoles(@Param("uid") Long uid);
+
+//    /**
+//     * 插入登录日志
+//     *
+//     * @param userLoginLog
+//     */
+//    void insertLoginLog(UserLoginLog userLoginLog);
+//
+//    /**
+//     * 分页查询登录日志
+//     *
+//     * @param bounds
+//     * @param queryWrapper
+//     * @return
+//     */
+//    List<UserLoginLog> findLoginLogPage(PageBounds bounds, Map<String, Object> queryWrapper);
 
     /**
      * 查询搜索账号

src/main/java/com/zhiqiyun/open/core/mapper/UserLoginLogMapper.java

@@ -0,0 +1,9 @@
+package com.zhiqiyun.open.core.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhiqiyun.open.core.models.UserLoginLog;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface UserLoginLogMapper extends BaseMapper<UserLoginLog> {
+}

src/main/java/com/zhiqiyun/open/core/mapper/UserOperateLogMapper.java

@@ -0,0 +1,9 @@
+package com.zhiqiyun.open.core.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhiqiyun.open.core.models.UserOperateLog;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface UserOperateLogMapper extends BaseMapper<UserOperateLog> {
+}

src/main/java/com/zhiqiyun/open/core/models/RoleInfo.java

@@ -1,5 +1,9 @@
 package com.zhiqiyun.open.core.models;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -9,15 +13,18 @@ import java.util.List;
  * @author jtoms
  */
 @Data
+@TableName("role_info")
 public class RoleInfo implements Serializable {
 
     private static final long serialVersionUID = 5241138963805332125L;
 
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     private String name;
 
     private String remark;
 
+    @TableField(exist = false)
     private List<Long> listAuthorities;
 }

src/main/java/com/zhiqiyun/open/core/models/UserLoginLog.java

@@ -1,5 +1,10 @@
 package com.zhiqiyun.open.core.models;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler;
 import com.zhiqiyun.open.core.enmus.AccountType;
 import com.zhiqiyun.open.core.enmus.UserLoginLogState;
 import lombok.Data;
@@ -12,15 +17,20 @@ import java.util.Date;
  * @date 2017-6-7
  */
 @Data
+@TableName(value = "user_login_logs", autoResultMap = true)
 public class UserLoginLog implements Serializable {
     private static final long serialVersionUID = -6352081881437839365L;
+    @TableId(type = IdType.AUTO)
     private String id;
     private String loginAccount;
+    @TableField(typeHandler = MybatisEnumTypeHandler.class)
     private AccountType accountType;
     private String loginIp;
     private String loginLocal;
     private String fromSource;
     private String deviceId;
     private Date loginTime;
+
+    @TableField(typeHandler = MybatisEnumTypeHandler.class)
     private UserLoginLogState state;
 }

src/main/java/com/zhiqiyun/open/core/models/UserOperateLog.java

@@ -1,5 +1,9 @@
 package com.zhiqiyun.open.core.models;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -9,8 +13,10 @@ import java.util.Date;
  * @author jtoms
  */
 @Data
+@TableName("user_operate_logs")
 public class UserOperateLog implements Serializable {
     private static final long serialVersionUID = -734912919219229259L;
+    @TableId(type = IdType.INPUT)
     private String id;
     private Long uid;
     private String tags;
@@ -22,5 +28,6 @@ public class UserOperateLog implements Serializable {
     private Date requestTime;
     private Date responseTime;
 
+    @TableField(exist = false)
     private String nickName;
 }

src/main/java/com/zhiqiyun/open/core/service/RoleInfoService.java

@@ -1,5 +1,6 @@
 package com.zhiqiyun.open.core.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhiqiyun.open.mybatis.paginator.domain.PageBounds;
 import com.zhiqiyun.open.mybatis.paginator.domain.PageResult;
 import com.zhiqiyun.open.core.models.RoleInfo;
@@ -10,7 +11,7 @@ import java.util.Map;
 /**
  * @author jtoms
  */
-public interface RoleInfoService {
+public interface RoleInfoService extends IService<RoleInfo> {
     /**
      * 更新角色信息
      *
@@ -40,19 +41,19 @@ public interface RoleInfoService {
      * @return
      */
     List<Long> findAuthorities(Long roleId);
-
-    /**
-     * 分页查询角色列表
-     *
-     * @return
-     */
-    PageResult<RoleInfo> findPage(PageBounds bounds, Map<String, Object> queryWrapper);
-
-    /**
-     * 查询所有角色
-     *
-     * @return
-     */
-    List<RoleInfo> findAll();
+//
+//    /**
+//     * 分页查询角色列表
+//     *
+//     * @return
+//     */
+//    PageResult<RoleInfo> findPage(PageBounds bounds, Map<String, Object> queryWrapper);
+//
+//    /**
+//     * 查询所有角色
+//     *
+//     * @return
+//     */
+//    List<RoleInfo> findAll();
 
 }

src/main/java/com/zhiqiyun/open/core/service/UserBaseInfoService.java

@@ -1,8 +1,12 @@
 package com.zhiqiyun.open.core.service;
 
-import com.zhiqiyun.open.core.models.*;
+
 import com.zhiqiyun.open.core.enmus.AccountType;
 import com.zhiqiyun.open.core.enmus.PasswordType;
+import com.zhiqiyun.open.core.models.RoleInfo;
+import com.zhiqiyun.open.core.models.UserBaseInfo;
+import com.zhiqiyun.open.core.models.UserLoginAccount;
+import com.zhiqiyun.open.core.models.UserPassword;
 import com.zhiqiyun.open.mybatis.paginator.domain.PageBounds;
 import com.zhiqiyun.open.mybatis.paginator.domain.PageResult;
 
@@ -64,14 +68,14 @@ public interface UserBaseInfoService {
      */
     List<String> findUserAuthorities(Long uid);
 
-    /**
-     * 查询用户所拥有的权限
-     *
-     * @param uid
-     * @return
-     */
-    List<RoleInfo> findRoles(Long uid);
-
+//    /**
+//     * 查询用户所拥有的权限
+//     *
+//     * @param uid
+//     * @return
+//     */
+//    List<RoleInfo> findRoles(Long uid);
+//
 
     /**
      * 查询用户名下所有账号
@@ -91,37 +95,21 @@ public interface UserBaseInfoService {
      */
     String insertOrUpdate(UserBaseInfo userInfo, List<UserLoginAccount> loginAccounts, List<Long> listRoles) throws Exception;
 
-    /**
-     * 插入日志信息
-     *
-     * @param userOperateLog
-     */
-    void insertOperateLog(UserOperateLog userOperateLog);
-
-    /**
-     * 插入用户登录日志
-     *
-     * @param userLoginLog
-     */
-    void insertLoginLog(UserLoginLog userLoginLog);
-
-    /**
-     * 查询用户登录日志
-     *
-     * @param bounds
-     * @param queryWrapper
-     * @return
-     */
-    PageResult<UserLoginLog> findLoginLogPage(PageBounds bounds, Map<String, Object> queryWrapper);
-
-    /**
-     * 查询用户操作日志
-     *
-     * @param bounds
-     * @param queryWrapper
-     * @return
-     */
-    PageResult<UserOperateLog> findOperateLogPage(PageBounds bounds, Map<String, Object> queryWrapper);
+//    /**
+//     * 插入用户登录日志
+//     *
+//     * @param userLoginLog
+//     */
+//    void insertLoginLog(UserLoginLog userLoginLog);
+//
+//    /**
+//     * 查询用户登录日志
+//     *
+//     * @param bounds
+//     * @param queryWrapper
+//     * @return
+//     */
+//    PageResult<UserLoginLog> findLoginLogPage(PageBounds bounds, Map<String, Object> queryWrapper);
 
     /**
      * 更新用户密码

src/main/java/com/zhiqiyun/open/core/service/UserLoginLogService.java

@@ -0,0 +1,8 @@
+package com.zhiqiyun.open.core.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhiqiyun.open.core.models.UserLoginLog;
+import com.zhiqiyun.open.core.models.UserOperateLog;
+
+public interface UserLoginLogService extends IService<UserLoginLog> {
+}

src/main/java/com/zhiqiyun/open/core/service/UserOperateLogService.java

@@ -0,0 +1,7 @@
+package com.zhiqiyun.open.core.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhiqiyun.open.core.models.UserOperateLog;
+
+public interface UserOperateLogService extends IService<UserOperateLog> {
+}

src/main/java/com/zhiqiyun/open/core/service/impl/OauthRoleInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.zhiqiyun.open.core.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhiqiyun.open.exception.ServiceException;
 import com.zhiqiyun.open.core.mapper.RoleInfoMapper;
 import com.zhiqiyun.open.core.models.RoleInfo;
@@ -18,19 +19,16 @@ import java.util.Map;
  * @author jtoms
  */
 @Service
-public class OauthRoleInfoServiceImpl implements RoleInfoService {
-
-    @Autowired
-    private RoleInfoMapper roleInfoMapper;
+public class OauthRoleInfoServiceImpl extends ServiceImpl<RoleInfoMapper, RoleInfo> implements RoleInfoService {
 
     @Override
     @Transactional(rollbackFor = ServiceException.class)
     public void updateById(RoleInfo roleInfo, List<Long> listAuthorities) throws ServiceException {
         try {
-            this.roleInfoMapper.updateById(roleInfo);
-            this.roleInfoMapper.deleteAuthorities(Collections.singletonList(roleInfo.getId()));
+            this.updateById(roleInfo);
+            this.baseMapper.deleteAuthorities(Collections.singletonList(roleInfo.getId()));
             if (listAuthorities != null && listAuthorities.size() > 0) {
-                this.roleInfoMapper.insertAuthority(roleInfo.getId(), listAuthorities);
+                this.baseMapper.insertAuthority(roleInfo.getId(), listAuthorities);
             }
         } catch (Exception e) {
             throw new ServiceException(e);
@@ -41,10 +39,10 @@ public class OauthRoleInfoServiceImpl implements RoleInfoService {
     @Transactional(rollbackFor = ServiceException.class)
     public void insert(RoleInfo roleInfo, List<Long> listAuthorities) throws ServiceException {
         try {
-            this.roleInfoMapper.insert(roleInfo);
-            this.roleInfoMapper.deleteAuthorities(Collections.singletonList(roleInfo.getId()));
+            this.save(roleInfo);
+            this.baseMapper.deleteAuthorities(Collections.singletonList(roleInfo.getId()));
             if (listAuthorities != null && listAuthorities.size() > 0) {
-                this.roleInfoMapper.insertAuthority(roleInfo.getId(), listAuthorities);
+                this.baseMapper.insertAuthority(roleInfo.getId(), listAuthorities);
             }
         } catch (Exception e) {
             throw new ServiceException(e);
@@ -55,8 +53,8 @@ public class OauthRoleInfoServiceImpl implements RoleInfoService {
     @Transactional(rollbackFor = ServiceException.class)
     public void deleteByIds(List<Long> roleIds) throws ServiceException {
         try {
-            this.roleInfoMapper.deleteAuthorities(roleIds);
-            this.roleInfoMapper.deleteBatchIds(roleIds);
+            this.baseMapper.deleteAuthorities(roleIds);
+            this.baseMapper.deleteBatchIds(roleIds);
         } catch (Exception e) {
             throw new ServiceException(e);
         }
@@ -64,18 +62,18 @@ public class OauthRoleInfoServiceImpl implements RoleInfoService {
 
     @Override
     public List<Long> findAuthorities(Long roleId) {
-        return this.roleInfoMapper.findAuthorities(roleId);
-    }
-
-    @Override
-    public PageResult<RoleInfo> findPage(PageBounds bounds, Map<String, Object> queryWrapper) {
-        List<RoleInfo> listData = this.roleInfoMapper.findPage(bounds, queryWrapper);
-
-        return bounds.newPageResult(listData);
-    }
-
-    @Override
-    public List<RoleInfo> findAll() {
-        return this.roleInfoMapper.findAll();
+        return this.baseMapper.findAuthorities(roleId);
     }
+//
+//    @Override
+//    public PageResult<RoleInfo> findPage(PageBounds bounds, Map<String, Object> queryWrapper) {
+//        List<RoleInfo> listData = this.baseMapper.findPage(bounds, queryWrapper);
+//
+//        return bounds.newPageResult(listData);
+//    }
+//
+//    @Override
+//    public List<RoleInfo> findAll() {
+//        return this.baseMapper.findAll();
+//    }
 }

src/main/java/com/zhiqiyun/open/core/service/impl/UserBaseInfoServiceImpl.java

@@ -1,7 +1,10 @@
 package com.zhiqiyun.open.core.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhiqiyun.open.core.mapper.UserBaseInfoMapper;
 import com.zhiqiyun.open.core.mapper.UserLoginAccountMapper;
+import com.zhiqiyun.open.core.mapper.UserOperateLogMapper;
 import com.zhiqiyun.open.core.models.*;
 import com.zhiqiyun.open.core.service.Ip2RegionService;
 import com.zhiqiyun.open.core.service.OauthService;
@@ -80,10 +83,10 @@ public class UserBaseInfoServiceImpl implements UserBaseInfoService {
         return this.userBaseInfoMapper.findUserAuthorities(uid);
     }
 
-    @Override
-    public List<RoleInfo> findRoles(Long uid) {
-        return this.userBaseInfoMapper.findRoles(uid);
-    }
+//    @Override
+//    public List<RoleInfo> findRoles(Long uid) {
+//        return this.userBaseInfoMapper.findRoles(uid);
+//    }
 
     @Override
     public void updatePassword(Long uid, String password, String salt, PasswordType passwordType) {
@@ -157,29 +160,18 @@ public class UserBaseInfoServiceImpl implements UserBaseInfoService {
         }
     }
 
-    @Override
-    public void insertOperateLog(UserOperateLog userOperateLog) {
-        this.userBaseInfoMapper.insertOperateLog(userOperateLog);
-    }
-
-    @Override
-    public void insertLoginLog(UserLoginLog userLoginLog) {
-        try {
-            userLoginLog.setLoginLocal(this.ip2RegionService.getRegion(userLoginLog.getLoginIp()));
-        } finally {
-            userBaseInfoMapper.insertLoginLog(userLoginLog);
-        }
-    }
-
-    @Override
-    public PageResult<UserLoginLog> findLoginLogPage(PageBounds bounds, Map<String, Object> queryWrapper) {
-        List<UserLoginLog> listData = userBaseInfoMapper.findLoginLogPage(bounds, queryWrapper);
-        return bounds.newPageResult(listData);
-    }
-
-    @Override
-    public PageResult<UserOperateLog> findOperateLogPage(PageBounds bounds, Map<String, Object> queryWrapper) {
-        List<UserOperateLog> listData = userBaseInfoMapper.findOperateLogPage(bounds, queryWrapper);
-        return bounds.newPageResult(listData);
-    }
+//    @Override
+//    public void insertLoginLog(UserLoginLog userLoginLog) {
+//        try {
+//            userLoginLog.setLoginLocal(this.ip2RegionService.getRegion(userLoginLog.getLoginIp()));
+//        } finally {
+//            userBaseInfoMapper.insertLoginLog(userLoginLog);
+//        }
+//    }
+//
+//    @Override
+//    public PageResult<UserLoginLog> findLoginLogPage(PageBounds bounds, Map<String, Object> queryWrapper) {
+//        List<UserLoginLog> listData = userBaseInfoMapper.findLoginLogPage(bounds, queryWrapper);
+//        return bounds.newPageResult(listData);
+//    }
 }

src/main/java/com/zhiqiyun/open/core/service/impl/UserLoginLogServiceImpl.java

@@ -0,0 +1,11 @@
+package com.zhiqiyun.open.core.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhiqiyun.open.core.mapper.UserLoginLogMapper;
+import com.zhiqiyun.open.core.models.UserLoginLog;
+import com.zhiqiyun.open.core.service.UserLoginLogService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserLoginLogServiceImpl extends ServiceImpl<UserLoginLogMapper, UserLoginLog> implements UserLoginLogService {
+}

src/main/java/com/zhiqiyun/open/core/service/impl/UserOperateLogServiceImpl.java

@@ -0,0 +1,11 @@
+package com.zhiqiyun.open.core.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhiqiyun.open.core.mapper.UserOperateLogMapper;
+import com.zhiqiyun.open.core.models.UserOperateLog;
+import com.zhiqiyun.open.core.service.UserOperateLogService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserOperateLogServiceImpl extends ServiceImpl<UserOperateLogMapper, UserOperateLog> implements UserOperateLogService {
+}

src/main/java/com/zhiqiyun/open/mvc/manager/controller/OauthController.java

@@ -1,10 +1,14 @@
 package com.zhiqiyun.open.mvc.manager.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhiqiyun.open.annotation.Permission;
 import com.zhiqiyun.open.core.models.*;
 import com.zhiqiyun.open.core.enmus.AccountType;
 import com.zhiqiyun.open.core.enmus.PasswordType;
 import com.zhiqiyun.open.core.enmus.UserLoginLogState;
+import com.zhiqiyun.open.core.service.UserLoginLogService;
 import com.zhiqiyun.open.mvc.Result;
 import com.zhiqiyun.open.mvc.manager.params.ChangePasswordParam;
 import com.zhiqiyun.open.mvc.manager.params.LoginParam;
@@ -39,6 +43,9 @@ public class OauthController {
     private UserBaseInfoService userBaseInfoService;
 
     @Autowired
+    private UserLoginLogService userLoginLogService;
+
+    @Autowired
     private CaptchaService captchaService;
 
     @Autowired
@@ -123,7 +130,7 @@ public class OauthController {
             userLoginLog.setDeviceId("");
             userLoginLog.setLoginTime(DateUtil.current());
             userLoginLog.setLoginLocal("未知地址");
-            this.threadPoolTaskExecutor.execute(() -> userBaseInfoService.insertLoginLog(userLoginLog));
+            this.threadPoolTaskExecutor.execute(() -> userLoginLogService.save(userLoginLog));
         }
     }
 
@@ -195,11 +202,17 @@ public class OauthController {
     @Permission(tags = "获取用户登录记录", writeLog = false)
     @PostMapping("/getLoginLogs")
     public Result getLoginLogs(@RequestBody QueryPageParams params) {
+
+        Page<UserLoginLog> page = params.getPage();
+        page.addOrder(OrderItem.desc("login_time"));
+
         String accessToken = ServletContext.getAccessToken();
         OauthInfo oauthInfo = oauthService.getAuth(accessToken);
-        Map<String, Object> queryWrapper = new HashMap<>();
-        queryWrapper.put("uid", oauthInfo.getId());
-        PageResult<UserLoginLog> pageResult = this.userBaseInfoService.findLoginLogPage(params.getPageBounds(), queryWrapper);
+
+        QueryWrapper<UserLoginLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("uid", oauthInfo.getId());
+
+        Page<UserLoginLog> pageResult = this.userLoginLogService.page(page, queryWrapper);
 
         return Result.instance(Result.Code.SUCCESS).setData(pageResult);
     }

src/main/java/com/zhiqiyun/open/mvc/manager/controller/RoleInfoController.java

@@ -1,6 +1,10 @@
 package com.zhiqiyun.open.mvc.manager.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhiqiyun.open.annotation.Permission;
+import com.zhiqiyun.open.core.models.UserLoginLog;
 import com.zhiqiyun.open.mvc.Result;
 import com.zhiqiyun.open.mvc.manager.params.QueryRoleParam;
 import com.zhiqiyun.open.mvc.manager.params.SaveRoleParam;
@@ -32,12 +36,13 @@ public class RoleInfoController {
     @Permission(value = "oauth.role.find", tags = "查询系统角色")
     @PostMapping("/findPage")
     public Result findRolePage(@RequestBody QueryRoleParam params) {
+        Page<RoleInfo> page = params.getPage();
+        page.addOrder(OrderItem.desc("id"));
+        QueryWrapper<RoleInfo> queryWrapper = new QueryWrapper<>();
 
-        PageResult<RoleInfo> resultData = this.roleInfoService.findPage(params.getPageBounds(), params.getQueryWrapper());
+        Page<RoleInfo> resultData = this.roleInfoService.page(page, queryWrapper);
 
-        List<RoleInfo> listData = resultData.getData();
-
-        for (RoleInfo roleInfo : listData) {
+        for (RoleInfo roleInfo : resultData.getRecords()) {
             roleInfo.setListAuthorities(this.roleInfoService.findAuthorities(roleInfo.getId()));
         }
 
@@ -47,7 +52,7 @@ public class RoleInfoController {
     @Permission(value = "oauth.role.find", tags = "查询所有系统角色")
     @PostMapping("/findAll")
     public Result findAll() {
-        List<RoleInfo> listData = this.roleInfoService.findAll();
+        List<RoleInfo> listData = this.roleInfoService.list();
         return Result.instance(Result.Code.SUCCESS).setData(listData);
     }
 

src/main/java/com/zhiqiyun/open/mvc/manager/controller/UserInfoController.java

@@ -1,17 +1,20 @@
 package com.zhiqiyun.open.mvc.manager.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhiqiyun.open.annotation.Permission;
-import com.zhiqiyun.open.core.models.*;
 import com.zhiqiyun.open.core.enmus.AccountType;
 import com.zhiqiyun.open.core.enmus.PasswordType;
 import com.zhiqiyun.open.core.enmus.UserState;
+import com.zhiqiyun.open.core.models.*;
+import com.zhiqiyun.open.core.service.*;
 import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.mvc.manager.params.*;
-import com.zhiqiyun.open.mybatis.paginator.domain.Order;
-import com.zhiqiyun.open.mybatis.paginator.domain.PageBounds;
+import com.zhiqiyun.open.mvc.manager.params.QueryLoginLogParam;
+import com.zhiqiyun.open.mvc.manager.params.QueryOperateLogParams;
+import com.zhiqiyun.open.mvc.manager.params.QueryUserParam;
+import com.zhiqiyun.open.mvc.manager.params.SaveUserParam;
 import com.zhiqiyun.open.mybatis.paginator.domain.PageResult;
-import com.zhiqiyun.open.core.service.OauthService;
-import com.zhiqiyun.open.core.service.UserBaseInfoService;
 import com.zhiqiyun.open.utils.RandomUtil;
 import com.zhiqiyun.open.utils.ServletContext;
 import org.apache.commons.lang3.StringUtils;
@@ -39,6 +42,15 @@ public class UserInfoController {
     private UserBaseInfoService userBaseInfoService;
 
     @Autowired
+    private UserOperateLogService userOperateLogService;
+
+    @Autowired
+    private UserLoginLogService userLoginLogService;
+
+    @Autowired
+    private RoleInfoService roleInfoService;
+
+    @Autowired
     private OauthService oauthService;
 
     @Permission(value = "oauth.user.find", tags = "查询系统所有用户")
@@ -63,7 +75,9 @@ public class UserInfoController {
                 }
                 dataMap.put(account.getAccountType().name(), account.getLoginAccount());
             }
-            List<RoleInfo> listRoles = this.userBaseInfoService.findRoles(info.getId());
+            QueryWrapper<RoleInfo> queryRoleInfoWrapper = new QueryWrapper<>();
+            queryRoleInfoWrapper.eq("uid", info.getId());
+            List<RoleInfo> listRoles = this.roleInfoService.list(queryRoleInfoWrapper);
             dataMap.put("listRoles", listRoles);
 
             listData.add(dataMap);
@@ -167,16 +181,48 @@ public class UserInfoController {
     @Permission(value = "oauth.user.find", tags = "查询用户操作日志")
     @PostMapping("/findOperateLogPage")
     public Result findOperateLogPage(@RequestBody QueryOperateLogParams params) {
-        PageBounds bounds = params.getPageBounds();
-        bounds.addOrder(Order.create("request_time", Order.Direction.DESC));
-        PageResult<UserOperateLog> resultData = this.userBaseInfoService.findOperateLogPage(bounds, params.getQueryWrapper());
+        Page<UserOperateLog> page = params.getPage();
+        page.addOrder(OrderItem.desc("request_time"));
+
+        QueryWrapper<UserOperateLog> queryWrapper = new QueryWrapper<>();
+        if (params.getUid() != null) {
+            queryWrapper.like("uid", params.getUid());
+        }
+        if (StringUtils.isNotBlank(params.getTags())) {
+            queryWrapper.like("tags", params.getTags());
+        }
+        if (StringUtils.isNotBlank(params.getRequestIp())) {
+            queryWrapper.eq("request_ip", params.getRequestIp());
+        }
+        if (StringUtils.isNotBlank(params.getRequestUrl())) {
+            queryWrapper.like("request_url", params.getRequestUrl());
+        }
+        if (StringUtils.isNotBlank(params.getRequestParams())) {
+            queryWrapper.like("request_params", params.getRequestParams());
+        }
+        if (StringUtils.isNotBlank(params.getRequestData())) {
+            queryWrapper.like("request_data", params.getRequestData());
+        }
+        if (params.getRequestTime() != null) {
+            queryWrapper.between("request_time", params.getRequestTime().getStatDate(), params.getRequestTime().getEndDate());
+        }
+        Page<UserOperateLog> resultData = this.userOperateLogService.page(page, queryWrapper);
+        for (UserOperateLog operateLog : resultData.getRecords()) {
+            UserBaseInfo userBaseInfo = this.userBaseInfoService.findById(operateLog.getUid());
+            if (userBaseInfo != null) {
+                operateLog.setNickName(userBaseInfo.getNickName());
+            }
+        }
         return Result.instance(Result.Code.SUCCESS).setData(resultData);
     }
 
     @Permission(value = "oauth.user.find", tags = "查询用户登录日志")
     @PostMapping("/findLoginLogPage")
     public Result findLoginLogPage(@RequestBody QueryLoginLogParam params) {
-        PageResult<UserLoginLog> resultData = this.userBaseInfoService.findLoginLogPage(params.getPageBounds(), params.getQueryWrapper());
+        Page<UserLoginLog> page = params.getPage();
+        page.addOrder(OrderItem.desc("login_time"));
+        QueryWrapper<UserLoginLog> queryWrapper = new QueryWrapper<>();
+        Page<UserLoginLog> resultData = this.userLoginLogService.page(page, queryWrapper);
         return Result.instance(Result.Code.SUCCESS).setData(resultData);
     }
 

src/main/java/com/zhiqiyun/open/mvc/manager/params/QueryOperateLogParams.java

@@ -9,7 +9,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class QueryOperateLogParams extends QueryPageParams {
-    private String nickName;
+    private Long uid;
     private String tags;
     private String requestIp;
     private String requestUrl;

src/main/java/com/zhiqiyun/open/mybatis/typeHandler/IEnumTypeHandler.java

@@ -12,24 +12,24 @@ import java.sql.SQLException;
 /**
  * @author jtoms
  */
-public class IEnumTypeHandler<E extends EiEnum> extends BaseTypeHandler<E> {
-
-    private final Class<E> type;
-
-    public IEnumTypeHandler(Class<E> type) {
-        if (type == null) {
-            throw new IllegalArgumentException("Type argument cannot be null");
-        }
-        this.type = type;
-    }
+public class IEnumTypeHandler extends BaseTypeHandler<EiEnum> {
+//
+//    private final Class<E> type;
+//
+//    public IEnumTypeHandler(Class<E> type) {
+//        if (type == null) {
+//            throw new IllegalArgumentException("Type argument cannot be null");
+//        }
+//        this.type = type;
+//    }
 
     @Override
-    public void setNonNullParameter(PreparedStatement ps, int i, E parameter, JdbcType jdbcType) throws SQLException {
+    public void setNonNullParameter(PreparedStatement ps, int i, EiEnum parameter, JdbcType jdbcType) throws SQLException {
         ps.setInt(i, parameter.getValue());
     }
 
     @Override
-    public E getNullableResult(ResultSet rs, String columnName) throws SQLException {
+    public EiEnum getNullableResult(ResultSet rs, String columnName) throws SQLException {
         int i = rs.getInt(columnName);
         if (rs.wasNull()) {
             return null;
@@ -39,7 +39,7 @@ public class IEnumTypeHandler<E extends EiEnum> extends BaseTypeHandler<E> {
     }
 
     @Override
-    public E getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+    public EiEnum getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
         int i = rs.getInt(columnIndex);
         if (rs.wasNull()) {
             return null;
@@ -49,7 +49,7 @@ public class IEnumTypeHandler<E extends EiEnum> extends BaseTypeHandler<E> {
     }
 
     @Override
-    public E getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
+    public EiEnum getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
         int i = cs.getInt(columnIndex);
         if (cs.wasNull()) {
             return null;
@@ -58,11 +58,11 @@ public class IEnumTypeHandler<E extends EiEnum> extends BaseTypeHandler<E> {
         }
     }
 
-    public E getEnum(int value) {
-        E[] enums = this.type.getEnumConstants();
-        E em = null;
+    public EiEnum getEnum(int value) {
+        EiEnum[] enums = EiEnum.class.getEnumConstants();
+        EiEnum em = null;
         if (enums != null) {
-            for (E e : enums) {
+            for (EiEnum e : enums) {
                 if (e.getValue() == value) {
                     em = e;
                     break;

src/main/resources/mybatis/mappers/RoleInfoMapper.xml

@@ -1,36 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.zhiqiyun.open.core.mapper.RoleInfoMapper">
-    <resultMap id="BaseResultMap" type="com.zhiqiyun.open.core.models.RoleInfo">
-        <id column="id" property="id" jdbcType="BIGINT"/>
-        <result column="name" property="name" jdbcType="VARCHAR"/>
-        <result column="remark" property="remark" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <sql id="Base_Column">
-        `id`
-        , `name`, `remark`
-    </sql>
-
-    <insert id="insert" parameterType="com.zhiqiyun.open.core.models.RoleInfo" useGeneratedKeys="true" keyProperty="id">
-        insert into `role_info` (`name`, remark)
-        values (#{name,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR})
-    </insert>
-
-    <update id="updateById" parameterType="com.zhiqiyun.open.core.models.RoleInfo">
-        update `role_info`
-        <set>
-            <if test="name != null and name !=''">
-                `name` = #{name,jdbcType=VARCHAR},
-            </if>
-            <if test="remark != null and remark !=''">
-                `remark` = #{remark,jdbcType=VARCHAR},
-            </if>
-        </set>
-        <where>
-            `id` = #{id, jdbcType=BIGINT}
-        </where>
-    </update>
 
     <insert id="insertAuthority">
         insert into role_authority (authority_id, role_id)
@@ -45,23 +15,6 @@
         from role_authority
         WHERE role_id = #{roleId,jdbcType=BIGINT}
     </select>
-    <select id="findPage" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column"/>
-        from `role_info`
-        <where>
-            <if test="name != null and name != ''">
-                `name` like CONCAT('%',#{name,jdbcType=BIGINT},'%')
-            </if>
-        </where>
-        order by id desc
-    </select>
-    <select id="findAll" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column"/>
-        from `role_info`
-        order by id desc
-    </select>
     <delete id="deleteAuthorities" parameterType="java.lang.Long">
         delete FROM role_authority
         <where>

src/main/resources/mybatis/mappers/UserBaseInfoMapper.xml

@@ -11,18 +11,18 @@
         <result column="state" property="state" typeHandler="com.zhiqiyun.open.mybatis.typeHandler.IEnumTypeHandler"/>
     </resultMap>
 
-    <resultMap id="UserLoginLogResultMap" type="com.zhiqiyun.open.core.models.UserLoginLog">
-        <id column="id" property="id" jdbcType="BIGINT"/>
-        <result column="login_account" property="loginAccount" jdbcType="VARCHAR"/>
-        <result column="account_type" property="accountType"
-                typeHandler="com.zhiqiyun.open.mybatis.typeHandler.IEnumTypeHandler"/>
-        <result column="login_ip" property="loginIp" jdbcType="VARCHAR"/>
-        <result column="login_local" property="loginLocal" jdbcType="VARCHAR"/>
-        <result column="from_source" property="fromSource" jdbcType="VARCHAR"/>
-        <result column="device_id" property="deviceId" jdbcType="VARCHAR"/>
-        <result column="login_time" property="loginTime" jdbcType="TIMESTAMP"/>
-        <result column="state" property="state" typeHandler="com.zhiqiyun.open.mybatis.typeHandler.IEnumTypeHandler"/>
-    </resultMap>
+<!--    <resultMap id="UserLoginLogResultMap" type="com.zhiqiyun.open.core.models.UserLoginLog">-->
+<!--        <id column="id" property="id" jdbcType="BIGINT"/>-->
+<!--        <result column="login_account" property="loginAccount" jdbcType="VARCHAR"/>-->
+<!--        <result column="account_type" property="accountType"-->
+<!--                typeHandler="com.zhiqiyun.open.mybatis.typeHandler.IEnumTypeHandler"/>-->
+<!--        <result column="login_ip" property="loginIp" jdbcType="VARCHAR"/>-->
+<!--        <result column="login_local" property="loginLocal" jdbcType="VARCHAR"/>-->
+<!--        <result column="from_source" property="fromSource" jdbcType="VARCHAR"/>-->
+<!--        <result column="device_id" property="deviceId" jdbcType="VARCHAR"/>-->
+<!--        <result column="login_time" property="loginTime" jdbcType="TIMESTAMP"/>-->
+<!--        <result column="state" property="state" typeHandler="com.zhiqiyun.open.mybatis.typeHandler.IEnumTypeHandler"/>-->
+<!--    </resultMap>-->
     <resultMap id="UserOperateLogResultMap" type="com.zhiqiyun.open.core.models.UserOperateLog">
         <id column="id" property="id" jdbcType="BIGINT"/>
         <result column="uid" property="uid" jdbcType="BIGINT"/>
@@ -104,32 +104,18 @@
                 #{registerTime, jdbcType=TIMESTAMP},
                 #{registerIp, jdbcType=VARCHAR})
     </insert>
-    <insert id="insertOperateLog" parameterType="com.zhiqiyun.open.core.models.UserOperateLog">
-        insert into `user_operate_logs` (`id`, `uid`, `tags`, `from_source`, `request_url`, `request_ip`,
-                                         `request_params`, `request_data`, `request_time`, `response_time`)
-        values (#{id, jdbcType=VARCHAR},
-                #{uid, jdbcType=BIGINT},
-                #{tags, jdbcType=VARCHAR},
-                #{fromSource, jdbcType=VARCHAR},
-                #{requestUrl, jdbcType=VARCHAR},
-                #{requestIp, jdbcType=VARCHAR},
-                #{requestParams, jdbcType=VARCHAR},
-                #{requestData, jdbcType=VARCHAR},
-                #{requestTime, jdbcType=TIMESTAMP},
-                #{responseTime, jdbcType=TIMESTAMP})
-    </insert>
-    <insert id="insertLoginLog">
-        insert into `user_login_logs` (`login_account`, `account_type`, `login_ip`, `login_local`, `from_source`,
-                                       `device_id`, `login_time`, `state`)
-        values (#{loginAccount},
-                #{accountType, typeHandler=com.zhiqiyun.open.mybatis.typeHandler.IEnumTypeHandler},
-                #{loginIp},
-                #{loginLocal},
-                #{fromSource},
-                #{deviceId},
-                #{loginTime, jdbcType=TIMESTAMP},
-                #{state, typeHandler=com.zhiqiyun.open.mybatis.typeHandler.IEnumTypeHandler})
-    </insert>
+<!--    <insert id="insertLoginLog">-->
+<!--        insert into `user_login_logs` (`login_account`, `account_type`, `login_ip`, `login_local`, `from_source`,-->
+<!--                                       `device_id`, `login_time`, `state`)-->
+<!--        values (#{loginAccount},-->
+<!--                #{accountType, typeHandler=com.zhiqiyun.open.mybatis.typeHandler.IEnumTypeHandler},-->
+<!--                #{loginIp},-->
+<!--                #{loginLocal},-->
+<!--                #{fromSource},-->
+<!--                #{deviceId},-->
+<!--                #{loginTime, jdbcType=TIMESTAMP},-->
+<!--                #{state, typeHandler=com.zhiqiyun.open.mybatis.typeHandler.IEnumTypeHandler})-->
+<!--    </insert>-->
     <update id="updateById" parameterType="com.zhiqiyun.open.core.models.UserBaseInfo">
         update `user_base_info`
         <set>
@@ -161,77 +147,45 @@
             )
         )
     </select>
-    <select id="findRoles" resultMap="com.zhiqiyun.open.core.mapper.RoleInfoMapper.BaseResultMap"
-            parameterType="java.lang.Long">
-        select
-        <include refid="com.zhiqiyun.open.core.mapper.RoleInfoMapper.Base_Column"/>
-        from `role_info`
-        <where>
-            `id` in (select `role_id` from `user_role` where `uid` = #{uid,jdbcType=BIGINT})
-        </where>
-    </select>
-    <select id="findLoginLogPage" resultMap="UserLoginLogResultMap">
-        select
-        `id`, `login_account`, `account_type`, `login_ip`, `login_local`, `from_source`, `device_id`,
-        `login_time`, `state`
-        from user_login_logs a
-        <where>
-            <if test="loginAccount !=null and loginAccount !=''">
-                AND `login_account` like CONCAT('%',#{loginAccount},'%')
-            </if>
-            <if test="accountType !=null">
-                AND `account_type`=#{accountType, typeHandler=com.zhiqiyun.open.mybatis.typeHandler.IEnumTypeHandler}
-            </if>
-            <if test="loginIp !=null and loginIp !=''">
-                AND `login_ip`=#{loginIp}
-            </if>
-            <if test="loginLocal !=null and loginLocal !=''">
-                AND `login_local` like CONCAT('%',#{loginLocal},'%')
-            </if>
-            <if test="fromSource !=null and fromSource !=''">
-                AND `from_source` like CONCAT('%',#{fromSource},'%')
-            </if>
-            <if test="loginTime !=null">
-                AND `login_time` between #{loginTime.statDate, jdbcType=TIMESTAMP} and
-                #{loginTime.endDate, jdbcType=TIMESTAMP}
-            </if>
-            <if test="state !=null">
-                AND `state` = #{state, typeHandler=com.zhiqiyun.open.mybatis.typeHandler.IEnumTypeHandler}
-            </if>
-        </where>
-    </select>
-
-    <select id="findOperateLogPage" resultMap="UserOperateLogResultMap">
-        select
-        a.id,a.uid,a.tags,a.from_source,a.request_ip,a.request_url,a.request_params,a.request_data,a.request_time,a.response_time,
-        b.nick_name
-        from user_operate_logs a
-        left join user_base_info b on a.`uid`=b.`id`
-        <where>
-            <if test="nickName !=null and nickName !=''">
-                AND b.`nick_name` like CONCAT("%",#{nickName},"%")
-            </if>
-            <if test="tags !=null and tags !=''">
-                AND a.`tags` like CONCAT("%",#{tags},"%")
-            </if>
-            <if test="requestIp !=null and requestIp !=''">
-                AND a.`request_ip` = #{requestIp}
-            </if>
-            <if test="requestUrl !=null and requestUrl !=''">
-                AND a.`request_url` like CONCAT("%",#{requestUrl},"%")
-            </if>
-            <if test="requestParams !=null and requestParams !=''">
-                AND a.`request_params` like CONCAT("%",#{requestParams},"%")
-            </if>
-            <if test="requestData !=null and requestData !=''">
-                AND a.`request_data` like CONCAT("%",#{requestData},"%")
-            </if>
-            <if test="requestTime !=null">
-                AND `request_time` between #{requestTime.statDate, jdbcType=TIMESTAMP} and
-                #{requestTime.endDate, jdbcType=TIMESTAMP}
-            </if>
-        </where>
-    </select>
+<!--    <select id="findRoles" resultMap="com.zhiqiyun.open.core.mapper.RoleInfoMapper.BaseResultMap"-->
+<!--            parameterType="java.lang.Long">-->
+<!--        select-->
+<!--        <include refid="com.zhiqiyun.open.core.mapper.RoleInfoMapper.Base_Column"/>-->
+<!--        from `role_info`-->
+<!--        <where>-->
+<!--            `id` in (select `role_id` from `user_role` where `uid` = #{uid,jdbcType=BIGINT})-->
+<!--        </where>-->
+<!--    </select>-->
+<!--    <select id="findLoginLogPage" resultMap="UserLoginLogResultMap">-->
+<!--        select-->
+<!--        `id`, `login_account`, `account_type`, `login_ip`, `login_local`, `from_source`, `device_id`,-->
+<!--        `login_time`, `state`-->
+<!--        from user_login_logs a-->
+<!--        <where>-->
+<!--            <if test="loginAccount !=null and loginAccount !=''">-->
+<!--                AND `login_account` like CONCAT('%',#{loginAccount},'%')-->
+<!--            </if>-->
+<!--            <if test="accountType !=null">-->
+<!--                AND `account_type`=#{accountType, typeHandler=com.zhiqiyun.open.mybatis.typeHandler.IEnumTypeHandler}-->
+<!--            </if>-->
+<!--            <if test="loginIp !=null and loginIp !=''">-->
+<!--                AND `login_ip`=#{loginIp}-->
+<!--            </if>-->
+<!--            <if test="loginLocal !=null and loginLocal !=''">-->
+<!--                AND `login_local` like CONCAT('%',#{loginLocal},'%')-->
+<!--            </if>-->
+<!--            <if test="fromSource !=null and fromSource !=''">-->
+<!--                AND `from_source` like CONCAT('%',#{fromSource},'%')-->
+<!--            </if>-->
+<!--            <if test="loginTime !=null">-->
+<!--                AND `login_time` between #{loginTime.statDate, jdbcType=TIMESTAMP} and-->
+<!--                #{loginTime.endDate, jdbcType=TIMESTAMP}-->
+<!--            </if>-->
+<!--            <if test="state !=null">-->
+<!--                AND `state` = #{state, typeHandler=com.zhiqiyun.open.mybatis.typeHandler.IEnumTypeHandler}-->
+<!--            </if>-->
+<!--        </where>-->
+<!--    </select>-->
     <select id="findSelectAccounts" resultType="java.util.Map">
         select id,`nick_name` as nickName from `user_base_info`
         <where>