fix: 使用了AutoDict注解的字段需要指定JsonSerialize 序列化为LocalDateTimeSerializer

@@ -37,7 +37,7 @@ public class SysDictAspect {
   private static final String DICT_TEXT_SUFFIX = "DictText";
   private static final String DICT_TEXT_SUFFIX = "DictText";
 
 
   /** 定义切入点 */
   /** 定义切入点 */
-  @Pointcut("execution(* com.codeez..*.*Controller.*(..))")
+  @Pointcut("execution(* org.thingsboard..*.yunteng.*Controller.*(..))")
   public void exudeService() {}
   public void exudeService() {}
 
 
   /**
   /**
@@ -120,20 +120,13 @@ public class SysDictAspect {
         Object codeText = field.get(object);
         Object codeText = field.get(object);
         if (null != codeText) {
         if (null != codeText) {
           String textValue = getDictText(dictCode, codeText);
           String textValue = getDictText(dictCode, codeText);
-          JsonNode jsonNode = JacksonUtil.toJsonNode(JacksonUtil.toString(sourceObject));
           if(null == objectNode){
           if(null == objectNode){
+            JsonNode jsonNode = JacksonUtil.toJsonNode(JacksonUtil.toString(sourceObject));
             objectNode = (ObjectNode) jsonNode;
             objectNode = (ObjectNode) jsonNode;
           }
           }
           objectNode.put(field.getName() + DICT_TEXT_SUFFIX, textValue);
           objectNode.put(field.getName() + DICT_TEXT_SUFFIX, textValue);
         }
         }
       }
       }
-      if(field.getType().getName().equals("java.time.LocalDateTime")){
-        Object content = field.get(object);
-        if(null != content && null !=objectNode){
-          DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-          objectNode.put(field.getName(),fmt.format((LocalDateTime)content));
-        }
-      }
     }
     }
     return objectNode;
     return objectNode;
   }
   }

@@ -4,6 +4,8 @@ package org.thingsboard.server.common.data.yunteng.dto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
@@ -29,6 +31,7 @@ public class BaseDTO {
   /**创建时间*/
   /**创建时间*/
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
   @ApiModelProperty(value = "创建时间")
   @ApiModelProperty(value = "创建时间")
+  @JsonSerialize(using = LocalDateTimeSerializer.class)
   private LocalDateTime createTime;
   private LocalDateTime createTime;
   /**更新用户*/
   /**更新用户*/
   @ApiModelProperty(value = "更新用户")
   @ApiModelProperty(value = "更新用户")
@@ -36,6 +39,7 @@ public class BaseDTO {
   /**更新时间*/
   /**更新时间*/
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
   @ApiModelProperty(value = "更新时间")
   @ApiModelProperty(value = "更新时间")
+  @JsonSerialize(using = LocalDateTimeSerializer.class)
   private LocalDateTime updateTime;
   private LocalDateTime updateTime;
   @JsonIgnore
   @JsonIgnore
   public <E> void copyToEntity(E entity, String... ignoreProperties) {
   public <E> void copyToEntity(E entity, String... ignoreProperties) {

@@ -2,6 +2,8 @@ package org.thingsboard.server.common.data.yunteng.dto;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 import lombok.Data;
 import org.thingsboard.server.common.data.yunteng.common.aspect.annotation.AutoDict;
 import org.thingsboard.server.common.data.yunteng.common.aspect.annotation.AutoDict;
 
 
@@ -32,6 +34,7 @@ public class MailLogDTO extends BaseDTO{
 
 
     /** 发送时间 */
     /** 发送时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     private LocalDateTime sendTime;
     private LocalDateTime sendTime;
 
 
     /** 租户Code */
     /** 租户Code */

@@ -23,6 +23,7 @@ public class MessageTemplateDTO extends TenantDTO {
   private MessageConfigDTO messageConfig;
   private MessageConfigDTO messageConfig;
 
 
   /**消息类型*/
   /**消息类型*/
+  @AutoDict(dictCode = "message_type")
   private String messageType;
   private String messageType;
 
 
   /** 模板用途 */
   /** 模板用途 */

@@ -3,9 +3,10 @@ package org.thingsboard.server.common.data.yunteng.dto;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
-import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 import org.thingsboard.server.common.data.yunteng.enums.TenantStatusEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TenantStatusEnum;
 
 
@@ -32,5 +33,6 @@ public class TenantDTO extends BaseDTO {
   private TenantStatusEnum tenantStatus;
   private TenantStatusEnum tenantStatus;
 
 
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @JsonSerialize(using = LocalDateTimeSerializer.class)
   private LocalDateTime tenantExpireTime;
   private LocalDateTime tenantExpireTime;
 }
 }

@@ -58,18 +58,17 @@ public class YtMessageTemplateServiceImpl
     MessageTemplateDTO queryTemplate = new MessageTemplateDTO();
     MessageTemplateDTO queryTemplate = new MessageTemplateDTO();
     queryTemplate.setTemplatePurpose(templateDTO.getTemplatePurpose());
     queryTemplate.setTemplatePurpose(templateDTO.getTemplatePurpose());
     queryTemplate.setMessageType(templateDTO.getMessageType());
     queryTemplate.setMessageType(templateDTO.getMessageType());
-    //queryTemplate.setTemplateCode(tenantCode);
+    queryTemplate.setTenantId(templateDTO.getTenantId());
+    queryTemplate.setStatus(FastIotConstants.MagicNumber.ONE);
     if(StringUtils.isEmpty(templateDTO.getTemplatePurpose()) || StringUtils.isEmpty(templateDTO.getMessageType())){
     if(StringUtils.isEmpty(templateDTO.getTemplatePurpose()) || StringUtils.isEmpty(templateDTO.getMessageType())){
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     }
     List<MessageTemplateDTO> messageTemplateDTOList = baseMapper.findMessageTemplate(queryTemplate);
     List<MessageTemplateDTO> messageTemplateDTOList = baseMapper.findMessageTemplate(queryTemplate);
     if(null!=messageTemplateDTOList && messageTemplateDTOList.size()>0){
     if(null!=messageTemplateDTOList && messageTemplateDTOList.size()>0){
-      throw new YtDataValidationException(ErrorMessage.NOT_SET_PASSWORD_TEMPLATE.getMessage());
+      throw new YtDataValidationException(ErrorMessage.EXIST_ENABLE_TEMPLATE.getMessage());
     }
     }
     MessageTemplate messageTemplate = baseMapper.selectById(templateDTO.getId());
     MessageTemplate messageTemplate = baseMapper.selectById(templateDTO.getId());
-    templateDTO.setTenantId(templateDTO.getTenantId());
     templateDTO.copyToEntity(messageTemplate);
     templateDTO.copyToEntity(messageTemplate);
-
     baseMapper.updateById(messageTemplate);
     baseMapper.updateById(messageTemplate);
     messageTemplate.copyToDTO(templateDTO);
     messageTemplate.copyToDTO(templateDTO);
     return templateDTO;
     return templateDTO;

@@ -31,7 +31,6 @@
         LEFT JOIN sys_dict sd ON sd.ID = sdi.dict_id
         LEFT JOIN sys_dict sd ON sd.ID = sdi.dict_id
         <where>
         <where>
             sdi.status = 1
             sdi.status = 1
-            <if test="tenantId !=null and tenantId!=''">AND sd.tenant_id=#{tenantId}</if>
             <if test="dictCode !=null and dictCode!=''">AND sd.dict_code = #{dictCode}</if>
             <if test="dictCode !=null and dictCode!=''">AND sd.dict_code = #{dictCode}</if>
             <if test="itemValue !=null and itemValue!=''">AND sdi.item_value = #{itemValue}</if>
             <if test="itemValue !=null and itemValue!=''">AND sdi.item_value = #{itemValue}</if>
         </where>
         </where>