From 34ba7af31ca09f778c91ead18da56146f48ea810 Mon Sep 17 00:00:00 2001 From: "1049970895@qniao.cn" <1049970895> Date: Tue, 16 Aug 2022 18:02:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/IotMachineEventGeneratorJob.java | 50 ------------------- 1 file changed, 50 deletions(-) diff --git a/iot-machine-state-event-generator-job/src/main/java/com/qniao/iot/machine/event/generator/job/IotMachineEventGeneratorJob.java b/iot-machine-state-event-generator-job/src/main/java/com/qniao/iot/machine/event/generator/job/IotMachineEventGeneratorJob.java index 5b746f9..fa77720 100644 --- a/iot-machine-state-event-generator-job/src/main/java/com/qniao/iot/machine/event/generator/job/IotMachineEventGeneratorJob.java +++ b/iot-machine-state-event-generator-job/src/main/java/com/qniao/iot/machine/event/generator/job/IotMachineEventGeneratorJob.java @@ -63,9 +63,6 @@ public class IotMachineEventGeneratorJob { "where qmrs.iot_mac = ?\n" + " and qmrs.is_delete = 0"; - - //private static RestHighLevelClient restHighLevelClient = new RestHighLevelClient(RestClient.builder(new HttpHost(""))); - public static void main(String[] args) throws Exception { final StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment(); @@ -168,9 +165,6 @@ public class IotMachineEventGeneratorJob { if (deviceStateListJson == null) { // 查询数据库最新的设备状态 List list = Db.use().query(SQL, DeviceState.class, machineIotMac); - // 查询es最新的设备状态 - //deviceStateListJson = queryLatestDeviceStatus(machineIotMac); - if (CollUtil.isNotEmpty(list)) { deviceStateListJson = list.get(0); @@ -183,50 +177,6 @@ public class IotMachineEventGeneratorJob { return deviceStateListJson; } - /*private static DeviceState queryLatestDeviceStatus(Long machineIotMac) { - - try { - // 构建查询条件（注意：termQuery 支持多种格式查询，如 boolean、int、double、string 等，这里使用的是 string 的查询） - SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); - searchSourceBuilder.query(QueryBuilders.termQuery("machineIotMac", machineIotMac)); - searchSourceBuilder.sort("reportTime", SortOrder.DESC); - searchSourceBuilder.size(1); - // 创建查询请求对象，将查询对象配置到其中 - SearchRequest searchRequest = new SearchRequest(getLatestIndices()); - searchRequest.source(searchSourceBuilder); - // 执行查询，然后处理响应结果 - SearchResponse searchResponse = restHighLevelClient.search(searchRequest, RequestOptions.DEFAULT); - // 根据状态和数据条数验证是否返回了数据 - if (RestStatus.OK.equals(searchResponse.status()) && searchResponse.getHits().getTotalHits().value > 0) { - SearchHits hits = searchResponse.getHits(); - SearchHit reqHit = hits.getHits()[0]; - MachineIotDataReceivedEvent receivedEvent = JSONUtil - .toBean(reqHit.getSourceAsString(), MachineIotDataReceivedEvent.class); - DeviceState deviceState = new DeviceState(); - deviceState.setMachineId(machineIotMac); - deviceState.setMachineId(); - } - } catch (IOException e) { - log.error("", e); - } - return null; - }*/ - - /*private static String[] getLatestIndices() throws IOException { - - GetAliasesRequest request = new GetAliasesRequest(); - GetAliasesResponse getAliasesResponse = restHighLevelClient.indices().getAlias(request, RequestOptions.DEFAULT); - Map> map = getAliasesResponse.getAliases(); - Set indices = map.keySet(); - List indicesList = new ArrayList<>(); - for (String key : indices) { - if(key.contains(ApolloConfig.get(ConfigConstant.SINK_ELASTICSEARCH_INDEX))) { - indicesList.add(key); - } - } - return ArrayUtil.toArray(indicesList, String.class); - }*/ - private static void sinkRabbitMq(DataStream commandDataStream) { // rabbitmq配置