mybatis-jpa-extra-3.3.2 service and impl

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AccessServiceImpl.java

@@ -19,10 +19,11 @@ package org.dromara.maxkey.persistence.service.impl;
 
 import org.dromara.maxkey.entity.Access;
 import org.dromara.maxkey.persistence.mapper.AccessMapper;
+import org.dromara.maxkey.persistence.service.AccessService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class AccessServiceImpl  extends JpaServiceImpl<AccessMapper,Access>{
+public class AccessServiceImpl  extends JpaServiceImpl<AccessMapper,Access> implements AccessService{
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AccountsServiceImpl.java

@@ -27,6 +27,7 @@ import org.dromara.maxkey.entity.AccountsStrategy;
 import org.dromara.maxkey.entity.OrganizationsCast;
 import org.dromara.maxkey.entity.idm.UserInfo;
 import org.dromara.maxkey.persistence.mapper.AccountsMapper;
+import org.dromara.maxkey.persistence.service.AccountsService;
 import org.dromara.maxkey.persistence.service.AccountsStrategyService;
 import org.dromara.maxkey.persistence.service.OrganizationsCastService;
 import org.dromara.maxkey.persistence.service.UserInfoService;
@@ -45,7 +46,7 @@ import net.sourceforge.pinyin4j.format.HanyuPinyinVCharType;
 import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
 
 @Repository
-public class AccountsServiceImpl  extends JpaServiceImpl<AccountsMapper,Accounts>{
+public class AccountsServiceImpl  extends JpaServiceImpl<AccountsMapper,Accounts>  implements AccountsService{
 
     @Autowired
     ProvisionService provisionService;

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AccountsStrategyServiceImpl.java

@@ -22,17 +22,16 @@ import java.util.List;
 import org.dromara.maxkey.entity.AccountsStrategy;
 import org.dromara.maxkey.entity.permissions.Roles;
 import org.dromara.maxkey.persistence.mapper.AccountsStrategyMapper;
+import org.dromara.maxkey.persistence.service.AccountsStrategyService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class AccountsStrategyServiceImpl  extends JpaServiceImpl<AccountsStrategyMapper,AccountsStrategy> {
+public class AccountsStrategyServiceImpl  extends JpaServiceImpl<AccountsStrategyMapper,AccountsStrategy> implements AccountsStrategyService{
     static final  Logger _logger = LoggerFactory.getLogger(AccountsStrategyServiceImpl.class);
 
-	
-	
 	public List<Roles> queryDynamicGroups(Roles groups){
 	    return this.getMapper().queryDynamicGroups(groups);
 	}

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsAdaptersServiceImpl.java

@@ -19,10 +19,11 @@ package org.dromara.maxkey.persistence.service.impl;
 
 import org.dromara.maxkey.entity.apps.AppsAdapters;
 import org.dromara.maxkey.persistence.mapper.AppsAdaptersMapper;
+import org.dromara.maxkey.persistence.service.AppsAdaptersService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class AppsAdaptersServiceImpl  extends JpaServiceImpl<AppsAdaptersMapper,AppsAdapters>{
+public class AppsAdaptersServiceImpl  extends JpaServiceImpl<AppsAdaptersMapper,AppsAdapters> implements AppsAdaptersService{
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsCasDetailsServiceImpl.java

@@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.dromara.maxkey.entity.apps.AppsCasDetails;
 import org.dromara.maxkey.persistence.mapper.AppsCasDetailsMapper;
+import org.dromara.maxkey.persistence.service.AppsCasDetailsService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
@@ -28,7 +29,7 @@ import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 
 @Repository
-public class AppsCasDetailsServiceImpl  extends JpaServiceImpl<AppsCasDetailsMapper,AppsCasDetails>{
+public class AppsCasDetailsServiceImpl  extends JpaServiceImpl<AppsCasDetailsMapper,AppsCasDetails> implements AppsCasDetailsService{
 
 	protected static final   Cache<String, AppsCasDetails> detailsCache = 
             Caffeine.newBuilder()

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsFormBasedDetailsServiceImpl.java

@@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.dromara.maxkey.entity.apps.AppsFormBasedDetails;
 import org.dromara.maxkey.persistence.mapper.AppsFormBasedDetailsMapper;
+import org.dromara.maxkey.persistence.service.AppsFormBasedDetailsService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
@@ -28,7 +29,7 @@ import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 
 @Repository
-public class AppsFormBasedDetailsServiceImpl  extends JpaServiceImpl<AppsFormBasedDetailsMapper,AppsFormBasedDetails>{
+public class AppsFormBasedDetailsServiceImpl  extends JpaServiceImpl<AppsFormBasedDetailsMapper,AppsFormBasedDetails> implements AppsFormBasedDetailsService{
 
 	protected static final   Cache<String, AppsFormBasedDetails> detailsCache = 
             Caffeine.newBuilder()

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsJwtDetailsServiceImpl.java

@@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.dromara.maxkey.entity.apps.AppsJwtDetails;
 import org.dromara.maxkey.persistence.mapper.AppsJwtDetailsMapper;
+import org.dromara.maxkey.persistence.service.AppsJwtDetailsService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
@@ -28,7 +29,7 @@ import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 
 @Repository
-public class AppsJwtDetailsServiceImpl  extends JpaServiceImpl<AppsJwtDetailsMapper,AppsJwtDetails>{
+public class AppsJwtDetailsServiceImpl  extends JpaServiceImpl<AppsJwtDetailsMapper,AppsJwtDetails> implements AppsJwtDetailsService{
 
 	protected static final   Cache<String, AppsJwtDetails> detailsCache = 
             Caffeine.newBuilder()

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsSaml20DetailsServiceImpl.java

@@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.dromara.maxkey.entity.apps.AppsSAML20Details;
 import org.dromara.maxkey.persistence.mapper.AppsSaml20DetailsMapper;
+import org.dromara.maxkey.persistence.service.AppsSaml20DetailsService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
@@ -28,7 +29,7 @@ import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 
 @Repository
-public class AppsSaml20DetailsServiceImpl  extends JpaServiceImpl<AppsSaml20DetailsMapper,AppsSAML20Details>{
+public class AppsSaml20DetailsServiceImpl  extends JpaServiceImpl<AppsSaml20DetailsMapper,AppsSAML20Details> implements AppsSaml20DetailsService{
 
 	protected static final   Cache<String, AppsSAML20Details> detailsCache = 
             Caffeine.newBuilder()

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsServiceImpl.java

@@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit;
 import org.dromara.maxkey.entity.apps.Apps;
 import org.dromara.maxkey.entity.apps.UserApps;
 import org.dromara.maxkey.persistence.mapper.AppsMapper;
+import org.dromara.maxkey.persistence.service.AppsService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
@@ -30,7 +31,7 @@ import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 
 @Repository
-public class AppsServiceImpl extends JpaServiceImpl<AppsMapper,Apps>{
+public class AppsServiceImpl extends JpaServiceImpl<AppsMapper,Apps> implements AppsService{
 	//maxkey-mgt
 	public static final  	String MGT_APP_ID 		= "622076759805923328";
 	

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsTokenBasedDetailsServiceImpl.java

@@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.dromara.maxkey.entity.apps.AppsTokenBasedDetails;
 import org.dromara.maxkey.persistence.mapper.AppsTokenBasedDetailsMapper;
+import org.dromara.maxkey.persistence.service.AppsTokenBasedDetailsService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
@@ -28,7 +29,7 @@ import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 
 @Repository
-public class AppsTokenBasedDetailsServiceImpl  extends JpaServiceImpl<AppsTokenBasedDetailsMapper,AppsTokenBasedDetails>{
+public class AppsTokenBasedDetailsServiceImpl  extends JpaServiceImpl<AppsTokenBasedDetailsMapper,AppsTokenBasedDetails> implements AppsTokenBasedDetailsService{
 
 	protected static final   Cache<String, AppsTokenBasedDetails> detailsCache = 
             Caffeine.newBuilder()

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/CnfEmailSendersServiceImpl.java

@@ -20,11 +20,12 @@ package org.dromara.maxkey.persistence.service.impl;
 
 import org.dromara.maxkey.entity.cnf.CnfEmailSenders;
 import org.dromara.maxkey.persistence.mapper.CnfEmailSendersMapper;
+import org.dromara.maxkey.persistence.service.CnfEmailSendersService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
 
 @Repository
-public class CnfEmailSendersServiceImpl  extends JpaServiceImpl<CnfEmailSendersMapper,CnfEmailSenders>{
+public class CnfEmailSendersServiceImpl  extends JpaServiceImpl<CnfEmailSendersMapper,CnfEmailSenders> implements CnfEmailSendersService{
 	 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/CnfLdapContextServiceImpl.java

@@ -19,11 +19,12 @@ package org.dromara.maxkey.persistence.service.impl;
 
 import org.dromara.maxkey.entity.cnf.CnfLdapContext;
 import org.dromara.maxkey.persistence.mapper.CnfLdapContextMapper;
+import org.dromara.maxkey.persistence.service.CnfLdapContextService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
 
 @Repository
-public class CnfLdapContextServiceImpl  extends JpaServiceImpl<CnfLdapContextMapper,CnfLdapContext>{
+public class CnfLdapContextServiceImpl  extends JpaServiceImpl<CnfLdapContextMapper,CnfLdapContext> implements CnfLdapContextService{
  
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/CnfPasswordPolicyServiceImpl.java

@@ -19,10 +19,11 @@ package org.dromara.maxkey.persistence.service.impl;
 
 import org.dromara.maxkey.entity.cnf.CnfPasswordPolicy;
 import org.dromara.maxkey.persistence.mapper.CnfPasswordPolicyMapper;
+import org.dromara.maxkey.persistence.service.CnfPasswordPolicyService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class CnfPasswordPolicyServiceImpl  extends JpaServiceImpl<CnfPasswordPolicyMapper,CnfPasswordPolicy>{
+public class CnfPasswordPolicyServiceImpl  extends JpaServiceImpl<CnfPasswordPolicyMapper,CnfPasswordPolicy> implements CnfPasswordPolicyService{
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/CnfSmsProviderServiceImpl.java

@@ -19,11 +19,12 @@ package org.dromara.maxkey.persistence.service.impl;
 
 import org.dromara.maxkey.entity.cnf.CnfSmsProvider;
 import org.dromara.maxkey.persistence.mapper.CnfSmsProviderMapper;
+import org.dromara.maxkey.persistence.service.CnfSmsProviderService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
 
 @Repository
-public class CnfSmsProviderServiceImpl  extends JpaServiceImpl<CnfSmsProviderMapper,CnfSmsProvider>{
+public class CnfSmsProviderServiceImpl  extends JpaServiceImpl<CnfSmsProviderMapper,CnfSmsProvider> implements CnfSmsProviderService{
  
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/ConnectorsServiceImpl.java

@@ -19,10 +19,11 @@ package org.dromara.maxkey.persistence.service.impl;
 
 import org.dromara.maxkey.entity.Connectors;
 import org.dromara.maxkey.persistence.mapper.ConnectorsMapper;
+import org.dromara.maxkey.persistence.service.ConnectorsService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class ConnectorsServiceImpl  extends JpaServiceImpl<ConnectorsMapper,Connectors>{
+public class ConnectorsServiceImpl  extends JpaServiceImpl<ConnectorsMapper,Connectors> implements ConnectorsService{
   
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/FileUploadServiceImpl.java

@@ -19,10 +19,11 @@ package org.dromara.maxkey.persistence.service.impl;
 
 import org.dromara.maxkey.entity.FileUpload;
 import org.dromara.maxkey.persistence.mapper.FileUploadMapper;
+import org.dromara.maxkey.persistence.service.FileUploadService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class FileUploadServiceImpl  extends JpaServiceImpl<FileUploadMapper,FileUpload>{
+public class FileUploadServiceImpl  extends JpaServiceImpl<FileUploadMapper,FileUpload> implements FileUploadService{
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/GroupMemberServiceImpl.java

@@ -23,6 +23,7 @@ import org.dromara.maxkey.entity.idm.GroupMember;
 import org.dromara.maxkey.entity.idm.Groups;
 import org.dromara.maxkey.entity.idm.UserInfo;
 import org.dromara.maxkey.persistence.mapper.GroupMemberMapper;
+import org.dromara.maxkey.persistence.service.GroupMemberService;
 import org.dromara.mybatis.jpa.entity.JpaPageResults;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.slf4j.Logger;
@@ -30,7 +31,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class GroupMemberServiceImpl  extends JpaServiceImpl<GroupMemberMapper,GroupMember>{
+public class GroupMemberServiceImpl  extends JpaServiceImpl<GroupMemberMapper,GroupMember> implements GroupMemberService{
 	static final  Logger _logger = LoggerFactory.getLogger(GroupMemberServiceImpl.class);
 
 	public int addDynamicMember(Groups dynamicGroup) {
@@ -51,27 +52,18 @@ public class GroupMemberServiceImpl  extends JpaServiceImpl<GroupMemberMapper,Gr
 	
 	
 	public JpaPageResults<Groups> noMember(GroupMember entity) {
-		entity.setPageSelectId(entity.generateId());
-		entity.setStartRow(calculateStartRow(entity.getPageNumber() ,entity.getPageSize()));
-		
-		entity.setPageable(true);
+		beforePageResults(entity);
 		List<Groups> resultslist = null;
 		try {
 			resultslist = getMapper().noMember(entity);
 		} catch (Exception e) {
 			_logger.error("queryPageResults Exception " , e);
 		}
-		entity.setPageable(false);
-		Integer totalPage = resultslist.size();
-		
-		Integer totalCount = 0;
-		if(entity.getPageNumber() == 1 && totalPage < entity.getPageSize()) {
-			totalCount = totalPage;
-		}else {
-			totalCount = parseCount(getMapper().fetchCount(entity));
-		}
-		
-		return new JpaPageResults<Groups>(entity.getPageNumber(),entity.getPageSize(),totalPage,totalCount,resultslist);
+		//当前页记录数
+		Integer records = parseRecords(resultslist);
+		//总页数
+		Integer totalCount =fetchCount(entity, resultslist);
+		return new JpaPageResults<Groups>(entity.getPageNumber(),entity.getPageSize(),records,totalCount,resultslist);
 	}
 	
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/GroupsServiceImpl.java

@@ -26,6 +26,9 @@ import org.dromara.maxkey.entity.Institutions;
 import org.dromara.maxkey.entity.idm.Groups;
 import org.dromara.maxkey.entity.permissions.Roles;
 import org.dromara.maxkey.persistence.mapper.GroupsMapper;
+import org.dromara.maxkey.persistence.service.GroupMemberService;
+import org.dromara.maxkey.persistence.service.GroupsService;
+import org.dromara.maxkey.persistence.service.InstitutionsService;
 import org.dromara.maxkey.util.StrUtils;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.slf4j.Logger;
@@ -34,14 +37,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class GroupsServiceImpl  extends JpaServiceImpl<GroupsMapper,Groups>{
+public class GroupsServiceImpl  extends JpaServiceImpl<GroupsMapper,Groups> implements GroupsService{
     static final  Logger _logger = LoggerFactory.getLogger(GroupsServiceImpl.class);
 
     @Autowired
-    GroupMemberServiceImpl groupMemberService;
+    GroupMemberService groupMemberService;
     
     @Autowired
-    InstitutionsServiceImpl institutionsService;
+    InstitutionsService institutionsService;
     
 	public List<Groups> queryDynamicGroups(Groups groups){
 	    return this.getMapper().queryDynamic(groups);

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistoryConnectorServiceImpl.java

@@ -19,10 +19,11 @@ package org.dromara.maxkey.persistence.service.impl;
 
 import org.dromara.maxkey.entity.history.HistoryConnector;
 import org.dromara.maxkey.persistence.mapper.HistoryConnectorMapper;
+import org.dromara.maxkey.persistence.service.HistoryConnectorService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class HistoryConnectorServiceImpl  extends JpaServiceImpl<HistoryConnectorMapper,HistoryConnector>{
+public class HistoryConnectorServiceImpl  extends JpaServiceImpl<HistoryConnectorMapper,HistoryConnector> implements HistoryConnectorService{
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistoryLoginAppsServiceImpl.java

@@ -19,11 +19,12 @@ package org.dromara.maxkey.persistence.service.impl;
 
 import org.dromara.maxkey.entity.history.HistoryLoginApps;
 import org.dromara.maxkey.persistence.mapper.HistoryLoginAppsMapper;
+import org.dromara.maxkey.persistence.service.HistoryLoginAppsService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class HistoryLoginAppsServiceImpl  extends JpaServiceImpl<HistoryLoginAppsMapper,HistoryLoginApps>{
+public class HistoryLoginAppsServiceImpl  extends JpaServiceImpl<HistoryLoginAppsMapper,HistoryLoginApps> implements HistoryLoginAppsService{
 
 	@Override
 	public boolean  insert(HistoryLoginApps loginAppsHistory){

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistoryLoginServiceImpl.java

@@ -19,12 +19,13 @@ package org.dromara.maxkey.persistence.service.impl;
 
 import org.dromara.maxkey.entity.history.HistoryLogin;
 import org.dromara.maxkey.persistence.mapper.HistoryLoginMapper;
+import org.dromara.maxkey.persistence.service.HistoryLoginService;
 import org.dromara.mybatis.jpa.entity.JpaPageResults;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class HistoryLoginServiceImpl  extends JpaServiceImpl<HistoryLoginMapper,HistoryLogin>{
+public class HistoryLoginServiceImpl  extends JpaServiceImpl<HistoryLoginMapper,HistoryLogin> implements HistoryLoginService{
 
 	public JpaPageResults<HistoryLogin> queryOnlineSession(HistoryLogin historyLogin) {
 	    return this.fetchPageResults("queryOnlineSession",historyLogin);

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistorySynchronizerServiceImpl.java

@@ -19,10 +19,11 @@ package org.dromara.maxkey.persistence.service.impl;
 
 import org.dromara.maxkey.entity.history.HistorySynchronizer;
 import org.dromara.maxkey.persistence.mapper.HistorySynchronizerMapper;
+import org.dromara.maxkey.persistence.service.HistorySynchronizerService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class HistorySynchronizerServiceImpl  extends JpaServiceImpl<HistorySynchronizerMapper,HistorySynchronizer>{
+public class HistorySynchronizerServiceImpl  extends JpaServiceImpl<HistorySynchronizerMapper,HistorySynchronizer> implements HistorySynchronizerService{
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistorySystemLogsServiceImpl.java

@@ -33,6 +33,7 @@ import org.dromara.maxkey.entity.permissions.Resources;
 import org.dromara.maxkey.entity.permissions.RoleMember;
 import org.dromara.maxkey.entity.permissions.Roles;
 import org.dromara.maxkey.persistence.mapper.HistorySystemLogsMapper;
+import org.dromara.maxkey.persistence.service.HistorySystemLogsService;
 import org.dromara.maxkey.util.JsonUtils;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.slf4j.Logger;
@@ -40,7 +41,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class HistorySystemLogsServiceImpl  extends JpaServiceImpl<HistorySystemLogsMapper,HistorySystemLogs>{
+public class HistorySystemLogsServiceImpl  extends JpaServiceImpl<HistorySystemLogsMapper,HistorySystemLogs> implements HistorySystemLogsService{
 	static final Logger _logger = LoggerFactory.getLogger(HistorySystemLogsServiceImpl.class);
 
 	public void insert(String topic,Object entity,String action,String result,UserInfo operator) {

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/InstitutionsServiceImpl.java

@@ -19,12 +19,13 @@ package org.dromara.maxkey.persistence.service.impl;
 
 import org.dromara.maxkey.entity.Institutions;
 import org.dromara.maxkey.persistence.mapper.InstitutionsMapper;
+import org.dromara.maxkey.persistence.service.InstitutionsService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
 
 @Repository
-public class InstitutionsServiceImpl  extends JpaServiceImpl<InstitutionsMapper,Institutions>{
+public class InstitutionsServiceImpl  extends JpaServiceImpl<InstitutionsMapper,Institutions> implements InstitutionsService{
 
 	 public Institutions findByDomain(String domain) {
 		 return getMapper().findByDomain(domain);

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/OrganizationsCastServiceImpl.java

@@ -19,6 +19,7 @@ package org.dromara.maxkey.persistence.service.impl;
 
 import org.dromara.maxkey.entity.OrganizationsCast;
 import org.dromara.maxkey.persistence.mapper.OrganizationsCastMapper;
+import org.dromara.maxkey.persistence.service.OrganizationsCastService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,7 +27,7 @@ import org.springframework.stereotype.Repository;
 
 
 @Repository
-public class OrganizationsCastServiceImpl  extends JpaServiceImpl<OrganizationsCastMapper,OrganizationsCast>{
+public class OrganizationsCastServiceImpl  extends JpaServiceImpl<OrganizationsCastMapper,OrganizationsCast> implements OrganizationsCastService{
 	static final  Logger _logger = LoggerFactory.getLogger(OrganizationsCastServiceImpl.class);
 
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/OrganizationsServiceImpl.java

@@ -27,6 +27,7 @@ import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
 import org.dromara.maxkey.entity.idm.Organizations;
 import org.dromara.maxkey.persistence.mapper.OrganizationsMapper;
+import org.dromara.maxkey.persistence.service.OrganizationsService;
 import org.dromara.maxkey.provision.ProvisionAct;
 import org.dromara.maxkey.provision.ProvisionService;
 import org.dromara.maxkey.provision.ProvisionTopic;
@@ -39,7 +40,7 @@ import org.springframework.stereotype.Repository;
 
 
 @Repository
-public class OrganizationsServiceImpl  extends JpaServiceImpl<OrganizationsMapper,Organizations>{
+public class OrganizationsServiceImpl  extends JpaServiceImpl<OrganizationsMapper,Organizations> implements OrganizationsService{
 	static final Logger _logger = LoggerFactory.getLogger(OrganizationsServiceImpl.class);
 	
     @Autowired

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/PermissionRoleServiceImpl.java

@@ -22,13 +22,14 @@ import java.util.List;
 
 import org.dromara.maxkey.entity.permissions.PermissionRole;
 import org.dromara.maxkey.persistence.mapper.PermissionRoleMapper;
+import org.dromara.maxkey.persistence.service.PermissionRoleService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class PermissionRoleServiceImpl  extends JpaServiceImpl<PermissionRoleMapper,PermissionRole>{
+public class PermissionRoleServiceImpl  extends JpaServiceImpl<PermissionRoleMapper,PermissionRole> implements PermissionRoleService{
 	static final Logger _logger = LoggerFactory.getLogger(PermissionRoleServiceImpl.class);
  
 	

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/PermissionServiceImpl.java

@@ -21,13 +21,14 @@ import java.util.List;
 
 import org.dromara.maxkey.entity.permissions.Permission;
 import org.dromara.maxkey.persistence.mapper.PermissionMapper;
+import org.dromara.maxkey.persistence.service.PermissionService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class PermissionServiceImpl  extends JpaServiceImpl<PermissionMapper,Permission>{
+public class PermissionServiceImpl  extends JpaServiceImpl<PermissionMapper,Permission> implements PermissionService{
 	static final  Logger _logger = LoggerFactory.getLogger(PermissionServiceImpl.class);
 
 	public boolean insertGroupPrivileges(List<Permission> rolePermissionsList) {

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/RegisterServiceImpl.java

@@ -22,11 +22,12 @@ import java.util.List;
 import org.dromara.maxkey.entity.Register;
 import org.dromara.maxkey.entity.idm.UserInfo;
 import org.dromara.maxkey.persistence.mapper.RegisterMapper;
+import org.dromara.maxkey.persistence.service.RegisterService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class RegisterServiceImpl  extends JpaServiceImpl<RegisterMapper,Register>{
+public class RegisterServiceImpl  extends JpaServiceImpl<RegisterMapper,Register> implements RegisterService{
 	
 	public UserInfo findByEmail(String email){
 		List<UserInfo> listUserInfo=getMapper().findByEmail(email);

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/ReportServiceImpl.java

@@ -21,12 +21,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.dromara.maxkey.persistence.mapper.ReportMapper;
+import org.dromara.maxkey.persistence.service.ReportService;
 import org.dromara.mybatis.jpa.entity.JpaEntity;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class ReportServiceImpl  extends JpaServiceImpl<ReportMapper,JpaEntity>{
+public class ReportServiceImpl  extends JpaServiceImpl<ReportMapper,JpaEntity> implements ReportService{
 
 	public Integer analysisDay(HashMap<String,Object> reportParameter) {
 		return getMapper().analysisDay(reportParameter);

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/ResourcesServiceImpl.java

@@ -21,11 +21,12 @@ import java.util.List;
 
 import org.dromara.maxkey.entity.permissions.Resources;
 import org.dromara.maxkey.persistence.mapper.ResourcesMapper;
+import org.dromara.maxkey.persistence.service.ResourcesService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class ResourcesServiceImpl  extends JpaServiceImpl<ResourcesMapper,Resources>{
+public class ResourcesServiceImpl  extends JpaServiceImpl<ResourcesMapper,Resources> implements ResourcesService{
 	
 	public List<Resources> queryResourcesTree(Resources resource){
 	   return  getMapper().fetchPageResults(resource);

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/RoleMemberServiceImpl.java

@@ -24,6 +24,7 @@ import org.dromara.maxkey.entity.idm.UserInfo;
 import org.dromara.maxkey.entity.permissions.RoleMember;
 import org.dromara.maxkey.entity.permissions.Roles;
 import org.dromara.maxkey.persistence.mapper.RoleMemberMapper;
+import org.dromara.maxkey.persistence.service.RoleMemberService;
 import org.dromara.mybatis.jpa.entity.JpaPageResults;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.slf4j.Logger;
@@ -31,7 +32,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class RoleMemberServiceImpl  extends JpaServiceImpl<RoleMemberMapper,RoleMember>{
+public class RoleMemberServiceImpl  extends JpaServiceImpl<RoleMemberMapper,RoleMember> implements RoleMemberService{
 	static final  Logger _logger = LoggerFactory.getLogger(RoleMemberServiceImpl.class);
 
 	public int addDynamicRoleMember(Roles dynamicGroup) {
@@ -52,27 +53,18 @@ public class RoleMemberServiceImpl  extends JpaServiceImpl<RoleMemberMapper,Role
 	
 	
 	public JpaPageResults<Roles> rolesNoMember(RoleMember entity) {
-		entity.setPageSelectId(entity.generateId());
-		entity.setStartRow(calculateStartRow(entity.getPageNumber() ,entity.getPageSize()));
-		
-		entity.setPageable(true);
+		beforePageResults(entity);
 		List<Roles> resultslist = null;
 		try {
 			resultslist = getMapper().rolesNoMember(entity);
 		} catch (Exception e) {
 			_logger.error("fetchPageResults Exception " , e);
 		}
-		entity.setPageable(false);
-		Integer totalPage = resultslist.size();
-		
-		Integer totalCount = 0;
-		if(entity.getPageNumber() == 1 && totalPage < entity.getPageSize()) {
-			totalCount = totalPage;
-		}else {
-			totalCount = parseCount(getMapper().fetchCount(entity));
-		}
-		
-		return new JpaPageResults<Roles>(entity.getPageNumber(),entity.getPageSize(),totalPage,totalCount,resultslist);
+		//当前页记录数
+		Integer records = parseRecords(resultslist);
+		//总页数
+		Integer totalCount =fetchCount(entity, resultslist);
+		return new JpaPageResults<Roles>(entity.getPageNumber(),entity.getPageSize(),records,totalCount,resultslist);
 	}
 	
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/RolesServiceImpl.java

@@ -27,6 +27,9 @@ import org.dromara.maxkey.constants.ConstsStatus;
 import org.dromara.maxkey.entity.Institutions;
 import org.dromara.maxkey.entity.permissions.Roles;
 import org.dromara.maxkey.persistence.mapper.RolesMapper;
+import org.dromara.maxkey.persistence.service.InstitutionsService;
+import org.dromara.maxkey.persistence.service.RoleMemberService;
+import org.dromara.maxkey.persistence.service.RolesService;
 import org.dromara.maxkey.util.StrUtils;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.slf4j.Logger;
@@ -35,14 +38,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class RolesServiceImpl  extends JpaServiceImpl<RolesMapper,Roles> {
+public class RolesServiceImpl  extends JpaServiceImpl<RolesMapper,Roles> implements RolesService{
     static final  Logger _logger = LoggerFactory.getLogger(RolesServiceImpl.class);
     
     @Autowired
-    RoleMemberServiceImpl roleMemberService;
+    RoleMemberService roleMemberService;
     
     @Autowired
-    InstitutionsServiceImpl institutionsService;
+    InstitutionsService institutionsService;
 
 	
 	public List<Roles> queryDynamicRoles(Roles groups){

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/SocialsAssociatesServiceImpl.java

@@ -22,12 +22,13 @@ import java.util.List;
 import org.dromara.maxkey.entity.SocialsAssociate;
 import org.dromara.maxkey.entity.idm.UserInfo;
 import org.dromara.maxkey.persistence.mapper.SocialsAssociateMapper;
+import org.dromara.maxkey.persistence.service.SocialsAssociatesService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
 
 @Repository
-public class SocialsAssociatesServiceImpl  extends JpaServiceImpl<SocialsAssociateMapper,SocialsAssociate>{
+public class SocialsAssociatesServiceImpl  extends JpaServiceImpl<SocialsAssociateMapper,SocialsAssociate> implements SocialsAssociatesService{
 
 	public List<SocialsAssociate>  queryByUser(UserInfo user) {
 		return getMapper().queryByUser(user);

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/SocialsProviderServiceImpl.java

@@ -19,13 +19,14 @@ package org.dromara.maxkey.persistence.service.impl;
 
 import org.dromara.maxkey.entity.SocialsProvider;
 import org.dromara.maxkey.persistence.mapper.SocialsProviderMapper;
+import org.dromara.maxkey.persistence.service.SocialsProviderService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class SocialsProviderServiceImpl  extends JpaServiceImpl<SocialsProviderMapper,SocialsProvider>{
+public class SocialsProviderServiceImpl  extends JpaServiceImpl<SocialsProviderMapper,SocialsProvider> implements SocialsProviderService{
     static final  Logger _logger = LoggerFactory.getLogger(SocialsProviderServiceImpl.class);
     
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/SynchroRelatedServiceImpl.java

@@ -25,12 +25,13 @@ import org.dromara.maxkey.entity.SynchroRelated;
 import org.dromara.maxkey.entity.Synchronizers;
 import org.dromara.maxkey.entity.idm.Organizations;
 import org.dromara.maxkey.persistence.mapper.SynchroRelatedMapper;
+import org.dromara.maxkey.persistence.service.SynchroRelatedService;
 import org.dromara.maxkey.util.DateUtils;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class SynchroRelatedServiceImpl  extends JpaServiceImpl<SynchroRelatedMapper,SynchroRelated>{
+public class SynchroRelatedServiceImpl  extends JpaServiceImpl<SynchroRelatedMapper,SynchroRelated> implements SynchroRelatedService{
 
 	public int updateSyncTime(SynchroRelated synchroRelated) {
 		return getMapper().updateSyncTime(synchroRelated);

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/SynchronizersServiceImpl.java

@@ -19,13 +19,14 @@ package org.dromara.maxkey.persistence.service.impl;
 
 import org.dromara.maxkey.entity.Synchronizers;
 import org.dromara.maxkey.persistence.mapper.SynchronizersMapper;
+import org.dromara.maxkey.persistence.service.SynchronizersService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class SynchronizersServiceImpl  extends JpaServiceImpl<SynchronizersMapper,Synchronizers>{
+public class SynchronizersServiceImpl  extends JpaServiceImpl<SynchronizersMapper,Synchronizers> implements SynchronizersService{
     static final  Logger _logger = LoggerFactory.getLogger(SynchronizersServiceImpl.class);
 	
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/UserInfoServiceImpl.java

@@ -30,6 +30,7 @@ import org.dromara.maxkey.entity.idm.UserInfo;
 import org.dromara.maxkey.persistence.mapper.UserInfoMapper;
 import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator;
 import org.dromara.maxkey.persistence.service.AccountsService;
+import org.dromara.maxkey.persistence.service.UserInfoService;
 import org.dromara.maxkey.provision.ProvisionAct;
 import org.dromara.maxkey.provision.ProvisionService;
 import org.dromara.maxkey.provision.ProvisionTopic;
@@ -47,7 +48,7 @@ import org.springframework.stereotype.Repository;
  *
  */
 @Repository
-public class UserInfoServiceImpl extends JpaServiceImpl<UserInfoMapper,UserInfo> {
+public class UserInfoServiceImpl extends JpaServiceImpl<UserInfoMapper,UserInfo> implements UserInfoService{
 	static final  Logger _logger = LoggerFactory.getLogger(UserInfoServiceImpl.class);
 	
 	@Autowired

maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/endpoint/OAuth20AccessConfirmationEndpoint.java

@@ -59,7 +59,6 @@ public class OAuth20AccessConfirmationEndpoint {
 	static final Logger _logger = LoggerFactory.getLogger(OAuth20AccessConfirmationEndpoint.class);
 	 
     @Autowired
-    @Qualifier("appsService")
     protected AppsService appsService;
     
     @Autowired

maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/AbstractEndpoint.java

@@ -78,7 +78,6 @@ public class AbstractEndpoint implements InitializingBean {
 	AuthenticationManager authenticationManager;
 	
 	@Autowired
-    @Qualifier("appsService")
     protected AppsService appsService;
 	
 	@Autowired 

maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java

@@ -64,11 +64,9 @@ public class UserInfoEndpoint {
 	private DefaultTokenServices oauth20tokenServices;
 	
 	@Autowired
-	@Qualifier("userInfoService")
 	private UserInfoService userInfoService;
 	
 	@Autowired
-	@Qualifier("appsService")
 	protected AppsService appsService;
 
     @Autowired

maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java

@@ -85,11 +85,9 @@ public class UserInfoOIDCEndpoint {
 	
 	
 	@Autowired
-	@Qualifier("userInfoService")
 	private UserInfoService userInfoService;
 	
 	@Autowired
-	@Qualifier("appsService")
 	protected AppsService appsService;
 	
 	OAuthDefaultUserInfoAdapter defaultOAuthUserInfoAdapter=new OAuthDefaultUserInfoAdapter();

maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/service/impl/SyncJobConfigFieldServiceImpl.java

@@ -5,13 +5,13 @@ import org.dromara.maxkey.entity.SyncJobConfigField;
 import org.dromara.maxkey.persistence.mapper.SyncJobConfigFieldMapper;
 import org.dromara.maxkey.synchronizer.service.SyncJobConfigFieldService;
 import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
 import java.sql.Types;
 import java.util.ArrayList;
 import java.util.List;
 
-@Service
+@Repository
 public class SyncJobConfigFieldServiceImpl extends JpaServiceImpl<SyncJobConfigFieldMapper,SyncJobConfigField>  implements SyncJobConfigFieldService {
 
     public List<SyncJobConfigField> findByJobIdAndObjectType(Long jobId, String objectType) {

maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java

@@ -25,7 +25,6 @@ import org.dromara.mybatis.jpa.entity.JpaPageResults;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -48,7 +47,6 @@ public class RestUserInfoController {
 	static final Logger _logger = LoggerFactory.getLogger(RestUserInfoController.class);
 	
     @Autowired
-    @Qualifier("userInfoService")
     UserInfoService userInfoService;
     
     @GetMapping(value = "/{id}")

maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserPasswordController.java

@@ -25,7 +25,6 @@ import org.dromara.maxkey.persistence.service.UserInfoService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -40,7 +39,6 @@ public class RestUserPasswordController {
 	static final Logger _logger = LoggerFactory.getLogger(RestUserPasswordController.class);
 	
     @Autowired
-    @Qualifier("userInfoService")
     UserInfoService userInfoService;