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

1.谐波溯源算法bug

Browse Source
This commit is contained in:
chendaofei
2025-10-17 15:32:54 +08:00
parent e0cfcbccf8
commit 0e1605d9b3
7 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/service/impl/LineServiceImpl.java
View File

@@ -18,6 +18,7 @@ import com.njcn.product.terminal.mysqlTerminal.pojo.param.UserReportParam;
import com.njcn.product.terminal.mysqlTerminal.pojo.po.Device;
import com.njcn.product.terminal.mysqlTerminal.pojo.po.Line;
import com.njcn.product.terminal.mysqlTerminal.pojo.po.LineDetail;
import com.njcn.product.terminal.mysqlTerminal.pojo.po.UserReportPO;
import com.njcn.product.terminal.mysqlTerminal.pojo.vo.LineDataVO;
import com.njcn.product.terminal.mysqlTerminal.pojo.vo.LineDetailDataVO;
import com.njcn.product.terminal.mysqlTerminal.pojo.vo.TerminalTree;
@@ -58,6 +59,7 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
private final LineDetailMapper lineDetailMapper;
private final AreaMapper areaMapper;
private final VoltageMapper voltageMapper;
private final UserReportPOMapper userReportPOMapper;
@Override
public List<LedgerTreeDTO> getTree() {
@@ -261,7 +263,10 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
lineDetailDataVO.setDevId(device.getId());
lineDetailDataVO.setBusinessType(dictDataMapper.selectById(lineDetail.getBusinessType()).getName());
lineDetailDataVO.setLoadType(dictDataMapper.selectById(lineDetail.getLoadType()).getName());
lineDetailDataVO.setObjName(lineDetail.getObjName());
UserReportPO userReportPO = userReportPOMapper.selectById(lineDetail.getObjId());
if(Objects.nonNull(userReportPO)){
lineDetailDataVO.setObjName(userReportPO.getProjectName());
}
lineDetailDataVO.setId(lineDetail.getNum());
lineDetailDataVO.setPtType(TerminalUtils.ptType(lineDetail.getPtType()));
lineDetailDataVO.setPt(lineDetail.getPt1() + "/" + lineDetail.getPt2());