diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AccessServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AccessServiceImpl.java index 7da278ba5..7aefb9338 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AccessServiceImpl.java +++ b/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{ +public class AccessServiceImpl extends JpaServiceImpl implements AccessService{ } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AccountsServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AccountsServiceImpl.java index f6c47e879..8eb1480f9 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AccountsServiceImpl.java +++ b/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{ +public class AccountsServiceImpl extends JpaServiceImpl implements AccountsService{ @Autowired ProvisionService provisionService; diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AccountsStrategyServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AccountsStrategyServiceImpl.java index 48f28987f..e87e3ad3c 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AccountsStrategyServiceImpl.java +++ b/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 { +public class AccountsStrategyServiceImpl extends JpaServiceImpl implements AccountsStrategyService{ static final Logger _logger = LoggerFactory.getLogger(AccountsStrategyServiceImpl.class); - - public List queryDynamicGroups(Roles groups){ return this.getMapper().queryDynamicGroups(groups); } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsAdaptersServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsAdaptersServiceImpl.java index a72cb9836..f6f928440 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsAdaptersServiceImpl.java +++ b/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{ +public class AppsAdaptersServiceImpl extends JpaServiceImpl implements AppsAdaptersService{ } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsCasDetailsServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsCasDetailsServiceImpl.java index 42731a53b..57d2be1ec 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsCasDetailsServiceImpl.java +++ b/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{ +public class AppsCasDetailsServiceImpl extends JpaServiceImpl implements AppsCasDetailsService{ protected static final Cache detailsCache = Caffeine.newBuilder() diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsFormBasedDetailsServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsFormBasedDetailsServiceImpl.java index 9752c8dac..99832bd89 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsFormBasedDetailsServiceImpl.java +++ b/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{ +public class AppsFormBasedDetailsServiceImpl extends JpaServiceImpl implements AppsFormBasedDetailsService{ protected static final Cache detailsCache = Caffeine.newBuilder() diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsJwtDetailsServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsJwtDetailsServiceImpl.java index 37bc513fb..f7498f942 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsJwtDetailsServiceImpl.java +++ b/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{ +public class AppsJwtDetailsServiceImpl extends JpaServiceImpl implements AppsJwtDetailsService{ protected static final Cache detailsCache = Caffeine.newBuilder() diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsSaml20DetailsServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsSaml20DetailsServiceImpl.java index b091e0a31..7ce3e73d2 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsSaml20DetailsServiceImpl.java +++ b/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{ +public class AppsSaml20DetailsServiceImpl extends JpaServiceImpl implements AppsSaml20DetailsService{ protected static final Cache detailsCache = Caffeine.newBuilder() diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsServiceImpl.java index c2a718003..a23390fdc 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsServiceImpl.java +++ b/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{ +public class AppsServiceImpl extends JpaServiceImpl implements AppsService{ //maxkey-mgt public static final String MGT_APP_ID = "622076759805923328"; diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsTokenBasedDetailsServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsTokenBasedDetailsServiceImpl.java index 78a2c058f..926beff1b 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AppsTokenBasedDetailsServiceImpl.java +++ b/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{ +public class AppsTokenBasedDetailsServiceImpl extends JpaServiceImpl implements AppsTokenBasedDetailsService{ protected static final Cache detailsCache = Caffeine.newBuilder() diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/CnfEmailSendersServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/CnfEmailSendersServiceImpl.java index e847cf43c..555d57844 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/CnfEmailSendersServiceImpl.java +++ b/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{ +public class CnfEmailSendersServiceImpl extends JpaServiceImpl implements CnfEmailSendersService{ } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/CnfLdapContextServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/CnfLdapContextServiceImpl.java index 3c5ad1973..2998f78c9 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/CnfLdapContextServiceImpl.java +++ b/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{ +public class CnfLdapContextServiceImpl extends JpaServiceImpl implements CnfLdapContextService{ } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/CnfPasswordPolicyServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/CnfPasswordPolicyServiceImpl.java index a4f3cf0bd..9de9b4f7d 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/CnfPasswordPolicyServiceImpl.java +++ b/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{ +public class CnfPasswordPolicyServiceImpl extends JpaServiceImpl implements CnfPasswordPolicyService{ } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/CnfSmsProviderServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/CnfSmsProviderServiceImpl.java index a050fea70..a56097190 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/CnfSmsProviderServiceImpl.java +++ b/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{ +public class CnfSmsProviderServiceImpl extends JpaServiceImpl implements CnfSmsProviderService{ } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/ConnectorsServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/ConnectorsServiceImpl.java index 2db6069f4..496a37d58 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/ConnectorsServiceImpl.java +++ b/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{ +public class ConnectorsServiceImpl extends JpaServiceImpl implements ConnectorsService{ } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/FileUploadServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/FileUploadServiceImpl.java index d14796110..a92418ae2 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/FileUploadServiceImpl.java +++ b/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{ +public class FileUploadServiceImpl extends JpaServiceImpl implements FileUploadService{ } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/GroupMemberServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/GroupMemberServiceImpl.java index 6d15d7ab1..8cba94800 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/GroupMemberServiceImpl.java +++ b/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{ +public class GroupMemberServiceImpl extends JpaServiceImpl implements GroupMemberService{ static final Logger _logger = LoggerFactory.getLogger(GroupMemberServiceImpl.class); public int addDynamicMember(Groups dynamicGroup) { @@ -51,27 +52,18 @@ public class GroupMemberServiceImpl extends JpaServiceImpl noMember(GroupMember entity) { - entity.setPageSelectId(entity.generateId()); - entity.setStartRow(calculateStartRow(entity.getPageNumber() ,entity.getPageSize())); - - entity.setPageable(true); + beforePageResults(entity); List 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(entity.getPageNumber(),entity.getPageSize(),totalPage,totalCount,resultslist); + //当前页记录数 + Integer records = parseRecords(resultslist); + //总页数 + Integer totalCount =fetchCount(entity, resultslist); + return new JpaPageResults(entity.getPageNumber(),entity.getPageSize(),records,totalCount,resultslist); } } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/GroupsServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/GroupsServiceImpl.java index 738e23bd7..021cafb52 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/GroupsServiceImpl.java +++ b/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{ +public class GroupsServiceImpl extends JpaServiceImpl implements GroupsService{ static final Logger _logger = LoggerFactory.getLogger(GroupsServiceImpl.class); @Autowired - GroupMemberServiceImpl groupMemberService; + GroupMemberService groupMemberService; @Autowired - InstitutionsServiceImpl institutionsService; + InstitutionsService institutionsService; public List queryDynamicGroups(Groups groups){ return this.getMapper().queryDynamic(groups); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistoryConnectorServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistoryConnectorServiceImpl.java index 0e9cbb880..800b50cf3 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistoryConnectorServiceImpl.java +++ b/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{ +public class HistoryConnectorServiceImpl extends JpaServiceImpl implements HistoryConnectorService{ } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistoryLoginAppsServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistoryLoginAppsServiceImpl.java index 2dfc60df7..91c45f4c2 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistoryLoginAppsServiceImpl.java +++ b/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{ +public class HistoryLoginAppsServiceImpl extends JpaServiceImpl implements HistoryLoginAppsService{ @Override public boolean insert(HistoryLoginApps loginAppsHistory){ diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistoryLoginServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistoryLoginServiceImpl.java index 74bd8c294..d455fc7e1 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistoryLoginServiceImpl.java +++ b/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{ +public class HistoryLoginServiceImpl extends JpaServiceImpl implements HistoryLoginService{ public JpaPageResults queryOnlineSession(HistoryLogin historyLogin) { return this.fetchPageResults("queryOnlineSession",historyLogin); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistorySynchronizerServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistorySynchronizerServiceImpl.java index 43ac8f302..c2c2e1414 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistorySynchronizerServiceImpl.java +++ b/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{ +public class HistorySynchronizerServiceImpl extends JpaServiceImpl implements HistorySynchronizerService{ } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistorySystemLogsServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistorySystemLogsServiceImpl.java index eba2d5019..394842568 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/HistorySystemLogsServiceImpl.java +++ b/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{ +public class HistorySystemLogsServiceImpl extends JpaServiceImpl implements HistorySystemLogsService{ static final Logger _logger = LoggerFactory.getLogger(HistorySystemLogsServiceImpl.class); public void insert(String topic,Object entity,String action,String result,UserInfo operator) { diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/InstitutionsServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/InstitutionsServiceImpl.java index 052a84533..4093770d8 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/InstitutionsServiceImpl.java +++ b/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{ +public class InstitutionsServiceImpl extends JpaServiceImpl implements InstitutionsService{ public Institutions findByDomain(String domain) { return getMapper().findByDomain(domain); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/OrganizationsCastServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/OrganizationsCastServiceImpl.java index 36b637d59..155166f95 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/OrganizationsCastServiceImpl.java +++ b/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{ +public class OrganizationsCastServiceImpl extends JpaServiceImpl implements OrganizationsCastService{ static final Logger _logger = LoggerFactory.getLogger(OrganizationsCastServiceImpl.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/OrganizationsServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/OrganizationsServiceImpl.java index e669c7931..975a00f48 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/OrganizationsServiceImpl.java +++ b/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{ +public class OrganizationsServiceImpl extends JpaServiceImpl implements OrganizationsService{ static final Logger _logger = LoggerFactory.getLogger(OrganizationsServiceImpl.class); @Autowired diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/PermissionRoleServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/PermissionRoleServiceImpl.java index c0b40e551..7bd965449 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/PermissionRoleServiceImpl.java +++ b/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{ +public class PermissionRoleServiceImpl extends JpaServiceImpl implements PermissionRoleService{ static final Logger _logger = LoggerFactory.getLogger(PermissionRoleServiceImpl.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/PermissionServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/PermissionServiceImpl.java index 9ed22487b..f99901a29 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/PermissionServiceImpl.java +++ b/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{ +public class PermissionServiceImpl extends JpaServiceImpl implements PermissionService{ static final Logger _logger = LoggerFactory.getLogger(PermissionServiceImpl.class); public boolean insertGroupPrivileges(List rolePermissionsList) { diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/RegisterServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/RegisterServiceImpl.java index e3734a545..d01041c87 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/RegisterServiceImpl.java +++ b/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{ +public class RegisterServiceImpl extends JpaServiceImpl implements RegisterService{ public UserInfo findByEmail(String email){ List listUserInfo=getMapper().findByEmail(email); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/ReportServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/ReportServiceImpl.java index 6e2142ef4..6366b828f 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/ReportServiceImpl.java +++ b/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{ +public class ReportServiceImpl extends JpaServiceImpl implements ReportService{ public Integer analysisDay(HashMap reportParameter) { return getMapper().analysisDay(reportParameter); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/ResourcesServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/ResourcesServiceImpl.java index db7b6679f..3fc77e877 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/ResourcesServiceImpl.java +++ b/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{ +public class ResourcesServiceImpl extends JpaServiceImpl implements ResourcesService{ public List queryResourcesTree(Resources resource){ return getMapper().fetchPageResults(resource); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/RoleMemberServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/RoleMemberServiceImpl.java index 5455350c1..f2b300987 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/RoleMemberServiceImpl.java +++ b/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{ +public class RoleMemberServiceImpl extends JpaServiceImpl implements RoleMemberService{ static final Logger _logger = LoggerFactory.getLogger(RoleMemberServiceImpl.class); public int addDynamicRoleMember(Roles dynamicGroup) { @@ -52,27 +53,18 @@ public class RoleMemberServiceImpl extends JpaServiceImpl rolesNoMember(RoleMember entity) { - entity.setPageSelectId(entity.generateId()); - entity.setStartRow(calculateStartRow(entity.getPageNumber() ,entity.getPageSize())); - - entity.setPageable(true); + beforePageResults(entity); List 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(entity.getPageNumber(),entity.getPageSize(),totalPage,totalCount,resultslist); + //当前页记录数 + Integer records = parseRecords(resultslist); + //总页数 + Integer totalCount =fetchCount(entity, resultslist); + return new JpaPageResults(entity.getPageNumber(),entity.getPageSize(),records,totalCount,resultslist); } } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/RolesServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/RolesServiceImpl.java index cd3edf110..8327314c6 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/RolesServiceImpl.java +++ b/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 { +public class RolesServiceImpl extends JpaServiceImpl implements RolesService{ static final Logger _logger = LoggerFactory.getLogger(RolesServiceImpl.class); @Autowired - RoleMemberServiceImpl roleMemberService; + RoleMemberService roleMemberService; @Autowired - InstitutionsServiceImpl institutionsService; + InstitutionsService institutionsService; public List queryDynamicRoles(Roles groups){ diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/SocialsAssociatesServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/SocialsAssociatesServiceImpl.java index b6daedff2..9fa1248cc 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/SocialsAssociatesServiceImpl.java +++ b/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{ +public class SocialsAssociatesServiceImpl extends JpaServiceImpl implements SocialsAssociatesService{ public List queryByUser(UserInfo user) { return getMapper().queryByUser(user); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/SocialsProviderServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/SocialsProviderServiceImpl.java index 257b9561c..f80108fd8 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/SocialsProviderServiceImpl.java +++ b/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{ +public class SocialsProviderServiceImpl extends JpaServiceImpl implements SocialsProviderService{ static final Logger _logger = LoggerFactory.getLogger(SocialsProviderServiceImpl.class); } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/SynchroRelatedServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/SynchroRelatedServiceImpl.java index a30116665..512db59aa 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/SynchroRelatedServiceImpl.java +++ b/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{ +public class SynchroRelatedServiceImpl extends JpaServiceImpl implements SynchroRelatedService{ public int updateSyncTime(SynchroRelated synchroRelated) { return getMapper().updateSyncTime(synchroRelated); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/SynchronizersServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/SynchronizersServiceImpl.java index 6dc47626c..76becf0ec 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/SynchronizersServiceImpl.java +++ b/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{ +public class SynchronizersServiceImpl extends JpaServiceImpl implements SynchronizersService{ static final Logger _logger = LoggerFactory.getLogger(SynchronizersServiceImpl.class); } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/UserInfoServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/UserInfoServiceImpl.java index 5bfb13045..7764d803f 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/UserInfoServiceImpl.java +++ b/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 { +public class UserInfoServiceImpl extends JpaServiceImpl implements UserInfoService{ static final Logger _logger = LoggerFactory.getLogger(UserInfoServiceImpl.class); @Autowired diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/endpoint/OAuth20AccessConfirmationEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/endpoint/OAuth20AccessConfirmationEndpoint.java index 283f48453..492fe80e8 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/approval/endpoint/OAuth20AccessConfirmationEndpoint.java +++ b/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 diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/AbstractEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/AbstractEndpoint.java index b9ef942be..85111a151 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/AbstractEndpoint.java +++ b/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 diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java index a3434101e..ed6c4b407 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java +++ b/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 diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java index 20cf3aa4f..826c7de9e 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java +++ b/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(); diff --git a/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/service/impl/SyncJobConfigFieldServiceImpl.java b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/service/impl/SyncJobConfigFieldServiceImpl.java index 2fb9b7fa3..a179ba6fc 100644 --- a/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/service/impl/SyncJobConfigFieldServiceImpl.java +++ b/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 implements SyncJobConfigFieldService { public List findByJobIdAndObjectType(Long jobId, String objectType) { diff --git a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java index a5add8fc4..49327f5d2 100644 --- a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java +++ b/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}") diff --git a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserPasswordController.java b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserPasswordController.java index 4b1a463b9..e2dbd5817 100644 --- a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserPasswordController.java +++ b/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;