From 79865cc395c9d20bc9511e1b731e58f3b4ca44ee Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Wed, 20 Sep 2023 16:46:13 +0800 Subject: [PATCH] =?UTF-8?q?1.bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/PwMonitorController.java | 20 ++++--------------- .../ledgerManger/PmsMonitorController.java | 18 +++-------------- .../mapper/RMpPollutionDPOMapper.java | 2 +- 3 files changed, 8 insertions(+), 32 deletions(-) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwMonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwMonitorController.java index 92fab8cb2..422fd95d5 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwMonitorController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwMonitorController.java @@ -1,6 +1,5 @@ package com.njcn.device.pms.controller.distribution; -import cn.hutool.core.collection.CollectionUtil; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; @@ -50,11 +49,7 @@ public class PwMonitorController extends BaseController { public HttpResult> getPwMonitorList(@RequestBody @Validated PwPmsMonitorParam pwPmsMonitorParam) { String methodDescribe = getMethodDescribe("getPwMonitorList"); List monitorList = iPwMonitorService.getPwMonitorList(pwPmsMonitorParam); - if (CollectionUtil.isEmpty(monitorList)) { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe); - } else { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorList, methodDescribe); - } + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorList, methodDescribe); } /** @@ -70,11 +65,8 @@ public class PwMonitorController extends BaseController { public HttpResult> getPwSubsetMonitorList(@RequestBody @Validated PwPmsMonitorParam pwPmsMonitorParam) { String methodDescribe = getMethodDescribe("getPwSubsetMonitorList"); List monitorList = iPwMonitorService.getPwSubsetMonitorList(pwPmsMonitorParam); - if (CollectionUtil.isEmpty(monitorList)) { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe); - } else { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorList, methodDescribe); - } + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorList, methodDescribe); + } @@ -91,11 +83,7 @@ public class PwMonitorController extends BaseController { public HttpResult> getPwPhotovoltaicMonitorList(@RequestBody @Validated PwPmsMonitorParam pwPmsMonitorParam) { String methodDescribe = getMethodDescribe("getPwPhotovoltaicMonitorList"); List monitorList = iPwMonitorService.getPwPhotovoltaicMonitorList(pwPmsMonitorParam); - if (CollectionUtil.isEmpty(monitorList)) { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe); - } else { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorList, methodDescribe); - } + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorList, methodDescribe); } @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getPVCompositeIndicators") diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java index b87e9a58e..292017757 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java @@ -82,11 +82,7 @@ public class PmsMonitorController extends BaseController { public HttpResult> getMonitorInfoListByCond(@RequestBody PmsMonitorParam pmsMonitorParam) { String methodDescribe = getMethodDescribe("getMonitorInfoListByCond"); List list = monitorService.getMonitorInfoListByCond(pmsMonitorParam); - if (CollectionUtil.isEmpty(list)) { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe); - } else { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); - } + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } /*** @@ -102,11 +98,7 @@ public class PmsMonitorController extends BaseController { public HttpResult> getAllMonitorList() { String methodDescribe = getMethodDescribe("getAllMonitorList"); List monitorList = monitorService.getAllMonitorList(); - if (CollectionUtil.isEmpty(monitorList)) { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe); - } else { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorList, methodDescribe); - } + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorList, methodDescribe); } @@ -123,11 +115,7 @@ public class PmsMonitorController extends BaseController { public HttpResult> getAllMonitorPageList(@RequestBody TerminalQueryParam baseParam) { String methodDescribe = getMethodDescribe("getAllMonitorList"); Page monitor= monitorService.getAllMonitorPageList(baseParam); - if (Objects.isNull(monitor)) { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe); - } else { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe); - } + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe); } /** diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPollutionDPOMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPollutionDPOMapper.java index aea191517..34c8f9cac 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPollutionDPOMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPollutionDPOMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.harmonic.pojo.dto.PublicDTO; import com.njcn.harmonic.pojo.po.RMpPollutionDPO; import java.util.List; -import org.apache.ibatis.annotations.Param;import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Param; /** * Description: