简柏林 / thingskit · Commits

Commit ed7c4c12d7fef7a996d06363e748ab080ec8b595

Authored by xp.Huang
2 parents a4bb5177 6438d320

Merge branch '20230912' into 'master_dev' 

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

See merge request yunteng/thingskit!228
Inline Side-by-side
Showing 4 changed files with 15 additions and 8 deletions
@@ -80,7 +80,7 @@ public enum ErrorMessage { @@ -80,7 +80,7 @@ public enum ErrorMessage {
80 ASSERT_DEFAULT_NAME_NO_CHANGED(400056,"系统预制资源，不能修改名称！"), 80 ASSERT_DEFAULT_NAME_NO_CHANGED(400056,"系统预制资源，不能修改名称！"),
81 DATA_BOARD_IS_PRIVATE(400057,"该数据看板不是公有视图"), 81 DATA_BOARD_IS_PRIVATE(400057,"该数据看板不是公有视图"),
82 MESSAGE_SEND_TOO_FAST(400058,"1分钟内请求次数过多，请休息一下！"), 82 MESSAGE_SEND_TOO_FAST(400058,"1分钟内请求次数过多，请休息一下！"),
83 - PASSWORD_INCORRECT(4010059, "密码错误!"), 83 + PASSWORD_INCORRECT(4010059, "当前密码错误!"),
84 MESSAGE_SEND_FAILED(4010060, "消息发送失败!"), 84 MESSAGE_SEND_FAILED(4010060, "消息发送失败!"),
85 PROJECT_USED_SCRIPT(400061,"产品【%s】正在使用待删除的解析脚本"), 85 PROJECT_USED_SCRIPT(400061,"产品【%s】正在使用待删除的解析脚本"),
86 RULE_CHAIN_NOT_ENABLE(400062,"规则链不是有效的！"), 86 RULE_CHAIN_NOT_ENABLE(400062,"规则链不是有效的！"),
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
4 import com.baomidou.mybatisplus.annotation.TableId; 4 import com.baomidou.mybatisplus.annotation.TableId;
5 import com.baomidou.mybatisplus.annotation.TableName; 5 import com.baomidou.mybatisplus.annotation.TableName;
6 import com.fasterxml.jackson.databind.JsonNode; 6 import com.fasterxml.jackson.databind.JsonNode;
  7 +import io.swagger.annotations.ApiModelProperty;
7 import lombok.Data; 8 import lombok.Data;
8 import org.thingsboard.server.common.data.alarm.AlarmSeverity; 9 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
9 import org.thingsboard.server.common.data.alarm.AlarmStatus; 10 import org.thingsboard.server.common.data.alarm.AlarmStatus;
@@ -80,6 +81,7 @@ public class TkAlarmEntity { @@ -80,6 +81,7 @@ public class TkAlarmEntity {
80 81
81 private String organizationId; 82 private String organizationId;
82 private String organizationName; 83 private String organizationName;
  84 + private String deviceAlias;
83 85
84 public String getStartTs() { 86 public String getStartTs() {
85 return DateTimeUtils.format(this.startTs); 87 return DateTimeUtils.format(this.startTs);
@@ -2,12 +2,16 @@ package org.thingsboard.server.dao.yunteng.impl; @@ -2,12 +2,16 @@ package org.thingsboard.server.dao.yunteng.impl;
2 2
3 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 3 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 import com.baomidou.mybatisplus.core.metadata.IPage; 4 import com.baomidou.mybatisplus.core.metadata.IPage;
  5 +import java.util.List;
  6 +import java.util.Map;
  7 +import java.util.Set;
5 import lombok.RequiredArgsConstructor; 8 import lombok.RequiredArgsConstructor;
6 import lombok.extern.slf4j.Slf4j; 9 import lombok.extern.slf4j.Slf4j;
7 import org.apache.commons.lang3.StringUtils; 10 import org.apache.commons.lang3.StringUtils;
8 import org.springframework.stereotype.Service; 11 import org.springframework.stereotype.Service;
9 import org.springframework.transaction.annotation.Transactional; 12 import org.springframework.transaction.annotation.Transactional;
10 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants; 13 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
  14 +import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
11 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException; 15 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
12 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage; 16 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
13 import org.thingsboard.server.common.data.yunteng.dto.MessageConfigDTO; 17 import org.thingsboard.server.common.data.yunteng.dto.MessageConfigDTO;
@@ -18,10 +22,6 @@ import org.thingsboard.server.dao.yunteng.mapper.MessageConfigMapper; @@ -18,10 +22,6 @@ import org.thingsboard.server.dao.yunteng.mapper.MessageConfigMapper;
18 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService; 22 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
19 import org.thingsboard.server.dao.yunteng.service.TkMessageConfigService; 23 import org.thingsboard.server.dao.yunteng.service.TkMessageConfigService;
20 24
21 -import java.util.List;  
22 -import java.util.Map;  
23 -import java.util.Set;  
24 -  
25 @Service 25 @Service
26 @Slf4j 26 @Slf4j
27 @RequiredArgsConstructor 27 @RequiredArgsConstructor
@@ -46,7 +46,8 @@ public class TkMessageConfigServiceImpl @@ -46,7 +46,8 @@ public class TkMessageConfigServiceImpl
46 String.valueOf(queryMap.get("messageType"))) 46 String.valueOf(queryMap.get("messageType")))
47 .eq( 47 .eq(
48 queryMap.get("status") != null, 48 queryMap.get("status") != null,
49 - TkMessageConfigEntity::getStatus, queryMap.get("status")) 49 + TkMessageConfigEntity::getStatus,
  50 + queryMap.get("status"))
50 .eq(true, TkMessageConfigEntity::getTenantId, tenantId)); 51 .eq(true, TkMessageConfigEntity::getTenantId, tenantId));
51 return getPageData(configIPage, MessageConfigDTO.class); 52 return getPageData(configIPage, MessageConfigDTO.class);
52 } 53 }
@@ -82,7 +83,10 @@ public class TkMessageConfigServiceImpl @@ -82,7 +83,10 @@ public class TkMessageConfigServiceImpl
82 } 83 }
83 checkMessageConfig(configDTO, tenantId); 84 checkMessageConfig(configDTO, tenantId);
84 } 85 }
85 - configDTO.copyToEntity(config); 86 + configDTO.copyToEntity(
  87 + config,
  88 + ModelConstants.TablePropertyMapping.CREATOR,
  89 + ModelConstants.TablePropertyMapping.CREATE_TIME);
