查询mqtt认证记录

sys-api-service/src/main/java/com/xy/service/LogOperateServiceImpl.java

@@ -8,22 +8,15 @@ import com.xy.dto.LogOperateDto;
 import com.xy.entity.LogOperate;
 import com.xy.entity.UserInfo;
 import com.xy.mapper.LogOperateMapper;
-import com.xy.utils.Emptys;
-import com.xy.utils.EsQueryWrapper;
-import com.xy.utils.PageBean;
-import com.xy.utils.R;
+import com.xy.utils.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.search.aggregations.Aggregations;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import static com.xy.utils.Beans.copy;
 import static com.xy.utils.EsBeans.toPageBean;
@@ -65,9 +58,14 @@ public class LogOperateServiceImpl implements LogOperateService {
     public R<List<LogOperateDto.Vo>> mqttBySn(@RequestBody LogOperateDto.MqttBySn mqttBySn) {
         LambdaEsQueryWrapper<LogOperate> lambdaEsQueryWrapper = new LambdaEsQueryWrapper<LogOperate>()
                 .like(LogOperate::getLogContent, "mqtt认证查询-结果=false,sn=")
-                .ge(Emptys.check(mqttBySn.getBeginCreateTime()), LogOperate::getCreateTime, mqttBySn.getBeginCreateTime())
-                .le(Emptys.check(mqttBySn.getEndCreateTime()), LogOperate::getCreateTime, mqttBySn.getEndCreateTime())
-                .distinct(LogOperate::getLogContent);
+                .distinct(LogOperate::getLogContent)
+                .orderByDesc(LogOperate::getCreateTime);
+        if (Emptys.check(mqttBySn.getBeginCreateTime())) {
+            lambdaEsQueryWrapper.ge(LogOperate::getCreateTime, DataTime.toString(mqttBySn.getBeginCreateTime()));
+        }
+        if (Emptys.check(mqttBySn.getEndCreateTime())) {
+            lambdaEsQueryWrapper.le(LogOperate::getCreateTime, DataTime.toString(mqttBySn.getEndCreateTime()));
+        }
         List<LogOperate> logOperates = logOperateMapper.selectList(lambdaEsQueryWrapper);
         return R.ok(copy(LogOperateDto.Vo.class, logOperates));
     }