Merge remote-tracking branch 'origin/master' into master

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

@@ -343,7 +343,7 @@ public class MeterTreeController extends BladeController {
                 return R.fail(400, "请勿重复提交，30秒后再尝试");
             }
             bladeRedis.set(redisKey, "1");
-            bladeRedis.expire(redisKey, 30);
+            bladeRedis.expire(redisKey, 5);
 
             /*初始化 或 增量同步 项目计量树*/
             return meterTreeProjectService.projectTreeInitOrSync(projectInfo.getMeterTemplateId(), Long.parseLong(projectId));

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/MeterTreeProjectServiceImpl.java

@@ -68,6 +68,8 @@ public class MeterTreeProjectServiceImpl extends BaseServiceImpl<MeterTreeProjec
                 logger.info(" ==================== 已成功删除旧系统模板id {} 项目id {} 的合同段单元树数据 ==================== ", meterTreeProject.getTemplateId(), projectId);
             }
         }
+        //新增总数
+        int addTotal = 0;
 
         if (rootNode.size() == 0) {
             /*================== 新增初始化 ==================*/
@@ -130,7 +132,8 @@ public class MeterTreeProjectServiceImpl extends BaseServiceImpl<MeterTreeProjec
 
                 if (sortedList.size() == systemNodeIds.size()) {
                     if (this.saveBatch(sortedList, 1000)) {
-                        return R.success("操作成功");
+                        addTotal = sortedList.size();
+                        return R.success("同步完成，新增个"+addTotal+"节点！");
                     } else {
                         return R.fail("操作失败");
                     }
@@ -260,17 +263,18 @@ public class MeterTreeProjectServiceImpl extends BaseServiceImpl<MeterTreeProjec
 
                                 /*入库*/
                                 this.saveBatch(sortedList, 1000);
+                                addTotal = sortedList.size();
                             }
                         }
 
                     }
-                    return R.success("操作成功");
+                    return R.success("同步完成，新增个"+addTotal+"节点！");
                 } catch (Exception e) {
                     e.printStackTrace();
                     throw new ServiceException("操作异常！");
                 }
             } else {
-                return R.fail("未获取到需要同步的系统级计量单元信息！");
+                return R.success("同步完成，新增0个节点！");
             }
         }
     }