Merge branch '20220922' into 'master'

20220922 See merge request huang/thingsboard3.3.2!135

Merge branch '20220922' into 'master'
20220922 See merge request huang/thingsboard3.3.2!135
xp.Huang
2 parents f95eb166 f51e73c0
Showing 7 changed files with 132 additions and 62 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/HomePageController.java
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/message/ErrorMessage.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/HomePageServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtMailServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtSmsServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtUserServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/service/HomePageService.java
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/HomePageController.java
View file @3231a48
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/HomePageController.java
View file @3231a48
@@ -2,14 +2,12 @@ package org.thingsboard.server.controller.yunteng;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.query.TsValue;
@@ -18,6 +16,7 @@ import org.thingsboard.server.common.data.yunteng.dto.HomePageLeftTopDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TenantTransportMessageDTO;
 import org.thingsboard.server.common.data.yunteng.dto.statistics.HomePageAppDTO;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TrendType;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
@@ -103,13 +102,13 @@ public class HomePageController extends BaseController {
     @GetMapping("app")
     @ApiOperation(value = "小程序首页统计信息")
-    public ResponseEntity<HomePageAppDTO> appStatistics()
+    public ResponseEntity<HomePageAppDTO> appStatistics(@ApiParam(value = "只取告警数据") @RequestParam("login") Boolean login)
             throws ThingsboardException, ExecutionException, InterruptedException {
         SecurityUser user = getCurrentUser();
         if(user == null){
             return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
         }
-        HomePageAppDTO app = homePageService.app(user.isPtSysadmin(),user.isPtAdmin(),user.isPtTenantAdmin(),user.getTenantId(),user.getCustomerId());
+        HomePageAppDTO app = homePageService.app(login,user.isPtSysadmin(),user.isPtAdmin(),user.isPtTenantAdmin(),user.getTenantId(),user.getCustomerId());
         return ResponseEntity.ok(app);
     }
 }
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/message/ErrorMessage.java
View file @3231a48
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/message/ErrorMessage.java
View file @3231a48
@@ -37,9 +37,9 @@ public enum ErrorMessage {
   USER_NOT_EXISTS(400015,"用户不存在"),
   ENABLED_CONFIG_IS_EXISTED(400016,"已启用同类型配置"),
   USERNAME_IS_IMMUTABLE(400017,"用户账号不可变"),
-  CONFIG_IS_DISABLE(400018,"配置未启用"),
+  MESSAGE_CONFIG_NOT_EXISTS(400018,"消息配置不存在或未启用"),
   IT_CANT_EQUAL_ITSELF(400019,"父级组织不可以为本身"),
-  TARGET_TEMPLATE_NOT_EXISTS(400020,"不存在可用的消息模板"),
+  MESSAGE_TEMPLATE_NOT_EXISTS(400020,"消息模板不存在或未启用！"),
   DEVICE_NOT_EXISTENCE_IN_TENANT(400021,"当前租户下不存在该设备"),
   DEVICE_RELATION_IS_ABSENT(400022,"设备关联关系已不存在"),
   DATA_IS_DELETED(400023,"数据已经删除"),
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/HomePageServiceImpl.java
View file @3231a48
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/HomePageServiceImpl.java
View file @3231a48
@@ -115,7 +115,7 @@ public class HomePageServiceImpl implements HomePageService {
     }
     @Override
-    public HomePageAppDTO app(boolean isPtSysAdmin, boolean isPtAdmin, boolean isTenantAdmin, EntityId tenantId, EntityId customerId) {
+    public HomePageAppDTO app(Boolean login,boolean isPtSysAdmin, boolean isPtAdmin, boolean isTenantAdmin, EntityId tenantId, EntityId customerId) {
         /**
          * 如果当前用户是超级管理员或平台管理员，查询所有的租户数量、客户、设备
          * 如果当前用户是租户管理员，查询租户下的所有              客户、设备、告警、消息量
@@ -135,6 +135,15 @@ public class HomePageServiceImpl implements HomePageService {
         Map<String, Object> todayFilter = buildCountFilter(entityId,startTime,endTime);
         HomePageAppDTO app = new HomePageAppDTO();
+
+        if (!isPtSysAdmin && !isPtAdmin ) {
+            app.setTotalAlarm(getAlarmInfo(totalFilter));
+            app.setTodayAlarm(getAlarmInfo(todayFilter));
+        }
+        if(login){
+            return app;
+        }
+
         if (isPtSysAdmin || isPtAdmin) {
             List<TenantDTO> tenants = getTenantInfo();
             AtomicInteger totalExpired = new AtomicInteger();
@@ -192,10 +201,7 @@ public class HomePageServiceImpl implements HomePageService {
             app.setTodayCustomer(today);
         }
-        if (!isPtSysAdmin && !isPtAdmin ) {
-            app.setTotalAlarm(getAlarmInfo(totalFilter));
-            app.setTodayAlarm(getAlarmInfo(todayFilter));
-        }
+
         if (!isPtSysAdmin && !isPtAdmin ) {
             app.setTotalMsg(getFlowStatistics(totalFilter));
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtMailServiceImpl.java
View file @3231a48
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtMailServiceImpl.java
View file @3231a48
 package org.thingsboard.server.dao.yunteng.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import jakarta.mail.*;
 import jakarta.mail.internet.InternetAddress;
@@ -14,6 +15,7 @@ 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.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.request.EmailReqDTO;
+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.ResponseCodeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
@@ -45,15 +47,38 @@ public class YtMailServiceImpl implements YtMailService {
   @Override
   public boolean sendEmail(EmailReqDTO emailReqDTO) {
     boolean result =false;
-    //查询模板信息
-    MessageTemplate messageTemplate = messageTemplateMapper.selectById(emailReqDTO.getId());
-    if(null == messageTemplate){
-      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
-    }
-    MessageConfig messageConfig =messageConfigMapper.selectById(messageTemplate.getMessageConfigId());
-    if (messageConfig.getStatus() != FastIotConstants.StateValue.ENABLE) {
-      throw new YtDataValidationException(ErrorMessage.CONFIG_IS_DISABLE.getMessage());
-    }
+
+
+
+      /**消息模板是否可用*/
+      QueryWrapper<MessageTemplate> messageTemplateQueryWrapper = new QueryWrapper<MessageTemplate>();
+      messageTemplateQueryWrapper.lambda()
+              .eq(MessageTemplate::getId, emailReqDTO.getId())
+              .eq(MessageTemplate::getStatus, AssetStatusEnum.ENABLE.ordinal());
+      MessageTemplate messageTemplate = messageTemplateMapper.selectOne(messageTemplateQueryWrapper);
+      if (null == messageTemplate) {
+          throw new YtDataValidationException(ErrorMessage.MESSAGE_TEMPLATE_NOT_EXISTS.getMessage());
+      }
+
+      /**消息配置是否可用*/
+      QueryWrapper<MessageConfig> configQueryWrapper = new QueryWrapper<>();
+      configQueryWrapper.lambda()
+              .eq(MessageConfig::getId, messageTemplate.getMessageConfigId())
+              .eq(MessageConfig::getStatus, AssetStatusEnum.ENABLE.ordinal());
+      MessageConfig messageConfig =
+              messageConfigMapper.selectOne(configQueryWrapper);
+      if (null == messageConfig) {
+          throw new YtDataValidationException(ErrorMessage.MESSAGE_CONFIG_NOT_EXISTS.getMessage());
+      }
+
+
+
+
+
+
+
+
+
     JsonNode configNode = messageConfig.getConfig();
     EmailConfiguration emailConfiguration = JacksonUtil.convertValue(configNode, EmailConfiguration.class);
      if(emailConfiguration !=null){
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtSmsServiceImpl.java
View file @3231a48
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtSmsServiceImpl.java
View file @3231a48
@@ -19,6 +19,7 @@ import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidatio
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.request.CodeTTL;
 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.MessageTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.MsgTemplatePurposeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ResponseCodeEnum;
@@ -65,43 +66,59 @@ public class YtSmsServiceImpl implements YtSmsService {
     if (StringUtils.isEmpty(phoneNumbers) || StringUtils.isEmpty(templateId)) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
-    MessageTemplate messageTemplate = messageTemplateMapper.selectById(templateId);
-    if (null != messageTemplate) {
-      MessageConfig messageConfig =
-          messageConfigMapper.selectById(messageTemplate.getMessageConfigId());
-      JsonNode configJsonNode = messageConfig.getConfig();
-      ObjectNode configObjectNode = (ObjectNode) configJsonNode;
-      configObjectNode.put("type", messageConfig.getPlatformType());
-      SmsProviderConfiguration smsProviderConfiguration =
-          JacksonUtil.convertValue(configObjectNode, SmsProviderConfiguration.class);
-      if (null != smsProviderConfiguration) {
-        SmsSender smsSender = ytDefaultSmsSenderFactory.createSmsSender(smsProviderConfiguration);
-        String result =
-            smsSender.sendSms(
-                phoneNumbers,
-                messageTemplate.getTemplateCode(),
-                templateParam,
-                messageTemplate.getSignName());
-        // 记录短信日志
-        String status = ResponseCodeEnum.SUCCESS.name();
-        String remark = smsReqDTO.getRemark()==null?"":smsReqDTO.getRemark();
-        if(!ResponseCodeEnum.SUCCESS.name().equals(result)){
-          status = ResponseCodeEnum.FAILED.name();
-          remark += result;
-        }
-        SmsLog smsLog = new SmsLog();
-        smsLog.setToPhone(phoneNumbers);
-        smsLog.setType(messageConfig.getPlatformType());
-        smsLog.setStatus(status);
-        smsLog.setRemark(remark);
-        smsLog.setMessageTemplateId(messageTemplate.getId());
-        smsLog.setTemplateParam(JacksonUtil.toJsonNode(JacksonUtil.toString(templateParam)));
-        smsLog.setSendTime(LocalDateTime.now());
-        smsLog.setTenantId(messageTemplate.getTenantId());
-        smsLog.setTemplatePurpose(smsReqDTO.getTemplatePurpose());
-        smsLogMapper.insert(smsLog);
-        return ResponseCodeEnum.SUCCESS.name().equals(result);
+    /**消息模板是否可用*/
+    QueryWrapper<MessageTemplate> messageTemplateQueryWrapper = new QueryWrapper<MessageTemplate>();
+    messageTemplateQueryWrapper.lambda()
+            .eq(MessageTemplate::getId, templateId)
+            .eq(MessageTemplate::getStatus, AssetStatusEnum.ENABLE.ordinal());
+    MessageTemplate messageTemplate = messageTemplateMapper.selectOne(messageTemplateQueryWrapper);
+    if (null == messageTemplate) {
+      throw new YtDataValidationException(ErrorMessage.MESSAGE_TEMPLATE_NOT_EXISTS.getMessage());
+    }
+
+    /**消息配置是否可用*/
+    QueryWrapper<MessageConfig> configQueryWrapper = new QueryWrapper<>();
+    configQueryWrapper.lambda()
+            .eq(MessageConfig::getId, messageTemplate.getMessageConfigId())
+            .eq(MessageConfig::getStatus, AssetStatusEnum.ENABLE.ordinal());
+    MessageConfig messageConfig =
+            messageConfigMapper.selectOne(configQueryWrapper);
+    if (null == messageConfig) {
+      throw new YtDataValidationException(ErrorMessage.MESSAGE_CONFIG_NOT_EXISTS.getMessage());
+    }
+
+    JsonNode configJsonNode = messageConfig.getConfig();
+    ObjectNode configObjectNode = (ObjectNode) configJsonNode;
+    configObjectNode.put("type", messageConfig.getPlatformType());
+    SmsProviderConfiguration smsProviderConfiguration =
+            JacksonUtil.convertValue(configObjectNode, SmsProviderConfiguration.class);
+    if (null != smsProviderConfiguration) {
+      SmsSender smsSender = ytDefaultSmsSenderFactory.createSmsSender(smsProviderConfiguration);
+      String result =
+              smsSender.sendSms(
+                      phoneNumbers,
+                      messageTemplate.getTemplateCode(),
+                      templateParam,
+                      messageTemplate.getSignName());
+      // 记录短信日志
+      String status = ResponseCodeEnum.SUCCESS.name();
+      String remark = smsReqDTO.getRemark()==null?"":smsReqDTO.getRemark();
+      if(!ResponseCodeEnum.SUCCESS.name().equals(result)){
+        status = ResponseCodeEnum.FAILED.name();
+        remark += result;
       }
+      SmsLog smsLog = new SmsLog();
+      smsLog.setToPhone(phoneNumbers);
+      smsLog.setType(messageConfig.getPlatformType());
+      smsLog.setStatus(status);
+      smsLog.setRemark(remark);
+      smsLog.setMessageTemplateId(messageTemplate.getId());
+      smsLog.setTemplateParam(JacksonUtil.toJsonNode(JacksonUtil.toString(templateParam)));
+      smsLog.setSendTime(LocalDateTime.now());
+      smsLog.setTenantId(messageTemplate.getTenantId());
+      smsLog.setTemplatePurpose(smsReqDTO.getTemplatePurpose());
+      smsLogMapper.insert(smsLog);
+      return ResponseCodeEnum.SUCCESS.name().equals(result);
     }
     return false;
   }
@@ -136,6 +153,8 @@ public class YtSmsServiceImpl implements YtSmsService {
     if (!canSend) {
       throw new YtDataValidationException(ErrorMessage.MESSAGE_SEND_TOO_FAST.getMessage());
     }
+
+    /**消息模板是否可用*/
     List<MessageTemplate> messageTemplates =
         messageTemplateMapper.selectList(
             new QueryWrapper<MessageTemplate>()
@@ -145,12 +164,25 @@ public class YtSmsServiceImpl implements YtSmsService {
                     .eq(MessageTemplate::getTemplatePurpose, purpose.name())
                     .eq(MessageTemplate::getMessageType, MessageTypeEnum.PHONE_MESSAGE.name()));
     if (messageTemplates.isEmpty()) {
-      throw new YtDataValidationException(ErrorMessage.TARGET_TEMPLATE_NOT_EXISTS.getMessage());
+      throw new YtDataValidationException(ErrorMessage.MESSAGE_TEMPLATE_NOT_EXISTS.getMessage());
     }
+
+    /**消息配置是否可用*/
+
+    MessageTemplate messageTemplate = messageTemplates.get(0);
+    QueryWrapper<MessageConfig> configQueryWrapper = new QueryWrapper<>();
+    configQueryWrapper.lambda()
+            .eq(MessageConfig::getId, messageTemplate.getMessageConfigId())
+            .eq(MessageConfig::getStatus, AssetStatusEnum.ENABLE.ordinal());
+    MessageConfig messageConfig =
+            messageConfigMapper.selectOne(configQueryWrapper);
+    if (null == messageConfig) {
+      throw new YtDataValidationException(ErrorMessage.MESSAGE_CONFIG_NOT_EXISTS.getMessage());
+    }
+
     String code = RandomStringUtils.randomNumeric(6);
     LinkedHashMap<String, String> params = new LinkedHashMap<>();
     params.put("code", code);
-    MessageTemplate messageTemplate = messageTemplates.get(0);
     SmsReqDTO smsReqDTO = new SmsReqDTO();
     smsReqDTO.setParams(params);
     smsReqDTO.setPhoneNumbers(phoneNumber);
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtUserServiceImpl.java
View file @3231a48
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtUserServiceImpl.java
View file @3231a48
@@ -297,6 +297,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     user.setEmail(userDTO.getEmail());
     user.setAccountExpireTime(userDTO.getAccountExpireTime());
     user.setRemark(userDTO.getRemark());
+    user.setUpdateTime(LocalDateTime.now());
     if (userDTO.getPassword() != null && !userDTO.getPassword().equals("******")) {
       user.setPassword(passwordEncoder.encode(userDTO.getPassword()));
     }
@@ -572,7 +573,14 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
               .stream()
               .map(UserRole::getRoleId)
               .collect(Collectors.toList());
-      return roleIds.toArray(new String[roleIds.size()]);
+      List<String> enableRoles = roleMapper.selectList(new QueryWrapper<Role>().lambda()
+                      .eq(Role::isEnabled, true).in(Role::getId,roleIds))
+              .stream().map(m -> m.getId())
+              .collect(Collectors.toList());
+      if(enableRoles.size() == 0){
+        return null;
+      }
+      return roleIds.toArray(new String[enableRoles.size()]);
     }
     if (roleOrGroupReqDTO.isQueryOrganization()) {
       List<String> organizationIds =
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/HomePageService.java
View file @3231a48
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/HomePageService.java
View file @3231a48
@@ -81,7 +81,7 @@ public interface HomePageService {
      * @param customerId
      * @return
      */
-    HomePageAppDTO app(boolean isPtSysAdmin, boolean isPtAdmin, boolean isTenantAdmin, EntityId tenantId, EntityId customerId);
+    HomePageAppDTO app(Boolean login,boolean isPtSysAdmin, boolean isPtAdmin, boolean isTenantAdmin, EntityId tenantId, EntityId customerId);
 }