Skip to content

Commit 554aa58

Browse files
elunezelunez
committed
代码优化
1 parent 8c7217e commit 554aa58

24 files changed

Lines changed: 325 additions & 110 deletions

File tree

‎eladmin-common/src/main/java/me/zhengjie/exception/handler/GlobalExceptionHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class GlobalExceptionHandler {
2727
* 处理所有不可知的异常
2828
*/
2929
@ExceptionHandler(Throwable.class)
30-
public ResponseEntity handleException(Throwable e){
30+
public ResponseEntity<ApiError> handleException(Throwable e){
3131
// 打印堆栈信息
3232
log.error(ThrowableUtil.getStackTrace(e));
3333
return buildResponseEntity(ApiError.error(e.getMessage()));
@@ -37,7 +37,7 @@ public ResponseEntity handleException(Throwable e){
3737
* BadCredentialsException
3838
*/
3939
@ExceptionHandler(BadCredentialsException.class)
40-
public ResponseEntity badCredentialsException(BadCredentialsException e){
40+
public ResponseEntity<ApiError> badCredentialsException(BadCredentialsException e){
4141
// 打印堆栈信息
4242
String message = "坏的凭证".equals(e.getMessage()) ? "用户名或密码不正确" : e.getMessage();
4343
log.error(message);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public void generator(GenConfig genConfig, List<ColumnInfo> columns) {
134134
}
135135

136136
@Override
137-
public ResponseEntity preview(GenConfig genConfig, List<ColumnInfo> columns) {
137+
public ResponseEntity<Object> preview(GenConfig genConfig, List<ColumnInfo> columns) {
138138
if(genConfig.getId() == null){
139139
throw new BadRequestException("请先配置生成器");
140140
}

‎eladmin-monitor/src/main/java/me/zhengjie/res/ServerMonitorController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class ServerMonitorController {
2525
private static final double GB = 1024*1024*1024.00;
2626

2727
@GetMapping
28-
public ResponseEntity getServerInfo(){
28+
public ResponseEntity<Object> getServerInfo(){
2929
Map<String,Object> resultMap = new HashMap<>(8);
3030
try {
3131
CpuInfo[] infoList = sigar.getCpuInfoList();

‎eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Database.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
import lombok.Data;
44
import cn.hutool.core.bean.BeanUtil;
55
import cn.hutool.core.bean.copier.CopyOptions;
6+
import org.hibernate.annotations.CreationTimestamp;
7+
68
import javax.persistence.*;
79
import java.io.Serializable;
10+
import java.sql.Timestamp;
811

912
/**
1013
* @author zhanghouying
@@ -46,6 +49,8 @@ public class Database implements Serializable {
4649
@Column(name = "user_name",nullable = false)
4750
private String userName;
4851

52+
@CreationTimestamp
53+
private Timestamp createTime;
4954

5055
public void copy(Database source){
5156
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));

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

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
import org.springframework.security.access.prepost.PreAuthorize;
1313
import org.springframework.validation.annotation.Validated;
1414
import org.springframework.web.bind.annotation.*;
15+
import javax.servlet.http.HttpServletResponse;
16+
import java.io.IOException;
17+
import java.util.Set;
1518

1619
/**
1720
* @author zhanghouying
@@ -28,37 +31,45 @@ public AppController(AppService appService){
2831
this.appService = appService;
2932
}
3033

34+
@Log("导出应用数据")
35+
@ApiOperation("导出应用数据")
36+
@GetMapping(value = "/download")
37+
@PreAuthorize("@el.check('app:list')")
38+
public void download(HttpServletResponse response, AppQueryCriteria criteria) throws IOException {
39+
appService.download(appService.queryAll(criteria), response);
40+
}
41+
3142
@Log("查询应用")
3243
@ApiOperation(value = "查询应用")
3344
@GetMapping
3445
@PreAuthorize("@el.check('app:list')")
35-
public ResponseEntity getApps(AppQueryCriteria criteria, Pageable pageable){
46+
public ResponseEntity<Object> getApps(AppQueryCriteria criteria, Pageable pageable){
3647
return new ResponseEntity<>(appService.queryAll(criteria,pageable),HttpStatus.OK);
3748
}
3849

3950
@Log("新增应用")
4051
@ApiOperation(value = "新增应用")
4152
@PostMapping
4253
@PreAuthorize("@el.check('app:add')")
43-
public ResponseEntity create(@Validated @RequestBody App resources){
54+
public ResponseEntity<Object> create(@Validated @RequestBody App resources){
4455
return new ResponseEntity<>(appService.create(resources),HttpStatus.CREATED);
4556
}
4657

4758
@Log("修改应用")
4859
@ApiOperation(value = "修改应用")
4960
@PutMapping
5061
@PreAuthorize("@el.check('app:edit')")
51-
public ResponseEntity update(@Validated @RequestBody App resources){
62+
public ResponseEntity<Object> update(@Validated @RequestBody App resources){
5263
appService.update(resources);
53-
return new ResponseEntity(HttpStatus.NO_CONTENT);
64+
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
5465
}
5566

5667
@Log("删除应用")
5768
@ApiOperation(value = "删除应用")
58-
@DeleteMapping(value = "/{id}")
69+
@DeleteMapping
5970
@PreAuthorize("@el.check('app:del')")
60-
public ResponseEntity delete(@PathVariable Long id){
61-
appService.delete(id);
62-
return new ResponseEntity(HttpStatus.OK);
71+
public ResponseEntity<Object> delete(@RequestBody Set<Long> ids){
72+
appService.delete(ids);
73+
return new ResponseEntity<>(HttpStatus.OK);
6374
}
6475
}

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

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717
import org.springframework.validation.annotation.Validated;
1818
import org.springframework.web.bind.annotation.*;
1919
import org.springframework.web.multipart.MultipartFile;
20-
2120
import javax.servlet.http.HttpServletRequest;
21+
import javax.servlet.http.HttpServletResponse;
2222
import java.io.File;
23+
import java.io.IOException;
24+
import java.util.Set;
2325

2426
/**
2527
* @author zhanghouying
@@ -38,53 +40,61 @@ public DatabaseController(DatabaseService databaseService) {
3840
this.databaseService = databaseService;
3941
}
4042

43+
@Log("导出数据库数据")
44+
@ApiOperation("导出数据库数据")
45+
@GetMapping(value = "/download")
46+
@PreAuthorize("@el.check('database:list')")
47+
public void download(HttpServletResponse response, DatabaseQueryCriteria criteria) throws IOException {
48+
databaseService.download(databaseService.queryAll(criteria), response);
49+
}
50+
4151
@Log("查询数据库")
4252
@ApiOperation(value = "查询数据库")
4353
@GetMapping
4454
@PreAuthorize("@el.check('database:list')")
45-
public ResponseEntity getDatabases(DatabaseQueryCriteria criteria, Pageable pageable){
55+
public ResponseEntity<Object> getDatabases(DatabaseQueryCriteria criteria, Pageable pageable){
4656
return new ResponseEntity<>(databaseService.queryAll(criteria,pageable),HttpStatus.OK);
4757
}
4858

4959
@Log("新增数据库")
5060
@ApiOperation(value = "新增数据库")
5161
@PostMapping
5262
@PreAuthorize("@el.check('database:add')")
53-
public ResponseEntity create(@Validated @RequestBody Database resources){
63+
public ResponseEntity<Object> create(@Validated @RequestBody Database resources){
5464
return new ResponseEntity<>(databaseService.create(resources),HttpStatus.CREATED);
5565
}
5666

5767
@Log("修改数据库")
5868
@ApiOperation(value = "修改数据库")
5969
@PutMapping
6070
@PreAuthorize("@el.check('database:edit')")
61-
public ResponseEntity update(@Validated @RequestBody Database resources){
71+
public ResponseEntity<Object> update(@Validated @RequestBody Database resources){
6272
databaseService.update(resources);
63-
return new ResponseEntity(HttpStatus.NO_CONTENT);
73+
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
6474
}
6575

6676
@Log("删除数据库")
6777
@ApiOperation(value = "删除数据库")
68-
@DeleteMapping(value = "/{id}")
78+
@DeleteMapping
6979
@PreAuthorize("@el.check('database:del')")
70-
public ResponseEntity delete(@PathVariable String id){
71-
databaseService.delete(id);
72-
return new ResponseEntity(HttpStatus.OK);
80+
public ResponseEntity<Object> delete(@RequestBody Set<String> ids){
81+
databaseService.delete(ids);
82+
return new ResponseEntity<>(HttpStatus.OK);
7383
}
7484

7585
@Log("测试数据库链接")
7686
@ApiOperation(value = "测试数据库链接")
7787
@PostMapping("/testConnect")
7888
@PreAuthorize("@el.check('database:testConnect')")
79-
public ResponseEntity testConnect(@Validated @RequestBody Database resources){
89+
public ResponseEntity<Object> testConnect(@Validated @RequestBody Database resources){
8090
return new ResponseEntity<>(databaseService.testConnection(resources),HttpStatus.CREATED);
8191
}
8292

8393
@Log("执行SQL脚本")
8494
@ApiOperation(value = "执行SQL脚本")
8595
@PostMapping(value = "/upload")
8696
@PreAuthorize("@el.check('database:add')")
87-
public ResponseEntity upload(@RequestBody MultipartFile file, HttpServletRequest request)throws Exception{
97+
public ResponseEntity<Object> upload(@RequestBody MultipartFile file, HttpServletRequest request)throws Exception{
8898
String id = request.getParameter("id");
8999
DatabaseDto database = databaseService.findById(id);
90100
String fileName = "";

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

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,13 @@
1616
import org.springframework.web.bind.annotation.*;
1717
import org.springframework.web.multipart.MultipartFile;
1818
import javax.servlet.http.HttpServletRequest;
19+
import javax.servlet.http.HttpServletResponse;
1920
import java.io.File;
21+
import java.io.IOException;
2022
import java.util.HashMap;
2123
import java.util.Map;
2224
import java.util.Objects;
25+
import java.util.Set;
2326

2427
/**
2528
* @author zhanghouying
@@ -38,45 +41,53 @@ public DeployController(DeployService deployService) {
3841
this.deployService = deployService;
3942
}
4043

44+
@Log("导出部署数据")
45+
@ApiOperation("导出部署数据")
46+
@GetMapping(value = "/download")
47+
@PreAuthorize("@el.check('database:list')")
48+
public void download(HttpServletResponse response, DeployQueryCriteria criteria) throws IOException {
49+
deployService.download(deployService.queryAll(criteria), response);
50+
}
51+
4152
@Log("查询部署")
4253
@ApiOperation(value = "查询部署")
4354
@GetMapping
4455
@PreAuthorize("@el.check('deploy:list')")
45-
public ResponseEntity getDeploys(DeployQueryCriteria criteria, Pageable pageable){
56+
public ResponseEntity<Object> getDeploys(DeployQueryCriteria criteria, Pageable pageable){
4657
return new ResponseEntity<>(deployService.queryAll(criteria,pageable),HttpStatus.OK);
4758
}
4859

4960
@Log("新增部署")
5061
@ApiOperation(value = "新增部署")
5162
@PostMapping
5263
@PreAuthorize("@el.check('deploy:add')")
53-
public ResponseEntity create(@Validated @RequestBody Deploy resources){
64+
public ResponseEntity<Object> create(@Validated @RequestBody Deploy resources){
5465
return new ResponseEntity<>(deployService.create(resources),HttpStatus.CREATED);
5566
}
5667

5768
@Log("修改部署")
5869
@ApiOperation(value = "修改部署")
5970
@PutMapping
6071
@PreAuthorize("@el.check('deploy:edit')")
61-
public ResponseEntity update(@Validated @RequestBody Deploy resources){
72+
public ResponseEntity<Object> update(@Validated @RequestBody Deploy resources){
6273
deployService.update(resources);
63-
return new ResponseEntity(HttpStatus.NO_CONTENT);
74+
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
6475
}
6576

6677
@Log("删除部署")
6778
@ApiOperation(value = "删除部署")
68-
@DeleteMapping(value = "/{id}")
79+
@DeleteMapping
6980
@PreAuthorize("@el.check('deploy:del')")
70-
public ResponseEntity delete(@PathVariable Long id){
71-
deployService.delete(id);
72-
return new ResponseEntity(HttpStatus.OK);
81+
public ResponseEntity<Object> delete(@RequestBody Set<Long> ids){
82+
deployService.delete(ids);
83+
return new ResponseEntity<>(HttpStatus.OK);
7384
}
7485

7586
@Log("上传文件部署")
7687
@ApiOperation(value = "上传文件部署")
7788
@PostMapping(value = "/upload")
7889
@PreAuthorize("@el.check('deploy:edit')")
79-
public ResponseEntity upload(@RequestBody MultipartFile file, HttpServletRequest request)throws Exception{
90+
public ResponseEntity<Object> upload(@RequestBody MultipartFile file, HttpServletRequest request)throws Exception{
8091
Long id = Long.valueOf(request.getParameter("id"));
8192
String fileName = "";
8293
if(file != null){
@@ -99,31 +110,31 @@ public ResponseEntity upload(@RequestBody MultipartFile file, HttpServletRequest
99110
@ApiOperation(value = "系统还原")
100111
@PostMapping(value = "/serverReduction")
101112
@PreAuthorize("@el.check('deploy:edit')")
102-
public ResponseEntity serverReduction(@Validated @RequestBody DeployHistory resources){
113+
public ResponseEntity<Object> serverReduction(@Validated @RequestBody DeployHistory resources){
103114
String result = deployService.serverReduction(resources);
104115
return new ResponseEntity<>(result,HttpStatus.OK);
105116
}
106117
@Log("服务运行状态")
107118
@ApiOperation(value = "服务运行状态")
108119
@PostMapping(value = "/serverStatus")
109120
@PreAuthorize("@el.check('deploy:edit')")
110-
public ResponseEntity serverStatus(@Validated @RequestBody Deploy resources){
121+
public ResponseEntity<Object> serverStatus(@Validated @RequestBody Deploy resources){
111122
String result = deployService.serverStatus(resources);
112123
return new ResponseEntity<>(result,HttpStatus.OK);
113124
}
114125
@Log("启动服务")
115126
@ApiOperation(value = "启动服务")
116127
@PostMapping(value = "/startServer")
117128
@PreAuthorize("@el.check('deploy:edit')")
118-
public ResponseEntity startServer(@Validated @RequestBody Deploy resources){
129+
public ResponseEntity<Object> startServer(@Validated @RequestBody Deploy resources){
119130
String result = deployService.startServer(resources);
120131
return new ResponseEntity<>(result,HttpStatus.OK);
121132
}
122133
@Log("停止服务")
123134
@ApiOperation(value = "停止服务")
124135
@PostMapping(value = "/stopServer")
125136
@PreAuthorize("@el.check('deploy:edit')")
126-
public ResponseEntity stopServer(@Validated @RequestBody Deploy resources){
137+
public ResponseEntity<Object> stopServer(@Validated @RequestBody Deploy resources){
127138
String result = deployService.stopServer(resources);
128139
return new ResponseEntity<>(result,HttpStatus.OK);
129140
}

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

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
import io.swagger.annotations.Api;
44
import io.swagger.annotations.ApiOperation;
55
import me.zhengjie.aop.log.Log;
6-
import me.zhengjie.modules.mnt.domain.DeployHistory;
76
import me.zhengjie.modules.mnt.service.DeployHistoryService;
87
import me.zhengjie.modules.mnt.service.dto.DeployHistoryQueryCriteria;
9-
import org.springframework.beans.factory.annotation.Autowired;
108
import org.springframework.data.domain.Pageable;
119
import org.springframework.http.HttpStatus;
1210
import org.springframework.http.ResponseEntity;
1311
import org.springframework.security.access.prepost.PreAuthorize;
14-
import org.springframework.validation.annotation.Validated;
1512
import org.springframework.web.bind.annotation.*;
13+
import javax.servlet.http.HttpServletResponse;
14+
import java.io.IOException;
15+
import java.util.Set;
1616

1717
/**
1818
* @author zhanghouying
@@ -29,20 +29,28 @@ public DeployHistoryController(DeployHistoryService deployhistoryService) {
2929
this.deployhistoryService = deployhistoryService;
3030
}
3131

32+
@Log("导出部署历史数据")
33+
@ApiOperation("导出部署历史数据")
34+
@GetMapping(value = "/download")
35+
@PreAuthorize("@el.check('deployHistory:list')")
36+
public void download(HttpServletResponse response, DeployHistoryQueryCriteria criteria) throws IOException {
37+
deployhistoryService.download(deployhistoryService.queryAll(criteria), response);
38+
}
39+
3240
@Log("查询部署历史")
3341
@ApiOperation(value = "查询部署历史")
3442
@GetMapping
3543
@PreAuthorize("@el.check('deployHistory:list')")
36-
public ResponseEntity getDeployHistorys(DeployHistoryQueryCriteria criteria, Pageable pageable){
44+
public ResponseEntity<Object> getDeployHistorys(DeployHistoryQueryCriteria criteria, Pageable pageable){
3745
return new ResponseEntity<>(deployhistoryService.queryAll(criteria,pageable),HttpStatus.OK);
3846
}
3947

4048
@Log("删除DeployHistory")
4149
@ApiOperation(value = "删除部署历史")
42-
@DeleteMapping(value = "/{id}")
43-
@PreAuthorize("hasAnyRole('deployHistory:del')")
44-
public ResponseEntity delete(@PathVariable String id){
45-
deployhistoryService.delete(id);
46-
return new ResponseEntity(HttpStatus.OK);
50+
@DeleteMapping
51+
@PreAuthorize("@el.check('deployHistory:del')")
52+
public ResponseEntity<Object> delete(@RequestBody Set<String> ids){
53+
deployhistoryService.delete(ids);
54+
return new ResponseEntity<>(HttpStatus.OK);
4755
}
4856
}

0 commit comments

Comments
 (0)