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

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

@@ -9,6 +9,7 @@ import com.syc.slm.slmbi.entity.BaseEntity;
 import com.syc.slm.slmbi.entity.CurrentUser;
 import com.syc.slm.slmbi.entity.InstrumentPanelGroup;
 import com.syc.slm.slmbi.service.InstrumentPanelGroupService;
+import com.syc.slm.slmbi.service.InstrumentPanelInitService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -32,18 +33,23 @@ public class TenantController extends BaseRestController{
 
     @Autowired
     private InstrumentPanelGroupService groupService;
+
+    @Autowired
+    private InstrumentPanelInitService panelInitService;
     @PostMapping
     @ApiOperation("新增租户初始化分组")
     @ApiImplicitParam(name = "appId", value = "租户id", required = true, dataTypeClass = String.class)
-    public R<String> initGroup(@PathVariable String appId) {
+    public R<Object> initGroup(@PathVariable String appId ,HttpServletRequest request) {
         return call(() -> {
             log.info("盛云平台创建租户初始化分组");
             log.info("appId:"+appId);
             log.info("盛云平台创建租户初始化分组");
+            CurrentUser currentUser = getCurrentUser(request);
             InstrumentPanelGroupDTO groupDTO = new InstrumentPanelGroupDTO();
             groupDTO.setParentId(null);
             groupDTO.setName("全部分组");
-           return  groupService.saveGroup(groupDTO,appId);
+            groupService.saveGroup(groupDTO, appId);
+            panelInitService.initOnePanel(appId,currentUser.getToken(),request);
         });
     }
 

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

@@ -123,7 +123,15 @@ public class InstrumentPanelInitServiceImpl extends ServiceImpl<InstrumentPanelM
                 e.printStackTrace();
                 throw new SysException("仪表板配置详情解密异常");
             }
-            configService.publish(queryAppId,setConfig(one,queryAppId,initPanelName1,config));
+
+            InstrumentPanelTree tree = treeService.getById(panelConfig.getPanelId());
+            LambdaQueryWrapper<InstrumentPanelTree> where = new LambdaQueryWrapper<>();
+            where.eq(BaseEntity::getRecordStatus, SlmConstants.DATA_VALID);
+            where.likeRight(InstrumentPanelTree::getFullId, tree.getFullId() + ".");
+            where.orderByAsc(InstrumentPanelTree::getAssemblyKey);
+            List<InstrumentPanelTree> panelTrees = treeService.list(where);
+
+            configService.publish(appId,setConfig(one,appId,initPanelName1,config,panelTrees));
 
         }
 
@@ -142,13 +150,19 @@ public class InstrumentPanelInitServiceImpl extends ServiceImpl<InstrumentPanelM
                 e.printStackTrace();
                 throw new SysException("仪表板配置详情解密异常");
             }
-            configService.publish(queryAppId,setConfig(one,queryAppId,initPanelName2,config));
+            InstrumentPanelTree tree = treeService.getById(panelConfig.getPanelId());
+            LambdaQueryWrapper<InstrumentPanelTree> where = new LambdaQueryWrapper<>();
+            where.eq(BaseEntity::getRecordStatus, SlmConstants.DATA_VALID);
+            where.likeRight(InstrumentPanelTree::getFullId, tree.getFullId() + ".");
+            where.orderByAsc(InstrumentPanelTree::getAssemblyKey);
+            List<InstrumentPanelTree> panelTrees = treeService.list(where);
+            configService.publish(appId,setConfig(one,appId,initPanelName2,config,panelTrees));
         }
 
         return null;
     }
 
-    private InstrumentPanelConfigDTO setConfig(InstrumentPanelGroup one , String appId, String panelName, String panelConfig){
+    private InstrumentPanelConfigDTO setConfig(InstrumentPanelGroup one , String appId, String panelName, String panelConfig, List<InstrumentPanelTree> panelTrees){
         SaveInstrumentPanelDTO panelDto  = new SaveInstrumentPanelDTO();
         panelDto.setName(panelName);
         panelDto.setGroupId(one.getId());
@@ -156,12 +170,6 @@ public class InstrumentPanelInitServiceImpl extends ServiceImpl<InstrumentPanelM
         InstrumentPanel instrumentPanel = baseMapper.selectById(panelId);
         InstrumentPanelConfigDTO config = new InstrumentPanelConfigDTO();
         List<InstrumentPanelAssemblyDTO> assemblys = Lists.newArrayList();
-        InstrumentPanelTree tree = treeService.getById(panelId);
-        LambdaQueryWrapper<InstrumentPanelTree> where = new LambdaQueryWrapper<>();
-        where.eq(BaseEntity::getRecordStatus, SlmConstants.DATA_VALID);
-        where.likeRight(InstrumentPanelTree::getFullId, tree.getFullId() + ".");
-        where.orderByAsc(InstrumentPanelTree::getAssemblyKey);
-        List<InstrumentPanelTree> panelTrees = treeService.list(where);
         panelTrees.forEach(x->{
             InstrumentPanelAssemblyDTO dto = new InstrumentPanelAssemblyDTO();
             dto.setName(x.getName());