Merge branch '20220908' into 'master'

fix: 小程序统计接口异常问题修复

See merge request huang/thingsboard3.3.2!129

@@ -23,7 +23,7 @@ public enum ErrorMessage {
   PROVIDE_CORRECT_PHONE_NUMBER(400004,"请提供正确的电话号码"),
   PROVIDE_CORRECT_PHONE_NUMBER(400004,"请提供正确的电话号码"),
   PROVIDE_CORRECT_EMAIL(400005,"请提供正确的邮箱"),
   PROVIDE_CORRECT_EMAIL(400005,"请提供正确的邮箱"),
   PHONE_NUMBER_OR_EMAIL_REQUIRED(400006,"必须提供电话或者邮箱"),
   PHONE_NUMBER_OR_EMAIL_REQUIRED(400006,"必须提供电话或者邮箱"),
-  NAME_ALREADY_EXISTS(400007,"名称已存在"),
+  NAME_ALREADY_EXISTS(400007,"名称已被使用"),
   ROLE_IN_USE(400008,"该角色还存在用户使用"),
   ROLE_IN_USE(400008,"该角色还存在用户使用"),
   NONE_DEFAULT_RULE_CHAIN(400009,"该租户不存在默认的规则链"),
   NONE_DEFAULT_RULE_CHAIN(400009,"该租户不存在默认的规则链"),
   TENANT_MISMATCHING(400010,"租户不匹配"),
   TENANT_MISMATCHING(400010,"租户不匹配"),
@@ -67,7 +67,7 @@ public enum ErrorMessage {
   VIDEO_PLATFORM_CONFIG_LACK(400047,"流媒体平台信息缺失"),
   VIDEO_PLATFORM_CONFIG_LACK(400047,"流媒体平台信息缺失"),
   VIDEO_PLATFORM_CONFIG_ERROR(400048,"流媒体平台信息配置有误"),
   VIDEO_PLATFORM_CONFIG_ERROR(400048,"流媒体平台信息配置有误"),
   VIDEO_PLATFORM_NEED_ENABLE_HLS_HTTPS(400049,"平台需开启https的hls协议"),
   VIDEO_PLATFORM_NEED_ENABLE_HLS_HTTPS(400049,"平台需开启https的hls协议"),
-  NAME_EXISTED(400050,"名称【%s】已存在"),
+  NAME_EXISTED(400050,"名称【%s】已被使用"),
   INVALID_PARAMETER_OR_NOT_MATCH_TENANT(400051,"参数错误或该条数据不属于当前租户"),
   INVALID_PARAMETER_OR_NOT_MATCH_TENANT(400051,"参数错误或该条数据不属于当前租户"),
   CRON_INVALID(400052,"cron表达式无效"),
   CRON_INVALID(400052,"cron表达式无效"),
   EXPORT_CONFIG_NON_EXISTENT(400053,"报表配置不存在或已被删除"),
   EXPORT_CONFIG_NON_EXISTENT(400053,"报表配置不存在或已被删除"),

@@ -36,6 +36,8 @@ import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.dao.entity.AbstractEntityService;
 import org.thingsboard.server.dao.entity.AbstractEntityService;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.dao.service.DataValidator;
@@ -112,7 +114,7 @@ public class DeviceProfileServiceImpl extends AbstractEntityService implements D
         } catch (Exception t) {
         } catch (Exception t) {
             ConstraintViolationException e = extractConstraintViolationException(t).orElse(null);
             ConstraintViolationException e = extractConstraintViolationException(t).orElse(null);
             if (e != null && e.getConstraintName() != null && e.getConstraintName().equalsIgnoreCase("device_profile_name_unq_key")) {
             if (e != null && e.getConstraintName() != null && e.getConstraintName().equalsIgnoreCase("device_profile_name_unq_key")) {
-                throw new DataValidationException("Device profile with such name already exists!");
+                throw new YtDataValidationException(ErrorMessage.NAME_ALREADY_EXISTS.getMessage());
             } else if (e != null && e.getConstraintName() != null && e.getConstraintName().equalsIgnoreCase("device_provision_key_unq_key")) {
             } else if (e != null && e.getConstraintName() != null && e.getConstraintName().equalsIgnoreCase("device_provision_key_unq_key")) {
                 throw new DataValidationException("Device profile with such provision device key already exists!");
                 throw new DataValidationException("Device profile with such provision device key already exists!");
             } else {
             } else {

@@ -174,7 +174,7 @@ public class HomePageServiceImpl implements HomePageService {
                 }else{
                 }else{
                     totalExpired.getAndIncrement();
                     totalExpired.getAndIncrement();
                 }
                 }
-                if(endTime.isAfter(customer.getUpdateTime()) && startTime.isBefore(customer.getUpdateTime())){
+                if(customer.getUpdateTime() != null && endTime.isAfter(customer.getUpdateTime()) && startTime.isBefore(customer.getUpdateTime())){
                     totalActivity.incrementAndGet();
                     totalActivity.incrementAndGet();
                 }
                 }
 
 

@@ -380,8 +380,8 @@
     <select id="findDeviceKeys" resultType="string">
     <select id="findDeviceKeys" resultType="string">
         SELECT
         SELECT
         DISTINCT base.key as keyName
         DISTINCT base.key as keyName
-        FROM  ts_kv_latest latest
-        LEFT JOIN ts_kv_dictionary base ON latest.key = base.key_id
+        FROM  ts_kv_dictionary base
+        LEFT JOIN ts_kv_latest latest ON latest.key = base.key_id
         LEFT JOIN device tb ON tb.ID  = latest.entity_id
         LEFT JOIN device tb ON tb.ID  = latest.entity_id
         LEFT JOIN iotfs_device iot ON tb.ID :: TEXT = iot.tb_device_id
         LEFT JOIN iotfs_device iot ON tb.ID :: TEXT = iot.tb_device_id
         <where>
         <where>