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

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

2.5 Beta 详情：https://www.ydyno.com/archives/1225.html

eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java

@@ -39,8 +39,6 @@ public class RedisUtils {
         this.redisTemplate = redisTemplate;
     }
 
-    // =============================common============================
-
     /**
      * 指定缓存失效时间
      * @param key  键
@@ -645,4 +643,17 @@ public class RedisUtils {
             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);
+    }
 }

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

@@ -65,7 +65,8 @@ public class AppController {
     @PostMapping
 	@PreAuthorize("@el.check('app:add')")
     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("修改应用")

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

@@ -73,7 +73,8 @@ public class DatabaseController {
     @PostMapping
 	@PreAuthorize("@el.check('database:add')")
     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("修改数据库")

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

@@ -75,7 +75,8 @@ public class DeployController {
     @PostMapping
 	@PreAuthorize("@el.check('deploy:add')")
     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("修改部署")

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

@@ -65,7 +65,8 @@ public class ServerDeployController {
     @PostMapping
 	@PreAuthorize("@el.check('serverDeploy:add')")
     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("修改服务器")

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

@@ -56,9 +56,8 @@ public interface AppService {
     /**
      * 创建
      * @param resources /
-     * @return /
      */
-    AppDto create(App resources);
+    void create(App resources);
 
     /**
      * 编辑

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

@@ -56,9 +56,8 @@ public interface DatabaseService {
     /**
      * 创建
      * @param resources /
-     * @return /
      */
-    DatabaseDto create(Database resources);
+    void create(Database resources);
 
     /**
      * 编辑

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

@@ -55,9 +55,8 @@ public interface DeployHistoryService {
     /**
      * 创建
      * @param resources /
-     * @return /
      */
-    DeployHistoryDto create(DeployHistory resources);
+    void create(DeployHistory resources);
 
     /**
      * 删除

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

@@ -57,9 +57,8 @@ public interface DeployService {
     /**
      * 创建
      * @param resources /
-     * @return /
      */
-    DeployDto create(Deploy resources);
+    void create(Deploy resources);
 
 
     /**

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

@@ -56,9 +56,8 @@ public interface ServerDeployService {
     /**
      * 创建
      * @param resources /
-     * @return /
      */
-	ServerDeployDto create(ServerDeploy resources);
+    void create(ServerDeploy resources);
 
     /**
      * 编辑

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

@@ -68,9 +68,9 @@ public class AppServiceImpl implements AppService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public AppDto create(App resources) {
+    public void create(App resources) {
         verification(resources);
-        return appMapper.toDto(appRepository.save(resources));
+        appRepository.save(resources);
     }
 
     @Override

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

@@ -71,9 +71,9 @@ public class DatabaseServiceImpl implements DatabaseService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public DatabaseDto create(Database resources) {
+    public void create(Database resources) {
         resources.setId(IdUtil.simpleUUID());
-        return databaseMapper.toDto(databaseRepository.save(resources));
+        databaseRepository.save(resources);
     }
 
     @Override

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

@@ -68,9 +68,9 @@ public class DeployHistoryServiceImpl implements DeployHistoryService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public DeployHistoryDto create(DeployHistory resources) {
+    public void create(DeployHistory resources) {
         resources.setId(IdUtil.simpleUUID());
-        return deployhistoryMapper.toDto(deployhistoryRepository.save(resources));
+        deployhistoryRepository.save(resources);
     }
 
     @Override

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

@@ -90,8 +90,8 @@ public class DeployServiceImpl implements DeployService {
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public DeployDto create(Deploy resources) {
-		return deployMapper.toDto(deployRepository.save(resources));
+	public void create(Deploy resources) {
+		deployRepository.save(resources);
 	}
 
 	@Override

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

@@ -89,9 +89,8 @@ public class ServerDeployServiceImpl implements ServerDeployService {
 
 	@Override
     @Transactional(rollbackFor = Exception.class)
-    public ServerDeployDto create(ServerDeploy resources) {
-
-		return serverDeployMapper.toDto(serverDeployRepository.save(resources));
+    public void create(ServerDeploy resources) {
+		serverDeployRepository.save(resources);
     }
 
     @Override

eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java

@@ -87,7 +87,8 @@ public class QuartzJobController {
         if (resources.getId() != null) {
             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("修改定时任务")

eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/QuartzJobService.java

@@ -64,9 +64,8 @@ public interface QuartzJobService {
     /**
      * 创建
      * @param resources /
-     * @return /
      */
-    QuartzJob create(QuartzJob resources);
+    void create(QuartzJob resources);
 
     /**
      * 编辑

eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java

@@ -79,13 +79,12 @@ public class QuartzJobServiceImpl implements QuartzJobService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public QuartzJob create(QuartzJob resources) {
+    public void create(QuartzJob resources) {
         if (!CronExpression.isValidExpression(resources.getCronExpression())){
             throw new BadRequestException("cron表达式格式错误");
         }
         resources = quartzJobRepository.save(resources);
         quartzManage.addJob(resources);
-        return resources;
     }
 
     @Override

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java

@@ -63,6 +63,9 @@ public class Dept extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "上级部门")
     private Long pid;
 
+    @ApiModelProperty(value = "子节点数目", hidden = true)
+    private Integer subCount = 0;
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java

@@ -87,6 +87,9 @@ public class Menu extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "上级菜单")
     private Long pid;
 
+    @ApiModelProperty(value = "子节点数目", hidden = true)
+    private Integer subCount = 0;
+
     @ApiModelProperty(value = "外链菜单")
     private Boolean iFrame;