Merge branch '20220829' into 'master'

feat: 默认密码是否需要重置

See merge request huang/thingsboard3.3.2!125

@@ -54,12 +54,12 @@ public class YtTenantController extends AbstractUserAccount {
     SendResetPasswordEmailMsg msg = new SendResetPasswordEmailMsg();
     msg.setUserId(userId);
     msg.setMessageTypeEnum(MessageTypeEnum.PHONE_MESSAGE);
-    userService.sendRestPasswordMsg(msg);
+    userService.sendRestPasswordMsg(getCurrentUser().getCurrentTenantId(),msg);
   }
 
 
   @PostMapping("/sendRestPasswordMsg")
-  public void resetPassword(@RequestBody SendResetPasswordEmailMsg msg) {
-    userService.sendRestPasswordMsg(msg);
+  public void resetPassword(@RequestBody SendResetPasswordEmailMsg msg) throws ThingsboardException {
+    userService.sendRestPasswordMsg(getCurrentUser().getCurrentTenantId(),msg);
   }
 }

@@ -1154,6 +1154,7 @@ account:
     emailSuffix: ${ACCOUNT_EMAIL_SUFFIX:yunteng.com}
 #    emailSuffix: thingskit.com
     defaultPassword: 123456
+    reset: ${ACCOUNT_PASSWORD_FORCE_RESET:true}
 third:
   wechat:
     url: https://api.weixin.qq.com

@@ -10,6 +10,7 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.yunteng.common.YtCommonService;
 import org.thingsboard.server.common.data.yunteng.common.aspect.annotation.AutoDict;
@@ -27,6 +28,7 @@ import java.util.List;
 @Component
 @Slf4j
 @RequiredArgsConstructor
