1.bug修改

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<List<PwPmsMonitorDTO>> getPwMonitorList(@RequestBody @Validated PwPmsMonitorParam pwPmsMonitorParam) {
         String methodDescribe = getMethodDescribe("getPwMonitorList");
         List<PwPmsMonitorDTO> monitorList = iPwMonitorService.getPwMonitorList(pwPmsMonitorParam);
-        if (CollectionUtil.isEmpty(monitorList)) {
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorList, methodDescribe);
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
-        } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorList, methodDescribe);
-        }
     }
 
     /**
@@ -70,11 +65,8 @@ public class PwMonitorController extends BaseController {
     public HttpResult<List<PwPmsMonitorDTO>> getPwSubsetMonitorList(@RequestBody @Validated PwPmsMonitorParam pwPmsMonitorParam) {
         String methodDescribe = getMethodDescribe("getPwSubsetMonitorList");
         List<PwPmsMonitorDTO> monitorList = iPwMonitorService.getPwSubsetMonitorList(pwPmsMonitorParam);
-        if (CollectionUtil.isEmpty(monitorList)) {
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorList, methodDescribe);
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
+
-        } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorList, methodDescribe);
-        }
     }
 
 
@@ -91,11 +83,7 @@ public class PwMonitorController extends BaseController {
     public HttpResult<List<PwPmsMonitorDTO>> getPwPhotovoltaicMonitorList(@RequestBody @Validated PwPmsMonitorParam pwPmsMonitorParam) {
         String methodDescribe = getMethodDescribe("getPwPhotovoltaicMonitorList");
         List<PwPmsMonitorDTO> monitorList = iPwMonitorService.getPwPhotovoltaicMonitorList(pwPmsMonitorParam);
-        if (CollectionUtil.isEmpty(monitorList)) {
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorList, methodDescribe);
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
-        } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorList, methodDescribe);
-        }
     }
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getPVCompositeIndicators")

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<List<PmsMonitorDTO>> getMonitorInfoListByCond(@RequestBody PmsMonitorParam pmsMonitorParam) {
         String methodDescribe = getMethodDescribe("getMonitorInfoListByCond");
         List<PmsMonitorDTO> list = monitorService.getMonitorInfoListByCond(pmsMonitorParam);
-        if (CollectionUtil.isEmpty(list)) {
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
-        } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
-        }
     }
 
     /***
@@ -102,11 +98,7 @@ public class PmsMonitorController extends BaseController {
     public HttpResult<List<PmsMonitorVO>> getAllMonitorList() {
         String methodDescribe = getMethodDescribe("getAllMonitorList");
         List<PmsMonitorVO> monitorList = monitorService.getAllMonitorList();
-        if (CollectionUtil.isEmpty(monitorList)) {
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorList, methodDescribe);
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
-        } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorList, methodDescribe);
-        }
     }
 
 
@@ -123,11 +115,7 @@ public class PmsMonitorController extends BaseController {
     public HttpResult<Page<Monitor>> getAllMonitorPageList(@RequestBody TerminalQueryParam baseParam) {
         String methodDescribe = getMethodDescribe("getAllMonitorList");
         Page<Monitor> monitor= monitorService.getAllMonitorPageList(baseParam);
-        if (Objects.isNull(monitor)) {
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe);
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
-        } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe);
-        }
     }
 
     /**

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: