Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

预留按月补招功能

Browse Source
This commit is contained in:
xuyang
2023-03-28 13:40:02 +08:00
parent 273e301a5b
commit 4f5c0a4a94
22 changed files with 168 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitRateDPO.java
View File

@@ -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;

4
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitTargetDPO.java
View File

@@ -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;

36
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java
View File

@@ -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<String> getDayByMonth(int yearParam, int monthParam){
List<String> 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;
}
}

18
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java
View File

@@ -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,6 +75,7 @@ public class DayDataController extends BaseController {
@PostMapping("dataToDay")
@OperateInfo(info = LogEnum.BUSINESS_MEDIUM)
public HttpResult<Boolean> dataToDayHandler(@RequestBody LineParam jobParam ){
String startTime,endTime;
log.info(LocalDateTime.now()+"dataToDayHandler开始执行");
String methodDescribe = getMethodDescribe("dataToDayHandler");
List<String> indexLists = new ArrayList<> ();
@@ -82,9 +84,21 @@ public class DayDataController extends BaseController {
} else{
indexLists = jobParam.getLineIds();
}
String startTime = jobParam.getDataDate()+" "+"00:00:00";
String endTime = jobParam.getDataDate()+" "+"23:59:59";
if (jobParam.getType() == 3){
int year = Integer.parseInt(jobParam.getDataDate().split("-")[0]);
int month = Integer.parseInt(jobParam.getDataDate().split("-")[1]);
List<String> 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);
}
}

14
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicGeneralController.java
View File

@@ -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<String> 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<String> 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);
}
}

14
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicMetricController.java
View File

@@ -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<String> 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<String> 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);
}
}

14
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java
View File

@@ -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<String> 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<String> 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);
}
}

17
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitTargetController.java
View File

@@ -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<String> 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<String> 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);
}
}

19
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java
View File

@@ -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<Boolean> limitRate(@RequestBody LineParam limitRateHanlderParam ){
log.info(LocalDateTime.now()+"limitRate开始执行");
String startTime,endTime;
String methodDescribe = getMethodDescribe("limitRate");
List<String> 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";
if (limitRateHanlderParam.getType() == 3){
int year = Integer.parseInt(limitRateHanlderParam.getDataDate().split("-")[0]);
int month = Integer.parseInt(limitRateHanlderParam.getDataDate().split("-")[1]);
List<String> 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);
}
}

14
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/OnlineRateController.java
View File

@@ -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<String> 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<String> 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);
}

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataVDServiceImpl.java
View File

@@ -21,6 +21,6 @@ public class RStatDataVDServiceImpl extends MppServiceImpl<RStatDataVDMapper, RS
@Override
public void insert(List<RStatDataVDPO> list) {
this.saveOrUpdateBatch(list,50);
this.saveOrUpdateBatchByMultiId(list,50);
}
}

7
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java
View File

