Merge branch '20220601' into 'master'

feat: 按钮级权限控制

See merge request huang/thingsboard3.3.2!105

@@ -56,10 +56,12 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 public class YtDeviceController extends BaseController {
 public class YtDeviceController extends BaseController {
     private final YtDeviceService deviceService;
     private final YtDeviceService deviceService;
     private final DeviceService tbDeviceService;
     private final DeviceService tbDeviceService;
+    String sePL = new Date().toString();
 
 
     @PostMapping
     @PostMapping
     @ApiOperation("创建|编辑")
     @ApiOperation("创建|编辑")
-    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
+//    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
+    @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{})")
     public ResponseEntity<DeviceDTO> saveDevice(
     public ResponseEntity<DeviceDTO> saveDevice(
             @Validated(AddGroup.class) @RequestBody DeviceDTO deviceDTO) throws ThingsboardException, ExecutionException, InterruptedException {
             @Validated(AddGroup.class) @RequestBody DeviceDTO deviceDTO) throws ThingsboardException, ExecutionException, InterruptedException {
         String currentTenantId = getCurrentUser().getCurrentTenantId();
         String currentTenantId = getCurrentUser().getCurrentTenantId();

+package org.thingsboard.server.controller.yunteng.permission;
+
+import com.alibaba.excel.util.StringUtils;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.dao.yunteng.service.RoleService;
+import org.thingsboard.server.service.security.model.SecurityUser;
+
+import java.util.List;
+import java.util.Set;
+
+@Service("check")
+@Slf4j
+@RequiredArgsConstructor
+public class PermissionTools {
+
+    private final RoleService roleService;
+
+    /**
+     * 接口权限校验
+     *
+     * @param needRoles      接口访问所需角色
+     * @param needPermission 接口访问所需权限
+     * @return
+     */
+    public Boolean checkPermissions(List<String> needRoles, Set<String> needPermission) {
+        SecurityUser securityUser = null;
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        if (authentication != null && authentication.getPrincipal() instanceof SecurityUser) {
+            securityUser = (SecurityUser) authentication.getPrincipal();
+        }
+        if (securityUser == null) {
+            return false;
+        }
+        Set<String> userRoles = securityUser.getRoles();
+        if (needRoles != null && !needRoles.isEmpty()) {
+            if (userRoles == null) {
+                return false;
+            }
+            boolean roleMatched = userRoles.stream().anyMatch(f -> needRoles.contains(f));
+            if (!roleMatched) {
+                return false;
+            }
+        }
+
+        if (needPermission != null && !needPermission.isEmpty()) {
+            Set<String> userPermissions = roleService.getPermissions(securityUser.isPtSysadmin(), securityUser.isPtTenantAdmin(), securityUser.getCurrentTenantId(), securityUser.getCurrentUserId());
+            if (userPermissions == null || userPermissions.isEmpty()) {
+                return false;
+            }
+            boolean permissionMatched = userPermissions.stream().anyMatch(f -> needPermission.contains(f));
+            if (!permissionMatched) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

 package org.thingsboard.server.dao.yunteng.impl;
 package org.thingsboard.server.dao.yunteng.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -9,8 +10,14 @@ import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.dto.*;
+import org.thingsboard.server.dao.yunteng.entities.ConfigurationAct;
 import org.thingsboard.server.dao.yunteng.entities.ConfigurationContent;
 import org.thingsboard.server.dao.yunteng.entities.ConfigurationContent;
+import org.thingsboard.server.dao.yunteng.entities.ConfigurationDatasource;
+import org.thingsboard.server.dao.yunteng.entities.ConfigurationEvent;
+import org.thingsboard.server.dao.yunteng.mapper.ConfigurationActMapper;
 import org.thingsboard.server.dao.yunteng.mapper.ConfigurationContentMapper;
 import org.thingsboard.server.dao.yunteng.mapper.ConfigurationContentMapper;
+import org.thingsboard.server.dao.yunteng.mapper.ConfigurationDatasourceMapper;
+import org.thingsboard.server.dao.yunteng.mapper.ConfigurationEventMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.YtConfigurationContentService;
 import org.thingsboard.server.dao.yunteng.service.YtConfigurationContentService;
 import java.util.List;
 import java.util.List;
@@ -22,6 +29,9 @@ import java.util.Set;
 public class YtConfigurationContentServiceImpl
 public class YtConfigurationContentServiceImpl
     extends AbstractBaseService<ConfigurationContentMapper, ConfigurationContent>
     extends AbstractBaseService<ConfigurationContentMapper, ConfigurationContent>
     implements YtConfigurationContentService {
     implements YtConfigurationContentService {
+  private final ConfigurationDatasourceMapper datasourceMapper;
+  private final ConfigurationEventMapper eventMapper;
+  private final ConfigurationActMapper actMapper;
 
 
   @Override
   @Override
   @Transactional
   @Transactional
@@ -62,6 +72,18 @@ public class YtConfigurationContentServiceImpl
   @Override
   @Override
   @Transactional
   @Transactional
   public boolean deleteConfigurationContentByCenterId(Set<String> configurationCenterIds) {
   public boolean deleteConfigurationContentByCenterId(Set<String> configurationCenterIds) {
+    LambdaQueryWrapper<ConfigurationDatasource> dataFilter = new QueryWrapper<ConfigurationDatasource>().lambda()
+            .in(ConfigurationDatasource::getConfigurationId,configurationCenterIds);
+    datasourceMapper.delete(dataFilter);
+
+    LambdaQueryWrapper<ConfigurationEvent> eventFilter = new QueryWrapper<ConfigurationEvent>().lambda()
+            .in(ConfigurationEvent::getConfigurationId,configurationCenterIds);
+    eventMapper.delete(eventFilter);
+
+    LambdaQueryWrapper<ConfigurationAct> actFilter = new QueryWrapper<ConfigurationAct>().lambda()
+            .in(ConfigurationAct::getConfigurationId,configurationCenterIds);
+    actMapper.delete(actFilter);
+
     return baseMapper.delete(
     return baseMapper.delete(
             new LambdaQueryWrapper<ConfigurationContent>()
             new LambdaQueryWrapper<ConfigurationContent>()
                 .in(ConfigurationContent::getConfigurationId, configurationCenterIds))
                 .in(ConfigurationContent::getConfigurationId, configurationCenterIds))

@@ -111,9 +111,9 @@ public class YtSmsServiceImpl implements YtSmsService {
   @Transactional
   @Transactional
   public boolean sendSmsCode(String phoneNumber,MsgTemplatePurposeEnum purpose) {
   public boolean sendSmsCode(String phoneNumber,MsgTemplatePurposeEnum purpose) {
     // 检查手机号码是否存在系统，以免乱发消息
     // 检查手机号码是否存在系统，以免乱发消息
-    if (userMapper
-        .selectList(new QueryWrapper<User>().lambda().eq(User::getPhoneNumber, phoneNumber))
-        .isEmpty()) {
+    List<User> users = userMapper
+            .selectList(new QueryWrapper<User>().lambda().eq(User::getPhoneNumber, phoneNumber));
+    if (users.isEmpty()) {
       throw new YtDataValidationException("电话号码未在系统注册，请联系你的管理员");
       throw new YtDataValidationException("电话号码未在系统注册，请联系你的管理员");
     }
     }
     // 获取是否有验证码存在，防止发送数量过多
     // 获取是否有验证码存在，防止发送数量过多
@@ -140,8 +140,10 @@ public class YtSmsServiceImpl implements YtSmsService {
         messageTemplateMapper.selectList(
         messageTemplateMapper.selectList(
             new QueryWrapper<MessageTemplate>()
             new QueryWrapper<MessageTemplate>()
                 .lambda()
                 .lambda()
-                .eq(MessageTemplate::getTemplatePurpose, purpose.name())
-                .eq(MessageTemplate::getMessageType, MessageTypeEnum.PHONE_MESSAGE.name()));
+                    .eq(MessageTemplate::getTenantId, users.get(0).getTenantId())
+                    .eq(MessageTemplate::getStatus, 1)
+                    .eq(MessageTemplate::getTemplatePurpose, purpose.name())
+                    .eq(MessageTemplate::getMessageType, MessageTypeEnum.PHONE_MESSAGE.name()));
     if (messageTemplates.isEmpty()) {
     if (messageTemplates.isEmpty()) {
       throw new YtDataValidationException("no sms provider config");
       throw new YtDataValidationException("no sms provider config");
     }
     }

@@ -7,7 +7,9 @@
         SELECT sus.*
         SELECT sus.*
         FROM iotfs_third_user base
         FROM iotfs_third_user base
         LEFT JOIN sys_user sus ON base.app_user_id = sus.id
         LEFT JOIN sys_user sus ON base.app_user_id = sus.id
+        LEFT JOIN sys_tenant ste ON ste.tenant_id = sus.tenant_id
         <where>
         <where>
+            sus.account_expire_time > CURRENT_TIMESTAMP  and ste.tenant_expire_time > CURRENT_TIMESTAMP
             <if test="thirdId !=null and thirdId !=''">
             <if test="thirdId !=null and thirdId !=''">
                 AND base.third_user_id = #{thirdId}
                 AND base.third_user_id = #{thirdId}
             </if>
             </if>