pms台账bug提交

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsDistributionMonitorController.java

@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
 import com.njcn.web.controller.BaseController;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -98,7 +99,11 @@ public class PmsDistributionMonitorController extends BaseController {
     public HttpResult<DistributionMonitor> getDistributionMonitorById(@RequestParam("monitorSort") String monitorSort,@RequestParam("id") String id){
         String methodDescribe = getMethodDescribe("getDistributionMonitorById");
         DistributionMonitor res = iDistributionMonitorService.getDistributionMonitorById(monitorSort,id);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
+        if(Objects.isNull(res)){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
+        }
     }
 
 

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsPowerClientController.java

@@ -11,6 +11,7 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.pms.pojo.param.PowerClientParam;
 import com.njcn.device.pms.pojo.param.PowerUserParam;
 import com.njcn.device.pms.pojo.po.PowerClient;
+import com.njcn.device.pms.pojo.vo.PowerClientVO;
 import com.njcn.device.pms.service.majornetwork.IPowerClientService;
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.Api;
@@ -100,9 +101,9 @@ public class PmsPowerClientController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getPowerClientList")
     @ApiOperation("获取用电用户列表")
-    public HttpResult<List<PowerClient>> getPowerClientList(@RequestBody PowerClientParam powerClientParam) {
+    public HttpResult<List<PowerClientVO>> getPowerClientList(@RequestBody PowerClientParam powerClientParam) {
         String methodDescribe = getMethodDescribe("getPowerClientList");
-        List<PowerClient> result = iPowerClientService.getPowerClientList(powerClientParam);
+        List<PowerClientVO> result = iPowerClientService.getPowerClientList(powerClientParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerClientMapper.java

@@ -2,6 +2,10 @@ package com.njcn.device.pms.mapper.majornetwork;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pms.pojo.po.PowerClient;
+import com.njcn.device.pms.pojo.vo.PowerClientVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,7 @@ import com.njcn.device.pms.pojo.po.PowerClient;
  */
 public interface PowerClientMapper extends BaseMapper<PowerClient> {
 
+
+    List<PowerClientVO> getPowerClientSelect(@Param("orgIds") List<String> orgIds);
+
 }

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerClientMapper.xml

@@ -3,4 +3,25 @@
 <mapper namespace="com.njcn.device.pms.mapper.majornetwork.PowerClientMapper">
 
 
+    <select id="getPowerClientSelect" resultType="com.njcn.device.pms.pojo.vo.PowerClientVO">
+        select
+        pms_power_client.id,
+        pms_power_client.name,
+        pms_power_client.org_name,
+        pms_power_client.org_id,
+        pms_power_distributionarea.id platformId,
+        pms_power_distributionarea.name platformName
+
+        from pms_power_client pms_power_client
+        left join pms_power_distributionarea pms_power_distributionarea on pms_power_client.Platform_Id =
+        pms_power_distributionarea.id
+        where pms_power_client.status = 1
+        and pms_power_distributionarea.status = 1
+        <if test="orgIds!=null and orgIds.size!=0">
+        and pms_power_client.org_id in
+        <foreach collection="orgIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        </if>
+    </select>
 </mapper>

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerClientService.java

@@ -6,6 +6,7 @@ import com.njcn.device.pms.pojo.param.PowerClientParam;
 import com.njcn.device.pms.pojo.param.PowerUserParam;
 import com.njcn.device.pms.pojo.po.PowerClient;
 import com.njcn.device.pms.pojo.po.PowerClient;
+import com.njcn.device.pms.pojo.vo.PowerClientVO;
 import com.njcn.web.pojo.param.BaseParam;
 
 import java.util.List;
@@ -62,7 +63,7 @@ public interface IPowerClientService extends IService<PowerClient> {
      * @date 2022/10/25
      * @return boolean
      */
-    List<PowerClient> getPowerClientList(PowerClientParam powerClientParam);
+    List<PowerClientVO> getPowerClientList(PowerClientParam powerClientParam);
 
     /**
      * 查询用电用户列表

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java

@@ -13,6 +13,7 @@ import com.njcn.device.pms.pojo.param.PowerGenerationUserParam;
 import com.njcn.device.pms.pojo.param.PowerUserParam;
 import com.njcn.device.pms.pojo.po.PowerClient;
 import com.njcn.device.pms.pojo.po.PowerGenerationUser;
+import com.njcn.device.pms.pojo.vo.PowerClientVO;
 import com.njcn.device.pms.service.majornetwork.IPowerClientService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.user.api.DeptFeignClient;
@@ -22,6 +23,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -77,15 +79,12 @@ public class PowerClientServiceImpl extends ServiceImpl<PowerClientMapper, Power
     }
 
     @Override
-    public List<PowerClient> getPowerClientList(PowerClientParam powerClientParam) {
-        LambdaQueryWrapper<PowerClient> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+    public List<PowerClientVO> getPowerClientList(PowerClientParam powerClientParam) {
+        List<String> deptCodes = new ArrayList<>();
         if(StrUtil.isNotBlank(powerClientParam.getOrgId())){
-            List<String> deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(powerClientParam.getOrgId()).getData();
-            lambdaQueryWrapper.eq(PowerClient::getOrgId,deptIds).eq(PowerClient::getStatus,DataStateEnum.ENABLE.getCode());
+            deptCodes = deptFeignClient.getDepSonSelfCodetByDeptId(powerClientParam.getOrgId()).getData();
         }
-        lambdaQueryWrapper.select(PowerClient::getId,PowerClient::getName,PowerClient::getOrgId,PowerClient::getOrgName);
-        lambdaQueryWrapper.orderByDesc(PowerClient::getCreateTime).eq(PowerClient::getStatus, DataStateEnum.ENABLE.getCode());
-        return this.list(lambdaQueryWrapper);
+        return this.baseMapper.getPowerClientSelect(deptCodes);
     }