diff --git a/influx-data/influx-target/pom.xml b/influx-data/influx-target/pom.xml index b59d7f8..70a6e63 100644 --- a/influx-data/influx-target/pom.xml +++ b/influx-data/influx-target/pom.xml @@ -38,8 +38,16 @@ org.springframework.boot spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-security + + + influx-target diff --git a/influx-data/influx-target/src/main/java/com/njcn/influx/job/OracleToInfluxDBJob.java b/influx-data/influx-target/src/main/java/com/njcn/influx/job/OracleToInfluxDBJob.java index 01638e0..fb05db7 100644 --- a/influx-data/influx-target/src/main/java/com/njcn/influx/job/OracleToInfluxDBJob.java +++ b/influx-data/influx-target/src/main/java/com/njcn/influx/job/OracleToInfluxDBJob.java @@ -47,6 +47,7 @@ public class OracleToInfluxDBJob { }*/ //每小时03分钟时执行上一个小时的数据同步 + //河北这边比较特殊, @Scheduled(cron="0 3 * * * ?") public void executeHours() { DataAsynParam dataAsynParam = new DataAsynParam(); diff --git a/influx-data/influx-target/src/main/resources/application.yml b/influx-data/influx-target/src/main/resources/application.yml index f06f082..d760bae 100644 --- a/influx-data/influx-target/src/main/resources/application.yml +++ b/influx-data/influx-target/src/main/resources/application.yml @@ -5,6 +5,10 @@ business: server: port: 8090 spring: + security: + user: + name: njcn + password: dnzl@#002 #influxDB内容配置 influx: url: http://192.168.1.102:8086 diff --git a/manufact_influx_data/src/test/java/com/njcn/DataTest.java b/manufact_influx_data/src/test/java/com/njcn/DataTest.java index cfdc842..e92edc3 100644 --- a/manufact_influx_data/src/test/java/com/njcn/DataTest.java +++ b/manufact_influx_data/src/test/java/com/njcn/DataTest.java @@ -78,7 +78,7 @@ public class DataTest extends BaseJunitTest { System.out.println(2222); System.out.println(2222); List list = resultMapper.toPOJO(sqlResult, DataV.class); - Map> stringListMap = list.stream().collect(Collectors.groupingBy(obj -> obj.getPhasicType().concat(StrPool.UNDERLINE).concat(obj.getValueType()))); + Map> stringListMap = list.stream().collect(Collectors.groupingBy(obj -> obj.getPhaseType().concat(StrPool.UNDERLINE).concat(obj.getValueType()))); influxQueryWrapper = new InfluxQueryWrapper(DataInHarmRateV.class); influxQueryWrapper.between(DataInHarmRateV::getTime, startTime, endTime).regular(DataInHarmRateV::getLineId, lineList);