Merge branch '20230912' into 'master_dev'

fix(DEFECT-1561): 消息配置更新时间未刷新问题

See merge request yunteng/thingskit!228

@@ -80,7 +80,7 @@ public enum ErrorMessage {
   ASSERT_DEFAULT_NAME_NO_CHANGED(400056,"系统预制资源，不能修改名称！"),
   DATA_BOARD_IS_PRIVATE(400057,"该数据看板不是公有视图"),
   MESSAGE_SEND_TOO_FAST(400058,"1分钟内请求次数过多，请休息一下！"),
-  PASSWORD_INCORRECT(4010059, "密码错误!"),
+  PASSWORD_INCORRECT(4010059, "当前密码错误!"),
   MESSAGE_SEND_FAILED(4010060, "消息发送失败!"),
   PROJECT_USED_SCRIPT(400061,"产品【%s】正在使用待删除的解析脚本"),
   RULE_CHAIN_NOT_ENABLE(400062,"规则链不是有效的！"),

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
@@ -80,6 +81,7 @@ public class TkAlarmEntity {
 
   private String organizationId;
   private String organizationName;
+  private String deviceAlias;
 
   public String getStartTs() {
     return DateTimeUtils.format(this.startTs);

@@ -2,12 +2,16 @@ package org.thingsboard.server.dao.yunteng.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 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.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.MessageConfigDTO;
@@ -18,10 +22,6 @@ import org.thingsboard.server.dao.yunteng.mapper.MessageConfigMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.TkMessageConfigService;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 @Service
 @Slf4j
 @RequiredArgsConstructor
@@ -46,7 +46,8 @@ public class TkMessageConfigServiceImpl
                     String.valueOf(queryMap.get("messageType")))
                 .eq(
                     queryMap.get("status") != null,
-                    TkMessageConfigEntity::getStatus, queryMap.get("status"))
+                    TkMessageConfigEntity::getStatus,
+                    queryMap.get("status"))
                 .eq(true, TkMessageConfigEntity::getTenantId, tenantId));
     return getPageData(configIPage, MessageConfigDTO.class);
   }
@@ -82,7 +83,10 @@ public class TkMessageConfigServiceImpl
       }
       checkMessageConfig(configDTO, tenantId);
     }
-    configDTO.copyToEntity(config);
+    configDTO.copyToEntity(
+        config,
+        ModelConstants.TablePropertyMapping.CREATOR,
+        ModelConstants.TablePropertyMapping.CREATE_TIME);
     config.setTenantId(tenantId);
     baseMapper.updateById(config);
     config.copyToDTO(configDTO);

@@ -7,6 +7,7 @@
         <result property="id" column="id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.UUIDTypeHandler"/>
         <result property="tenantId" column="tenant_id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.UUIDTypeHandler"/>
         <result property="deviceName" column="device_name"/>
+        <result property="deviceAlias" column="device_alias"/>
         <result property="customerId" column="customer_id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.UUIDTypeHandler"/>
         <result property="type" column="type"/>
         <result property="deviceId" column="device_id" />
@@ -37,7 +38,7 @@
 
 
     <select id="alarmPage" resultMap="alarmInfo">
-        SELECT d.name AS device_name,d.id device_id,m.*,d.organization_id,org.name organization_name
+        SELECT d.name AS device_name,d.alias AS device_alias,d.id device_id,m.*,d.organization_id,org.name organization_name
         FROM alarm m
         LEFT JOIN tk_device d ON m.originator_id = d.tb_device_id::uuid
         LEFT JOIN tk_organization org ON org.id = d.organization_id