From f27a107bba8de8f73346fe585346706608b9c560 Mon Sep 17 00:00:00 2001 From: guofeihu <3347277866@qq.com> Date: Thu, 22 Aug 2024 09:08:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9B=91=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=E6=97=B6=E6=96=B0=E5=A2=9E=E6=96=B0=E8=83=BD=E6=BA=90=E7=AB=99?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/njcn/device/pq/pojo/param/LineParam.java | 3 ++- .../src/main/java/com/njcn/device/pq/pojo/vo/LineVO.java | 3 ++- .../com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml | 2 +- .../njcn/device/pq/service/impl/NewStationServiceImpl.java | 5 ++++- .../njcn/event/pojo/param/VoltageRideThroughQueryParam.java | 3 +++ .../Impl/VoltageRideThroughEventServiceImpl.java | 4 ++-- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LineParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LineParam.java index 1ace18146..c144926ad 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LineParam.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LineParam.java @@ -188,6 +188,7 @@ public class LineParam { @ApiModelProperty(name = "updateFlag",value = "修改标识") private Integer updateFlag; - + @ApiModelProperty(name = "newStationId",value = "新能源场站信息ID") + private String newStationId; } diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineVO.java index cb8baa930..f4a8e0d7b 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineVO.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineVO.java @@ -121,6 +121,7 @@ public class LineVO implements Serializable { @ApiModelProperty(name = "sort",value = "排序",required = true) private Integer sort; - + @ApiModelProperty(name = "newStationId",value = "新能源场站信息ID") + private String newStationId; } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml index 9c6c73e30..c75d4f0a2 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml @@ -198,6 +198,6 @@ diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/NewStationServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/NewStationServiceImpl.java index 78a28ee1e..26acb686e 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/NewStationServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/NewStationServiceImpl.java @@ -2,6 +2,7 @@ package com.njcn.device.pq.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.exception.BusinessException; @@ -80,7 +81,9 @@ public class NewStationServiceImpl extends ServiceImpl lambdaUpdateWrapper = new LambdaQueryWrapper<>(); + lambdaUpdateWrapper.eq(NewStation::getId,id).eq(NewStation::getState,1); + return this.baseMapper.selectOne(lambdaUpdateWrapper); } } diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/VoltageRideThroughQueryParam.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/VoltageRideThroughQueryParam.java index d5696333a..3ddb6820c 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/VoltageRideThroughQueryParam.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/VoltageRideThroughQueryParam.java @@ -22,6 +22,9 @@ public class VoltageRideThroughQueryParam extends BaseParam { @NotBlank(message = "新能源场站不能为空") private String type; + @ApiModelProperty("1:高电压次数,2:低电压次数") + private String frequencyType; + @ApiModelProperty("监测点集合(用于后端使用)") private List lineIds; diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/VoltageRideThroughEventServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/VoltageRideThroughEventServiceImpl.java index 6f4dccc65..501a3c27a 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/VoltageRideThroughEventServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/VoltageRideThroughEventServiceImpl.java @@ -70,8 +70,8 @@ public class VoltageRideThroughEventServiceImpl implements VoltageRideThroughEve voltageRideThroughVo.setLat(area.getLat()); voltageRideThroughVo.setLng(area.getLng()); } - voltageRideThroughVo.setHighPressure(new Random().nextInt()+1+""); - voltageRideThroughVo.setLowPressure(new Random().nextInt()+1+""); + voltageRideThroughVo.setHighPressure((int) (Math.random() * 100 + 1)+""); + voltageRideThroughVo.setLowPressure((int) (Math.random() * 100 + 1)+""); //开始计算每个地区高低压穿越次数 //获取当前部门下所有的监测点(当然也会根据选择的新能源场站类型进行过滤) List lineIds = deptLineFeignClient.getLineByDeptIdAndNewStation(deptDTO.getId(),voltageRideThroughQueryParam.getType()).getData();