From 00fd70112285a7a86a55ff9789f3cbed7208b7c1 Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Mon, 26 Aug 2024 13:47:24 +0800 Subject: [PATCH] =?UTF-8?q?1.pms=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/pmsWifi/PmsWifiController.java | 13 ++++--------- ...ataMapper.java => PmsMonitorRealDataMapper.java} | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) rename pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/pmsWifi/{MonitorRealDataMapper.java => PmsMonitorRealDataMapper.java} (72%) 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 index e42a1bf67..52ca58fb2 100644 --- 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 @@ -2,23 +2,18 @@ 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.mapper.pmsWifi.PmsMonitorRealDataMapper; 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.*; /** @@ -34,7 +29,7 @@ import org.springframework.web.bind.annotation.*; @RequiredArgsConstructor public class PmsWifiController extends BaseController { - private final MonitorRealDataMapper monitorRealDataMapper; + private final PmsMonitorRealDataMapper pmsMonitorRealDataMapper; private final IDataVService iDataVService; @@ -46,7 +41,7 @@ public class PmsWifiController extends BaseController { String methodDescribe = getMethodDescribe("getPmsInfo"); LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); lambdaUpdateWrapper.eq(MonitorRealData::getValueType,valueType).eq(MonitorRealData::getLineId,monitorId); - MonitorRealData monitorRealData = monitorRealDataMapper.selectOne(lambdaUpdateWrapper); + MonitorRealData monitorRealData = pmsMonitorRealDataMapper.selectOne(lambdaUpdateWrapper); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorRealData, methodDescribe); } 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/PmsMonitorRealDataMapper.java similarity index 72% rename from pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/pmsWifi/MonitorRealDataMapper.java rename to pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/pmsWifi/PmsMonitorRealDataMapper.java index 9f0fab41f..b344a19b6 100644 --- 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/PmsMonitorRealDataMapper.java @@ -10,5 +10,5 @@ import com.njcn.harmonic.pojo.po.pmsWifi.MonitorRealData; * @author cdf * @date 2024/8/25 */ -public interface MonitorRealDataMapper extends MppBaseMapper { +public interface PmsMonitorRealDataMapper extends MppBaseMapper { }