Commit fc2a4294 authored by ZWT's avatar ZWT

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

1.优化基础信息配置-柴发设备模块新增,修改,删除,查询接口,优化代码结构增加事务处理;
2.优化基础信息配置-储能设备模块新增,修改,删除,查询接口,优化代码结构增加事务处理;
3.优化基础信息配置-井口设备模块新增,修改,删除,查询接口,优化代码结构增加事务处理;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 1b7bb5de
...@@ -3,8 +3,8 @@ package pps.core.base.service; ...@@ -3,8 +3,8 @@ package pps.core.base.service;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import pps.core.base.entity.BaseDieselGeneratorEnt;
import pps.core.base.entity.BasePowerLineWellheadEnt; import pps.core.base.entity.BasePowerLineWellheadEnt;
import pps.core.base.entity.BaseWellheadEnt; import pps.core.base.entity.BaseWellheadEnt;
import pps.core.base.mapper.BasePowerLineWellheadMapper; import pps.core.base.mapper.BasePowerLineWellheadMapper;
...@@ -61,9 +61,7 @@ public class BaseWellheadService extends BaseService { ...@@ -61,9 +61,7 @@ public class BaseWellheadService extends BaseService {
public XServiceResult updateBaseWellhead(XContext context, UpdateBaseWellheadInput input) { public XServiceResult updateBaseWellhead(XContext context, UpdateBaseWellheadInput input) {
return XTransactionHelper.begin(context, () -> { return XTransactionHelper.begin(context, () -> {
BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class); BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
BaseWellheadEnt entity = mapper.selectOne(new LambdaUpdateWrapper<BaseWellheadEnt>() BaseWellheadEnt entity = this.selectOneByWellheadId(input.getId(), mapper);
.eq(BaseModel::getId, input.getId())
);
if (Objects.isNull(entity)) { if (Objects.isNull(entity)) {
return XServiceResult.error(context, XError.NotFound); return XServiceResult.error(context, XError.NotFound);
} }
...@@ -85,14 +83,12 @@ public class BaseWellheadService extends BaseService { ...@@ -85,14 +83,12 @@ public class BaseWellheadService extends BaseService {
} }
return XTransactionHelper.begin(context, () -> { return XTransactionHelper.begin(context, () -> {
BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class); BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
BaseWellheadEnt entity = mapper.selectOne(new LambdaUpdateWrapper<BaseWellheadEnt>() BaseWellheadEnt entity = this.selectOneByWellheadId(wellheadId, mapper);
.eq(BaseModel::getId, wellheadId)
);
if (Objects.isNull(entity)) { if (Objects.isNull(entity)) {
return XServiceResult.error(context, XError.NotFound); return XServiceResult.error(context, XError.NotFound);
} }
entity = new BaseWellheadEnt(); entity = new BaseWellheadEnt();
entity.setId(input.getId()); entity.setId(wellheadId);
entity.setIsDeleted(BusinessConstant.ZERO); entity.setIsDeleted(BusinessConstant.ZERO);
PpsUserSession session = context.getSession(PpsUserSession.class); PpsUserSession session = context.getSession(PpsUserSession.class);
BaseUtils.setBaseModelDefault(entity, session); BaseUtils.setBaseModelDefault(entity, session);
...@@ -106,16 +102,11 @@ public class BaseWellheadService extends BaseService { ...@@ -106,16 +102,11 @@ public class BaseWellheadService extends BaseService {
@XApiGet @XApiGet
public XSingleResult<GetBaseWellheadOutput> getBaseWellhead(XContext context, GetBaseWellheadInput input) { public XSingleResult<GetBaseWellheadOutput> getBaseWellhead(XContext context, GetBaseWellheadInput input) {
BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class); BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
QueryWrapper<BaseWellheadEnt> queryWrapper = new QueryWrapper<>(); BaseWellheadEnt entity = this.selectOneByWellheadId(input.getId(), mapper);
queryWrapper.lambda() if (Objects.isNull(entity)) {
.eq(BaseWellheadEnt::getId, input.getId())
.eq(BaseWellheadEnt::getIsDeleted, BusinessConstant.ONE);
BaseWellheadEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XSingleResult.error(context, XError.NotFound); return XSingleResult.error(context, XError.NotFound);
} }
GetBaseWellheadOutput output = new GetBaseWellheadOutput(); GetBaseWellheadOutput output = XCopyUtils.copyNewObject(entity, GetBaseWellheadOutput.class);
XCopyUtils.copyObject(entity, output);
return XSingleResult.success(output); return XSingleResult.success(output);
} }
...@@ -152,4 +143,17 @@ public class BaseWellheadService extends BaseService { ...@@ -152,4 +143,17 @@ public class BaseWellheadService extends BaseService {
); );
return count > 0; return count > 0;
} }
/**
* 通过井口ID查询井口信息
*
* @param wellheadId 井口id
* @param mapper 映射器
* @return {@link BaseDieselGeneratorEnt}
*/
private BaseWellheadEnt selectOneByWellheadId(String wellheadId, BaseWellheadMapper mapper) {
return mapper.selectOne(new LambdaQueryWrapper<BaseWellheadEnt>()
.eq(BaseModel::getId, wellheadId)
);
}
} }
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