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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wurui
2023-03-22 14:56:47 +08:00
parent 45297ec121 eb6c6fa85b
commit 37b67263cd
12 changed files with 80 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/AlarmParam.java
View File

@@ -16,7 +16,7 @@ import javax.validation.constraints.NotBlank;
*/
@Data
@ApiModel
public class AlarmParam {
public class AlarmParam extends BaseParam{
@NotBlank(message = "起始时间不可为空")
@DateTimeStrValid
@@ -45,12 +45,4 @@ public class AlarmParam {
@ApiModelProperty(name = "processTime",value = "处理时间")
private String processTime;
@ApiModelProperty("页码")
private Integer pageNum;
@ApiModelProperty("页面尺寸")
private Integer pageSize;
}

1
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalAlarmVO.java
View File

@@ -20,6 +20,7 @@ import java.time.LocalDateTime;
public class TerminalAlarmVO implements Serializable {
// 变电站
private String subName;
private String lineGrade;

22
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LargeScreenController.java
View File

@@ -1,12 +1,10 @@
package com.njcn.device.pq.controller;
import cn.hutool.core.collection.CollectionUtil;
import com.njcn.common.pojo.annotation.OperateInfo;
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.dto.GeneralDeviceDTO;
import com.njcn.device.pq.pojo.param.LargeScreenParam;
import com.njcn.device.pq.pojo.vo.MonitoringPointScaleVO;
import com.njcn.device.pq.service.LargeScreenService;
@@ -22,9 +20,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Objects;
/**
* @version 1.0.0
* @author: zbj
@@ -44,11 +39,24 @@ public class LargeScreenController extends BaseController {
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getMonitoringPointScale")
@ApiOperation("监测点规模")
@ApiImplicitParam(name = "largeScreenParam", value = "查询终端条件", required = true)
@ApiOperation("监测点规模(区域)")
@ApiImplicitParam(name = "largeScreenParam", value = "监测点规模(区域)", required = true)
public HttpResult<MonitoringPointScaleVO> getMonitoringPointScale(@RequestBody @Validated LargeScreenParam largeScreenParam) {
String methodDescribe = getMethodDescribe("getMonitoringPointScale");
MonitoringPointScaleVO result = largeScreenService.getMonitoringPointScale(largeScreenParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
/**
* 监测点规模
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getLoadType")
@ApiOperation("监测点规模(负荷类型)")
@ApiImplicitParam(name = "getLoadType", value = "监测点规模(负荷类型)", required = true)
public HttpResult<MonitoringPointScaleVO> getLoadType(@RequestBody @Validated LargeScreenParam largeScreenParam) {
String methodDescribe = getMethodDescribe("getLoadType");
MonitoringPointScaleVO result = largeScreenService.getLoadType(largeScreenParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
}

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmMapper.xml
View File

@@ -64,7 +64,7 @@ FROM
f.NAME type,
f.id typeId,
f.`Level`,
max( a.Occurred_Time ) occurredTime,
max(a.Occurred_Time) occurredTime,
e.NAME subName,
b.NAME devLineName,
b.id devLineId,

3
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LargeScreenService.java
View File

@@ -1,10 +1,8 @@
package com.njcn.device.pq.service;
import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
import com.njcn.device.pq.pojo.param.LargeScreenParam;
import com.njcn.device.pq.pojo.vo.MonitoringPointScaleVO;
import java.util.List;
/**
* @version 1.0.0
@@ -15,4 +13,5 @@ public interface LargeScreenService {
MonitoringPointScaleVO getMonitoringPointScale(LargeScreenParam largeScreenParam);
MonitoringPointScaleVO getLoadType(LargeScreenParam largeScreenParam);
}

38
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LargeScreenServiceImpl.java
View File

@@ -2,7 +2,6 @@ package com.njcn.device.pq.service.impl;
import com.njcn.common.pojo.dto.SimpleDTO;
import com.njcn.device.pq.mapper.LargeScreenMapper;
import com.njcn.device.pq.mapper.LineIntegrityDataMapper;
import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
import com.njcn.device.pq.pojo.param.DeviceInfoParam;
import com.njcn.device.pq.pojo.param.LargeScreenParam;
@@ -37,7 +36,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
private final LargeScreenMapper largeScreenMapper;
/**
* 监测点规模
* 监测点规模(区域)
*/
@Override
public MonitoringPointScaleVO getMonitoringPointScale(LargeScreenParam largeScreenParam) {
@@ -49,7 +48,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
deviceInfoParam.setDeptIndex(largeScreenParam.getDeptIndex());
//统计类型
SimpleDTO simpleDTO = new SimpleDTO();
simpleDTO.setName(String.valueOf(StatisticsEnum.POWER_NETWORK));
simpleDTO.setCode(String.valueOf(StatisticsEnum.POWER_NETWORK));
deviceInfoParam.setStatisticalType(simpleDTO);
//添加时间
deviceInfoParam.setSearchBeginTime(largeScreenParam.getSearchBeginTime());
@@ -72,4 +71,37 @@ public class LargeScreenServiceImpl implements LargeScreenService {
result.setMonitorAddCount(count.get("count").toString());
return result;
}
/**
* 监测点规模(负荷类型)
*/
@Override
public MonitoringPointScaleVO getLoadType(LargeScreenParam largeScreenParam) {
//创建返回VO
MonitoringPointScaleVO result = new MonitoringPointScaleVO();
ArrayList<MonitoringPointScaleParam> list = new ArrayList<>();
DeviceInfoParam.BusinessParam deviceInfoParam = new DeviceInfoParam.BusinessParam();
//部门索引
deviceInfoParam.setDeptIndex(largeScreenParam.getDeptIndex());
//统计类型
SimpleDTO simpleDTO = new SimpleDTO();
simpleDTO.setCode(String.valueOf(StatisticsEnum.LOAD_TYPE));
deviceInfoParam.setStatisticalType(simpleDTO);
//添加时间
deviceInfoParam.setSearchBeginTime(largeScreenParam.getSearchBeginTime());
deviceInfoParam.setSearchEndTime(largeScreenParam.getSearchEndTime());
// 获取所有数据
List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, Stream.of(0).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList()));
for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) {
MonitoringPointScaleParam param = new MonitoringPointScaleParam();
param.setIndex(generalDeviceDTO.getIndex());
param.setName(generalDeviceDTO.getName());
param.setCount(generalDeviceDTO.getLineIndexes().size());
list.add(param);
}
result.setParam(list);
return result;
}
}

