diff --git a/cn-advance/src/main/java/com/njcn/product/advance/eventSource/mapper/mapping/RelevanceMapper.xml b/cn-advance/src/main/java/com/njcn/product/advance/eventSource/mapper/mapping/RelevanceMapper.xml index d9b8bab..d82cdd6 100644 --- a/cn-advance/src/main/java/com/njcn/product/advance/eventSource/mapper/mapping/RelevanceMapper.xml +++ b/cn-advance/src/main/java/com/njcn/product/advance/eventSource/mapper/mapping/RelevanceMapper.xml @@ -18,14 +18,17 @@ b.logic_next nodeNext, d.Algo_Describe type FROM + pqs_tflgploy ploy, pqs_tflgployass a, pqs_tflgass b, pqs_transformer c, sys_dict_data d WHERE - a.tf_index = b.tf_index + ploy.TP_Index = a.TP_Index + and a.tf_index = b.tf_index AND b.tf_index = c.tf_index and c.Wiring = d.id + and ploy.Status = 1 diff --git a/cn-advance/src/main/java/com/njcn/product/advance/eventSource/service/impl/EventRelevantAnalysisServiceImpl.java b/cn-advance/src/main/java/com/njcn/product/advance/eventSource/service/impl/EventRelevantAnalysisServiceImpl.java index 941553f..b922680 100644 --- a/cn-advance/src/main/java/com/njcn/product/advance/eventSource/service/impl/EventRelevantAnalysisServiceImpl.java +++ b/cn-advance/src/main/java/com/njcn/product/advance/eventSource/service/impl/EventRelevantAnalysisServiceImpl.java @@ -78,14 +78,6 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl> nodeMap1 = getBeforeNodeInfo(); - Set>> nodeSort1 = nodeMap1.entrySet(); - System.out.println(nodeSort1); - - Map entityMtransMap1 = getNodeInfo(); - Set> setMtrans1 = entityMtransMap1.entrySet(); - System.out.println(setMtrans1); LocalDateTime date = LocalDateTime.now(); HandleEvent handleEvent = new HandleEvent(); @@ -117,6 +109,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl mm : mapValue) { for (EntityGroupEvtData groupEvtData : baseList) { + //矩阵只计算短路故障相关的事件，其他事件另行计算 if (groupEvtData.getNodePhysics().equals(mm.getKey()) && dictData.getId().equals(groupEvtData.getSagReason())) { groupEvtData.setNode(mm.getValue()); list.add(groupEvtData); diff --git a/cn-advance/src/main/java/com/njcn/product/advance/responsility/service/impl/RespDataServiceImpl.java b/cn-advance/src/main/java/com/njcn/product/advance/responsility/service/impl/RespDataServiceImpl.java index 9489da0..533ba3f 100644 --- a/cn-advance/src/main/java/com/njcn/product/advance/responsility/service/impl/RespDataServiceImpl.java +++ b/cn-advance/src/main/java/com/njcn/product/advance/responsility/service/impl/RespDataServiceImpl.java @@ -1498,6 +1498,10 @@ public class RespDataServiceImpl extends ServiceImpl i param.setLineIds(userList); List dataHarmPList = historyHarmonicService.getHarmonicPData(param); Map> collect = dataHarmPList.stream().collect(Collectors.groupingBy(DataHarmPowerP::getLineId)); + Set lineIds = collect.keySet(); + + + List result = new ArrayList<>(); collect.forEach((k,v)->{ LineDetailDataVO lineDetailData = lineService.getLineDetailData(k); diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/service/impl/LineServiceImpl.java b/cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/service/impl/LineServiceImpl.java index ce1f1f1..38be67c 100644 --- a/cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/service/impl/LineServiceImpl.java +++ b/cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/service/impl/LineServiceImpl.java @@ -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 implements Li private final LineDetailMapper lineDetailMapper; private final AreaMapper areaMapper; private final VoltageMapper voltageMapper; + private final UserReportPOMapper userReportPOMapper; @Override public List getTree() { @@ -261,7 +263,10 @@ public class LineServiceImpl extends ServiceImpl 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()); diff --git a/cn-zutai/src/main/java/com/njcn/product/cnzutai/zutai/pojo/po/CsPagePO.java b/cn-zutai/src/main/java/com/njcn/product/cnzutai/zutai/pojo/po/CsPagePO.java index 6bdfea9..1e7f455 100644 --- a/cn-zutai/src/main/java/com/njcn/product/cnzutai/zutai/pojo/po/CsPagePO.java +++ b/cn-zutai/src/main/java/com/njcn/product/cnzutai/zutai/pojo/po/CsPagePO.java @@ -55,6 +55,9 @@ public class CsPagePO extends BaseEntity { private String status; + private Integer sort; + + public static final String COL_ID = "id"; diff --git a/cn-zutai/src/main/java/com/njcn/product/cnzutai/zutai/service/impl/CsElementServiceImpl.java b/cn-zutai/src/main/java/com/njcn/product/cnzutai/zutai/service/impl/CsElementServiceImpl.java index 9734422..4cb593d 100644 --- a/cn-zutai/src/main/java/com/njcn/product/cnzutai/zutai/service/impl/CsElementServiceImpl.java +++ b/cn-zutai/src/main/java/com/njcn/product/cnzutai/zutai/service/impl/CsElementServiceImpl.java @@ -46,7 +46,6 @@ public class CsElementServiceImpl extends ServiceImpl i .lines() .collect(Collectors.joining("\n")); List csPagePOS = JSONUtil.toList(text, CsPagePO.class); + // 倒序排列 csPagePOS.forEach(temp->{ String s = fileStorageUtil.uploadStream(writeJsonStringToInputStream(temp.getPath()), OssPath.CONFIGURATIONPATH, OssPath.CONFIGURATIONNAME); temp.setPid(pid); temp.setStatus("1"); temp.setPath(s); + temp.setCreateTime(LocalDateTime.now()); + temp.setUpdateTime(LocalDateTime.now()); this.save(temp); }); } catch (IOException e) { @@ -109,8 +114,8 @@ public class CsPagePOServiceImpl extends ServiceImpl i QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(StrUtil.isNotBlank (csPageParam.getPid()),CsPagePO.COL_PID,csPageParam.getPid()). like(StrUtil.isNotBlank (csPageParam.getSearchValue()),CsPagePO.COL_NAME,csPageParam.getSearchValue()). - eq ("status",1); - // orderByAsc(CsPagePO.COL_KID) + eq ("status",1). + orderByAsc("sort"); IPage pageData = this.page(new Page<>(csPageParam.getPageNum(), csPageParam.getPageSize()), queryWrapper);