fix(equip):江西电建装备服务接收iot代码优化

amos-boot-data/amos-boot-data-equip/pom.xml

@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>com.yeejoin</groupId>
 			<artifactId>amos-component-influxdb</artifactId>
-			<version>1.8.5-SNAPSHOT</version>
+			<version>1.9.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 

amos-boot-data/amos-boot-data-equip/src/main/java/com/yeejoin/equip/kafka/KafkaConsumerService.java

@@ -91,13 +91,13 @@
 //                Map<String, String> tagsMap = new HashMap<>();
 //                Map<String, Object> fieldsMap = new HashMap<>();
 //                tagsMap.put("equipmentsIdx", key);
-//                tagsMap.put("address", indexAddress);
-//                tagsMap.put("gatewayId", gatewayId);
-//                tagsMap.put("dataType", dataType);
-//                tagsMap.put("equipmentIndexName", equipmentSpeIndex.getEquipmentIndexName());
-//                tagsMap.put("equipmentIndex", JSON.toJSONString(equipmentSpeIndex));
-//                tagsMap.put("equipmentSpecificName", equipmentSpeIndex.getEquipmentSpecificName());
-//                tagsMap.put("isAlarm", String.valueOf(equipmentSpeIndex.getIsAlarm()));
+//                fieldsMap.put("address", indexAddress);
+//                fieldsMap.put("gatewayId", gatewayId);
+//                fieldsMap.put("dataType", dataType);
+//                fieldsMap.put("equipmentIndexName", equipmentSpeIndex.getEquipmentIndexName());
+//                fieldsMap.put("equipmentIndex", JSON.toJSONString(equipmentSpeIndex));
+//                fieldsMap.put("equipmentSpecificName", equipmentSpeIndex.getEquipmentSpecificName());
+//                fieldsMap.put("isAlarm", String.valueOf(equipmentSpeIndex.getIsAlarm()));
 //
 //                String valueLabel = valueTranslate(value, equipmentSpeIndex.getValueEnum());
 //                fieldsMap.put("traceId", traceId);

amos-boot-data/amos-boot-data-equip/src/main/java/com/yeejoin/equip/kafka/KafkaConsumerWithThread.java

@@ -37,6 +37,8 @@ public class KafkaConsumerWithThread implements CommandLineRunner {
                     createThreadFactory());
     //iot转发实时消息存入influxdb前缀
     private static final String MEASUREMENT = "iot_data_";
+    private static final String INDICATORS = "indicators_";
+    private static final String TOTAL_CALL_DATA = "total_call_data_";
     private static final String ES_INDEX_NAME_JX = "jxiop_equipments";
     //装备更新最新消息存入influxdb前缀
     private static final String TRUE = "true";