86 config.setTenantId(tenantId); 90 config.setTenantId(tenantId);
87 baseMapper.updateById(config); 91 baseMapper.updateById(config);
88 config.copyToDTO(configDTO); 92 config.copyToDTO(configDTO);
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 <result property="id" column="id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.UUIDTypeHandler"/> 7 <result property="id" column="id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.UUIDTypeHandler"/>
8 <result property="tenantId" column="tenant_id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.UUIDTypeHandler"/> 8 <result property="tenantId" column="tenant_id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.UUIDTypeHandler"/>
9 <result property="deviceName" column="device_name"/> 9 <result property="deviceName" column="device_name"/>
  10 + <result property="deviceAlias" column="device_alias"/>
10 <result property="customerId" column="customer_id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.UUIDTypeHandler"/> 11 <result property="customerId" column="customer_id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.UUIDTypeHandler"/>
11 <result property="type" column="type"/> 12 <result property="type" column="type"/>
12 <result property="deviceId" column="device_id" /> 13 <result property="deviceId" column="device_id" />
@@ -37,7 +38,7 @@ @@ -37,7 +38,7 @@
37 38
38 39
39 <select id="alarmPage" resultMap="alarmInfo"> 40 <select id="alarmPage" resultMap="alarmInfo">
40 - SELECT d.name AS device_name,d.id device_id,m.*,d.organization_id,org.name organization_name 41 + SELECT d.name AS device_name,d.alias AS device_alias,d.id device_id,m.*,d.organization_id,org.name organization_name
41 FROM alarm m 42 FROM alarm m
42 LEFT JOIN tk_device d ON m.originator_id = d.tb_device_id::uuid 43 LEFT JOIN tk_device d ON m.originator_id = d.tb_device_id::uuid
43 LEFT JOIN tk_organization org ON org.id = d.organization_id 44 LEFT JOIN tk_organization org ON org.id = d.organization_id