From 43e60ec946493999f44a3c181baf1f7f84d7e59e Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Mon, 27 Feb 2023 13:39:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/influxdb/config/InfluxDbConfig.java | 16 ++++++++-------- .../majornetwork/impl/OverviewServiceImpl.java | 2 +- .../impl/DataExceptionInfluxServiceImpl.java | 6 ++---- .../impl/DataIntegrityRateInfluxServiceImpl.java | 4 +--- .../Impl/line/DataIntegrityRateServiceImpl.java | 2 -- 5 files changed, 12 insertions(+), 18 deletions(-) diff --git a/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/config/InfluxDbConfig.java b/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/config/InfluxDbConfig.java index 9643fdaf3..a7b016de7 100644 --- a/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/config/InfluxDbConfig.java +++ b/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/config/InfluxDbConfig.java @@ -3,8 +3,11 @@ package com.njcn.influxdb.config; import com.njcn.influxdb.utils.InfluxDbUtils; import lombok.Data; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; /** * 类的介绍： @@ -14,23 +17,20 @@ import org.springframework.context.annotation.Configuration; * @createTime 2021/12/10 10:48 */ @Data -@Configuration +@Component +@ConfigurationProperties(prefix = "spring.influx") public class InfluxDbConfig { - @Value("${spring.influx.url:''}") - private String influxDBUrl; + private String url; - @Value("${spring.influx.user:''}") - private String userName; + private String user; - @Value("${spring.influx.password:''}") private String password; - @Value("${spring.influx.database:''}") private String database; @Bean public InfluxDbUtils influxDbUtils() { - return new InfluxDbUtils(userName, password, influxDBUrl, database, "autogen"); + return new InfluxDbUtils(user, password, url, database, "autogen"); } } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/OverviewServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/OverviewServiceImpl.java index 47daf0a5a..daf73e06d 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/OverviewServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/OverviewServiceImpl.java @@ -283,7 +283,7 @@ public class OverviewServiceImpl implements OverviewService { //获取部门数据 Dept data = deptFeignClient.getDeptById(id).getData(); if(ObjectUtil.isNotNull(data)){ - return Arrays.asList(data.getCode()); + return Arrays.asList(data.getCode()); } return new ArrayList<>(); } diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/influxdb/impl/DataExceptionInfluxServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/influxdb/impl/DataExceptionInfluxServiceImpl.java index dfe0a5457..a7b896afc 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/influxdb/impl/DataExceptionInfluxServiceImpl.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/influxdb/impl/DataExceptionInfluxServiceImpl.java @@ -25,14 +25,12 @@ import java.util.Map; * @version 1.0.0 * @createTime 2022/11/28 - 10:09 */ +@Slf4j @Service @RequiredArgsConstructor -@Slf4j public class DataExceptionInfluxServiceImpl implements DataExceptionInfluxService { -// private final InfluxDbUtils influxDbUtils; - - private final InfluxDbUtils influxDbUtils = new InfluxDbUtils("admin", "njcnpqs", "http://192.168.1.18:8086", "pqsbase", ""); + private final InfluxDbUtils influxDbUtils; /** * 取前四项指标（相别为A） diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/influxdb/impl/DataIntegrityRateInfluxServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/influxdb/impl/DataIntegrityRateInfluxServiceImpl.java index 9ccd19090..3ddb5d776 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/influxdb/impl/DataIntegrityRateInfluxServiceImpl.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/influxdb/impl/DataIntegrityRateInfluxServiceImpl.java @@ -31,9 +31,7 @@ import java.util.Map; @Slf4j public class DataIntegrityRateInfluxServiceImpl implements DataIntegrityRateInfluxService { -// private final InfluxDbUtils influxDbUtils; - - private final InfluxDbUtils influxDbUtils = new InfluxDbUtils("admin", "njcnpqs", "http://192.168.1.18:8086", "pqsbase", ""); + private final InfluxDbUtils influxDbUtils; /** * 获取data_v表五项稳态指标日数量 diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DataIntegrityRateServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DataIntegrityRateServiceImpl.java index f99069aba..8258cc4f7 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DataIntegrityRateServiceImpl.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DataIntegrityRateServiceImpl.java @@ -43,8 +43,6 @@ import java.util.Objects; @Slf4j public class DataIntegrityRateServiceImpl implements DataIntegrityRateService { - private final InfluxDbUtils influxDbUtils; - private final RMpIntegrityDMapper rMpIntegrityDMapper; private final DistributionMonitorClient distributionMonitorClient;