From 500fbbad9cffd55cb17580f3a55db1ac5cd2d205 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Thu, 12 Sep 2024 10:33:40 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=B8=A4=E7=BA=A7=E8=B4=AF=E9=80=9A=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/majornetwork/impl/MonitorServiceImpl.java | 3 ++- .../upload/RUploadCommPointBusController.java | 10 ++++------ ...BusService.java => RUploadCommPointBusService.java} | 7 ++----- .../upload/impl/RUploadCommPointBusServiceImpl.java | 5 ++--- 4 files changed, 10 insertions(+), 15 deletions(-) rename pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/{IRUploadCommPointBusService.java => RUploadCommPointBusService.java} (66%) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java index 4d019121f..48055a0f3 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java @@ -306,7 +306,8 @@ public class MonitorServiceImpl extends ServiceImpl impl public List getPmsCalMonitorList(List monitorIds) { List monitorList = new ArrayList<>(); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.select(Monitor::getId,Monitor::getStatisticalInterval,Monitor::getTerminalId).eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()); + lambdaQueryWrapper.select(Monitor::getId,Monitor::getStatisticalInterval,Monitor::getTerminalId) + .in(Monitor::getId,monitorIds).eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()); List monitors = monitorMapper.selectList(lambdaQueryWrapper); for(Monitor monitor : monitors){ 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 6c667a7ee..270732feb 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 @@ -7,11 +7,9 @@ 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.common.utils.LogUtil; import com.njcn.harmonic.pojo.param.UploadDataParam; import com.njcn.harmonic.pojo.po.upload.RUploadCommPointBus; -import com.njcn.harmonic.pojo.vo.upload.UploadPointStatisticalDataVo; -import com.njcn.harmonic.service.upload.IRUploadCommPointBusService; +import com.njcn.harmonic.service.upload.RUploadCommPointBusService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -36,7 +34,7 @@ import com.njcn.web.controller.BaseController; @RequiredArgsConstructor public class RUploadCommPointBusController extends BaseController { - private final IRUploadCommPointBusService irUploadCommPointBusService; + private final RUploadCommPointBusService RUploadCommPointBusService; @OperateInfo(info = LogEnum.BUSINESS_COMMON) @@ -45,7 +43,7 @@ public class RUploadCommPointBusController extends BaseController { @ApiImplicitParam(name = "param", value = "实体参数", required = true) public HttpResult> getCommPointBusPage(@RequestBody @Validated UploadDataParam param) { String methodDescribe = getMethodDescribe("getCommPointBusPage"); - Page page = irUploadCommPointBusService.getCommPointBusPage(param); + Page page = RUploadCommPointBusService.getCommPointBusPage(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe); } @@ -56,7 +54,7 @@ public class RUploadCommPointBusController extends BaseController { @ApiImplicitParam(name = "param", value = "实体参数", required = true) public HttpResult upGwCommPoint(@RequestBody UploadDataParam param) { String methodDescribe = getMethodDescribe("upGwCommPoint"); - irUploadCommPointBusService.upGw(param); + RUploadCommPointBusService.upGw(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IRUploadCommPointBusService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/RUploadCommPointBusService.java similarity index 66% rename from pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IRUploadCommPointBusService.java rename to pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/RUploadCommPointBusService.java index 0fa1f6add..00cda69ba 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IRUploadCommPointBusService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/RUploadCommPointBusService.java @@ -3,20 +3,17 @@ package com.njcn.harmonic.service.upload; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.common.pojo.response.HttpResult; import com.njcn.harmonic.pojo.param.UploadDataParam; import com.njcn.harmonic.pojo.po.upload.RUploadCommPointBus; import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RequestBody; /** *

* 公共连接点母线电能质量统计 服务类 *

*/ -@Service -public interface IRUploadCommPointBusService extends IService { + +public interface RUploadCommPointBusService extends IService { Page getCommPointBusPage(UploadDataParam param); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadCommPointBusServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadCommPointBusServiceImpl.java index c60b372c6..fd14ce7d8 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadCommPointBusServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadCommPointBusServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +14,7 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.harmonic.mapper.upload.RUploadCommPointBusMapper; import com.njcn.harmonic.pojo.param.UploadDataParam; import com.njcn.harmonic.pojo.po.upload.RUploadCommPointBus; -import com.njcn.harmonic.service.upload.IRUploadCommPointBusService; +import com.njcn.harmonic.service.upload.RUploadCommPointBusService; import com.njcn.system.enums.DicDataEnum; import com.njcn.web.enums.GWSendEnum; import com.njcn.web.factory.PageFactory; @@ -37,7 +36,7 @@ import java.util.stream.Stream; * @since 2024-08-15 */ @Service -public class RUploadCommPointBusServiceImpl extends ServiceImpl implements IRUploadCommPointBusService { +public class RUploadCommPointBusServiceImpl extends ServiceImpl implements RUploadCommPointBusService { @Override public Page getCommPointBusPage(UploadDataParam param) {