Merge branch '20220304' into 'master'

feat: 密码找回

See merge request huang/thingsboard3.3.2!55

 package org.thingsboard.server.controller.yunteng;
 
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.util.Assert;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.dto.request.AccountReqDTO;
+import org.thingsboard.server.common.data.yunteng.dto.request.SendResetPasswordEmailMsg;
+import org.thingsboard.server.common.data.yunteng.enums.MsgTemplatePurposeEnum;
 import org.thingsboard.server.dao.yunteng.service.YtSmsService;
+import org.thingsboard.server.dao.yunteng.service.YtUserService;
 
 import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.CHINA_MOBILE_PATTERN;
 
@@ -16,11 +19,24 @@ import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstan
 public class YtNoAuthController {
 
   private final YtSmsService smsService;
+  private final YtUserService userService;
 
   @PostMapping("/sendLoginSmsCode/{phoneNumber}")
   public boolean sendVerificationCode(@PathVariable("phoneNumber") String phoneNumber) {
     Assert.isTrue(
         CHINA_MOBILE_PATTERN.matcher(phoneNumber).matches(), "please input correct phone number");
-    return smsService.sendLoginSmsCode(phoneNumber);
+    return smsService.sendSmsCode(phoneNumber, MsgTemplatePurposeEnum.FOR_LOGIN);
+  }
+
+  @PostMapping("/reset/{userId}")
+  @ApiOperation("密码找回")
+  public void saveForgetPassword(@PathVariable("phoneNumber") String phoneNumber,@RequestBody AccountReqDTO forget) throws ThingsboardException {
+    userService.forgetPassword(phoneNumber,forget);
+  }
+
+  @PostMapping("/resetCode/{phoneNumber}")
+  @ApiOperation("密码找回短信验证码")
+  public void forgetPasswordCode(@PathVariable("phoneNumber") String phoneNumber) {
+    smsService.sendSmsCode(phoneNumber, MsgTemplatePurposeEnum.FOR_FORGET_PASSWORD);
   }
 }

@@ -10,6 +10,7 @@ import org.thingsboard.server.dao.yunteng.service.YtUserService;
 @RestController
 @RequestMapping("/api/yt/tenant")
 @RequiredArgsConstructor
