bug

Signed-off-by: liuyc <56808083@qq.com>

blade-service/blade-business/src/main/java/org/springblade/business/controller/ImageClassificationFileController.java

@@ -51,6 +51,7 @@ import org.springblade.system.entity.Dict;
 import org.springblade.system.feign.IDictClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -488,11 +489,7 @@ public class ImageClassificationFileController extends BladeController {
             }
 
             //获取当前节点下的文件
-            String type = "1";
-            if (vo.getId().toString().equals("1526085356632051714") || vo.getId().toString().equals("1526085256795033601")) {
-                type = "2";
-            }
-            Integer count = this.imageClassificationFileService.queryCurrentClassifyAllFileCount(projectId, contractId, vo.getId(), type);
+            Integer count = this.imageClassificationFileService.queryCurrentClassifyAllFileCount(projectId, contractId, vo.getId(), vo.getStorageDirectoryFormat().toString());
             vo.setCount(count);
 
         });

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/MeterTreeController.java

@@ -335,10 +335,10 @@ public class MeterTreeController extends BladeController {
             String redisKey = "meter:project:refresh-tree:" + projectId;
             String redisValue = bladeRedis.get(redisKey);
             if (StringUtils.isNotEmpty(redisValue) && redisValue.equals("1")) {
-                return R.fail(400, "请勿重复提交，60秒后再尝试");
+                return R.fail(400, "请勿重复提交，30秒后再尝试");
             }
             bladeRedis.set(redisKey, "1");
-            bladeRedis.expire(redisKey, 60);
+            bladeRedis.expire(redisKey, 30);
 
             /*初始化 或 增量同步 项目计量树*/
             return meterTreeProjectService.projectTreeInitOrSync(projectInfo.getMeterTemplateId(), Long.parseLong(projectId));
@@ -531,10 +531,10 @@ public class MeterTreeController extends BladeController {
             String redisKey = "meter:contract:refresh-tree:" + projectId + "_" + contractId;
             String redisValue = bladeRedis.get(redisKey);
             if (StringUtils.isNotEmpty(redisValue) && redisValue.equals("1")) {
-                return R.fail(400, "请勿重复提交，60秒后再尝试");
+                return R.fail(400, "请勿重复提交，30秒后再尝试");
             }
             bladeRedis.set(redisKey, "1");
-            bladeRedis.expire(redisKey, 60);
+            bladeRedis.expire(redisKey, 30);
 
             /*首先判断是否存在项目树*/
             MeterTreeProject rootNode = meterTreeProjectService.getBaseMapper().selectOne(Wrappers.<MeterTreeProject>lambdaQuery()