From 4e14fb5a3b37725901e5cd4f846ab4341ea58752 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Mon, 6 May 2024 19:24:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E8=83=BDinfluxdb?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pqs-energy/energy-boot/pom.xml | 9 +++++++-- .../njcn/energy/EnergyBootApplication.java | 3 ++- .../impl/EleAirStrategyServiceImpl.java | 19 +++++-------------- .../service/impl/EleBindServiceImpl.java | 4 +--- .../impl/EleInformationServiceImpl.java | 3 +-- .../service/impl/EleIntegrityServiceImpl.java | 2 +- .../service/impl/HighAnalyticServiceImpl.java | 10 +++++----- .../impl/LogicDeviceLineServiceImpl.java | 13 +++++-------- 8 files changed, 27 insertions(+), 36 deletions(-) diff --git a/pqs-energy/energy-boot/pom.xml b/pqs-energy/energy-boot/pom.xml index 0bdd127ab..088f4148c 100644 --- a/pqs-energy/energy-boot/pom.xml +++ b/pqs-energy/energy-boot/pom.xml @@ -48,11 +48,16 @@ common-swagger ${project.version} + + + + + + com.njcn - common-influxDB + pqs-influx ${project.version} - compile diff --git a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/EnergyBootApplication.java b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/EnergyBootApplication.java index 2dcd11760..da3d5c709 100644 --- a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/EnergyBootApplication.java +++ b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/EnergyBootApplication.java @@ -5,7 +5,7 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.context.annotation.DependsOn; /** * pqs @@ -17,6 +17,7 @@ import org.springframework.scheduling.annotation.EnableAsync; @MapperScan("com.njcn.**.mapper") @EnableFeignClients(basePackages = "com.njcn") @SpringBootApplication(scanBasePackages = "com.njcn") +@DependsOn("proxyMapperRegister") public class EnergyBootApplication { public static void main(String[] args) { diff --git a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/EleAirStrategyServiceImpl.java b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/EleAirStrategyServiceImpl.java index 26ccede32..2635f2936 100644 --- a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/EleAirStrategyServiceImpl.java +++ b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/EleAirStrategyServiceImpl.java @@ -11,8 +11,6 @@ import com.alibaba.nacos.shaded.com.google.gson.Gson; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.tocrhz.mqtt.annotation.MqttSubscribe; import com.github.tocrhz.mqtt.annotation.Payload; @@ -23,33 +21,24 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.db.constant.DbConstant; import com.njcn.energy.handler.MqttMessageHandler; -import com.njcn.energy.mapper.AirSetMapper; import com.njcn.energy.mapper.AirStrategyMapper; -import com.njcn.energy.mapper.LogicAccessMapper; import com.njcn.energy.mapper.LogicDeviceLineMapper; import com.njcn.energy.pojo.dto.AirStrategyDTO; import com.njcn.energy.pojo.dto.NetAndDevByLineDTO; import com.njcn.energy.pojo.enums.EnergyResponseEnum; import com.njcn.energy.pojo.param.AirStrategyParam; -import com.njcn.energy.pojo.param.NetDevParam; import com.njcn.energy.pojo.po.AirSet; import com.njcn.energy.pojo.po.AirStrategy; -import com.njcn.energy.pojo.po.NetDev; import com.njcn.energy.pojo.vo.AirStrategyVO; -import com.njcn.energy.pojo.vo.EnergyDeviceTreeVO; import com.njcn.energy.service.EleAirStrategyService; import com.njcn.energy.service.IEleSetService; -import com.njcn.influxdb.param.InfluxDBPublicParam; -import com.njcn.influxdb.utils.InfluxDBCommUtils; -import com.njcn.influxdb.utils.InfluxDbUtils; +import com.njcn.influx.utils.InfluxDbUtils; import com.njcn.job.api.JobFeignClient; import com.njcn.job.model.XxlJobInfo; import com.njcn.web.factory.PageFactory; import com.njcn.web.utils.RequestUtil; import com.xxl.job.core.biz.model.ReturnT; -import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; -import org.apache.commons.lang.StringUtils; import org.eclipse.paho.client.mqttv3.MqttMessage; import org.influxdb.dto.QueryResult; import org.springframework.beans.BeanUtils; @@ -60,8 +49,10 @@ import org.springframework.util.CollectionUtils; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.time.temporal.TemporalField; -import java.util.*; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** diff --git a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/EleBindServiceImpl.java b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/EleBindServiceImpl.java index bb3565edc..3e0cd06bc 100644 --- a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/EleBindServiceImpl.java +++ b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/EleBindServiceImpl.java @@ -8,12 +8,10 @@ import com.njcn.energy.pojo.constant.TableName; import com.njcn.energy.pojo.param.ElDataBindParam; import com.njcn.energy.pojo.po.DataArray; import com.njcn.energy.pojo.po.EleBind; -import com.njcn.energy.pojo.vo.EnergyTemplateVO; import com.njcn.energy.pojo.vo.YunCaiDataVO; import com.njcn.energy.service.IEleBindService; -import com.njcn.influxdb.utils.InfluxDbUtils; +import com.njcn.influx.utils.InfluxDbUtils; import lombok.RequiredArgsConstructor; -import org.influxdb.dto.QueryResult; import org.springframework.stereotype.Service; import java.util.*; diff --git a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/EleInformationServiceImpl.java b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/EleInformationServiceImpl.java index 77cc5cd31..93f0993d8 100644 --- a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/EleInformationServiceImpl.java +++ b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/EleInformationServiceImpl.java @@ -12,7 +12,7 @@ import com.njcn.energy.service.IEleInformationService; import com.njcn.energy.service.ILogicAccessService; import com.njcn.energy.service.ILogicDeviceLineService; import com.njcn.energy.service.INetDevService; -import com.njcn.influxdb.utils.InfluxDbUtils; +import com.njcn.influx.utils.InfluxDbUtils; import lombok.AllArgsConstructor; import org.influxdb.dto.QueryResult; import org.influxdb.impl.InfluxDBResultMapper; @@ -29,7 +29,6 @@ import java.time.ZoneId; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * 类的介绍： diff --git a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/EleIntegrityServiceImpl.java b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/EleIntegrityServiceImpl.java index 1cde9e21d..ab8ccecaf 100644 --- a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/EleIntegrityServiceImpl.java +++ b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/EleIntegrityServiceImpl.java @@ -9,7 +9,7 @@ import com.njcn.energy.pojo.dto.ElePublicDTO; import com.njcn.energy.pojo.po.*; import com.njcn.energy.pojo.vo.EleIntegrityVO; import com.njcn.energy.service.*; -import com.njcn.influxdb.utils.InfluxDbUtils; +import com.njcn.influx.utils.InfluxDbUtils; import lombok.AllArgsConstructor; import org.influxdb.dto.QueryResult; import org.influxdb.impl.InfluxDBResultMapper; diff --git a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/HighAnalyticServiceImpl.java b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/HighAnalyticServiceImpl.java index cb5d3c243..3adbbfd76 100644 --- a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/HighAnalyticServiceImpl.java +++ b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/HighAnalyticServiceImpl.java @@ -11,13 +11,16 @@ import com.njcn.energy.pojo.enums.EnergyResponseEnum; import com.njcn.energy.pojo.enums.LoadEnum; import com.njcn.energy.pojo.param.ElectComparaParam; import com.njcn.energy.pojo.param.LoadStatisticParam; -import com.njcn.energy.pojo.po.*; +import com.njcn.energy.pojo.po.EleEpdPqd; +import com.njcn.energy.pojo.po.EleLine; +import com.njcn.energy.pojo.po.EleLoadSet; +import com.njcn.energy.pojo.po.EleMd; import com.njcn.energy.pojo.vo.EleRateVO; import com.njcn.energy.pojo.vo.ElectCompareVO; import com.njcn.energy.pojo.vo.LoadStatisticVO; import com.njcn.energy.pojo.vo.LoadTendencyVO; import com.njcn.energy.service.HighAnalyticService; -import com.njcn.influxdb.utils.InfluxDbUtils; +import com.njcn.influx.utils.InfluxDbUtils; import com.njcn.job.api.JobFeignClient; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataTypeEnum; @@ -28,9 +31,6 @@ import org.springframework.stereotype.Service; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; import java.util.*; import java.util.stream.Collectors; diff --git a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/LogicDeviceLineServiceImpl.java b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/LogicDeviceLineServiceImpl.java index 267a15da5..8645db9c2 100644 --- a/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/LogicDeviceLineServiceImpl.java +++ b/pqs-energy/energy-boot/src/main/java/com/njcn/energy/service/impl/LogicDeviceLineServiceImpl.java @@ -2,9 +2,7 @@ package com.njcn.energy.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -24,17 +22,16 @@ import com.njcn.energy.pojo.param.EnergyBaseParam; import com.njcn.energy.pojo.param.GroupArrParam; import com.njcn.energy.pojo.po.*; import com.njcn.energy.pojo.vo.*; -import com.njcn.energy.service.*; -import com.njcn.influxdb.param.InfluxDBPublicParam; -import com.njcn.influxdb.utils.InfluxDbUtils; +import com.njcn.energy.service.IDataGroupService; +import com.njcn.energy.service.IGroupArrayService; +import com.njcn.energy.service.ILogicDeviceLineService; +import com.njcn.influx.deprecated.InfluxDBPublicParam; +import com.njcn.influx.utils.InfluxDbUtils; import lombok.RequiredArgsConstructor; import org.influxdb.dto.QueryResult; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.math.BigDecimal; -import java.text.SimpleDateFormat; -import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*;