diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LargeScreenParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LargeScreenParam.java index 81f765a44..a7f834575 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LargeScreenParam.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LargeScreenParam.java @@ -1,6 +1,7 @@ package com.njcn.device.pq.pojo.param; import com.njcn.common.pojo.constant.PatternRegex; +import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -15,7 +16,7 @@ import java.io.Serializable; * @date: 2023/03/20 */ @Data -public class LargeScreenParam implements Serializable { +public class LargeScreenParam extends BaseParam implements Serializable { @ApiModelProperty(name = "deptIndex", value = "部门索引", required = true) @NotBlank(message = "部门索引不可为空") diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/MiddleChildVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/MiddleChildVO.java new file mode 100644 index 000000000..08aae6c46 --- /dev/null +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/MiddleChildVO.java @@ -0,0 +1,57 @@ +package com.njcn.device.pq.pojo.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @version 1.0.0 + * @author: zbj + * @date: 2023/04/17 + */ +@Data +public class MiddleChildVO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + private String id; + + /** + * base + */ + private Float base; + + /** + * ream + */ + private Float ream; + + /** + * statusValue + */ + private Float statusValue; + + /** + * name + */ + private String name; + + /** + * ip + */ + private String ip; + + /** + * port + */ + private String port; + + /** + * comFlag + */ + private String comFlag; +} diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java index 273fc18be..ada8e31ec 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java @@ -1,7 +1,9 @@ package com.njcn.event.mapper.majornetwork; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.device.pq.pojo.vo.AllDataVO; import com.njcn.device.pq.pojo.vo.EventVO; +import com.njcn.device.pq.pojo.vo.MiddleChildVO; import com.njcn.device.pq.pojo.vo.MiddleLimitRateVO; import com.njcn.harmonic.pojo.po.PQSComAssesPO; import org.apache.ibatis.annotations.Param; @@ -28,11 +30,11 @@ public interface LargeScreenMapper { Map getDownCount (@Param("lineIds") List lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime); - List getMiddleDown (@Param("lineIds") List lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime); + List getMiddleDown (Page page,@Param("lineIds") List lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime); - List> getMiddleTerminal (@Param("deviceIds") List deviceIds, @Param("startTime") String startTime, @Param("endTime") String endTime); + List getMiddleTerminal (Page page,@Param("deviceIds") List deviceIds, @Param("startTime") String startTime, @Param("endTime") String endTime); - List getMiddleLimitRate (@Param("lineIds") List deviceIds, @Param("startTime") String startTime, @Param("endTime") String endTime); + List getMiddleLimitRate (Page page,@Param("lineIds") List deviceIds, @Param("startTime") String startTime, @Param("endTime") String endTime); List> getHomeostasisArea (@Param("indexIds") List indexIds, @Param("startTime") String startTime, @Param("endTime") String endTime); diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml index 96defa9ba..ba5659583 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml @@ -127,7 +127,7 @@ order by ed.create_time desc - SELECT pd.id, IFNULL( diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java index 35be5a530..2086f70ca 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java @@ -3,6 +3,7 @@ package com.njcn.event.service.majornetwork.Impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.device.pq.api.GeneralDeviceInfoClient; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; @@ -373,7 +374,7 @@ public class LargeScreenServiceImpl implements LargeScreenService { List generalDeviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData(); //获取所有监测点集合 List lineIds = generalDeviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList()); - return largeScreenMapper.getMiddleDown(lineIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); + return largeScreenMapper.getMiddleDown(new Page<>(largeScreenParam.getPageNum(), largeScreenParam.getPageSize()),lineIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); } /** @@ -398,25 +399,25 @@ public class LargeScreenServiceImpl implements LargeScreenService { List generalDeviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData(); //获取所有监测点集合 List deviceIds = generalDeviceDTOList.stream().flatMap(dto -> dto.getDeviceIndexes().stream()).collect(Collectors.toList()); - List> map = largeScreenMapper.getMiddleTerminal(deviceIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); + List map = largeScreenMapper.getMiddleTerminal(new Page<>(largeScreenParam.getPageNum(), largeScreenParam.getPageSize()),deviceIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); float base = 0.0f; float ream = 0.0f; float statusValue = 0.0f; float v = 0.0f; String s = ""; - for (Map stringObjectMap : map) { + for (MiddleChildVO middleChildVO : map) { MiddleTerminalVO vo = new MiddleTerminalVO(); - base = Float.parseFloat(stringObjectMap.get("base").toString()); - ream = Float.parseFloat(stringObjectMap.get("ream").toString()); - statusValue = Float.parseFloat(stringObjectMap.get("statusValue").toString()); + base = middleChildVO.getBase(); + ream = middleChildVO.getReam(); + statusValue = middleChildVO.getStatusValue(); statusValue = statusValue / 1024.0f / 1024.0f; v = statusValue / (base + ream); s = formatFloat(v); - vo.setName(stringObjectMap.get("name").toString()); - vo.setIp(stringObjectMap.get("ip").toString()); - vo.setPort(stringObjectMap.get("port").toString()); - vo.setComFlag(stringObjectMap.get("comFlag").toString()); + vo.setName(middleChildVO.getName()); + vo.setIp(middleChildVO.getIp()); + vo.setPort(middleChildVO.getPort()); + vo.setComFlag(middleChildVO.getComFlag()); vo.setProportion(s); result.add(vo); } @@ -451,7 +452,7 @@ public class LargeScreenServiceImpl implements LargeScreenService { List generalDeviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData(); //获取所有监测点集合 List lineIds = generalDeviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList()); - return largeScreenMapper.getMiddleLimitRate(lineIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); + return largeScreenMapper.getMiddleLimitRate(new Page<>(largeScreenParam.getPageNum(), largeScreenParam.getPageSize()),lineIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); }