"...src/main/resources/vm/java/sub-domain.java.vm" did not exist on "a5dce6cccce2e76cb2b68119ced1b33e245ad935"
Commit 90a4a80a authored by ZhengJie's avatar ZhengJie
Browse files

[代码完善](v2.5): v2.5 beta 菜单部门优化,其他杂项优化

菜单和部门表加入 sub_count 字段,记录子节点数目,树形表格懒加载使用。
脚本同步更新

2.5 Beta 详情:https://www.ydyno.com/archives/1225.html
parent 48570fcb
...@@ -39,8 +39,6 @@ public class RedisUtils { ...@@ -39,8 +39,6 @@ public class RedisUtils {
this.redisTemplate = redisTemplate; this.redisTemplate = redisTemplate;
} }
// =============================common============================
/** /**
* 指定缓存失效时间 * 指定缓存失效时间
* @param key 键 * @param key 键
...@@ -645,4 +643,17 @@ public class RedisUtils { ...@@ -645,4 +643,17 @@ public class RedisUtils {
return 0; return 0;
} }
} }
/**
*
* @param dict
* @param ids
*/
public void delByKeys(String prefix, Set<Long> ids) {
List<String> keys = new ArrayList<>();
for (Long id : ids) {
keys.add(new StringBuffer(prefix).append(id).toString());
}
redisTemplate.delete(keys);
}
} }
...@@ -65,7 +65,8 @@ public class AppController { ...@@ -65,7 +65,8 @@ public class AppController {
@PostMapping @PostMapping
@PreAuthorize("@el.check('app:add')") @PreAuthorize("@el.check('app:add')")
public ResponseEntity<Object> create(@Validated @RequestBody App resources){ public ResponseEntity<Object> create(@Validated @RequestBody App resources){
return new ResponseEntity<>(appService.create(resources),HttpStatus.CREATED); appService.create(resources);
return new ResponseEntity<>(HttpStatus.CREATED);
} }
@Log("修改应用") @Log("修改应用")
......
...@@ -73,7 +73,8 @@ public class DatabaseController { ...@@ -73,7 +73,8 @@ public class DatabaseController {
@PostMapping @PostMapping
@PreAuthorize("@el.check('database:add')") @PreAuthorize("@el.check('database:add')")
public ResponseEntity<Object> create(@Validated @RequestBody Database resources){ public ResponseEntity<Object> create(@Validated @RequestBody Database resources){
return new ResponseEntity<>(databaseService.create(resources),HttpStatus.CREATED); databaseService.create(resources);
return new ResponseEntity<>(HttpStatus.CREATED);
} }
@Log("修改数据库") @Log("修改数据库")
......
...@@ -75,7 +75,8 @@ public class DeployController { ...@@ -75,7 +75,8 @@ public class DeployController {
@PostMapping @PostMapping
@PreAuthorize("@el.check('deploy:add')") @PreAuthorize("@el.check('deploy:add')")
public ResponseEntity<Object> create(@Validated @RequestBody Deploy resources){ public ResponseEntity<Object> create(@Validated @RequestBody Deploy resources){
return new ResponseEntity<>(deployService.create(resources),HttpStatus.CREATED); deployService.create(resources);
return new ResponseEntity<>(HttpStatus.CREATED);
} }
@Log("修改部署") @Log("修改部署")
......
...@@ -65,7 +65,8 @@ public class ServerDeployController { ...@@ -65,7 +65,8 @@ public class ServerDeployController {
@PostMapping @PostMapping
@PreAuthorize("@el.check('serverDeploy:add')") @PreAuthorize("@el.check('serverDeploy:add')")
public ResponseEntity<Object> create(@Validated @RequestBody ServerDeploy resources){ public ResponseEntity<Object> create(@Validated @RequestBody ServerDeploy resources){
return new ResponseEntity<>(serverDeployService.create(resources),HttpStatus.CREATED); serverDeployService.create(resources);
return new ResponseEntity<>(HttpStatus.CREATED);
} }
@Log("修改服务器") @Log("修改服务器")
......
...@@ -56,9 +56,8 @@ public interface AppService { ...@@ -56,9 +56,8 @@ public interface AppService {
/** /**
* 创建 * 创建
* @param resources / * @param resources /
* @return /
*/ */
AppDto create(App resources); void create(App resources);
/** /**
* 编辑 * 编辑
......
...@@ -56,9 +56,8 @@ public interface DatabaseService { ...@@ -56,9 +56,8 @@ public interface DatabaseService {
/** /**
* 创建 * 创建
* @param resources / * @param resources /
* @return /
*/ */
DatabaseDto create(Database resources); void create(Database resources);
/** /**
* 编辑 * 编辑
......
...@@ -55,9 +55,8 @@ public interface DeployHistoryService { ...@@ -55,9 +55,8 @@ public interface DeployHistoryService {
/** /**
* 创建 * 创建
* @param resources / * @param resources /
* @return /
*/ */
DeployHistoryDto create(DeployHistory resources); void create(DeployHistory resources);
/** /**
* 删除 * 删除
......
...@@ -57,9 +57,8 @@ public interface DeployService { ...@@ -57,9 +57,8 @@ public interface DeployService {
/** /**
* 创建 * 创建
* @param resources / * @param resources /
* @return /
*/ */
DeployDto create(Deploy resources); void create(Deploy resources);
/** /**
......
...@@ -56,9 +56,8 @@ public interface ServerDeployService { ...@@ -56,9 +56,8 @@ public interface ServerDeployService {
/** /**
* 创建 * 创建
* @param resources / * @param resources /
* @return /
*/ */
ServerDeployDto create(ServerDeploy resources); void create(ServerDeploy resources);
/** /**
* 编辑 * 编辑
......
...@@ -68,9 +68,9 @@ public class AppServiceImpl implements AppService { ...@@ -68,9 +68,9 @@ public class AppServiceImpl implements AppService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public AppDto create(App resources) { public void create(App resources) {
verification(resources); verification(resources);
return appMapper.toDto(appRepository.save(resources)); appRepository.save(resources);
} }
@Override @Override
......
...@@ -71,9 +71,9 @@ public class DatabaseServiceImpl implements DatabaseService { ...@@ -71,9 +71,9 @@ public class DatabaseServiceImpl implements DatabaseService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public DatabaseDto create(Database resources) { public void create(Database resources) {
resources.setId(IdUtil.simpleUUID()); resources.setId(IdUtil.simpleUUID());
return databaseMapper.toDto(databaseRepository.save(resources)); databaseRepository.save(resources);
} }
@Override @Override
......
...@@ -68,9 +68,9 @@ public class DeployHistoryServiceImpl implements DeployHistoryService { ...@@ -68,9 +68,9 @@ public class DeployHistoryServiceImpl implements DeployHistoryService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public DeployHistoryDto create(DeployHistory resources) { public void create(DeployHistory resources) {
resources.setId(IdUtil.simpleUUID()); resources.setId(IdUtil.simpleUUID());
return deployhistoryMapper.toDto(deployhistoryRepository.save(resources)); deployhistoryRepository.save(resources);
} }
@Override @Override
......
...@@ -90,8 +90,8 @@ public class DeployServiceImpl implements DeployService { ...@@ -90,8 +90,8 @@ public class DeployServiceImpl implements DeployService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public DeployDto create(Deploy resources) { public void create(Deploy resources) {
return deployMapper.toDto(deployRepository.save(resources)); deployRepository.save(resources);
} }
@Override @Override
......
...@@ -89,9 +89,8 @@ public class ServerDeployServiceImpl implements ServerDeployService { ...@@ -89,9 +89,8 @@ public class ServerDeployServiceImpl implements ServerDeployService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public ServerDeployDto create(ServerDeploy resources) { public void create(ServerDeploy resources) {
serverDeployRepository.save(resources);
return serverDeployMapper.toDto(serverDeployRepository.save(resources));
} }
@Override @Override
......
...@@ -87,7 +87,8 @@ public class QuartzJobController { ...@@ -87,7 +87,8 @@ public class QuartzJobController {
if (resources.getId() != null) { if (resources.getId() != null) {
throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID"); throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID");
} }
return new ResponseEntity<>(quartzJobService.create(resources),HttpStatus.CREATED); quartzJobService.create(resources);
return new ResponseEntity<>(HttpStatus.CREATED);
} }
@Log("修改定时任务") @Log("修改定时任务")
......
...@@ -64,9 +64,8 @@ public interface QuartzJobService { ...@@ -64,9 +64,8 @@ public interface QuartzJobService {
/** /**
* 创建 * 创建
* @param resources / * @param resources /
* @return /
*/ */
QuartzJob create(QuartzJob resources); void create(QuartzJob resources);
/** /**
* 编辑 * 编辑
......
...@@ -79,13 +79,12 @@ public class QuartzJobServiceImpl implements QuartzJobService { ...@@ -79,13 +79,12 @@ public class QuartzJobServiceImpl implements QuartzJobService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public QuartzJob create(QuartzJob resources) { public void create(QuartzJob resources) {
if (!CronExpression.isValidExpression(resources.getCronExpression())){ if (!CronExpression.isValidExpression(resources.getCronExpression())){
throw new BadRequestException("cron表达式格式错误"); throw new BadRequestException("cron表达式格式错误");
} }
resources = quartzJobRepository.save(resources); resources = quartzJobRepository.save(resources);
quartzManage.addJob(resources); quartzManage.addJob(resources);
return resources;
} }
@Override @Override
......
...@@ -63,6 +63,9 @@ public class Dept extends BaseEntity implements Serializable { ...@@ -63,6 +63,9 @@ public class Dept extends BaseEntity implements Serializable {
@ApiModelProperty(value = "上级部门") @ApiModelProperty(value = "上级部门")
private Long pid; private Long pid;
@ApiModelProperty(value = "子节点数目", hidden = true)
private Integer subCount = 0;
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) { if (this == o) {
......
...@@ -87,6 +87,9 @@ public class Menu extends BaseEntity implements Serializable { ...@@ -87,6 +87,9 @@ public class Menu extends BaseEntity implements Serializable {
@ApiModelProperty(value = "上级菜单") @ApiModelProperty(value = "上级菜单")
private Long pid; private Long pid;
@ApiModelProperty(value = "子节点数目", hidden = true)
private Integer subCount = 0;
@ApiModelProperty(value = "外链菜单") @ApiModelProperty(value = "外链菜单")
private Boolean iFrame; private Boolean iFrame;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment