同步代码

pom.xml

@@ -37,7 +37,7 @@
 
  <properties>
  <zuihou-commons.version>2.0-SNAPSHOT</zuihou-commons.version>
- <boot.project.version>b.2.0-SNAPSHOT</boot.project.version>
+ <zuihou-project.version>b.2.0-SNAPSHOT</zuihou-project.version>
 
  <java.version>1.8</java.version>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

zuihou-authority-biz/pom.xml

@@ -17,7 +17,7 @@
  <dependency>
  <groupId>com.github.zuihou</groupId>
  <artifactId>zuihou-authority-entity</artifactId>
- <version>${boot.project.version}</version>
+ <version>${zuihou-project.version}</version>
  </dependency>
 
  <dependency>

zuihou-authority-biz/src/main/java/com/github/zuihou/authority/dao/auth/ApplicationMapper.java

@@ -1,7 +1,7 @@
 package com.github.zuihou.authority.dao.auth;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.zuihou.authority.entity.auth.Application;
+import com.github.zuihou.base.mapper.SuperMapper;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -14,6 +14,6 @@
  * @date 2019-12-15
  */
 @Repository
-public interface ApplicationMapper extends BaseMapper<Application> {
+public interface ApplicationMapper extends SuperMapper<Application> {
 
 }

zuihou-authority-biz/src/main/java/com/github/zuihou/authority/dao/auth/ApplicationSystemApiMapper.java

@@ -1,7 +1,7 @@
 package com.github.zuihou.authority.dao.auth;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.zuihou.authority.entity.auth.ApplicationSystemApi;
+import com.github.zuihou.base.mapper.SuperMapper;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -14,6 +14,6 @@
  * @date 2019-12-15
  */
 @Repository
-public interface ApplicationSystemApiMapper extends BaseMapper<ApplicationSystemApi> {
+public interface ApplicationSystemApiMapper extends SuperMapper<ApplicationSystemApi> {
 
 }

zuihou-authority-biz/src/main/java/com/github/zuihou/authority/dao/auth/MenuMapper.java

@@ -1,7 +1,7 @@
 package com.github.zuihou.authority.dao.auth;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.zuihou.authority.entity.auth.Menu;
+import com.github.zuihou.base.mapper.SuperMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -17,7 +17,7 @@
  * @date 2019-07-03
  */
 @Repository
-public interface MenuMapper extends BaseMapper<Menu> {
+public interface MenuMapper extends SuperMapper<Menu> {
 
  /**
  * 查询用户可用菜单

zuihou-authority-biz/src/main/java/com/github/zuihou/authority/dao/auth/ResourceMapper.java

@@ -1,8 +1,8 @@
 package com.github.zuihou.authority.dao.auth;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.zuihou.authority.dto.auth.ResourceQueryDTO;
 import com.github.zuihou.authority.entity.auth.Resource;
+import com.github.zuihou.base.mapper.SuperMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -18,7 +18,7 @@
  * @date 2019-07-03
  */
 @Repository
-public interface ResourceMapper extends BaseMapper<Resource> {
+public interface ResourceMapper extends SuperMapper<Resource> {
  /**
  * 查询 拥有的资源
  *

zuihou-authority-biz/src/main/java/com/github/zuihou/authority/dao/auth/RoleAuthorityMapper.java

@@ -1,7 +1,7 @@
 package com.github.zuihou.authority.dao.auth;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.zuihou.authority.entity.auth.RoleAuthority;
+import com.github.zuihou.base.mapper.SuperMapper;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -14,6 +14,6 @@
  * @date 2019-07-03
  */
 @Repository
-public interface RoleAuthorityMapper extends BaseMapper<RoleAuthority> {
+public interface RoleAuthorityMapper extends SuperMapper<RoleAuthority> {
 
 }

zuihou-authority-biz/src/main/java/com/github/zuihou/authority/dao/auth/RoleMapper.java

@@ -1,7 +1,7 @@
 package com.github.zuihou.authority.dao.auth;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.zuihou.authority.entity.auth.Role;
+import com.github.zuihou.base.mapper.SuperMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -17,7 +17,7 @@
  * @date 2019-07-03
  */
 @Repository
-public interface RoleMapper extends BaseMapper<Role> {
+public interface RoleMapper extends SuperMapper<Role> {
  /**
  * 查询用户拥有的角色
  *

zuihou-authority-biz/src/main/java/com/github/zuihou/authority/dao/auth/RoleOrgMapper.java

@@ -1,7 +1,7 @@
 package com.github.zuihou.authority.dao.auth;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.zuihou.authority.entity.auth.RoleOrg;
+import com.github.zuihou.base.mapper.SuperMapper;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -14,6 +14,6 @@
  * @date 2019-07-03
  */
 @Repository
-public interface RoleOrgMapper extends BaseMapper<RoleOrg> {
+public interface RoleOrgMapper extends SuperMapper<RoleOrg> {
 
 }

zuihou-authority-biz/src/main/java/com/github/zuihou/authority/dao/auth/SystemApiMapper.java

@@ -1,7 +1,7 @@
 package com.github.zuihou.authority.dao.auth;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.zuihou.authority.entity.auth.SystemApi;
+import com.github.zuihou.base.mapper.SuperMapper;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -14,6 +14,6 @@
  * @date 2019-12-15
  */
 @Repository
-public interface SystemApiMapper extends BaseMapper<SystemApi> {
+public interface SystemApiMapper extends SuperMapper<SystemApi> {
 
 }

zuihou-authority-biz/src/main/java/com/github/zuihou/authority/dao/auth/UserRoleMapper.java

@@ -1,7 +1,7 @@
 package com.github.zuihou.authority.dao.auth;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.zuihou.authority.entity.auth.UserRole;
+import com.github.zuihou.base.mapper.SuperMapper;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -15,6 +15,6 @@
  * @date 2019-07-03
  */
 @Repository
-public interface UserRoleMapper extends BaseMapper<UserRole> {
+public interface UserRoleMapper extends SuperMapper<UserRole> {
 
 }

zuihou-authority-biz/src/main/java/com/github/zuihou/authority/dao/common/AreaMapper.java

@@ -1,7 +1,7 @@
 package com.github.zuihou.authority.dao.common;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.zuihou.authority.entity.common.Area;
+import com.github.zuihou.base.mapper.SuperMapper;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -14,6 +14,6 @@
  * @date 2019-07-02
  */
 @Repository
-public interface AreaMapper extends BaseMapper<Area> {
+public interface AreaMapper extends SuperMapper<Area> {
 
 }

zuihou-authority-biz/src/main/java/com/github/zuihou/authority/dao/common/DictionaryItemMapper.java

@@ -1,7 +1,7 @@
 package com.github.zuihou.authority.dao.common;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.zuihou.authority.entity.common.DictionaryItem;
+import com.github.zuihou.base.mapper.SuperMapper;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -14,6 +14,6 @@
  * @date 2019-07-02
  */
 @Repository
-public interface DictionaryItemMapper extends BaseMapper<DictionaryItem> {
+public interface DictionaryItemMapper extends SuperMapper<DictionaryItem> {
 
 }

zuihou-authority-biz/src/main/java/com/github/zuihou/authority/dao/common/DictionaryMapper.java

@@ -1,19 +1,19 @@
 package com.github.zuihou.authority.dao.common;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.zuihou.authority.entity.common.Dictionary;
+import com.github.zuihou.base.mapper.SuperMapper;
 import org.springframework.stereotype.Repository;
 
 /**
  * <p>
  * Mapper 接口
- * 字典目录
+ * 字典类型
  * </p>
  *
  * @author zuihou
  * @date 2019-07-02
  */
 @Repository
-public interface DictionaryMapper extends BaseMapper<Dictionary> {
+public interface DictionaryMapper extends SuperMapper<Dictionary> {
 
 }

zuihou-authority-biz/src/main/java/com/github/zuihou/authority/dao/common/LoginLogMapper.java

@@ -1,11 +1,12 @@
 package com.github.zuihou.authority.dao.common;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.zuihou.authority.entity.common.LoginLog;
+import com.github.zuihou.base.mapper.SuperMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -19,7 +20,7 @@
  * @date 2019-10-20
  */
 @Repository
-public interface LoginLogMapper extends BaseMapper<LoginLog> {
+public interface LoginLogMapper extends SuperMapper<LoginLog> {
  /**
  * 获取系统总访问次数
  *
@@ -65,4 +66,13 @@ public interface LoginLogMapper extends BaseMapper<LoginLog> {
  * @return
  */
  List<Map<String, Object>> findByOperatingSystem();
+
+ /**
+ * 清理日志
+ *
+ * @param clearBeforeTime 多久之前的
+ * @param clearBeforeNum 多少条
+ * @return
+ */
+ boolean clearLog(@Param("clearBeforeTime") LocalDateTime clearBeforeTime, @Param("clearBeforeNum") Integer clearBeforeNum);
 }

zuihou-authority-biz/src/main/java/com/github/zuihou/authority/dao/common/OptLogMapper.java

@@ -1,9 +1,12 @@
 package com.github.zuihou.authority.dao.common;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.zuihou.authority.entity.common.OptLog;
+import com.github.zuihou.base.mapper.SuperMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * Mapper 接口
@@ -14,6 +17,13 @@
  * @date 2019-07-02
  */
 @Repository
-public interface OptLogMapper extends BaseMapper<OptLog> {
-
+public interface OptLogMapper extends SuperMapper<OptLog> {
+ /**
+ * 清理日志
+ *
+ * @param clearBeforeTime 多久之前的
+ * @param clearBeforeNum 多少条
+ * @return
+ */
+ boolean clearLog(@Param("clearBeforeTime") LocalDateTime clearBeforeTime, @Param("clearBeforeNum") Integer clearBeforeNum);
 }

zuihou-authority-biz/src/main/java/com/github/zuihou/authority/dao/common/ParameterMapper.java

@@ -1,7 +1,7 @@
 package com.github.zuihou.authority.dao.common;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.zuihou.authority.entity.common.Parameter;
+import com.github.zuihou.base.mapper.SuperMapper;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -14,6 +14,6 @@
  * @date 2020-02-05
  */
 @Repository
-public interface ParameterMapper extends BaseMapper<Parameter> {
+public interface ParameterMapper extends SuperMapper<Parameter> {
 
 }

zuihou-authority-biz/src/main/java/com/github/zuihou/authority/dao/core/OrgMapper.java

@@ -1,7 +1,7 @@
 package com.github.zuihou.authority.dao.core;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.zuihou.authority.entity.core.Org;
+import com.github.zuihou.base.mapper.SuperMapper;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -14,6 +14,6 @@
  * @date 2019-07-22
  */
 @Repository
-public interface OrgMapper extends BaseMapper<Org> {
+public interface OrgMapper extends SuperMapper<Org> {
 
 }

zuihou-authority-biz/src/main/java/com/github/zuihou/authority/dao/core/StationMapper.java

@@ -1,10 +1,10 @@
 package com.github.zuihou.authority.dao.core;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.github.zuihou.authority.entity.core.Station;
+import com.github.zuihou.base.mapper.SuperMapper;
 import com.github.zuihou.database.mybatis.auth.DataScope;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -19,7 +19,7 @@
  * @date 2019-07-22
  */
 @Repository
-public interface StationMapper extends BaseMapper<Station> {
+public interface StationMapper extends SuperMapper<Station> {
  /**
  * 分页查询岗位信息（含角色）
  *

zuihou-authority-biz/src/main/java/com/github/zuihou/authority/dao/defaults/GlobalUserMapper.java

@@ -1,8 +1,8 @@
 package com.github.zuihou.authority.dao.defaults;
 
 import com.baomidou.mybatisplus.annotation.SqlParser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.zuihou.authority.entity.defaults.GlobalUser;
+import com.github.zuihou.base.mapper.SuperMapper;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -16,6 +16,6 @@
  */
 @Repository
 @SqlParser(filter = true)
-public interface GlobalUserMapper extends BaseMapper<GlobalUser> {
+public interface GlobalUserMapper extends SuperMapper<GlobalUser> {
 
 }

zuihou-authority-biz/src/main/java/com/github/zuihou/authority/dao/defaults/TenantMapper.java

@@ -1,8 +1,9 @@
 package com.github.zuihou.authority.dao.defaults;
 
 import com.baomidou.mybatisplus.annotation.SqlParser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.zuihou.authority.entity.defaults.Tenant;
+import com.github.zuihou.base.mapper.SuperMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -16,6 +17,7 @@
  */
 @Repository
 @SqlParser(filter = true)
-public interface TenantMapper extends BaseMapper<Tenant> {
+public interface TenantMapper extends SuperMapper<Tenant> {
 
+ Tenant getByCode(@Param("tenant") String tenant);
 }