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

达梦数据库兼容调整

Browse Source
This commit is contained in:
chendaofei
2025-04-10 13:15:29 +08:00
parent f7fb8d036a
commit 6793da251c
9 changed files with 124 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/EventDetail.java
View File

@@ -15,6 +15,7 @@ import java.time.Instant;
*/
@Data
@Measurement(name = "pqs_eventdetail")
@Deprecated
public class EventDetail {
@Column(name = "time")

1
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/LimitRatePO.java
View File

@@ -17,6 +17,7 @@ import java.time.Instant;
@Data
@Measurement(name = "limit_rate")
@TableName(value = "limit_rate")
@Deprecated
public class LimitRatePO {
//时间索引
@MppMultiId

1
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/LimitTarget.java
View File

@@ -17,6 +17,7 @@ import java.time.Instant;
*/
@Data
@Measurement(name = "limit_target")
@Deprecated
public class LimitTarget {
@Column(name = "time")

3
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/report/QualifiedReportMapper.java
View File

@@ -1,6 +1,7 @@
package com.njcn.harmonic.mapper.report;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.harmonic.pojo.po.day.RStatLimitTargetDPO;
import org.apache.ibatis.annotations.Param;
import java.time.LocalDateTime;
@@ -20,7 +21,7 @@ public interface QualifiedReportMapper {
* @author cdf
* @date 2023/6/8
*/
Page<Map<String,Object>> getLimitRateData(@Param("page") Page<List<Map<String,Object>>> page, @Param("lineIds")List<String> lineIds, @Param("startTime")LocalDateTime startTime, @Param("endTime")LocalDateTime endTime);
Page<RStatLimitTargetDPO> getLimitRateData(@Param("page") Page<List<Map<String,Object>>> page, @Param("lineIds")List<String> lineIds, @Param("startTime")LocalDateTime startTime, @Param("endTime")LocalDateTime endTime);
/**
*

6
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/report/mapping/QualifiedReportMapper.xml
View File

@@ -2,8 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.harmonic.mapper.report.QualifiedReportMapper">
<select id="getLimitRateData" resultType="map">
select my_index,
<select id="getLimitRateData" resultType="RStatLimitTargetDPO">
select my_index as lineId,
SUM( UHARM_2_OVERTIME ) UHARM_2_OVERTIME,
SUM( IHARM_2_OVERTIME ) IHARM_2_OVERTIME,
SUM( UHARM_3_OVERTIME ) UHARM_3_OVERTIME,
@@ -56,7 +56,7 @@
SUM( UABERRANCE_OVERTIME ) UABERRANCE_OVERTIME,
SUM( UBALANCE_OVERTIME ) UBALANCE_OVERTIME,
SUM( FLICKER_OVERTIME ) FLICKER_OVERTIME,
SUM( flicker_all_time ) FLICKET_ALL_TIME,
SUM( flicker_all_time ) FLICKER_ALL_TIME,
sum( Freq_Dev_OverTime ) FREQ_DEV_OVERTIME,
SUM( ALL_TIME ) ALLTIME
FROM

136
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/QualifiedReportServiceImpl.java
View File

@@ -18,13 +18,17 @@ import com.njcn.harmonic.mapper.report.QualifiedReportMapper;
import com.njcn.harmonic.pojo.dto.FpyReportDTO;
import com.njcn.harmonic.pojo.dto.FpyTagContent;
import com.njcn.harmonic.pojo.param.QualifiedReportParam;
import com.njcn.harmonic.pojo.po.day.RStatLimitTargetDPO;
import com.njcn.harmonic.pojo.po.report.EnumPass;
import com.njcn.harmonic.service.majornetwork.QualifiedReportService;
import com.njcn.web.factory.PageFactory;
import lombok.RequiredArgsConstructor;
import org.apache.commons.beanutils.BeanUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -45,6 +49,8 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
public class QualifiedReportServiceImpl implements QualifiedReportService {
private static final Logger logger = LoggerFactory.getLogger(QualifiedReportServiceImpl.class);
private final QualifiedReportMapper qualifiedReportMapper;
private final GeneralDeviceInfoClient generalDeviceInfoClient;
@@ -55,6 +61,10 @@ public class QualifiedReportServiceImpl implements QualifiedReportService {
private final OverLimitClient overLimitClient;
// 谐波计算的起始次数
private static final int HARMONIC_START = 2;
// 谐波计算的结束次数
private static final int HARMONIC_END = 26;
@Override
public Page<FpyReportDTO> pageTable(QualifiedReportParam qualifiedReportParam) {
@@ -69,36 +79,46 @@ public class QualifiedReportServiceImpl implements QualifiedReportService {
lineBaseQueryParam.setLineIds(lineIds);
lineBaseQueryParam.setSearchValue(qualifiedReportParam.getSearchValue());
List<AreaLineInfoVO> areaLineInfoVOList = lineFeignClient.getRichLineInfo(lineBaseQueryParam).getData();
if(CollUtil.isEmpty(areaLineInfoVOList)){
if (CollUtil.isEmpty(areaLineInfoVOList)) {
return pageResult;
}
List<String> lineNewIds = areaLineInfoVOList.stream().map(AreaLineInfoVO::getLineId).distinct().collect(Collectors.toList());
Map<String, AreaLineInfoVO> lineMap = areaLineInfoVOList.stream().collect(Collectors.toMap(AreaLineInfoVO::getLineId, Function.identity()));
List<String> lineNewIds = areaLineInfoVOList.stream()
.map(AreaLineInfoVO::getLineId)
.distinct()
.collect(Collectors.toList());
Map<String, AreaLineInfoVO> lineMap = areaLineInfoVOList.stream()
.collect(Collectors.toMap(AreaLineInfoVO::getLineId, Function.identity()));
Page<Map<String, Object>> page = qualifiedReportMapper.getLimitRateData(new Page<>(PageFactory.getPageNum(qualifiedReportParam), PageFactory.getPageSize(qualifiedReportParam)), lineNewIds, PubUtils.beginTimeToLocalDateTime(qualifiedReportParam.getBeginTime()), PubUtils.endTimeToLocalDateTime(qualifiedReportParam.getEndTime()));
Page<RStatLimitTargetDPO> page = qualifiedReportMapper.getLimitRateData(new Page<>(PageFactory.getPageNum(qualifiedReportParam), PageFactory.getPageSize(qualifiedReportParam)), lineNewIds, PubUtils.beginTimeToLocalDateTime(qualifiedReportParam.getBeginTime()), PubUtils.endTimeToLocalDateTime(qualifiedReportParam.getEndTime()));
if (CollUtil.isNotEmpty(page.getRecords())) {
List<String> realLineIds = page.getRecords().stream().map(item -> item.get("my_index").toString()).distinct().collect(Collectors.toList());
List<String> realLineIds = page.getRecords().stream()
.map(RStatLimitTargetDPO::getLineId)
.distinct()
.collect(Collectors.toList());
List<Map<String, Object>> dayIhMapList = qualifiedReportMapper.getLimitRateDataIHarm(lineIds, qualifiedReportParam.getBeginTime(), qualifiedReportParam.getEndTime());
Map<String, Map<String, Object>> mapMap = dayIhMapList.stream().collect(Collectors.toMap(it -> it.get("MYINDEX").toString(), Function.identity()));
Map<String, Map<String, Object>> lineIhMap = dayIhMapList.stream()
.collect(Collectors.toMap(it -> it.get("MYINDEX").toString(), Function.identity()));
List<RStatIntegrityD> rStatIntegrityList = lineIntegrityClient.getIntegrityByLineIds(realLineIds, qualifiedReportParam.getBeginTime(), qualifiedReportParam.getEndTime()).getData();
Map<String, RStatIntegrityD> rStatIntegrityMap = rStatIntegrityList.stream().collect(Collectors.toMap(RStatIntegrityD::getLineIndex, Function.identity()));
Map<String, RStatIntegrityD> rStatIntegrityMap = rStatIntegrityList.stream()
.collect(Collectors.toMap(RStatIntegrityD::getLineIndex, Function.identity()));
List<Overlimit> overLimitList = overLimitClient.getOverLimitByLineIds(realLineIds).getData();
Map<String, Overlimit> overLimitMap = overLimitList.stream().collect(Collectors.toMap(Overlimit::getId, Function.identity()));
Map<String, Overlimit> overLimitMap = overLimitList.stream()
.collect(Collectors.toMap(Overlimit::getId, Function.identity()));
for (Map<String, Object> map : page.getRecords()) {
String lineId = map.get("my_index").toString();
for (RStatLimitTargetDPO map : page.getRecords()) {
String lineId = map.getLineId();
Map<String, Object> mapOverLimit = new HashMap<>();
try {
BeanUtils.describe(overLimitMap.get(lineId)).forEach((key, value) -> mapOverLimit.put((String) key, value));
} catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
e.printStackTrace();
logger.error("合格率报告查询_处理Overlimit数据时发生异常", e);
}
//获取平均值的最大值
Map<String, Object> iM = mapMap.get(lineId);
FpyTagContent fpyTagContent = calAllTag(map, mapOverLimit, iM);
Map<String, Object> lineIh = lineIhMap.get(lineId);
FpyTagContent fpyTagContent = calAllTag(map, mapOverLimit, lineIh);
FpyReportDTO fpyReportData = new FpyReportDTO();
if (lineMap.containsKey(lineId)) {
@@ -106,7 +126,6 @@ public class QualifiedReportServiceImpl implements QualifiedReportService {
BeanUtil.copyProperties(areaLineInfoVO, fpyReportData);
fpyReportData.setHarmDes(fpyTagContent.getPassFlag());
fpyReportData.setPowerDes(fpyTagContent.getContent());
}
if (rStatIntegrityMap.containsKey(lineId)) {
@@ -123,55 +142,59 @@ public class QualifiedReportServiceImpl implements QualifiedReportService {
return pageResult;
}
/**
* 计算合格率
*
* @param alltime 总时间
* @param overTime 超标时间
* @param description 描述信息
* @return 合格率字符串
*/
private String calculateRate(BigDecimal alltime, BigDecimal overTime, String description) {
if (alltime.intValue() > 0 && overTime.intValue() > 0) {
BigDecimal rate = alltime.subtract(overTime).divide(alltime, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
return description + rate.floatValue() + "%;";
}
return "";
}
/**
* 其他指标计算
*/
private FpyTagContent calAllTag(Map<String, Object> map, Map<String, Object> mapOverLimit, Map<String, Object> iMap) {
private FpyTagContent calAllTag(RStatLimitTargetDPO map, Map<String, Object> mapOverLimit, Map<String, Object> lineIhMap) {
StrBuilder content = new StrBuilder();
BigDecimal alltime = (BigDecimal) map.get("ALLTIME");
BigDecimal flicketAllTime = (BigDecimal) map.get("FLICKET_ALL_TIME");
BigDecimal alltime = new BigDecimal(map.getAllTime()) ;
BigDecimal flicketAllTime =new BigDecimal(map.getFlickerAllTime());
FpyTagContent fpyTagContent = new FpyTagContent();
if (alltime.intValue() > 0) {
//频率偏差
BigDecimal freq = (BigDecimal) map.get("FREQ_DEV_OVERTIME");
if (freq.intValue() > 0) {
BigDecimal freqRate = alltime.subtract(freq).divide(alltime, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
content.append("频率偏差合格率").append(String.valueOf(freqRate.floatValue())).append("%;");
}
BigDecimal freq = new BigDecimal(map.getFreqDevOvertime());
content.append(calculateRate(alltime, freq, "频率偏差合格率"));
//电压偏差
BigDecimal voltageDev = (BigDecimal) map.get("VOLTAGE_DEV_OVERTIME");
if (voltageDev.intValue() > 0) {
BigDecimal voltageDevRate = alltime.subtract(voltageDev).divide(alltime, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
content.append("电压偏差合格率").append(String.valueOf(voltageDevRate.floatValue())).append("%;");
}
BigDecimal voltageDev = new BigDecimal(map.getVoltageDevOvertime());
content.append(calculateRate(alltime, voltageDev, "电压偏差合格率"));
//三项不平衡
BigDecimal ubalance = (BigDecimal) map.get("UBALANCE_OVERTIME");
if (ubalance.intValue() > 0) {
BigDecimal ubalanceRate = alltime.subtract(ubalance).divide(alltime, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
content.append("三相电压不平衡合格率").append(String.valueOf(ubalanceRate.floatValue())).append("%;");
}
BigDecimal ubalance = new BigDecimal(map.getUbalanceOvertime());
content.append(calculateRate(alltime, ubalance, "三相电压不平衡合格率"));
//闪变
BigDecimal flickOver = (BigDecimal) map.get("FLICKER_OVERTIME");
if (flickOver.intValue() > 0) {
BigDecimal flickOverRate = flicketAllTime.subtract(flickOver).divide(flicketAllTime, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
content.append("长时闪变合格率").append(String.valueOf(flickOverRate.floatValue())).append("%;");
}
BigDecimal flickOver = new BigDecimal(map.getFlickerOvertime());
content.append(calculateRate(flicketAllTime, flickOver, "长时闪变合格率"));
//电压畸变
BigDecimal uab = (BigDecimal) map.get("UABERRANCE_OVERTIME");
BigDecimal uab = new BigDecimal(map.getUaberranceOvertime());
BigDecimal uabRate = alltime.subtract(uab).divide(alltime, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
if (uabRate.floatValue() < 95) {
content.append("电压总畸变率").append(String.valueOf(uabRate.floatValue())).append("%;");
}
//计算组装谐波含电压有率
int flagV = 0;
for (int i = 2; i < 26; i++) {
BigDecimal v = (BigDecimal) map.get("UHARM_" + i + "_OVERTIME");
int flagV = 0;
for (int i = HARMONIC_START; i < HARMONIC_END; i++) {
BigDecimal v = new BigDecimal(getUharmOvertime(i));
BigDecimal hegeRate = alltime.subtract(v).divide(alltime, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
if (hegeRate.floatValue() < 95) {
content.append(String.valueOf(i)).append("次谐波电压含有率合格率").append(String.valueOf(hegeRate.floatValue())).append("%;");
@@ -181,12 +204,12 @@ public class QualifiedReportServiceImpl implements QualifiedReportService {
//计算组装谐波电流幅值
int flagI = 0;
for (int i = 2; i < 26; i++) {
for (int i = HARMONIC_START; i < HARMONIC_END; i++) {
String key = "IHARM_" + i + "_OVERTIME";
BigDecimal ih = (BigDecimal) map.get(key);
BigDecimal ih = new BigDecimal(getIharmOvertime(i));
BigDecimal hegeRate = alltime.subtract(ih).divide(alltime, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
if (hegeRate.floatValue() < 95) {
BigDecimal maxI = (BigDecimal) iMap.get(key);
BigDecimal maxI = (BigDecimal) lineIhMap.get(key);
BigDecimal overLimit = new BigDecimal(mapOverLimit.get("iharm" + i).toString());
content.append(String.valueOf(i)).append("次谐波电流合格率").append(String.valueOf(hegeRate.floatValue())).append("%,限值为").append(String.valueOf(overLimit.floatValue())).append("A," + "最大值为").append(String.valueOf(maxI.setScale(2, RoundingMode.HALF_UP))).append("A;");
flagI++;
@@ -214,4 +237,27 @@ public class QualifiedReportServiceImpl implements QualifiedReportService {
return fpyTagContent;
}
}
public Integer getUharmOvertime(int harmonicOrder) {
try {
Field field = this.getClass().getDeclaredField("uharm" + harmonicOrder + "Overtime");
field.setAccessible(true);
return (Integer) field.get(this);
} catch (NoSuchFieldException | IllegalAccessException e) {
e.printStackTrace();
return 0;
}
}
public Integer getIharmOvertime(int harmonicOrder) {
try {
Field field = this.getClass().getDeclaredField("iharm" + harmonicOrder + "Overtime");
field.setAccessible(true);
return (Integer) field.get(this);
} catch (NoSuchFieldException | IllegalAccessException e) {
e.printStackTrace();
return 0;
}
}
}