From 4f5c0a4a942d67aa464cde8a6b4e0c538f9c142b Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Tue, 28 Mar 2023 13:40:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=95=99=E6=8C=89=E6=9C=88=E8=A1=A5?= =?UTF-8?q?=E6=8B=9B=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../harmonic/pojo/po/RStatLimitRateDPO.java | 4 +++ .../harmonic/pojo/po/RStatLimitTargetDPO.java | 4 +++ .../prepare/harmonic/utils/PublicUtil.java | 36 ++++++++++++++++--- .../controller/line/DayDataController.java | 22 +++++++++--- .../line/HarmonicGeneralController.java | 14 +++++++- .../line/HarmonicMetricController.java | 14 +++++++- .../controller/line/IntegrityController.java | 14 +++++++- .../line/LimitTargetController.java | 17 ++++++++- .../controller/line/LimitrateController.java | 21 +++++++++-- .../controller/line/OnlineRateController.java | 14 +++++++- .../Impl/day/RStatDataVDServiceImpl.java | 2 +- .../mysql/Impl/line/DayDataServiceImpl.java | 2 +- .../Impl/line/HarmonicGeneralServiceImpl.java | 7 ++-- .../Impl/line/HarmonicMetricServiceImpl.java | 6 ++-- .../mysql/Impl/line/IntegrityServiceImpl.java | 6 ++-- .../Impl/line/LimitTargetServiceImpl.java | 8 ++--- .../Impl/line/OnlineRateServiceImpl.java | 6 ++-- .../mysql/line/HarmonicGeneralService.java | 2 +- .../mysql/line/HarmonicMetricService.java | 2 +- .../service/mysql/line/IntegrityService.java | 2 +- .../mysql/line/LimitTargetService.java | 2 +- .../service/mysql/line/OnlineRateService.java | 2 +- 22 files changed, 168 insertions(+), 39 deletions(-) diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitRateDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitRateDPO.java index 09e05d14f..d7b7f5c0d 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitRateDPO.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitRateDPO.java @@ -2,6 +2,7 @@ package com.njcn.prepare.harmonic.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -16,18 +17,21 @@ public class RStatLimitRateDPO { /** * 监测点ID合格率的变电站/装置/母线/线路序号 */ + @MppMultiId @TableField(value = "my_index") private String lineId; /** * 数据类型,’A’表示A相，’B’表示B相,’C’表示C相,’’M’表示ABC三项总和，T’表示总 */ + @MppMultiId @TableField(value = "phasic_type") private String phasicType; /** * 合格率时间 */ + @MppMultiId @TableField(value = "time_id") private Date time; diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitTargetDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitTargetDPO.java index faabb53bf..9655484b2 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitTargetDPO.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitTargetDPO.java @@ -2,6 +2,7 @@ package com.njcn.prepare.harmonic.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; import com.njcn.harmonic.pojo.po.LimitRate; import lombok.AllArgsConstructor; import lombok.Data; @@ -17,18 +18,21 @@ public class RStatLimitTargetDPO{ /** * 监测点ID合格率的变电站/装置/母线/线路序号 */ + @MppMultiId @TableField(value = "my_index") private String lineId; /** * 数据类型,’A’表示A相，’B’表示B相,’C’表示C相,’’M’表示ABC三项总和，T’表示总 */ + @MppMultiId @TableField(value = "phasic_type") private String phasicType; /** * 合格率时间 */ + @MppMultiId @TableField(value = "time_id") private Date time; diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java index bb9436046..1c7e6e960 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java @@ -5,10 +5,7 @@ import cn.hutool.core.date.DateUtil; import com.njcn.device.pq.constant.Param; import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; +import java.util.*; public class PublicUtil { @@ -97,4 +94,35 @@ public class PublicUtil { System.out.println ( PublicUtil.getNowQuarter ("2002-01-07")); } + /** + * 根据当前年、月获取每一天日期 + */ + public static List getDayByMonth(int yearParam, int monthParam){ + List list = new ArrayList<>(); + Calendar calendar = Calendar.getInstance(Locale.CHINA); + calendar.set(yearParam, monthParam-1, 1); + //年份 + int year = calendar.get(Calendar.YEAR); + //月份 + int month = calendar.get(Calendar.MONTH) + 1; + int day = calendar.getActualMaximum(Calendar.DATE); + for (int i = 1; i <= day; i++) { + String date=null; + if(month<10 && i<10){ + date = year +"-0"+month+"-0"+i; + } + if(month<10 && i>=10){ + date = year +"-0"+month+"-"+i; + } + if(month>=10 && i<10){ + date = year +"-"+month+"-0"+i; + } + if(month>=10 && i>=10){ + date = year +"-"+month+"-"+i; + } + list.add(date); + } + return list; + } + } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java index 6f367682c..c62c457f3 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java @@ -8,6 +8,7 @@ import com.njcn.common.utils.HttpResultUtil; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.prepare.harmonic.pojo.param.LineParam; import com.njcn.prepare.harmonic.service.mysql.line.DayDataService; +import com.njcn.prepare.harmonic.utils.PublicUtil; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -74,17 +75,30 @@ public class DayDataController extends BaseController { @PostMapping("dataToDay") @OperateInfo(info = LogEnum.BUSINESS_MEDIUM) public HttpResult dataToDayHandler(@RequestBody LineParam jobParam ){ + String startTime,endTime; log.info(LocalDateTime.now()+"dataToDayHandler开始执行"); String methodDescribe = getMethodDescribe("dataToDayHandler"); List indexLists = new ArrayList<> (); if(CollectionUtils.isEmpty (jobParam.getLineIds())){ indexLists = lineFeignClient.getLineList().getData(); - }else{ + } else{ indexLists = jobParam.getLineIds(); } - String startTime = jobParam.getDataDate()+" "+"00:00:00"; - String endTime = jobParam.getDataDate()+" "+"23:59:59"; - dayDataService.dataToDayHandler(indexLists,startTime,endTime); + if (jobParam.getType() == 3){ + int year = Integer.parseInt(jobParam.getDataDate().split("-")[0]); + int month = Integer.parseInt(jobParam.getDataDate().split("-")[1]); + List dayList = PublicUtil.getDayByMonth(year,month); + for (String item : dayList) { + log.info(item+"-->开始执行"); + startTime = item+" "+"00:00:00"; + endTime = item+" "+"23:59:59"; + dayDataService.dataToDayHandler(indexLists,startTime,endTime); + } + } else { + startTime = jobParam.getDataDate()+" "+"00:00:00"; + endTime = jobParam.getDataDate()+" "+"23:59:59"; + dayDataService.dataToDayHandler(indexLists,startTime,endTime); + } return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicGeneralController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicGeneralController.java index 39f077afb..f33f05bee 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicGeneralController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicGeneralController.java @@ -7,6 +7,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.prepare.harmonic.pojo.param.LineParam; import com.njcn.prepare.harmonic.service.mysql.line.HarmonicGeneralService; +import com.njcn.prepare.harmonic.utils.PublicUtil; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.time.LocalDateTime; +import java.util.List; /** * @author xiaoyao @@ -52,7 +54,17 @@ public class HarmonicGeneralController extends BaseController { public HttpResult generalDataToMysql(@RequestBody @Validated LineParam lineParam){ log.info(LocalDateTime.now()+"generalDataToMysql开始执行"); String methodDescribe = getMethodDescribe("generalDataToMysql"); - harmonicGeneralService.generalDataToMysql(lineParam); + if (lineParam.getType() == 3){ + int year = Integer.parseInt(lineParam.getDataDate().split("-")[0]); + int month = Integer.parseInt(lineParam.getDataDate().split("-")[1]); + List dayList = PublicUtil.getDayByMonth(year,month); + for (String item : dayList) { + log.info(item+"-->开始执行"); + harmonicGeneralService.generalDataToMysql(lineParam,item); + } + } else { + harmonicGeneralService.generalDataToMysql(lineParam,lineParam.getDataDate()); + } return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicMetricController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicMetricController.java index 8b5560342..ff450e985 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicMetricController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicMetricController.java @@ -7,6 +7,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.prepare.harmonic.pojo.param.LineParam; import com.njcn.prepare.harmonic.service.mysql.line.HarmonicMetricService; +import com.njcn.prepare.harmonic.utils.PublicUtil; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.time.LocalDateTime; +import java.util.List; /** * @author xiaoyao @@ -53,7 +55,17 @@ public class HarmonicMetricController extends BaseController { public HttpResult metricDataToMysql(@RequestBody @Validated LineParam lineParam){ log.info(LocalDateTime.now()+"metricDataToMysql开始执行"); String methodDescribe = getMethodDescribe("metricDataToMysql"); - harmonicMetricService.metricDataToMysql(lineParam); + if (lineParam.getType() == 3){ + int year = Integer.parseInt(lineParam.getDataDate().split("-")[0]); + int month = Integer.parseInt(lineParam.getDataDate().split("-")[1]); + List dayList = PublicUtil.getDayByMonth(year,month); + for (String item : dayList) { + log.info(item+"-->开始执行"); + harmonicMetricService.metricDataToMysql(lineParam,item); + } + } else { + harmonicMetricService.metricDataToMysql(lineParam,lineParam.getDataDate()); + } return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java index 4074e0ac6..8470778e4 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java @@ -7,6 +7,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.prepare.harmonic.pojo.param.LineParam; import com.njcn.prepare.harmonic.service.mysql.line.IntegrityService; +import com.njcn.prepare.harmonic.utils.PublicUtil; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.time.LocalDateTime; +import java.util.List; /** * @author xiaoyao @@ -53,7 +55,17 @@ public class IntegrityController extends BaseController { public HttpResult dataIntegrity(@RequestBody @Validated LineParam lineParam){ log.info(LocalDateTime.now()+"dataIntegrity开始执行"); String methodDescribe = getMethodDescribe("dataIntegrity"); - integrityService.dataIntegrity(lineParam); + if (lineParam.getType() == 3){ + int year = Integer.parseInt(lineParam.getDataDate().split("-")[0]); + int month = Integer.parseInt(lineParam.getDataDate().split("-")[1]); + List dayList = PublicUtil.getDayByMonth(year,month); + for (String item : dayList) { + log.info(item+"-->开始执行"); + integrityService.dataIntegrity(lineParam,item); + } + } else { + integrityService.dataIntegrity(lineParam,lineParam.getDataDate()); + } return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, CommonResponseEnum.SUCCESS.getMessage(), methodDescribe); } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitTargetController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitTargetController.java index 8bca1acd9..ec4dcf57b 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitTargetController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitTargetController.java @@ -7,6 +7,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.prepare.harmonic.pojo.param.LineParam; import com.njcn.prepare.harmonic.service.mysql.line.LimitTargetService; +import com.njcn.prepare.harmonic.utils.PublicUtil; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.time.LocalDateTime; +import java.util.List; /** * @author xiaoyao @@ -53,7 +55,20 @@ public class LimitTargetController extends BaseController { public HttpResult limitTargetData(@RequestBody @Validated LineParam lineParam){ log.info(LocalDateTime.now()+"limitTargetData开始执行"); String methodDescribe = getMethodDescribe("limitTargetData"); - limitTargetService.limitTargetData(lineParam); + String time; + if (lineParam.getType() == 3){ + int year = Integer.parseInt(lineParam.getDataDate().split("-")[0]); + int month = Integer.parseInt(lineParam.getDataDate().split("-")[1]); + List dayList = PublicUtil.getDayByMonth(year,month); + for (String item : dayList) { + log.info(item+"-->开始执行"); + time = item + " 00:00:00"; + limitTargetService.limitTargetData(lineParam,time); + } + } else { + time = lineParam.getDataDate() + " 00:00:00"; + limitTargetService.limitTargetData(lineParam,time); + } return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java index a17e16297..550bde50f 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java @@ -8,6 +8,7 @@ import com.njcn.common.utils.HttpResultUtil; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.prepare.harmonic.pojo.param.LineParam; import com.njcn.prepare.harmonic.service.mysql.Impl.line.LimitRateService; +import com.njcn.prepare.harmonic.utils.PublicUtil; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -75,6 +76,7 @@ public class LimitrateController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_MEDIUM) public HttpResult limitRate(@RequestBody LineParam limitRateHanlderParam ){ log.info(LocalDateTime.now()+"limitRate开始执行"); + String startTime,endTime; String methodDescribe = getMethodDescribe("limitRate"); List indexLists = new ArrayList<> (); if(CollectionUtils.isEmpty (limitRateHanlderParam.getLineIds ())){ @@ -82,9 +84,22 @@ public class LimitrateController extends BaseController { }else{ indexLists = limitRateHanlderParam.getLineIds (); } - String startTime = limitRateHanlderParam.getDataDate ()+" "+"00:00:00"; - String endTime = limitRateHanlderParam.getDataDate ()+" "+"23:59:59"; - limitRateService.limitRate(indexLists,startTime,endTime); + + if (limitRateHanlderParam.getType() == 3){ + int year = Integer.parseInt(limitRateHanlderParam.getDataDate().split("-")[0]); + int month = Integer.parseInt(limitRateHanlderParam.getDataDate().split("-")[1]); + List dayList = PublicUtil.getDayByMonth(year,month); + for (String item : dayList) { + log.info(item+"-->开始执行"); + startTime = item+" "+"00:00:00"; + endTime = item+" "+"23:59:59"; + limitRateService.limitRate(indexLists,startTime,endTime); + } + } else { + startTime = limitRateHanlderParam.getDataDate ()+" "+"00:00:00"; + endTime = limitRateHanlderParam.getDataDate ()+" "+"23:59:59"; + limitRateService.limitRate(indexLists,startTime,endTime); + } return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/OnlineRateController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/OnlineRateController.java index 69ad40c73..90a1c2a09 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/OnlineRateController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/OnlineRateController.java @@ -7,6 +7,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.prepare.harmonic.pojo.param.LineParam; import com.njcn.prepare.harmonic.service.mysql.line.OnlineRateService; +import com.njcn.prepare.harmonic.utils.PublicUtil; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.time.LocalDateTime; +import java.util.List; /** * 生成在线率数据表 @@ -55,7 +57,17 @@ public class OnlineRateController extends BaseController { public HttpResult onlineRateData(@RequestBody @Validated LineParam lineParam){ log.info(LocalDateTime.now()+"onlineRateData开始执行"); String methodDescribe = getMethodDescribe("onlineRateData"); - onlineRateService.onlineRateData(lineParam); + if (lineParam.getType() == 3){ + int year = Integer.parseInt(lineParam.getDataDate().split("-")[0]); + int month = Integer.parseInt(lineParam.getDataDate().split("-")[1]); + List dayList = PublicUtil.getDayByMonth(year,month); + for (String item : dayList) { + log.info(item+"-->开始执行"); + onlineRateService.onlineRateData(lineParam,item); + } + } else { + onlineRateService.onlineRateData(lineParam,lineParam.getDataDate()); + } return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataVDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataVDServiceImpl.java index ad0b8f51d..fcb8cef79 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataVDServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataVDServiceImpl.java @@ -21,6 +21,6 @@ public class RStatDataVDServiceImpl extends MppServiceImpl list) { - this.saveOrUpdateBatch(list,50); + this.saveOrUpdateBatchByMultiId(list,50); } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java index aeb41970b..6337f840d 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java @@ -765,7 +765,7 @@ public class DayDataServiceImpl implements DayDataService { /** * 功能描述:获取dataV数据 * @author xy - * @param lineIndex 监测点集ID + * @param lineIndex 监测点集ID * @param startTime 起始时间 * @param endTime 结束时间 * @date 2022/5/10 14:56 diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java index 08debc917..78d68a6c6 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java @@ -71,7 +71,8 @@ public class HarmonicGeneralServiceImpl extends MppServiceImpl list = new ArrayList<>(); List lineIdOutList; if (CollUtil.isEmpty(lineParam.getLineIds())){ @@ -80,12 +81,12 @@ public class HarmonicGeneralServiceImpl extends MppServiceImpl(lineParam.getLineIds()); } - Date dateOut = DateUtil.parse(lineParam.getDataDate()); + Date dateOut = DateUtil.parse(time); for (String lineId : lineIdOutList){ RStatComassesDPO rStatComassesDpo = new RStatComassesDPO(); rStatComassesDpo.setTime(dateOut); rStatComassesDpo.setLineId(lineId); - Map fields = getGeneralData(lineId,lineParam.getDataDate()); + Map fields = getGeneralData(lineId,time); rStatComassesDpo.setFreqDev1(Objects.isNull(fields.get("freq_dev1"))?0.0:Double.parseDouble(fields.get("freq_dev1").toString())); rStatComassesDpo.setFreqDev2(Objects.isNull(fields.get("freq_dev2"))?0.0:Double.parseDouble(fields.get("freq_dev2").toString())); rStatComassesDpo.setFreqDev3(Objects.isNull(fields.get("freq_dev3"))?0.0:Double.parseDouble(fields.get("freq_dev3").toString())); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java index e9cc09b9b..0fada68c8 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java @@ -67,7 +67,7 @@ public class HarmonicMetricServiceImpl extends MppServiceImpl list = new ArrayList<>(); List lineIdList; if (CollUtil.isEmpty(lineParam.getLineIds())){ @@ -76,12 +76,12 @@ public class HarmonicMetricServiceImpl extends MppServiceImpl(lineParam.getLineIds()); } - Date dateOut = DateUtil.parse(lineParam.getDataDate()); + Date dateOut = DateUtil.parse(time); for (String lineId : lineIdList){ RStatAssesDPO rStatAssesDpo = new RStatAssesDPO(); rStatAssesDpo.setTime(dateOut); rStatAssesDpo.setLineId(lineId); - Map fields = getMetricData(lineId,lineParam.getDataDate()); + Map fields = getMetricData(lineId,time); rStatAssesDpo.setVuDev(Double.parseDouble(fields.get("vu_dev").toString())); rStatAssesDpo.setFreqDev(Double.parseDouble(fields.get("freq_dev").toString())); rStatAssesDpo.setDataPlt(Double.parseDouble(fields.get("data_plt").toString())); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java index 2bdfaf756..0f853e060 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java @@ -81,7 +81,7 @@ public class IntegrityServiceImpl extends MppServiceImpl lineDetailList = new ArrayList<>(); if (CollUtil.isEmpty(lineParam.getLineIds())){ List overLimitList = getAllLinesLimitData(); @@ -90,10 +90,10 @@ public class IntegrityServiceImpl extends MppServiceImpl list = new ArrayList<>(); for (LineDetail lineDetail :lineDetailList){ - int dataCount = getDataCount(lineDetail.getId(),lineParam.getDataDate()); + int dataCount = getDataCount(lineDetail.getId(),time); RStatIntegrityDPO integrityDpo = new RStatIntegrityDPO(); integrityDpo.setTime(dateOut); integrityDpo.setLineId(lineDetail.getId()); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java index da0e97963..d149bcdc3 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java @@ -64,14 +64,14 @@ public class LimitTargetServiceImpl extends MppServiceImpl list = new ArrayList<>(); - Date dateOut = DateUtil.parse(lineParam.getDataDate()); + Date dateOut = DateUtil.parse(time); List limitRateData = new ArrayList<>(); if (CollUtil.isEmpty(lineParam.getLineIds())){ - limitRateData = getLimitRateDataFromMysql(null,lineParam.getDataDate()); + limitRateData = getLimitRateDataFromMysql(null,time); } else { - limitRateData = getLimitRateDataFromMysql(lineParam.getLineIds(),lineParam.getDataDate()); + limitRateData = getLimitRateDataFromMysql(lineParam.getLineIds(),time); } if (!CollectionUtils.isEmpty(limitRateData)){ for (RStatLimitRateDPO limitRate : limitRateData){ diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/OnlineRateServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/OnlineRateServiceImpl.java index 84fa18728..44ac1edcd 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/OnlineRateServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/OnlineRateServiceImpl.java @@ -81,7 +81,7 @@ public class OnlineRateServiceImpl extends MppServiceImpl lineIdList = lineParam.getLineIds(); if (CollUtil.isEmpty(lineParam.getLineIds())){ lineIdList = lineFeignClient.getDeviceList().getData(); @@ -92,11 +92,11 @@ public class OnlineRateServiceImpl extends MppServiceImpl list = new ArrayList<>(); - Date dateOut = DateUtil.parse(lineParam.getDataDate()); + Date dateOut = DateUtil.parse(time); for (PqsCommunicatePO pqsCommunicate : outCommunicateData){ RStatOnlineRateDPO onlineRateDpo = new RStatOnlineRateDPO(); Date newDate = Date.from(pqsCommunicate.getTime()); - OnLineRateDTO onLineRate = onLineMinute(newDate,dateOut,pqsCommunicate.getType(),pqsCommunicate.getDevId(),lineParam.getDataDate()); + OnLineRateDTO onLineRate = onLineMinute(newDate,dateOut,pqsCommunicate.getType(),pqsCommunicate.getDevId(),time); onlineRateDpo.setTime(dateOut); onlineRateDpo.setDevId(pqsCommunicate.getDevId()); onlineRateDpo.setOnlineMin(onLineRate.getOnLineMinute()); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/HarmonicGeneralService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/HarmonicGeneralService.java index f92df7d43..99c1a4a06 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/HarmonicGeneralService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/HarmonicGeneralService.java @@ -11,5 +11,5 @@ public interface HarmonicGeneralService { void generalData(LineParam lineParam); - void generalDataToMysql(LineParam lineParam); + void generalDataToMysql(LineParam lineParam,String time); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/HarmonicMetricService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/HarmonicMetricService.java index 7583a3d54..2a46aa030 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/HarmonicMetricService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/HarmonicMetricService.java @@ -11,5 +11,5 @@ public interface HarmonicMetricService { void metricData(LineParam lineParam); - void metricDataToMysql(LineParam lineParam); + void metricDataToMysql(LineParam lineParam,String time); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IntegrityService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IntegrityService.java index 0f378df3c..81c934949 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IntegrityService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IntegrityService.java @@ -11,5 +11,5 @@ public interface IntegrityService { String computeDataIntegrity(LineParam lineParam); - void dataIntegrity(LineParam lineParam); + void dataIntegrity(LineParam lineParam,String time); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/LimitTargetService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/LimitTargetService.java index 70a8d9828..2112c5165 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/LimitTargetService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/LimitTargetService.java @@ -11,5 +11,5 @@ public interface LimitTargetService { void getLimitTargetData(LineParam lineParam); - void limitTargetData(LineParam lineParam); + void limitTargetData(LineParam lineParam,String time); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/OnlineRateService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/OnlineRateService.java index 5ba162718..018c5c646 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/OnlineRateService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/OnlineRateService.java @@ -11,5 +11,5 @@ public interface OnlineRateService { void getOnlineRateData(LineParam lineParam); - void onlineRateData(LineParam lineParam); + void onlineRateData(LineParam lineParam,String time); }