Skip to content

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

feat(吉林演示): 松原 

1.基础信息配置模块创建基础风机电站表及基础风机电站关联测风塔表,同时生成对应代码;
2.开发基础信息配置模块基础风机电站新增接口,完成接口冒烟测试并生成接口文档同时生成接口测试用例;
3.开发基础信息配置模块基础风机电站详情接口,完成接口冒烟测试并生成接口文档同时生成接口测试用例;
4.开发基础信息配置模块基础风机电站修改接口,完成接口冒烟测试并生成接口文档同时生成接口测试用例;
5.开发基础信息配置模块基础风机电站删除接口,完成接口冒烟测试并生成接口文档同时生成接口测试用例;
6.开发基础信息配置模块基础风机电站分页查询接口,完成接口冒烟测试并生成接口文档同时生成接口测试用例;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 50a76772
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 59 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseWindTurbineService.java
View file @ 5418fdbb
......@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.UUID;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
......@@ -18,6 +17,7 @@ import pps.core.base.mapper.BaseWindTurbineMapper;
import pps.core.base.mapper.BaseWindTurbineViewMapper;
import pps.core.base.service.data.base_wind_tower.BaseWindTowerInput;
import pps.core.base.service.data.base_wind_turbine.*;
import pps.core.base.utils.ServiceUtil;
import pps.core.common.constant.BusinessConstant;
import pps.core.common.entity.BaseModel;
import pps.core.common.session.PpsUserSession;
......@@ -25,16 +25,12 @@ import pps.core.common.utils.BaseUtils;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.data.CustomQueryInput;
import xstartup.base.util.XCopyUtils;
import xstartup.data.XPageResult;
import xstartup.data.XServiceResult;
import xstartup.data.XSingleResult;
import xstartup.error.XError;
import xstartup.feature.api.annotation.XApiAnonymous;
import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost;
import xstartup.feature.mybatis.helper.XMapperHelper;
import xstartup.helper.XTransactionHelper;
import java.util.ArrayList;
......@@ -171,63 +167,20 @@ public class BaseWindTurbineService {
});
}
@XApiAnonymous
@XApiGet
public XPageResult<QueryBaseWindTurbineOutput> queryBaseWindTurbine(XContext context, QueryBaseWindTurbineInput input) {
BaseWindTurbineMapper mapper = context.getBean(BaseWindTurbineMapper.class);
QueryWrapper<BaseWindTurbineEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(BaseWindTurbineEnt::getId, input.getId())
.eq(BaseWindTurbineEnt::getIsDeleted, input.getIsDeleted())
.like(BaseWindTurbineEnt::getCreateById, input.getCreateById())
.like(BaseWindTurbineEnt::getCreateByName, input.getCreateByName())
.eq(BaseWindTurbineEnt::getCreateTime, input.getCreateTime())
.like(BaseWindTurbineEnt::getModifyById, input.getModifyById())
.like(BaseWindTurbineEnt::getModifyByName, input.getModifyByName())
.eq(BaseWindTurbineEnt::getModifyTime, input.getModifyTime())
.like(BaseWindTurbineEnt::getOuId, input.getOuId())
.like(BaseWindTurbineEnt::getOuName, input.getOuName())
.like(BaseWindTurbineEnt::getStationName, input.getStationName())
.eq(BaseWindTurbineEnt::getTotalPower, input.getTotalPower())
.eq(BaseWindTurbineEnt::getDiameter, input.getDiameter())
.eq(BaseWindTurbineEnt::getVaneLength, input.getVaneLength())
.eq(BaseWindTurbineEnt::getHubHeight, input.getHubHeight())
.eq(BaseWindTurbineEnt::getLongitude, input.getLongitude())
.eq(BaseWindTurbineEnt::getLatitude, input.getLatitude())
.eq(BaseWindTurbineEnt::getElevation, input.getElevation())
.eq(BaseWindTurbineEnt::getAreaCode, input.getAreaCode());
return XMapperHelper.query(mapper, input, queryWrapper, QueryBaseWindTurbineOutput.class);
}
@XApiAnonymous
@XApiGet
public XPageResult<QueryBaseWindTurbineOutput> dynamicQueryBaseWindTurbine(XContext context, CustomQueryInput input) {
BaseWindTurbineMapper mapper = context.getBean(BaseWindTurbineMapper.class);
return XMapperHelper.query(mapper, input, BaseWindTurbineEnt.class, QueryBaseWindTurbineOutput.class);
}
@XApiAnonymous
@XApiGet
public XSingleResult<GetBaseWindTurbineViewOutput> getBaseWindTurbineView(XContext context, GetBaseWindTurbineViewInput input) {
BaseWindTurbineViewMapper mapper = context.getBean(BaseWindTurbineViewMapper.class);
BaseWindTurbineView record = new BaseWindTurbineView();
XCopyUtils.copyObject(input, record);
BaseWindTurbineView view = mapper.selectOne(record);
if (view == null) {
return XSingleResult.error(context, XError.NotFound);
}
GetBaseWindTurbineViewOutput output = new GetBaseWindTurbineViewOutput();
XCopyUtils.copyObject(view, output);
return XSingleResult.success(output);
}
@XApiAnonymous
@XApiGet
/**
* 分页查询
*
* @param context 上下文
* @param input 输入
* @return {@link XPageResult }<{@link QueryBaseWindTurbineViewOutput }>
*/
@XText("分页查询")
@XApiPost
public XPageResult<QueryBaseWindTurbineViewOutput> queryBaseWindTurbineView(XContext context, QueryBaseWindTurbineViewInput input) {
BaseWindTurbineViewMapper mapper = context.getBean(BaseWindTurbineViewMapper.class);
BaseWindTurbineView record = new BaseWindTurbineView();
XCopyUtils.copyObject(input, record);
BaseWindTurbineView record = XCopyUtils.copyNewObject(input, BaseWindTurbineView.class);
PageHelper.startPage(input.getPage(), input.getLimit());
record.setOuList(ServiceUtil.getOrgIdsByPath(context, input.getOuId()));
List<BaseWindTurbineView> list = mapper.selectList(record);
PageInfo<BaseWindTurbineView> pageInfo = new PageInfo<>(list);
List<QueryBaseWindTurbineViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBaseWindTurbineViewOutput.class);
......
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