diff --git a/eladmin/eladmin-common/src/main/java/me/zhengjie/utils/PageResult.java b/eladmin/eladmin-common/src/main/java/me/zhengjie/utils/PageResult.java new file mode 100644 index 0000000..0f1fdfe --- /dev/null +++ b/eladmin/eladmin-common/src/main/java/me/zhengjie/utils/PageResult.java @@ -0,0 +1,16 @@ +package me.zhengjie.utils; + +import lombok.AccessLevel; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +import java.util.List; + +@Getter +@RequiredArgsConstructor(access = AccessLevel.PACKAGE) +public class PageResult { + + private final List content; + + private final long totalElements; +} diff --git a/eladmin/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java b/eladmin/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java index afda52a..72c759d 100644 --- a/eladmin/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java +++ b/eladmin/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java @@ -23,17 +23,16 @@ import java.util.*; * @author Zheng Jie * @date 2018-12-10 */ -@SuppressWarnings({"unchecked","all"}) public class PageUtil extends cn.hutool.core.util.PageUtil { /** * List 分页 */ - public static List toPage(int page, int size , List list) { + public static List paging(int page, int size , List list) { int fromIndex = page * size; int toIndex = page * size + size; if(fromIndex > list.size()){ - return new ArrayList(); + return Collections.emptyList(); } else if(toIndex >= list.size()) { return list.subList(fromIndex,list.size()); } else { @@ -44,40 +43,28 @@ public class PageUtil extends cn.hutool.core.util.PageUtil { /** * Page 数据处理 */ - public static Map toPage(IPage page) { - Map map = new LinkedHashMap<>(2); - map.put("content",page.getRecords()); - map.put("totalElements",page.getTotal()); - return map; + public static PageResult toPage(IPage page) { + return new PageResult<>(page.getRecords(), page.getTotal()); } /** * 自定义分页 */ - public static Map toPage(List list) { - Map map = new LinkedHashMap<>(2); - map.put("content",list); - map.put("totalElements",list.size()); - return map; + public static PageResult toPage(List list) { + return new PageResult<>(list, list.size()); } /** * 返回空数据 */ - public static Map noData () { - Map map = new LinkedHashMap<>(2); - map.put("content",null); - map.put("totalElements",0); - return map; + public static PageResult noData () { + return new PageResult<>(null, 0); } /** * 自定义分页 */ - public static Map toPage(Object object, Object totalElements) { - Map map = new LinkedHashMap<>(2); - map.put("content",object); - map.put("totalElements",totalElements); - return map; + public static PageResult toPage(List list, long totalElements) { + return new PageResult<>(list, totalElements); } } diff --git a/eladmin/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java b/eladmin/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java index 1c09999..b0e2a56 100644 --- a/eladmin/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java +++ b/eladmin/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java @@ -39,13 +39,13 @@ public class GenConfigController { @ApiOperation("查询") @GetMapping(value = "/{tableName}") - public ResponseEntity queryGenConfig(@PathVariable String tableName){ + public ResponseEntity queryGenConfig(@PathVariable String tableName){ return new ResponseEntity<>(genConfigService.find(tableName), HttpStatus.OK); } @PutMapping @ApiOperation("修改") - public ResponseEntity updateGenConfig(@Validated @RequestBody GenConfig genConfig){ + public ResponseEntity updateGenConfig(@Validated @RequestBody GenConfig genConfig){ return new ResponseEntity<>(genConfigService.update(genConfig.getTableName(), genConfig),HttpStatus.OK); } } diff --git a/eladmin/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java b/eladmin/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java index d0e72a5..89e0c11 100644 --- a/eladmin/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java +++ b/eladmin/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java @@ -20,9 +20,11 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import me.zhengjie.domain.ColumnInfo; +import me.zhengjie.domain.vo.TableInfo; import me.zhengjie.exception.BadRequestException; import me.zhengjie.service.GenConfigService; import me.zhengjie.service.GeneratorService; +import me.zhengjie.utils.PageResult; import me.zhengjie.utils.PageUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; @@ -50,13 +52,13 @@ public class GeneratorController { @ApiOperation("查询数据库数据") @GetMapping(value = "/tables") - public ResponseEntity queryTables(@RequestParam(defaultValue = "") String name, Page page){ + public ResponseEntity> queryTables(@RequestParam(defaultValue = "") String name, Page page){ return new ResponseEntity<>(generatorService.getTables(name, page), HttpStatus.OK); } @ApiOperation("查询字段数据") @GetMapping(value = "/columns") - public ResponseEntity queryColumns(@RequestParam String tableName){ + public ResponseEntity> queryColumns(@RequestParam String tableName){ List columnInfos = generatorService.getColumns(tableName); return new ResponseEntity<>(PageUtil.toPage(columnInfos), HttpStatus.OK); } diff --git a/eladmin/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java b/eladmin/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java index 2c4c618..d53fa07 100644 --- a/eladmin/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java +++ b/eladmin/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java @@ -19,11 +19,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.domain.GenConfig; import me.zhengjie.domain.ColumnInfo; +import me.zhengjie.domain.vo.TableInfo; +import me.zhengjie.utils.PageResult; import org.springframework.http.ResponseEntity; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.List; -import java.util.Map; /** * @author Zheng Jie @@ -38,7 +39,7 @@ public interface GeneratorService extends IService { * @param page 分页参数 * @return / */ - Map getTables(String name, Page page); + PageResult getTables(String name, Page page); /** * 得到数据表的元数据 diff --git a/eladmin/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java b/eladmin/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java index fef3cd6..45bb8c0 100644 --- a/eladmin/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java +++ b/eladmin/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java @@ -23,13 +23,11 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.zhengjie.domain.GenConfig; import me.zhengjie.domain.ColumnInfo; +import me.zhengjie.domain.vo.TableInfo; import me.zhengjie.exception.BadRequestException; import me.zhengjie.mapper.ColumnInfoMapper; import me.zhengjie.service.GeneratorService; -import me.zhengjie.utils.FileUtil; -import me.zhengjie.utils.GenUtil; -import me.zhengjie.utils.PageUtil; -import me.zhengjie.utils.StringUtils; +import me.zhengjie.utils.*; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; @@ -55,7 +53,7 @@ public class GeneratorServiceImpl extends ServiceImpl getTables(String name, Page page) { + public PageResult getTables(String name, Page page) { return PageUtil.toPage(columnInfoMapper.getTables(name, page)); } diff --git a/eladmin/eladmin-generator/src/main/resources/template/admin/Controller.ftl b/eladmin/eladmin-generator/src/main/resources/template/admin/Controller.ftl index f14dd2d..179ea9d 100644 --- a/eladmin/eladmin-generator/src/main/resources/template/admin/Controller.ftl +++ b/eladmin/eladmin-generator/src/main/resources/template/admin/Controller.ftl @@ -30,6 +30,7 @@ import io.swagger.annotations.*; import java.io.IOException; import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import me.zhengjie.utils.PageResult; /** * @author ${author} @@ -55,7 +56,7 @@ public class ${className}Controller { @Log("查询${apiAlias}") @ApiOperation("查询${apiAlias}") @PreAuthorize("@el.check('${changeClassName}:list')") - public ResponseEntity query${className}(${className}QueryCriteria criteria, Page page){ + public ResponseEntity> query${className}(${className}QueryCriteria criteria, Page page){ return new ResponseEntity<>(${changeClassName}Service.queryAll(criteria,page),HttpStatus.OK); } diff --git a/eladmin/eladmin-generator/src/main/resources/template/admin/Service.ftl b/eladmin/eladmin-generator/src/main/resources/template/admin/Service.ftl index c63402f..aeab0af 100644 --- a/eladmin/eladmin-generator/src/main/resources/template/admin/Service.ftl +++ b/eladmin/eladmin-generator/src/main/resources/template/admin/Service.ftl @@ -23,6 +23,7 @@ import java.io.IOException; import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import me.zhengjie.utils.PageResult; /** * @description 服务接口 @@ -35,9 +36,9 @@ public interface ${className}Service extends IService<${className}> { * 查询数据分页 * @param criteria 条件 * @param page 分页参数 - * @return Map + * @return PageResult */ - Map queryAll(${className}QueryCriteria criteria, Page page); + PageResult<${className}> queryAll(${className}QueryCriteria criteria, Page page); /** * 查询所有数据不分页 diff --git a/eladmin/eladmin-generator/src/main/resources/template/admin/ServiceImpl.ftl b/eladmin/eladmin-generator/src/main/resources/template/admin/ServiceImpl.ftl index e4c8c28..3da87d4 100644 --- a/eladmin/eladmin-generator/src/main/resources/template/admin/ServiceImpl.ftl +++ b/eladmin/eladmin-generator/src/main/resources/template/admin/ServiceImpl.ftl @@ -41,6 +41,7 @@ import java.io.IOException; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.LinkedHashMap; +import me.zhengjie.utils.PageResult; /** * @description 服务实现 @@ -54,7 +55,7 @@ public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${c private final ${className}Mapper ${changeClassName}Mapper; @Override - public Map queryAll(${className}QueryCriteria criteria, Page page){ + public PageResult<${className}> queryAll(${className}QueryCriteria criteria, Page page){ return PageUtil.toPage(${changeClassName}Mapper.findAll(criteria, page)); } diff --git a/eladmin/eladmin-logging/src/main/java/me/zhengjie/rest/SysLogController.java b/eladmin/eladmin-logging/src/main/java/me/zhengjie/rest/SysLogController.java index 92edc8d..f23376b 100644 --- a/eladmin/eladmin-logging/src/main/java/me/zhengjie/rest/SysLogController.java +++ b/eladmin/eladmin-logging/src/main/java/me/zhengjie/rest/SysLogController.java @@ -23,6 +23,7 @@ import me.zhengjie.annotation.Log; import me.zhengjie.domain.SysLog; import me.zhengjie.service.SysLogService; import me.zhengjie.domain.vo.SysLogQueryCriteria; +import me.zhengjie.utils.PageResult; import me.zhengjie.utils.SecurityUtils; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -63,14 +64,14 @@ public class SysLogController { @GetMapping @ApiOperation("日志查询") @PreAuthorize("@el.check()") - public ResponseEntity queryLog(SysLogQueryCriteria criteria, Page page){ + public ResponseEntity> queryLog(SysLogQueryCriteria criteria, Page page){ criteria.setLogType("INFO"); return new ResponseEntity<>(sysLogService.queryAll(criteria,page), HttpStatus.OK); } @GetMapping(value = "/user") @ApiOperation("用户日志查询") - public ResponseEntity queryUserLog(SysLogQueryCriteria criteria, Page page){ + public ResponseEntity> queryUserLog(SysLogQueryCriteria criteria, Page page){ criteria.setLogType("INFO"); criteria.setUsername(SecurityUtils.getCurrentUsername()); return new ResponseEntity<>(sysLogService.queryAllByUser(criteria,page), HttpStatus.OK); @@ -79,7 +80,7 @@ public class SysLogController { @GetMapping(value = "/error") @ApiOperation("错误日志查询") @PreAuthorize("@el.check()") - public ResponseEntity queryErrorLog(SysLogQueryCriteria criteria, Page page){ + public ResponseEntity> queryErrorLog(SysLogQueryCriteria criteria, Page page){ criteria.setLogType("ERROR"); return new ResponseEntity<>(sysLogService.queryAll(criteria,page), HttpStatus.OK); } diff --git a/eladmin/eladmin-logging/src/main/java/me/zhengjie/service/SysLogService.java b/eladmin/eladmin-logging/src/main/java/me/zhengjie/service/SysLogService.java index 3f6ba94..af39b29 100644 --- a/eladmin/eladmin-logging/src/main/java/me/zhengjie/service/SysLogService.java +++ b/eladmin/eladmin-logging/src/main/java/me/zhengjie/service/SysLogService.java @@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.domain.SysLog; import me.zhengjie.domain.vo.SysLogQueryCriteria; +import me.zhengjie.utils.PageResult; import org.aspectj.lang.ProceedingJoinPoint; import org.springframework.scheduling.annotation.Async; import javax.servlet.http.HttpServletResponse; @@ -34,11 +35,12 @@ public interface SysLogService extends IService{ /** * 分页查询 + * * @param criteria 查询条件 - * @param page 分页参数 + * @param page 分页参数 * @return / */ - Map queryAll(SysLogQueryCriteria criteria, Page page); + PageResult queryAll(SysLogQueryCriteria criteria, Page page); /** * 查询全部数据 @@ -53,7 +55,7 @@ public interface SysLogService extends IService{ * @param page 分页参数 * @return - */ - Map queryAllByUser(SysLogQueryCriteria criteria, Page page); + PageResult queryAllByUser(SysLogQueryCriteria criteria, Page page); /** * 保存日志数据 diff --git a/eladmin/eladmin-logging/src/main/java/me/zhengjie/service/impl/SysLogServiceImpl.java b/eladmin/eladmin-logging/src/main/java/me/zhengjie/service/impl/SysLogServiceImpl.java index 5fabe4f..6dc28ba 100644 --- a/eladmin/eladmin-logging/src/main/java/me/zhengjie/service/impl/SysLogServiceImpl.java +++ b/eladmin/eladmin-logging/src/main/java/me/zhengjie/service/impl/SysLogServiceImpl.java @@ -48,7 +48,7 @@ public class SysLogServiceImpl extends ServiceImpl impleme private final SysLogMapper sysLogMapper; @Override - public Map queryAll(SysLogQueryCriteria criteria, Page page) { + public PageResult queryAll(SysLogQueryCriteria criteria, Page page) { return PageUtil.toPage(sysLogMapper.queryAll(criteria, page)); } @@ -58,7 +58,7 @@ public class SysLogServiceImpl extends ServiceImpl impleme } @Override - public Map queryAllByUser(SysLogQueryCriteria criteria, Page page) { + public PageResult queryAllByUser(SysLogQueryCriteria criteria, Page page) { return PageUtil.toPage(sysLogMapper.queryAllByUser(criteria, page)); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/AppController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/AppController.java index b088767..fe906c7 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/AppController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/AppController.java @@ -23,6 +23,7 @@ import me.zhengjie.annotation.Log; import me.zhengjie.modules.mnt.domain.App; import me.zhengjie.modules.mnt.service.AppService; import me.zhengjie.modules.mnt.domain.vo.AppQueryCriteria; +import me.zhengjie.utils.PageResult; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -54,7 +55,7 @@ public class AppController { @ApiOperation(value = "查询应用") @GetMapping @PreAuthorize("@el.check('app:list')") - public ResponseEntity queryApp(AppQueryCriteria criteria, Page page){ + public ResponseEntity> queryApp(AppQueryCriteria criteria, Page page){ return new ResponseEntity<>(appService.queryAll(criteria, page),HttpStatus.OK); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DatabaseController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DatabaseController.java index 369ffc2..f70bcfc 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DatabaseController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DatabaseController.java @@ -26,6 +26,7 @@ import me.zhengjie.modules.mnt.service.DatabaseService; import me.zhengjie.modules.mnt.domain.vo.DatabaseQueryCriteria; import me.zhengjie.modules.mnt.util.SqlUtils; import me.zhengjie.utils.FileUtil; +import me.zhengjie.utils.PageResult; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -61,7 +62,7 @@ public class DatabaseController { @ApiOperation(value = "查询数据库") @GetMapping @PreAuthorize("@el.check('database:list')") - public ResponseEntity queryDatabase(DatabaseQueryCriteria criteria, Page page){ + public ResponseEntity> queryDatabase(DatabaseQueryCriteria criteria, Page page){ return new ResponseEntity<>(databaseService.queryAll(criteria, page),HttpStatus.OK); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployController.java index 2946b31..3a1336f 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployController.java @@ -25,6 +25,7 @@ import me.zhengjie.modules.mnt.domain.DeployHistory; import me.zhengjie.modules.mnt.service.DeployService; import me.zhengjie.modules.mnt.domain.vo.DeployQueryCriteria; import me.zhengjie.utils.FileUtil; +import me.zhengjie.utils.PageResult; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -63,7 +64,7 @@ public class DeployController { @ApiOperation(value = "查询部署") @GetMapping @PreAuthorize("@el.check('deploy:list')") - public ResponseEntity queryDeployData(DeployQueryCriteria criteria, Page page){ + public ResponseEntity> queryDeployData(DeployQueryCriteria criteria, Page page){ return new ResponseEntity<>(deployService.queryAll(criteria, page),HttpStatus.OK); } @@ -122,7 +123,7 @@ public class DeployController { @ApiOperation(value = "系统还原") @PostMapping(value = "/serverReduction") @PreAuthorize("@el.check('deploy:edit')") - public ResponseEntity serverReduction(@Validated @RequestBody DeployHistory resources){ + public ResponseEntity serverReduction(@Validated @RequestBody DeployHistory resources){ String result = deployService.serverReduction(resources); return new ResponseEntity<>(result,HttpStatus.OK); } @@ -131,7 +132,7 @@ public class DeployController { @ApiOperation(value = "服务运行状态") @PostMapping(value = "/serverStatus") @PreAuthorize("@el.check('deploy:edit')") - public ResponseEntity serverStatus(@Validated @RequestBody Deploy resources){ + public ResponseEntity serverStatus(@Validated @RequestBody Deploy resources){ String result = deployService.serverStatus(resources); return new ResponseEntity<>(result,HttpStatus.OK); } @@ -140,7 +141,7 @@ public class DeployController { @ApiOperation(value = "启动服务") @PostMapping(value = "/startServer") @PreAuthorize("@el.check('deploy:edit')") - public ResponseEntity startServer(@Validated @RequestBody Deploy resources){ + public ResponseEntity startServer(@Validated @RequestBody Deploy resources){ String result = deployService.startServer(resources); return new ResponseEntity<>(result,HttpStatus.OK); } @@ -149,7 +150,7 @@ public class DeployController { @ApiOperation(value = "停止服务") @PostMapping(value = "/stopServer") @PreAuthorize("@el.check('deploy:edit')") - public ResponseEntity stopServer(@Validated @RequestBody Deploy resources){ + public ResponseEntity stopServer(@Validated @RequestBody Deploy resources){ String result = deployService.stopServer(resources); return new ResponseEntity<>(result,HttpStatus.OK); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployHistoryController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployHistoryController.java index 09e5314..d8a36c7 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployHistoryController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployHistoryController.java @@ -20,8 +20,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import me.zhengjie.annotation.Log; +import me.zhengjie.modules.mnt.domain.DeployHistory; import me.zhengjie.modules.mnt.service.DeployHistoryService; import me.zhengjie.modules.mnt.domain.vo.DeployHistoryQueryCriteria; +import me.zhengjie.utils.PageResult; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -52,7 +54,7 @@ public class DeployHistoryController { @ApiOperation(value = "查询部署历史") @GetMapping @PreAuthorize("@el.check('deployHistory:list')") - public ResponseEntity queryDeployHistory(DeployHistoryQueryCriteria criteria, Page page){ + public ResponseEntity> queryDeployHistory(DeployHistoryQueryCriteria criteria, Page page){ return new ResponseEntity<>(deployhistoryService.queryAll(criteria, page),HttpStatus.OK); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/ServerController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/ServerController.java index 78a40f5..17b68dc 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/ServerController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/ServerController.java @@ -23,6 +23,7 @@ import me.zhengjie.annotation.Log; import me.zhengjie.modules.mnt.domain.Server; import me.zhengjie.modules.mnt.service.ServerService; import me.zhengjie.modules.mnt.domain.vo.ServerQueryCriteria; +import me.zhengjie.utils.PageResult; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -54,7 +55,7 @@ public class ServerController { @ApiOperation(value = "查询服务器") @GetMapping @PreAuthorize("@el.check('serverDeploy:list')") - public ResponseEntity queryServerDeploy(ServerQueryCriteria criteria, Page page){ + public ResponseEntity> queryServerDeploy(ServerQueryCriteria criteria, Page page){ return new ResponseEntity<>(serverService.queryAll(criteria, page),HttpStatus.OK); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java index 856bcb8..a6b2090 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java @@ -19,6 +19,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.mnt.domain.App; import me.zhengjie.modules.mnt.domain.vo.AppQueryCriteria; +import me.zhengjie.utils.PageResult; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; @@ -37,7 +39,7 @@ public interface AppService extends IService { * @param page 分页参数 * @return / */ - Map queryAll(AppQueryCriteria criteria, Page page); + PageResult queryAll(AppQueryCriteria criteria, Page page); /** * 查询全部数据 diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java index 79282fd..a042605 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java @@ -19,10 +19,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.mnt.domain.Database; import me.zhengjie.modules.mnt.domain.vo.DatabaseQueryCriteria; +import me.zhengjie.utils.PageResult; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; -import java.util.Map; import java.util.Set; /** @@ -33,11 +34,12 @@ public interface DatabaseService extends IService { /** * 分页查询 + * * @param criteria 条件 - * @param page 分页参数 + * @param page 分页参数 * @return / */ - Map queryAll(DatabaseQueryCriteria criteria, Page page); + PageResult queryAll(DatabaseQueryCriteria criteria, Page page); /** * 查询全部 diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java index 670d9a1..28a3653 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java @@ -19,10 +19,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.mnt.domain.DeployHistory; import me.zhengjie.modules.mnt.domain.vo.DeployHistoryQueryCriteria; +import me.zhengjie.utils.PageResult; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; -import java.util.Map; import java.util.Set; /** @@ -32,11 +33,12 @@ public interface DeployHistoryService extends IService { /** * 分页查询 + * * @param criteria 条件 - * @param page 分页参数 + * @param page 分页参数 * @return / */ - Map queryAll(DeployHistoryQueryCriteria criteria, Page page); + PageResult queryAll(DeployHistoryQueryCriteria criteria, Page page); /** * 查询全部 diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java index c5edfc7..8d30bd5 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java @@ -20,10 +20,11 @@ import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.mnt.domain.Deploy; import me.zhengjie.modules.mnt.domain.DeployHistory; import me.zhengjie.modules.mnt.domain.vo.DeployQueryCriteria; +import me.zhengjie.utils.PageResult; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; -import java.util.Map; import java.util.Set; /** @@ -34,11 +35,12 @@ public interface DeployService extends IService { /** * 分页查询 + * * @param criteria 条件 - * @param page 分页参数 + * @param page 分页参数 * @return / */ - Map queryAll(DeployQueryCriteria criteria, Page page); + PageResult queryAll(DeployQueryCriteria criteria, Page page); /** * 查询全部数据 diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerService.java index 6c4babd..407a047 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerService.java @@ -19,10 +19,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.mnt.domain.Server; import me.zhengjie.modules.mnt.domain.vo.ServerQueryCriteria; +import me.zhengjie.utils.PageResult; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; -import java.util.Map; import java.util.Set; /** @@ -33,11 +34,12 @@ public interface ServerService extends IService { /** * 分页查询 + * * @param criteria 条件 - * @param page 分页参数 + * @param page 分页参数 * @return / */ - Map queryAll(ServerQueryCriteria criteria, Page page); + PageResult queryAll(ServerQueryCriteria criteria, Page page); /** * 查询全部数据 diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java index 15147ad..a86d628 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java @@ -26,6 +26,7 @@ import me.zhengjie.modules.mnt.mapper.DeployServerMapper; import me.zhengjie.modules.mnt.service.AppService; import me.zhengjie.modules.mnt.domain.vo.AppQueryCriteria; import me.zhengjie.utils.FileUtil; +import me.zhengjie.utils.PageResult; import me.zhengjie.utils.PageUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -46,7 +47,7 @@ public class AppServiceImpl extends ServiceImpl implements AppSe private final DeployServerMapper deployServerMapper; @Override - public Map queryAll(AppQueryCriteria criteria, Page page){ + public PageResult queryAll(AppQueryCriteria criteria, Page page){ return PageUtil.toPage(appMapper.queryAll(criteria, page)); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java index 5a34911..ace15a7 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java @@ -26,6 +26,7 @@ import me.zhengjie.modules.mnt.service.DatabaseService; import me.zhengjie.modules.mnt.domain.vo.DatabaseQueryCriteria; import me.zhengjie.modules.mnt.util.SqlUtils; import me.zhengjie.utils.FileUtil; +import me.zhengjie.utils.PageResult; import me.zhengjie.utils.PageUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -45,7 +46,7 @@ public class DatabaseServiceImpl extends ServiceImpl i private final DatabaseMapper databaseMapper; @Override - public Map queryAll(DatabaseQueryCriteria criteria, Page page){ + public PageResult queryAll(DatabaseQueryCriteria criteria, Page page){ return PageUtil.toPage(databaseMapper.findAll(criteria, page)); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java index 5905fb9..583d973 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java @@ -25,6 +25,7 @@ import me.zhengjie.modules.mnt.service.DeployHistoryService; import me.zhengjie.modules.mnt.domain.vo.DeployHistoryQueryCriteria; import me.zhengjie.utils.DateUtil; import me.zhengjie.utils.FileUtil; +import me.zhengjie.utils.PageResult; import me.zhengjie.utils.PageUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -43,7 +44,7 @@ public class DeployHistoryServiceImpl extends ServiceImpl queryAll(DeployHistoryQueryCriteria criteria, Page page){ + public PageResult queryAll(DeployHistoryQueryCriteria criteria, Page page){ return PageUtil.toPage(deployhistoryMapper.findAll(criteria, page)); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java index f21caf5..205a0e8 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java @@ -63,9 +63,8 @@ public class DeployServiceImpl extends ServiceImpl impleme */ private final Integer count = 30; - @Override - public Map queryAll(DeployQueryCriteria criteria, Page page) { + public PageResult queryAll(DeployQueryCriteria criteria, Page page) { criteria.setOffset(page.offset()); List deploys = deployMapper.findAll(criteria); Long total = deployMapper.countAll(criteria); diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerServiceImpl.java index 1b750cc..73aa983 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerServiceImpl.java @@ -25,6 +25,7 @@ import me.zhengjie.modules.mnt.service.ServerService; import me.zhengjie.modules.mnt.domain.vo.ServerQueryCriteria; import me.zhengjie.modules.mnt.util.ExecuteShellUtil; import me.zhengjie.utils.FileUtil; +import me.zhengjie.utils.PageResult; import me.zhengjie.utils.PageUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -44,7 +45,7 @@ public class ServerServiceImpl extends ServiceImpl impleme private final DeployServerMapper deployServerMapper; @Override - public Map queryAll(ServerQueryCriteria criteria, Page page){ + public PageResult queryAll(ServerQueryCriteria criteria, Page page){ return PageUtil.toPage(serverMapper.findAll(criteria, page)); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java index a1617c3..50a209a 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java @@ -23,8 +23,10 @@ import lombok.extern.slf4j.Slf4j; import me.zhengjie.annotation.Log; import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.quartz.domain.QuartzJob; +import me.zhengjie.modules.quartz.domain.QuartzLog; import me.zhengjie.modules.quartz.service.QuartzJobService; import me.zhengjie.modules.quartz.domain.vo.QuartzJobQueryCriteria; +import me.zhengjie.utils.PageResult; import me.zhengjie.utils.SpringContextHolder; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -52,7 +54,7 @@ public class QuartzJobController { @ApiOperation("查询定时任务") @GetMapping @PreAuthorize("@el.check('timing:list')") - public ResponseEntity queryQuartzJob(QuartzJobQueryCriteria criteria, Page page){ + public ResponseEntity> queryQuartzJob(QuartzJobQueryCriteria criteria, Page page){ return new ResponseEntity<>(quartzJobService.queryAll(criteria,page), HttpStatus.OK); } @@ -73,7 +75,7 @@ public class QuartzJobController { @ApiOperation("查询任务执行日志") @GetMapping(value = "/logs") @PreAuthorize("@el.check('timing:list')") - public ResponseEntity queryQuartzJobLog(QuartzJobQueryCriteria criteria, Page page){ + public ResponseEntity> queryQuartzJobLog(QuartzJobQueryCriteria criteria, Page page){ return new ResponseEntity<>(quartzJobService.queryAllLog(criteria,page), HttpStatus.OK); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/QuartzJobService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/QuartzJobService.java index 71a9fa0..f3516d2 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/QuartzJobService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/QuartzJobService.java @@ -20,10 +20,11 @@ import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.quartz.domain.QuartzJob; import me.zhengjie.modules.quartz.domain.QuartzLog; import me.zhengjie.modules.quartz.domain.vo.QuartzJobQueryCriteria; +import me.zhengjie.utils.PageResult; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; -import java.util.Map; import java.util.Set; /** @@ -34,11 +35,12 @@ public interface QuartzJobService extends IService { /** * 分页查询 + * * @param criteria 条件 - * @param page 分页参数 + * @param page 分页参数 * @return / */ - Map queryAll(QuartzJobQueryCriteria criteria, Page page); + PageResult queryAll(QuartzJobQueryCriteria criteria, Page page); /** * 查询全部 @@ -49,11 +51,12 @@ public interface QuartzJobService extends IService { /** * 分页查询日志 + * * @param criteria 条件 - * @param page 分页参数 + * @param page 分页参数 * @return / */ - Map queryAllLog(QuartzJobQueryCriteria criteria, Page page); + PageResult queryAllLog(QuartzJobQueryCriteria criteria, Page page); /** * 查询全部 diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java index 027306d..8d011a4 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java @@ -51,12 +51,12 @@ public class QuartzJobServiceImpl extends ServiceImpl queryAll(QuartzJobQueryCriteria criteria, Page page){ + public PageResult queryAll(QuartzJobQueryCriteria criteria, Page page){ return PageUtil.toPage(quartzJobMapper.findAll(criteria, page)); } @Override - public Map queryAllLog(QuartzJobQueryCriteria criteria, Page page){ + public PageResult queryAllLog(QuartzJobQueryCriteria criteria, Page page){ return PageUtil.toPage(quartzLogMapper.findAll(criteria, page)); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java index a157874..a03e1c9 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java @@ -44,6 +44,7 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -113,7 +114,7 @@ public class AuthorizationController { @ApiOperation("获取用户信息") @GetMapping(value = "/info") - public ResponseEntity getUserInfo() { + public ResponseEntity getUserInfo() { return ResponseEntity.ok(SecurityUtils.getCurrentUser()); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/OnlineController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/OnlineController.java index 8b91fdf..cc5968c 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/OnlineController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/OnlineController.java @@ -19,7 +19,9 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import me.zhengjie.modules.security.service.OnlineUserService; +import me.zhengjie.modules.security.service.dto.OnlineUserDto; import me.zhengjie.utils.EncryptUtils; +import me.zhengjie.utils.PageResult; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -43,7 +45,7 @@ public class OnlineController { @ApiOperation("查询在线用户") @GetMapping @PreAuthorize("@el.check()") - public ResponseEntity queryOnlineUser(String filter, Pageable pageable){ + public ResponseEntity> queryOnlineUser(String filter, Pageable pageable){ return new ResponseEntity<>(onlineUserService.getAll(filter, pageable),HttpStatus.OK); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/OnlineUserService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/OnlineUserService.java index af8d298..87ccaf4 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/OnlineUserService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/OnlineUserService.java @@ -70,10 +70,10 @@ public class OnlineUserService { * @param pageable / * @return / */ - public Map getAll(String filter, Pageable pageable){ + public PageResult getAll(String filter, Pageable pageable){ List onlineUserDtos = getAll(filter); return PageUtil.toPage( - PageUtil.toPage(pageable.getPageNumber(),pageable.getPageSize(), onlineUserDtos), + PageUtil.paging(pageable.getPageNumber(),pageable.getPageSize(), onlineUserDtos), onlineUserDtos.size() ); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java index aa7a6d2..b465cdb 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java @@ -24,6 +24,7 @@ import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.system.domain.Dept; import me.zhengjie.modules.system.service.DeptService; import me.zhengjie.modules.system.domain.vo.DeptQueryCriteria; +import me.zhengjie.utils.PageResult; import me.zhengjie.utils.PageUtil; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -56,7 +57,7 @@ public class DeptController { @ApiOperation("查询部门") @GetMapping @PreAuthorize("@el.check('user:list','dept:list')") - public ResponseEntity queryDept(DeptQueryCriteria criteria) throws Exception { + public ResponseEntity> queryDept(DeptQueryCriteria criteria) throws Exception { List depts = deptService.queryAll(criteria, true); return new ResponseEntity<>(PageUtil.toPage(depts),HttpStatus.OK); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java index 5cf73bf..2c50d0d 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java @@ -24,6 +24,7 @@ import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.system.domain.Dict; import me.zhengjie.modules.system.service.DictService; import me.zhengjie.modules.system.domain.vo.DictQueryCriteria; +import me.zhengjie.utils.PageResult; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -31,6 +32,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.List; import java.util.Set; /** @@ -56,14 +58,14 @@ public class DictController { @ApiOperation("查询字典") @GetMapping(value = "/all") @PreAuthorize("@el.check('dict:list')") - public ResponseEntity queryAllDict(){ + public ResponseEntity> queryAllDict(){ return new ResponseEntity<>(dictService.queryAll(new DictQueryCriteria()),HttpStatus.OK); } @ApiOperation("查询字典") @GetMapping @PreAuthorize("@el.check('dict:list')") - public ResponseEntity queryDict(DictQueryCriteria resources, Page page){ + public ResponseEntity> queryDict(DictQueryCriteria resources, Page page){ return new ResponseEntity<>(dictService.queryAll(resources, page),HttpStatus.OK); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java index aab2c87..ddbf3fc 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java @@ -24,6 +24,7 @@ import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.system.domain.DictDetail; import me.zhengjie.modules.system.service.DictDetailService; import me.zhengjie.modules.system.domain.vo.DictDetailQueryCriteria; +import me.zhengjie.utils.PageResult; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -48,7 +49,7 @@ public class DictDetailController { @ApiOperation("查询字典详情") @GetMapping - public ResponseEntity queryDictDetail(DictDetailQueryCriteria criteria, Page page){ + public ResponseEntity> queryDictDetail(DictDetailQueryCriteria criteria, Page page){ return new ResponseEntity<>(dictDetailService.queryAll(criteria, page),HttpStatus.OK); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java index 86b4350..b68dfef 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java @@ -24,6 +24,7 @@ import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.system.domain.Job; import me.zhengjie.modules.system.service.JobService; import me.zhengjie.modules.system.domain.vo.JobQueryCriteria; +import me.zhengjie.utils.PageResult; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -56,7 +57,7 @@ public class JobController { @ApiOperation("查询岗位") @GetMapping @PreAuthorize("@el.check('job:list','user:list')") - public ResponseEntity queryJob(JobQueryCriteria criteria, Page page){ + public ResponseEntity> queryJob(JobQueryCriteria criteria, Page page){ return new ResponseEntity<>(jobService.queryAll(criteria, page),HttpStatus.OK); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java index fc8bd9d..fd7ccce 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java @@ -22,8 +22,10 @@ import lombok.RequiredArgsConstructor; import me.zhengjie.annotation.Log; import me.zhengjie.modules.system.domain.Menu; import me.zhengjie.exception.BadRequestException; +import me.zhengjie.modules.system.domain.vo.MenuVo; import me.zhengjie.modules.system.service.MenuService; import me.zhengjie.modules.system.domain.vo.MenuQueryCriteria; +import me.zhengjie.utils.PageResult; import me.zhengjie.utils.PageUtil; import me.zhengjie.utils.SecurityUtils; import org.springframework.http.HttpStatus; @@ -58,7 +60,7 @@ public class MenuController { @GetMapping(value = "/build") @ApiOperation("获取前端所需菜单") - public ResponseEntity buildMenus(){ + public ResponseEntity> buildMenus(){ List menuList = menuService.findByUser(SecurityUtils.getCurrentUserId()); List menus = menuService.buildTree(menuList); return new ResponseEntity<>(menuService.buildMenus(menus),HttpStatus.OK); @@ -67,7 +69,7 @@ public class MenuController { @ApiOperation("返回全部的菜单") @GetMapping(value = "/lazy") @PreAuthorize("@el.check('menu:list','roles:list')") - public ResponseEntity queryAllMenu(@RequestParam Long pid){ + public ResponseEntity> queryAllMenu(@RequestParam Long pid){ return new ResponseEntity<>(menuService.getMenus(pid),HttpStatus.OK); } @@ -86,7 +88,7 @@ public class MenuController { @GetMapping @ApiOperation("查询菜单") @PreAuthorize("@el.check('menu:list')") - public ResponseEntity queryMenu(MenuQueryCriteria criteria) throws Exception { + public ResponseEntity> queryMenu(MenuQueryCriteria criteria) throws Exception { List menuList = menuService.queryAll(criteria, true); return new ResponseEntity<>(PageUtil.toPage(menuList),HttpStatus.OK); } @@ -94,7 +96,7 @@ public class MenuController { @ApiOperation("查询菜单:根据ID获取同级与上级数据") @PostMapping("/superior") @PreAuthorize("@el.check('menu:list')") - public ResponseEntity getMenuSuperior(@RequestBody List ids) { + public ResponseEntity> getMenuSuperior(@RequestBody List ids) { Set menus = new LinkedHashSet<>(); if(CollectionUtil.isNotEmpty(ids)){ for (Long id : ids) { diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java index d4b0a17..458440f 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java @@ -25,6 +25,7 @@ import me.zhengjie.modules.system.domain.Role; import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.system.service.RoleService; import me.zhengjie.modules.system.domain.vo.RoleQueryCriteria; +import me.zhengjie.utils.PageResult; import me.zhengjie.utils.SecurityUtils; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -55,7 +56,7 @@ public class RoleController { @ApiOperation("获取单个role") @GetMapping(value = "/{id}") @PreAuthorize("@el.check('roles:list')") - public ResponseEntity findRoleById(@PathVariable Long id){ + public ResponseEntity findRoleById(@PathVariable Long id){ return new ResponseEntity<>(roleService.findById(id), HttpStatus.OK); } @@ -69,14 +70,14 @@ public class RoleController { @ApiOperation("返回全部的角色") @GetMapping(value = "/all") @PreAuthorize("@el.check('roles:list','user:add','user:edit')") - public ResponseEntity queryAllRole(){ + public ResponseEntity> queryAllRole(){ return new ResponseEntity<>(roleService.queryAll(),HttpStatus.OK); } @ApiOperation("查询角色") @GetMapping @PreAuthorize("@el.check('roles:list')") - public ResponseEntity queryRole(RoleQueryCriteria criteria, Page page){ + public ResponseEntity> queryRole(RoleQueryCriteria criteria, Page page){ return new ResponseEntity<>(roleService.queryAll(criteria, page),HttpStatus.OK); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java index 1c2a0a2..017c0d2 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java @@ -76,7 +76,7 @@ public class UserController { @ApiOperation("查询用户") @GetMapping @PreAuthorize("@el.check('user:list')") - public ResponseEntity queryUser(UserQueryCriteria criteria, Page page){ + public ResponseEntity> queryUser(UserQueryCriteria criteria, Page page){ if (!ObjectUtils.isEmpty(criteria.getDeptId())) { criteria.getDeptIds().add(criteria.getDeptId()); // 先查找是否存在子节点 diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java index d720a39..0432dca 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java @@ -19,8 +19,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.system.domain.DictDetail; import me.zhengjie.modules.system.domain.vo.DictDetailQueryCriteria; +import me.zhengjie.utils.PageResult; + import java.util.List; -import java.util.Map; /** * @author Zheng Jie @@ -48,11 +49,12 @@ public interface DictDetailService extends IService { /** * 分页查询 + * * @param criteria 条件 - * @param page 分页参数 + * @param page 分页参数 * @return / */ - Map queryAll(DictDetailQueryCriteria criteria, Page page); + PageResult queryAll(DictDetailQueryCriteria criteria, Page page); /** * 根据字典名称获取字典详情 diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java index 5619e76..ae737c1 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java @@ -19,10 +19,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.system.domain.Dict; import me.zhengjie.modules.system.domain.vo.DictQueryCriteria; +import me.zhengjie.utils.PageResult; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; -import java.util.Map; import java.util.Set; /** @@ -33,11 +34,12 @@ public interface DictService extends IService { /** * 分页查询 + * * @param criteria 条件 - * @param page 分页参数 + * @param page 分页参数 * @return / */ - Map queryAll(DictQueryCriteria criteria, Page page); + PageResult queryAll(DictQueryCriteria criteria, Page page); /** * 查询全部数据 diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java index 846b162..c65c609 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java @@ -19,10 +19,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.system.domain.Job; import me.zhengjie.modules.system.domain.vo.JobQueryCriteria; +import me.zhengjie.utils.PageResult; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; -import java.util.Map; import java.util.Set; /** @@ -58,11 +59,12 @@ public interface JobService extends IService { /** * 分页查询 + * * @param criteria 条件 - * @param page 分页参数 + * @param page 分页参数 * @return / */ - Map queryAll(JobQueryCriteria criteria, Page page); + PageResult queryAll(JobQueryCriteria criteria, Page page); /** * 查询全部数据 diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MenuService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MenuService.java index 0c16728..4c25192 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MenuService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MenuService.java @@ -18,6 +18,8 @@ package me.zhengjie.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.system.domain.Menu; import me.zhengjie.modules.system.domain.vo.MenuQueryCriteria; +import me.zhengjie.modules.system.domain.vo.MenuVo; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; @@ -77,7 +79,7 @@ public interface MenuService extends IService { * @param menus / * @return / */ - Object buildMenus(List menus); + List buildMenus(List menus); /** * 删除 diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/RoleService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/RoleService.java index d9fbfbb..7d500fe 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/RoleService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/RoleService.java @@ -21,10 +21,11 @@ import me.zhengjie.modules.security.service.dto.AuthorityDto; import me.zhengjie.modules.system.domain.Role; import me.zhengjie.modules.system.domain.User; import me.zhengjie.modules.system.domain.vo.RoleQueryCriteria; +import me.zhengjie.utils.PageResult; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; -import java.util.Map; import java.util.Set; /** @@ -86,11 +87,12 @@ public interface RoleService extends IService { /** * 待条件分页查询 + * * @param criteria 条件 - * @param page 分页参数 + * @param page 分页参数 * @return / */ - Map queryAll(RoleQueryCriteria criteria, Page page); + PageResult queryAll(RoleQueryCriteria criteria, Page page); /** * 查询全部 diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java index 64d9e73..21636a3 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java @@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.system.domain.User; import me.zhengjie.modules.system.domain.vo.UserQueryCriteria; +import me.zhengjie.utils.PageResult; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -97,11 +98,12 @@ public interface UserService extends IService { /** * 查询全部 + * * @param criteria 条件 - * @param page 分页参数 + * @param page 分页参数 * @return / */ - Map queryAll(UserQueryCriteria criteria, Page page); + PageResult queryAll(UserQueryCriteria criteria, Page page); /** * 查询全部不分页 diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java index a40f63b..c8ec3c6 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java @@ -30,7 +30,6 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.Map; /** * @author Zheng Jie @@ -46,7 +45,7 @@ public class DictDetailServiceImpl extends ServiceImpl queryAll(DictDetailQueryCriteria criteria, Page page) { + public PageResult queryAll(DictDetailQueryCriteria criteria, Page page) { return PageUtil.toPage(dictDetailMapper.findAll(criteria, page)); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java index 2aafb7a..05d4695 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java @@ -47,7 +47,7 @@ public class DictServiceImpl extends ServiceImpl implements Di private final DictDetailMapper deleteDetail; @Override - public Map queryAll(DictQueryCriteria criteria, Page page){ + public PageResult queryAll(DictQueryCriteria criteria, Page page){ criteria.setOffset(page.offset()); List dicts = dictMapper.findAll(criteria); Long total = dictMapper.countAll(criteria); diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java index 7bd7a32..93ada92 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java @@ -49,7 +49,7 @@ public class JobServiceImpl extends ServiceImpl implements JobSe private final UserMapper userMapper; @Override - public Map queryAll(JobQueryCriteria criteria, Page page) { + public PageResult queryAll(JobQueryCriteria criteria, Page page) { return PageUtil.toPage(jobMapper.findAll(criteria, page)); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java index df96c31..32f1ad3 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java @@ -69,7 +69,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro } @Override - public Map queryAll(RoleQueryCriteria criteria, Page page) { + public PageResult queryAll(RoleQueryCriteria criteria, Page page) { criteria.setOffset(page.offset()); List roles = roleMapper.findAll(criteria); Long total = roleMapper.countAll(criteria); diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java index 4db774f..0cb0283 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java @@ -63,7 +63,7 @@ public class UserServiceImpl extends ServiceImpl implements Us private final OnlineUserService onlineUserService; @Override - public Map queryAll(UserQueryCriteria criteria, Page page) { + public PageResult queryAll(UserQueryCriteria criteria, Page page) { criteria.setOffset(page.offset()); List users = userMapper.findAll(criteria); Long total = userMapper.countAll(criteria); diff --git a/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/EmailController.java b/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/EmailController.java index 952f8ba..b4ae6dd 100644 --- a/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/EmailController.java +++ b/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/EmailController.java @@ -41,7 +41,7 @@ public class EmailController { private final EmailService emailService; @GetMapping - public ResponseEntity queryEmailConfig(){ + public ResponseEntity queryEmailConfig(){ return new ResponseEntity<>(emailService.find(),HttpStatus.OK); } @@ -49,7 +49,7 @@ public class EmailController { @PutMapping @ApiOperation("配置邮件") public ResponseEntity updateEmailConfig(@Validated @RequestBody EmailConfig emailConfig) throws Exception { - emailService.config(emailConfig,emailService.find()); + emailService.config(emailConfig, emailService.find()); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java b/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java index a993635..7c3ef23 100644 --- a/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java +++ b/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java @@ -23,6 +23,7 @@ import me.zhengjie.exception.BadRequestException; import me.zhengjie.service.LocalStorageService; import me.zhengjie.domain.vo.LocalStorageQueryCriteria; import me.zhengjie.utils.FileUtil; +import me.zhengjie.utils.PageResult; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -48,7 +49,7 @@ public class LocalStorageController { @GetMapping @ApiOperation("查询文件") @PreAuthorize("@el.check('storage:list')") - public ResponseEntity queryFile(LocalStorageQueryCriteria criteria, Page page){ + public ResponseEntity> queryFile(LocalStorageQueryCriteria criteria, Page page){ return new ResponseEntity<>(localStorageService.queryAll(criteria,page),HttpStatus.OK); } @@ -69,7 +70,7 @@ public class LocalStorageController { @ApiOperation("上传图片") @PostMapping("/pictures") - public ResponseEntity uploadPicture(@RequestParam MultipartFile file){ + public ResponseEntity uploadPicture(@RequestParam MultipartFile file){ // 判断文件是否为图片 String suffix = FileUtil.getExtensionName(file.getOriginalFilename()); if(!FileUtil.IMAGE.equals(FileUtil.getFileType(suffix))){ diff --git a/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java b/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java index d076a41..73ee0d0 100644 --- a/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java +++ b/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java @@ -26,6 +26,7 @@ import me.zhengjie.domain.QiniuContent; import me.zhengjie.service.QiNiuConfigService; import me.zhengjie.domain.vo.QiniuQueryCriteria; import me.zhengjie.service.QiniuContentService; +import me.zhengjie.utils.PageResult; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; @@ -52,7 +53,7 @@ public class QiniuController { private final QiNiuConfigService qiNiuConfigService; @GetMapping(value = "/config") - public ResponseEntity queryQiNiuConfig(){ + public ResponseEntity queryQiNiuConfig(){ return new ResponseEntity<>(qiNiuConfigService.getConfig(), HttpStatus.OK); } @@ -73,7 +74,7 @@ public class QiniuController { @ApiOperation("查询文件") @GetMapping - public ResponseEntity queryQiNiu(QiniuQueryCriteria criteria, Page page){ + public ResponseEntity> queryQiNiu(QiniuQueryCriteria criteria, Page page){ return new ResponseEntity<>(qiniuContentService.queryAll(criteria, page),HttpStatus.OK); } diff --git a/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java b/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java index 423b975..5fa8ab3 100644 --- a/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java +++ b/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java @@ -44,7 +44,6 @@ public interface EmailService extends IService { * 发送邮件 * @param emailVo 邮件发送的内容 * @param emailConfig 邮件配置 - * @throws Exception / */ void send(EmailVo emailVo, EmailConfig emailConfig); } diff --git a/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java b/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java index 3225a2d..5eb4a70 100644 --- a/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java +++ b/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java @@ -19,11 +19,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.domain.LocalStorage; import me.zhengjie.domain.vo.LocalStorageQueryCriteria; +import me.zhengjie.utils.PageResult; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; -import java.util.Map; /** * @author Zheng Jie @@ -33,11 +33,12 @@ public interface LocalStorageService extends IService { /** * 分页查询 + * * @param criteria 条件 - * @param page 分页参数 + * @param page 分页参数 * @return / */ - Map queryAll(LocalStorageQueryCriteria criteria, Page page); + PageResult queryAll(LocalStorageQueryCriteria criteria, Page page); /** * 查询全部数据 diff --git a/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/QiniuContentService.java b/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/QiniuContentService.java index 62ff6b3..c9ea547 100644 --- a/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/QiniuContentService.java +++ b/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/QiniuContentService.java @@ -20,11 +20,11 @@ import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.domain.QiniuConfig; import me.zhengjie.domain.QiniuContent; import me.zhengjie.domain.vo.QiniuQueryCriteria; +import me.zhengjie.utils.PageResult; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; -import java.util.Map; /** * @author Zheng Jie @@ -34,11 +34,12 @@ public interface QiniuContentService extends IService { /** * 分页查询 + * * @param criteria 条件 - * @param page 分页参数 + * @param page 分页参数 * @return / */ - Map queryAll(QiniuQueryCriteria criteria, Page page); + PageResult queryAll(QiniuQueryCriteria criteria, Page page); /** * 查询全部 diff --git a/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java b/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java index 819b70a..a431395 100644 --- a/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java +++ b/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java @@ -49,7 +49,7 @@ public class LocalStorageServiceImpl extends ServiceImpl queryAll(LocalStorageQueryCriteria criteria, Page page){ + public PageResult queryAll(LocalStorageQueryCriteria criteria, Page page){ return PageUtil.toPage(localStorageMapper.findAll(criteria, page)); } diff --git a/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiniuContentServiceImpl.java b/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiniuContentServiceImpl.java index 5797ff9..9490f54 100644 --- a/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiniuContentServiceImpl.java +++ b/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiniuContentServiceImpl.java @@ -31,6 +31,7 @@ import me.zhengjie.domain.QiniuConfig; import me.zhengjie.domain.QiniuContent; import me.zhengjie.mapper.QiniuContentMapper; import me.zhengjie.domain.vo.QiniuQueryCriteria; +import me.zhengjie.utils.PageResult; import me.zhengjie.utils.QiNiuUtil; import me.zhengjie.exception.BadRequestException; import me.zhengjie.service.QiniuContentService; @@ -60,7 +61,7 @@ public class QiniuContentServiceImpl extends ServiceImpl queryAll(QiniuQueryCriteria criteria, Page page){ + public PageResult queryAll(QiniuQueryCriteria criteria, Page page){ return PageUtil.toPage(qiniuContentMapper.findAll(criteria, page)); }