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

@@ -43,7 +43,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 
 @RestController
 @RequestMapping("api/yt/admin")
-@Api(tags = {"租户管理","菜单管理"})
+@Api(tags = {"租户管理", "菜单管理"})
 @RequiredArgsConstructor
 @PreAuthorize("hasAnyAuthority('SYS_ADMIN','PLATFORM_ADMIN')")
 public class YtAdminController extends BaseController {
@@ -56,6 +56,7 @@ public class YtAdminController extends BaseController {
   private final UserService tbUserService;
 
   @PostMapping("/tenant")
+  @PreAuthorize("hasAnyAuthority('api:yt:admin:saveTenant')")
   public ResponseEntity<TenantDTO> saveTenant(@RequestBody TenantReqDTO tenantReqDTO) {
     TenantDTO newTenant = ytTenantService.createNewTenant(tenantReqDTO);
     URI location =
@@ -100,34 +101,44 @@ public class YtAdminController extends BaseController {
   }
 
   @DeleteMapping("/tenant")
-  public void deleteTenant(@Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO) throws ThingsboardException{
-
-    deleteDTO.getIds().forEach(id->{
-      ytTenantService.findById(id).ifPresent(tenantDTO -> {
-        try {
-          deleteTenant(tenantDTO.getTenantId());
-        } catch (ThingsboardException e) {
-          handleException(e);
-        }
-      });
-    });
+  public void deleteTenant(@Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO)
+      throws ThingsboardException {
+
+    deleteDTO
+        .getIds()
+        .forEach(
+            id -> {
+              ytTenantService
+                  .findById(id)
+                  .ifPresent(
+                      tenantDTO -> {
+                        try {
+                          deleteTenant(tenantDTO.getTenantId());
+                        } catch (ThingsboardException e) {
+                          handleException(e);
+                        }
+                      });
+            });
     ytTenantService.deleteTenants(
         deleteDTO.getIds().toArray(new String[deleteDTO.getIds().size()]));
   }
 
   @DeleteMapping("/user/deleteTenantAdmin")
-  public ResponseEntity<Boolean> deleteTenantAdmin(@Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO)
-      throws ThingsboardException {
+  public ResponseEntity<Boolean> deleteTenantAdmin(
+      @Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO) throws ThingsboardException {
     for (String strUserId : deleteDTO.getIds()) {
       UserDTO userDTO = userService.findUserInfoById(strUserId);
-      if(null != userDTO && StringUtils.isNotBlank(userDTO.getTbUser())){
+      if (null != userDTO && StringUtils.isNotBlank(userDTO.getTbUser())) {
         deleteTenantAdmin(userDTO.getTbUser());
-      }else {
+      } else {
         return ResponseEntity.ok(false);
       }
     }
-    boolean result = userService.deleteUser(
-        deleteDTO.getIds(), getCurrentUser().isPtSysadmin(), getCurrentUser().getCurrentTenantId());
+    boolean result =
+        userService.deleteUser(
+            deleteDTO.getIds(),
+            getCurrentUser().isPtSysadmin(),
+            getCurrentUser().getCurrentTenantId());
     return ResponseEntity.ok(result);
   }
 
@@ -164,13 +175,16 @@ public class YtAdminController extends BaseController {
   }
 
   @GetMapping("/me/menus")
-  public ResponseEntity<List<MenuDTO>> getMyMenus() throws ThingsboardException {
+  public ResponseEntity<List<MenuDTO>> getMyMenus(
+      @RequestParam(value = "needButton", required = false, defaultValue = "true")
+          boolean needButton)
+      throws ThingsboardException {
     return ResponseEntity.ok(
         menuService.getMyMenus(
             getCurrentUser().getCurrentTenantId(),
             getCurrentUser().getCurrentUserId(),
             getCurrentUser().isPtSysadmin(),
-            getCurrentUser().isPtTenantAdmin()));
+            getCurrentUser().isPtTenantAdmin(),needButton));
   }
 
   @PutMapping("/menu/assign/{tenantId}")
@@ -207,10 +221,10 @@ public class YtAdminController extends BaseController {
     try {
       boolean isCreate = tenantReqDTO.getTenantId() == null;
       Tenant tbTenant;
-      if(isCreate){
+      if (isCreate) {
         // 增加TB的租户创建
         tbTenant = new Tenant();
-      }else{
+      } else {
         tbTenant = new Tenant(new TenantId(UUID.fromString(tenantReqDTO.getTenantId())));
       }
       tbTenant.setTenantProfileId(tenantReqDTO.getTenantProfileId());
@@ -239,7 +253,8 @@ public class YtAdminController extends BaseController {
       tenantService.deleteTenant(tenantId);
       tenantProfileCache.evict(tenantId);
       tbClusterService.onTenantDelete(tenant, null);
-      tbClusterService.broadcastEntityStateChangeEvent(tenantId, tenantId, ComponentLifecycleEvent.DELETED);
+      tbClusterService.broadcastEntityStateChangeEvent(
+          tenantId, tenantId, ComponentLifecycleEvent.DELETED);
     } catch (Exception e) {
       throw handleException(e);
     }

@@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
@@ -27,6 +28,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RequestMapping("/api/yt/configuration/center")
 @RequiredArgsConstructor
 @Api(tags = "组态中心")
+@PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
 public class YtConfigurationCenterController extends BaseController {
 
   private final YtConfigurationCenterService ytConfigurationCenterService;

@@ -26,12 +26,14 @@ public class YtMenuController extends BaseController {
   private final MenuService menuService;
 
   @GetMapping("/me/menus")
-  public List<MenuDTO> getMyMenus() throws ThingsboardException {
+  public List<MenuDTO> getMyMenus(
+          @RequestParam(value = "needButton", required = false, defaultValue = "true") boolean needButton
+  ) throws ThingsboardException {
     return menuService.getMyMenus(
         getCurrentUser().getCurrentTenantId(),
         getCurrentUser().getCurrentUserId(),
         getCurrentUser().isPtSysadmin(),
-        getCurrentUser().isPtTenantAdmin());
+        getCurrentUser().isPtTenantAdmin(),needButton);
   }
 
   @GetMapping("getMenuIdsByRoleId/{roleId}")

@@ -36,35 +36,42 @@ public class MenuServiceImpl extends AbstractBaseService<MenuMapper, Menu> imple
   public List<MenuDTO> getAllMenus(String tenantId) {
 
     List<Menu> menus =
-        baseMapper.selectList(
-            new QueryWrapper<Menu>().lambda().eq(Menu::getTenantId, tenantId));
+        baseMapper.selectList(new QueryWrapper<Menu>().lambda().eq(Menu::getTenantId, tenantId));
     Map<String, MenuDTO> menuDTOMap = new LinkedHashMap<>(menus.size());
     menus.forEach(menu -> menuDTOMap.put(menu.getId(), menu.getDTO(MenuDTO.class)));
-    return buildMenuDTOTree(menuDTOMap);
+    return buildMenuDTOTree(menuDTOMap,true);
   }
 
   @Override
-  public List<MenuDTO> getMyMenus(String tenantId,String userId,boolean isSysAdmin,boolean isTenantAdmin) {
+  public List<MenuDTO> getMyMenus(
+      String tenantId,
+      String userId,
+      boolean isSysAdmin,
+      boolean isTenantAdmin,
+      boolean needButton) {
     List<MenuDTO> menuDTOs;
     if (isSysAdmin) {
       menuDTOs = baseMapper.selectSysAdminMenu();
-    }
-    else if (isTenantAdmin) {
+    } else if (isTenantAdmin) {
       menuDTOs = baseMapper.selectTenantMenu(tenantId);
-    }
-    else {
+    } else {
       menuDTOs = baseMapper.selectMyMenu(userId);
     }
     Map<String, MenuDTO> menuDTOMap = new LinkedHashMap<>(menuDTOs.size());
     menuDTOs.forEach(menuDTO -> menuDTOMap.put(menuDTO.getId(), menuDTO));
-    return buildMenuDTOTree(menuDTOMap);
+    return buildMenuDTOTree(menuDTOMap, needButton);
   }
 
-  private List<MenuDTO> buildMenuDTOTree(Map<String, MenuDTO> menuDTOMap) {
+  private List<MenuDTO> buildMenuDTOTree(Map<String, MenuDTO> menuDTOMap, boolean needButton) {
     List<MenuDTO> result = Lists.newArrayList();
     for (MenuDTO node : menuDTOMap.values()) {
       MenuDTO parent = menuDTOMap.get(node.getParentId());
       if (parent != null && !(node.getId().equals(parent.getId()))) {
+        if (!needButton) {
+          if (node.getMeta().get("menuType").asText().equals("2")) {
+            continue;
+          }
+        }
         parent.getChildren().add(node);
         continue;
       }
@@ -77,12 +84,11 @@ public class MenuServiceImpl extends AbstractBaseService<MenuMapper, Menu> imple
 
   @Override
   @Transactional
-  public MenuDTO saveMenu(String tenantId,boolean isSysAdmin,MenuDTO menuDTO) {
+  public MenuDTO saveMenu(String tenantId, boolean isSysAdmin, MenuDTO menuDTO) {
     if (menuDTO.getType() == null) {
       menuDTO.setType(MenuTypeEnum.CUSTOM);
     }
-    if (!isSysAdmin
-        && menuDTO.getType().equals(MenuTypeEnum.SYSADMIN)) {
+    if (!isSysAdmin && menuDTO.getType().equals(MenuTypeEnum.SYSADMIN)) {
       throw new AccessDeniedException("Non-system admin cannot save system menu");
     }
     if (menuDTO.getType().equals(MenuTypeEnum.CUSTOM)
@@ -112,7 +118,7 @@ public class MenuServiceImpl extends AbstractBaseService<MenuMapper, Menu> imple
 
   @Override
   @Transactional
-  public MenuDTO updateMenu(String tenantId,boolean isSysAdmin,MenuDTO menuDTO) {
+  public MenuDTO updateMenu(String tenantId, boolean isSysAdmin, MenuDTO menuDTO) {
     Menu menu = baseMapper.selectById(menuDTO.getId());
     if (menu == null) {
       throw new YtDataValidationException("cannot find menu to update");
@@ -134,7 +140,7 @@ public class MenuServiceImpl extends AbstractBaseService<MenuMapper, Menu> imple
 
   @Override
   @Transactional
-  public boolean deleteMenus(String tenantId,String[] menuIds) {
+  public boolean deleteMenus(String tenantId, String[] menuIds) {
     Set<String> ids = Set.of(menuIds);
     // 2. 删除角色对应的menu
     roleMapper.deleteRoleMenuMappingByMenuIds(ids);
@@ -148,7 +154,7 @@ public class MenuServiceImpl extends AbstractBaseService<MenuMapper, Menu> imple
 
   @Override
   @Transactional
-  public boolean assignMenuToTenant(String tenantId,String[] menuId) {
+  public boolean assignMenuToTenant(String tenantId, String[] menuId) {
     Set<String> ids = Set.of(menuId);
     int menuCountInDB =
         baseMapper.selectCount(new QueryWrapper<Menu>().lambda().in(Menu::getId, ids));

@@ -19,7 +19,7 @@ public interface MenuService {
    * @return list 树状menu
    */
   List<MenuDTO> getMyMenus(
-      String tenantId, String userId, boolean isPtSysAdmin, boolean isPtTenantAdmin);
+      String tenantId, String userId, boolean isPtSysAdmin, boolean isPtTenantAdmin,boolean needButton);
 
   MenuDTO saveMenu(String tenantId, boolean isPtSysAdmin, MenuDTO menuDTO);