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

1.bug调整

Browse Source
This commit is contained in:
chendaofei
2026-06-25 18:27:44 +08:00
parent 5a0e990f90
commit 83907cd3ee
9 changed files with 151 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/powerstatistics/PowerStatisticsController.java
View File

@@ -64,7 +64,7 @@ public class PowerStatisticsController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getTargetByTime")
@ApiOperation("点击越限列表时间查询指标的详细数据")
public HttpResult<List<ThdDataVO>> getTargetByTime(@RequestBody @Validated PowerStatisticsParam powerStatisticsParam) {
public HttpResult<List<ThdDataVO>> getTargetByTime(@RequestBody PowerStatisticsParam powerStatisticsParam) {
String methodDescribe = getMethodDescribe("getTargetByTime");
List<ThdDataVO> targetByTime = powerStatisticsService.getTargetByTimeDetail(powerStatisticsParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, targetByTime, methodDescribe);
@@ -73,14 +73,14 @@ public class PowerStatisticsController extends BaseController {
@ResponseBody
@ApiOperation("导出区间数据")
@PostMapping(value = "exportExcelRangTemplate")
public void exportExcelRangTemplate(@RequestBody @Validated PowerStatisticsParam powerStatisticsParam,HttpServletResponse response) {
public void exportExcelRangTemplate(@RequestBody PowerStatisticsParam powerStatisticsParam,HttpServletResponse response) {
powerStatisticsService.exportExcelRangTemplate(powerStatisticsParam,response);
}
@ResponseBody
@ApiOperation("导出指标越限列表数据")
@PostMapping(value = "exportExcelListTemplate")
public void exportExcelListTemplate(@RequestBody @Validated PowerStatisticsParam powerStatisticsParam,HttpServletResponse response) {
public void exportExcelListTemplate(@RequestBody PowerStatisticsParam powerStatisticsParam,HttpServletResponse response) {
powerStatisticsService.exportExcelListTemplate(powerStatisticsParam,response);
}

8
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpTargetWarnDServiceImpl.java
View File

@@ -167,12 +167,16 @@ public class RMpTargetWarnDServiceImpl extends ServiceImpl<RMpTargetWarnDMapper,
List<GridDiagramVO.StatisticsData> statisticsData = new ArrayList<>();
List<GridDiagramVO.StatisticsData> gwStatisticsData = new ArrayList<>();
List<String> idsList = new ArrayList<>();
int allNum = 0;
for(String voltage:voltageIds){
GridDiagramVO.StatisticsData voltageItem = new GridDiagramVO.StatisticsData();
voltageItem.setColumnName(voltage);
if(voltageMonitorMap.containsKey(voltage)){
List<String> ids = voltageMonitorMap.get(voltage).stream().map(LineDevGetDTO::getObjId).distinct().collect(Collectors.toList());
voltageItem.setNumOne((long)ids.size());
allNum+=ids.size();
idsList.addAll(ids);
voltageItem.setNumOneList(ids);
}else {
voltageItem.setNumOne(0L);
@@ -180,6 +184,10 @@ public class RMpTargetWarnDServiceImpl extends ServiceImpl<RMpTargetWarnDMapper,
}
statisticsData.add(voltageItem);
}
GridDiagramVO.StatisticsData dataSum = new GridDiagramVO.StatisticsData();
dataSum.setNumOneList(idsList);
dataSum.setNumOne((long)allNum);
statisticsData.add(dataSum);
lineStatistics.setData(statisticsData);
gwLineStatistics.setData(gwStatisticsData);

27
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/report/impl/CustomReportServiceImpl.java
View File

@@ -115,6 +115,9 @@ public class CustomReportServiceImpl implements CustomReportService {
private final String STR_FOUR = "%";
private final String UVOLTAGE_DEV = "UVOLTAGE_DEV";
private final String VOLTAGE_DEV = "VOLTAGE_DEV";
private final String PT = "PT";
private final String CT = "CT";
@Override
public void getCustomReport(ReportSearchParam reportSearchParam, HttpServletResponse response) {
@@ -126,6 +129,8 @@ public class CustomReportServiceImpl implements CustomReportService {
DeviceUnitCommDTO deviceUnitCommDTO = BeanUtil.copyProperties(deviceUnit, DeviceUnitCommDTO.class);
Map<String,String> finalTerminalMap = convertKeysToUpperCase(commTerminalGeneralClient.getCustomDetailByLineId(reportSearchParam.getLineId()).getData());
finalTerminalMap.put(PT,formatSciNumber(finalTerminalMap.getOrDefault(PT,"N/A")));
finalTerminalMap.put(CT,formatSciNumber(finalTerminalMap.getOrDefault(CT,"N/A")));
customReportTableService.getCustomReport(reportSearchParam,finalTerminalMap,deviceUnitCommDTO, response);
} else {
//浙江无线报表
@@ -1462,6 +1467,28 @@ public class CustomReportServiceImpl implements CustomReportService {
}
}
/**
* 解析科学计数字符串，转为完整数字文本，原有小数原样保留
* @param numStr 数据库返回字符串：123.00 / 1.234E+08 / N/A
* @return 标准数字字符串
*/
public String formatSciNumber(String numStr) {
// 空值或占位符直接返回
if (numStr == null || "N/A".equals(numStr.trim())) {
return numStr;
}
// 判断是否为科学计数格式
if (numStr.toLowerCase().contains("e")) {
// BigDecimal 可完美解析科学计数，输出完整数字，保留全部小数位
String [] split =numStr.split(":");
BigDecimal one = new BigDecimal(split[0]);
BigDecimal two = new BigDecimal(split[1]);
return (one.toPlainString().concat(":").concat(two.toPlainString()));
}
return numStr;
}
}