Skip to content

G
gf_back
Commit 00267669 authored by ZWT's avatar ZWT
Browse files
Options

feat(能源管理系统): 基础信息配置 

1.修改基础信息配置--输电线路配置模块查询井口列表接口,增加返回结果参数,修改查询逻辑,完成接口冒烟测试同时修改接口文档;
2.修改基础信息配置模块业务工具类,增加匹配查询字典名称方法;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent db153cdf
Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 63 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePowerLineService.java
View file @ 00267669
......@@ -6,9 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils;
import pps.cloud.system.service.SysOrganizationCloudService;
import pps.cloud.system.service.data.GetSysOrganizationViewInput;
import pps.cloud.system.service.data.GetSysOrganizationViewOutput;
import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
import pps.core.base.entity.*;
import pps.core.base.mapper.*;
......@@ -40,7 +37,6 @@ import xstartup.helper.XTransactionHelper;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
/**
* 输电线路配置模块
......@@ -208,7 +204,8 @@ public class BasePowerLineService {
List<BasePowerLineView> list = mapper.selectList(record);
PageInfo<BasePowerLineView> pageInfo = new PageInfo<>(list);
List<QueryBasePowerLineViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePowerLineViewOutput.class);
String ouName = this.getSysOrgNameById(context, input.getOuId());
if (CollectionUtil.isNotEmpty(outputs)) {
String ouName = DictUtils.getSysOrgNameById(context, input.getOuId());
List<QuerySysDictionaryViewOutput> gridTypeList = DictUtils.getDictList(context, DictTypeConstant.GRID_TYPE);
List<QuerySysDictionaryViewOutput> lineTypeList = DictUtils.getDictList(context, DictTypeConstant.LINE_TYPE);
for (QueryBasePowerLineViewOutput output : outputs) {
......@@ -220,6 +217,7 @@ public class BasePowerLineService {
DictUtils.getDicNameByStream(lineTypeList, output.getLineTypeKey())
);
}
}
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
......@@ -290,26 +288,6 @@ public class BasePowerLineService {
/*-----------------------------------private-----------------------------------*/
/**
* 通过组织id获取系统组织名称
*
* @param context 上下文
* @param ouId 组织id
* @return {@link String}
*/
private String getSysOrgNameById(XContext context, String ouId) {
SysOrganizationCloudService orgCloudService = context.getBean(SysOrganizationCloudService.class);
GetSysOrganizationViewInput viewInput = new GetSysOrganizationViewInput();
viewInput.setId(ouId);
XSingleResult<GetSysOrganizationViewOutput> organization = orgCloudService.getSysOrganizationById(context, viewInput);
organization.throwIfFail();
return Optional.ofNullable(organization.getResult())
.map(GetSysOrganizationViewOutput::getOuName)
.orElse(null);
}
/**
* 通过线路ID获取线路信息
*
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePriceStrategyService.java
View file @ 00267669
......@@ -9,19 +9,12 @@ import org.apache.commons.lang3.StringUtils;
import pps.cloud.system.service.SystemAreaService;
import pps.cloud.system.service.data.GetSysAreaInput;
import pps.cloud.system.service.data.GetSysAreaOutput;
import pps.core.base.entity.BasePriceStrategyDetailEnt;
import pps.core.base.entity.BasePriceStrategyEnt;
import pps.core.base.entity.BasePriceStrategyMonthEnt;
import pps.core.base.entity.BasePriceStrategyView;
import pps.core.base.mapper.BasePriceStrategyDetailMapper;
import pps.core.base.mapper.BasePriceStrategyMapper;
import pps.core.base.mapper.BasePriceStrategyMonthMapper;
import pps.core.base.mapper.BasePriceStrategyViewMapper;
import pps.core.base.entity.*;
import pps.core.base.mapper.*;
import pps.core.base.service.data.base_price_strategy.*;
import pps.core.base.service.data.base_price_strategy_month.CreateBasePriceStrategyMonthInput;
import pps.core.base.service.data.base_price_strategy_month.GetBasePriceStrategyMonthOutput;
import pps.core.base.service.data.base_price_strategy_month.UpdateBasePriceStrategyMonthInput;
import pps.core.base.utils.DictUtils;
import pps.core.common.entity.BaseEnt;
import pps.core.common.session.PpsUserSession;
import pps.core.common.utils.BaseEntUtils;
......@@ -144,7 +137,7 @@ public class BasePriceStrategyService {
@XText("市电峰谷策略--删除")
public XServiceResult deleteBasePriceStrategy(XContext context, DeleteBasePriceStrategyInput input) {
String strategyId = input.getId();
if (DictUtils.checkStrategyIsReference(context, strategyId)) {
if (this.checkStrategyIsReference(context, strategyId)) {
return XServiceResult.error(992, "当前策略已被引用");
}
return XTransactionHelper.begin(context, () -> {
......@@ -287,6 +280,21 @@ public class BasePriceStrategyService {
/*-----------------------------------private-----------------------------------*/
/**
* 检查市电峰谷策略是否被引用
*
* @param context 上下文
* @param strategyId 战略id
* @return boolean
*/
private boolean checkStrategyIsReference(XContext context, String strategyId) {
BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);
Long count = mapper.selectCount(new LambdaQueryWrapper<BasePowerLineEnt>()
.eq(BasePowerLineEnt::getStrategyId, strategyId)
);
return count > 0;
}
/**
* 获得系统输出列表区域
*
......
C09-base/pps-core-base/src/main/java/pps/core/base/utils/DictUtils.java
View file @ 00267669
package pps.core.base.utils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.apache.commons.lang3.StringUtils;
import pps.cloud.system.service.SysOrganizationCloudService;
import pps.cloud.system.service.SystemDictionaryService;
import pps.cloud.system.service.data.GetSysOrganizationViewInput;
import pps.cloud.system.service.data.GetSysOrganizationViewOutput;
import pps.cloud.system.service.data.QuerySysDictionaryViewInput;
import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
import pps.core.base.entity.BasePowerLineEnt;
import pps.core.base.mapper.BasePowerLineMapper;
import xstartup.base.XContext;
import xstartup.data.XListResult;
import xstartup.data.XSingleResult;
import java.util.List;
import java.util.Optional;
/**
* 封装工具类
......@@ -20,6 +22,8 @@ import java.util.List;
*/
public class DictUtils {
/*-------------------------服务调用-------------------------*/
/**
* 通过字典类型查询字典
*
......@@ -38,6 +42,26 @@ public class DictUtils {
return dictPageResult.getResult();
}
/**
* 通过组织id获取系统组织名称
*
* @param context 上下文
* @param ouId 组织id
* @return {@link String}
*/
public static String getSysOrgNameById(XContext context, String ouId) {
SysOrganizationCloudService orgCloudService = context.getBean(SysOrganizationCloudService.class);
GetSysOrganizationViewInput viewInput = new GetSysOrganizationViewInput();
viewInput.setId(ouId);
XSingleResult<GetSysOrganizationViewOutput> organization = orgCloudService.getSysOrganizationById(context, viewInput);
organization.throwIfFail();
return Optional.ofNullable(organization.getResult())
.map(GetSysOrganizationViewOutput::getOuName)
.orElse(null);
}
/*-------------------------其他-------------------------*/
/**
* 通过字典编码匹配查询字典名称
*
......@@ -52,19 +76,4 @@ public class DictUtils {
.findAny()
.orElse(null);
}
/**
* 检查市电峰谷策略是否被引用
*
* @param context 上下文
* @param strategyId 战略id
* @return boolean
*/
public static boolean checkStrategyIsReference(XContext context, String strategyId) {
BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);
Long count = mapper.selectCount(new LambdaQueryWrapper<BasePowerLineEnt>()
.eq(BasePowerLineEnt::getStrategyId, strategyId)
);
return count > 0;
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment