From 1cc3ce4c3b442c4ac39cf417a1f6c2ec32a1a2c6 Mon Sep 17 00:00:00 2001 From: zhangbaojian <1065122561@qq.com> Date: Fri, 14 Apr 2023 15:16:47 +0800 Subject: [PATCH] =?UTF-8?q?zbj//1.=E5=8A=9F=E7=8E=87=E8=B4=9F=E8=8D=B7?= =?UTF-8?q?=E6=8E=92=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pq/pojo/param/LargeScreenParam.java | 2 ++ .../njcn/device/pq/pojo/vo/PowerOrderVO.java | 35 +++++++++++++++++++ .../controller/PqsTerminalLogsController.java | 1 - .../pq/mapper/PqsTerminalLogsMapper.java | 2 -- .../pq/service/IPqsTerminalLogsService.java | 1 - .../impl/PqsTerminalLogsServiceImpl.java | 3 -- .../majornetwork/LargeScreenController.java | 13 +++++++ .../majornetwork/LargeScreenMapper.java | 4 +++ .../mapping/LargeScreenMapper.xml | 15 ++++++++ .../majornetwork/LargeScreenService.java | 1 + .../impl/LargeScreenServiceImpl.java | 8 +++++ 11 files changed, 78 insertions(+), 7 deletions(-) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/PowerOrderVO.java 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 3f64cf1ff..81f765a44 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 @@ -29,4 +29,6 @@ public class LargeScreenParam implements Serializable { @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误") private String searchEndTime; + @ApiModelProperty("返回条数") + private Integer limit; } \ No newline at end of file diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/PowerOrderVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/PowerOrderVO.java new file mode 100644 index 000000000..cc61b68d6 --- /dev/null +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/PowerOrderVO.java @@ -0,0 +1,35 @@ +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/14 + */ +@Data +public class PowerOrderVO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 名称 + */ + @ApiModelProperty("名称") + private String name; + + /** + * 功率最大值 + */ + @ApiModelProperty("功率最大值") + private String max; + + /** + * id + */ + @ApiModelProperty("id") + private String id; +} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqsTerminalLogsController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqsTerminalLogsController.java index a3d230f58..b301edf60 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqsTerminalLogsController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqsTerminalLogsController.java @@ -6,7 +6,6 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; -import com.njcn.device.pq.pojo.param.DeviceLogParam; import com.njcn.device.pq.pojo.param.LogsListParam; import com.njcn.device.pq.pojo.po.PqsTerminalLogs; import com.njcn.device.pq.pojo.vo.LogsListVO; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/PqsTerminalLogsMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/PqsTerminalLogsMapper.java index d3fe735a3..918742c31 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/PqsTerminalLogsMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/PqsTerminalLogsMapper.java @@ -2,13 +2,11 @@ package com.njcn.device.pq.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.device.pq.pojo.param.LogsListParam; import com.njcn.device.pq.pojo.po.PqsTerminalLogs; import com.njcn.device.pq.pojo.vo.LogsListVO; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import java.util.List; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IPqsTerminalLogsService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IPqsTerminalLogsService.java index d88e003f7..2fd10bede 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IPqsTerminalLogsService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IPqsTerminalLogsService.java @@ -1,7 +1,6 @@ package com.njcn.device.pq.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.device.pq.pojo.param.DeviceLogParam; import com.njcn.device.pq.pojo.param.LogsListParam; import com.njcn.device.pq.pojo.po.PqsTerminalLogs; import com.njcn.device.pq.pojo.vo.LogsListVO; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsTerminalLogsServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsTerminalLogsServiceImpl.java index b9ada8787..e61fcaf2c 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsTerminalLogsServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsTerminalLogsServiceImpl.java @@ -1,7 +1,5 @@ package com.njcn.device.pq.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.device.pq.mapper.PqsTerminalLogsMapper; import com.njcn.device.pq.pojo.param.LogsListParam; @@ -11,7 +9,6 @@ import com.njcn.device.pq.service.IPqsTerminalLogsService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.List; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/LargeScreenController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/LargeScreenController.java index 85655816b..48024d26d 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/LargeScreenController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/LargeScreenController.java @@ -62,4 +62,17 @@ public class LargeScreenController extends BaseController { List result = largeScreenService.getHomeostasisLoad(largeScreenParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } + + /** + * 功率负荷排名 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getPowerOrder") + @ApiOperation("功率负荷排名") + @ApiImplicitParam(name = "largeScreenParam", value = "功率负荷排名", required = true) + public HttpResult> getPowerOrder(@RequestBody @Validated LargeScreenParam largeScreenParam) { + String methodDescribe = getMethodDescribe("getHomeostasisLoad"); + List result = largeScreenService.getPowerOrder(largeScreenParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java index da298fc48..6a1e76828 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java @@ -1,5 +1,7 @@ package com.njcn.harmonic.mapper.majornetwork; +import com.njcn.device.pq.pojo.param.LargeScreenParam; +import com.njcn.device.pq.pojo.vo.PowerOrderVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,4 +18,6 @@ public interface LargeScreenMapper { List> getHomeostasisLoad (@Param("indexIds") List indexIds, @Param("startTime") String startTime, @Param("endTime") String endTime); + List getPowerOrder (LargeScreenParam largeScreenParam); + } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/LargeScreenMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/LargeScreenMapper.xml index ed1e33a9e..e1ace2e13 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/LargeScreenMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/LargeScreenMapper.xml @@ -41,4 +41,19 @@ group by rshom.measurement_type_class + + + diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/LargeScreenService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/LargeScreenService.java index fc6c8df37..a57a49c9b 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/LargeScreenService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/LargeScreenService.java @@ -17,4 +17,5 @@ public interface LargeScreenService { List getHomeostasisLoad(LargeScreenParam largeScreenParam); + List getPowerOrder(LargeScreenParam largeScreenParam); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/LargeScreenServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/LargeScreenServiceImpl.java index f5c8f9981..d0789b3d8 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/LargeScreenServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/LargeScreenServiceImpl.java @@ -1,5 +1,6 @@ package com.njcn.harmonic.service.majornetwork.impl; +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; @@ -135,4 +136,11 @@ public class LargeScreenServiceImpl implements LargeScreenService { return result; } + /** + * 功率负荷排名 + */ + @Override + public List getPowerOrder(LargeScreenParam largeScreenParam) { + return largeScreenMapper.getPowerOrder(largeScreenParam); + } }