@@ -72,6 +74,7 @@ public class KafkaConsumerWithThread implements CommandLineRunner {
     @Override
     public void run(String... args) {
         Thread thread = new Thread(new KafkaConsumerThread(consumerConfig.consumerConfigs(), topic));
+        //4.启动线程
         thread.start();
     }
 
@@ -85,6 +88,7 @@ public class KafkaConsumerWithThread implements CommandLineRunner {
         String gatewayId = jsonObject.getString("gatewayId");
         String value = jsonObject.getString("value");
         String key = indexAddress + "_" + gatewayId;
+        String signalType = jsonObject.getString("signalType");
 
         try {
             if (equipmentIndexVOMap.get(key) != null) {
@@ -93,12 +97,11 @@ public class KafkaConsumerWithThread implements CommandLineRunner {
 
                 Map<String, String> tagsMap = new HashMap<>();
                 Map<String, Object> fieldsMap = new HashMap<>();
-
                 tagsMap.put("equipmentsIdx", key);
-                tagsMap.put("address", indexAddress);
-                tagsMap.put("gatewayId", gatewayId);
-                tagsMap.put("dataType", dataType);
 
+                fieldsMap.put("address", indexAddress);
+                fieldsMap.put("gatewayId", gatewayId);
+                fieldsMap.put("dataType", dataType);
                 fieldsMap.put("isAlarm", String.valueOf(equipmentSpeIndex.getIsAlarm()));
                 fieldsMap.put("equipmentSpecificName", equipmentSpeIndex.getEquipmentSpecificName());
                 String valueLabel = valueTranslate(value, equipmentSpeIndex.getValueEnum());
@@ -111,18 +114,24 @@ public class KafkaConsumerWithThread implements CommandLineRunner {
                 fieldsMap.put("equipmentIndex", JSON.toJSONString(equipmentSpeIndex));
                 influxDbConnection.insert(MEASUREMENT + gatewayId, tagsMap, fieldsMap);
 
-                //更新数据入ES库
+                //总召入库
+                if(!"transformation".equals(signalType)){
+                    influxDbConnection.insert(TOTAL_CALL_DATA + gatewayId, tagsMap, fieldsMap);
+                }
+                influxDbConnection.insert(INDICATORS + gatewayId, tagsMap, fieldsMap, TIME, TimeUnit.MILLISECONDS);
+
+                ////更新数据入ES库
                 Map<String, Object> paramJson = new HashMap<>();
                 if (Arrays.asList(TRUE, FALSE).contains(value)) {
                     paramJson.put("value", value);
                 }else{
-                    paramJson.put("value", Float.parseFloat(value));
+                    paramJson.put("valueDouble", Float.parseFloat(value));
                 }
                 paramJson.put("valueLabel", valueLabel.isEmpty() ? value : valueLabel);
-                paramJson.put("createdTime", simpleDateFormat.format(new Date()));
+                paramJson.put("createdTime", new Date());
+                paramJson.put("unit", equipmentSpeIndex.getUnitName());
                 elasticSearchUtil.updateData(ES_INDEX_NAME_JX,key,JSON.toJSONString(paramJson));
 
-                //influxDbConnection.insert(INDICATORS + gatewayId, tagsMap, fieldsMap, TIME, TimeUnit.MILLISECONDS);
                 if (equipmentSpeIndex.getIsAlarm() != null && 1 == equipmentSpeIndex.getIsAlarm()) {
                     fieldsMap.putAll(tagsMap);
                     kafkaProducerService.sendMessageAsync(alarmTopic, JSON.toJSONString(fieldsMap));
@@ -171,31 +180,5 @@ public class KafkaConsumerWithThread implements CommandLineRunner {
                 }
             }
         }
-
-        //@Override
-        //public void run() {
-        //    while (true) {
-        //        ConsumerRecords<String, String> records = kafkaConsumer.poll(Duration.ofMillis(100));
-        //        for (TopicPartition topicPartition : records.partitions()) {
-        //            List<ConsumerRecord<String, String>> recordList = new ArrayList<>(records.records(topicPartition));
-        //            Iterator<ConsumerRecord<String, String>> it = recordList.iterator();
-        //            while (it.hasNext()) {
-        //                ConsumerRecord<String, String> record = it.next();
-        //                long startTime = System.currentTimeMillis();
-        //                long lastOffset = recordList.get(recordList.size() - 1).offset();
-        //                try {
-        //                    kafkaConsumer.commitSync(Collections.singletonMap(topicPartition, new OffsetAndMetadata(lastOffset + 1)));
-        //                } catch (Exception e) {
-        //                    log.error("kafka is timeout since maybe business code processing to low,topicName:{},currentName:{},commit time:{},value{},error:{}", topic, Thread.currentThread().getName(), (System.currentTimeMillis() - startTime), record.value(), e);
-        //                    break;
-        //                }
-        //                pooledExecutor.submit(() -> {
-        //                    processRecord(record, equipmentIndexVOMap);
-        //                });
-        //                it.remove();
-        //            }
-        //        }
-        //    }
-        //}
     }
 }

amos-boot-data/amos-boot-data-equip/src/main/java/com/yeejoin/equip/kafka/KafkaProducerService.java

@@ -63,7 +63,7 @@ public class KafkaProducerService {
             }
             @Override
             public void onSuccess(SendResult<String, String> stringStringSendResult) {
-                log.info("发送消息（异步） success! topic: {}, message: {}", topic, message);
+                //log.info("发送消息（异步） success! topic: {}, message: {}", topic, message);
             }
         });
     }

