diff --git a/pom.xml b/pom.xml index 02bc866..6d8fa5c 100644 --- a/pom.xml +++ b/pom.xml @@ -15,8 +15,8 @@ 17 126588786019.dkr.ecr.ap-northeast-1.amazonaws.com - 029530100103.dkr.ecr.ap-northeast-1.amazonaws.com - spf-receiver-stg + 382934810846.dkr.ecr.ap-northeast-1.amazonaws.com + spf-receiver-stg spf-receiver 4.2.9.Final @@ -635,26 +635,26 @@ - - io.fabric8 - docker-maven-plugin - 0.38.1 - - - AKIAQNYBBSGDVT3VF4ON - DEhPMTHAIsKK7L2klURQrmMe3r2Tqgbaa6z2FYQu - - - - ${aws.ecr.registryTest}/aeon/${aws.ecr.repositoryTest}:latest - ${aws.ecr.registry} - - ${project.basedir}/Dockerfile - - - - - + + io.fabric8 + docker-maven-plugin + 0.38.1 + + + AKIAVSKFRQDPNWHJDSHL + DqGyOiVFKI50/Ix+cjvj25vPL2tC7NJrJ7fqzn/g + + + + ${aws.ecr.registryTest}/aeon/${aws.ecr.repositoryTest}:latest + ${aws.ecr.repositoryTest} + + ${project.basedir}/Dockerfile + + + + + diff --git a/src/main/java/com/techsor/datacenter/receiver/config/DataCenterEnvConfig.java b/src/main/java/com/techsor/datacenter/receiver/config/DataCenterEnvConfig.java index 469f86b..53acbee 100644 --- a/src/main/java/com/techsor/datacenter/receiver/config/DataCenterEnvConfig.java +++ b/src/main/java/com/techsor/datacenter/receiver/config/DataCenterEnvConfig.java @@ -26,7 +26,7 @@ public class DataCenterEnvConfig { @Value("${data.center.ioserver_process.api:#{'/v1/generic/ioserver_process'}}") private String processIoserverUrl; - @Value("${data.center.trendLog.api:#{'/v1/generic/trendLog_process'}}") + @Value("${data.center.trendLog.api:#{'/v1/generic/trendlog_process'}}") private String processTrendLogUrl; @Value("${data.center.st150_process.api:#{'/v1/generic/st150_process'}}") diff --git a/src/main/java/com/techsor/datacenter/receiver/service/impl/MQTTServiceImpl.java b/src/main/java/com/techsor/datacenter/receiver/service/impl/MQTTServiceImpl.java index 3cb4c2b..e80c274 100644 --- a/src/main/java/com/techsor/datacenter/receiver/service/impl/MQTTServiceImpl.java +++ b/src/main/java/com/techsor/datacenter/receiver/service/impl/MQTTServiceImpl.java @@ -250,18 +250,20 @@ class MqttConsumer { } String[] deviceIdPositionArrays; if (JsonUtils.isJsonArray(deviceIdPosition)){ + log.debug("deviceIdPosition is jsonArray:==>{}", datasourceConfigEntity); deviceIdPositionArrays= JSON.parseArray(deviceIdPosition,String.class).toArray(new String[0]); }else { + log.debug("deviceIdPosition is json:==>{}", datasourceConfigEntity); deviceIdPositionArrays=new String[]{deviceIdPosition}; } //解析出多个设备ID - Gson gson = new Gson(); String payloadStr = message.getPayload() instanceof String ? (String) message.getPayload() : gson.toJson(message.getPayload()); String trimData = StringUtils.trim(payloadStr); + log.debug("payloadStr:==>{}", trimData); if (!JsonUtils.isJson(trimData)) { log.warn("data is not json:==>{}", datasourceConfigEntity, trimData); return true; @@ -274,6 +276,7 @@ class MqttConsumer { String currentJsonValue = gson.toJson(element); //获取最终设备ID位置信息 String finalDevicePosition=extractDevicePosition(currentJsonValue,deviceIdPositionArrays); + log.debug("finalDevicePosition:==>{}", finalDevicePosition); String deviceId = JsonPath.read(currentJsonValue, finalDevicePosition); if (StringUtils.isEmpty(deviceId)) { @@ -298,7 +301,18 @@ class MqttConsumer { if (!JsonUtils.isJson(trimData)) { return true; } - String deviceId = JsonPath.read(trimData, deviceIdPosition); + + String deviceId=""; + for (String tempPosition : deviceIdPositionArrays) { + try { + log.debug("deviceIdPosition:==>{}", tempPosition); + deviceId = JsonPath.read(trimData, tempPosition); + break; + }catch (Exception e){ + + } + } + if (StringUtils.isEmpty(deviceId)) { log.warn("deviceId is null:==>{}", datasourceConfigEntity); return true; @@ -365,6 +379,7 @@ class MqttConsumer { String result=""; for (int i = 0; i < deviceIdPositionArrays.length; i++) { try{ + log.debug("deviceIdPosition:==>{}", deviceIdPositionArrays[i]); Object value=JsonPath.read(rootCurrentJsonValue,deviceIdPositionArrays[i]); if (!Objects.isNull(value)){ result = deviceIdPositionArrays[i]; diff --git a/src/main/java/com/techsor/datacenter/receiver/utils/DefaultHttpRequestUtil.java b/src/main/java/com/techsor/datacenter/receiver/utils/DefaultHttpRequestUtil.java index 592aca7..309e06a 100644 --- a/src/main/java/com/techsor/datacenter/receiver/utils/DefaultHttpRequestUtil.java +++ b/src/main/java/com/techsor/datacenter/receiver/utils/DefaultHttpRequestUtil.java @@ -32,6 +32,7 @@ public class DefaultHttpRequestUtil { .body(params) .execute() .body(); + logger.debug("resonponseJson: {}",responseJson); MyHTTPResponse response = JSONUtil.parseObj(responseJson).toBean(MyHTTPResponse.class); return response; }