From d14e83c93578235f63d020f3469d17a572a40d81 Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Thu, 6 Mar 2025 14:55:36 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=BB=88=E7=AB=AF=E6=A8=A1=E5=9D=97=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gwPush/MonitorStatisticsController.java | 6 +- .../PmsPowerDistributionareaController.java | 3 +- .../distribution/mapping/PwMonitorMapper.xml | 90 ++++--------------- .../gwPush/MonitorStatisticsService.java | 2 +- .../impl/MonitorStatisticsServiceImpl.java | 11 ++- .../IPowerDistributionareaService.java | 3 +- .../PowerDistributionareaServiceImpl.java | 11 ++- 7 files changed, 38 insertions(+), 88 deletions(-) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/gwPush/MonitorStatisticsController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/gwPush/MonitorStatisticsController.java index 60a9e9813..636184f02 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/gwPush/MonitorStatisticsController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/gwPush/MonitorStatisticsController.java @@ -28,10 +28,10 @@ public class MonitorStatisticsController extends BaseController { @PostMapping("/objType") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @ApiOperation("国网上送接口") - public HttpResult< List>> objType(String deptId){ + @ApiOperation("查询主网用户分类") + public HttpResult< List>> objType(String deptId,Integer up){ String methodDescribe = getMethodDescribe("objType"); - List> gwMonitorStatistics = monitorStatisticsService.getGwMonitorStatistics(deptId); + List> gwMonitorStatistics = monitorStatisticsService.getGwMonitorStatistics(deptId,up); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, gwMonitorStatistics, methodDescribe); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsPowerDistributionareaController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsPowerDistributionareaController.java index 739b7948d..ca087c12e 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsPowerDistributionareaController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsPowerDistributionareaController.java @@ -14,6 +14,7 @@ import com.njcn.common.utils.LogUtil; import com.njcn.device.pms.annotation.TerminalOperationLogDesc; import com.njcn.device.pms.pojo.excel.PowerDistributionAreaExcel; import com.njcn.device.pms.pojo.param.PowerDistributionareaParam; +import com.njcn.device.pms.pojo.param.TaiZhangParam; import com.njcn.device.pms.pojo.po.PowerDistributionarea; import com.njcn.device.pms.pojo.vo.PVCapacity; import com.njcn.device.pms.service.majornetwork.IPowerDistributionareaService; @@ -58,7 +59,7 @@ public class PmsPowerDistributionareaController extends BaseController { @PostMapping("getPowerDistributionAreaList") @ApiOperation("分页查询台区所有信息") @ApiImplicitParam(name = "baseParam",value = "查询台区信息",required = true) - public HttpResult> getList(@RequestBody @Validated BaseParam baseParam){ + public HttpResult> getList(@RequestBody TaiZhangParam baseParam){ String methodDescribe = getMethodDescribe("getList"); LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, baseParam); Page res = iPowerDistributionareaService.getList(baseParam); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml index e0d788bb6..995846ace 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml @@ -7,10 +7,10 @@ SELECT DISTINCT monitor.Org_Id AS orgId, monitor.Org_Name AS orgName, - monitor.Powerr_Id AS powerId, - monitor.Powerr_Name AS powerName, + monitor.`Powerr_Id` AS powerId, + monitor.`Powerr_Name` AS powerName, monitor.id AS monitorId, - monitor.Name AS monitorName, + monitor.`Name` AS monitorName, monitor.Line_Id, monitor.Line_Name, pdm.Monitor_Sort AS monitorSort, @@ -26,11 +26,11 @@ pdm.Update_By AS updateBy, pdm.Update_Time AS updateTime FROM - (( + ( SELECT pm.id, - pm.Name, - pm.Status, + pm.`Name`, + pm.`Status`, pm.Org_Id, pm.Org_Name, pm.Powerr_Id, @@ -48,57 +48,11 @@ - ) UNION ALL - /* ( - SELECT - ppd.id, - ppd.Name, - ppd.Status, - ppd.Org_Id, - ppd.Org_Name, - ppd.Power_Station_Id, - ppd.Powerr_Name, - ppd.Line_Id, - ppd.Line_Name - FROM - pms_power_distributionarea AS ppd - ) UNION ALL*/ - ( - SELECT - ppc.id, - ppc.Name, - ppc.Status, - ppc.Org_Id, - ppc.Org_Name, - ppc.Power_Station_Id, - ps.Power_Name, - ppc.Line_Id, - 0 - FROM - pms_power_client AS ppc - INNER JOIN pms_statation_stat ps ON ps.Power_Id = ppc.Power_Station_Id - AND ppc.Org_Id = ps.Org_Id - ) UNION ALL - ( - SELECT - ppgu.id, - ppgu.Name, - ppgu.Status, - ppgu.Org_Id, - ppgu.Org_Name, - ppgu.Power_Station_Id, - pss.Power_Name, - ppgu.Line_Id, - 0 - FROM - pms_power_generation_user AS ppgu - INNER JOIN pms_statation_stat AS pss ON pss.Power_Id = ppgu.Power_Station_Id - AND ppgu.Org_Id = pss.Org_Id - )) AS monitor + ) AS monitor INNER JOIN pms_distribution_monitor AS pdm ON monitor.id = pdm.Monitor_Id WHERE - monitor.Status = 1 - AND pdm.Status = 1 + monitor.`Status` = 1 + AND pdm.`Status` = 1 AND monitor.Org_Id IN #{orgId} @@ -131,9 +85,10 @@ AND pdm.If_Power_User = #{pwPmsMonitorParam.ifPowerUser} - AND monitor.Name LIKE CONCAT('%',#{pwPmsMonitorParam.monitorName},'%') + AND monitor.`Name` LIKE CONCAT('%',#{pwPmsMonitorParam.monitorName},'%') + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/MonitorStatisticsService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/MonitorStatisticsService.java index 489196f74..f1975b652 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/MonitorStatisticsService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/MonitorStatisticsService.java @@ -19,7 +19,7 @@ public interface MonitorStatisticsService { * @Author: wr * @Date: 2024/3/22 9:49 */ - List> getGwMonitorStatistics(String deptId); + List> getGwMonitorStatistics(String deptId,Integer up); /** * @Description: 国网上送新能源场站统计 diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorStatisticsServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorStatisticsServiceImpl.java index 19ff6e599..4d5669937 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorStatisticsServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorStatisticsServiceImpl.java @@ -67,7 +67,7 @@ public class MonitorStatisticsServiceImpl implements MonitorStatisticsService { private final ITerminalService terminalService; @Override - public List> getGwMonitorStatistics(String deptId) { + public List> getGwMonitorStatistics(String deptId,Integer up) { List> info = new ArrayList<>(); //查询所有一级树字典 List sysDicTreePOList = dictTreeFeignClient.queryAll().getData(); @@ -105,6 +105,7 @@ public class MonitorStatisticsServiceImpl implements MonitorStatisticsService { DeptGetLineParam deptGetLineParam = new DeptGetLineParam(); deptGetLineParam.setDeptId(deptId); deptGetLineParam.setMonitorStateRunning(false); + deptGetLineParam.setSystemType(0); List deptGetChildrenMoreDTOS = commTerminalService.deptGetLine(deptGetLineParam); //部门信息循环 List line; @@ -115,8 +116,12 @@ public class MonitorStatisticsServiceImpl implements MonitorStatisticsService { if (CollUtil.isEmpty(lineBaseList)) { continue; } - List upToGridList = lineBaseList.stream().filter(item -> Objects.equals(item.getIsUpToGrid(), DataStateEnum.ENABLE.getCode())) - .collect(Collectors.toList()); + List upToGridList; + if(Objects.isNull(up) || up == 1){ + upToGridList = lineBaseList.stream().filter(item -> Objects.equals(item.getIsUpToGrid(), DataStateEnum.ENABLE.getCode())).collect(Collectors.toList()); + }else { + upToGridList = lineBaseList; + } addmetWorkList(metWorkMap, upToGridList, line); addSourceLoadList(sourceLoadMap, upToGridList, line); info.add(line); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerDistributionareaService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerDistributionareaService.java index 8ce3fdda9..8a3150892 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerDistributionareaService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerDistributionareaService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.common.pojo.param.StatisticsBizBaseParam; import com.njcn.device.pms.pojo.excel.PowerDistributionAreaExcel; import com.njcn.device.pms.pojo.param.PowerDistributionareaParam; +import com.njcn.device.pms.pojo.param.TaiZhangParam; import com.njcn.device.pms.pojo.po.PowerDistributionarea; import com.njcn.device.pms.pojo.vo.PVCapacity; import com.njcn.web.pojo.param.BaseParam; @@ -28,7 +29,7 @@ public interface IPowerDistributionareaService extends IService getList(BaseParam baseParam); + Page getList(TaiZhangParam baseParam); /** * 查询所有 diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java index 14e15e147..959499296 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java @@ -21,6 +21,7 @@ import com.njcn.device.pms.mapper.majornetwork.PowerDistributionareaMapper; import com.njcn.device.pms.pojo.excel.PowerDistributionAreaExcel; import com.njcn.device.pms.pojo.excel.PowerGenerationUserExcel; import com.njcn.device.pms.pojo.param.PowerDistributionareaParam; +import com.njcn.device.pms.pojo.param.TaiZhangParam; import com.njcn.device.pms.pojo.po.GeneratrixWire; import com.njcn.device.pms.pojo.po.PowerDistributionarea; import com.njcn.device.pms.pojo.po.PowerGenerationUser; @@ -82,16 +83,18 @@ public class PowerDistributionareaServiceImpl extends ServiceImpl getList(BaseParam baseParam) { - List deptInfo = deptFeignClient.getAllDept().getData(); - List deptIds = deptInfo.stream().map(Dept::getCode).collect(Collectors.toList()); + public Page getList(TaiZhangParam baseParam) { + List deptInfo = deptFeignClient.getDepSonSelfCodetByDeptId(baseParam.getOrgId()).getData(); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(PowerDistributionarea::getStatus,DataStateEnum.ENABLE.getCode()) - .in(CollUtil.isNotEmpty(deptIds),PowerDistributionarea::getOrgId,deptIds) + .in(CollUtil.isNotEmpty(deptInfo),PowerDistributionarea::getOrgId,deptInfo) .and(StrUtil.isNotBlank(baseParam.getSearchValue()), i->i.like(PowerDistributionarea::getName,baseParam.getSearchValue()) .or() .like(PowerDistributionarea::getPowerrName,baseParam.getSearchValue()) + .or() + .like(PowerDistributionarea::getLineName,baseParam.getSearchValue()) + .or() .like(PowerDistributionarea::getOrgName,baseParam.getSearchValue())).orderByDesc(PowerDistributionarea::getCreateTime);