diff --git a/pom.xml b/pom.xml index 264e7c7..d661247 100644 --- a/pom.xml +++ b/pom.xml @@ -469,40 +469,19 @@ - - - - - - - - - - - - - - - - - - - - - - + io.fabric8 docker-maven-plugin 0.38.1 - AKIAVSKFRQDPNWHJDSHL - DqGyOiVFKI50/Ix+cjvj25vPL2tC7NJrJ7fqzn/g + AKIAR26KHSVRUEAKRBPZ + wmMPx9vypaNi5ZIlyz4c018hKCb2M1dnGBdA+oh2 - ${aws.ecr.registryTest}/aeon/${aws.ecr.repository}:latest + ${aws.ecr.registry}/aeon-prod/${aws.ecr.repositoryProd}:latest ${aws.ecr.registry} ${project.basedir}/Dockerfile @@ -511,6 +490,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/techsor/datacenter/sender/processers/AsyncDataProcessor.java b/src/main/java/com/techsor/datacenter/sender/processers/AsyncDataProcessor.java index 85c6146..8bc0ab1 100644 --- a/src/main/java/com/techsor/datacenter/sender/processers/AsyncDataProcessor.java +++ b/src/main/java/com/techsor/datacenter/sender/processers/AsyncDataProcessor.java @@ -4,6 +4,7 @@ import com.techsor.datacenter.sender.service.IDataProcessService; import com.techsor.datacenter.sender.service.KingIOServerService; import com.techsor.datacenter.sender.service.St150Service; import com.techsor.datacenter.sender.service.TrendLogService; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.Async; @@ -31,7 +32,12 @@ public class AsyncDataProcessor { try { // 执行耗时任务 String processJson = trendLogService.start(content); - dataProcessService.processKingIOServerData(processJson); + if (StringUtils.isNotBlank(processJson)){ + dataProcessService.processKingIOServerData(processJson); + }else{ + log.warn("processTrendLogAsync processJson is [Blank],skip"); + log.error( content); + } } catch (Exception e) { // 记录异常日志 log.error("Error while processing data asynchronously: " + e.getMessage()); diff --git a/src/main/java/com/techsor/datacenter/sender/service/TrendLogService.java b/src/main/java/com/techsor/datacenter/sender/service/TrendLogService.java index 3b7d5a8..c5f0ee4 100644 --- a/src/main/java/com/techsor/datacenter/sender/service/TrendLogService.java +++ b/src/main/java/com/techsor/datacenter/sender/service/TrendLogService.java @@ -110,7 +110,11 @@ public class TrendLogService { DataSourceContextHolder.clearCurrentDataSourceKey(); } - return JSON.toJSONString(dbmValues); + if (dbmValues.size()>0){ + return JSON.toJSONString(dbmValues); + }else{ + return ""; + } } //处理TrendLog的单条数据