Skip to content

Commit 5b9213f

Browse files
elunezelunez
committed
代码优化
1 parent a74cf51 commit 5b9213f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+128
-95
lines changed

‎eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,10 @@ public static <T> PageResult<T> toPage(List<T> list, long totalElements) {
5454
return new PageResult<>(list, totalElements);
5555
}
5656

57+
/**
58+
* 返回空数据
59+
*/
60+
public static <T> PageResult<T> noData () {
61+
return new PageResult<>(null, 0);
62+
}
5763
}

‎eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class GenConfigController {
3939

4040
@ApiOperation("查询")
4141
@GetMapping(value = "/{tableName}")
42-
public ResponseEntity<Object> queryGenConfig(@PathVariable String tableName){
42+
public ResponseEntity<GenConfig> queryGenConfig(@PathVariable String tableName){
4343
return new ResponseEntity<>(genConfigService.find(tableName), HttpStatus.OK);
4444
}
4545

‎eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@
1919
import io.swagger.annotations.ApiOperation;
2020
import lombok.RequiredArgsConstructor;
2121
import me.zhengjie.domain.ColumnInfo;
22+
import me.zhengjie.domain.vo.TableInfo;
2223
import me.zhengjie.exception.BadRequestException;
2324
import me.zhengjie.service.GenConfigService;
2425
import me.zhengjie.service.GeneratorService;
26+
import me.zhengjie.utils.PageResult;
2527
import me.zhengjie.utils.PageUtil;
2628
import org.springframework.beans.factory.annotation.Value;
2729
import org.springframework.http.HttpStatus;
@@ -55,16 +57,16 @@ public ResponseEntity<Object> queryAllTables(){
5557

5658
@ApiOperation("查询数据库数据")
5759
@GetMapping(value = "/tables")
58-
public ResponseEntity<Object> queryTables(@RequestParam(defaultValue = "") String name,
59-
@RequestParam(defaultValue = "0")Integer page,
60-
@RequestParam(defaultValue = "10")Integer size){
60+
public ResponseEntity<PageResult<TableInfo>> queryTables(@RequestParam(defaultValue = "") String name,
61+
@RequestParam(defaultValue = "0")Integer page,
62+
@RequestParam(defaultValue = "10")Integer size){
6163
int[] startEnd = PageUtil.transToStartEnd(page, size);
6264
return new ResponseEntity<>(generatorService.getTables(name,startEnd), HttpStatus.OK);
6365
}
6466

6567
@ApiOperation("查询字段数据")
6668
@GetMapping(value = "/columns")
67-
public ResponseEntity<Object> queryColumns(@RequestParam String tableName){
69+
public ResponseEntity<PageResult<ColumnInfo>> queryColumns(@RequestParam String tableName){
6870
List<ColumnInfo> columnInfos = generatorService.getColumns(tableName);
6971
return new ResponseEntity<>(PageUtil.toPage(columnInfos,columnInfos.size()), HttpStatus.OK);
7072
}

‎eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
import me.zhengjie.domain.GenConfig;
1919
import me.zhengjie.domain.ColumnInfo;
20+
import me.zhengjie.domain.vo.TableInfo;
21+
import me.zhengjie.utils.PageResult;
2022
import org.springframework.http.ResponseEntity;
2123
import org.springframework.scheduling.annotation.Async;
2224
import javax.servlet.http.HttpServletRequest;
@@ -35,7 +37,7 @@ public interface GeneratorService {
3537
* @param startEnd 分页参数
3638
* @return /
3739
*/
38-
Object getTables(String name, int[] startEnd);
40+
PageResult<TableInfo> getTables(String name, int[] startEnd);
3941

4042
/**
4143
* 得到数据表的元数据

‎eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@
2525
import me.zhengjie.exception.BadRequestException;
2626
import me.zhengjie.repository.ColumnInfoRepository;
2727
import me.zhengjie.service.GeneratorService;
28-
import me.zhengjie.utils.FileUtil;
29-
import me.zhengjie.utils.GenUtil;
30-
import me.zhengjie.utils.PageUtil;
31-
import me.zhengjie.utils.StringUtils;
28+
import me.zhengjie.utils.*;
3229
import org.slf4j.Logger;
3330
import org.slf4j.LoggerFactory;
3431
import org.springframework.http.HttpStatus;
@@ -71,7 +68,7 @@ public Object getTables() {
7168
}
7269

7370
@Override
74-
public Object getTables(String name, int[] startEnd) {
71+
public PageResult<TableInfo> getTables(String name, int[] startEnd) {
7572
// 使用预编译防止sql注入
7673
String sql = "select table_name ,create_time , engine, table_collation, table_comment from information_schema.tables " +
7774
"where table_schema = (select database()) " +

‎eladmin-logging/src/main/java/me/zhengjie/rest/SysLogController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import me.zhengjie.annotation.Log;
2222
import me.zhengjie.service.SysLogService;
2323
import me.zhengjie.service.dto.SysLogQueryCriteria;
24+
import me.zhengjie.service.dto.SysLogSmallDto;
25+
import me.zhengjie.utils.PageResult;
2426
import me.zhengjie.utils.SecurityUtils;
2527
import org.springframework.data.domain.Pageable;
2628
import org.springframework.http.HttpStatus;
@@ -69,7 +71,7 @@ public ResponseEntity<Object> queryLog(SysLogQueryCriteria criteria, Pageable pa
6971

7072
@GetMapping(value = "/user")
7173
@ApiOperation("用户日志查询")
72-
public ResponseEntity<Object> queryUserLog(SysLogQueryCriteria criteria, Pageable pageable){
74+
public ResponseEntity<PageResult<SysLogSmallDto>> queryUserLog(SysLogQueryCriteria criteria, Pageable pageable){
7375
criteria.setLogType("INFO");
7476
criteria.setUsername(SecurityUtils.getCurrentUsername());
7577
return new ResponseEntity<>(sysLogService.queryAllByUser(criteria,pageable), HttpStatus.OK);

‎eladmin-logging/src/main/java/me/zhengjie/service/SysLogService.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
import me.zhengjie.domain.SysLog;
1919
import me.zhengjie.service.dto.SysLogQueryCriteria;
20+
import me.zhengjie.service.dto.SysLogSmallDto;
21+
import me.zhengjie.utils.PageResult;
2022
import org.aspectj.lang.ProceedingJoinPoint;
2123
import org.springframework.data.domain.Pageable;
2224
import org.springframework.scheduling.annotation.Async;
@@ -52,7 +54,7 @@ public interface SysLogService {
5254
* @param pageable 分页参数
5355
* @return -
5456
*/
55-
Object queryAllByUser(SysLogQueryCriteria criteria, Pageable pageable);
57+
PageResult<SysLogSmallDto> queryAllByUser(SysLogQueryCriteria criteria, Pageable pageable);
5658

5759
/**
5860
* 保存日志数据

‎eladmin-logging/src/main/java/me/zhengjie/service/impl/SysLogServiceImpl.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import me.zhengjie.repository.LogRepository;
2525
import me.zhengjie.service.SysLogService;
2626
import me.zhengjie.service.dto.SysLogQueryCriteria;
27+
import me.zhengjie.service.dto.SysLogSmallDto;
2728
import me.zhengjie.service.mapstruct.LogErrorMapper;
2829
import me.zhengjie.service.mapstruct.LogSmallMapper;
2930
import me.zhengjie.utils.*;
@@ -60,7 +61,7 @@ public Object queryAll(SysLogQueryCriteria criteria, Pageable pageable) {
6061
if (status.equals(criteria.getLogType())) {
6162
return PageUtil.toPage(page.map(logErrorMapper::toDto));
6263
}
63-
return page;
64+
return PageUtil.toPage(page);
6465
}
6566

6667
@Override
@@ -69,7 +70,7 @@ public List<SysLog> queryAll(SysLogQueryCriteria criteria) {
6970
}
7071

7172
@Override
72-
public Object queryAllByUser(SysLogQueryCriteria criteria, Pageable pageable) {
73+
public PageResult<SysLogSmallDto> queryAllByUser(SysLogQueryCriteria criteria, Pageable pageable) {
7374
Page<SysLog> page = logRepository.findAll(((root, criteriaQuery, cb) -> QueryHelp.getPredicate(root, criteria, cb)), pageable);
7475
return PageUtil.toPage(page.map(logSmallMapper::toDto));
7576
}

‎eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/AppController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
import me.zhengjie.annotation.Log;
2222
import me.zhengjie.modules.mnt.domain.App;
2323
import me.zhengjie.modules.mnt.service.AppService;
24+
import me.zhengjie.modules.mnt.service.dto.AppDto;
2425
import me.zhengjie.modules.mnt.service.dto.AppQueryCriteria;
26+
import me.zhengjie.utils.PageResult;
2527
import org.springframework.data.domain.Pageable;
2628
import org.springframework.http.HttpStatus;
2729
import org.springframework.http.ResponseEntity;
@@ -54,7 +56,7 @@ public void exportApp(HttpServletResponse response, AppQueryCriteria criteria) t
5456
@ApiOperation(value = "查询应用")
5557
@GetMapping
5658
@PreAuthorize("@el.check('app:list')")
57-
public ResponseEntity<Object> queryApp(AppQueryCriteria criteria, Pageable pageable){
59+
public ResponseEntity<PageResult<AppDto>> queryApp(AppQueryCriteria criteria, Pageable pageable){
5860
return new ResponseEntity<>(appService.queryAll(criteria,pageable),HttpStatus.OK);
5961
}
6062

‎eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DatabaseController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import me.zhengjie.modules.mnt.service.dto.DatabaseQueryCriteria;
2727
import me.zhengjie.modules.mnt.util.SqlUtils;
2828
import me.zhengjie.utils.FileUtil;
29+
import me.zhengjie.utils.PageResult;
2930
import org.springframework.data.domain.Pageable;
3031
import org.springframework.http.HttpStatus;
3132
import org.springframework.http.ResponseEntity;
@@ -62,7 +63,7 @@ public void exportDatabase(HttpServletResponse response, DatabaseQueryCriteria c
6263
@ApiOperation(value = "查询数据库")
6364
@GetMapping
6465
@PreAuthorize("@el.check('database:list')")
65-
public ResponseEntity<Object> queryDatabase(DatabaseQueryCriteria criteria, Pageable pageable){
66+
public ResponseEntity<PageResult<DatabaseDto>> queryDatabase(DatabaseQueryCriteria criteria, Pageable pageable){
6667
return new ResponseEntity<>(databaseService.queryAll(criteria,pageable),HttpStatus.OK);
6768
}
6869

‎eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
import me.zhengjie.modules.mnt.domain.Deploy;
2323
import me.zhengjie.modules.mnt.domain.DeployHistory;
2424
import me.zhengjie.modules.mnt.service.DeployService;
25+
import me.zhengjie.modules.mnt.service.dto.DeployDto;
2526
import me.zhengjie.modules.mnt.service.dto.DeployQueryCriteria;
2627
import me.zhengjie.utils.FileUtil;
28+
import me.zhengjie.utils.PageResult;
2729
import org.springframework.data.domain.Pageable;
2830
import org.springframework.http.HttpStatus;
2931
import org.springframework.http.ResponseEntity;
@@ -64,7 +66,7 @@ public void exportDeployData(HttpServletResponse response, DeployQueryCriteria c
6466
@ApiOperation(value = "查询部署")
6567
@GetMapping
6668
@PreAuthorize("@el.check('deploy:list')")
67-
public ResponseEntity<Object> queryDeployData(DeployQueryCriteria criteria, Pageable pageable){
69+
public ResponseEntity<PageResult<DeployDto>> queryDeployData(DeployQueryCriteria criteria, Pageable pageable){
6870
return new ResponseEntity<>(deployService.queryAll(criteria,pageable),HttpStatus.OK);
6971
}
7072

‎eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployHistoryController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
import lombok.RequiredArgsConstructor;
2121
import me.zhengjie.annotation.Log;
2222
import me.zhengjie.modules.mnt.service.DeployHistoryService;
23+
import me.zhengjie.modules.mnt.service.dto.DeployHistoryDto;
2324
import me.zhengjie.modules.mnt.service.dto.DeployHistoryQueryCriteria;
25+
import me.zhengjie.utils.PageResult;
2426
import org.springframework.data.domain.Pageable;
2527
import org.springframework.http.HttpStatus;
2628
import org.springframework.http.ResponseEntity;
@@ -52,7 +54,7 @@ public void exportDeployHistory(HttpServletResponse response, DeployHistoryQuery
5254
@ApiOperation(value = "查询部署历史")
5355
@GetMapping
5456
@PreAuthorize("@el.check('deployHistory:list')")
55-
public ResponseEntity<Object> queryDeployHistory(DeployHistoryQueryCriteria criteria, Pageable pageable){
57+
public ResponseEntity<PageResult<DeployHistoryDto>> queryDeployHistory(DeployHistoryQueryCriteria criteria, Pageable pageable){
5658
return new ResponseEntity<>(deployhistoryService.queryAll(criteria,pageable),HttpStatus.OK);
5759
}
5860

‎eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/ServerDeployController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
import me.zhengjie.annotation.Log;
2222
import me.zhengjie.modules.mnt.domain.ServerDeploy;
2323
import me.zhengjie.modules.mnt.service.ServerDeployService;
24+
import me.zhengjie.modules.mnt.service.dto.ServerDeployDto;
2425
import me.zhengjie.modules.mnt.service.dto.ServerDeployQueryCriteria;
26+
import me.zhengjie.utils.PageResult;
2527
import org.springframework.data.domain.Pageable;
2628
import org.springframework.http.HttpStatus;
2729
import org.springframework.http.ResponseEntity;
@@ -54,7 +56,7 @@ public void exportServerDeploy(HttpServletResponse response, ServerDeployQueryCr
5456
@ApiOperation(value = "查询服务器")
5557
@GetMapping
5658
@PreAuthorize("@el.check('serverDeploy:list')")
57-
public ResponseEntity<Object> queryServerDeploy(ServerDeployQueryCriteria criteria, Pageable pageable){
59+
public ResponseEntity<PageResult<ServerDeployDto>> queryServerDeploy(ServerDeployQueryCriteria criteria, Pageable pageable){
5860
return new ResponseEntity<>(serverDeployService.queryAll(criteria,pageable),HttpStatus.OK);
5961
}
6062

‎eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import me.zhengjie.modules.mnt.domain.App;
1919
import me.zhengjie.modules.mnt.service.dto.AppDto;
2020
import me.zhengjie.modules.mnt.service.dto.AppQueryCriteria;
21+
import me.zhengjie.utils.PageResult;
2122
import org.springframework.data.domain.Pageable;
2223

2324
import javax.servlet.http.HttpServletResponse;
@@ -37,7 +38,7 @@ public interface AppService {
3738
* @param pageable 分页参数
3839
* @return /
3940
*/
40-
Object queryAll(AppQueryCriteria criteria, Pageable pageable);
41+
PageResult<AppDto> queryAll(AppQueryCriteria criteria, Pageable pageable);
4142

4243
/**
4344
* 查询全部数据

‎eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import me.zhengjie.modules.mnt.domain.Database;
1919
import me.zhengjie.modules.mnt.service.dto.DatabaseDto;
2020
import me.zhengjie.modules.mnt.service.dto.DatabaseQueryCriteria;
21+
import me.zhengjie.utils.PageResult;
2122
import org.springframework.data.domain.Pageable;
2223

2324
import javax.servlet.http.HttpServletResponse;
@@ -37,7 +38,7 @@ public interface DatabaseService {
3738
* @param pageable 分页参数
3839
* @return /
3940
*/
40-
Object queryAll(DatabaseQueryCriteria criteria, Pageable pageable);
41+
PageResult<DatabaseDto> queryAll(DatabaseQueryCriteria criteria, Pageable pageable);
4142

4243
/**
4344
* 查询全部

‎eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import me.zhengjie.modules.mnt.domain.DeployHistory;
1919
import me.zhengjie.modules.mnt.service.dto.DeployHistoryDto;
2020
import me.zhengjie.modules.mnt.service.dto.DeployHistoryQueryCriteria;
21+
import me.zhengjie.utils.PageResult;
2122
import org.springframework.data.domain.Pageable;
2223

2324
import javax.servlet.http.HttpServletResponse;
@@ -36,7 +37,7 @@ public interface DeployHistoryService {
3637
* @param pageable 分页参数
3738
* @return /
3839
*/
39-
Object queryAll(DeployHistoryQueryCriteria criteria, Pageable pageable);
40+
PageResult<DeployHistoryDto> queryAll(DeployHistoryQueryCriteria criteria, Pageable pageable);
4041

4142
/**
4243
* 查询全部

‎eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import me.zhengjie.modules.mnt.domain.DeployHistory;
2020
import me.zhengjie.modules.mnt.service.dto.DeployDto;
2121
import me.zhengjie.modules.mnt.service.dto.DeployQueryCriteria;
22+
import me.zhengjie.utils.PageResult;
2223
import org.springframework.data.domain.Pageable;
2324

2425
import javax.servlet.http.HttpServletResponse;
@@ -38,7 +39,7 @@ public interface DeployService {
3839
* @param pageable 分页参数
3940
* @return /
4041
*/
41-
Object queryAll(DeployQueryCriteria criteria, Pageable pageable);
42+
PageResult<DeployDto> queryAll(DeployQueryCriteria criteria, Pageable pageable);
4243

4344
/**
4445
* 查询全部数据

‎eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerDeployService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import me.zhengjie.modules.mnt.domain.ServerDeploy;
1919
import me.zhengjie.modules.mnt.service.dto.ServerDeployDto;
2020
import me.zhengjie.modules.mnt.service.dto.ServerDeployQueryCriteria;
21+
import me.zhengjie.utils.PageResult;
2122
import org.springframework.data.domain.Pageable;
2223

2324
import javax.servlet.http.HttpServletResponse;
@@ -37,7 +38,7 @@ public interface ServerDeployService {
3738
* @param pageable 分页参数
3839
* @return /
3940
*/
40-
Object queryAll(ServerDeployQueryCriteria criteria, Pageable pageable);
41+
PageResult<ServerDeployDto> queryAll(ServerDeployQueryCriteria criteria, Pageable pageable);
4142

4243
/**
4344
* 查询全部数据

‎eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@
2323
import me.zhengjie.modules.mnt.service.dto.AppDto;
2424
import me.zhengjie.modules.mnt.service.dto.AppQueryCriteria;
2525
import me.zhengjie.modules.mnt.service.mapstruct.AppMapper;
26-
import me.zhengjie.utils.FileUtil;
27-
import me.zhengjie.utils.PageUtil;
28-
import me.zhengjie.utils.QueryHelp;
29-
import me.zhengjie.utils.ValidationUtil;
26+
import me.zhengjie.utils.*;
3027
import org.springframework.data.domain.Page;
3128
import org.springframework.data.domain.Pageable;
3229
import org.springframework.stereotype.Service;
@@ -47,7 +44,7 @@ public class AppServiceImpl implements AppService {
4744
private final AppMapper appMapper;
4845

4946
@Override
50-
public Object queryAll(AppQueryCriteria criteria, Pageable pageable){
47+
public PageResult<AppDto> queryAll(AppQueryCriteria criteria, Pageable pageable){
5148
Page<App> page = appRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
5249
return PageUtil.toPage(page.map(appMapper::toDto));
5350
}

‎eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@
2525
import me.zhengjie.modules.mnt.service.dto.DatabaseQueryCriteria;
2626
import me.zhengjie.modules.mnt.service.mapstruct.DatabaseMapper;
2727
import me.zhengjie.modules.mnt.util.SqlUtils;
28-
import me.zhengjie.utils.FileUtil;
29-
import me.zhengjie.utils.PageUtil;
30-
import me.zhengjie.utils.QueryHelp;
31-
import me.zhengjie.utils.ValidationUtil;
28+
import me.zhengjie.utils.*;
3229
import org.springframework.data.domain.Page;
3330
import org.springframework.data.domain.Pageable;
3431
import org.springframework.stereotype.Service;
@@ -50,7 +47,7 @@ public class DatabaseServiceImpl implements DatabaseService {
5047
private final DatabaseMapper databaseMapper;
5148

5249
@Override
53-
public Object queryAll(DatabaseQueryCriteria criteria, Pageable pageable){
50+
public PageResult<DatabaseDto> queryAll(DatabaseQueryCriteria criteria, Pageable pageable){
5451
Page<Database> page = databaseRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
5552
return PageUtil.toPage(page.map(databaseMapper::toDto));
5653
}

‎eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@
2323
import me.zhengjie.modules.mnt.service.dto.DeployHistoryDto;
2424
import me.zhengjie.modules.mnt.service.dto.DeployHistoryQueryCriteria;
2525
import me.zhengjie.modules.mnt.service.mapstruct.DeployHistoryMapper;
26-
import me.zhengjie.utils.FileUtil;
27-
import me.zhengjie.utils.PageUtil;
28-
import me.zhengjie.utils.QueryHelp;
29-
import me.zhengjie.utils.ValidationUtil;
26+
import me.zhengjie.utils.*;
3027
import org.springframework.data.domain.Page;
3128
import org.springframework.data.domain.Pageable;
3229
import org.springframework.stereotype.Service;
@@ -47,7 +44,7 @@ public class DeployHistoryServiceImpl implements DeployHistoryService {
4744
private final DeployHistoryMapper deployhistoryMapper;
4845

4946
@Override
50-
public Object queryAll(DeployHistoryQueryCriteria criteria, Pageable pageable){
47+
public PageResult<DeployHistoryDto> queryAll(DeployHistoryQueryCriteria criteria, Pageable pageable){
5148
Page<DeployHistory> page = deployhistoryRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
5249
return PageUtil.toPage(page.map(deployhistoryMapper::toDto));
5350
}

0 commit comments

Comments
 (0)