+@ConditionalOnExpression("('${service.type:null}'=='monolith' || '${service.type:null}'=='tb-core') ")
 public class SysDictAspect {
 
   private final YtCommonService commonService;

@@ -36,7 +36,7 @@ public enum ErrorMessage {
   USERNAME_IS_IMMUTABLE(400017,"用户账号不可变"),
   CONFIG_IS_DISABLE(400018,"配置未启用"),
   IT_CANT_EQUAL_ITSELF(400019,"父级组织不可以为本身"),
-  TARGET_TEMPLATE_NOT_EXISTS(400020,"目标模板不存在"),
+  TARGET_TEMPLATE_NOT_EXISTS(400020,"不存在可用的消息模板"),
   DEVICE_NOT_EXISTENCE_IN_TENANT(400021,"当前租户下不存在该设备"),
   DEVICE_RELATION_IS_ABSENT(400022,"设备关联关系已不存在"),
   DATA_IS_DELETED(400023,"数据已经删除"),
@@ -59,7 +59,7 @@ public enum ErrorMessage {
   DEVICE_LOSED(400039,"设备相关参数丢失"),
   SCENE_REACT_NOT_EXTIED(400040,"场景联动不存在"),
   DEVICE_USED_SCENE_REACT(400041,"场景联动【%s】正在使用该设备"),
-  SCENE_REACT_USED_ALARM_PROFILE(400042,"场景联动正在使用该告警配置"),
+  SCENE_REACT_USED_ALARM_PROFILE(400042,"场景联动【%s】正在使用该告警配置"),
   APP_USER_BINDED(400043,"平台用户【%s】已被其它账号绑定"),
   THIRD_PLATFORM_EXCEPTION(400044,"【%s】，第三方异常【%s】"),
   DEVICE_NOT_EXTIED(400045,"设备不存在"),

@@ -10,4 +10,5 @@ import org.springframework.stereotype.Component;
 public class AccountProperties {
     private String emailSuffix;
     private String defaultPassword;
+    private Boolean reset;
 }

 package org.thingsboard.server.dao.yunteng.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -15,8 +16,10 @@ import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.AlarmProfile;
+import org.thingsboard.server.dao.yunteng.entities.SceneLinkage;
 import org.thingsboard.server.dao.yunteng.mapper.AlarmProfileMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
+import org.thingsboard.server.dao.yunteng.mapper.SceneLinkageMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AlarmProfileService;
 import org.thingsboard.server.dao.yunteng.service.DoActionService;
@@ -35,6 +38,7 @@ public class AlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileMap
     private final UserOrganizationMappingServiceImpl userOrganizationMappingService;
 
     private final OrganizationMapper ytOrganizationMapper;
+    private final SceneLinkageMapper sceneLinkageMapper;
 
     @Override
     public YtPageData<AlarmProfileDTO> page(
@@ -74,10 +78,9 @@ public class AlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileMap
             if (!alarmProfile.getOrganizationId().equals(alarmProfileDTO.getOrganizationId())) {
                 Set<String> profiles = new HashSet<>();
                 profiles.add(alarmProfileDTO.getId());
-                List<DoActionDTO> list =
-                        doActionService.findDoActionByAlarmProfileIds(alarmProfileDTO.getTenantId(), profiles);
-                if (list.size() > FastIotConstants.MagicNumber.ZERO) {
-                    throw new YtDataValidationException(ErrorMessage.SCENE_REACT_USED_ALARM_PROFILE.getMessage());
+                Set<String>names = alarmProfileUsed(alarmProfileDTO.getTenantId(), profiles);
+                if(!names.isEmpty()){
+                    throw new YtDataValidationException(String.format(ErrorMessage.SCENE_REACT_USED_ALARM_PROFILE.getMessage(), names));
                 }
             }
             baseMapper.updateById(alarmProfileDTO.getEntity(AlarmProfile.class));
@@ -106,13 +109,32 @@ public class AlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileMap
     @Override
     @Transactional
     public boolean deleteAlarmProFile(DeleteDTO deleteDTO) {
+        Set<String>names = alarmProfileUsed(deleteDTO.getTenantId(), deleteDTO.getIds());
+        if(!names.isEmpty()){
+            throw new YtDataValidationException(String.format(ErrorMessage.SCENE_REACT_USED_ALARM_PROFILE.getMessage(), names));
+        }
+        return baseMapper.deleteBatchIds(deleteDTO.getIds()) > 0;
+    }
+
+    private Set<String> alarmProfileUsed(String tenantId, Set<String> profileIds) {
+
+        Set<String> sceneNames = new HashSet<>();
         // 如果有场景联动使用告警配置，则不能删除
         List<DoActionDTO> list =
-                doActionService.findDoActionByAlarmProfileIds(deleteDTO.getTenantId(), deleteDTO.getIds());
+                doActionService.findDoActionByAlarmProfileIds(tenantId, profileIds);
         if (list.size() > FastIotConstants.MagicNumber.ZERO) {
-            throw new YtDataValidationException(ErrorMessage.EXIST_LEADER_MEMBER_RELATION.getMessage());
+            Set<String> sceneIds = new HashSet<>();
+            for(DoActionDTO action:list){
+                sceneIds.add(action.getSceneLinkageId());
+            }
+            List<SceneLinkage> scenes = sceneLinkageMapper.selectList(new QueryWrapper<SceneLinkage>().lambda()
+                    .eq(SceneLinkage::getId, sceneIds)
+            );
+            for(SceneLinkage item: scenes){
+                sceneNames.add(item.getName());
+            }
         }
-        return baseMapper.deleteBatchIds(deleteDTO.getIds()) > 0;
+        return sceneNames;
     }
 
     @Override

@@ -6,10 +6,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.yunteng.dto.AlarmInfoDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.EmailReqDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.SmsReqDTO;
-import org.thingsboard.server.common.data.yunteng.enums.AssetStatusEnum;
-import org.thingsboard.server.common.data.yunteng.enums.EmailFormatEnum;
-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.*;
 import org.thingsboard.server.common.data.yunteng.utils.YtDateTimeUtils;
 import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.mapper.*;
@@ -65,8 +62,10 @@ public class YtNoticeServiceImpl implements YtNoticeService {
                 .eq(Organization::getId, device.getOrganizationId());
         Organization organization = organizationMapper.selectOne(organizationQueryWrapper);
 
-
-        AlarmProfile alarmProfile = alarmProfileMapper.selectById(profileId);
+        QueryWrapper<AlarmProfile> profileQueryWrapper = new QueryWrapper<AlarmProfile>();
+        profileQueryWrapper.lambda()
+                .eq(AlarmProfile::getId, profileId).eq(AlarmProfile::getStatus, StatusEnum.ENABLE.ordinal());
+        AlarmProfile alarmProfile = alarmProfileMapper.selectOne(profileQueryWrapper);
 
 
         if (alarmProfile == null || alarmProfile.getAlarmContactId().isEmpty() || alarmProfile.getMessageMode().isEmpty()) {

@@ -145,7 +145,7 @@ public class YtSmsServiceImpl implements YtSmsService {
                     .eq(MessageTemplate::getTemplatePurpose, purpose.name())
                     .eq(MessageTemplate::getMessageType, MessageTypeEnum.PHONE_MESSAGE.name()));
     if (messageTemplates.isEmpty()) {
-      throw new YtDataValidationException("no sms provider config");
+      throw new YtDataValidationException(ErrorMessage.TARGET_TEMPLATE_NOT_EXISTS.getMessage());
     }
     String code = RandomStringUtils.randomNumeric(6);
     LinkedHashMap<String, String> params = new LinkedHashMap<>();

@@ -233,7 +233,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   public UserInfoDTO me(String userId, String tenantId, Set<String> currentRoles) {
     User user = baseMapper.selectById(userId);
     UserInfoDTO userInfoDTO = new UserInfoDTO();
-    if (!StringUtils.isEmpty(user.getActivateToken())) {
+    if (!accountProperties.getReset() || !StringUtils.isEmpty(user.getActivateToken())) {
       userInfoDTO.setNeedSetPwd(false);
     }
     AtomicReference<LocalDateTime> expireTime = new AtomicReference<>(user.getAccountExpireTime());
@@ -510,7 +510,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   }
 
   @Override
-  public void sendRestPasswordMsg(SendResetPasswordEmailMsg msg) {
+  public void sendRestPasswordMsg(String tenantId,SendResetPasswordEmailMsg msg) {
     // 通过用户ID查询用户信息
     User user = baseMapper.selectById(msg.getUserId());
     if (null == user) {
@@ -522,6 +522,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     String messageType = msg.getMessageTypeEnum().name();
     messageTemplateDTO.setMessageType(messageType);
     messageTemplateDTO.setTemplatePurpose(MsgTemplatePurposeEnum.FOR_SET_PASSWORD.name());
+    messageTemplateDTO.setTenantId(tenantId);
     messageTemplateDTO.setStatus(1);
     List<MessageTemplateDTO> templateDTOList =
         messageTemplateService.findMessageTemplate(messageTemplateDTO);

@@ -54,7 +54,7 @@ public interface YtUserService {
    *
    * @param msg 请求信息
    */
-  void sendRestPasswordMsg(SendResetPasswordEmailMsg msg);
+  void sendRestPasswordMsg(String tenantId,SendResetPasswordEmailMsg msg);
 
   /**
    * 判断账号是否注册过