From 62362432842fbec9cb8cc08b4c0d7c7a97931f2c Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Mon, 26 Aug 2024 10:27:28 +0800 Subject: [PATCH] =?UTF-8?q?1.pms=E6=97=A0=E7=BA=BF=E8=B6=8B=E5=8A=BF?= =?UTF-8?q?=E5=9B=BE=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PqsDeviceUnitServiceImpl.java | 13 ++++- .../pojo/po/pmsWifi/MonitorRealData.java | 46 +++++++++++++++ .../controller/pmsWifi/PmsWifiController.java | 56 +++++++++++++++++++ .../upload/RUploadCommPointBusController.java | 2 +- .../mapper/pmsWifi/MonitorRealDataMapper.java | 14 +++++ 5 files changed, 127 insertions(+), 4 deletions(-) create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/pmsWifi/MonitorRealData.java create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/pmsWifi/PmsWifiController.java create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/pmsWifi/MonitorRealDataMapper.java diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PqsDeviceUnitServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PqsDeviceUnitServiceImpl.java index 32cd4c7a8..1ab3f2e7f 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PqsDeviceUnitServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PqsDeviceUnitServiceImpl.java @@ -1,6 +1,7 @@ package com.njcn.device.pms.service.majornetwork.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -18,7 +19,9 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; @@ -44,6 +47,9 @@ public class PqsDeviceUnitServiceImpl extends ServiceImpl terminal = list.stream().map(PmsTerminal::getId).collect(Collectors.toList()); //获取所有终端信息 List pqsDeviceUnits = this.listByIds(terminal); @@ -61,12 +67,13 @@ public class PqsDeviceUnitServiceImpl extends ServiceImpl> terMap = subValue.stream().collect(Collectors.groupingBy(PmsTerminal::getId)); - List terUnitVos = new ArrayList<>(); + List terUnitVos = new ArrayList<>(); terMap.forEach((terKey, terValue) -> { for (PmsTerminal pmsTerminal : terValue) { - DeviceUnitVo terUnitVo = new DeviceUnitVo(); + DeviceUnitVo.DeviceUnit terUnitVo = new DeviceUnitVo.DeviceUnit(); terUnitVo.setId(pmsTerminal.getId()); terUnitVo.setName(pmsTerminal.getName()); + terUnitVo.setDevFlag(pmsTerminal.getTerminalState()); PqsDeviceUnit pqsDeviceUnit; if (unitMap.containsKey(terKey)) { pqsDeviceUnit = unitMap.get(terKey); diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/pmsWifi/MonitorRealData.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/pmsWifi/MonitorRealData.java new file mode 100644 index 000000000..dadd43b38 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/pmsWifi/MonitorRealData.java @@ -0,0 +1,46 @@ +package com.njcn.harmonic.pojo.po.pmsWifi; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author xy + * @since 2024-08-25 + */ +@Getter +@Setter +@TableName("pms_real_data") +public class MonitorRealData { + + private static final long serialVersionUID = 1L; + + @TableField("id") + private String id; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @TableField("time_Id") + private LocalDateTime timeId; + + @MppMultiId + @TableField("line_id") + private String lineId; + + @MppMultiId + @TableField("value_type") + private String valueType; + + @TableField("pms_content") + private String pmsContent; + + +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/pmsWifi/PmsWifiController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/pmsWifi/PmsWifiController.java new file mode 100644 index 000000000..e42a1bf67 --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/pmsWifi/PmsWifiController.java @@ -0,0 +1,56 @@ +package com.njcn.harmonic.controller.pmsWifi; + + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +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.harmonic.mapper.pmsWifi.MonitorRealDataMapper; +import com.njcn.harmonic.pojo.param.UploadDataParam; +import com.njcn.harmonic.pojo.po.pmsWifi.MonitorRealData; +import com.njcn.harmonic.pojo.po.upload.RUploadCommPointBus; +import com.njcn.harmonic.service.upload.IRUploadCommPointBusService; +import com.njcn.influx.service.IDataVService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +/** + *

+ * 公共连接点母线电能质量统计 前端控制器 + *

+ * + * @author cdf + * @since 2024-08-15 + */ +@RestController +@RequestMapping("/pmsWifi") +@RequiredArgsConstructor +public class PmsWifiController extends BaseController { + + private final MonitorRealDataMapper monitorRealDataMapper; + + private final IDataVService iDataVService; + + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @GetMapping("/getPmsInfo") + @ApiOperation("查询最新的一条电能质量数据") + public HttpResult getPmsInfo(@RequestParam String monitorId,@RequestParam String valueType) { + String methodDescribe = getMethodDescribe("getPmsInfo"); + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.eq(MonitorRealData::getValueType,valueType).eq(MonitorRealData::getLineId,monitorId); + MonitorRealData monitorRealData = monitorRealDataMapper.selectOne(lambdaUpdateWrapper); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorRealData, methodDescribe); + } + + + +} + diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadCommPointBusController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadCommPointBusController.java index 6842f3872..6c667a7ee 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadCommPointBusController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadCommPointBusController.java @@ -28,7 +28,7 @@ import com.njcn.web.controller.BaseController; * 公共连接点母线电能质量统计 前端控制器 *

* - * @author xy + * @author cdf * @since 2024-08-15 */ @RestController diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/pmsWifi/MonitorRealDataMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/pmsWifi/MonitorRealDataMapper.java new file mode 100644 index 000000000..9f0fab41f --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/pmsWifi/MonitorRealDataMapper.java @@ -0,0 +1,14 @@ +package com.njcn.harmonic.mapper.pmsWifi; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.harmonic.pojo.po.pmsWifi.MonitorRealData; + + +/** + * roma + * + * @author cdf + * @date 2024/8/25 + */ +public interface MonitorRealDataMapper extends MppBaseMapper { +}