1.两级贯通接口调整

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<MonitorMapper, Monitor> impl
     public List<LineDevGetDTO> getPmsCalMonitorList(List<String> monitorIds) {
         List<LineDevGetDTO> monitorList = new ArrayList<>();
         LambdaQueryWrapper<Monitor> 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<Monitor> monitors = monitorMapper.selectList(lambdaQueryWrapper);
         for(Monitor monitor : monitors){

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.RUploadCommPointBusService;
-import com.njcn.harmonic.service.upload.IRUploadCommPointBusService;
 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<Page<RUploadCommPointBus>> getCommPointBusPage(@RequestBody @Validated UploadDataParam param) {
         String methodDescribe = getMethodDescribe("getCommPointBusPage");
-        Page<RUploadCommPointBus> page = irUploadCommPointBusService.getCommPointBusPage(param);
+        Page<RUploadCommPointBus> 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<Boolean> upGwCommPoint(@RequestBody UploadDataParam param) {
         String methodDescribe = getMethodDescribe("upGwCommPoint");
-        irUploadCommPointBusService.upGw(param);
+        RUploadCommPointBusService.upGw(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
     }
 

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;
 
 /**
  * <p>
  * 公共连接点母线电能质量统计 服务类
  * </p>
  */
-@Service
+
-public interface IRUploadCommPointBusService extends IService<RUploadCommPointBus> {
+public interface RUploadCommPointBusService extends IService<RUploadCommPointBus> {
 
     Page<RUploadCommPointBus> getCommPointBusPage(UploadDataParam param);
 

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<RUploadCommPointBusMapper, RUploadCommPointBus> implements IRUploadCommPointBusService {
+public class RUploadCommPointBusServiceImpl extends ServiceImpl<RUploadCommPointBusMapper, RUploadCommPointBus> implements RUploadCommPointBusService {
 
     @Override
     public Page<RUploadCommPointBus> getCommPointBusPage(UploadDataParam param) {