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

问题单修复

Browse Source
This commit is contained in:
zhuxinyu
2023-04-14 13:42:12 +08:00
parent 249b1cf025
commit 4490758e8a
12 changed files with 379 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalMaintainMapper.java
View File

@@ -1,7 +1,6 @@
package com.njcn.device.pq.mapper;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.device.pq.pojo.vo.LineFlowMealDetailVO;
import com.njcn.device.pq.pojo.vo.TerminalDaliyFlowVO;
import com.njcn.device.pq.pojo.vo.TerminalMaintainVO;
@@ -23,7 +22,7 @@ public interface TerminalMaintainMapper {
* @author cdf
* @date 2022/5/11
*/
List<TerminalMaintainVO> getTerminalDevInfo(@Param("devIds")List<String> devIds);
List<TerminalMaintainVO> getTerminalDevInfo(@Param("devIds") List<String> devIds, @Param("comFlag") Integer comFlag, @Param("devType") String devType);
/**
* 获取区域

12
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml
View File

@@ -30,6 +30,12 @@ FROM
<foreach collection="devIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
<if test="comFlag != null">
AND b.Com_Flag=#{comFlag}
</if>
<if test="devType !=null and devType != ''">
AND b.Dev_Type =#{devType}
</if>
</select>
<select id="getGdAndSubList" resultType="TerminalMaintainVO">
@@ -56,7 +62,11 @@ FROM
</select>
<select id="getPqLineGdAndSubList" resultType="TerminalMaintainVO">
select a.id,a.name,a.level,a.pid from pq_line a
select a.id,
a.name,
a.level,
a.pid
from pq_line a
where a.id in
<foreach collection="ids" item="item" open="(" close=")" separator=",">
#{item}

1
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalOnlineRateDataMapper.xml
View File

@@ -30,6 +30,7 @@
device.id,
device.pid,
device.`Name`,
device.`Name` AS dataName,
device.`Level`,
device.Sort,
pdevice.ip,

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

@@ -90,19 +90,21 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
if (CollectionUtils.isEmpty(devIds)) {
continue;
}
TerminalMaintainVO terminalMaintainVO = new TerminalMaintainVO();
terminalMaintainVO.setName(generalDeviceDTO.getName());
terminalMaintainVO.setId(generalDeviceDTO.getIndex());
terminalMaintainVO.setLevel(1);
List<TerminalMaintainVO> devList = terminalMaintainMapper.getTerminalDevInfo(devIds);
List<TerminalMaintainVO> subList = terminalMaintainMapper.getPqLineGdAndSubList(generalDeviceDTO.getSubIndexes());
List<TerminalMaintainVO> gdList = terminalMaintainMapper.getPqLineGdAndSubList(generalDeviceDTO.getGdIndexes());
dealTerminalData(subList, devList);
dealTerminalData(gdList, subList);
terminalMaintainVO.setChildren(gdList);
List<TerminalMaintainVO> devList = terminalMaintainMapper.getTerminalDevInfo(devIds,terminalMainQueryParam.getComFlag(),terminalMainQueryParam.getDevType());
if (CollectionUtil.isEmpty(devList)) {
continue;
}
List<String> subIndexes = devList.stream().map(TerminalMaintainVO::getPid).collect(Collectors.toList());
List<TerminalMaintainVO> subList1 = terminalMaintainMapper.getPqLineGdAndSubList(subIndexes);
List<String> gdIndexes = subList1.stream().map(TerminalMaintainVO::getPid).collect(Collectors.toList());
List<TerminalMaintainVO> gdList1 = terminalMaintainMapper.getPqLineGdAndSubList(gdIndexes);
dealTerminalData(subList1, devList);
dealTerminalData(gdList1, subList1);
terminalMaintainVO.setChildren(gdList1);
resList.add(terminalMaintainVO);
}
}