简柏林 / thingskit · Commits

Commit b82c3314232ce71fd9e2f751f7a4c5d31ca450b7

Authored by 黄 x
1 parent 5f65ac83

fix: 修改邮件、短信发送记录时间查询BUG

Inline Side-by-side
Showing 3 changed files with 22 additions and 6 deletions
1 package org.thingsboard.server.dao.yunteng.impl; 1 package org.thingsboard.server.dao.yunteng.impl;
  2 +
2 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 3 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
3 import com.baomidou.mybatisplus.core.metadata.IPage; 4 import com.baomidou.mybatisplus.core.metadata.IPage;
4 import lombok.RequiredArgsConstructor; 5 import lombok.RequiredArgsConstructor;
@@ -12,6 +13,8 @@ import org.thingsboard.server.dao.yunteng.mapper.SmsLogMapper; @@ -12,6 +13,8 @@ import org.thingsboard.server.dao.yunteng.mapper.SmsLogMapper;
12 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService; 13 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
13 import org.thingsboard.server.dao.yunteng.service.SmsLogService; 14 import org.thingsboard.server.dao.yunteng.service.SmsLogService;
14 15
  16 +import java.time.LocalDateTime;
  17 +import java.time.format.DateTimeFormatter;
15 import java.util.Map; 18 import java.util.Map;
16 import java.util.Set; 19 import java.util.Set;
17 20
@@ -23,12 +26,13 @@ public class SmsLogServiceImpl extends AbstractBaseService<SmsLogMapper, SmsLog> @@ -23,12 +26,13 @@ public class SmsLogServiceImpl extends AbstractBaseService<SmsLogMapper, SmsLog>
23 26
24 @Override 27 @Override
25 public YtPageData<SmsLogDTO> page(Map<String, Object> queryMap, String tenantId) { 28 public YtPageData<SmsLogDTO> page(Map<String, Object> queryMap, String tenantId) {
  29 + DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
26 IPage<SmsLog> configIPage = 30 IPage<SmsLog> configIPage =
27 baseMapper.selectPage( 31 baseMapper.selectPage(
28 getPage(queryMap, "send_time", false), 32 getPage(queryMap, "send_time", false),
29 new QueryWrapper<SmsLog>() 33 new QueryWrapper<SmsLog>()
30 .lambda() 34 .lambda()
31 - .eq(SmsLog::getTenantId,tenantId) 35 + .eq(SmsLog::getTenantId, tenantId)
32 .like( 36 .like(
33 queryMap.get("toPhone") != null, 37 queryMap.get("toPhone") != null,
34 SmsLog::getToPhone, 38 SmsLog::getToPhone,
@@ -36,8 +40,12 @@ public class SmsLogServiceImpl extends AbstractBaseService<SmsLogMapper, SmsLog> @@ -36,8 +40,12 @@ public class SmsLogServiceImpl extends AbstractBaseService<SmsLogMapper, SmsLog>
36 .between( 40 .between(
37 queryMap.get("startTime") != null && queryMap.get("endTime") != null, 41 queryMap.get("startTime") != null && queryMap.get("endTime") != null,
38 SmsLog::getSendTime, 42 SmsLog::getSendTime,
39 - queryMap.get("startTime"),  
40 - queryMap.get("endTime"))); 43 + queryMap.get("startTime") != null
  44 + ? LocalDateTime.parse(queryMap.get("startTime").toString(), df)
  45 + : null,
  46 + queryMap.get("endTime") != null
  47 + ? LocalDateTime.parse(queryMap.get("endTime").toString(), df)
  48 + : null));
41 return getPageData(configIPage, SmsLogDTO.class); 49 return getPageData(configIPage, SmsLogDTO.class);
42 } 50 }
43 51
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -4,6 +4,7 @@ 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 lombok.RequiredArgsConstructor; 5 import lombok.RequiredArgsConstructor;
6 import lombok.extern.slf4j.Slf4j; 6 import lombok.extern.slf4j.Slf4j;
  7 +import org.springframework.format.annotation.DateTimeFormat;
7 import org.springframework.stereotype.Service; 8 import org.springframework.stereotype.Service;
8 import org.springframework.transaction.annotation.Transactional; 9 import org.springframework.transaction.annotation.Transactional;
9 import org.thingsboard.server.common.data.yunteng.dto.MailLogDTO; 10 import org.thingsboard.server.common.data.yunteng.dto.MailLogDTO;
@@ -13,6 +14,8 @@ import org.thingsboard.server.dao.yunteng.mapper.MaiLogMapper; @@ -13,6 +14,8 @@ import org.thingsboard.server.dao.yunteng.mapper.MaiLogMapper;
13 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService; 14 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
14 import org.thingsboard.server.dao.yunteng.service.YtMailLogService; 15 import org.thingsboard.server.dao.yunteng.service.YtMailLogService;
15 16
  17 +import java.time.LocalDateTime;
  18 +import java.time.format.DateTimeFormatter;
16 import java.util.Map; 19 import java.util.Map;
17 import java.util.Set; 20 import java.util.Set;
18 21
@@ -23,6 +26,7 @@ public class YtMailLogServiceImpl extends AbstractBaseService<MaiLogMapper, Mail @@ -23,6 +26,7 @@ public class YtMailLogServiceImpl extends AbstractBaseService<MaiLogMapper, Mail
23 implements YtMailLogService { 26 implements YtMailLogService {
24 @Override 27 @Override
25 public YtPageData<MailLogDTO> page(String tenantId, Map<String, Object> queryMap) { 28 public YtPageData<MailLogDTO> page(String tenantId, Map<String, Object> queryMap) {
  29 + DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
26 IPage<MailLog> configIPage = 30 IPage<MailLog> configIPage =
27 baseMapper.selectPage( 31 baseMapper.selectPage(
28 getPage(queryMap, "send_time", false), 32 getPage(queryMap, "send_time", false),
@@ -36,8 +40,12 @@ public class YtMailLogServiceImpl extends AbstractBaseService<MaiLogMapper, Mail @@ -36,8 +40,12 @@ public class YtMailLogServiceImpl extends AbstractBaseService<MaiLogMapper, Mail
36 .between( 40 .between(
37 queryMap.get("startTime") != null && queryMap.get("endTime") != null, 41 queryMap.get("startTime") != null && queryMap.get("endTime") != null,
38 MailLog::getSendTime, 42 MailLog::getSendTime,
39 - queryMap.get("startTime"),  
40 - queryMap.get("endTime"))); 43 + queryMap.get("startTime") != null
  44 + ? LocalDateTime.parse(queryMap.get("startTime").toString(), df)
  45 + : null,
  46 + queryMap.get("endTime") != null
  47 + ? LocalDateTime.parse(queryMap.get("endTime").toString(), df)
  48 + : null));
41 return getPageData(configIPage, MailLogDTO.class); 49 return getPageData(configIPage, MailLogDTO.class);
42 } 50 }
43 51
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 3
4 -<mapper namespace="com.codeez.mapper.MaiLogMapper"> 4 +<mapper namespace="org.thingsboard.server.dao.yunteng.mapper.MaiLogMapper">
5 <resultMap id="mailLogDTO" type="org.thingsboard.server.common.data.yunteng.dto.MailLogDTO" > 5 <resultMap id="mailLogDTO" type="org.thingsboard.server.common.data.yunteng.dto.MailLogDTO" >
6 <result property="id" column="id"/> 6 <result property="id" column="id"/>
7 <result property="emailFrom" column="email_from"/> 7 <result property="emailFrom" column="email_from"/>