From 76147134a4e102736457272791838462e3a9a536 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 25 Apr 2023 13:26:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B1=A1=E5=8C=BA=E9=A2=84=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mysql/Impl/line/PollutionServiceImpl.java | 212 ++++++++++++++---- .../day/IRStatDataHarmRateVDService.java | 3 +- .../mysql/day/IRStatDataIDService.java | 3 +- .../mysql/day/IRStatDataInharmIDService.java | 3 +- .../mysql/day/IRStatDataInharmVDService.java | 3 +- .../mysql/day/IRStatDataPltDService.java | 3 +- .../mysql/day/IRStatDataVDService.java | 3 +- 7 files changed, 179 insertions(+), 51 deletions(-) diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java index 4266b34da..4687454f1 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.date.TimeInterval; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.njcn.common.pojo.constant.BizParamConstant; import com.njcn.common.pojo.constant.ServerInfo; import com.njcn.common.pojo.response.HttpResult; @@ -18,11 +19,14 @@ import com.njcn.device.pq.api.LineFeignClient; import com.njcn.device.pq.pojo.po.Overlimit; import com.njcn.harmonic.pojo.dto.PublicDTO; import com.njcn.harmonic.pojo.po.RMpPollutionDPO; +import com.njcn.harmonic.pojo.po.RStatDataVD; +import com.njcn.harmonic.pojo.po.day.*; import com.njcn.influxdb.utils.InfluxDbUtils; import com.njcn.prepare.harmonic.mapper.mysql.line.*; import com.njcn.prepare.harmonic.pojo.dto.PollutionDTO; import com.njcn.prepare.harmonic.pojo.influxdb.po.*; import com.njcn.prepare.harmonic.pojo.param.LineParam; +import com.njcn.prepare.harmonic.service.mysql.day.*; import com.njcn.prepare.harmonic.service.mysql.line.PollutionService; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataTypeEnum; @@ -87,6 +91,11 @@ public class PollutionServiceImpl implements PollutionService { private final DeptFeignClient deptFeignClient; + private final IRStatDataVDService dataVDService; + private final IRStatDataHarmRateVDService harmRateVDService; + private final IRStatDataIDService dataIDService; + private final IRStatDataInharmVDService inharmVDService; + private final IRStatDataPltDService pltDService; @Override @Async("asyncExecutor") public void processPollutionData(LineParam lineParam) { @@ -333,14 +342,22 @@ public class PollutionServiceImpl implements PollutionService { } private Map> getThreePhaseData(List overLimitList,String dataDate){ - String sql = "SELECT * FROM day_v where value_type = 'CP95' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') " + processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +" group by line_id order by time desc limit 3 tz('Asia/Shanghai')"; - InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); + Map stringStringMap = processMysqlDate(dataDate, Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); + List threePhaseList = dataVDService.list(new LambdaQueryWrapper() + .eq(RStatDataVDPO::getValueType, "CP95") + .in(RStatDataVDPO::getPhaseType, Arrays.asList("A", "B", "C")) + .ge(RStatDataVDPO::getTime, stringStringMap.get("startTime")) + .le(RStatDataVDPO::getTime, stringStringMap.get("endTime")) + ); List data; PublicDTO publicDTO; List lineData = new ArrayList<>(); - QueryResult threePhaseSqlResult = influxDbUtils.query(sql); - List threePhaseList = resultMapper.toPOJO(threePhaseSqlResult, DayVPO.class); - for (DayVPO item1 : threePhaseList) { +// String sql = "SELECT * FROM day_v where value_type = 'CP95' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') " + processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +" group by line_id order by time desc limit 3 tz('Asia/Shanghai')"; +// InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); +// QueryResult threePhaseSqlResult = influxDbUtils.query(sql); +// List threePhaseList = resultMapper.toPOJO(threePhaseSqlResult, DayVPO.class); + + for (RStatDataVDPO item1 : threePhaseList) { for (Overlimit item2 : overLimitList) { if (Objects.equals(item1.getLineId(),item2.getId())){ double vUnbalance = item1.getVUnbalance()/item2.getUaberrance(); @@ -358,14 +375,22 @@ public class PollutionServiceImpl implements PollutionService { } private Map> getDistortionRateData(List overLimitList,String dataDate){ - String sql = "SELECT * FROM day_harmrate_v where value_type = 'CP95' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') "+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +"group by line_id order by time desc limit 3 tz('Asia/Shanghai')"; - InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); + Map stringStringMap = processMysqlDate(dataDate, Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); + List distortionRateList = harmRateVDService.list(new LambdaQueryWrapper() + .eq(RStatDataHarmrateVDPO::getValueType, "CP95") + .in(RStatDataHarmrateVDPO::getPhaseType, Arrays.asList("A", "B", "C")) + .ge(RStatDataHarmrateVDPO::getTime, stringStringMap.get("startTime")) + .le(RStatDataHarmrateVDPO::getTime, stringStringMap.get("endTime")) + ); List data; PublicDTO publicDTO; List lineData = new ArrayList<>(); - QueryResult distortionRateSqlResult = influxDbUtils.query(sql); - List distortionRateList = resultMapper.toPOJO(distortionRateSqlResult, DayHarmrateVPO.class); - for (DayHarmrateVPO dayHarmrateV : distortionRateList) { +// String sql = "SELECT * FROM day_harmrate_v where value_type = 'CP95' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') "+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +"group by line_id order by time desc limit 3 tz('Asia/Shanghai')"; +// InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); +// +// QueryResult distortionRateSqlResult = influxDbUtils.query(sql); +// List distortionRateList = resultMapper.toPOJO(distortionRateSqlResult, DayHarmrateVPO.class); + for (RStatDataHarmrateVDPO dayHarmrateV : distortionRateList) { for (Overlimit overlimit : overLimitList) { if (Objects.equals(dayHarmrateV.getLineId(),overlimit.getId())){ double v2 = dayHarmrateV.getV2()/overlimit.getUharm2(); @@ -409,14 +434,22 @@ public class PollutionServiceImpl implements PollutionService { * 谐波电流：各次谐波电流（2~25次），取各监测点最新的A、B、C三相数据。 */ private List getHarmonicCurrent(List overLimitList,String dataDate){ - String sql = "SELECT * FROM day_i where value_type = 'CP95' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C')"+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +" group by line_id order by time desc limit 3 tz('Asia/Shanghai')"; - InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); + Map stringStringMap = processMysqlDate(dataDate, Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); + List list = dataIDService.list(new LambdaQueryWrapper() + .eq(RStatDataIDPO::getValueType, "CP95") + .in(RStatDataIDPO::getPhaseType, Arrays.asList("A", "B", "C")) + .ge(RStatDataIDPO::getTime, stringStringMap.get("startTime")) + .le(RStatDataIDPO::getTime, stringStringMap.get("endTime")) + ); List data; PublicDTO publicDTO; List lineData = new ArrayList<>(); - QueryResult sqlResult = influxDbUtils.query(sql); - List list = resultMapper.toPOJO(sqlResult, DayIPO.class); - for (DayIPO dayI : list) { +// String sql = "SELECT * FROM day_i where value_type = 'CP95' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C')"+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +" group by line_id order by time desc limit 3 tz('Asia/Shanghai')"; +// InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); +// +// QueryResult sqlResult = influxDbUtils.query(sql); +// List list = resultMapper.toPOJO(sqlResult, DayIPO.class); + for (RStatDataIDPO dayI : list) { for (Overlimit overlimit : overLimitList) { if (Objects.equals(dayI.getLineId(),overlimit.getId())){ double v2 = dayI.getI2()/overlimit.getIharm2(); @@ -461,14 +494,23 @@ public class PollutionServiceImpl implements PollutionService { * 频率偏差：各监测点最新的T相数据，取频率上下偏差的绝对值中的最大值。 */ private List getFrequencyDeviation(List overLimitList,String dataDate){ - String sql = "SELECT line_id,abs(freq_dev) AS freq_dev FROM day_v where phasic_type = 'T' and (value_type = 'MIN' or value_type = 'MAX') "+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +"group by line_id order by time desc limit 2 tz('Asia/Shanghai')"; - InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); + Map stringStringMap = processMysqlDate(dataDate, Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); + List threePhaseList = dataVDService.list(new QueryWrapper() + .select("line_id","abs(freq_dev)") + .in("value_type", Arrays.asList("MIN","MAX")) + .in("phasic_type", Arrays.asList("T")) + .ge("time", stringStringMap.get("startTime")) + .le("time", stringStringMap.get("endTime")) + ); List data; PublicDTO publicDTO; List lineData = new ArrayList<>(); - QueryResult sqlResult = influxDbUtils.query(sql); - List list = resultMapper.toPOJO(sqlResult, DayVPO.class); - for (DayVPO dayV : list) { +// String sql = "SELECT line_id,abs(freq_dev) AS freq_dev FROM day_v where phasic_type = 'T' and (value_type = 'MIN' or value_type = 'MAX') "+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +"group by line_id order by time desc limit 2 tz('Asia/Shanghai')"; +// InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); +// +// QueryResult sqlResult = influxDbUtils.query(sql); +// List list = resultMapper.toPOJO(sqlResult, DayVPO.class); + for (RStatDataVDPO dayV : threePhaseList) { for (Overlimit overlimit : overLimitList) { if (Objects.equals(dayV.getLineId(),overlimit.getId())){ double freqDev = dayV.getFreqDev()/overlimit.getFreqDev(); @@ -490,14 +532,23 @@ public class PollutionServiceImpl implements PollutionService { * 电压偏差：各监测点最新的A、B、C三相数据，取电压上下偏差的绝对值中的最大值。 */ private List getVoltageDeviation(List overLimitList,String dataDate){ - String sql = "SELECT line_id,vu_dev,vl_dev,value_type FROM day_v where (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and (value_type = 'MIN' or value_type = 'MAX') "+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +" group by line_id order by time desc limit 6 tz('Asia/Shanghai')"; - QueryResult sqlResult = influxDbUtils.query(sql); - InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); + Map stringStringMap = processMysqlDate(dataDate, Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); + List list = dataVDService.list(new QueryWrapper() + .select("line_id","vu_dev","vl_dev","value_type") + .in("value_type", Arrays.asList("MIN","MAX")) + .in("phasic_type", Arrays.asList("A","B","C")) + .ge("time", stringStringMap.get("startTime")) + .le("time", stringStringMap.get("endTime")) + ); List data; PublicDTO publicDTO; List lineData = new ArrayList<>(); - List list = resultMapper.toPOJO(sqlResult, DayVPO.class); - for (DayVPO dayV : list) { +// String sql = "SELECT line_id,vu_dev,vl_dev,value_type FROM day_v where (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and (value_type = 'MIN' or value_type = 'MAX') "+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +" group by line_id order by time desc limit 6 tz('Asia/Shanghai')"; +// QueryResult sqlResult = influxDbUtils.query(sql); +// InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); +// +// List list = resultMapper.toPOJO(sqlResult, DayVPO.class); + for (RStatDataVDPO dayV : list) { for (Overlimit overlimit : overLimitList) { if (Objects.equals(dayV.getLineId(),overlimit.getId())){ double vlDev = Math.abs(dayV.getVlDev()/overlimit.getUvoltageDev()); @@ -520,14 +571,23 @@ public class PollutionServiceImpl implements PollutionService { * 三相电压不平衡度：各监测点最新的T相数据。 */ private List getThreePhaseVoltageUnbalance(List overLimitList,String dataDate){ - String sql = "SELECT line_id,v_unbalance,value_type FROM day_v where phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') "+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +" group by line_id order by time desc limit 2 tz('Asia/Shanghai')"; - InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); + Map stringStringMap = processMysqlDate(dataDate, Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); + List list = dataVDService.list(new QueryWrapper() + .select("line_id","v_unbalance","value_type") + .in("value_type", Arrays.asList("CP95","MAX")) + .in("phasic_type", Arrays.asList("T")) + .ge("time", stringStringMap.get("startTime")) + .le("time", stringStringMap.get("endTime")) + ); List data; PublicDTO publicDTO; List lineData = new ArrayList<>(); - QueryResult sqlResult = influxDbUtils.query(sql); - List list = resultMapper.toPOJO(sqlResult, DayVPO.class); - for (DayVPO dayV : list) { +// String sql = "SELECT line_id,v_unbalance,value_type FROM day_v where phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') "+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +" group by line_id order by time desc limit 2 tz('Asia/Shanghai')"; +// InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); +// +// QueryResult sqlResult = influxDbUtils.query(sql); +// List list = resultMapper.toPOJO(sqlResult, DayVPO.class); + for (RStatDataVDPO dayV : list) { for (Overlimit overlimit : overLimitList) { if (Objects.equals(dayV.getLineId(),overlimit.getId())){ double vUnbalance = Math.abs(dayV.getVUnbalance()/overlimit.getUbalance()); @@ -549,14 +609,23 @@ public class PollutionServiceImpl implements PollutionService { * 负序电流：各监测点最新的T相数据。 */ private List getNegativeSequenceCurrent(List overLimitList,String dataDate){ - String sql = "SELECT line_id,i_neg,value_type FROM day_i where phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') "+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +" group by line_id order by time desc limit 2 tz('Asia/Shanghai')"; - InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); + Map stringStringMap = processMysqlDate(dataDate, Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); + List list = dataIDService.list(new QueryWrapper() + .select("line_id","i_neg","value_type") + .in("value_type", Arrays.asList("CP95","MAX")) + .in("phasic_type", Arrays.asList("T")) + .ge("time", stringStringMap.get("startTime")) + .le("time", stringStringMap.get("endTime")) + ); List data; PublicDTO publicDTO; List lineData = new ArrayList<>(); - QueryResult sqlResult = influxDbUtils.query(sql); - List list = resultMapper.toPOJO(sqlResult, DayIPO.class); - for (DayIPO dayI : list) { +// String sql = "SELECT line_id,i_neg,value_type FROM day_i where phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') "+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +" group by line_id order by time desc limit 2 tz('Asia/Shanghai')"; +// InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); +// +// QueryResult sqlResult = influxDbUtils.query(sql); +// List list = resultMapper.toPOJO(sqlResult, DayIPO.class); + for (RStatDataIDPO dayI : list) { for (Overlimit overlimit : overLimitList) { if (Objects.equals(dayI.getLineId(),overlimit.getId()) && overlimit.getINeg() != 0){ BigDecimal dayiNeg = BigDecimal.valueOf(dayI.getINeg()); @@ -581,14 +650,22 @@ public class PollutionServiceImpl implements PollutionService { * 间谐波电压含有率：各监测点最新的A、B、C三相数据。 */ private List getInterharmonicVoltage(List overLimitList,String dataDate){ - String sql = "SELECT * FROM day_inharm_v where (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' "+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +" group by line_id order by time desc limit 3 tz('Asia/Shanghai')"; - InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); + Map stringStringMap = processMysqlDate(dataDate, Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); + List list = inharmVDService.list(new QueryWrapper() + .in("value_type", Arrays.asList("CP95")) + .in("phasic_type", Arrays.asList("A","B","C")) + .ge("time", stringStringMap.get("startTime")) + .le("time", stringStringMap.get("endTime")) + ); List data; PublicDTO publicDTO; List lineData = new ArrayList<>(); - QueryResult sqlResult = influxDbUtils.query(sql); - List list = resultMapper.toPOJO(sqlResult, DayInharmVPO.class); - for (DayInharmVPO dayInharmV : list) { +// String sql = "SELECT * FROM day_inharm_v where (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' "+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +" group by line_id order by time desc limit 3 tz('Asia/Shanghai')"; +// InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); +// +// QueryResult sqlResult = influxDbUtils.query(sql); +// List list = resultMapper.toPOJO(sqlResult, DayInharmVPO.class); + for (RStatDataInharmVDPO dayInharmV : list) { for (Overlimit overlimit : overLimitList) { if (Objects.equals(dayInharmV.getLineId(),overlimit.getId())){ double v1 = Math.abs(dayInharmV.getV1()/overlimit.getInuharm1()); @@ -625,14 +702,23 @@ public class PollutionServiceImpl implements PollutionService { * 长时电压闪变：各监测点最新的A、B、C三相数据。 */ private List getVoltageFlicker(List overLimitList,String dataDate){ - String sql = "SELECT * FROM day_plt where (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' "+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +" group by line_id order by time desc limit 3 tz('Asia/Shanghai')"; - InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); + Map stringStringMap = processMysqlDate(dataDate, Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); + List list = pltDService.list(new QueryWrapper() + .in("value_type", Arrays.asList("CP95")) + .in("phasic_type", Arrays.asList("A","B","C")) + .ge("time", stringStringMap.get("startTime")) + .le("time", stringStringMap.get("endTime")) + ); List data; PublicDTO publicDTO; List lineData = new ArrayList<>(); - QueryResult sqlResult = influxDbUtils.query(sql); - List list = resultMapper.toPOJO(sqlResult, DayPltPO.class); - for (DayPltPO dayPlt : list) { + +// String sql = "SELECT * FROM day_plt where (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' "+ processDate(dataDate,Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)) +" group by line_id order by time desc limit 3 tz('Asia/Shanghai')"; +// InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); +// +// QueryResult sqlResult = influxDbUtils.query(sql); +// List list = resultMapper.toPOJO(sqlResult, DayPltPO.class); + for (RStatDataPltDPO dayPlt : list) { for (Overlimit overlimit : overLimitList) { if (Objects.equals(dayPlt.getLineId(),overlimit.getId())){ double plt = Math.abs(dayPlt.getPlt()/overlimit.getFlicker()); @@ -710,6 +796,42 @@ public class PollutionServiceImpl implements PollutionService { return outList; } + /** + * MYSQL 时间返回 + * @param date + * @param type + * @return + */ + private Map processMysqlDate(String date,Integer type){ + Map mapDate=new HashMap<>(); + if (StrUtil.isNotBlank(date)){ + if (Integer.valueOf(BizParamConstant.STAT_BIZ_DAY).equals(type)){ + mapDate.put("startTime",date+" 00:00:00"); + mapDate.put("endTime",date+" 23:59:59"); + }else if (Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH).equals(type)){ + Date dateOut = DateUtil.parse(date); + Date dateOutb = DateUtil.beginOfMonth(dateOut); + Date dateOute = DateUtil.endOfMonth(dateOut); + mapDate.put("startTime",dateOutb+" 00:00:00"); + mapDate.put("endTime",dateOute+" 23:59:59"); + }else if (Integer.valueOf(BizParamConstant.STAT_BIZ_QUARTER).equals(type)){ + Date dateOut = DateUtil.parse(date); + Date dateOutb = DateUtil.beginOfQuarter(dateOut); + Date dateOute = DateUtil.endOfQuarter(dateOut); + mapDate.put("startTime",dateOutb+" 00:00:00"); + mapDate.put("endTime",dateOute+" 23:59:59"); + }else if (Integer.valueOf(BizParamConstant.STAT_BIZ_YEAR).equals(type)){ + Date dateOut = DateUtil.parse(date); + Date dateOutb = DateUtil.beginOfYear(dateOut); + Date dateOute = DateUtil.endOfYear(dateOut); + mapDate.put("startTime",dateOutb+" 00:00:00"); + mapDate.put("endTime",dateOute+" 23:59:59"); + } + } + return mapDate; + } + + /** * influxDb时间条件处理 */ diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmRateVDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmRateVDService.java index 238e0e4d2..852c126cc 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmRateVDService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmRateVDService.java @@ -1,10 +1,11 @@ package com.njcn.prepare.harmonic.service.mysql.day; +import com.github.jeffreyning.mybatisplus.service.IMppService; import com.njcn.harmonic.pojo.po.day.RStatDataHarmrateVDPO; import java.util.List; -public interface IRStatDataHarmRateVDService { +public interface IRStatDataHarmRateVDService extends IMppService { void insert(List list); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataIDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataIDService.java index 296304560..7e02a60fe 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataIDService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataIDService.java @@ -1,10 +1,11 @@ package com.njcn.prepare.harmonic.service.mysql.day; +import com.github.jeffreyning.mybatisplus.service.IMppService; import com.njcn.harmonic.pojo.po.day.RStatDataIDPO; import java.util.List; -public interface IRStatDataIDService { +public interface IRStatDataIDService extends IMppService { void insert(List list); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataInharmIDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataInharmIDService.java index a7e48e568..c7654eee2 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataInharmIDService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataInharmIDService.java @@ -1,10 +1,11 @@ package com.njcn.prepare.harmonic.service.mysql.day; +import com.github.jeffreyning.mybatisplus.service.IMppService; import com.njcn.harmonic.pojo.po.day.RStatDataInharmIDPO; import java.util.List; -public interface IRStatDataInharmIDService { +public interface IRStatDataInharmIDService extends IMppService { void insert(List list); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataInharmVDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataInharmVDService.java index 4ae42d0f6..21e7cf8b7 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataInharmVDService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataInharmVDService.java @@ -1,10 +1,11 @@ package com.njcn.prepare.harmonic.service.mysql.day; +import com.github.jeffreyning.mybatisplus.service.IMppService; import com.njcn.harmonic.pojo.po.day.RStatDataInharmVDPO; import java.util.List; -public interface IRStatDataInharmVDService { +public interface IRStatDataInharmVDService extends IMppService { void insert(List list); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataPltDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataPltDService.java index f85c8ba06..a74582015 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataPltDService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataPltDService.java @@ -1,10 +1,11 @@ package com.njcn.prepare.harmonic.service.mysql.day; +import com.github.jeffreyning.mybatisplus.service.IMppService; import com.njcn.harmonic.pojo.po.day.RStatDataPltDPO; import java.util.List; -public interface IRStatDataPltDService { +public interface IRStatDataPltDService extends IMppService { void insert(List list); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataVDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataVDService.java index cd8b95100..193c78d01 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataVDService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataVDService.java @@ -1,10 +1,11 @@ package com.njcn.prepare.harmonic.service.mysql.day; +import com.github.jeffreyning.mybatisplus.service.IMppService; import com.njcn.harmonic.pojo.po.day.RStatDataVDPO; import java.util.List; -public interface IRStatDataVDService { +public interface IRStatDataVDService extends IMppService { void insert(List list); }