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

区域报告模板bug修改

Browse Source
This commit is contained in:
cdf
2026-03-23 13:03:32 +08:00
parent e8cd6da8a0
commit 9225e82edb
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java
View File

@@ -193,13 +193,16 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
}); });
UserLedgerVO userReportPO = userLedgerVOMap.get(objId); UserLedgerVO userReportPO = userLedgerVOMap.get(objId);
if (Objects.isNull(userReportPO)) {
System.out.println(map);
}
TerminalTree terminalTree = new TerminalTree(); TerminalTree terminalTree = new TerminalTree();
terminalTree.setName(userReportPO.getProjectName()); if (Objects.isNull(userReportPO)) {
terminalTree.setId(userReportPO.getId()); terminalTree.setName("用户对象缺失");
terminalTree.setPid(userReportPO.getStationId()); terminalTree.setId(objId);
terminalTree.setPid("");
}else {
terminalTree.setName(userReportPO.getProjectName());
terminalTree.setId(userReportPO.getId());
terminalTree.setPid(userReportPO.getStationId());
}
terminalTree.setPowerFlag(1); terminalTree.setPowerFlag(1);
terminalTree.setLevel(LineBaseEnum.USER_LEVEL.getCode()); terminalTree.setLevel(LineBaseEnum.USER_LEVEL.getCode());
terminalTree.setChildren(temDevList); terminalTree.setChildren(temDevList);

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

@@ -25,6 +25,7 @@ import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.po.Dept; import com.njcn.user.pojo.po.Dept;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.Assert; import org.springframework.util.Assert;
@@ -49,7 +50,9 @@ public class AreaHarmonicServiceImpl implements AreaHarmonicService {
// 常量定义 // 常量定义
private static final String REPORT_TEMPLATE_PATH = "file/areaReportTemplate.docx"; private static final String REPORT_TEMPLATE_PATH = "file/areaReportTemplate.docx";
private static final String DEFAULT_PROVIDER_DEPT = "云网能源(曲靖)有限责任公司";
@Value("${areaReportTitle:上海电力有限公司电力科学研究院}")
private String DEFAULT_PROVIDER_DEPT;
private static final String NO_DATA_PLACEHOLDER = "无"; private static final String NO_DATA_PLACEHOLDER = "无";
private static final String UNKNOWN_VALUE = "/"; private static final String UNKNOWN_VALUE = "/";