6
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
View File

@@ -401,12 +401,6 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
if (CollectionUtils.isEmpty(deviceIndexes)) {
continue;
}
// 监测点流量统计
// deviceList = lineMapper.getNewDeviceRunStatistics(lineIndexes,
// DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())),
// DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime())),
// (deviceInfoParam.getPageNum()-1)*deviceInfoParam.getPageSize(),
// deviceInfoParam.getPageSize());
page = lineMapper.getNewDeviceRunStatistics(
new Page(deviceInfoParam.getPageNum(), deviceInfoParam.getPageSize()),

16
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalAlarmServiceImpl.java
View File

@@ -29,19 +29,9 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService {
@Override
public Page<TerminalAlarmVO> alarmList(AlarmParam alarmParam) {
String sql = "SELECT last(dev_line_type) as dev_line_type,line_id ,type FROM pqs_alarm group by type,line_id,dev_line_type";
//Page<TerminalAlarmVO> page = new Page<>(PageFactory.getPageNum(alarmParam),PageFactory.getPageSize(alarmParam));
//return alarmMapper.getAlarmInfo(page,PubUtils.beginTimeToLocalDateTime(alarmParam.getStartTime()),PubUtils.endTimeToLocalDateTime(alarmParam.getEndTime()),alarmParam.getFlag(),alarmParam.getType(),alarmParam.getAlarmLevel(),alarmParam.getLineGrade());
return null;
// String sql = "SELECT last(dev_line_type) as dev_line_type,line_id ,type FROM pqs_alarm group by type,line_id,dev_line_type";
Page<TerminalAlarmVO> page = new Page<>(PageFactory.getPageNum(alarmParam),PageFactory.getPageSize(alarmParam));
return alarmMapper.getAlarmInfo(page,PubUtils.beginTimeToLocalDateTime(alarmParam.getStartTime()),PubUtils.endTimeToLocalDateTime(alarmParam.getEndTime()),alarmParam.getFlag(),alarmParam.getType(),alarmParam.getAlarmLevel(),alarmParam.getLineGrade());
}
@Override