From 2f1e899be7d95b96de54a68c8359807e12fd8c45 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Wed, 14 Aug 2024 14:04:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E5=80=BC=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E4=B8=BA=E4=B8=80=E6=AC=A1=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../csdevice/pojo/vo/DeviceManagerVO.java | 3 + .../equipment/CsGroupController.java | 5 +- .../csdevice/service/ICsGroupService.java | 2 +- .../impl/CsEquipmentDeliveryServiceImpl.java | 2 + .../service/impl/CsGroupServiceImpl.java | 94 +++++++++++++++++-- .../param/DevicDataTrendQueryParam.java | 3 + .../handler/MqttMessageHandler.java | 8 ++ .../impl/DeviceDataTrendServiceImpl.java | 56 ++++++++--- 8 files changed, 152 insertions(+), 21 deletions(-) diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerVO.java index 51ba627..ac26632 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerVO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerVO.java @@ -39,6 +39,9 @@ public class DeviceManagerVO { @ApiModelProperty(value = "装置数据集集合") private List dataSetList; + @ApiModelProperty(value = "装置数据标识") + private String dataLevel; + @Data public static class DataSetVO { @ApiModelProperty(value = "数据集Id") diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroupController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroupController.java index be015ee..2b9c546 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroupController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroupController.java @@ -61,10 +61,11 @@ public class CsGroupController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "页面尺寸", required = true), @ApiImplicitParam(name = "lineId", value = "监测点id", required = true), @ApiImplicitParam(name = "searchValue", value = "搜索值", required = true), + @ApiImplicitParam(name = "dataLevel", value = "数据标志", required = true) }) - public HttpResult> getDeviceRtData(@RequestParam("id") String id, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, @RequestParam(value = "lineId")String lineId, @RequestParam(value = "searchValue") String searchValue){ + public HttpResult> getDeviceRtData(@RequestParam("id") String id, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, @RequestParam(value = "lineId")String lineId, @RequestParam(value = "searchValue") String searchValue, @RequestParam(value = "dataLevel",required = false) String dataLevel){ String methodDescribe = getMethodDescribe("getDeviceRtData"); - IPage list = csGroupService.getDeviceRtData(id, pageNum, pageSize,lineId,searchValue); + IPage list = csGroupService.getDeviceRtData(id, pageNum, pageSize,lineId,searchValue,dataLevel); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsGroupService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsGroupService.java index 17089a2..90b06b7 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsGroupService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsGroupService.java @@ -34,7 +34,7 @@ public interface ICsGroupService extends IService { * 获取装置分组后的实时数据 * @return */ - IPage getDeviceRtData(String id, Integer pageNum, Integer pageSize, String lineId, String searchValue); + IPage getDeviceRtData(String id, Integer pageNum, Integer pageSize, String lineId, String searchValue, String dataLevel); /** * 获取装置时间范围内的历史数据 diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java index 5689bf8..216cdd9 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java @@ -349,6 +349,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl impl } @Override - public IPage getDeviceRtData(String id, Integer pageNum, Integer pageSize, String lineId, String searchValue) { + public IPage getDeviceRtData(String id, Integer pageNum, Integer pageSize, String lineId, String searchValue, String dataLevel) { IPage pageTurn = new Page<>(); List arrayList = new ArrayList<>(); IPage pageRes = csGroupMapper.getGroupDataList(new Page<>(pageNum, pageSize),id,searchValue); @@ -143,19 +145,76 @@ public class CsGroupServiceImpl extends ServiceImpl impl List group = groupList.stream().map(DataGroupTemplateVO::getId).collect(Collectors.toList()); //获取当前组的所有指标项 List list = csDataArrayMapper.getArrayByGroup(group); + //获取所有字典指标 + List epdPqdList = epdFeignClient.selectByIds(list.stream().map(EnergyTemplateVO::getDataId).distinct().collect(Collectors.toList())).getData(); + Map eventTypeMap = epdPqdList.stream().collect(Collectors.toMap(EleEpdPqd::getId, Function.identity())); + //根据lineId获取监测点pt、ct变比 + CsLinePO csLinePO = csLineFeignClient.queryLineById(Collections.singletonList(lineId)).getData().get(0); for (EnergyTemplateVO item : list) { EnergyTemplateVO vo = new EnergyTemplateVO(); BeanUtils.copyProperties(item,vo); - EleEpdPqd eleEpdPqd = epdFeignClient.selectById(item.getDataId()).getData(); + EleEpdPqd eleEpdPqd = eventTypeMap.get(item.getDataId()); vo.setClassId(eleEpdPqd.getClassId()); vo.setUnit(eleEpdPqd.getUnit()); StatisticalDataDTO statisticalDataDTO = commonService.getLineRtData(lineId,influxDbParamUtil.getTableNameByClassId(eleEpdPqd.getClassId()),item.getName(),item.getPhase(),item.getStatMethod(),influxDbParamUtil.getClDidByLineId(lineId)); - if (!Objects.isNull(statisticalDataDTO)){ + if (Objects.nonNull(statisticalDataDTO)) { vo.setTime(statisticalDataDTO.getTime()); - vo.setDataValue(BigDecimal.valueOf(statisticalDataDTO.getValue()).setScale(4, RoundingMode.UP).doubleValue()); - } else { - vo.setDataValue(3.1415926); } + if (Objects.isNull(dataLevel)) { + if (Objects.nonNull(statisticalDataDTO)) { + vo.setDataValue(BigDecimal.valueOf(statisticalDataDTO.getValue()).setScale(4, RoundingMode.UP).doubleValue()); + } else { + vo.setDataValue(3.1415926); + } + } else { + if ("Primary".equals(dataLevel)) { + if (Objects.nonNull(statisticalDataDTO)) { + vo.setDataValue(BigDecimal.valueOf(statisticalDataDTO.getValue()).setScale(4, RoundingMode.UP).doubleValue()); + } else { + vo.setDataValue(3.1415926); + } + } else { + if (Objects.nonNull(statisticalDataDTO)) { + if (ObjectUtil.isNotNull(eleEpdPqd.getPrimaryFormula())) { + double secondaryData = secondaryToPrimary(eleEpdPqd.getPrimaryFormula(), statisticalDataDTO.getValue(), csLinePO.getPtRatio(), csLinePO.getCtRatio()); + vo.setDataValue(BigDecimal.valueOf(secondaryData).setScale(4, RoundingMode.UP).doubleValue()); + } else { + vo.setDataValue(BigDecimal.valueOf(statisticalDataDTO.getValue()).setScale(4, RoundingMode.UP).doubleValue()); + } + } else { + vo.setDataValue(3.1415926); + } + } + } +// if (Objects.isNull(dataLevel)){ +// if (!Objects.isNull(statisticalDataDTO)){ +// vo.setTime(statisticalDataDTO.getTime()); +// vo.setDataValue(BigDecimal.valueOf(statisticalDataDTO.getValue()).setScale(4, RoundingMode.UP).doubleValue()); +// } else { +// vo.setDataValue(3.1415926); +// } +// } else { +// if (Objects.equals(dataLevel,"Primary")) { +// if (!Objects.isNull(statisticalDataDTO)){ +// vo.setTime(statisticalDataDTO.getTime()); +// vo.setDataValue(BigDecimal.valueOf(statisticalDataDTO.getValue()).setScale(4, RoundingMode.UP).doubleValue()); +// } else { +// vo.setDataValue(3.1415926); +// } +// } else { +// if (!Objects.isNull(statisticalDataDTO)){ +// vo.setTime(statisticalDataDTO.getTime()); +// if (ObjectUtil.isNotNull(eleEpdPqd.getPrimaryFormula())) { +// double secondaryData = secondaryToPrimary(eleEpdPqd.getPrimaryFormula(),statisticalDataDTO.getValue(),csLinePO.getPtRatio(),csLinePO.getCtRatio()); +// vo.setDataValue(BigDecimal.valueOf(secondaryData).setScale(4, RoundingMode.UP).doubleValue()); +// } else { +// vo.setDataValue(BigDecimal.valueOf(statisticalDataDTO.getValue()).setScale(4, RoundingMode.UP).doubleValue()); +// } +// } else { +// vo.setDataValue(3.1415926); +// } +// } +// } arrayList.add(vo); } if (CollectionUtil.isNotEmpty(arrayList)){ @@ -663,6 +722,27 @@ public class CsGroupServiceImpl extends ServiceImpl impl return result; } - + /** + * 二次值换算成一次值 + */ + public double secondaryToPrimary(String formula, Double data,Double pt, Double ct) { + switch (formula) { + case "*PT": + data = data * pt; + break; + case "*CT": + data = data * ct; + break; + case "*PT*CT/1000": + data = data * pt * ct / 1000; + break; + case "*PT/1000": + data = data * pt / 1000; + break; + default: + break; + } + return data; + } } diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/DevicDataTrendQueryParam.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/DevicDataTrendQueryParam.java index 8ea0195..e4204fa 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/DevicDataTrendQueryParam.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/DevicDataTrendQueryParam.java @@ -37,6 +37,9 @@ public class DevicDataTrendQueryParam { @NotNull(message="结束时间不能为空！") private String endTime; + @ApiModelProperty(value = "数据类型") + private String dataLevel; + private String devId; @Data public static class StatisticalParam{ diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java index 96146a6..cff1cd1 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java @@ -390,6 +390,14 @@ public class MqttMessageHandler { return "APF模块 5"; case "6": return "APF模块 6"; + case "7": + return "APF模块 7"; + case "8": + return "APF模块 8"; + case "9": + return "APF模块 9"; + case "10": + return "APF模块 10"; default: break; } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java index 9675c88..e51ad18 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java @@ -9,6 +9,8 @@ import com.njcn.csdevice.enums.AlgorithmResponseEnum; import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO; import com.njcn.csdevice.pojo.dto.LineParamDTO; import com.njcn.csdevice.pojo.po.CsLedger; +import com.njcn.csdevice.pojo.po.CsLinePO; +import com.njcn.csdevice.pojo.vo.EnergyTemplateVO; import com.njcn.csharmonic.param.DevicDataTrendQueryParam; import com.njcn.csharmonic.pojo.vo.ThdDataVO; import com.njcn.csharmonic.service.DeviceDataTrendService; @@ -20,6 +22,7 @@ import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.api.EpdFeignClient; import com.njcn.system.enums.DicDataEnum; import com.njcn.system.pojo.po.DictData; +import com.njcn.system.pojo.po.EleEpdPqd; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -27,9 +30,7 @@ import org.springframework.util.CollectionUtils; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.ZoneId; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -49,6 +50,7 @@ public class DeviceDataTrendServiceImpl implements DeviceDataTrendService { private final DicDataFeignClient dicDataFeignClient; private final EquipmentFeignClient equipmentFeignClient; private final InfluxDbParamUtil influxDbParamUtil; + private final EpdFeignClient epdFeignClient; @Override public List> queryDataTrend(DevicDataTrendQueryParam devicDataTrendQueryParam) { List> result = new ArrayList<>(); @@ -60,29 +62,41 @@ public class DeviceDataTrendServiceImpl implements DeviceDataTrendService { lineParamDTO.setLineId(devicDataTrendQueryParam.getLineId()); List data = csLedgerFeignClient.queryLine(lineParamDTO).getData(); List data1 = equipmentFeignClient.queryDeviceById(Stream.of((data == null || data.isEmpty()) ? devicDataTrendQueryParam.getDevId() : data.get(0).getPid()).collect(Collectors.toList())).getData(); + //根据lineId获取监测点pt、ct变比 + CsLinePO csLinePO = csLineFeignClient.queryLineById(Collections.singletonList(devicDataTrendQueryParam.getLineId())).getData().get(0); + devicDataTrendQueryParam.getStatisticalParams().forEach(temp->{ CommonQueryParam commonQueryParam = new CommonQueryParam(); commonQueryParam.setLineId(devicDataTrendQueryParam.getLineId()); commonQueryParam.setTableName(influxDbParamUtil.getTableNameByClassId(temp.getClassId())); commonQueryParam.setColumnName(temp.getName()); commonQueryParam.setPhasic(temp.getPhase()); - commonQueryParam.setStartTime( devicDataTrendQueryParam.getStartTime()); - commonQueryParam.setEndTime(devicDataTrendQueryParam.getEndTime()); + commonQueryParam.setStartTime( devicDataTrendQueryParam.getStartTime() + " 00:00:00"); + commonQueryParam.setEndTime(devicDataTrendQueryParam.getEndTime() + " 23:59:59"); commonQueryParam.setDataType( temp.getStatMethod()); commonQueryParam.setProcess(data1.get(0).getProcess()+""); commonQueryParam.setClDid(influxDbParamUtil.getClDidByLineId(devicDataTrendQueryParam.getLineId())); - + EleEpdPqd epdPqd = epdFeignClient.selectByIds(Collections.singletonList(temp.getDataId())).getData().get(0); List deviceRtData = commonService.getDeviceRtDataByTime(Stream.of(commonQueryParam).collect(Collectors.toList())); List collect1 = deviceRtData.stream().map(statisticalDataDTO -> { ThdDataVO vo = new ThdDataVO(); vo.setLineId(statisticalDataDTO.getLineId()); vo.setPhase(statisticalDataDTO.getPhaseType()); - vo.setTime(statisticalDataDTO.getTime()); vo.setStatMethod(statisticalDataDTO.getValueType()); - vo.setStatisticalData(BigDecimal.valueOf(statisticalDataDTO.getValue()).setScale(4, RoundingMode.UP).doubleValue()); + //对二次值做转换 + if (Objects.equals(devicDataTrendQueryParam.getDataLevel(),"Secondary")) { + if (!Objects.isNull(epdPqd.getPrimaryFormula())) { + double secondaryData = secondaryToPrimary(epdPqd.getPrimaryFormula(), statisticalDataDTO.getValue(), csLinePO.getPtRatio(), csLinePO.getCtRatio()); + vo.setStatisticalData(BigDecimal.valueOf(secondaryData).setScale(4, RoundingMode.UP).doubleValue()); + } else { + vo.setStatisticalData(BigDecimal.valueOf(statisticalDataDTO.getValue()).setScale(4, RoundingMode.UP).doubleValue()); + } + } else { + vo.setStatisticalData(BigDecimal.valueOf(statisticalDataDTO.getValue()).setScale(4, RoundingMode.UP).doubleValue()); + } vo.setStatisticalIndex(temp.getDataId()); vo.setStatisticalName(temp.getName()); vo.setUnit(temp.getUnit()); @@ -91,9 +105,29 @@ public class DeviceDataTrendServiceImpl implements DeviceDataTrendService { }).collect(Collectors.toList()); result.add(collect1); }); - - - return result; } + + /** + * 二次值换算成一次值 + */ + public double secondaryToPrimary(String formula, Double data,Double pt, Double ct) { + switch (formula) { + case "*PT": + data = data * pt; + break; + case "*CT": + data = data * ct; + break; + case "*PT*CT/1000": + data = data * pt * ct / 1000; + break; + case "*PT/1000": + data = data * pt / 1000; + break; + default: + break; + } + return data; + } }