|
@@ -15,11 +15,15 @@ import com.xy.utils.R;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import lombok.AllArgsConstructor;
|
|
import lombok.AllArgsConstructor;
|
|
|
|
+import org.elasticsearch.action.search.SearchResponse;
|
|
|
|
+import org.elasticsearch.search.aggregations.Aggregations;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
|
|
|
|
|
+import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
+import java.util.Map;
|
|
|
|
|
|
import static com.xy.utils.Beans.copy;
|
|
import static com.xy.utils.Beans.copy;
|
|
import static com.xy.utils.EsBeans.toPageBean;
|
|
import static com.xy.utils.EsBeans.toPageBean;
|
|
@@ -56,4 +60,16 @@ public class LogOperateServiceImpl implements LogOperateService {
|
|
return R.ok(voPageBean);
|
|
return R.ok(voPageBean);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @PostMapping("mqttBySn")
|
|
|
|
+ @ApiOperation("查询mqtt认证记录")
|
|
|
|
+ public R<List<LogOperateDto.Vo>> mqttBySn(@RequestBody LogOperateDto.MqttBySn mqttBySn) {
|
|
|
|
+ LambdaEsQueryWrapper<LogOperate> lambdaEsQueryWrapper = new LambdaEsQueryWrapper<LogOperate>()
|
|
|
|
+ .like(LogOperate::getLogContent, "mqtt认证查询-sn=")
|
|
|
|
+ .ge(Emptys.check(mqttBySn.getBeginCreateTime()), LogOperate::getCreateTime, mqttBySn.getBeginCreateTime())
|
|
|
|
+ .le(Emptys.check(mqttBySn.getEndCreateTime()), LogOperate::getCreateTime, mqttBySn.getEndCreateTime())
|
|
|
|
+ .distinct(LogOperate::getLogContent);
|
|
|
|
+ List<LogOperate> logOperates = logOperateMapper.selectList(lambdaEsQueryWrapper);
|
|
|
|
+ return R.ok(copy(LogOperateDto.Vo.class, logOperates));
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|