修改租户初始化

src/main/java/com/syc/slm/slmbi/controller/TenantController.java

@@ -41,22 +41,8 @@ public class TenantController extends BaseRestController{
     @ApiImplicitParam(name = "appId", value = "租户id", required = true, dataTypeClass = String.class)
     public R<Object> initGroup(@PathVariable String appId ,HttpServletRequest request) {
         return call(() -> {
-            log.info("盛云平台创建租户初始化分组");
-            log.info("appId:"+appId);
-            log.info("盛云平台创建租户初始化分组");
-            LambdaQueryWrapper<InstrumentPanelGroup> where = new LambdaQueryWrapper<>();
-            where.eq(BaseEntity::getRecordStatus, SlmConstants.DATA_VALID);
-            where.eq(BaseEntity::getAppId, appId);
-            where.eq(InstrumentPanelGroup::getName, "全部分组");
             CurrentUser currentUser = getCurrentUser(request);
-            InstrumentPanelGroup one = groupService.getOne(where);
-            if(ObjectUtils.isEmpty(one)) {
-                InstrumentPanelGroupDTO groupDTO = new InstrumentPanelGroupDTO();
-                groupDTO.setParentId(null);
-                groupDTO.setName("全部分组");
-                groupService.saveGroup(groupDTO, appId);
-            }
-            panelInitService.initOnePanel(appId,currentUser.getToken(),request,appId);
+            return panelInitService.initPanelByTenant(currentUser.getToken(),request,appId);
         });
     }
 

src/main/java/com/syc/slm/slmbi/service/InstrumentPanelInitService.java

@@ -17,4 +17,13 @@ public interface InstrumentPanelInitService extends IService<InstrumentPanel> {
     String initOnePanel(String queryAppId,String token, HttpServletRequest request,String appId);
 
     String initBatchPanel(String token, HttpServletRequest request,String appId);
+
+    /**
+     * 初始化租户的仪表表
+     * @param token
+     * @param request
+     * @param appId
+     * @return
+     */
+    String initPanelByTenant(String token, HttpServletRequest request,String appId);
 }

src/main/java/com/syc/slm/slmbi/service/impl/InstrumentPanelInitServiceImpl.java

@@ -84,6 +84,28 @@ public class InstrumentPanelInitServiceImpl extends ServiceImpl<InstrumentPanelM
         return "true";
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String initPanelByTenant(String token, HttpServletRequest request, String appId) {
+        log.info("盛云平台创建租户初始化分组");
+        log.info("appId:"+appId);
+        log.info("盛云平台创建租户初始化分组");
+        LambdaQueryWrapper<InstrumentPanelGroup> where = new LambdaQueryWrapper<>();
+        where.eq(BaseEntity::getRecordStatus, SlmConstants.DATA_VALID);
+        where.eq(BaseEntity::getAppId, appId);
+        where.eq(InstrumentPanelGroup::getName, "全部分组");
+        InstrumentPanelGroup one = groupService.getOne(where);
+        if(ObjectUtils.isEmpty(one)) {
+            InstrumentPanelGroupDTO groupDTO = new InstrumentPanelGroupDTO();
+            groupDTO.setParentId(null);
+            groupDTO.setName("全部分组");
+            groupService.saveGroup(groupDTO, appId);
+        }
+        // 因为是初始化当前租户，所以queryAppId和appId是一样的
+        this.initOnePanel(appId,token,request,appId);
+        return "true";
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String initOnePanel(String queryAppId, String token,HttpServletRequest request,String appId) {