diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/EventListVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/EventListVO.java new file mode 100644 index 000000000..4be42d7fb --- /dev/null +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/EventListVO.java @@ -0,0 +1,30 @@ +package com.njcn.device.pq.pojo.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @version 1.0.0 + * @author: zbj + * @date: 2023/04/18 + */ +@Data +public class EventListVO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 结果集合 + */ + @ApiModelProperty("结果集合") + private List list; + + /** + * 总次数 + */ + @ApiModelProperty("总次数") + private Integer size; +} diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/MiddleLimitRateListVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/MiddleLimitRateListVO.java new file mode 100644 index 000000000..74581bb56 --- /dev/null +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/MiddleLimitRateListVO.java @@ -0,0 +1,30 @@ +package com.njcn.device.pq.pojo.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @version 1.0.0 + * @author: zbj + * @date: 2023/04/18 + */ +@Data +public class MiddleLimitRateListVO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 结果集合 + */ + @ApiModelProperty("结果集合") + private List list; + + /** + * 总次数 + */ + @ApiModelProperty("总次数") + private Integer size; +} diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/MiddleTerminalListVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/MiddleTerminalListVO.java new file mode 100644 index 000000000..a83692f64 --- /dev/null +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/MiddleTerminalListVO.java @@ -0,0 +1,31 @@ +package com.njcn.device.pq.pojo.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @version 1.0.0 + * @author: zbj + * @date: 2023/04/18 + */ +@Data +public class MiddleTerminalListVO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 结果集合 + */ + @ApiModelProperty("结果集合") + private List list; + + /** + * 总次数 + */ + @ApiModelProperty("总次数") + private Integer size; + +} diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/LargeScreenController.java b/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/LargeScreenController.java index 950a0bedf..7a5eb1492 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/LargeScreenController.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/LargeScreenController.java @@ -109,9 +109,9 @@ public class LargeScreenController extends BaseController { @PostMapping("/getMiddleDown") @ApiOperation("大屏中间暂态") @ApiImplicitParam(name = "largeScreenParam", value = "大屏中间暂态", required = true) - public HttpResult> getMiddleDown(@RequestBody @Validated LargeScreenParam largeScreenParam) { + public HttpResult getMiddleDown(@RequestBody @Validated LargeScreenParam largeScreenParam) { String methodDescribe = getMethodDescribe("getMiddleDown"); - List result = largeScreenService.getMiddleDown(largeScreenParam); + EventListVO result = largeScreenService.getMiddleDown(largeScreenParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } @@ -122,9 +122,9 @@ public class LargeScreenController extends BaseController { @PostMapping("/getMiddleTerminal") @ApiOperation("大屏中间终端异常信息") @ApiImplicitParam(name = "largeScreenParam", value = "大屏中间终端异常信息", required = true) - public HttpResult> getMiddleTerminal(@RequestBody @Validated LargeScreenParam largeScreenParam) { + public HttpResult getMiddleTerminal(@RequestBody @Validated LargeScreenParam largeScreenParam) { String methodDescribe = getMethodDescribe("getMiddleTerminal"); - List result = largeScreenService.getMiddleTerminal(largeScreenParam); + MiddleTerminalListVO result = largeScreenService.getMiddleTerminal(largeScreenParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } @@ -135,9 +135,9 @@ public class LargeScreenController extends BaseController { @PostMapping("/getMiddleLimitRate") @ApiOperation("大屏中间稳态越线信息") @ApiImplicitParam(name = "largeScreenParam", value = "大屏中间稳态越线信息", required = true) - public HttpResult> getMiddleLimitRate(@RequestBody @Validated LargeScreenParam largeScreenParam) { + public HttpResult getMiddleLimitRate(@RequestBody @Validated LargeScreenParam largeScreenParam) { String methodDescribe = getMethodDescribe("getMiddleLimitRate"); - List result = largeScreenService.getMiddleLimitRate(largeScreenParam); + MiddleLimitRateListVO result = largeScreenService.getMiddleLimitRate(largeScreenParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } } 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 ada8e31ec..52cd46660 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 @@ -32,10 +32,16 @@ public interface LargeScreenMapper { List getMiddleDown (Page page,@Param("lineIds") List lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime); + List getMiddleDownChind (@Param("lineIds") List lineIds, @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 getMiddleTerminalChild (@Param("deviceIds") 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 getMiddleLimitRateChild (@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 ba5659583..a93710cfe 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 @@ -108,11 +108,14 @@ + + + + + + + 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 2086f70ca..d76b49155 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 @@ -357,7 +357,7 @@ public class LargeScreenServiceImpl implements LargeScreenService { * 大屏中间暂态 */ @Override - public List 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 generalDeviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData(); //获取所有监测点集合 List 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 eventVOS = largeScreenMapper.getMiddleDown(new Page<>(largeScreenParam.getPageNum(), largeScreenParam.getPageSize()), lineIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); + //获取没分页前的总数据 + List chind = largeScreenMapper.getMiddleDownChind(lineIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); + EventListVO listVO = new EventListVO(); + listVO.setList(eventVOS); + listVO.setSize(chind.size()); + return listVO; } /** * 大屏中间终端异常信息 */ @Override - public List getMiddleTerminal(LargeScreenParam largeScreenParam) { + public MiddleTerminalListVO getMiddleTerminal(LargeScreenParam largeScreenParam) { //创建返回VO List result = new ArrayList<>(); DeviceInfoParam.BusinessParam deviceInfoParam = new DeviceInfoParam.BusinessParam(); @@ -399,7 +405,9 @@ 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(new Page<>(largeScreenParam.getPageNum(), largeScreenParam.getPageSize()),deviceIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); + List map = largeScreenMapper.getMiddleTerminal(new Page<>(largeScreenParam.getPageNum(), largeScreenParam.getPageSize()), deviceIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); + //获取没分页前的总数据 + List 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 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 generalDeviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData(); //获取所有监测点集合 List 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 middleLimitRate = largeScreenMapper.getMiddleLimitRate(new Page<>(largeScreenParam.getPageNum(), largeScreenParam.getPageSize()), lineIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); + //获取没分页前的总数据 + List child = largeScreenMapper.getMiddleLimitRateChild(lineIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); + MiddleLimitRateListVO listVO = new MiddleLimitRateListVO(); + listVO.setList(middleLimitRate); + listVO.setSize(child.size()); + return listVO; } diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/LargeScreenService.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/LargeScreenService.java index 18214b37b..0d211e4e7 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/LargeScreenService.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/LargeScreenService.java @@ -25,11 +25,11 @@ public interface LargeScreenService { List getAllData(LargeScreenParam largeScreenParam); - List getMiddleDown(LargeScreenParam largeScreenParam); + EventListVO getMiddleDown(LargeScreenParam largeScreenParam); - List getMiddleTerminal(LargeScreenParam largeScreenParam); + MiddleTerminalListVO getMiddleTerminal(LargeScreenParam largeScreenParam); - List getMiddleLimitRate(LargeScreenParam largeScreenParam); + MiddleLimitRateListVO getMiddleLimitRate(LargeScreenParam largeScreenParam); List getComAccessData(List lineIndexes, String searchBeginTime, String searchEndTime);