ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

报表调整

Browse Source
This commit is contained in:
hongawen
2025-01-14 16:10:52 +08:00
parent 8fa69a6876
commit f3a48ca345
4 changed files with 71 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
detection/src/main/java/com/njcn/gather/report/service/impl/ReportServiceImpl.java
View File

@@ -108,7 +108,7 @@ public class ReportServiceImpl implements IReportService {
// 判断该计划下是否所有设备报告已生成，如果已生成则将计划状态改为已完成 // 判断该计划下是否所有设备报告已生成，如果已生成则将计划状态改为已完成
int count = iPqDevService.countUnReportDev(devReportParam.getPlanId()); int count = iPqDevService.countUnReportDev(devReportParam.getPlanId());
if(count == 0){ if (count == 0) {
LambdaUpdateWrapper<AdPlan> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<AdPlan> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(AdPlan::getId, devReportParam.getPlanId()) updateWrapper.eq(AdPlan::getId, devReportParam.getPlanId())
.set(AdPlan::getReportState, DevReportStateEnum.GENERATED.getValue()); .set(AdPlan::getReportState, DevReportStateEnum.GENERATED.getValue());
@@ -137,7 +137,11 @@ public class ReportServiceImpl implements IReportService {
// 调试人员，todo... 待咨询曹泽辉如何获取当前用户信息，目前先写死 // 调试人员，todo... 待咨询曹泽辉如何获取当前用户信息，目前先写死
baseModelMap.put("${userName}", "管理员"); baseModelMap.put("${userName}", "管理员");
// 调试日期 // 调试日期
if (pqDevVO.getCheckTime() != null) {
baseModelMap.put("${testDate}", DateUtil.format(pqDevVO.getCheckTime(), DatePattern.CHINESE_DATE_PATTERN));
} else {
baseModelMap.put("${testDate}", DateUtil.format(new Date(), DatePattern.CHINESE_DATE_PATTERN)); baseModelMap.put("${testDate}", DateUtil.format(new Date(), DatePattern.CHINESE_DATE_PATTERN));
}
// 装置编码 // 装置编码
baseModelMap.put("${CreateId}", pqDevVO.getCreateId()); baseModelMap.put("${CreateId}", pqDevVO.getCreateId());
// 额定电流 // 额定电流
@@ -218,8 +222,21 @@ public class ReportServiceImpl implements IReportService {
singleNonHarmParam.setSort(testItemIndex); singleNonHarmParam.setSort(testItemIndex);
fillMapValue(singleNonHarmParam, dataModelMap, "10Ua", "10Ub", "10Uc"); fillMapValue(singleNonHarmParam, dataModelMap, "10Ua", "10Ub", "10Uc");
// 5A 电流
// 电压偏差
testItemIndex = 3; testItemIndex = 3;
pqScriptCheckDataService = "8e221487f242c77f1eff05234580d4c5";
// 获取数据
singleNonHarmParam.setAdType(pqScriptCheckDataService);
singleNonHarmParam.setSort(testItemIndex);
fillMapValue(singleNonHarmParam, dataModelMap, "DELTA_Ua", "DELTA_Ub", "DELTA_Uc");
// 特殊处理电压偏差
specialDealVoltage(dataModelMap, "${DELTA_Ua}");
specialDealVoltage(dataModelMap, "${DELTA_Ub}");
specialDealVoltage(dataModelMap, "${DELTA_Uc}");
// 5A 电流
testItemIndex = 4;
pqScriptCheckDataService = "7fbadbeb9dd5ccb69d216f4f9ad60b4f"; pqScriptCheckDataService = "7fbadbeb9dd5ccb69d216f4f9ad60b4f";
// 获取数据 // 获取数据
singleNonHarmParam.setAdType(pqScriptCheckDataService); singleNonHarmParam.setAdType(pqScriptCheckDataService);
@@ -227,7 +244,7 @@ public class ReportServiceImpl implements IReportService {
fillMapValue(singleNonHarmParam, dataModelMap, "5Ia", "5Ib", "5Ic"); fillMapValue(singleNonHarmParam, dataModelMap, "5Ia", "5Ib", "5Ic");
// 5A 电流相角 // 5A 电流相角
testItemIndex = 3; testItemIndex = 4;
pqScriptCheckDataService = "fdffc6b5dfdc8751b9fde9b599b8ea51"; pqScriptCheckDataService = "fdffc6b5dfdc8751b9fde9b599b8ea51";
// 获取数据 // 获取数据
singleNonHarmParam.setAdType(pqScriptCheckDataService); singleNonHarmParam.setAdType(pqScriptCheckDataService);
@@ -235,20 +252,13 @@ public class ReportServiceImpl implements IReportService {
fillMapValue(singleNonHarmParam, dataModelMap, "5IaA", "5IbA", "5IcA"); fillMapValue(singleNonHarmParam, dataModelMap, "5IaA", "5IbA", "5IcA");
// 1A 电流 // 1A 电流
testItemIndex = 4; testItemIndex = 5;
pqScriptCheckDataService = "7fbadbeb9dd5ccb69d216f4f9ad60b4f"; pqScriptCheckDataService = "7fbadbeb9dd5ccb69d216f4f9ad60b4f";
// 获取数据 // 获取数据
singleNonHarmParam.setAdType(pqScriptCheckDataService); singleNonHarmParam.setAdType(pqScriptCheckDataService);
singleNonHarmParam.setSort(testItemIndex); singleNonHarmParam.setSort(testItemIndex);
fillMapValue(singleNonHarmParam, dataModelMap, "1Ia", "1Ib", "1Ic"); fillMapValue(singleNonHarmParam, dataModelMap, "1Ia", "1Ib", "1Ic");
// 电压偏差
testItemIndex = 5;
pqScriptCheckDataService = "148faabd2630aaac0b70be8609075f69";
// 获取数据
singleNonHarmParam.setAdType(pqScriptCheckDataService);
singleNonHarmParam.setSort(testItemIndex);
fillMapValue(singleNonHarmParam, dataModelMap, "DELTA_Ua", "DELTA_Ub", "DELTA_Uc");
// 三相电压不平衡度 // 三相电压不平衡度
testItemIndex = 6; testItemIndex = 6;
@@ -291,7 +301,7 @@ public class ReportServiceImpl implements IReportService {
// 获取数据 // 获取数据
singleNonHarmParam.setAdType(pqScriptCheckDataService); singleNonHarmParam.setAdType(pqScriptCheckDataService);
singleNonHarmParam.setSort(testItemIndex); singleNonHarmParam.setSort(testItemIndex);
fillMapValueHarm(singleNonHarmParam, dataModelMap, "Uha", "Uhb", "Uhc", 57.74); fillMapValueHarm(singleNonHarmParam, dataModelMap, "Uha", "Uhb", "Uhc", 57.74, 100);
// 谐波电电流,少了基波 todo... // 谐波电电流,少了基波 todo...
testItemIndex = 11; testItemIndex = 11;
@@ -299,7 +309,7 @@ public class ReportServiceImpl implements IReportService {
// 获取数据 // 获取数据
singleNonHarmParam.setAdType(pqScriptCheckDataService); singleNonHarmParam.setAdType(pqScriptCheckDataService);
singleNonHarmParam.setSort(testItemIndex); singleNonHarmParam.setSort(testItemIndex);
fillMapValueHarm(singleNonHarmParam, dataModelMap, "Iha", "Ihb", "Ihc", 1); fillMapValueHarm(singleNonHarmParam, dataModelMap, "Iha", "Ihb", "Ihc", 1, 1);
// 间谐波电压 // 间谐波电压
testItemIndex = 12; testItemIndex = 12;
@@ -307,7 +317,7 @@ public class ReportServiceImpl implements IReportService {
// 获取数据 // 获取数据
singleNonHarmParam.setAdType(pqScriptCheckDataService); singleNonHarmParam.setAdType(pqScriptCheckDataService);
singleNonHarmParam.setSort(testItemIndex); singleNonHarmParam.setSort(testItemIndex);
fillMapValueHarm(singleNonHarmParam, dataModelMap, "InUa", "InUb", "InUc", 57.74); fillMapValueHarm(singleNonHarmParam, dataModelMap, "InUa", "InUb", "InUc", 57.74, 100);
// 间谐波电流 // 间谐波电流
testItemIndex = 13; testItemIndex = 13;
@@ -315,7 +325,7 @@ public class ReportServiceImpl implements IReportService {
// 获取数据 // 获取数据
singleNonHarmParam.setAdType(pqScriptCheckDataService); singleNonHarmParam.setAdType(pqScriptCheckDataService);
singleNonHarmParam.setSort(testItemIndex); singleNonHarmParam.setSort(testItemIndex);
fillMapValueHarm(singleNonHarmParam, dataModelMap, "InIa", "InIb", "InIc", 1); fillMapValueHarm(singleNonHarmParam, dataModelMap, "InIa", "InIb", "InIc", 1, 1);
// 替换文档内容 // 替换文档内容
@@ -325,53 +335,62 @@ public class ReportServiceImpl implements IReportService {
} }
} }
private void specialDealVoltage(Map<String, String> dataModelMap, String symbol) {
String value = dataModelMap.get(symbol);
if (Objects.nonNull(value) && !value.equals("/")) {
Double valueDouble = Double.valueOf(value);
double result = ((valueDouble - 57.74) / 57.74) * 100;
dataModelMap.put(symbol, doubleRound(4, result));
}
}
/** /**
* 填充谐波Map数据 * 填充谐波Map数据
*/ */
private void fillMapValueHarm(SingleNonHarmParam singleNonHarmParam, Map<String, String> dataModelMap, String aSymbol, String bSymbol, String cSymbol, double baseValue) { private void fillMapValueHarm(SingleNonHarmParam singleNonHarmParam, Map<String, String> dataModelMap, String aSymbol, String bSymbol, String cSymbol, double baseValue, int percent) {
AdHarmonicResult adHarmonicResult = adHarmonicService.getSingleResult(singleNonHarmParam); AdHarmonicResult adHarmonicResult = adHarmonicService.getSingleResult(singleNonHarmParam);
if (Objects.nonNull(adHarmonicResult)) { if (Objects.nonNull(adHarmonicResult)) {
// 要处理 2 5 7 11 23 35 43 50 // 要处理 2 5 7 11 23 35 43 50
dataModelMap.put("${" + aSymbol + "2}", devValue(adHarmonicResult.getAValue2(), baseValue)); dataModelMap.put("${" + aSymbol + "2}", devValue(adHarmonicResult.getAValue2(), baseValue, percent));
dataModelMap.put("${" + bSymbol + "2}", devValue(adHarmonicResult.getBValue2(), baseValue)); dataModelMap.put("${" + bSymbol + "2}", devValue(adHarmonicResult.getBValue2(), baseValue, percent));
dataModelMap.put("${" + cSymbol + "2}", devValue(adHarmonicResult.getCValue2(), baseValue)); dataModelMap.put("${" + cSymbol + "2}", devValue(adHarmonicResult.getCValue2(), baseValue, percent));
dataModelMap.put("${" + aSymbol + "5}", devValue(adHarmonicResult.getAValue5(), baseValue)); dataModelMap.put("${" + aSymbol + "5}", devValue(adHarmonicResult.getAValue5(), baseValue, percent));
dataModelMap.put("${" + bSymbol + "5}", devValue(adHarmonicResult.getBValue5(), baseValue)); dataModelMap.put("${" + bSymbol + "5}", devValue(adHarmonicResult.getBValue5(), baseValue, percent));
dataModelMap.put("${" + cSymbol + "5}", devValue(adHarmonicResult.getCValue5(), baseValue)); dataModelMap.put("${" + cSymbol + "5}", devValue(adHarmonicResult.getCValue5(), baseValue, percent));
dataModelMap.put("${" + aSymbol + "7}", devValue(adHarmonicResult.getAValue7(), baseValue)); dataModelMap.put("${" + aSymbol + "7}", devValue(adHarmonicResult.getAValue7(), baseValue, percent));
dataModelMap.put("${" + bSymbol + "7}", devValue(adHarmonicResult.getBValue7(), baseValue)); dataModelMap.put("${" + bSymbol + "7}", devValue(adHarmonicResult.getBValue7(), baseValue, percent));
dataModelMap.put("${" + cSymbol + "7}", devValue(adHarmonicResult.getCValue7(), baseValue)); dataModelMap.put("${" + cSymbol + "7}", devValue(adHarmonicResult.getCValue7(), baseValue, percent));
dataModelMap.put("${" + aSymbol + "11}", devValue(adHarmonicResult.getAValue11(), baseValue)); dataModelMap.put("${" + aSymbol + "11}", devValue(adHarmonicResult.getAValue11(), baseValue, percent));
dataModelMap.put("${" + bSymbol + "11}", devValue(adHarmonicResult.getBValue11(), baseValue)); dataModelMap.put("${" + bSymbol + "11}", devValue(adHarmonicResult.getBValue11(), baseValue, percent));
dataModelMap.put("${" + cSymbol + "11}", devValue(adHarmonicResult.getCValue11(), baseValue)); dataModelMap.put("${" + cSymbol + "11}", devValue(adHarmonicResult.getCValue11(), baseValue, percent));
dataModelMap.put("${" + aSymbol + "23}", devValue(adHarmonicResult.getAValue23(), baseValue)); dataModelMap.put("${" + aSymbol + "23}", devValue(adHarmonicResult.getAValue23(), baseValue, percent));
dataModelMap.put("${" + bSymbol + "23}", devValue(adHarmonicResult.getBValue23(), baseValue)); dataModelMap.put("${" + bSymbol + "23}", devValue(adHarmonicResult.getBValue23(), baseValue, percent));
dataModelMap.put("${" + cSymbol + "23}", devValue(adHarmonicResult.getCValue23(), baseValue)); dataModelMap.put("${" + cSymbol + "23}", devValue(adHarmonicResult.getCValue23(), baseValue, percent));
dataModelMap.put("${" + aSymbol + "35}", devValue(adHarmonicResult.getAValue35(), baseValue)); dataModelMap.put("${" + aSymbol + "35}", devValue(adHarmonicResult.getAValue35(), baseValue, percent));
dataModelMap.put("${" + bSymbol + "35}", devValue(adHarmonicResult.getBValue35(), baseValue)); dataModelMap.put("${" + bSymbol + "35}", devValue(adHarmonicResult.getBValue35(), baseValue, percent));
dataModelMap.put("${" + cSymbol + "35}", devValue(adHarmonicResult.getCValue35(), baseValue)); dataModelMap.put("${" + cSymbol + "35}", devValue(adHarmonicResult.getCValue35(), baseValue, percent));
dataModelMap.put("${" + aSymbol + "43}", devValue(adHarmonicResult.getAValue43(), baseValue)); dataModelMap.put("${" + aSymbol + "43}", devValue(adHarmonicResult.getAValue43(), baseValue, percent));
dataModelMap.put("${" + bSymbol + "43}", devValue(adHarmonicResult.getBValue43(), baseValue)); dataModelMap.put("${" + bSymbol + "43}", devValue(adHarmonicResult.getBValue43(), baseValue, percent));
dataModelMap.put("${" + cSymbol + "43}", devValue(adHarmonicResult.getCValue43(), baseValue)); dataModelMap.put("${" + cSymbol + "43}", devValue(adHarmonicResult.getCValue43(), baseValue, percent));
dataModelMap.put("${" + aSymbol + "50}", devValue(adHarmonicResult.getAValue50(), baseValue)); dataModelMap.put("${" + aSymbol + "50}", devValue(adHarmonicResult.getAValue50(), baseValue, percent));
dataModelMap.put("${" + bSymbol + "50}", devValue(adHarmonicResult.getBValue50(), baseValue)); dataModelMap.put("${" + bSymbol + "50}", devValue(adHarmonicResult.getBValue50(), baseValue, percent));
dataModelMap.put("${" + cSymbol + "50}", devValue(adHarmonicResult.getCValue50(), baseValue)); dataModelMap.put("${" + cSymbol + "50}", devValue(adHarmonicResult.getCValue50(), baseValue, percent));
} }
} }
private String devValue(String dataJson, double baseValue) { private String devValue(String dataJson, double baseValue, Integer percent) {
DetectionData tempA = JSONUtil.toBean(dataJson, DetectionData.class); DetectionData tempA = JSONUtil.toBean(dataJson, DetectionData.class);
if (Objects.nonNull(tempA) && Objects.nonNull(tempA.getData())) { if (Objects.nonNull(tempA) && Objects.nonNull(tempA.getData())) {
return doubleRound(4, (tempA.getData() / 100) * baseValue); return doubleRound(4, (tempA.getData() / percent) * baseValue);
} }
return "/"; return "/";
} }
@@ -383,9 +402,9 @@ public class ReportServiceImpl implements IReportService {
private void fillMapValue(SingleNonHarmParam singleNonHarmParam, Map<String, String> dataModelMap, String aSymbol, String bSymbol, String cSymbol) { private void fillMapValue(SingleNonHarmParam singleNonHarmParam, Map<String, String> dataModelMap, String aSymbol, String bSymbol, String cSymbol) {
AdNonHarmonicResult adNonHarmonicResult = adNonHarmonicService.getSingleResult(singleNonHarmParam); AdNonHarmonicResult adNonHarmonicResult = adNonHarmonicService.getSingleResult(singleNonHarmParam);
if (Objects.nonNull(adNonHarmonicResult)) { if (Objects.nonNull(adNonHarmonicResult)) {
dataModelMap.put("${".concat(aSymbol).concat("}"), devValue(adNonHarmonicResult.getAValue(), 1)); dataModelMap.put("${".concat(aSymbol).concat("}"), devValue(adNonHarmonicResult.getAValue(), 1, 1));
dataModelMap.put("${".concat(bSymbol).concat("}"), devValue(adNonHarmonicResult.getBValue(), 1)); dataModelMap.put("${".concat(bSymbol).concat("}"), devValue(adNonHarmonicResult.getBValue(), 1, 1));
dataModelMap.put("${".concat(cSymbol).concat("}"), devValue(adNonHarmonicResult.getCValue(), 1)); dataModelMap.put("${".concat(cSymbol).concat("}"), devValue(adNonHarmonicResult.getCValue(), 1, 1));
} }
} }
@@ -395,7 +414,7 @@ public class ReportServiceImpl implements IReportService {
private void fillMapValueT(SingleNonHarmParam singleNonHarmParam, Map<String, String> dataModelMap, String tSymbol) { private void fillMapValueT(SingleNonHarmParam singleNonHarmParam, Map<String, String> dataModelMap, String tSymbol) {
AdNonHarmonicResult adNonHarmonicResult = adNonHarmonicService.getSingleResult(singleNonHarmParam); AdNonHarmonicResult adNonHarmonicResult = adNonHarmonicService.getSingleResult(singleNonHarmParam);
if (Objects.nonNull(adNonHarmonicResult)) { if (Objects.nonNull(adNonHarmonicResult)) {
dataModelMap.put("${".concat(tSymbol).concat("}"), devValue(adNonHarmonicResult.getTValue(), 1)); dataModelMap.put("${".concat(tSymbol).concat("}"), devValue(adNonHarmonicResult.getTValue(), 1, 1));
} }
} }

3
device/src/main/java/com/njcn/gather/device/device/pojo/vo/PqDevVO.java
View File

@@ -9,6 +9,7 @@ import com.njcn.gather.device.monitor.pojo.po.PqMonitor;
import lombok.Data; import lombok.Data;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
/** /**
@@ -85,4 +86,6 @@ public class PqDevVO {
private Integer reCheckNum; private Integer reCheckNum;
private List<PqMonitor> monitorList; private List<PqMonitor> monitorList;
private LocalDateTime checkTime;
} }

4
entrance/src/main/resources/application.yml
View File

@@ -45,8 +45,8 @@ mybatis-plus:
socket: socket:
source: source:
ip: 192.168.1.127 ip: 192.168.1.138
port: 8574 port: 62000
device: device:
ip: 192.168.1.138 ip: 192.168.1.138
port: 61000 port: 61000

BIN
entrance/src/main/resources/model/BaseDataModel.docx
View File

Binary file not shown.