mybatis-jpa-extra-3.3.6

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccessService.java

@@ -18,7 +18,7 @@
 package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.Access;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 
 public interface AccessService  extends IJpaService<Access>{

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsService.java

@@ -22,7 +22,7 @@ import java.util.List;
 import org.dromara.maxkey.entity.Accounts;
 import org.dromara.maxkey.entity.AccountsStrategy;
 import org.dromara.maxkey.entity.idm.UserInfo;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface AccountsService  extends IJpaService<Accounts>{
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsStrategyService.java

@@ -21,7 +21,7 @@ import java.util.List;
 
 import org.dromara.maxkey.entity.AccountsStrategy;
 import org.dromara.maxkey.entity.permissions.Roles;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface AccountsStrategyService  extends IJpaService<AccountsStrategy> {
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsAdaptersService.java

@@ -18,7 +18,7 @@
 package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.apps.AppsAdapters;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface AppsAdaptersService  extends IJpaService<AppsAdapters>{
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsCasDetailsService.java

@@ -18,7 +18,7 @@
 package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.apps.AppsCasDetails;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface AppsCasDetailsService  extends IJpaService<AppsCasDetails>{
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsFormBasedDetailsService.java

@@ -18,7 +18,7 @@
 package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.apps.AppsFormBasedDetails;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface AppsFormBasedDetailsService  extends IJpaService<AppsFormBasedDetails>{
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsJwtDetailsService.java

@@ -18,7 +18,7 @@
 package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.apps.AppsJwtDetails;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface AppsJwtDetailsService  extends IJpaService<AppsJwtDetails>{
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsSaml20DetailsService.java

@@ -18,7 +18,7 @@
 package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.apps.AppsSAML20Details;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface AppsSaml20DetailsService  extends IJpaService<AppsSAML20Details>{
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsService.java

@@ -20,7 +20,7 @@ package org.dromara.maxkey.persistence.service;
 import java.util.List;
 import org.dromara.maxkey.entity.apps.Apps;
 import org.dromara.maxkey.entity.apps.UserApps;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface AppsService extends IJpaService<Apps>{
 	

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsTokenBasedDetailsService.java

@@ -18,7 +18,7 @@
 package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.apps.AppsTokenBasedDetails;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface AppsTokenBasedDetailsService  extends IJpaService<AppsTokenBasedDetails>{
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AuthzResourceService.java

@@ -26,7 +26,7 @@ import org.dromara.maxkey.entity.apps.Apps;
 import org.dromara.maxkey.entity.authz.QueryAppResourceDto;
 import org.dromara.maxkey.entity.idm.UserInfo;
 import org.dromara.maxkey.entity.permissions.Resources;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface AuthzResourceService   extends IJpaService<UserInfo>{
 	

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/CnfEmailSendersService.java

@@ -19,7 +19,7 @@ package org.dromara.maxkey.persistence.service;
 
 
 import org.dromara.maxkey.entity.cnf.CnfEmailSenders;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface CnfEmailSendersService  extends IJpaService<CnfEmailSenders>{
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/CnfLdapContextService.java

@@ -18,7 +18,7 @@
 package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.cnf.CnfLdapContext;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 
 public interface CnfLdapContextService  extends IJpaService<CnfLdapContext>{

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/CnfPasswordPolicyService.java

@@ -20,7 +20,7 @@ package org.dromara.maxkey.persistence.service;
 import java.util.List;
 
 import org.dromara.maxkey.entity.cnf.CnfPasswordPolicy;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 import org.passay.Rule;
 
 public interface CnfPasswordPolicyService  extends IJpaService<CnfPasswordPolicy>{

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/CnfSmsProviderService.java

@@ -18,7 +18,7 @@
 package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.cnf.CnfSmsProvider;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 
 public interface CnfSmsProviderService  extends IJpaService<CnfSmsProvider>{ 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ConnectorsService.java

@@ -18,7 +18,7 @@
 package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.Connectors;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface ConnectorsService  extends IJpaService<Connectors>{
  

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/FileUploadService.java

@@ -18,7 +18,7 @@
 package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.FileUpload;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface FileUploadService  extends IJpaService<FileUpload>{
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupMemberService.java

@@ -22,7 +22,7 @@ import java.util.List;
 import org.dromara.maxkey.entity.idm.GroupMember;
 import org.dromara.maxkey.entity.idm.Groups;
 import org.dromara.maxkey.entity.idm.UserInfo;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 import org.dromara.mybatis.jpa.entity.JpaPageResults;
 
 public interface GroupMemberService  extends IJpaService<GroupMember>{

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupsService.java

@@ -20,7 +20,7 @@ package org.dromara.maxkey.persistence.service;
 import java.util.List;
 
 import org.dromara.maxkey.entity.idm.Groups;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface GroupsService  extends IJpaService<Groups>{
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryConnectorService.java

@@ -18,7 +18,7 @@
 package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.history.HistoryConnector;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface HistoryConnectorService  extends IJpaService<HistoryConnector>{
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryLoginAppsService.java

@@ -18,7 +18,7 @@
 package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.history.HistoryLoginApps;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface HistoryLoginAppsService  extends IJpaService<HistoryLoginApps>{
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryLoginService.java

@@ -18,7 +18,7 @@
 package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.history.HistoryLogin;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 import org.dromara.mybatis.jpa.entity.JpaPageResults;
 
 public interface HistoryLoginService  extends IJpaService<HistoryLogin>{

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistorySynchronizerService.java

@@ -18,7 +18,7 @@
 package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.history.HistorySynchronizer;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface HistorySynchronizerService  extends IJpaService<HistorySynchronizer>{
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistorySystemLogsService.java

@@ -19,7 +19,7 @@ package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.history.HistorySystemLogs;
 import org.dromara.maxkey.entity.idm.UserInfo;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface HistorySystemLogsService  extends IJpaService<HistorySystemLogs>{
 	

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/InstitutionsService.java

@@ -18,7 +18,7 @@
 package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.Institutions;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface InstitutionsService  extends IJpaService<Institutions>{
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsCastService.java

@@ -18,7 +18,7 @@
 package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.OrganizationsCast;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface OrganizationsCastService  extends IJpaService<OrganizationsCast>{
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsService.java

@@ -20,7 +20,7 @@ package org.dromara.maxkey.persistence.service;
 import java.util.List;
 
 import org.dromara.maxkey.entity.idm.Organizations;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 
 public interface OrganizationsService  extends IJpaService<Organizations>{

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/PasskeyChallengeService.java

@@ -17,7 +17,7 @@
 package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.passkey.PasskeyChallenge;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 /**
  * PasskeyChallenge Service 接口

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/PermissionRoleService.java

@@ -21,7 +21,7 @@ package org.dromara.maxkey.persistence.service;
 import java.util.List;
 
 import org.dromara.maxkey.entity.permissions.PermissionRole;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface PermissionRoleService  extends IJpaService<PermissionRole>{
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/PermissionService.java

@@ -20,7 +20,7 @@ package org.dromara.maxkey.persistence.service;
 import java.util.List;
 
 import org.dromara.maxkey.entity.permissions.Permission;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface PermissionService  extends IJpaService<Permission>{
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RegisterService.java

@@ -19,7 +19,7 @@ package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.Register;
 import org.dromara.maxkey.entity.idm.UserInfo;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface RegisterService  extends IJpaService<Register>{
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ReportService.java

@@ -20,7 +20,7 @@ package org.dromara.maxkey.persistence.service;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 import org.dromara.mybatis.jpa.entity.JpaEntity;
 
 public interface ReportService  extends IJpaService<JpaEntity>{

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ResourcesService.java

@@ -20,7 +20,7 @@ package org.dromara.maxkey.persistence.service;
 import java.util.List;
 
 import org.dromara.maxkey.entity.permissions.Resources;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface ResourcesService  extends IJpaService<Resources>{
 	

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RoleMemberService.java

@@ -23,7 +23,7 @@ import java.util.List;
 import org.dromara.maxkey.entity.idm.UserInfo;
 import org.dromara.maxkey.entity.permissions.RoleMember;
 import org.dromara.maxkey.entity.permissions.Roles;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 import org.dromara.mybatis.jpa.entity.JpaPageResults;
 
 public interface RoleMemberService  extends IJpaService<RoleMember>{

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RolesService.java

@@ -22,7 +22,7 @@ package org.dromara.maxkey.persistence.service;
 import java.util.List;
 
 import org.dromara.maxkey.entity.permissions.Roles;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface RolesService  extends IJpaService<Roles> {
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SocialsAssociatesService.java

@@ -21,7 +21,7 @@ import java.util.List;
 
 import org.dromara.maxkey.entity.SocialsAssociate;
 import org.dromara.maxkey.entity.idm.UserInfo;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 
 public interface SocialsAssociatesService  extends IJpaService<SocialsAssociate>{

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SocialsProviderService.java

@@ -18,7 +18,7 @@
 package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.SocialsProvider;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface SocialsProviderService  extends IJpaService<SocialsProvider>{
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SynchroRelatedService.java

@@ -21,7 +21,7 @@ import java.util.List;
 
 import org.dromara.maxkey.entity.SynchroRelated;
 import org.dromara.maxkey.entity.Synchronizers;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface SynchroRelatedService  extends IJpaService<SynchroRelated>{
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SynchronizersService.java

@@ -18,7 +18,7 @@
 package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.Synchronizers;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 public interface SynchronizersService  extends IJpaService<Synchronizers>{
 	

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoService.java

@@ -20,7 +20,7 @@ package org.dromara.maxkey.persistence.service;
 
 import org.dromara.maxkey.entity.ChangePassword;
 import org.dromara.maxkey.entity.idm.UserInfo;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 /**
  * @author Crystal.Sea

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserPasskeyService.java

@@ -19,7 +19,7 @@ package org.dromara.maxkey.persistence.service;
 import java.util.List;
 
 import org.dromara.maxkey.entity.passkey.UserPasskey;
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 
 /**
  * UserPasskey Service 接口

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

@@ -52,7 +52,7 @@ public class GroupMemberServiceImpl  extends JpaServiceImpl<GroupMemberMapper,Gr
 	
 	
 	public JpaPageResults<Groups> noMember(GroupMember entity) {
-		beforePageResults(entity);
+		entity.build();
 		List<Groups> resultslist = null;
 		try {
 			resultslist = getMapper().noMember(entity);
@@ -60,7 +60,7 @@ public class GroupMemberServiceImpl  extends JpaServiceImpl<GroupMemberMapper,Gr
 			_logger.error("queryPageResults Exception " , e);
 		}
 		//当前页记录数
-		Integer records = parseRecords(resultslist);
+		Integer records = JpaPageResults.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/RoleMemberServiceImpl.java

@@ -53,7 +53,7 @@ public class RoleMemberServiceImpl  extends JpaServiceImpl<RoleMemberMapper,Role
 	
 	
 	public JpaPageResults<Roles> rolesNoMember(RoleMember entity) {
-		beforePageResults(entity);
+		entity.build();
 		List<Roles> resultslist = null;
 		try {
 			resultslist = getMapper().rolesNoMember(entity);
@@ -61,7 +61,7 @@ public class RoleMemberServiceImpl  extends JpaServiceImpl<RoleMemberMapper,Role
 			_logger.error("fetchPageResults Exception " , e);
 		}
 		//当前页记录数
-		Integer records = parseRecords(resultslist);
+		Integer records = JpaPageResults.parseRecords(resultslist);
 		//总页数
 		Integer totalCount =fetchCount(entity, resultslist);
 		return new JpaPageResults<Roles>(entity.getPageNumber(),entity.getPageSize(),records,totalCount,resultslist);

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

@@ -19,7 +19,7 @@ package org.dromara.maxkey.synchronizer.service;
 
 import org.dromara.maxkey.entity.SyncJobConfigField;
 
-import org.dromara.mybatis.jpa.IJpaService;
+import org.dromara.mybatis.jpa.service.IJpaService;
 import java.util.List;
 
 public interface SyncJobConfigFieldService extends IJpaService<SyncJobConfigField> {