Merge branch '20221129' into 'master'

20221129

See merge request huang/thingsboard3.3.2!143

@@ -117,7 +117,7 @@ public class ScheduleUtils {
     try{
       obj = SpringBeanUtils.getBean(StringUtils.split(invokeTarget, ".")[0]);
     }catch (Exception e){
-      throw new YtDataValidationException(e.getMessage());
+      throw new YtDataValidationException("调用方法【"+invokeTarget+"】不存在");
     }
     return containsAnyIgnoreCase(
         obj.getClass().getPackage().getName(),

@@ -43,7 +43,9 @@ public class TkAlarmInfoServiceImpl implements TkAlarmInfoService {
 
     @Override
     public YtPageData<TkAlarmEntity> alarmPage(Map<String, Object> pageMap, TenantId tenantId, UUID customerId, AlarmSeverity severity, String alarmType, Long startTime, Long endTime, List<AlarmStatus> status, String deviceId, DeviceTypeEnum deviceType, EntityType originatorType, String organizationId) {
-        IPage<TkAlarmEntity> page = getPage(pageMap, ModelConstants.STATUS_PROPERTY+","+ModelConstants.CREATED_TIME_PROPERTY+" DESC, "+ModelConstants.STATUS_PROPERTY, OrderTypeEnum.ASC);
+        StringBuilder defaultOrderFields = new StringBuilder("ack_ts asc,clear_ts asc,");
+        defaultOrderFields.append(ModelConstants.CREATED_TIME_PROPERTY);
+        IPage<TkAlarmEntity> page = getPage(pageMap, defaultOrderFields.toString(), OrderTypeEnum.DESC);
         List<String> ids = new ArrayList<>();
         if (StringUtils.isNotBlank(organizationId)) {
             List<String> filter = new ArrayList<>();

@@ -10,8 +10,8 @@
         <result property="outTarget" column="out_target" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
         <result property="callType" column="call_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
         <result property="commandType" column="command_type"/>
-        <result property="thingsModelId" column="scene_linkage_id"/>
-        <result property="sceneLinkageId" column="things_model_id"/>
+        <result property="thingsModelId" column="things_model_id"/>
+        <result property="sceneLinkageId" column="scene_linkage_id"/>
         <result property="deviceProfileId" column="device_profile_id"/>
         <result property="alarmProfileId" column="alarm_profile_id"/>
         <result property="tenantId" column="tenant_id"/>
@@ -19,7 +19,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="createTime" column="create_time"/>
         <result property="creator" column="creator"/>
-        
+
     </resultMap>
     <sql id="columns">
         id,device_id,entity_type,do_context,out_target,call_type,scene_linkage_id,alarm_profile_id,