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

切换mysql为达梦数据库-代码审查

Browse Source 
1.harmonic-boot模块
This commit is contained in:
hongawen
2024-09-27 11:34:45 +08:00
parent 4a0e9e3343
commit ae440613fb
126 changed files with 317 additions and 1301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ComAssessController.java
View File

@@ -24,8 +24,8 @@ import java.util.List;
/**
* @version 1.0.0
* @author: chenchao
* @date: 2022/04/21 09:05
* @author chenchao
* @date 2022/04/21 09:05
* 对应菜单 谐波系统-区域-电能质量评估
*/
@Validated

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/CustomReportController.java
View File

@@ -24,7 +24,6 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
/**

332
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java
View File

@@ -48,6 +48,9 @@ import java.util.*;
import java.util.stream.Collectors;
/**
* @author wr
*/
@Slf4j
@RestController
@RequestMapping("/exportmodel")
@@ -55,7 +58,9 @@ import java.util.stream.Collectors;
@AllArgsConstructor
public class ExportModelController extends BaseController {
// 非谐波数据
/**
* 非谐波数据
*/
List<ReportTarget> listVirtual;
List<ReportTarget> listPower;
List<ReportTarget> listFlicker;
@@ -63,9 +68,13 @@ public class ExportModelController extends BaseController {
List<ReportTarget> listVdeviation;
List<ReportTarget> listFrequency;
List<ReportTarget> listThreephase;
// 谐波电压数据
/**
* 谐波电压数据
*/
List<ReportTarget> listVoltageRate;
// 谐波电流数据
/**
* 谐波电流数据
*/
List<ReportTarget> listICurrent;
@@ -119,12 +128,12 @@ public class ExportModelController extends BaseController {
}
bdname = lineDto.getBdName();
areaName = lineDto.getAreaName();
if(areaName.equals("冀北")){
if("冀北".equals(areaName)){
areaName="国网"+areaName;
}
pttype = PubUtils.ptTypeName(lineDto.getPtType());
} else {
List<Monitor> monitorList = monitorClient.getMonitorList(Arrays.asList(lineIndex)).getData();
List<Monitor> monitorList = monitorClient.getMonitorList(Collections.singletonList(lineIndex)).getData();
if (ObjectUtil.isNull(monitorList)) {
throw new BusinessException(EventResponseEnum.NOT_FOUND);
}
@@ -210,8 +219,8 @@ public class ExportModelController extends BaseController {
log.info("获取报表发生异常，异常是" + e1.getMessage());
}
Map<String, Object> reportmap = new HashMap<>();// 报告Map
// 报告Map
Map<String, Object> reportmap = new HashMap<>(16);
//数据单位
PqsDeviceUnit deviceUnit = deviceUnitClient.lineUnitDetail(lineIndex).getData();
reportmap.putAll(unitMap(deviceUnit));
@@ -219,7 +228,7 @@ public class ExportModelController extends BaseController {
reportmap.put("$btype$", btype);
reportmap.put("$ctype$", ctype);
Map<String, Object> header = new HashMap<String, Object>();
Map<String, Object> header = new HashMap<>(16);
if (ObjectUtil.isNotEmpty(file)) {
byte[] bytes = file.getBytes();
if(bytes.length>0){
@@ -271,21 +280,27 @@ public class ExportModelController extends BaseController {
reportmap.put("$image$", header);
getVirtualData(param);
ReportValue voltage1 = this.listVirtual.get(0).getList().get(0);// 电压幅值
ReportValue voltage2 = this.listVirtual.get(0).getList().get(1);// 电压幅值
ReportValue voltage3 = this.listVirtual.get(0).getList().get(2);// 电压幅值
ReportValue current1 = this.listVirtual.get(1).getList().get(0);// 电流幅值
ReportValue current2 = this.listVirtual.get(1).getList().get(1);// 电流幅值
ReportValue current3 = this.listVirtual.get(1).getList().get(2);// 电流幅值
// 电压幅值
ReportValue voltage1 = this.listVirtual.get(0).getList().get(0);
// 电压幅值
ReportValue voltage2 = this.listVirtual.get(0).getList().get(1);
// 电压幅值
ReportValue voltage3 = this.listVirtual.get(0).getList().get(2);
// 电流幅值
ReportValue current1 = this.listVirtual.get(1).getList().get(0);
// 电流幅值
ReportValue current2 = this.listVirtual.get(1).getList().get(1);
// 电流幅值
ReportValue current3 = this.listVirtual.get(1).getList().get(2);
String strLineBaseName = String.format("%s%s", new String[]{bdname + "_", name});
String strAnalysis = "";// 分析建议
String strError = "";// 报表错误
// 分析建议
String strAnalysis = "";
// 报表错误
String strError = "";
/**************************************************************
**** 基波电压/电流有效值表格
**************************************
**************************************
* 一、用基波电压和基波电流做是否有值的判断， 判断策略为所有的基波电压和基波电流都为空
* *************************************
* ************************************* 二、基本数据判断
@@ -407,7 +422,7 @@ public class ExportModelController extends BaseController {
case 1:
tmpstrMap = "B";
break;
case 2:
default:
tmpstrMap = "C";
break;
}
@@ -463,37 +478,55 @@ public class ExportModelController extends BaseController {
// Depts dep = R.getCurrentDept();
// String detpName = dep.getArea();
reportmap.put("$detpName$", areaName); // 区域名称
// 区域名称
reportmap.put("$detpName$", areaName);
// 获取报告生成时间
Date currentTime = new Date();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy年MM月dd日 HH时mm分ss秒");// 报告时分秒格式
// 报告时分秒格式
SimpleDateFormat formatter = new SimpleDateFormat("yyyy年MM月dd日 HH时mm分ss秒");
String strTime = String.format("%s——%s。",
new String[]{DateUtil.format(startDate, "yyyy年MM月dd日 HH时mm分ss秒"),
DateUtil.format(endDate, "yyyy年MM月dd日 HH时mm分ss秒")});
reportmap.put("$number$", reportNumber); // 报告编号
reportmap.put("$titlePoint$", crmName); // 客户名称
reportmap.put("$TitleTime$", formatter.format(currentTime)); // 报告生成时间
// 报告编号
reportmap.put("$number$", reportNumber);
// 客户名称
reportmap.put("$titlePoint$", crmName);
// 报告生成时间
reportmap.put("$TitleTime$", formatter.format(currentTime));
// 报告标题
reportmap.put("$ReportTitle$",
String.format("对该地区%s电能质量在线监测数据进行分析， 以判断电能质量指标是否满足国标。", new String[]{strLineBaseName}));// 报告标题
reportmap.put("$ReportTime$", strTime);// 报告分析时间段
String.format("对该地区%s电能质量在线监测数据进行分析， 以判断电能质量指标是否满足国标。", new String[]{strLineBaseName}));
// 报告分析时间段
reportmap.put("$ReportTime$", strTime);
// 运行数据分析
reportmap.put("$RunBaseName$", String.format("以下将对%s电能质量统计数据进行分析，数据包括基波电压/电流、谐波电压/电流、电压偏差、三相电压不平衡度、电压闪变、频率偏差。",
new String[]{strLineBaseName}));// 运行数据分析
reportmap.put("$BaseVITable$", String.format("报告分析时间段内%s的基波电压/电流分钟统计数据见下表。", new String[]{strLineBaseName}));// 基波电压和电流
reportmap.put("$VDTable$", String.format("报告分析时间段内%s的电压偏差统计数据见下表。", new String[]{strLineBaseName}));// 供电电压偏差
reportmap.put("$FRETable$", String.format("报告分析时间段内%s的频率偏差统计数据见下表。", new String[]{strLineBaseName}));// 频率偏差
reportmap.put("$THETable$", String.format("报告分析时间段内%s的三相电压不平衡度统计数据见下表。", new String[]{strLineBaseName}));// 三相电压不平衡度
reportmap.put("$PLTTable$", String.format("报告分析时间段内%s的闪变统计数据见下表。", new String[]{strLineBaseName}));// 闪变
new String[]{strLineBaseName}));
// 基波电压和电流
reportmap.put("$BaseVITable$", String.format("报告分析时间段内%s的基波电压/电流分钟统计数据见下表。", new String[]{strLineBaseName}));
// 供电电压偏差
reportmap.put("$VDTable$", String.format("报告分析时间段内%s的电压偏差统计数据见下表。", new String[]{strLineBaseName}));
// 频率偏差
reportmap.put("$FRETable$", String.format("报告分析时间段内%s的频率偏差统计数据见下表。", new String[]{strLineBaseName}));
// 三相电压不平衡度
reportmap.put("$THETable$", String.format("报告分析时间段内%s的三相电压不平衡度统计数据见下表。", new String[]{strLineBaseName}));
// 闪变
reportmap.put("$PLTTable$", String.format("报告分析时间段内%s的闪变统计数据见下表。", new String[]{strLineBaseName}));
// 谐波电压
reportmap.put("$RVTable$",
String.format("报告分析时间段内%s的2-25次谐波电压含有率CP95概率值统计数据见下表。", new String[]{strLineBaseName}));// 谐波电压
String.format("报告分析时间段内%s的2-25次谐波电压含有率CP95概率值统计数据见下表。", new String[]{strLineBaseName}));
// 谐波电流
reportmap.put("$RITable$",
String.format("报告分析时间段内%s的2-25次谐波电流幅值CP95概率值统计数据见下表。", new String[]{strLineBaseName}));// 谐波电流
reportmap.put("$LineName1$", name);// 监测点名称1
reportmap.put("$LineName2$", name);// 监测点名称2
reportmap.put("$LineName3$", name);// 监测点名称3
reportmap.put("$LineName4$", name);// 监测点名称4
reportmap.put("$LineName5$", name);// 监测点名称5
String.format("报告分析时间段内%s的2-25次谐波电流幅值CP95概率值统计数据见下表。", new String[]{strLineBaseName}));
// 监测点名称1
reportmap.put("$LineName1$", name);
// 监测点名称2
reportmap.put("$LineName2$", name);
// 监测点名称3
reportmap.put("$LineName3$", name);
// 监测点名称4
reportmap.put("$LineName4$", name);
// 监测点名称5
reportmap.put("$LineName5$", name);
/**********************
**** 数据获取
@@ -507,16 +540,21 @@ public class ExportModelController extends BaseController {
getThreePhase(param, overLimit);
getVoltageRate(param, overLimit);
getCurrentRate(param, overLimit);
ReportValue pst1 = this.listFlicker.get(0).getList().get(0);// 短闪
ReportValue pst2 = this.listFlicker.get(0).getList().get(1);// 短闪
ReportValue pst3 = this.listFlicker.get(0).getList().get(2);// 短闪
ReportValue plt1 = this.listFlicker.get(1).getList().get(0);// 长闪
ReportValue plt2 = this.listFlicker.get(1).getList().get(1);// 长闪
ReportValue plt3 = this.listFlicker.get(1).getList().get(2);// 长闪
// 短闪
ReportValue pst1 = this.listFlicker.get(0).getList().get(0);
// 短闪
ReportValue pst2 = this.listFlicker.get(0).getList().get(1);
// 短闪
ReportValue pst3 = this.listFlicker.get(0).getList().get(2);
// 长闪
ReportValue plt1 = this.listFlicker.get(1).getList().get(0);
// 长闪
ReportValue plt2 = this.listFlicker.get(1).getList().get(1);
// 长闪
ReportValue plt3 = this.listFlicker.get(1).getList().get(2);
// 监测点基本信息
reportmap.put("$LineBase$", String.format("%s%s，CT变比为：%s，PT变比为：%s。",
new String[]{bdname, name, lineDto.getCt(), lineDto.getPt()}));// 监测点基本信息
new String[]{bdname, name, lineDto.getCt(), lineDto.getPt()}));
/**************************************************************
**** 三张大表基础数据幅值
@@ -570,7 +608,8 @@ public class ExportModelController extends BaseController {
ReportValue vdeviation1 = this.listVdeviation.get(0).getList().get(0);
ReportValue vdeviation2 = this.listVdeviation.get(0).getList().get(1);
ReportValue vdeviation3 = this.listVdeviation.get(0).getList().get(2);
String vdeviationLimit = judgeNull(this.listVdeviation.get(0).getOverLimit());// 获取电压上下偏差的国标限值
// 获取电压上下偏差的国标限值
String vdeviationLimit = judgeNull(this.listVdeviation.get(0).getOverLimit());
reportmap.put("$VD_L$", vdeviationLimit);
String strResultVdeviationdata = "";
String tmpstrResultVdeviationdata = "";
@@ -644,7 +683,8 @@ public class ExportModelController extends BaseController {
**** 频率偏差
***************************************************************/
ReportValue valueOfFreValue = this.listFrequency.get(1).getList().get(0);
String valueOfFreLimit = judgeNull(this.listFrequency.get(1).getOverLimit());// 获取频率偏差国标限值
// 获取频率偏差国标限值
String valueOfFreLimit = judgeNull(this.listFrequency.get(1).getOverLimit());
reportmap.put("$FRE_L$", valueOfFreLimit);
String strResultFre = "";
String tmpstrResultFre = "";
@@ -699,10 +739,12 @@ public class ExportModelController extends BaseController {
}
if ("".equals(tmpstrResultFre)) {
reportmap.put("$FV0R$", "合格");// 三张大表取值
// 三张大表取值
reportmap.put("$FV0R$", "合格");
strResultFre += "从上表中可以看出" + strLineBaseName + "频率偏差均满足国标限值（±" + valueOfFreLimit + deviceUnit.getUnitFrequencyDev() + "）的要求。";
} else {
reportmap.put("$FV0R$", "不合格");// 三张大表取值
// 三张大表取值
reportmap.put("$FV0R$", "不合格");
strAnalysis += tmpstrResultFre + ",均不满足国标限值（±" + valueOfFreLimit + deviceUnit.getUnitFrequencyDev() + "）的要求。";
strResultFre += "从上表中可以看出" + strLineBaseName + "频率偏差" + tmpstrResultFre + ",均不满足国标限值（±" + valueOfFreLimit
+ deviceUnit.getUnitFrequencyDev() + "）的要求。";
@@ -716,7 +758,8 @@ public class ExportModelController extends BaseController {
**** 三相电压不平衡度
***************************************************************/
ReportValue valueOfThree = this.listThreephase.get(0).getList().get(0);
String valueOfThreeLimit = judgeNull(this.listThreephase.get(0).getOverLimit());// 获取三相电压不平衡度国标限值
// 获取三相电压不平衡度国标限值
String valueOfThreeLimit = judgeNull(this.listThreephase.get(0).getOverLimit());
reportmap.put("$THE_L$", valueOfThreeLimit);
String strResultThree = "";
String tmpstrResultThree = "";
@@ -745,10 +788,12 @@ public class ExportModelController extends BaseController {
strResultThreeValue += "注意:从上表中可以看出" + strLineBaseName + "三相电压不平衡度数据存在异常(不是数值类型)。";
}
if (cp95Value > limit) {
reportmap.put("$TV0R$", "不合格");// 三张大表取值
// 三张大表取值
reportmap.put("$TV0R$", "不合格");
tmpstrResultThree += "三相电压不平衡度95%概率值为：" + valueOfThree.getCp95Value().toString();
} else {
reportmap.put("$TV0R$", "合格");// 三张大表取值
// 三张大表取值
reportmap.put("$TV0R$", "合格");
}
if (!(maxValue >= minValue && maxValue >= aveValue && maxValue >= cp95Value)) {
@@ -778,7 +823,8 @@ public class ExportModelController extends BaseController {
/**************************************************************
**** 电压闪变
***************************************************************/
String valueOfFlickerLimit = judgeNull(this.listFlicker.get(1).getOverLimit());// 获取电压长时闪变的限值
// 获取电压长时闪变的限值
String valueOfFlickerLimit = judgeNull(this.listFlicker.get(1).getOverLimit());
reportmap.put("$PLT_L$", valueOfFlickerLimit);
String strResultFlicker = "";
String tmpstrResultFlicker = "";
@@ -981,26 +1027,38 @@ public class ExportModelController extends BaseController {
String tmpstrResult = "";
if (maxValue > limit) {
if (!"".equals(tmpstrResult))
if (!"".equals(tmpstrResult)) {
tmpstrResult += "、";
}
tmpstrResult += "A";
reportmap.put("$CV" + (i + 1) + "R_A$", "不合格");// 三张大表取值
} else
reportmap.put("$CV" + (i + 1) + "R_A$", "合格");// 三张大表取值
// 三张大表取值
reportmap.put("$CV" + (i + 1) + "R_A$", "不合格");
} else {
// 三张大表取值
reportmap.put("$CV" + (i + 1) + "R_A$", "合格");
}
if (minValue > limit) {
if (!"".equals(tmpstrResult))
if (!"".equals(tmpstrResult)) {
tmpstrResult += "、";
}
tmpstrResult += "B";
reportmap.put("$CV" + (i + 1) + "R_B$", "不合格");// 三张大表取值
} else
reportmap.put("$CV" + (i + 1) + "R_B$", "合格");// 三张大表取值
// 三张大表取值
reportmap.put("$CV" + (i + 1) + "R_B$", "不合格");
} else {
// 三张大表取值
reportmap.put("$CV" + (i + 1) + "R_B$", "合格");
}
if (aveValue > limit) {
if (!"".equals(tmpstrResult))
if (!"".equals(tmpstrResult)) {
tmpstrResult += "、";
}
tmpstrResult += "C";
reportmap.put("$CV" + (i + 1) + "R_C$", "不合格");// 三张大表取值
} else
reportmap.put("$CV" + (i + 1) + "R_C$", "合格");// 三张大表取值
// 三张大表取值
reportmap.put("$CV" + (i + 1) + "R_C$", "不合格");
} else {
// 三张大表取值
reportmap.put("$CV" + (i + 1) + "R_C$", "合格");
}
// 判断单个结论是否存在
if (!"".equals(tmpstrResult)) {
tmpstrResultVoltageRate += (i + 1) + "次谐波电压含有率95%概率值" + tmpstrResult + ";";
@@ -1062,28 +1120,37 @@ public class ExportModelController extends BaseController {
}
// 限值判断
if (cp95ValueA > limit) {
if (!"".equals(tmpstrResultDistortion))
if (!"".equals(tmpstrResultDistortion)) {
tmpstrResultDistortion += "、";
}
tmpstrResultDistortion += atype;
reportmap.put("$TV0R_A$", "不合格");// 三张大表取值
// 三张大表取值
reportmap.put("$TV0R_A$", "不合格");
} else {
reportmap.put("$TV0R_A$", "合格");// 三张大表取值
// 三张大表取值
reportmap.put("$TV0R_A$", "合格");
}
if (cp95ValueB > limit) {
if (!"".equals(tmpstrResultDistortion))
if (!"".equals(tmpstrResultDistortion)) {
tmpstrResultDistortion += "、";
}
tmpstrResultDistortion += btype;
reportmap.put("$TV0R_B$", "不合格");// 三张大表取值
// 三张大表取值
reportmap.put("$TV0R_B$", "不合格");
} else {
reportmap.put("$TV0R_B$", "合格");// 三张大表取值
// 三张大表取值
reportmap.put("$TV0R_B$", "合格");
}
if (cp95ValueC > limit && pttype != 2) {
if (!"".equals(tmpstrResultDistortion))
if (!"".equals(tmpstrResultDistortion)) {
tmpstrResultDistortion += "、";
}
tmpstrResultDistortion += ctype;
reportmap.put("$TV0R_C$", "不合格");// 三张大表取值
// 三张大表取值
reportmap.put("$TV0R_C$", "不合格");
} else {
reportmap.put("$TV0R_C$", "合格");// 三张大表取值
// 三张大表取值
reportmap.put("$TV0R_C$", "合格");
}
// 假如为空则所有的都满足
@@ -1150,26 +1217,38 @@ public class ExportModelController extends BaseController {
String tmpstrResult = "";
if (maxValue > limit) {
if (!"".equals(tmpstrResult))
if (!"".equals(tmpstrResult)) {
tmpstrResult += "、";
}
tmpstrResult += "A";
reportmap.put("$CI" + (i + 1) + "R_A$", "不合格");// 三张大表取值
} else
reportmap.put("$CI" + (i + 1) + "R_A$", "合格");// 三张大表取值
// 三张大表取值
reportmap.put("$CI" + (i + 1) + "R_A$", "不合格");
} else {
// 三张大表取值
reportmap.put("$CI" + (i + 1) + "R_A$", "合格");
}
if (minValue > limit) {
if (!"".equals(tmpstrResult))
if (!"".equals(tmpstrResult)) {
tmpstrResult += "、";
}
tmpstrResult += "B";
reportmap.put("$CI" + (i + 1) + "R_B$", "不合格");// 三张大表取值
} else
reportmap.put("$CI" + (i + 1) + "R_B$", "合格");// 三张大表取值
// 三张大表取值
reportmap.put("$CI" + (i + 1) + "R_B$", "不合格");
} else {
// 三张大表取值
reportmap.put("$CI" + (i + 1) + "R_B$", "合格");
}
if (aveValue > limit) {
if (!"".equals(tmpstrResult))
if (!"".equals(tmpstrResult)) {
tmpstrResult += "、";
}
tmpstrResult += "C";
reportmap.put("$CI" + (i + 1) + "R_C$", "不合格");// 三张大表取值
} else
reportmap.put("$CI" + (i + 1) + "R_C$", "合格");// 三张大表取值
// 三张大表取值
reportmap.put("$CI" + (i + 1) + "R_C$", "不合格");
} else {
// 三张大表取值
reportmap.put("$CI" + (i + 1) + "R_C$", "合格");
}
// 判断单个结论是否存在
if (!"".equals(tmpstrResult)) {
tmpstrResultCurrent += (i + 1) + "次谐波电流幅值95%概率值" + tmpstrResult + ";";
@@ -1191,18 +1270,27 @@ public class ExportModelController extends BaseController {
// 测试结果填写
reportmap.put("$ResultTitle$", String.format("通过对（%s——%s）时间段内%s电能质量统计数据分析后得出以下结论：",
new String[]{DateUtil.format(startDate, "yyyy年MM月dd日 HH时mm分ss秒"),
DateUtil.format(endDate, "yyyy年MM月dd日 HH时mm分ss秒"), strLineBaseName}));// 结论标题
reportmap.put("$Result_VD$", String.format("（1）电压偏差：%s", new String[]{strResultVdeviationdata}));// 电压偏差
reportmap.put("$Result_FRE$", String.format("（2）频率偏差：%s", new String[]{strResultFre}));// 频率偏差
reportmap.put("$Result_THE$", String.format("（3）三相电压不平衡度：%s", new String[]{strResultThree}));// 三相电压不平衡度
reportmap.put("$Result_FIC$", String.format("（4）电压长时闪变：%s", new String[]{strResultFlicker}));// 电压长时闪变
reportmap.put("$Result_VOL$", String.format("（5）谐波电压：%s", new String[]{strResultVoltageRate}));// 谐波电压
reportmap.put("$Result_CUR$", String.format("（6）谐波电流：%s", new String[]{strResultCurrent}));// 谐波电流
DateUtil.format(endDate, "yyyy年MM月dd日 HH时mm分ss秒"), strLineBaseName}));
// 电压偏差
reportmap.put("$Result_VD$", String.format("（1）电压偏差：%s", new String[]{strResultVdeviationdata}));
// 频率偏差
reportmap.put("$Result_FRE$", String.format("（2）频率偏差：%s", new String[]{strResultFre}));
// 三相电压不平衡度
reportmap.put("$Result_THE$", String.format("（3）三相电压不平衡度：%s", new String[]{strResultThree}));
// 电压长时闪变
reportmap.put("$Result_FIC$", String.format("（4）电压长时闪变：%s", new String[]{strResultFlicker}));
// 谐波电压
reportmap.put("$Result_VOL$", String.format("（5）谐波电压：%s", new String[]{strResultVoltageRate}));
// 谐波电流
reportmap.put("$Result_CUR$", String.format("（6）谐波电流：%s", new String[]{strResultCurrent}));
// 分析建议填写
if (!"".equals(strAnalysis) || !"".equals(strError)) {
reportmap.put("$Analysis$", "根据统计数据结果分析,监测点为：" + name + "," + strAnalysis + strError);// 分析建议
// 分析建议
reportmap.put("$Analysis$", "根据统计数据结果分析,监测点为：" + name + "," + strAnalysis + strError);
} else {
reportmap.put("$Analysis$", "根据统计数据结果分析,监测点为：" + name + "，电能质量数据满足国标限值要求。");// 分析建议
// 分析建议
reportmap.put("$Analysis$", "根据统计数据结果分析,监测点为：" + name + "，电能质量数据满足国标限值要求。");
}
/************************************
@@ -1228,7 +1316,8 @@ public class ExportModelController extends BaseController {
reportmap.put("$YF0X$", judgeNull(powerDto4.getFmaxValue()));
reportmap.put("$YF0N$", judgeNull(powerDto4.getMinValue()));
reportmap.put("$YF0E$", judgeNull(powerDto4.getMeanValue()));
formatter = new SimpleDateFormat("yyyyMMddHHmmss");// 报告时分秒格式
// 报告时分秒格式
formatter = new SimpleDateFormat("yyyyMMddHHmmss");
String reportFileUrl = "";
try {
@@ -1254,7 +1343,7 @@ public class ExportModelController extends BaseController {
*/
private Map<String, String> unitMap(PqsDeviceUnit deviceUnit) {
List<DictData> dictData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEVICE_UNIT.getCode()).getData();
Map<String, String> unit = new HashMap<>();
Map<String, String> unit = new HashMap<>(16);
List<String> list = dictData.stream().map(DictData::getCode).collect(Collectors.toList());
for (String s : list) {
//有效值
@@ -1305,9 +1394,6 @@ public class ExportModelController extends BaseController {
/**
* 解析base64，返回图片所在路径
*
* @param base64Info
* @return
*/
@SuppressWarnings("restriction")
private String decodeBase64(byte[] base64Info) {
@@ -1391,7 +1477,9 @@ public class ExportModelController extends BaseController {
}
}
// 基波幅值
/**
* 基波幅值
*/
public void getVirtualData(ReportQueryParam param) {
List<ReportValue> listVirtual = reportService.getVirtualData(param);
@@ -1410,7 +1498,9 @@ public class ExportModelController extends BaseController {
}
// 功率
/**
* 功率
*/
public void getPowerData(ReportQueryParam param) {
List<ReportValue> listPower = reportService.getPowerData(param);
@@ -1424,7 +1514,9 @@ public class ExportModelController extends BaseController {
transformData(this.listPower, listPower, list, true, false);
}
// 闪变
/**
* 闪变
*/
public void getFlicker(ReportQueryParam param, Overlimit overLimit) {
List<ReportValue> listFlicker = reportService.getFlickerData(param);
List<Pass> list = new ArrayList<>();
@@ -1441,7 +1533,9 @@ public class ExportModelController extends BaseController {
transformData(this.listFlicker, listFlicker, list, true);
}
// 电压偏差
/**
* 电压偏差
*/
public void getVdeviation(ReportQueryParam param, Overlimit overLimit) {
List<ReportValue> listVdeviation = reportService.getVdeviation(param);
List<Pass> list = new ArrayList<>();
@@ -1454,7 +1548,9 @@ public class ExportModelController extends BaseController {
transformData(this.listVdeviation, listVdeviation, list, true);
}
// 畸变率
/**
* 畸变率
*/
public void getDistortion(ReportQueryParam param, Overlimit overLimit) {
List<ReportValue> listDistortion = reportService.getDistortionData(param);
List<Pass> list = new ArrayList<>();
@@ -1473,7 +1569,9 @@ public class ExportModelController extends BaseController {
transformData(this.listDistortion, listDistortion, list, true);
}
// 频率
/**
* 频率
*/
public void getFre(ReportQueryParam param, Overlimit overLimit) {
List<ReportValue> listFrequency = reportService.getFrequencyData(param);
@@ -1494,7 +1592,9 @@ public class ExportModelController extends BaseController {
}
// 三相不平衡
/**
* 三相不平衡
*/
public void getThreePhase(ReportQueryParam param, Overlimit overLimit) {
List<ReportValue> listThreephase = reportService.getThreephase(param);
@@ -1517,7 +1617,9 @@ public class ExportModelController extends BaseController {
}
// 谐波电流
/**
* 谐波电流
*/
public void getCurrentRate(ReportQueryParam param, Overlimit overLimit) {
List<ReportValue> listICurrent = reportService.getICurrent(param);
@@ -1538,7 +1640,9 @@ public class ExportModelController extends BaseController {
transformData(this.listICurrent, listICurrent, list, true);
}
// 谐波电压
/**
* 谐波电压
*/
public void getVoltageRate(ReportQueryParam param, Overlimit overLimit) {
List<ReportValue> listVoltageRate = reportService.getVoltageRate(param);

25
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelJBController.java
View File

@@ -56,6 +56,9 @@ import java.util.*;
import java.util.stream.Collectors;
/**
* @author wr
*/
@Slf4j
@RestController
@RequestMapping("/exportmodel")
@@ -63,7 +66,9 @@ import java.util.stream.Collectors;
@AllArgsConstructor
public class ExportModelJBController extends BaseController {
// 非谐波数据
/**
* 非谐波数据
*/
List<ReportTarget> listVirtual;
List<ReportTarget> listPower;
List<ReportTarget> listFlicker;
@@ -71,14 +76,22 @@ public class ExportModelJBController extends BaseController {
List<ReportTarget> listVdeviation;
List<ReportTarget> listFrequency;
List<ReportTarget> listThreephase;
// 谐波电压数据
/**
* 谐波电压数据
*/
List<ReportTarget> listVoltageRate;
// 谐波电流数据
/**
* 谐波电流数据
*/
List<ReportTarget> listICurrent;
// 间谐波电压
/**
* 间谐波电压
*/
List<ReportTarget> listInRate;
// 负序电流
/**
* 负序电流
*/
List<ReportTarget> listIneRate;
private final LineFeignClient lineFeignClient;
@@ -425,7 +438,7 @@ public class ExportModelJBController extends BaseController {
case 1:
tmpstrMap = "B";
break;
case 2:
default:
tmpstrMap = "C";
break;
}

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HistoryResultController.java
View File

@@ -33,7 +33,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Arrays;
import java.util.List;
/**

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionSubstationController.java
View File

@@ -8,8 +8,6 @@ import com.njcn.common.utils.HttpResultUtil;
import com.njcn.common.utils.LogUtil;
import com.njcn.device.pq.pojo.dto.PollutionLineDTO;
import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO;
import com.njcn.device.pq.pojo.param.GridDiagramParam;
import com.njcn.device.pq.pojo.param.RunManageParam;
import com.njcn.harmonic.pojo.param.HarmonicPublicParam;
import com.njcn.harmonic.pojo.param.PollutionSubstationQuryParam;
import com.njcn.harmonic.pojo.vo.PollutionSubstationVO;
@@ -30,8 +28,6 @@ import java.util.List;
/**
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2022/10/13 9:39【需求编号】
*
* @author clam
* @version V1.0.0

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RMpHarmonicReportDController.java
View File

@@ -20,8 +20,6 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @Title RMpHarmonicReportDController
* @Package com.njcn.harmonic.controller
* @Author jianghaifei
* @Date 2022-10-20 19:08
* @Version V1.0

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/SteadyExceedRateController.java
View File

@@ -25,8 +25,8 @@ import java.util.List;
/**
* @version 1.0.0
* @author: chenchao
* @date: 2022/04/12 11:44
* @author chenchao
* @date 2022/04/12 11:44
*/
@Validated
@Slf4j

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/SteadyQualifyController.java
View File

@@ -25,8 +25,8 @@ import java.util.List;
/**
* @version 1.0.0
* @author: chenchao
* @date: 2022/03/30 19:18
* @author chenchao
* @date 2022/03/30 19:18
*/
@Validated
@Slf4j

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/THDController.java
View File

@@ -24,8 +24,8 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @author: chenchao
* @date: 2022/03/10 21:39
* @author chenchao
* @date 2022/03/10 21:39
* @Description: <描述>
*/
@Validated

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/TerminalController.java
View File

@@ -24,8 +24,8 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @author: chenchao
* @date: 2022/03/01 21:57
* @author chenchao
* @date 2022/03/01 21:57
* @Description: <描述>
*/
@Validated

29
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/algorithm/AlgorithmController.java
View File

@@ -1,7 +1,6 @@
package com.njcn.harmonic.controller.algorithm;
import cn.hutool.core.bean.BeanUtil;
import com.njcn.common.config.GeneralInfo;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
@@ -25,6 +24,9 @@ import org.springframework.web.multipart.MultipartFile;
import java.util.*;
/**
* @author hongawen
*/
@RestController
@RequiredArgsConstructor
@Api(tags = "算法")
@@ -40,14 +42,11 @@ public class AlgorithmController extends BaseController {
/**
* 算法保存
*
* @param param
* @return
*/
@PostMapping("/getAlgorithmSave")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("算法保存")
@ApiImplicitParam(name = "param", value = "算发内容", required = true)
@ApiImplicitParam(name = "param", value = "算法内容", required = true)
public HttpResult<Boolean> getAlgorithmSave(@RequestBody RStatFileVO param) {
String methodDescribe = getMethodDescribe("getAlgorithmSave");
RStatFile rStatFile = BeanUtil.copyProperties(param, RStatFile.class);
@@ -83,24 +82,4 @@ public class AlgorithmController extends BaseController {
}
}
/**
* 通用删除请求
*/
// @PostMapping("/common/delete")
// @ResponseBody
// public HttpResult<MinIoUploadResDTO> delete()
// {
// try
// {
// List<String> aaa=new ArrayList<>();
// aaa.add("algorithm/0CA99CB427A94A8A833499A41C557405.png");
// aaa.add("algorithm/07D8A0FD304A42CDB73F514FBEE641BC.png");
// minIoUtils.removeObjects( minIoProperties.getBucket(),aaa);
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, null);
// }
// catch (Exception e)
// {
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, null);
// }
// }
}

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/dataquality/RMpPartHarmonicDetailController.java
View File

@@ -34,8 +34,6 @@ public class RMpPartHarmonicDetailController extends BaseController {
/**
* 稳态指标超标明细表-月表统计
*
* @param param
* @return
*/
@PostMapping("/getRMpPartHarmonicDetail")
@ApiOperation("稳态指标超标在线监测超标问题详情")

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/dim/DimGlobalDealController.java
View File

@@ -1,6 +1,5 @@
package com.njcn.harmonic.controller.dim;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwOverviewController.java
View File

@@ -28,7 +28,6 @@ import java.util.List;
* <分布式光伏概览>
*
* @author wr
* @createTime: 2022-12-29
*/
@RestController
@RequestMapping("/pwOverview")

31
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRMpBenchmarkLevelController.java
View File

@@ -21,14 +21,11 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @Title RMpBenchmarkLevelController
* @Package com.njcn.device.pms.controller
* @Author jianghaifei
* @Date 2022-10-11 10:34
* @Version V1.0
* @author jianghaifei
* @date 2022-10-11 10:34
* @version V1.0
*/
@RestController
@Api(tags = "配网-基准水平评估")
@@ -36,11 +33,20 @@ import java.util.List;
@RequestMapping("/pwRMpBenchmarkLevel")
public class PwRMpBenchmarkLevelController extends BaseController {
private final PwRMpBenchmarkLevelMService rMpBenchmarkLevelMService; //基准水平-月
/**
* 基准水平-月
*/
private final PwRMpBenchmarkLevelMService rMpBenchmarkLevelMService;
private final PwRMpBenchmarkLevelQService rMpBenchmarkLevelQService; //基准水平-季
/**
* 基准水平-季
*/
private final PwRMpBenchmarkLevelQService rMpBenchmarkLevelQService;
private final PwRMpBenchmarkLevelYService rMpBenchmarkLevelYService; //基准水平-年
/**
* 基准水平-年
*/
private final PwRMpBenchmarkLevelYService rMpBenchmarkLevelYService;
@PostMapping("getPwRMpBenchmarkLevelList")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -62,13 +68,10 @@ public class PwRMpBenchmarkLevelController extends BaseController {
//查询基准水平-季数据
rMpBenchmarkLevelList = rMpBenchmarkLevelQService.getPwRMpBenchmarkLevelList(rMpBenchmarkLevelParam);
break;
case BizParamConstant.STAT_BIZ_MONTH:
//查询基准水平-月数据
default:
//查询月数据
rMpBenchmarkLevelList = rMpBenchmarkLevelMService.getPwRMpBenchmarkLevelList(rMpBenchmarkLevelParam);
break;
default:
//如果前端没有传type默认查询月数据
rMpBenchmarkLevelList = rMpBenchmarkLevelMService.getPwRMpBenchmarkLevelList(rMpBenchmarkLevelParam);
}
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpBenchmarkLevelList, methodDescribe);
}

15
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatOrgController.java
View File

@@ -70,9 +70,6 @@ public class PwRStatOrgController extends BaseController {
/**
* 配网稳态指标超标明细表
*
* @param param
* @return
*/
@PostMapping("/getPwRMpPartHarmonicDetail")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -86,9 +83,6 @@ public class PwRStatOrgController extends BaseController {
/**
* 配网稳态指标超标明细表-指标趋势图
*
* @param param
* @return
*/
@PostMapping("/getRMpPartHarmonicDetailIcon")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -102,9 +96,6 @@ public class PwRStatOrgController extends BaseController {
/**
* 配网区域稳态指标合格率统计表-配网（稳态指标合格率统计）
*
* @param param、
* @return
*/
@PostMapping("/getPwRStatOrgIndex")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -118,9 +109,6 @@ public class PwRStatOrgController extends BaseController {
/**
* 区域稳态指标合格率统计表-配网（稳态指标合格率统计）
*
* @param param
* @return
*/
@PostMapping("/getPwRMpPassRateInfo")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -134,9 +122,6 @@ public class PwRStatOrgController extends BaseController {
/**
* 变电站稳态指标超标分类统计表
*
* @param param
* @return
*/
@PostMapping("/getPwRStatSubstationOrg")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)

3
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwUserLimitController.java
View File

@@ -1,6 +1,5 @@
package com.njcn.harmonic.controller.distribution;
import com.njcn.harmonic.service.majornetwork.RStatLimitService;
import io.swagger.annotations.Api;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -9,6 +8,7 @@ import org.springframework.web.bind.annotation.RestController;
/**
* 配网用户侧指标越限
* @author cdf
*/
@RestController
@RequestMapping("/pwLimit")
@@ -16,5 +16,4 @@ import org.springframework.web.bind.annotation.RestController;
@Api(tags = "配网用户侧指标越限")
@RequiredArgsConstructor
public class PwUserLimitController {
private final RStatLimitService rStatLimitService;
}

10
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/RStatPwPermeabilityMController.java
View File

@@ -18,14 +18,10 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @Title RStatPwPermeabilityMController
* @Package com.njcn.harmonic.controller
* @Author jianghaifei
* @Date 2022-11-07 13:55
* @Version V1.0
* @author jianghaifei
* @date 2022-11-07 13:55
* @version V1.0
*/
@RestController
@RequestMapping("/rStatPwPermeability")

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/LargeScreenController.java
View File

@@ -25,8 +25,8 @@ import java.util.List;
/**
* @version 1.0.0
* @author: zbj
* @date: 2023/04/06
* @author zbj
* @date 2023/04/06
*/
@Slf4j
@Api(tags = "大屏")

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/PVOverviewController.java
View File

@@ -22,7 +22,6 @@ import java.util.List;
/**
* @author wr
* @description
* @date 2023/5/10 9:25
*/
@RestController

24
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RMpBenchmarkLevelController.java
View File

@@ -23,8 +23,6 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @Title RMpBenchmarkLevelController
* @Package com.njcn.device.pms.controller
* @Author jianghaifei
* @Date 2022-10-11 10:34
* @Version V1.0
@@ -35,11 +33,20 @@ import java.util.List;
@RequestMapping("/rMpBenchmarkLevel")
public class RMpBenchmarkLevelController extends BaseController {
private final RMpBenchmarkLevelMService rMpBenchmarkLevelMService; //基准水平-月
/**
* 基准水平-月
*/
private final RMpBenchmarkLevelMService rMpBenchmarkLevelMService;
private final RMpBenchmarkLevelQService rMpBenchmarkLevelQService; //基准水平-季
/**
* 基准水平-季
*/
private final RMpBenchmarkLevelQService rMpBenchmarkLevelQService;
private final RMpBenchmarkLevelYService rMpBenchmarkLevelYService; //基准水平-年
/**
* 基准水平-年
*/
private final RMpBenchmarkLevelYService rMpBenchmarkLevelYService;
@PostMapping("getAllRMpBenchmarkLevelList")
@@ -59,13 +66,10 @@ public class RMpBenchmarkLevelController extends BaseController {
//查询基准水平-季数据
rMpBenchmarkLevelList = rMpBenchmarkLevelQService.getRMpBenchmarkLevelList(rMpBenchmarkLevelParam);
break;
case BizParamConstant.STAT_BIZ_MONTH:
//查询基准水平-月数据
default:
//查询月数据
rMpBenchmarkLevelList = rMpBenchmarkLevelMService.getRMpBenchmarkLevelList(rMpBenchmarkLevelParam);
break;
default:
//如果前端没有传type默认查询月数据
rMpBenchmarkLevelList = rMpBenchmarkLevelMService.getRMpBenchmarkLevelList(rMpBenchmarkLevelParam);
}
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpBenchmarkLevelList, methodDescribe);
}

12
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatOrgController.java
View File

@@ -103,8 +103,6 @@ public class RStatOrgController extends BaseController {
/**
* 区域干扰源电流类指标超标统计
*
* @param param
* @return
*/
@GetMapping("/getRStatLoadType")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -118,8 +116,6 @@ public class RStatOrgController extends BaseController {
/**
* 变电站（换流站）稳态指标超标分类统计表
*
* @param param
* @return
*/
@PostMapping("/getRStatSubstationOrg")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -134,8 +130,6 @@ public class RStatOrgController extends BaseController {
/**
* 稳态指标超标明细表
*
* @param param
* @return
*/
@PostMapping("/getRMpPartHarmonicDetail")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -149,8 +143,6 @@ public class RStatOrgController extends BaseController {
/**
* 稳态指标超标明细表-指标趋势图
*
* @param param
* @return
*/
@GetMapping("/getRMpPartHarmonicDetailIcon")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -164,8 +156,6 @@ public class RStatOrgController extends BaseController {
/**
* 区域稳态指标合格率统计表-主网（稳态指标合格率统计）
*
* @param param
* @return
*/
@GetMapping("/getRStatOrgIndex")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -179,8 +169,6 @@ public class RStatOrgController extends BaseController {
/**
* 区域稳态指标合格率统计表-主网（稳态指标合格率统计）
*
* @param param
* @return
*/
@PostMapping("/getRMpPassRateInfo")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)

3
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/pmsWifi/PmsWifiController.java
View File

@@ -10,7 +10,6 @@ import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.harmonic.mapper.pmsWifi.PmsMonitorRealDataMapper;
import com.njcn.harmonic.pojo.po.pmsWifi.MonitorRealData;
import com.njcn.influx.service.IDataVService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -31,8 +30,6 @@ public class PmsWifiController extends BaseController {
private final PmsMonitorRealDataMapper pmsMonitorRealDataMapper;
private final IDataVService iDataVService;
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@GetMapping("/getPmsInfo")

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/report/QualifiedReport.java
View File

@@ -7,10 +7,8 @@ import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.device.pq.pojo.param.PulicTimeStatisParam;
import com.njcn.harmonic.pojo.dto.FpyReportDTO;
import com.njcn.harmonic.pojo.param.QualifiedReportParam;
import com.njcn.harmonic.pojo.vo.AssesVO;
import com.njcn.harmonic.service.majornetwork.QualifiedReportService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
@@ -18,14 +16,12 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* pqs

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/PermeabilityController.java
View File

@@ -19,8 +19,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @Title permeabilityController
* @Package com.njcn.harmonic.controller.specialanalysis
* @Author jianghaifei
* @Date 2022-11-28 11:22
* @Version V1.0

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/RMpEmissionController.java
View File

@@ -22,8 +22,6 @@ import java.util.List;
/**
* 专项分析-风电场-发射特性分析
* @Title RMpEmissionController
* @Package com.njcn.harmonic.controller.specialanalysis
* @Author jianghaifei
* @Date 2022-11-30 19:11
* @Version V1.0

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/RMpInfluenceController.java
View File

@@ -5,9 +5,7 @@ import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.harmonic.pojo.param.RMpEmissionParam;
import com.njcn.harmonic.pojo.param.RMpInfluenceParam;
import com.njcn.harmonic.pojo.vo.RMpEmissionChartVO;
import com.njcn.harmonic.pojo.vo.RMpInfluenceChartVO;
import com.njcn.harmonic.pojo.vo.RMpInfluenceVO;
import com.njcn.harmonic.service.specialanalysis.RMpInfluenceMService;
@@ -23,8 +21,6 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @Title RMpInfluenceController
* @Package com.njcn.harmonic.controller.specialanalysis
* @Author jianghaifei
* @Date 2022-12-01 19:54
* @Version V1.0

6
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/RStatOrgPvPowerQualityController.java
View File

@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
* <专项分析-分布式光伏>
*
* @author wr
* @createTime: 2022-11-25
* @createTime 2022-11-25
*/
@RestController
@RequestMapping("/distributedPvVolOver")
@@ -39,8 +39,6 @@ public class RStatOrgPvPowerQualityController extends BaseController {
/**
* 低功率因数统计
*
* @param param
* @return
*/
@PostMapping("/getPowerQualityStream")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -55,8 +53,6 @@ public class RStatOrgPvPowerQualityController extends BaseController {
/**
* 详细数据表分页查询
*
* @param param
* @return
*/
@PostMapping("/getPowerQualityInfo")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/StreamReverseController.java
View File

@@ -21,8 +21,6 @@ import org.springframework.web.bind.annotation.RestController;
/**
* 潮流倒送分析
* @Title StreamReverseController
* @Package com.njcn.harmonic.controller.specialanalysis
* @Author jianghaifei
* @Date 2022-11-25 10:19
* @Version V1.0

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/WindFarmController.java
View File

@@ -41,8 +41,6 @@ public class WindFarmController extends BaseController {
/**
* 详细数据表分页查询
*
* @param param
* @return
*/
@PostMapping("/getWindFarmDetailInfo")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -57,8 +55,6 @@ public class WindFarmController extends BaseController {
/**
* 详细数据表分页查询
*
* @param param
* @return
*/
@PostMapping("/getRailwayDetailInfo")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/EvaluationDownController.java
View File

@@ -1,6 +1,5 @@
package com.njcn.harmonic.controller.upload;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.harmonic.pojo.param.upload.DimBusBarParam;

5
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadDataLogController.java
View File

@@ -7,18 +7,13 @@ import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.common.utils.LogUtil;
import com.njcn.harmonic.pojo.param.UploadDataParam;
import com.njcn.harmonic.pojo.po.upload.RUploadDataLog;
import com.njcn.harmonic.pojo.vo.upload.UploadEvaluationDataVo;
import com.njcn.harmonic.service.upload.IRUploadDataLogService;
import com.njcn.harmonic.service.upload.impl.RUploadDataLogServiceImpl;
import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

3
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadReportController.java
View File

@@ -10,11 +10,8 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.harmonic.pojo.param.DimGlobalDataParam;
import com.njcn.harmonic.pojo.po.upload.RUploadReport;
import com.njcn.harmonic.pojo.vo.DimGlobalDataStandVO;
import com.njcn.harmonic.service.upload.IRUploadReportService;
import com.njcn.system.api.DicDataFeignClient;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.po.Dept;
import com.njcn.web.enums.GWSendEnum;

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadWorkOrderController.java
View File

@@ -9,16 +9,13 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.common.utils.LogUtil;
import com.njcn.harmonic.pojo.param.UploadDataParam;
import com.njcn.harmonic.pojo.param.upload.RUploadWorkOrderParam;
import com.njcn.harmonic.pojo.po.upload.RUploadWorkOrderPO;
import com.njcn.harmonic.pojo.vo.upload.UploadEvaluationDataVo;
import com.njcn.harmonic.service.upload.IRUploadWorkOrderService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,7 +25,6 @@ import com.njcn.web.controller.BaseController;
import java.util.List;
import static org.reflections.Reflections.log;
/**
* <p>

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/TypicalSourceLoadDownController.java
View File

@@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.RestController;
/**
* @author wr
* @description
* @date 2024/5/16 9:22
*/
@Slf4j

9
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/algorithm/mapping/RStatFileMapper.xml
View File

@@ -2,14 +2,5 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.harmonic.mapper.algorithm.RStatFileMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatFile">
<id column="id" property="id" />
<result column="create_Time" property="createTime" />
<result column="update_Time" property="updateTime" />
<result column="file_content" property="fileContent" />
<result column="create_By" property="createBy" />
<result column="update_By" property="updateBy" />
</resultMap>
</mapper>

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusGlobalDMapper.java
View File

@@ -1,7 +1,6 @@
package com.njcn.harmonic.mapper.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RDimBusGlobalD;

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusGlobalMMapper.java
View File

@@ -1,7 +1,6 @@
package com.njcn.harmonic.mapper.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RDimBusGlobalM;

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusGlobalYMapper.java
View File

@@ -1,7 +1,6 @@
package com.njcn.harmonic.mapper.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RDimBusGlobalY;

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusStationEventDMapper.java
View File

@@ -1,6 +1,5 @@
package com.njcn.harmonic.mapper.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RDimBusStationEventD;

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusStationEventMMapper.java
View File

@@ -1,6 +1,5 @@
package com.njcn.harmonic.mapper.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RDimBusStationEventM;

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusTargetDPOMapper.java
View File

@@ -1,6 +1,5 @@
package com.njcn.harmonic.mapper.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RDimBusTargetDPO;

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimMonitorRateDMapper.java
View File

@@ -1,6 +1,5 @@
package com.njcn.harmonic.mapper.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RDimMonitorRateD;

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimMonitorRateMMapper.java
View File

@@ -1,6 +1,5 @@
package com.njcn.harmonic.mapper.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RDimMonitorRateM;

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimMonitorRateYMapper.java
View File

@@ -1,6 +1,5 @@
package com.njcn.harmonic.mapper.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RDimMonitorRateY;

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjEventDMapper.java
View File

@@ -1,6 +1,5 @@
package com.njcn.harmonic.mapper.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RDimObjEventD;

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjEventMMapper.java
View File

@@ -1,6 +1,5 @@
package com.njcn.harmonic.mapper.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RDimObjEventM;

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjEventYMapper.java
View File

@@ -1,6 +1,5 @@
package com.njcn.harmonic.mapper.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RDimObjEventY;

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjRateDMapper.java
View File

@@ -1,6 +1,5 @@
package com.njcn.harmonic.mapper.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RDimObjRateD;

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjRateMMapper.java
View File

@@ -1,6 +1,5 @@
package com.njcn.harmonic.mapper.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RDimObjRateM;

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjRateYMapper.java
View File

@@ -1,6 +1,5 @@
package com.njcn.harmonic.mapper.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RDimObjRateY;

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjTargetDMapper.java
View File

@@ -1,6 +1,5 @@
package com.njcn.harmonic.mapper.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RDimObjTargetD;

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjTargetMMapper.java
View File

@@ -1,6 +1,5 @@
package com.njcn.harmonic.mapper.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RDimObjTargetM;

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjTargetYMapper.java
View File

@@ -1,6 +1,5 @@
package com.njcn.harmonic.mapper.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RDimObjTargetY;

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimStationTargetYMapper.java
View File

@@ -1,6 +1,5 @@
package com.njcn.harmonic.mapper.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RDimStationTargetY;

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimVoltageDMapper.java
View File

@@ -18,6 +18,5 @@ import java.util.Set;
*/
public interface RDimVoltageDMapper extends MppBaseMapper<RDimVoltageD> {
List<LineDataDto> getLineData(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("collection") Set<String> list);
}

23
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/mapping/RDimBusbarHarmnicDPOMapper.xml
View File

@@ -1,26 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.prepare.harmonic.mapper.mysql.dim.RDimBusbarHarmnicDPOMapper">
<resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.dim.RDimBusbarHarmnicDPO">
<!--@mbg.generated-->
<!--@Table r_dim_busbar_harmnic_d-->
<id column="Org_Id" jdbcType="CHAR" property="orgId" />
<id column="Statis_Date" jdbcType="DATE" property="statisDate" />
<id column="BusBar_Id" jdbcType="CHAR" property="busbarId" />
<id column="Target_type" jdbcType="CHAR" property="targetType" />
<id column="Voltage_level" jdbcType="CHAR" property="voltageLevel" />
<result column="Level" jdbcType="BIT" property="level" />
<result column="limit count" jdbcType="INTEGER" property="limitCount" />
<result column="Statis_count" jdbcType="INTEGER" property="statisCount" />
<result column="State" jdbcType="BIT" property="state" />
<result column="Create_By" jdbcType="CHAR" property="createBy" />
<result column="Create_Time" jdbcType="TIMESTAMP" property="createTime" />
<result column="Update_By" jdbcType="CHAR" property="updateBy" />
<result column="Update_Time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
Org_Id, Statis_Date, BusBar_Id, Target_type, Voltage_level, Level, limit count,
Statis_count, State, Create_By, Create_Time, Update_By, Update_Time
</sql>
</mapper>

18
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/mapping/RDimStationHarmnicDPOMapper.xml
View File

@@ -1,21 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.prepare.harmonic.mapper.mysql.dim.RDimStationHarmnicDPOMapper">
<resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.dim.RDimStationHarmnicDPO">
<!--@mbg.generated-->
<!--@Table r_dim_station_harmnic_d-->
<id column="Org_Id" jdbcType="CHAR" property="orgId" />
<id column="Statis_Date" jdbcType="DATE" property="statisDate" />
<id column="Station Id" jdbcType="CHAR" property="stationId" />
<id column="Target_type" jdbcType="CHAR" property="targetType" />
<id column="Level" jdbcType="BIT" property="level" />
<result column="Voltage_level" jdbcType="CHAR" property="voltageLevel" />
<result column="limit_count" jdbcType="INTEGER" property="limitCount" />
<result column="Statis_count" jdbcType="INTEGER" property="statisCount" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
Org_Id, Statis_Date, Station Id, Target_type, Level, Monitor_Tag, Voltage_level,
limit_count, Statis_count
</sql>
</mapper>

3
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/PwRMpBenchmarkLevelMMapper.java
View File

@@ -5,9 +5,6 @@ import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelM;
/**
* @author jianghf
* @description 针对表【r_mp_benchmark_level_m】的数据库操作Mapper
* @createDate 2022-10-11 10:32:18
* @Entity com.njcn.device.pms.pojo.po.RMpBenchmarkLevelM
*/
public interface PwRMpBenchmarkLevelMMapper extends BaseMapper<RMpBenchmarkLevelM> {

3
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/PwRMpBenchmarkLevelQMapper.java
View File

@@ -5,9 +5,6 @@ import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelQ;
/**
* @author jianghf
* @description 针对表【r_mp_benchmark_level_q】的数据库操作Mapper
* @createDate 2022-10-11 10:32:18
* @Entity com.njcn.device.pms.pojo.po.RMpBenchmarkLevelQ
*/
public interface PwRMpBenchmarkLevelQMapper extends BaseMapper<RMpBenchmarkLevelQ> {

3
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/PwRMpBenchmarkLevelYMapper.java
View File

@@ -5,9 +5,6 @@ import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelY;
/**
* @author jianghf
* @description 针对表【r_mp_benchmark_level_y】的数据库操作Mapper
* @createDate 2022-10-11 10:32:18
* @Entity com.njcn.device.pms.pojo.po.RMpBenchmarkLevelY
*/
public interface PwRMpBenchmarkLevelYMapper extends BaseMapper<RMpBenchmarkLevelY> {

14
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/PwRStatOrgMapper.java
View File

@@ -3,9 +3,7 @@ package com.njcn.harmonic.mapper.distribution;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
import com.njcn.harmonic.pojo.po.RStatOrgQ;
import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO;
import com.njcn.harmonic.pojo.vo.RStatOrgVO;
import com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -22,10 +20,6 @@ public interface PwRStatOrgMapper extends BaseMapper<RStatOrgQ> {
/**
* 配网查询区域超标统计-年数据
* @param param
* @param deptIds
* @param dataType
* @return
*/
List<RStatOrgVO.PwRStatOrgVO> selectListY(@Param("param") StatSubstationBizBaseParam param,
@Param("deptIds")List<String> deptIds,
@@ -33,10 +27,6 @@ public interface PwRStatOrgMapper extends BaseMapper<RStatOrgQ> {
/**
* 配网查询区域超标统计-季数据
* @param param
* @param deptIds
* @param dataType
* @return
*/
List<RStatOrgVO.PwRStatOrgVO> selectListQ(@Param("param") StatSubstationBizBaseParam param,
@Param("deptIds")List<String> deptIds,
@@ -44,10 +34,6 @@ public interface PwRStatOrgMapper extends BaseMapper<RStatOrgQ> {
/**
* 配网查询区域超标统计-月数据
* @param param
* @param deptIds
* @param dataType
* @return
*/
List<RStatOrgVO.PwRStatOrgVO> selectListM(@Param("param") StatSubstationBizBaseParam param,
@Param("deptIds")List<String> deptIds,

5
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/RStatPwPermeabilityMMapper.java
View File

@@ -2,20 +2,15 @@ package com.njcn.harmonic.mapper.distribution;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.harmonic.pojo.param.RStatPwPermeabilityMParam;
import com.njcn.harmonic.pojo.po.RStatPwPermeabilityM;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.harmonic.pojo.vo.RStatPwPermeabilityMVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* @author jianghf
* @description 针对表【r_stat_pw_permeability_m】的数据库操作Mapper
* @createDate 2022-11-07 10:35:21
* @Entity com.njcn.harmonic.pojo.po.RStatPwPermeabilityM
*/
public interface RStatPwPermeabilityMMapper extends BaseMapper<RStatPwPermeabilityM> {

18
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRMpBenchmarkLevelMMapper.xml
View File

@@ -4,23 +4,5 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.harmonic.mapper.distribution.PwRMpBenchmarkLevelMMapper">
<resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpBenchmarkLevelM">
<id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
<id property="dataDate" column="data_date" jdbcType="DATE"/>
<result property="voltageAvg" column="voltage_avg" jdbcType="FLOAT"/>
<result property="voltageSd" column="voltage_sd" jdbcType="FLOAT"/>
<result property="unbalanceAvg" column="unbalance_avg" jdbcType="FLOAT"/>
<result property="unbalanceSd" column="unbalance_sd" jdbcType="FLOAT"/>
<result property="vthdAvg" column="vthd_avg" jdbcType="FLOAT"/>
<result property="vthdSd" column="vthd_sd" jdbcType="FLOAT"/>
<result property="flickerAvg" column="flicker_avg" jdbcType="FLOAT"/>
<result property="flickerSd" column="flicker_sd" jdbcType="FLOAT"/>
</resultMap>
<sql id="Base_Column_List">
measurement_point_id,data_date,voltage_avg,
voltage_sd,unbalance_avg,unbalance_sd,
vthd_avg,vthd_sd,flicker_avg,
flicker_sd
</sql>
</mapper>

18
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRMpBenchmarkLevelQMapper.xml
View File

@@ -4,23 +4,5 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.harmonic.mapper.distribution.PwRMpBenchmarkLevelQMapper">
<resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpBenchmarkLevelQ">
<id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
<id property="dataDate" column="data_date" jdbcType="DATE"/>
<result property="voltageAvg" column="voltage_avg" jdbcType="FLOAT"/>
<result property="voltageSd" column="voltage_sd" jdbcType="FLOAT"/>
<result property="unbalanceAvg" column="unbalance_avg" jdbcType="FLOAT"/>
<result property="unbalanceSd" column="unbalance_sd" jdbcType="FLOAT"/>
<result property="vthdAvg" column="vthd_avg" jdbcType="FLOAT"/>
<result property="vthdSd" column="vthd_sd" jdbcType="FLOAT"/>
<result property="flickerAvg" column="flicker_avg" jdbcType="FLOAT"/>
<result property="flickerSd" column="flicker_sd" jdbcType="FLOAT"/>
</resultMap>
<sql id="Base_Column_List">
measurement_point_id,data_date,voltage_avg,
voltage_sd,unbalance_avg,unbalance_sd,
vthd_avg,vthd_sd,flicker_avg,
flicker_sd
</sql>
</mapper>

18
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRMpBenchmarkLevelYMapper.xml
View File

@@ -4,23 +4,5 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.harmonic.mapper.distribution.PwRMpBenchmarkLevelYMapper">
<resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpBenchmarkLevelY">
<id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
<id property="dataDate" column="data_date" jdbcType="DATE"/>
<result property="voltageAvg" column="voltage_avg" jdbcType="FLOAT"/>
<result property="voltageSd" column="voltage_sd" jdbcType="FLOAT"/>
<result property="unbalanceAvg" column="unbalance_avg" jdbcType="FLOAT"/>
<result property="unbalanceSd" column="unbalance_sd" jdbcType="FLOAT"/>
<result property="vthdAvg" column="vthd_avg" jdbcType="FLOAT"/>
<result property="vthdSd" column="vthd_sd" jdbcType="FLOAT"/>
<result property="flickerAvg" column="flicker_avg" jdbcType="FLOAT"/>
<result property="flickerSd" column="flicker_sd" jdbcType="FLOAT"/>
</resultMap>
<sql id="Base_Column_List">
measurement_point_id,data_date,voltage_avg,
voltage_sd,unbalance_avg,unbalance_sd,
vthd_avg,vthd_sd,flicker_avg,
flicker_sd
</sql>
</mapper>

23
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/RStatPwPermeabilityMMapper.xml
View File

@@ -3,29 +3,6 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.harmonic.mapper.distribution.RStatPwPermeabilityMMapper">
<resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RStatPwPermeabilityM">
<id property="orgNo" column="org_no" jdbcType="VARCHAR"/>
<id property="dataDate" column="data_date" jdbcType="DATE"/>
<id property="psrId" column="psr_id" jdbcType="VARCHAR"/>
<result property="voltageAvg" column="voltage_avg" jdbcType="FLOAT"/>
<result property="voltageSd" column="voltage_sd" jdbcType="FLOAT"/>
<result property="unbalanceAvg" column="unbalance_avg" jdbcType="FLOAT"/>
<result property="unbalanceSd" column="unbalance_sd" jdbcType="FLOAT"/>
<result property="vthdAvg" column="vthd_avg" jdbcType="FLOAT"/>
<result property="vthdSd" column="vthd_sd" jdbcType="FLOAT"/>
<result property="flickerAvg" column="flicker_avg" jdbcType="FLOAT"/>
<result property="flickerSd" column="flicker_sd" jdbcType="FLOAT"/>
<result property="permeabilityType" column="permeability_type" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
org_no,data_date,psr_id,
voltage_avg,voltage_sd,unbalance_avg,
unbalance_sd,vthd_avg,vthd_sd,
flicker_avg,flicker_sd,permeability_type
</sql>
<select id="getPwPermeabilityList" resultType="com.njcn.harmonic.pojo.vo.RStatPwPermeabilityMVO">
select
rspp25.org_no as orgNO, rspp25.psr_id as psrId,

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java
View File

@@ -9,8 +9,8 @@ import java.util.Map;
/**
* @version 1.0.0
* @author: zbj
* @date: 2023/03/31
* @author zbj
* @date 2023/03/31
*/
public interface LargeScreenMapper {

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/PVOverviewMapper.java
View File

@@ -7,8 +7,8 @@ import java.util.List;
/**
* @version 1.0.0
* @author: wr
* @date: 2023/05/10
* @author wr
* @date 2023/05/10
*/
public interface PVOverviewMapper {

3
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RMpBenchmarkLevelMMapper.java
View File

@@ -5,9 +5,6 @@ import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelM;
/**
* @author jianghf
* @description 针对表【r_mp_benchmark_level_m】的数据库操作Mapper
* @createDate 2022-10-11 10:32:18
* @Entity com.njcn.device.pms.pojo.po.RMpBenchmarkLevelM
*/
public interface RMpBenchmarkLevelMMapper extends BaseMapper<RMpBenchmarkLevelM> {

3
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RMpBenchmarkLevelQMapper.java
View File

@@ -5,9 +5,6 @@ import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelQ;
/**
* @author jianghf
* @description 针对表【r_mp_benchmark_level_q】的数据库操作Mapper
* @createDate 2022-10-11 10:32:18
* @Entity com.njcn.device.pms.pojo.po.RMpBenchmarkLevelQ
*/
public interface RMpBenchmarkLevelQMapper extends BaseMapper<RMpBenchmarkLevelQ> {

3
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RMpBenchmarkLevelYMapper.java
View File

@@ -5,9 +5,6 @@ import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelY;
/**
* @author jianghf
* @description 针对表【r_mp_benchmark_level_y】的数据库操作Mapper
* @createDate 2022-10-11 10:32:18
* @Entity com.njcn.device.pms.pojo.po.RMpBenchmarkLevelY
*/
public interface RMpBenchmarkLevelYMapper extends BaseMapper<RMpBenchmarkLevelY> {

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RMpPartHarmonicDetailDMapper.java
View File

@@ -20,8 +20,6 @@ public interface RMpPartHarmonicDetailDMapper extends BaseMapper<RMpPartHarmonic
/**
* 稳态指标超标明细表-指标趋势图
* @param param
* @return
*/
List<RMpPartHarmonicDetailIconVO> getRMpPartHarmonicDetailIcon(@Param("param") StatisticsBizBaseParam param);
}

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RMpPassRateMMapper.java
View File

@@ -21,8 +21,6 @@ public interface RMpPassRateMMapper extends BaseMapper<RMpPassRateM> {
/**
* 获取月稳态指标合格率明细表
* @param baseParam
* @return
*/
List<RStatOrgIndexVO> getMonthPassRate(@Param("param") StatSubstationBizBaseParam baseParam);

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RMpPassRateQMapper.java
View File

@@ -21,8 +21,6 @@ public interface RMpPassRateQMapper extends BaseMapper<RMpPassRateQ> {
/**
* 获取季稳态指标合格率明细表
* @param baseParam
* @return
*/
List<RStatOrgIndexVO> getQuarterPassRate(@Param("param") StatSubstationBizBaseParam baseParam);

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RMpPassRateYMapper.java
View File

@@ -21,8 +21,6 @@ public interface RMpPassRateYMapper extends BaseMapper<RMpPassRateY> {
/**
* 获取年稳态指标合格率明细表
* @param baseParam
* @return
*/
List<RStatOrgIndexVO> getYearPassRate(@Param("param") StatSubstationBizBaseParam baseParam);

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RMpSurplusHarmonicDetailMMapper.java
View File

@@ -21,8 +21,6 @@ public interface RMpSurplusHarmonicDetailMMapper extends BaseMapper<RMpSurplusHa
/**
* 稳态指标超标明细表
* @param param
* @return
*/
List<RMpPartHarmonicDetailVO> getRMpPartHarmonicDetail(@Param("param") StatSubstationBizBaseParam param);

5
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicDMapper.java
View File

@@ -19,11 +19,6 @@ public interface RStatHarmonicDMapper extends BaseMapper<RStatHarmonicD> {
/**
* 查询全部
* @param param
* @param dataType
* @param measurementId
* @param harmonicId
* @return
*/
List<RStatHarmonicD> selectInfoList(@Param("param") StatSubstationBizBaseParam param,
@Param("dataType") String dataType,

3
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicMMapper.java
View File

@@ -19,9 +19,6 @@ public interface RStatHarmonicMMapper extends BaseMapper<RStatHarmonicM> {
/**
* 查询监测点
* @param param
* @param dataType
* @return
*/
List<RStatHarmonicM> selectInfoList(@Param("param") StatSubstationBizBaseParam param,
@Param("dataType") String dataType);

3
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicQMapper.java
View File

@@ -19,9 +19,6 @@ public interface RStatHarmonicQMapper extends BaseMapper<RStatHarmonicQ> {
/**
* 查询监测点
* @param param
* @param dataType
* @return
*/
List<RStatHarmonicQ> selectInfoList(@Param("param") StatSubstationBizBaseParam param,
@Param("dataType") String dataType);

5
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicVoltageMMapper.java
View File

@@ -20,11 +20,6 @@ public interface RStatHarmonicVoltageMMapper extends BaseMapper<RStatHarmonicVol
/**
* 监测点数据查询
* @param param
* @param dataType
* @param measurementId
* @param harmonicId
* @return
*/
List<RStatHarmonicVoltageM> selectInfoList(@Param("param") StatSubstationBizBaseParam param,
@Param("dataType") String dataType,

3
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicYMapper.java
View File

@@ -19,9 +19,6 @@ public interface RStatHarmonicYMapper extends BaseMapper<RStatHarmonicY> {
/**
* 监测点数据查询
* @param param
* @param dataType
* @return
*/
List<RStatHarmonicY> selectInfoList(@Param("param") StatSubstationBizBaseParam param,
@Param("dataType") String dataType);

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatLoadTypeMMapper.java
View File

@@ -20,8 +20,6 @@ public interface RStatLoadTypeMMapper extends BaseMapper<RStatLoadTypeM> {
/**
* 获取月区域暂态指标分类统计表
* @param param
* @return
*/
List<RStatLoadTypeVO> getMonthStatLoadType(@Param("param") StatSubstationBizBaseParam param);
}

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatLoadTypeQMapper.java
View File

@@ -20,8 +20,6 @@ public interface RStatLoadTypeQMapper extends BaseMapper<RStatLoadTypeQ> {
/**
* 获取季区域暂态指标分类统计表
* @param param
* @return
*/
List<RStatLoadTypeVO> getQuarterStatLoadType(@Param("param") StatSubstationBizBaseParam param);
}

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatLoadTypeYMapper.java
View File

@@ -20,7 +20,6 @@ public interface RStatLoadTypeYMapper extends BaseMapper<RStatLoadTypeY> {
/**
* 获取年区域暂态指标分类统计表
* @return
*/
List<RStatLoadTypeVO> getYearStatLoadType(@Param("param") StatSubstationBizBaseParam param);
}

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatOrgBusbarVoltageMMapper.java
View File

@@ -20,8 +20,6 @@ public interface RStatOrgBusbarVoltageMMapper extends BaseMapper<RStatOrgBusbarV
/**
* 获取月区域电站母线电压类指标超标计
* @param param
* @return
*/
List<RStatOrgBusbarVoltageVO> getMstatOrgBusbarVoltageVO(@Param("param") StatSubstationBizBaseParam param);
}

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatOrgBusbarVoltageQMapper.java
View File

@@ -20,8 +20,6 @@ public interface RStatOrgBusbarVoltageQMapper extends BaseMapper<RStatOrgBusbarV
/**
* 获取季区域电站母线电压类指标超标计
* @param param
* @return
*/
List<RStatOrgBusbarVoltageVO> getQstatOrgBusbarVoltageVO(@Param("param") StatSubstationBizBaseParam param);
}

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatOrgBusbarVoltageYMapper.java
View File

@@ -21,8 +21,6 @@ public interface RStatOrgBusbarVoltageYMapper extends BaseMapper<RStatOrgBusbarV
/**
* 获取年区域电站母线电压类指标超标计
* @param param
* @return
*/
List<RStatOrgBusbarVoltageVO> getYstatOrgBusbarVoltageVO(@Param("param") StatSubstationBizBaseParam param);
}

11
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatOrgMMapper.java
View File

@@ -22,9 +22,6 @@ public interface RStatOrgMMapper extends BaseMapper<RStatOrgM> {
/**
* 区域稳态指标超标分类统计表--月表数据
* @param param
* @param dataType
* @return
*/
List<RStatSubstationOrgVO> getMonthRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param,
@Param("deptIds") List<String> deptIds,
@@ -32,21 +29,13 @@ public interface RStatOrgMMapper extends BaseMapper<RStatOrgM> {
/**
* 获取月区域稳态指标合格率统计表
* @param param
* @param dataType
* @return
*/
List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getMonthRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param,
@Param("dataType") String dataType);
/**
* 配网获取月区域稳态指标合格率统计表
* @param param
* @param dataType
* @return
*/
List<PwRStatOrgVO> getPwMonthRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param,
@Param("dataType") String dataType);
List<RStatOrgM> getRStatOrgMList();
}

9
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatOrgQMapper.java
View File

@@ -22,9 +22,6 @@ public interface RStatOrgQMapper extends BaseMapper<RStatOrgQ> {
/**
* 区域稳态指标超标分类统计表--年表数据
* @param param
* @param dataType
* @return
*/
List<RStatSubstationOrgVO> getQuarterRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param,
@Param("deptIds") List<String> deptIds,
@@ -32,18 +29,12 @@ public interface RStatOrgQMapper extends BaseMapper<RStatOrgQ> {
/**
* 主网获取季区域稳态指标合格率统计表
* @param param
* @param dataType
* @return
*/
List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getQuarterRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param,
@Param("dataType") String dataType);
/**
* 配网获取季区域稳态指标合格率统计表
* @param param
* @param dataType
* @return
*/
List<PwRStatOrgVO> getPwQuarterRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param,
@Param("dataType") String dataType);

10
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatOrgYMapper.java
View File

@@ -22,10 +22,6 @@ public interface RStatOrgYMapper extends BaseMapper<RStatOrgY> {
/**
* 区域稳态指标超标分类统计表--年表数据
* @param param
* @param deptIds
* @param dataType
* @return
*/
List<RStatSubstationOrgVO> getYearRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param,
@Param("deptIds") List<String> deptIds,
@@ -33,18 +29,12 @@ public interface RStatOrgYMapper extends BaseMapper<RStatOrgY> {
/**
* 主网获取年区域稳态指标合格率统计表
* @param param
* @param dataType
* @return
*/
List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getYearRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param,
@Param("dataType") String dataType);
/**
* 配网获取年区域稳态指标合格率统计表
* @param param
* @param dataType
* @return
*/
List<PwRStatOrgVO> getPwYearRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param,
@Param("dataType") String dataType);

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatSubstationMMapper.java
View File

@@ -21,15 +21,11 @@ public interface RStatSubstationMMapper extends BaseMapper<RStatSubstationM> {
/**
* 变电站稳态指标超标分布（按超标天数）
* @param param
* @return
*/
RSubstationIconVO getStatSubstationIconM(@Param("param") StatSubstationBizBaseParam param);
/**
* 变电站稳态指标平均超标天数
* @param param
* @return
*/
List<RSubstationIcon2VO> getStatSubstationIcon2M(@Param("param") StatSubstationBizBaseParam param);
}

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatSubstationQMapper.java
View File

@@ -21,15 +21,11 @@ public interface RStatSubstationQMapper extends BaseMapper<RStatSubstationQ> {
/**
* 变电站稳态指标超标分布（按超标天数）
* @param param
* @return
*/
RSubstationIconVO getStatSubstationIconQ(@Param("param") StatSubstationBizBaseParam param);
/**
* 变电站稳态指标平均超标天数
* @param param
* @return
*/
List<RSubstationIcon2VO> getStatSubstationIcon2Q(@Param("param") StatSubstationBizBaseParam param);
}

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatSubstationVoltageMMapper.java
View File

@@ -22,8 +22,6 @@ public interface RStatSubstationVoltageMMapper extends BaseMapper<RStatSubstatio
/**
* 变电站稳态指标超标分布（按电压等级）
* @param param
* @return
*/
List<RVoltageIconVO> getStatSubstationIcon(@Param("param") StatSubstationBizBaseParam param,@Param("ids")List<String> ids);

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatSubstationYMapper.java
View File

@@ -21,16 +21,12 @@ public interface RStatSubstationYMapper extends BaseMapper<RStatSubstationY> {
/**
* 变电站稳态指标超标分布（按超标天数）
* @param param
* @return
*/
RSubstationIconVO getStatSubstationIconY(@Param("param") StatSubstationBizBaseParam param);
/**
* 变电站稳态指标平均超标天数
* @param param
* @return
*/
List<RSubstationIcon2VO> getStatSubstationIcon2Y(@Param("param") StatSubstationBizBaseParam param);
}

8
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/LargeScreenMapper.xml
View File

@@ -4,7 +4,7 @@
<select id="getHomeostasisArea" resultType="java.util.Map">
select
rshom.org_no "id",
rshom.org_no id,
round(avg(rshom.over_limit_measurement_ratio_accrued),2) avg
from r_stat_harmonic_org_m rshom
left join sys_dict_data sdd on rshom.data_type = sdd.Id and sdd.Code = 'Mainnet_Point'
@@ -24,7 +24,7 @@
<select id="getHomeostasisLoad" resultType="java.util.Map">
select
rshom.measurement_type_class "id",
rshom.measurement_type_class id,
round(avg(rshom.over_limit_measurement_ratio_accrued),2) avg
from r_stat_harmonic_m rshom
left join sys_dict_data sdd on rshom.data_type = sdd.Id and sdd.Code = 'Mainnet_Point'
@@ -43,9 +43,9 @@
</select>
<select id="getPowerOrder" resultType="com.njcn.device.pq.pojo.vo.PowerOrderVO">
select t.*, pl.Name "name"
select t.*, pl.Name name
from (
SELECT rsdhpd.line_id "id", round(max(rsdhpd.p), 0) "max"
SELECT rsdhpd.line_id id, round(max(rsdhpd.p), 0) max
FROM r_stat_data_harmpower_p_d rsdhpd
<where>
rsdhpd.line_id in

18
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RMpBenchmarkLevelMMapper.xml
View File

@@ -4,23 +4,5 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.harmonic.mapper.majornetwork.RMpBenchmarkLevelMMapper">
<resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpBenchmarkLevelM">
<id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
<id property="dataDate" column="data_date" jdbcType="DATE"/>
<result property="voltageAvg" column="voltage_avg" jdbcType="FLOAT"/>
<result property="voltageSd" column="voltage_sd" jdbcType="FLOAT"/>
<result property="unbalanceAvg" column="unbalance_avg" jdbcType="FLOAT"/>
<result property="unbalanceSd" column="unbalance_sd" jdbcType="FLOAT"/>
<result property="vthdAvg" column="vthd_avg" jdbcType="FLOAT"/>
<result property="vthdSd" column="vthd_sd" jdbcType="FLOAT"/>
<result property="flickerAvg" column="flicker_avg" jdbcType="FLOAT"/>
<result property="flickerSd" column="flicker_sd" jdbcType="FLOAT"/>
</resultMap>
<sql id="Base_Column_List">
measurement_point_id,data_date,voltage_avg,
voltage_sd,unbalance_avg,unbalance_sd,
vthd_avg,vthd_sd,flicker_avg,
flicker_sd
</sql>
</mapper>

18
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RMpBenchmarkLevelQMapper.xml
View File

@@ -4,23 +4,5 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.harmonic.mapper.majornetwork.RMpBenchmarkLevelQMapper">
<resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpBenchmarkLevelQ">
<id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
<id property="dataDate" column="data_date" jdbcType="DATE"/>
<result property="voltageAvg" column="voltage_avg" jdbcType="FLOAT"/>
<result property="voltageSd" column="voltage_sd" jdbcType="FLOAT"/>
<result property="unbalanceAvg" column="unbalance_avg" jdbcType="FLOAT"/>
<result property="unbalanceSd" column="unbalance_sd" jdbcType="FLOAT"/>
<result property="vthdAvg" column="vthd_avg" jdbcType="FLOAT"/>
<result property="vthdSd" column="vthd_sd" jdbcType="FLOAT"/>
<result property="flickerAvg" column="flicker_avg" jdbcType="FLOAT"/>
<result property="flickerSd" column="flicker_sd" jdbcType="FLOAT"/>
</resultMap>
<sql id="Base_Column_List">
measurement_point_id,data_date,voltage_avg,
voltage_sd,unbalance_avg,unbalance_sd,
vthd_avg,vthd_sd,flicker_avg,
flicker_sd
</sql>
</mapper>

18
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RMpBenchmarkLevelYMapper.xml
View File

@@ -4,23 +4,5 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.harmonic.mapper.majornetwork.RMpBenchmarkLevelYMapper">
<resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpBenchmarkLevelY">
<id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
<id property="dataDate" column="data_date" jdbcType="DATE"/>
<result property="voltageAvg" column="voltage_avg" jdbcType="FLOAT"/>
<result property="voltageSd" column="voltage_sd" jdbcType="FLOAT"/>
<result property="unbalanceAvg" column="unbalance_avg" jdbcType="FLOAT"/>
<result property="unbalanceSd" column="unbalance_sd" jdbcType="FLOAT"/>
<result property="vthdAvg" column="vthd_avg" jdbcType="FLOAT"/>
<result property="vthdSd" column="vthd_sd" jdbcType="FLOAT"/>
<result property="flickerAvg" column="flicker_avg" jdbcType="FLOAT"/>
<result property="flickerSd" column="flicker_sd" jdbcType="FLOAT"/>
</resultMap>
<sql id="Base_Column_List">
measurement_point_id,data_date,voltage_avg,
voltage_sd,unbalance_avg,unbalance_sd,
vthd_avg,vthd_sd,flicker_avg,
flicker_sd
</sql>
</mapper>

Some files were not shown because too many files have changed in this diff Show More