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

提交

Browse Source
This commit is contained in:
huangzj
2023-07-25 10:46:51 +08:00
parent e5f46d1393
commit be9c6bfc46
4 changed files with 30 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RMpDevEvaluateDetailController.java
View File

@@ -75,31 +75,25 @@ public class RMpDevEvaluateDetailController extends BaseController {
/*主网*/
List<LineDevGetDTO> collect = data1.stream().map(DeptGetDeviceDTO::getDeviceList).flatMap(Collection::stream).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(collect)){
Map<String, List<LineDevGetDTO>> map = collect.stream().collect(Collectors.groupingBy(LineDevGetDTO::getDevId));
map.forEach((k, v) -> {
DeviceParam.DeviceDetail deviceDetail = new DeviceParam.DeviceDetail();
deviceDetail.setDevId(k);
List<String> lineIds = v.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
deviceDetail.setLineIds(lineIds);
deviceDetail.setUpdateTime(v.get(0).getUpdateTime()+"");
list.add(deviceDetail);
});
}
collect.forEach(temp -> {
DeviceParam.DeviceDetail deviceDetail = new DeviceParam.DeviceDetail();
deviceDetail.setDevId(temp.getDevId());
deviceDetail.setLineIds(temp.getMonitorIds());
deviceDetail.setUpdateTime(temp.getUpdateTime()+"");
list.add(deviceDetail);
});
/*配网*/
List<LineDevGetDTO> collect2 = data1.stream().map(DeptGetDeviceDTO::getPwDeviceList).flatMap(Collection::stream).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(collect2)){
Map<String, List<LineDevGetDTO>> map = collect2.stream().collect(Collectors.groupingBy(LineDevGetDTO::getDevId));
map.forEach((k, v) -> {
DeviceParam.DeviceDetail deviceDetail = new DeviceParam.DeviceDetail();
deviceDetail.setDevId(k);
List<String> lineIds = v.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
deviceDetail.setLineIds(lineIds);
deviceDetail.setUpdateTime(v.get(0).getUpdateTime()+"");
list.add(deviceDetail);
});
}
collect2.forEach(temp -> {
DeviceParam.DeviceDetail deviceDetail = new DeviceParam.DeviceDetail();
deviceDetail.setDevId(temp.getDevId());
deviceDetail.setLineIds(temp.getMonitorIds());
deviceDetail.setUpdateTime(temp.getUpdateTime()+"");
list.add(deviceDetail);
});
deviceParam.setDetailList(list);
}

36
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RStatDevSignalController.java
View File

@@ -77,31 +77,23 @@ public class RStatDevSignalController extends BaseController {
/*主网*/
List<LineDevGetDTO> collect = data1.stream().map(DeptGetDeviceDTO::getDeviceList).flatMap(Collection::stream).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(collect)){
Map<String, List<LineDevGetDTO>> map = collect.stream().collect(Collectors.groupingBy(LineDevGetDTO::getDevId));
map.forEach((k, v) -> {
DeviceParam.DeviceDetail deviceDetail = new DeviceParam.DeviceDetail();
deviceDetail.setDevId(k);
List<String> lineIds = v.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
deviceDetail.setLineIds(lineIds);
deviceDetail.setUpdateTime(v.get(0).getUpdateTime()+"");
list.add(deviceDetail);
});
}
collect.forEach(temp -> {
DeviceParam.DeviceDetail deviceDetail = new DeviceParam.DeviceDetail();
deviceDetail.setDevId(temp.getDevId());
deviceDetail.setLineIds(temp.getMonitorIds());
deviceDetail.setUpdateTime(temp.getUpdateTime()+"");
list.add(deviceDetail);
});
/*配网*/
List<LineDevGetDTO> collect2 = data1.stream().map(DeptGetDeviceDTO::getPwDeviceList).flatMap(Collection::stream).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(collect2)){
Map<String, List<LineDevGetDTO>> map = collect2.stream().collect(Collectors.groupingBy(LineDevGetDTO::getDevId));
map.forEach((k, v) -> {
DeviceParam.DeviceDetail deviceDetail = new DeviceParam.DeviceDetail();
deviceDetail.setDevId(k);
List<String> lineIds = v.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
deviceDetail.setLineIds(lineIds);
deviceDetail.setUpdateTime(v.get(0).getUpdateTime()+"");
list.add(deviceDetail);
});
}
collect2.forEach(temp -> {
DeviceParam.DeviceDetail deviceDetail = new DeviceParam.DeviceDetail();
deviceDetail.setDevId(temp.getDevId());
deviceDetail.setLineIds(temp.getMonitorIds());
deviceDetail.setUpdateTime(temp.getUpdateTime()+"");
list.add(deviceDetail);
});
deviceParam.setDetailList(list);
}
rStatDevSignalDPOService.eventdetailHandler (deviceParam);

25
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/mapping/RStatHarmonicVoltageMPOMapper.xml Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.prepare.harmonic.mapper.mysql.newalgorithm.RStatHarmonicVoltageMPOMapper">
<resultMap id="BaseResultMap" type="com.njcn.prepare.harmonic.pojo.mysql.po.RStatHarmonicVoltageMPO">
<!--@mbg.generated-->
<!--@Table r_stat_harmonic_voltage_m-->
<id column="org_no" jdbcType="VARCHAR" property="orgNo" />
<id column="data_date" jdbcType="DATE" property="dataDate" />
<id column="measurement_type_class" jdbcType="VARCHAR" property="measurementTypeClass" />
<id column="harmonic_type" jdbcType="VARCHAR" property="harmonicType" />
<id column="voltage_type" jdbcType="VARCHAR" property="voltageType" />
<id column="data_type" jdbcType="VARCHAR" property="dataType" />
<result column="over_limit_measurement_average" jdbcType="REAL" property="overLimitMeasurementAverage" />
<result column="over_limit_measurement_accrued" jdbcType="INTEGER" property="overLimitMeasurementAccrued" />
<result column="over_day" jdbcType="INTEGER" property="overDay" />
<result column="over_limit_measurement_ratio_average" jdbcType="REAL" property="overLimitMeasurementRatioAverage" />
<result column="over_limit_measurement_ratio_accrued" jdbcType="REAL" property="overLimitMeasurementRatioAccrued" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
org_no, data_date, measurement_type_class, harmonic_type, voltage_type, data_type,
over_limit_measurement_average, over_limit_measurement_accrued, over_day, over_limit_measurement_ratio_average,
over_limit_measurement_ratio_accrued
</sql>
</mapper>

1
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/RStatHarmonicVoltageMPOService.java
View File

@@ -2,7 +2,6 @@ package com.njcn.prepare.harmonic.service.mysql.newalgorithm;
import com.github.jeffreyning.mybatisplus.service.IMppService;
import com.njcn.prepare.harmonic.pojo.mysql.po.RStatHarmonicVoltageMPO;
import com.baomidou.mybatisplus.extension.service.IService;
/**
*
* Description: