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

zbj//1.大屏中间三个接口增加总条数返回字段

Browse Source
This commit is contained in:
zhangbaojian
2023-04-18 14:00:42 +08:00
parent 20c5ebcbc7
commit 3a1f1f9795
8 changed files with 229 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java
View File

@@ -357,7 +357,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
* 大屏中间暂态
*/
@Override
public List<EventVO> getMiddleDown(LargeScreenParam largeScreenParam) {
public EventListVO getMiddleDown(LargeScreenParam largeScreenParam) {
DeviceInfoParam.BusinessParam deviceInfoParam = new DeviceInfoParam.BusinessParam();
//部门索引
deviceInfoParam.setDeptIndex(largeScreenParam.getDeptIndex());
@@ -374,14 +374,20 @@ public class LargeScreenServiceImpl implements LargeScreenService {
List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData();
//获取所有监测点集合
List<String> lineIds = generalDeviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList());
return largeScreenMapper.getMiddleDown(new Page<>(largeScreenParam.getPageNum(), largeScreenParam.getPageSize()),lineIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
List<EventVO> eventVOS = largeScreenMapper.getMiddleDown(new Page<>(largeScreenParam.getPageNum(), largeScreenParam.getPageSize()), lineIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
//获取没分页前的总数据
List<EventVO> chind = largeScreenMapper.getMiddleDownChind(lineIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
EventListVO listVO = new EventListVO();
listVO.setList(eventVOS);
listVO.setSize(chind.size());
return listVO;
}
/**
* 大屏中间终端异常信息
*/
@Override
public List<MiddleTerminalVO> getMiddleTerminal(LargeScreenParam largeScreenParam) {
public MiddleTerminalListVO getMiddleTerminal(LargeScreenParam largeScreenParam) {
//创建返回VO
List<MiddleTerminalVO> result = new ArrayList<>();
DeviceInfoParam.BusinessParam deviceInfoParam = new DeviceInfoParam.BusinessParam();
@@ -399,7 +405,9 @@ public class LargeScreenServiceImpl implements LargeScreenService {
List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData();
//获取所有监测点集合
List<String> deviceIds = generalDeviceDTOList.stream().flatMap(dto -> dto.getDeviceIndexes().stream()).collect(Collectors.toList());
List<MiddleChildVO> map = largeScreenMapper.getMiddleTerminal(new Page<>(largeScreenParam.getPageNum(), largeScreenParam.getPageSize()),deviceIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
List<MiddleChildVO> map = largeScreenMapper.getMiddleTerminal(new Page<>(largeScreenParam.getPageNum(), largeScreenParam.getPageSize()), deviceIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
//获取没分页前的总数据
List<MiddleChildVO> child = largeScreenMapper.getMiddleTerminalChild(deviceIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
float base = 0.0f;
float ream = 0.0f;
@@ -421,7 +429,10 @@ public class LargeScreenServiceImpl implements LargeScreenService {
vo.setProportion(s);
result.add(vo);
}
return result;
MiddleTerminalListVO listVO = new MiddleTerminalListVO();
listVO.setList(result);
listVO.setSize(child.size());
return listVO;
}
public static String formatFloat(Float value) {
@@ -436,7 +447,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
* 大屏中间稳态越线信息
*/
@Override
public List<MiddleLimitRateVO> getMiddleLimitRate(LargeScreenParam largeScreenParam) {
public MiddleLimitRateListVO getMiddleLimitRate(LargeScreenParam largeScreenParam) {
DeviceInfoParam.BusinessParam deviceInfoParam = new DeviceInfoParam.BusinessParam();
//部门索引
deviceInfoParam.setDeptIndex(largeScreenParam.getDeptIndex());
@@ -452,7 +463,13 @@ public class LargeScreenServiceImpl implements LargeScreenService {
List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData();
//获取所有监测点集合
List<String> lineIds = generalDeviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList());
return largeScreenMapper.getMiddleLimitRate(new Page<>(largeScreenParam.getPageNum(), largeScreenParam.getPageSize()),lineIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
List<MiddleLimitRateVO> middleLimitRate = largeScreenMapper.getMiddleLimitRate(new Page<>(largeScreenParam.getPageNum(), largeScreenParam.getPageSize()), lineIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
//获取没分页前的总数据
List<MiddleLimitRateVO> child = largeScreenMapper.getMiddleLimitRateChild(lineIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
MiddleLimitRateListVO listVO = new MiddleLimitRateListVO();
listVO.setList(middleLimitRate);
listVO.setSize(child.size());
return listVO;
}

6
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/LargeScreenService.java
View File

@@ -25,11 +25,11 @@ public interface LargeScreenService {
List<AllDataVO> getAllData(LargeScreenParam largeScreenParam);
List<EventVO> getMiddleDown(LargeScreenParam largeScreenParam);
EventListVO getMiddleDown(LargeScreenParam largeScreenParam);
List<MiddleTerminalVO> getMiddleTerminal(LargeScreenParam largeScreenParam);
MiddleTerminalListVO getMiddleTerminal(LargeScreenParam largeScreenParam);
List<MiddleLimitRateVO> getMiddleLimitRate(LargeScreenParam largeScreenParam);
MiddleLimitRateListVO getMiddleLimitRate(LargeScreenParam largeScreenParam);
List<PQSComAssesPO> getComAccessData(List<String> lineIndexes, String searchBeginTime, String searchEndTime);