diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManager.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManager.java index c3c45219..ef42ba76 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManager.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManager.java @@ -1,18 +1,20 @@ package ${basePackage}.module.system.mgr; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.req.ResCreateRequest; import ${basePackage}.module.system.req.ResDeleteRequest; import ${basePackage}.module.system.req.ResFindRequest; import ${basePackage}.module.system.req.ResGetRequest; +import ${basePackage}.module.system.req.ResLoadRequest; import ${basePackage}.module.system.req.ResTreeRequest; import ${basePackage}.module.system.req.ResUpdateRequest; import ${basePackage}.module.system.rsp.ResCreateResponse; import ${basePackage}.module.system.rsp.ResDeleteResponse; import ${basePackage}.module.system.rsp.ResFindResponse; import ${basePackage}.module.system.rsp.ResGetResponse; +import ${basePackage}.module.system.rsp.ResLoadResponse; import ${basePackage}.module.system.rsp.ResTreeResponse; import ${basePackage}.module.system.rsp.ResUpdateResponse; -import ${basePackage}.frame.auth.Token; /** * 资源 @@ -59,6 +61,15 @@ public interface ResManager { */ ResFindResponse find(ResFindRequest request, Token token); + /** + * 加载 + * + * @param request 请求对象 + * @param token 令牌 + * @return + */ + ResLoadResponse load(ResLoadRequest request, Token token); + /** * 获得对象 * diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManagerImpl.java index 92697cb1..9d2dd0f8 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManagerImpl.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManagerImpl.java @@ -1,11 +1,17 @@ package ${basePackage}.module.system.mgr; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.github.pagehelper.util.StringUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import ${basePackage}.frame.auth.Token; +import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.base.SortType; import ${basePackage}.frame.utils.IDgenerator; -import ${basePackage}.frame.utils.Message; -import ${basePackage}.frame.base.ErrorType; -import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.utils.MapperUtil; +import ${basePackage}.frame.utils.Message; import ${basePackage}.frame.utils.ValidationUtil; import ${basePackage}.module.system.ent.Res; import ${basePackage}.module.system.ent.ResTree; @@ -14,20 +20,16 @@ import ${basePackage}.module.system.req.ResCreateRequest; import ${basePackage}.module.system.req.ResDeleteRequest; import ${basePackage}.module.system.req.ResFindRequest; import ${basePackage}.module.system.req.ResGetRequest; +import ${basePackage}.module.system.req.ResLoadRequest; import ${basePackage}.module.system.req.ResTreeRequest; import ${basePackage}.module.system.req.ResUpdateRequest; import ${basePackage}.module.system.rsp.ResCreateResponse; import ${basePackage}.module.system.rsp.ResDeleteResponse; import ${basePackage}.module.system.rsp.ResFindResponse; import ${basePackage}.module.system.rsp.ResGetResponse; +import ${basePackage}.module.system.rsp.ResLoadResponse; import ${basePackage}.module.system.rsp.ResTreeResponse; import ${basePackage}.module.system.rsp.ResUpdateResponse; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.github.pagehelper.util.StringUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.HashMap; @@ -169,6 +171,29 @@ public class ResManagerImpl implements ResManager { return response; } + @Override + public ResLoadResponse load(ResLoadRequest request, Token token) { + ResLoadResponse response = new ResLoadResponse(); + + ValidationUtil.validate(request, response); + if (response.hasError()) { + return response; + } + + if (request.getPageSize() != 0) { + PageHelper.startPage(request.getPageNumber(), request.getPageSize()); + } + if (StringUtil.isNotEmpty(request.getSortKey())) { + PageHelper.orderBy(request.getSortKey() + " " + request.getSortType()); + } + PageInfo pageInfo = new PageInfo<>(resMapper.load(request, token)); + + response.setResult(pageInfo.getList()); + response.setTotalCount(pageInfo.getTotal()); + + return response; + } + /** * 获得对象 * diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/TokensManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/TokensManagerImpl.java index 1c833112..529f2daa 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/TokensManagerImpl.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/TokensManagerImpl.java @@ -10,8 +10,8 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import ${basePackage}.config.CacheConfig; -import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.auth.Token; +import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.base.SortType; import ${basePackage}.frame.utils.IDgenerator; import ${basePackage}.frame.utils.MapperUtil; @@ -20,6 +20,7 @@ import ${basePackage}.frame.utils.ValidationUtil; import ${basePackage}.module.system.ent.Tokens; import ${basePackage}.module.system.mpr.TokensMapper; import ${basePackage}.module.system.req.ResFindRequest; +import ${basePackage}.module.system.req.ResLoadRequest; import ${basePackage}.module.system.req.TokensBuildRequest; import ${basePackage}.module.system.req.TokensCreateRequest; import ${basePackage}.module.system.req.TokensDeleteRequest; @@ -28,6 +29,7 @@ import ${basePackage}.module.system.req.TokensGetRequest; import ${basePackage}.module.system.req.TokensLogoutRequest; import ${basePackage}.module.system.req.TokensUpdateRequest; import ${basePackage}.module.system.rsp.ResFindResponse; +import ${basePackage}.module.system.rsp.ResLoadResponse; import ${basePackage}.module.system.rsp.TokensBuildResponse; import ${basePackage}.module.system.rsp.TokensCreateResponse; import ${basePackage}.module.system.rsp.TokensDeleteResponse; @@ -277,10 +279,10 @@ public class TokensManagerImpl implements ${basePackage}.module.system.mgr.Token newToken.setUserName(tokens.getUserName()); // 获取用户的资源 - ResFindRequest resFindRequest = new ResFindRequest(); - resFindRequest.setPageSize(0); - resFindRequest.setUserId(tokens.getUserId()); - ResFindResponse resFindResponse = resManager.find(resFindRequest, token); + ResLoadRequest resLoadRequest = new ResLoadRequest(); + resLoadRequest.setPageSize(0); + resLoadRequest.setUserId(tokens.getUserId()); + ResLoadResponse resFindResponse = resManager.load(resLoadRequest, token); if (resFindResponse.hasError()) { response.addErrors(resFindResponse.getErrors()); return response; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_ResMapper.xml b/src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_ResMapper.xml index bdc1a52c..6595ce21 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_ResMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_ResMapper.xml @@ -82,6 +82,66 @@ + + + + + +