Commit 18f399d2 authored by ZWT's avatar ZWT

feat(能源管理系统): 间开制度管理

1.开发间开制度管理-基础间开配置模块新增功能,完成接口冒烟测试并生成接口文档;
2.排查无法获取mapper对象导致空指针异常问题,space模块添加mapper配置类;
3.开发间开制度管理-基础间开配置模块修改功能,完成接口冒烟测试并生成接口文档;
4.开发间开制度管理-基础间开配置模块逻辑删除功能,完成接口冒烟测试并生成接口文档;
5.开发间开制度管理-基础间开配置模块详情功能,完成接口冒烟测试并生成接口文档;
6.开发基础信息管理-输电线路Cloud模块通过ID查询线路基本信息功能;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent ac10ec7b
package pps.core.base.service.impl; package pps.core.base.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import pps.cloud.base.service.BasePowerLineCloudService; import pps.cloud.base.service.BasePowerLineCloudService;
...@@ -7,6 +7,7 @@ import pps.cloud.base.service.data.base_power_line.GetBasePowerLineViewOutput; ...@@ -7,6 +7,7 @@ import pps.cloud.base.service.data.base_power_line.GetBasePowerLineViewOutput;
import pps.core.base.entity.BasePowerLineEnt; import pps.core.base.entity.BasePowerLineEnt;
import pps.core.base.mapper.BasePowerLineMapper; import pps.core.base.mapper.BasePowerLineMapper;
import pps.core.common.entity.BaseModel; import pps.core.common.entity.BaseModel;
import xstartup.annotation.XService;
import xstartup.base.XContext; import xstartup.base.XContext;
import xstartup.base.util.XCopyUtils; import xstartup.base.util.XCopyUtils;
import xstartup.data.XSingleResult; import xstartup.data.XSingleResult;
...@@ -17,6 +18,7 @@ import xstartup.data.XSingleResult; ...@@ -17,6 +18,7 @@ import xstartup.data.XSingleResult;
* @author ZWT * @author ZWT
* @date 2023/09/05 15:37 * @date 2023/09/05 15:37
*/ */
@XService
public class BasePowerLineCloudServiceImpl implements BasePowerLineCloudService { public class BasePowerLineCloudServiceImpl implements BasePowerLineCloudService {
/** /**
......
...@@ -234,6 +234,7 @@ public class SpaceInstitutionDetailService { ...@@ -234,6 +234,7 @@ public class SpaceInstitutionDetailService {
} }
output.setOuName(ServiceUtil.getSysOrgNameById(context, output.getOuId())); output.setOuName(ServiceUtil.getSysOrgNameById(context, output.getOuId()));
output.setGridTypeName(ServiceUtil.getDictMap(context, BusinessConstant.GRID_TYPE).get(output.getGridTypeKey())); output.setGridTypeName(ServiceUtil.getDictMap(context, BusinessConstant.GRID_TYPE).get(output.getGridTypeKey()));
output.setLineName(ServiceUtil.getPowerLineNameById(context, output.getLineId()));
return XSingleResult.success(output); return XSingleResult.success(output);
} }
......
...@@ -115,18 +115,20 @@ public class ServiceUtil { ...@@ -115,18 +115,20 @@ public class ServiceUtil {
} }
/** /**
* 通过ID查询线路基本信息 * 通过ID查询线路名称
* *
* @param context 上下文 * @param context 上下文
* @param lineId 线路id * @param lineId 线路id
* @return {@link GetBasePowerLineViewOutput} * @return {@link String}
*/ */
public static GetBasePowerLineViewOutput getBasePowerLineById(XContext context, String lineId) { public static String getPowerLineNameById(XContext context, String lineId) {
BasePowerLineCloudService lineService = context.getBean(BasePowerLineCloudService.class); BasePowerLineCloudService lineService = context.getBean(BasePowerLineCloudService.class);
XSingleResult<GetBasePowerLineViewOutput> result = lineService.getBasePowerLineById(context, GetBasePowerLineInput.builder() XSingleResult<GetBasePowerLineViewOutput> result = lineService.getBasePowerLineById(context, GetBasePowerLineInput.builder()
.id(lineId) .id(lineId)
.build()); .build());
result.throwIfFail(); result.throwIfFail();
return result.getResult(); return Optional.ofNullable(result.getResult())
.map(GetBasePowerLineViewOutput::getLineName)
.orElse(null);
} }
} }
\ 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