@@ -71,7 +71,8 @@ public class HarmonicGeneralServiceImpl extends MppServiceImpl<RStatComassesDMap
}
@Override
public void generalDataToMysql(LineParam lineParam) {
@Async("asyncExecutor")
public void generalDataToMysql(LineParam lineParam, String time) {
List<RStatComassesDPO> list = new ArrayList<>();
List<String> lineIdOutList;
if (CollUtil.isEmpty(lineParam.getLineIds())){
@@ -80,12 +81,12 @@ public class HarmonicGeneralServiceImpl extends MppServiceImpl<RStatComassesDMap
}else {
lineIdOutList = new ArrayList<>(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<String, Object> fields = getGeneralData(lineId,lineParam.getDataDate());
Map<String, Object> 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()));

6
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java
View File

@@ -67,7 +67,7 @@ public class HarmonicMetricServiceImpl extends MppServiceImpl<RStatAssesDMapper,
@Override
@Async("asyncExecutor")
public void metricDataToMysql(LineParam lineParam) {
public void metricDataToMysql(LineParam lineParam,String time) {
List<RStatAssesDPO> list = new ArrayList<>();
List<String> lineIdList;
if (CollUtil.isEmpty(lineParam.getLineIds())){
@@ -76,12 +76,12 @@ public class HarmonicMetricServiceImpl extends MppServiceImpl<RStatAssesDMapper,
}else {
lineIdList = new ArrayList<>(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<String, Object> fields = getMetricData(lineId,lineParam.getDataDate());
Map<String, Object> 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()));

6
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java
View File

@@ -81,7 +81,7 @@ public class IntegrityServiceImpl extends MppServiceImpl<RStatIntegrityDMapper,
@Override
@Async("asyncExecutor")
public void dataIntegrity(LineParam lineParam) {
public void dataIntegrity(LineParam lineParam,String time) {
List<LineDetail> lineDetailList = new ArrayList<>();
if (CollUtil.isEmpty(lineParam.getLineIds())){
List<Overlimit> overLimitList = getAllLinesLimitData();
@@ -90,10 +90,10 @@ public class IntegrityServiceImpl extends MppServiceImpl<RStatIntegrityDMapper,
}else {
lineDetailList = lineFeignClient.getLineDetail(lineParam.getLineIds()).getData();
}
Date dateOut = DateUtil.parse(lineParam.getDataDate());
Date dateOut = DateUtil.parse(time);
List<RStatIntegrityDPO> 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());

8
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java
View File

@@ -64,14 +64,14 @@ public class LimitTargetServiceImpl extends MppServiceImpl<RStatLimitTargetDMapp
@Override
@Async("asyncExecutor")
public void limitTargetData(LineParam lineParam) {
public void limitTargetData(LineParam lineParam,String time) {
List<RStatLimitTargetDPO> list = new ArrayList<>();
Date dateOut = DateUtil.parse(lineParam.getDataDate());
Date dateOut = DateUtil.parse(time);
List<RStatLimitRateDPO> 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){

6
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/OnlineRateServiceImpl.java
View File

@@ -81,7 +81,7 @@ public class OnlineRateServiceImpl extends MppServiceImpl<RStatOnlineRateDMapper
@Override
@Async("asyncExecutor")
public void onlineRateData(LineParam lineParam) {
public void onlineRateData(LineParam lineParam,String time) {
List<String> lineIdList = lineParam.getLineIds();
if (CollUtil.isEmpty(lineParam.getLineIds())){
lineIdList = lineFeignClient.getDeviceList().getData();
@@ -92,11 +92,11 @@ public class OnlineRateServiceImpl extends MppServiceImpl<RStatOnlineRateDMapper
outCommunicateData.addAll(communicateData);
}
List<RStatOnlineRateDPO> 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());

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/HarmonicGeneralService.java
View File

@@ -11,5 +11,5 @@ public interface HarmonicGeneralService {
void generalData(LineParam lineParam);
void generalDataToMysql(LineParam lineParam);
void generalDataToMysql(LineParam lineParam,String time);
}

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/HarmonicMetricService.java
View File

@@ -11,5 +11,5 @@ public interface HarmonicMetricService {
void metricData(LineParam lineParam);
void metricDataToMysql(LineParam lineParam);
void metricDataToMysql(LineParam lineParam,String time);
}

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IntegrityService.java
View File

@@ -11,5 +11,5 @@ public interface IntegrityService {
String computeDataIntegrity(LineParam lineParam);
void dataIntegrity(LineParam lineParam);
void dataIntegrity(LineParam lineParam,String time);
}

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/LimitTargetService.java
View File

@@ -11,5 +11,5 @@ public interface LimitTargetService {
void getLimitTargetData(LineParam lineParam);
void limitTargetData(LineParam lineParam);
void limitTargetData(LineParam lineParam,String time);
}

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/OnlineRateService.java
View File

@@ -11,5 +11,5 @@ public interface OnlineRateService {
void getOnlineRateData(LineParam lineParam);
void onlineRateData(LineParam lineParam);
void onlineRateData(LineParam lineParam,String time);
}