amos-boot-data/amos-boot-data-equip/src/main/java/com/yeejoin/equip/utils/ElasticSearchConfig.java

+package com.yeejoin.equip.utils;
+
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.elasticsearch.client.ClientConfiguration;
+import org.springframework.data.elasticsearch.client.RestClients;
+import java.time.Duration;
+
+@Configuration
+public class ElasticSearchConfig {
+
+    @Value("${spring.elasticsearch.rest.uris}")
+    private String uris;
+
+    @Value("${elasticsearch.username}")
+    private String username;
+
+    @Value("${elasticsearch.password}")
+    private String password;
+
+    public static final RequestOptions COMMON_OPTIONS;
+    static {
+        RequestOptions.Builder builder = RequestOptions.DEFAULT.toBuilder();
+        COMMON_OPTIONS = builder.build();
+    }
+
+    @Bean
+    public RestHighLevelClient client() {
+        ClientConfiguration clientConfiguration = null;
+        try {
+            clientConfiguration = ClientConfiguration.builder()
+                    .connectedTo(uris)
+                    .withConnectTimeout(Duration.ofSeconds(5))
+                    .withSocketTimeout(Duration.ofSeconds(3))
+                    .withBasicAuth(username, password)
+                    .build();
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        assert clientConfiguration != null;
+        return RestClients.create(clientConfiguration).rest();
+    }
+}
\ No newline at end of file

amos-boot-data/amos-boot-data-equip/src/main/java/com/yeejoin/equip/utils/ElasticSearchUtil.java

@@ -40,14 +40,14 @@ public class ElasticSearchUtil {
         updateRequest.doc(paramJson, XContentType.JSON);
         try {
             UpdateResponse updateResponse = restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
-            log.info("索引[{}],主键：【{}】操作结果:[{}]", indexName, id, updateResponse.getResult());
+            //log.info("索引[{}],主键：【{}】操作结果:[{}]", indexName, id, updateResponse.getResult());
             if (DocWriteResponse.Result.CREATED.equals(updateResponse.getResult())) {
                 //新增
                 log.info("索引：【{}】,主键：【{}】新增成功", indexName, id);
                 return true;
             } else if (DocWriteResponse.Result.UPDATED.equals(updateResponse.getResult())) {
                 //修改
-                log.info("索引：【{}】，主键：【{}】修改成功", indexName, id);
+                //log.info("索引：【{}】，主键：【{}】修改成功", indexName, id);
                 return true;
             } else if (DocWriteResponse.Result.NOOP.equals(updateResponse.getResult())) {
                 //无变化

amos-boot-data/amos-boot-data-equip/src/main/resources/application-dev.properties

@@ -80,9 +80,8 @@ kafka.topic=PERSPECTIVE
 emq.topic=iot/data/perspective
 kafka.alarm.topic=EQUIPMENT_ALARM
 
-spring.elasticsearch.rest.uris=http://39.98.224.23:9200
-spring.elasticsearch.rest.connection-timeout=30000
-spring.elasticsearch.rest.username=elastic
-spring.elasticsearch.rest.password=123456
-spring.elasticsearch.rest.read-timeout=30000
-management.health.elasticsearch.enabled=false
+## ES properties:
+biz.elasticsearch.address=139.9.173.44
+spring.elasticsearch.rest.uris=${biz.elasticsearch.address}:9200
+elasticsearch.username= elastic
+elasticsearch.password= Yeejoin@2020
\ No newline at end of file

amos-boot-data/amos-boot-data-equip/src/main/resources/application.properties

 spring.application.name=AMOS-DATA-EQUIP
 server.servlet.context-path=/data-equip
-server.port=8200
+server.port=8100
 
 spring.profiles.active=dev
 server.compression.enabled=true