Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码提交

Browse Source
This commit is contained in:
huangzj
2023-10-25 19:56:54 +08:00
parent 83936e0029
commit 715f73ca2f
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppLineTopologyDiagramMapper.xml
View File

@@ -18,11 +18,13 @@
</sql> </sql>
<select id="queryByTopoId" resultType="com.njcn.csdevice.pojo.vo.AppLineTopologyDiagramVO"> <select id="queryByTopoId" resultType="com.njcn.csdevice.pojo.vo.AppLineTopologyDiagramVO">
select a.*,b.position linePostion from cs_line_topology_diagram a LEFT JOIN cs_line b on a.line_id=b.line_id where a.id=#{id} select a.*,b.position linePostion from cs_line_topology_diagram a LEFT JOIN cs_line b on a.line_id=b.line_id where a.status="1" and b.status="1" and a.id=#{id}
</select> </select>
<select id="queryByLineIds" resultType="com.njcn.csdevice.pojo.vo.AppLineTopologyDiagramVO"> <select id="queryByLineIds" resultType="com.njcn.csdevice.pojo.vo.AppLineTopologyDiagramVO">
select a.*,b.position linePostion,b.name name from cs_line_topology_diagram a LEFT JOIN cs_line b on a.line_id=b.line_id where a.line_id in select a.*,b.position linePostion,b.name name from cs_line_topology_diagram a LEFT JOIN cs_line b on a.line_id=b.line_id where
a.status="1" and b.status="1" and
a.line_id in
<foreach collection='lineIds' item='item' index="index" open='(' separator=',' close=')'> <foreach collection='lineIds' item='item' index="index" open='(' separator=',' close=')'>
#{item} #{item}
</foreach> </foreach>

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java
View File

@@ -49,7 +49,7 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
if(CollectionUtil.isEmpty(csPairList)){ if(CollectionUtil.isEmpty(csPairList)){
return new ArrayList<>(); return new ArrayList<>();
} }
List<CsLinePO> csLinePOS = this.listByIds(csPairList); List<CsLinePO> csLinePOS = this.lambdaQuery().in(CsLinePO::getLineId,csPairList).eq(CsLinePO::getStatus,1).list();
csLinePOS.forEach(temp->temp.setDevId(devId)); csLinePOS.forEach(temp->temp.setDevId(devId));
return csLinePOS; return csLinePOS;
} }

2
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java
View File

@@ -191,7 +191,7 @@ public class StableDataServiceImpl implements StableDataService {
String areaId = dicDataFeignClient.getDicDataByCode(DicDataEnum.OUTPUT_SIDE.getCode()).getData().getId(); String areaId = dicDataFeignClient.getDicDataByCode(DicDataEnum.OUTPUT_SIDE.getCode()).getData().getId();
Optional.ofNullable(csLinePOList).orElseThrow(()-> new BusinessException(AlgorithmResponseEnum.LINE_DATA_ERROR)); Optional.ofNullable(csLinePOList).orElseThrow(()-> new BusinessException(AlgorithmResponseEnum.LINE_DATA_ERROR));
collect = csLinePOList.stream().filter(temp->Objects.equals(areaId,temp.getPosition())).map(CsLinePO::getLineId).collect(Collectors.toList()); collect = csLinePOList.stream().filter(temp->Objects.equals(areaId,temp.getPosition())).map(CsLinePO::getLineId).distinct().collect(Collectors.toList());