diff --git a/pqs-influx/src/main/java/com/njcn/influx/mapper/CldStatisticsFlowMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/CldStatisticsFlowMapper.java similarity index 88% rename from pqs-influx/src/main/java/com/njcn/influx/mapper/CldStatisticsFlowMapper.java rename to pqs-influx/src/main/java/com/njcn/influx/imapper/CldStatisticsFlowMapper.java index ebc6509cf..808ab0581 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/mapper/CldStatisticsFlowMapper.java +++ b/pqs-influx/src/main/java/com/njcn/influx/imapper/CldStatisticsFlowMapper.java @@ -1,4 +1,4 @@ -package com.njcn.influx.mapper; +package com.njcn.influx.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; import com.njcn.influx.pojo.po.CldStatisFlow; diff --git a/pqs-influx/src/main/java/com/njcn/influx/mapper/DataFlickerMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataFlickerMapper.java similarity index 93% rename from pqs-influx/src/main/java/com/njcn/influx/mapper/DataFlickerMapper.java rename to pqs-influx/src/main/java/com/njcn/influx/imapper/DataFlickerMapper.java index 40ac9608c..f7eba9e8c 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/mapper/DataFlickerMapper.java +++ b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataFlickerMapper.java @@ -1,4 +1,4 @@ -package com.njcn.influx.mapper; +package com.njcn.influx.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; import com.njcn.influx.pojo.dto.DataFlickerDTO; diff --git a/pqs-influx/src/main/java/com/njcn/influx/mapper/DataFlucMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataFlucMapper.java similarity index 88% rename from pqs-influx/src/main/java/com/njcn/influx/mapper/DataFlucMapper.java rename to pqs-influx/src/main/java/com/njcn/influx/imapper/DataFlucMapper.java index 5472d08d2..24a8c35b5 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/mapper/DataFlucMapper.java +++ b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataFlucMapper.java @@ -1,4 +1,4 @@ -package com.njcn.influx.mapper; +package com.njcn.influx.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; import com.njcn.influx.pojo.po.DataFluc; diff --git a/pqs-influx/src/main/java/com/njcn/influx/mapper/DataHarmPhasicIMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPhasicIMapper.java similarity index 88% rename from pqs-influx/src/main/java/com/njcn/influx/mapper/DataHarmPhasicIMapper.java rename to pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPhasicIMapper.java index 2cb51fcf0..f131bf800 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/mapper/DataHarmPhasicIMapper.java +++ b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPhasicIMapper.java @@ -1,4 +1,4 @@ -package com.njcn.influx.mapper; +package com.njcn.influx.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; import com.njcn.influx.pojo.po.DataHarmPhasicI; diff --git a/pqs-influx/src/main/java/com/njcn/influx/mapper/DataHarmPhasicVMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPhasicVMapper.java similarity index 88% rename from pqs-influx/src/main/java/com/njcn/influx/mapper/DataHarmPhasicVMapper.java rename to pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPhasicVMapper.java index 23cd7c051..af8ce0652 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/mapper/DataHarmPhasicVMapper.java +++ b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPhasicVMapper.java @@ -1,4 +1,4 @@ -package com.njcn.influx.mapper; +package com.njcn.influx.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; import com.njcn.influx.pojo.po.DataHarmPhasicV; diff --git a/pqs-influx/src/main/java/com/njcn/influx/mapper/DataHarmPowerPMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPowerPMapper.java similarity index 88% rename from pqs-influx/src/main/java/com/njcn/influx/mapper/DataHarmPowerPMapper.java rename to pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPowerPMapper.java index 5c45b63ec..3fcafa5ef 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/mapper/DataHarmPowerPMapper.java +++ b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataHarmPowerPMapper.java @@ -1,4 +1,4 @@ -package com.njcn.influx.mapper; +package com.njcn.influx.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; import com.njcn.influx.pojo.po.DataHarmPowerP; diff --git a/pqs-influx/src/main/java/com/njcn/influx/mapper/DataVMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataVMapper.java similarity index 92% rename from pqs-influx/src/main/java/com/njcn/influx/mapper/DataVMapper.java rename to pqs-influx/src/main/java/com/njcn/influx/imapper/DataVMapper.java index feecbd264..6dced26e7 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/mapper/DataVMapper.java +++ b/pqs-influx/src/main/java/com/njcn/influx/imapper/DataVMapper.java @@ -1,4 +1,4 @@ -package com.njcn.influx.mapper; +package com.njcn.influx.imapper; import com.njcn.influx.base.InfluxDbBaseMapper; import com.njcn.influx.pojo.po.DataV; diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataFlickerServiceImpl.java b/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataFlickerServiceImpl.java index 6a5de6cac..22c24b9e9 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataFlickerServiceImpl.java +++ b/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataFlickerServiceImpl.java @@ -2,7 +2,7 @@ package com.njcn.influx.service.impl; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.njcn.influx.mapper.DataFlickerMapper; +import com.njcn.influx.imapper.DataFlickerMapper; import com.njcn.influx.pojo.dto.DataFlickerDTO; import com.njcn.influx.pojo.po.DataFlicker; import com.njcn.influx.query.InfluxQueryWrapper; @@ -10,7 +10,6 @@ import com.njcn.influx.service.DataFlickerService; import com.njcn.influx.utils.InfluxDbUtil; import org.influxdb.dto.QueryResult; import org.influxdb.impl.InfluxDBResultMapper; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataVServiceImpl.java b/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataVServiceImpl.java index a52c0cdf9..2b43af7fb 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataVServiceImpl.java +++ b/pqs-influx/src/main/java/com/njcn/influx/service/impl/DataVServiceImpl.java @@ -1,7 +1,7 @@ package com.njcn.influx.service.impl; import com.njcn.common.utils.HarmonicTimesUtil; -import com.njcn.influx.mapper.DataVMapper; +import com.njcn.influx.imapper.DataVMapper; import com.njcn.influx.pojo.po.DataV; import com.njcn.influx.query.InfluxQueryWrapper; import com.njcn.influx.service.IDataVService; diff --git a/pqs-influx/src/main/resources/application.yml b/pqs-influx/src/main/resources/application.yml index cdd2b1f80..d9a43b67b 100644 --- a/pqs-influx/src/main/resources/application.yml +++ b/pqs-influx/src/main/resources/application.yml @@ -4,4 +4,4 @@ spring: user: admin password: 123456 database: pqsbase_sjzx - mapper-location: com.njcn.influx.mapper \ No newline at end of file + mapper-location: com.njcn.influx.imapper \ No newline at end of file diff --git a/pqs-influx/src/test/java/com/njcn/influx/DemoTest.java b/pqs-influx/src/test/java/com/njcn/influx/DemoTest.java index 232a3c84d..e7ebb2d28 100644 --- a/pqs-influx/src/test/java/com/njcn/influx/DemoTest.java +++ b/pqs-influx/src/test/java/com/njcn/influx/DemoTest.java @@ -1,14 +1,12 @@ package com.njcn.influx; -import com.njcn.influx.mapper.CldStatisticsFlowMapper; -import com.njcn.influx.pojo.po.CldStatisFlow; -import com.njcn.influx.query.InfluxQueryWrapper; +import com.njcn.influx.imapper.CldStatisticsFlowMapper; +import com.njcn.influx.pojo.po.DataV; import com.njcn.influx.service.DataFlickerService; import com.njcn.influx.service.IDataVService; import lombok.SneakyThrows; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.ComponentScan; import java.util.List; @@ -32,7 +30,8 @@ public class DemoTest extends BaseJunitTest { @Test public void test() { // dataFlickerService.getDataFlicker("ff2d9674c1f1ecce7f33a5bf17fc4f2d","2023-05-02 00:00:00","2023-05-02 23:59:59"); - dataVService.getDataV("ff2d9674c1f1ecce7f33a5bf17fc4f2d","2023-05-02 00:00:00","2023-05-02 23:59:59"); + List ss = dataVService.getDataV("ff2d9674c1f1ecce7f33a5bf17fc4f2d", "2023-05-02 00:00:00", "2023-05-02 23:59:59"); + System.out.println(ss); }