+@Deprecated
 public class YtTenantController extends BaseController {
 
   private final YtUserService userService;

 package org.thingsboard.server.common.data.yunteng.dto;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.DeviceProfileType;
 import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
@@ -50,26 +53,39 @@ public class DeviceProfileDTO extends TenantDTO {
     /**默认消息队列*/
     private String defaultQueueName;
 
+    /**设备配置图片*/
+    private String image;
+    /**是否默认设备配置*/
+    private boolean isDefault;
+    private String type;
+
     public DeviceProfileDTO() {
     }
 
-    public DeviceProfileDTO(UUID id, String name, Long time, String description, DeviceTransportType transportType, UUID defaultRuleChainId) {
+    public DeviceProfileDTO(UUID id, String name, Long time, String description, DeviceTransportType transportType, UUID defaultRuleChainId,boolean isDefault,String image,DeviceProfileType type,Object profileData) {
         setId(id.toString());
         setCreateTime(LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneOffset.UTC));
         this.name = name;
+        this.isDefault = isDefault;
+        this.image = image;
         this.description = description;
+        this.type = type.name();
         this.transportType = transportType.name();
         this.defaultRuleChainId = Optional.ofNullable(defaultRuleChainId).map(chainId -> chainId.toString()).orElse(null);
+        this.profileData = JacksonUtil.convertValue(profileData, DeviceProfileData.class);
+
     }
 
-    public DeviceProfileDTO(UUID id, String name, Long time, String description, String convertJs, DeviceTransportType transportType, DeviceProfileData profileData, String defaultRuleChainId) {
+    public DeviceProfileDTO(UUID id, String name, Long time, String description, DeviceTransportType transportType, String defaultRuleChainId,boolean isDefault,String image,DeviceProfileType type, String convertJs) {
         setId(id.toString());
         setCreateTime(LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneOffset.UTC));
         this.name = name;
+        this.isDefault = isDefault;
+        this.image = image;
         this.description = description;
+        this.type = type.name();
         this.convertJs = convertJs;
         this.transportType = transportType.name();
         this.defaultRuleChainId = defaultRuleChainId.toString();
-        this.profileData = profileData;
     }
 }

@@ -106,9 +106,10 @@ public class YtSmsServiceImpl implements YtSmsService {
     return false;
   }
 
+
   @Override
   @Transactional
-  public boolean sendLoginSmsCode(String phoneNumber) {
+  public boolean sendSmsCode(String phoneNumber,MsgTemplatePurposeEnum purpose) {
     // 检查手机号码是否存在系统，以免乱发消息
     if (userMapper
         .selectList(new QueryWrapper<User>().lambda().eq(User::getPhoneNumber, phoneNumber))
@@ -117,7 +118,7 @@ public class YtSmsServiceImpl implements YtSmsService {
     }
     // 获取是否有验证码存在，防止发送数量过多
     String key =
-        MsgTemplatePurposeEnum.FOR_LOGIN.name()
+        purpose.name()
             + DEFAULT_DELIMITER
             + MessageTypeEnum.PHONE_MESSAGE.name()
             + DEFAULT_DELIMITER
@@ -139,7 +140,7 @@ public class YtSmsServiceImpl implements YtSmsService {
         messageTemplateMapper.selectList(
             new QueryWrapper<MessageTemplate>()
                 .lambda()
-                .eq(MessageTemplate::getTemplatePurpose, MsgTemplatePurposeEnum.FOR_LOGIN.name())
+                .eq(MessageTemplate::getTemplatePurpose, purpose.name())
                 .eq(MessageTemplate::getMessageType, MessageTypeEnum.PHONE_MESSAGE.name()));
     if (messageTemplates.isEmpty()) {
       throw new YtDataValidationException("no sms provider config");
@@ -152,7 +153,7 @@ public class YtSmsServiceImpl implements YtSmsService {
     smsReqDTO.setParams(params);
     smsReqDTO.setPhoneNumbers(phoneNumber);
     smsReqDTO.setId(messageTemplate.getId());
-    smsReqDTO.setTemplatePurpose(MsgTemplatePurposeEnum.FOR_LOGIN.name());
+    smsReqDTO.setTemplatePurpose(purpose.name());
     if (this.sendSms(smsReqDTO)) {
       cacheUtils.put(MOBILE_LOGIN_SMS_CODE, key, new CodeTTL(code, System.currentTimeMillis()));
       return true;

@@ -11,28 +11,34 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.query.TsValue;
+import org.thingsboard.server.common.data.security.UserCredentials;
+import org.thingsboard.server.common.data.security.event.UserAuthDataChangedEvent;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+import org.thingsboard.server.common.data.yunteng.core.cache.CacheUtils;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.NoneTenantAssetException;
 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.request.AccountReqDTO;
-import org.thingsboard.server.common.data.yunteng.dto.request.RoleOrOrganizationReqDTO;
-import org.thingsboard.server.common.data.yunteng.dto.request.SendResetPasswordEmailMsg;
-import org.thingsboard.server.common.data.yunteng.dto.request.SmsReqDTO;
+import org.thingsboard.server.common.data.yunteng.dto.request.*;
 import org.thingsboard.server.common.data.yunteng.enums.MessageTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.MsgTemplatePurposeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.UserStatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
+import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.mapper.*;
 import org.thingsboard.server.dao.yunteng.service.*;
@@ -43,8 +49,9 @@ import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
-import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.CHINA_MOBILE_PATTERN;
-import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.EMAIL_PATTERN;
+import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.*;
+import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.CacheConfigKey.MOBILE_LOGIN_SMS_CODE;
+import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.DEFAULT_DELIMITER;
 import static org.thingsboard.server.common.data.yunteng.constant.ModelConstants.TablePropertyMapping.*;
 
 @Service
@@ -68,6 +75,10 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   public static final String ACTIVATE_URL_PATTERN = "%s/api/noauth/activate?activateToken=%s";
   private final PasswordEncoder passwordEncoder;
 
+  private CacheUtils cacheUtils;
+  private final UserService tbUserService;
+  private final ApplicationEventPublisher eventPublisher;
+
   @Override
   public List<UserDetailsDTO> findUserDetailsByUsername(String username) {
     // 多个租户可能存在多个username相同的情况
@@ -427,6 +438,52 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   }
 
   @Override
+  public void forgetPassword(String phoneNumber,AccountReqDTO forget) {
+    String key =
+            MsgTemplatePurposeEnum.FOR_FORGET_PASSWORD.name()
+                    + DEFAULT_DELIMITER
+                    + MessageTypeEnum.PHONE_MESSAGE.name()
+                    + DEFAULT_DELIMITER
+                    + phoneNumber;
+    boolean correct =
+            cacheUtils
+                    .get(MOBILE_LOGIN_SMS_CODE, key)
+                    .map(
+                            o -> {
+                              CodeTTL codeTTL = (CodeTTL) o;
+                              if (System.currentTimeMillis() - codeTTL.getSendTs() < 5 * 60 * 1000) {
+                                return Objects.equals(codeTTL.getCode(), forget.getUserId());
+                              } else {
+                                return false;
+                              }
+                            })
+                    .orElse(false);
+    if (!correct) {
+      throw new BadCredentialsException("验证码不正确");
+    }
+    String pwd = forget.getPassword();
+    if (StringUtils.isEmpty(pwd)
+            || StringUtils.isEmpty(forget.getResetPassword())
+            || !pwd.equals(forget.getResetPassword())) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+
+    User user = baseMapper.selectOne(new QueryWrapper<User>().lambda().eq(User::getPhoneNumber, phoneNumber));
+
+    UserId userId = new UserId(UUID.fromString(user.getTbUser()));
+    UserCredentials userCredentials =
+            tbUserService.findUserCredentialsByUserId(TenantId.SYS_TENANT_ID, userId);
+
+    String encodePwd = passwordEncoder.encode(pwd);
+    userCredentials.setPassword(encodePwd);
+    user.setPassword(encodePwd);
+    tbUserService.replaceUserCredentials(new TenantId(UUID.fromString(user.getTenantId())), userCredentials);
+    eventPublisher.publishEvent(new UserAuthDataChangedEvent(userId));
+
+    changePassword(user);
+  }
+
+  @Override
   public List<UserDetailsDTO> getUserByPhoneNumber(String phoneNumber) {
     return baseMapper.findUserDetailsByPhoneNumber(phoneNumber);
   }
@@ -586,6 +643,11 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   @Override
   public User validateChangePasswordAccount(AccountReqDTO accountReqDTO) {
     User user = baseMapper.selectById(accountReqDTO.getUserId());
+    checkPassword(accountReqDTO, user);
+    return user;
+  }
+
+  private void checkPassword(AccountReqDTO accountReqDTO, User user) {
     if (null == user
         || StringUtils.isEmpty(accountReqDTO.getPassword())
         || StringUtils.isEmpty(accountReqDTO.getResetPassword())) {
@@ -597,7 +659,6 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
       throw new YtDataValidationException(ErrorMessage.USERNAME_PASSWORD_INCORRECT.getMessage());
     }
     user.setPassword(accountReqDTO.getResetPassword());
-    return user;
   }
 
   /**

@@ -30,7 +30,7 @@ import java.util.UUID;
 public interface YtDeviceProfileRepository extends JpaRepository<DeviceProfileEntity, UUID> {
 
 
-    @Query("SELECT new org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO(d.id, d.name, d.createdTime,d.description, d.transportType, d.defaultRuleChainId) " +
+    @Query("SELECT new org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO(d.id, d.name, d.createdTime,d.description, d.transportType, d.defaultRuleChainId,d.isDefault,d.image,d.type,d.profileData) " +
             "FROM DeviceProfileEntity d WHERE " +
             "d.tenantId = :tenantId AND d.transportType = :transportType AND LOWER(d.searchText) LIKE LOWER(CONCAT('%', :textSearch, '%'))")
     Page<DeviceProfileDTO> findDeviceProfileInfos(@Param("tenantId") UUID tenantId,
@@ -38,7 +38,7 @@ public interface YtDeviceProfileRepository extends JpaRepository<DeviceProfileEn
                                                   @Param("transportType") DeviceTransportType transportType,
                                                   Pageable pageable);
 
-    @Query("SELECT new org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO(d.id, d.name, d.createdTime,d.description, d.transportType, d.defaultRuleChainId) " +
+    @Query("SELECT new org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO(d.id, d.name, d.createdTime,d.description, d.transportType, d.defaultRuleChainId,d.isDefault,d.image,d.type,d.profileData) " +
             "FROM DeviceProfileEntity d WHERE " +
             "d.tenantId = :tenantId  AND LOWER(d.searchText) LIKE LOWER(CONCAT('%', :textSearch, '%'))")
     Page<DeviceProfileDTO> findDeviceProfileInfos(@Param("tenantId") UUID tenantId,
@@ -46,7 +46,7 @@ public interface YtDeviceProfileRepository extends JpaRepository<DeviceProfileEn
                                                   Pageable pageable);
 
 
-    @Query("SELECT new org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO(d.id, d.name, d.createdTime,d.description, d.transportType, d.defaultRuleChainId) " +
+    @Query("SELECT new org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO(d.id, d.name, d.createdTime,d.description, d.transportType, d.defaultRuleChainId,d.isDefault,d.image,d.type,d.profileData) " +
             "FROM DeviceProfileEntity d WHERE d.tenantId = :tenantId ")
     List<DeviceProfileDTO> findDeviceProfileByTenantId(@Param("tenantId") UUID tenantId);
 

@@ -2,9 +2,16 @@ package org.thingsboard.server.dao.yunteng.service;
 
 
 import org.thingsboard.server.common.data.yunteng.dto.request.SmsReqDTO;
+import org.thingsboard.server.common.data.yunteng.enums.MsgTemplatePurposeEnum;
 
 public interface YtSmsService {
   boolean sendSms(SmsReqDTO smsReqDTO);
 
-  boolean sendLoginSmsCode(String phoneNumber);
+  /**
+   * 推送短信验证码
+   * @param phoneNumber   手机号
+   * @param purpose        模板用途
+   * @return
+   */
+  boolean sendSmsCode(String phoneNumber, MsgTemplatePurposeEnum purpose);
 }

@@ -42,6 +42,8 @@ public interface YtUserService {
 
   void resetPassword(String userId, boolean isPtSysadmin, String tenantId);
 
+  void forgetPassword(String phoneNumber,AccountReqDTO forget);
+
   List<UserDetailsDTO> getUserByPhoneNumber(String phoneNumber);
 
   void validateUserNameAndPhoneNumberAndEmail(UserDTO userDTO);

@@ -3,10 +3,8 @@
  */
 package org.thingsboard.rule.engine.yunteng.scene;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import lombok.extern.slf4j.Slf4j;
-import org.thingsboard.common.util.JacksonUtil;
-import org.thingsboard.rule.engine.action.TbAlarmResult;
+import org.jetbrains.annotations.NotNull;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.device.profile.AlarmCondition;
@@ -14,7 +12,6 @@ import org.thingsboard.server.common.data.device.profile.AlarmConditionFilter;
 import org.thingsboard.server.common.data.device.profile.AlarmConditionFilterKey;
 import org.thingsboard.server.common.data.rule.RuleNodeState;
 import org.thingsboard.server.common.data.yunteng.dto.TriggerDTO;
-import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
@@ -41,6 +38,12 @@ class ReactState {
      */
     private ConcurrentHashMap<String, TriggerState> triggerState = new ConcurrentHashMap<>();
 
+    /**场景联动的执行条件状态
+     * 键：设备主键
+     * 值：设备指标参与的触发器
+     */
+    private ConcurrentHashMap<String, TriggerState> conditionState = new ConcurrentHashMap<>();
+
 
 
 
@@ -71,18 +74,36 @@ class ReactState {
     public void process(TbContext ctx, TbMsg msg,String deviceId) throws ExecutionException, InterruptedException {
         TriggerState triggerState = getOrCreateTriggerState(deviceId);
         boolean matched = false;
-        if(triggerState != null && actions != null){
+        if( actions != null){
+            ctx.tellSuccess(msg);
+        }
+
+        if(triggerState != null){
             matched = triggerState.process(ctx,msg);
         }
 
-        if(matched){
-            // TODO 执行条件
+
+        if(matched && conditions != null ){
+            matched = false;
+            for(DoCondition item:conditions){
+                TriggerState conditionState = getOrCreateConditionState(item.getEntityId(),item.getTriggerCondition());
+                boolean result = false;
+                if( conditionState != null){
+                    result =conditionState.process(ctx,msg);
+                }
+                if( result){
+                    matched = true;
+                    break;
+                }
+            }
         }
 
         if(matched){
             for(DoAction item: actions){
                 pushMsg(ctx, msg,  item);
             }
+        }else{
+            ctx.tellSuccess(msg);
         }
 
     }
@@ -99,18 +120,35 @@ class ReactState {
         TriggerService triggerService = SpringBeanUtils.getBean(TriggerService.class);
         TriggerDTO trigger =triggerService.getTrigger(reactId,deviceId);
         if(trigger != null){
-            AlarmCondition condition = trigger.getTriggerCondition();
-            Set<AlarmConditionFilterKey> filterKeys = new HashSet<>();
-            for(AlarmConditionFilter filter :condition.getCondition()){
-                filterKeys.add(filter.getKey());
-            }
-            TriggerState state = new TriggerState(deviceId,condition, filterKeys,null);
+            TriggerState state = createTriggerState(deviceId, trigger.getTriggerCondition());
             triggerState.put(deviceId, state);
-            return  state;
+            return state;
         }
         return null;
     }
 
+    protected TriggerState getOrCreateConditionState(String deviceId,AlarmCondition condition) {
+        if(conditionState.containsKey(deviceId)){
+            return conditionState.get(deviceId);
+        }else{
+            TriggerState state = createTriggerState(deviceId, condition);
+            conditionState.put(deviceId, state);
+            return  state;
+        }
+
+    }
+
+    @NotNull
+    private TriggerState createTriggerState(String deviceId, AlarmCondition condition) {
+        Set<AlarmConditionFilterKey> filterKeys = new HashSet<>();
+        for(AlarmConditionFilter filter :condition.getCondition()){
+            filterKeys.add(filter.getKey());
+        }
+        TriggerState state = new TriggerState(deviceId,condition, filterKeys,null);
+
+        return  state;
+    }
+
     private void pushMsg(TbContext ctx, TbMsg msg, DoAction action) {
         TbMsgMetaData metaData = //lastMsgMetaData != null ? lastMsgMetaData.copy() :
                 new TbMsgMetaData();

@@ -110,6 +110,7 @@ public class TbSceneReactNode implements TbNode {
     @Override
     public void onPartitionChangeMsg(TbContext ctx, PartitionChangeMsg msg) {
         // Cleanup the cache for all entities that are no longer assigned to current server partitions
+        reactStates.clear();
     }
 
     protected ReactState getOrCreateReactState(TbContext ctx, TbSceneReactNodeConfig config, String sceneId) {