Skip to content

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

feat(吉林演示): 松原 

1.修改风电站运行状态接口,增加模拟实际发电功率处理逻辑,完成接口冒烟测试;
2.修改天气数据处理定时任务,解决晚上十一点半天气预报数据处理异常问题,修改风资源预测数据和光伏资源预测数据时间处理逻辑,完成接口冒烟测试;
3.修改风机预测数据模块相关功能接口,增加判断当前部署环境逻辑,解决查询全量数据问题;
4.修改风机预测数据生成模块第三方风力发电数据生成功能,增加数据拆分逻辑,区分15分数据层级,完成功能冒烟测试;
5.修改风机预测监控页面历史风速统计接口,统计数据不显示问题及小数位过多问题;
6.修改天气预报数据爬取定时任务,解决8:00-11:00期间没有数据问题,完成功能验证;
7,修改风资源预测历史数据处理定时任务,修改查询逻辑,解决未保存历史预测数据问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 701c72c8
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1507 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/entity/SysPageInfoEnt.java deleted 100644 → 0
View file @ 701c72c8
package pps.core.base.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import xstartup.annotation.XText;
import java.io.Serializable;
import java.util.Date;
@TableName("sys_page_info")
public class SysPageInfoEnt implements Serializable {
@XText("主键")
@TableField
private String id;
@XText("页面id")
@TableField
private String pageId;
@XText("名称")
@TableField
private String pageName;
@XText("描述")
@TableField
private String pageRemark;
@XText("内容")
@TableField
private String pageContext;
@XText("发布状态1、已发布0、未发布")
@TableField
private Integer releaseState;
@XText("发布版本")
@TableField
private Integer releaseVersion;
@XText("创建人")
@TableField
private String createById;
@XText("创建人名称")
@TableField
private String createByName;
@XText("修改人")
@TableField
private String modifyById;
@XText("修改人名称")
@TableField
private String modifyByName;
@XText("修改时间")
@TableField
private Date modifyTime;
@XText("创建时间")
@TableField
private Date createTime;
@XText("发布时间")
@TableField
private Date releaseTime;
@XText("是否历史1、是0、否")
@TableField
private Integer isHistory;
public Integer getIsHistory() {
return isHistory;
}
public void setIsHistory(Integer isHistory) {
this.isHistory = isHistory;
}
public Date getReleaseTime() {
return releaseTime;
}
public void setReleaseTime(Date releaseTime) {
this.releaseTime = releaseTime;
}
public Date getModifyTime() {
return modifyTime;
}
public void setModifyTime(Date modifyTime) {
this.modifyTime = modifyTime;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getId() {
return this.id;
}
public void setId(String value) {
this.id = value;
}
public String getPageId() {
return this.pageId;
}
public void setPageId(String value) {
this.pageId = value;
}
public String getPageName() {
return this.pageName;
}
public void setPageName(String value) {
this.pageName = value;
}
public String getPageRemark() {
return this.pageRemark;
}
public void setPageRemark(String value) {
this.pageRemark = value;
}
public String getPageContext() {
return pageContext;
}
public void setPageContext(String pageContext) {
this.pageContext = pageContext;
}
public Integer getReleaseState() {
return this.releaseState;
}
public void setReleaseState(Integer value) {
this.releaseState = value;
}
public Integer getReleaseVersion() {
return this.releaseVersion;
}
public void setReleaseVersion(Integer value) {
this.releaseVersion = value;
}
public String getCreateById() {
return this.createById;
}
public void setCreateById(String value) {
this.createById = value;
}
public String getCreateByName() {
return this.createByName;
}
public void setCreateByName(String value) {
this.createByName = value;
}
public String getModifyById() {
return this.modifyById;
}
public void setModifyById(String value) {
this.modifyById = value;
}
public String getModifyByName() {
return this.modifyByName;
}
public void setModifyByName(String value) {
this.modifyByName = value;
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/entity/SysPageInfoView.java deleted 100644 → 0
View file @ 701c72c8
package pps.core.base.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import xstartup.annotation.XText;
import java.io.Serializable;
import java.util.Date;
public class SysPageInfoView implements Serializable {
@XText("主键")
@TableField
private String id;
@XText("页面id")
@TableField
private String pageId;
@XText("名称")
@TableField
private String pageName;
@XText("描述")
@TableField
private String pageRemark;
@XText("内容")
@TableField
private String pageContext;
@XText("发布状态1、已发布0、未发布")
@TableField
private Integer releaseState;
@XText("发布版本")
@TableField
private Integer releaseVersion;
@XText("创建人")
@TableField
private String createById;
@XText("创建人名称")
@TableField
private String createByName;
@XText("修改人")
@TableField
private String modifyById;
@XText("修改人名称")
@TableField
private String modifyByName;
@XText("修改时间")
@TableField
private Date modifyTime;
@XText("创建时间")
@TableField
private Date createTime;
@XText("发布时间")
@TableField
private Date releaseTime;
public Date getReleaseTime() {
return releaseTime;
}
public void setReleaseTime(Date releaseTime) {
this.releaseTime = releaseTime;
}
public Date getModifyTime() {
return modifyTime;
}
public void setModifyTime(Date modifyTime) {
this.modifyTime = modifyTime;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getId() {
return this.id;
}
public void setId(String value) {
this.id = value;
}
public String getPageId() {
return this.pageId;
}
public void setPageId(String value) {
this.pageId = value;
}
public String getPageName() {
return this.pageName;
}
public void setPageName(String value) {
this.pageName = value;
}
public String getPageRemark() {
return this.pageRemark;
}
public void setPageRemark(String value) {
this.pageRemark = value;
}
public String getPageContext() {
return pageContext;
}
public void setPageContext(String pageContext) {
this.pageContext = pageContext;
}
public Integer getReleaseState() {
return this.releaseState;
}
public void setReleaseState(Integer value) {
this.releaseState = value;
}
public Integer getReleaseVersion() {
return this.releaseVersion;
}
public void setReleaseVersion(Integer value) {
this.releaseVersion = value;
}
public String getCreateById() {
return this.createById;
}
public void setCreateById(String value) {
this.createById = value;
}
public String getCreateByName() {
return this.createByName;
}
public void setCreateByName(String value) {
this.createByName = value;
}
public String getModifyById() {
return this.modifyById;
}
public void setModifyById(String value) {
this.modifyById = value;
}
public String getModifyByName() {
return this.modifyByName;
}
public void setModifyByName(String value) {
this.modifyByName = value;
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/mapper/SysPageInfoMapper.java deleted 100644 → 0
View file @ 701c72c8
package pps.core.base.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.base.entity.SysPageInfoEnt;
@Repository(value = "pps.core.base.mapper.SysPageInfoMapper")
public interface SysPageInfoMapper extends BaseMapper<SysPageInfoEnt> {
}
C09-base/pps-core-base/src/main/java/pps/core/base/mapper/SysPageInfoViewMapper.java deleted 100644 → 0
View file @ 701c72c8
package pps.core.base.mapper;
import org.springframework.stereotype.Repository;
import pps.core.base.entity.SysPageInfoView;
import java.util.List;
@Repository(value = "pps.core.base.mapper.SysPageInfoViewMapper")
public interface SysPageInfoViewMapper {
SysPageInfoView selectOne(SysPageInfoView record);
List<SysPageInfoView> selectList(SysPageInfoView record);
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/SysPageInfoService.java deleted 100644 → 0
View file @ 701c72c8
package pps.core.base.service;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import pps.core.base.entity.SysPageInfoEnt;
import pps.core.base.mapper.SysPageInfoMapper;
import pps.core.base.service.data.sys_page_info.*;
import pps.core.common.session.PpsUserSession;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
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.XApiGet;
import xstartup.feature.api.annotation.XApiPost;
import xstartup.feature.mybatis.helper.XMapperHelper;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@XService
public class SysPageInfoService {
@XText("创建页面配置")
@XApiPost
public XServiceResult createSysPageInfo(XContext context, CreateSysPageInfoInput input) {
SysPageInfoMapper mapper = context.getBean(SysPageInfoMapper.class);
PpsUserSession session = context.getSession(PpsUserSession.class);
SysPageInfoEnt entity = new SysPageInfoEnt();
XCopyUtils.copyObject(input, entity);
entity.setId(UUID.randomUUID().toString());
entity.setPageId(UUID.randomUUID().toString());
entity.setReleaseState(1);
entity.setCreateById(session.getId());
entity.setCreateByName(session.getLoginName());
entity.setCreateTime(new Date());
mapper.insert(entity);
return XServiceResult.OK;
}
@XText("修改页面配置")
@XApiPost
public XServiceResult updateSysPageInfo(XContext context, UpdateSysPageInfoInput input) {
SysPageInfoMapper mapper = context.getBean(SysPageInfoMapper.class);
PpsUserSession session = context.getSession(PpsUserSession.class);
SysPageInfoEnt entity = mapper.selectOne(new LambdaQueryWrapper<SysPageInfoEnt>()
.eq(SysPageInfoEnt::getId, input.getId()));
if (ObjectUtil.isNull(entity)) {
return XServiceResult.error(context, XError.NotFound);
}
if (CharSequenceUtil.isNotBlank(input.getPageContext())) {
entity.setPageContext(input.getPageContext());
}
if (CharSequenceUtil.isNotBlank(input.getPageName())) {
entity.setPageName(input.getPageName());
}
if (CharSequenceUtil.isNotBlank(input.getPageRemark())) {
entity.setPageRemark(input.getPageRemark());
}
entity.setModifyTime(new Date());
entity.setModifyByName(session.getLoginName());
entity.setModifyById(session.getId());
mapper.updateById(entity);
return XServiceResult.OK;
}
@XText("删除页面配置")
@XApiPost
public XServiceResult deleteSysPageInfo(XContext context, DeleteSysPageInfoInput input) {
SysPageInfoMapper mapper = context.getBean(SysPageInfoMapper.class);
SysPageInfoEnt entity = mapper.selectOne(new LambdaQueryWrapper<SysPageInfoEnt>()
.eq(SysPageInfoEnt::getId, input.getId()));
if (ObjectUtil.isNull(entity)) {
return XServiceResult.error(context, XError.NotFound);
}
mapper.deleteById(entity);
return XServiceResult.OK;
}
@XText("获取详情")
@XApiGet
public XSingleResult<GetSysPageInfoOutput> getSysPageInfo(XContext context, GetSysPageInfoInput input) {
SysPageInfoMapper mapper = context.getBean(SysPageInfoMapper.class);
SysPageInfoEnt entity = mapper.selectOne(new LambdaQueryWrapper<SysPageInfoEnt>()
.eq(SysPageInfoEnt::getId, input.getId()));
if (ObjectUtil.isNull(entity)) {
return XSingleResult.error(context, XError.NotFound);
}
GetSysPageInfoOutput output = new GetSysPageInfoOutput();
XCopyUtils.copyObject(entity, output);
return XSingleResult.success(output);
}
@XText("条件查询列表数据")
@XApiGet
public XPageResult<QuerySysPageInfoOutput> querySysPageInfo(XContext context, QuerySysPageInfoInput input) {
SysPageInfoMapper mapper = context.getBean(SysPageInfoMapper.class);
QueryWrapper<SysPageInfoEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda()
.eq(CharSequenceUtil.isNotBlank(input.getPageId()), SysPageInfoEnt::getPageId, input.getPageId())
.eq(ObjectUtil.isNotNull(input.getReleaseState()), SysPageInfoEnt::getReleaseState, input.getReleaseState())
.like(CharSequenceUtil.isNotBlank(input.getPageName()), SysPageInfoEnt::getPageName, input.getPageName())
.orderByDesc(SysPageInfoEnt::getCreateTime);
return XMapperHelper.query(mapper, input, queryWrapper, QuerySysPageInfoOutput.class);
}
@XText("发布页面信息")
@XApiGet
public XServiceResult releasePageInfo(XContext context, GetSysPageInfoInput input) {
SysPageInfoMapper mapper = context.getBean(SysPageInfoMapper.class);
//根据id查询需要发布的数据
SysPageInfoEnt sysPageInfoEnt = mapper.selectOne(new LambdaQueryWrapper<SysPageInfoEnt>()
.eq(SysPageInfoEnt::getId, input.getId()));
//查询当前页面处于发布状态的版本删除
List<SysPageInfoEnt> sysPageInfos = mapper.selectList(new LambdaQueryWrapper<SysPageInfoEnt>()
.eq(SysPageInfoEnt::getPageId, sysPageInfoEnt.getPageId())
.eq(SysPageInfoEnt::getReleaseVersion, 1));
if (CollUtil.isNotEmpty(sysPageInfos)) {
SysPageInfoEnt pageInfoEnt = sysPageInfos.get(0);
mapper.deleteById(pageInfoEnt);
}
//查询发布的最大版本号
List<SysPageInfoEnt> sysPageInfoEnts = mapper.selectList(new LambdaQueryWrapper<SysPageInfoEnt>()
.eq(SysPageInfoEnt::getPageId, sysPageInfoEnt.getPageId())
.isNotNull(SysPageInfoEnt::getReleaseVersion)
.orderByDesc(SysPageInfoEnt::getReleaseVersion));
if (CollUtil.isNotEmpty(sysPageInfoEnts)) {
SysPageInfoEnt sysPageInfo = sysPageInfoEnts.get(0);
if (ObjectUtil.isNotNull(sysPageInfo.getReleaseVersion())) {
sysPageInfoEnt.setReleaseVersion(sysPageInfo.getReleaseVersion() + 1);
} else {
sysPageInfoEnt.setReleaseVersion(1);
}
} else {
sysPageInfoEnt.setReleaseVersion(1);
}
sysPageInfoEnt.setReleaseState(1);
sysPageInfoEnt.setReleaseTime(new Date());
mapper.updateById(sysPageInfoEnt);
return XServiceResult.OK;
}
@XText("根据pageId获取详情")
@XApiGet
public XSingleResult<GetSysPageInfoOutput> getSysPageInfoByPageId(XContext context, GetSysPageInfoInput input) {
SysPageInfoMapper mapper = context.getBean(SysPageInfoMapper.class);
SysPageInfoEnt entity = mapper.selectOne(new LambdaQueryWrapper<SysPageInfoEnt>()
.eq(SysPageInfoEnt::getPageId, input.getPageId())
.eq(SysPageInfoEnt::getReleaseState, 1));
if (ObjectUtil.isNull(entity)) {
return XSingleResult.error(context, XError.NotFound);
}
GetSysPageInfoOutput output = new GetSysPageInfoOutput();
XCopyUtils.copyObject(entity, output);
return XSingleResult.success(output);
}
}
\ No newline at end of file
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/sys_page_info/CreateSysPageInfoInput.java deleted 100644 → 0
View file @ 701c72c8
package pps.core.base.service.data.sys_page_info;
import xstartup.annotation.XText;
public class CreateSysPageInfoInput {
@XText("主键")
private String id;
@XText("页面id")
private String pageId;
@XText("名称")
private String pageName;
@XText("描述")
private String pageRemark;
@XText("内容")
private String pageContext;
@XText("发布状态1、已发布0、未发布")
private Integer releaseState;
@XText("发布版本")
private Integer releaseVersion;
@XText("创建人")
private String createById;
@XText("创建人名称")
private String createByName;
@XText("修改人")
private String modifyById;
@XText("修改人名称")
private String modifyByName;
public String getId() {
return this.id;
}
public void setId(String value) {
this.id = value;
}
public String getPageId() {
return this.pageId;
}
public void setPageId(String value) {
this.pageId = value;
}
public String getPageName() {
return this.pageName;
}
public void setPageName(String value) {
this.pageName = value;
}
public String getPageRemark() {
return this.pageRemark;
}
public void setPageRemark(String value) {
this.pageRemark = value;
}
public String getPageContext() {
return pageContext;
}
public void setPageContext(String pageContext) {
this.pageContext = pageContext;
}
public Integer getReleaseState() {
return this.releaseState;
}
public void setReleaseState(Integer value) {
this.releaseState = value;
}
public Integer getReleaseVersion() {
return this.releaseVersion;
}
public void setReleaseVersion(Integer value) {
this.releaseVersion = value;
}
public String getCreateById() {
return this.createById;
}
public void setCreateById(String value) {
this.createById = value;
}
public String getCreateByName() {
return this.createByName;
}
public void setCreateByName(String value) {
this.createByName = value;
}
public String getModifyById() {
return this.modifyById;
}
public void setModifyById(String value) {
this.modifyById = value;
}
public String getModifyByName() {
return this.modifyByName;
}
public void setModifyByName(String value) {
this.modifyByName = value;
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/sys_page_info/DeleteSysPageInfoInput.java deleted 100644 → 0
View file @ 701c72c8
package pps.core.base.service.data.sys_page_info;
import xstartup.annotation.XText;
public class DeleteSysPageInfoInput {
@XText("主键")
private String id;
@XText("页面id")
private String pageId;
@XText("名称")
private String pageName;
@XText("描述")
private String pageRemark;
@XText("内容")
private String pageContext;
@XText("发布状态1、已发布0、未发布")
private Integer releaseState;
@XText("发布版本")
private Integer releaseVersion;
@XText("创建人")
private String createById;
@XText("创建人名称")
private String createByName;
@XText("修改人")
private String modifyById;
@XText("修改人名称")
private String modifyByName;
public String getId() {
return this.id;
}
public void setId(String value) {
this.id = value;
}
public String getPageId() {
return this.pageId;
}
public void setPageId(String value) {
this.pageId = value;
}
public String getPageName() {
return this.pageName;
}
public void setPageName(String value) {
this.pageName = value;
}
public String getPageRemark() {
return this.pageRemark;
}
public void setPageRemark(String value) {
this.pageRemark = value;
}
public String getPageContext() {
return pageContext;
}
public void setPageContext(String pageContext) {
this.pageContext = pageContext;
}
public Integer getReleaseState() {
return this.releaseState;
}
public void setReleaseState(Integer value) {
this.releaseState = value;
}
public Integer getReleaseVersion() {
return this.releaseVersion;
}
public void setReleaseVersion(Integer value) {
this.releaseVersion = value;
}
public String getCreateById() {
return this.createById;
}
public void setCreateById(String value) {
this.createById = value;
}
public String getCreateByName() {
return this.createByName;
}
public void setCreateByName(String value) {
this.createByName = value;
}
public String getModifyById() {
return this.modifyById;
}
public void setModifyById(String value) {
this.modifyById = value;
}
public String getModifyByName() {
return this.modifyByName;
}
public void setModifyByName(String value) {
this.modifyByName = value;
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/sys_page_info/GetSysPageInfoInput.java deleted 100644 → 0
View file @ 701c72c8
package pps.core.base.service.data.sys_page_info;
import xstartup.annotation.XText;
public class GetSysPageInfoInput {
@XText("主键")
private String id;
@XText("页面id")
private String pageId;
@XText("名称")
private String pageName;
@XText("描述")
private String pageRemark;
@XText("内容")
private String pageContext;
@XText("发布状态1、已发布0、未发布")
private Integer releaseState;
@XText("发布版本")
private Integer releaseVersion;
@XText("创建人")
private String createById;
@XText("创建人名称")
private String createByName;
@XText("修改人")
private String modifyById;
@XText("修改人名称")
private String modifyByName;
public String getId() {
return this.id;
}
public void setId(String value) {
this.id = value;
}
public String getPageId() {
return this.pageId;
}
public void setPageId(String value) {
this.pageId = value;
}
public String getPageName() {
return this.pageName;
}
public void setPageName(String value) {
this.pageName = value;
}
public String getPageRemark() {
return this.pageRemark;
}
public void setPageRemark(String value) {
this.pageRemark = value;
}
public String getPageContext() {
return pageContext;
}
public void setPageContext(String pageContext) {
this.pageContext = pageContext;
}
public Integer getReleaseState() {
return this.releaseState;
}
public void setReleaseState(Integer value) {
this.releaseState = value;
}
public Integer getReleaseVersion() {
return this.releaseVersion;
}
public void setReleaseVersion(Integer value) {
this.releaseVersion = value;
}
public String getCreateById() {
return this.createById;
}
public void setCreateById(String value) {
this.createById = value;
}
public String getCreateByName() {
return this.createByName;
}
public void setCreateByName(String value) {
this.createByName = value;
}
public String getModifyById() {
return this.modifyById;
}
public void setModifyById(String value) {
this.modifyById = value;
}
public String getModifyByName() {
return this.modifyByName;
}
public void setModifyByName(String value) {
this.modifyByName = value;
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/sys_page_info/GetSysPageInfoOutput.java deleted 100644 → 0
View file @ 701c72c8
package pps.core.base.service.data.sys_page_info;
import xstartup.annotation.XText;
public class GetSysPageInfoOutput {
@XText("主键")
private String id;
@XText("页面id")
private String pageId;
@XText("名称")
private String pageName;
@XText("描述")
private String pageRemark;
@XText("内容")
private String pageContext;
@XText("发布状态1、已发布0、未发布")
private Integer releaseState;
@XText("发布版本")
private Integer releaseVersion;
@XText("创建人")
private String createById;
@XText("创建人名称")
private String createByName;
@XText("修改人")
private String modifyById;
@XText("修改人名称")
private String modifyByName;
public String getId() {
return this.id;
}
public void setId(String value) {
this.id = value;
}
public String getPageId() {
return this.pageId;
}
public void setPageId(String value) {
this.pageId = value;
}
public String getPageName() {
return this.pageName;
}
public void setPageName(String value) {
this.pageName = value;
}
public String getPageRemark() {
return this.pageRemark;
}
public void setPageRemark(String value) {
this.pageRemark = value;
}
public String getPageContext() {
return pageContext;
}
public void setPageContext(String pageContext) {
this.pageContext = pageContext;
}
public Integer getReleaseState() {
return this.releaseState;
}
public void setReleaseState(Integer value) {
this.releaseState = value;
}
public Integer getReleaseVersion() {
return this.releaseVersion;
}
public void setReleaseVersion(Integer value) {
this.releaseVersion = value;
}
public String getCreateById() {
return this.createById;
}
public void setCreateById(String value) {
this.createById = value;
}
public String getCreateByName() {
return this.createByName;
}
public void setCreateByName(String value) {
this.createByName = value;
}
public String getModifyById() {
return this.modifyById;
}
public void setModifyById(String value) {
this.modifyById = value;
}
public String getModifyByName() {
return this.modifyByName;
}
public void setModifyByName(String value) {
this.modifyByName = value;
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/sys_page_info/QuerySysPageInfoInput.java deleted 100644 → 0
View file @ 701c72c8
package pps.core.base.service.data.sys_page_info;
import xstartup.annotation.XText;
import xstartup.base.data.XPageInput;
public class QuerySysPageInfoInput extends XPageInput {
@XText("主键")
private String id;
@XText("页面id")
private String pageId;
@XText("名称")
private String pageName;
@XText("描述")
private String pageRemark;
@XText("内容")
private String pageContext;
@XText("发布状态1、已发布0、未发布")
private Integer releaseState;
@XText("发布版本")
private Integer releaseVersion;
@XText("创建人")
private String createById;
@XText("创建人名称")
private String createByName;
@XText("修改人")
private String modifyById;
@XText("修改人名称")
private String modifyByName;
public String getId() {
return this.id;
}
public void setId(String value) {
this.id = value;
}
public String getPageId() {
return this.pageId;
}
public void setPageId(String value) {
this.pageId = value;
}
public String getPageName() {
return this.pageName;
}
public void setPageName(String value) {
this.pageName = value;
}
public String getPageRemark() {
return this.pageRemark;
}
public void setPageRemark(String value) {
this.pageRemark = value;
}
public String getPageContext() {
return pageContext;
}
public void setPageContext(String pageContext) {
this.pageContext = pageContext;
}
public Integer getReleaseState() {
return this.releaseState;
}
public void setReleaseState(Integer value) {
this.releaseState = value;
}
public Integer getReleaseVersion() {
return this.releaseVersion;
}
public void setReleaseVersion(Integer value) {
this.releaseVersion = value;
}
public String getCreateById() {
return this.createById;
}
public void setCreateById(String value) {
this.createById = value;
}
public String getCreateByName() {
return this.createByName;
}
public void setCreateByName(String value) {
this.createByName = value;
}
public String getModifyById() {
return this.modifyById;
}
public void setModifyById(String value) {
this.modifyById = value;
}
public String getModifyByName() {
return this.modifyByName;
}
public void setModifyByName(String value) {
this.modifyByName = value;
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/sys_page_info/QuerySysPageInfoOutput.java deleted 100644 → 0
View file @ 701c72c8
package pps.core.base.service.data.sys_page_info;
import com.baomidou.mybatisplus.annotation.TableField;
import xstartup.annotation.XText;
import xstartup.base.data.XPageInput;
public class QuerySysPageInfoOutput extends XPageInput {
@XText("主键")
private String id;
@XText("页面id")
private String pageId;
@XText("名称")
private String pageName;
@XText("描述")
private String pageRemark;
@XText("内容")
private String pageContext;
@XText("发布状态1、已发布0、未发布")
private Integer releaseState;
@XText("发布版本")
private Integer releaseVersion;
@XText("创建人")
private String createById;
@XText("创建人名称")
private String createByName;
@XText("修改人")
private String modifyById;
@XText("修改人名称")
private String modifyByName;
@XText("是否历史1、是0、否")
@TableField
private Integer isHistory;
public Integer getIsHistory() {
return isHistory;
}
public void setIsHistory(Integer isHistory) {
this.isHistory = isHistory;
}
public String getId() {
return this.id;
}
public void setId(String value) {
this.id = value;
}
public String getPageId() {
return this.pageId;
}
public void setPageId(String value) {
this.pageId = value;
}
public String getPageName() {
return this.pageName;
}
public void setPageName(String value) {
this.pageName = value;
}
public String getPageRemark() {
return this.pageRemark;
}
public void setPageRemark(String value) {
this.pageRemark = value;
}
public String getPageContext() {
return pageContext;
}
public void setPageContext(String pageContext) {
this.pageContext = pageContext;
}
public Integer getReleaseState() {
return this.releaseState;
}
public void setReleaseState(Integer value) {
this.releaseState = value;
}
public Integer getReleaseVersion() {
return this.releaseVersion;
}
public void setReleaseVersion(Integer value) {
this.releaseVersion = value;
}
public String getCreateById() {
return this.createById;
}
public void setCreateById(String value) {
this.createById = value;
}
public String getCreateByName() {
return this.createByName;
}
public void setCreateByName(String value) {
this.createByName = value;
}
public String getModifyById() {
return this.modifyById;
}
public void setModifyById(String value) {
this.modifyById = value;
}
public String getModifyByName() {
return this.modifyByName;
}
public void setModifyByName(String value) {
this.modifyByName = value;
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/sys_page_info/UpdateSysPageInfoInput.java deleted 100644 → 0
View file @ 701c72c8
package pps.core.base.service.data.sys_page_info;
import xstartup.annotation.XText;
public class UpdateSysPageInfoInput {
@XText("主键")
private String id;
@XText("页面id")
private String pageId;
@XText("名称")
private String pageName;
@XText("描述")
private String pageRemark;
@XText("内容")
private String pageContext;
@XText("发布状态1、已发布0、未发布")
private Integer releaseState;
@XText("发布版本")
private Integer releaseVersion;
@XText("创建人")
private String createById;
@XText("创建人名称")
private String createByName;
@XText("修改人")
private String modifyById;
@XText("修改人名称")
private String modifyByName;
public String getId() {
return this.id;
}
public void setId(String value) {
this.id = value;
}
public String getPageId() {
return this.pageId;
}
public void setPageId(String value) {
this.pageId = value;
}
public String getPageName() {
return this.pageName;
}
public void setPageName(String value) {
this.pageName = value;
}
public String getPageRemark() {
return this.pageRemark;
}
public void setPageRemark(String value) {
this.pageRemark = value;
}
public String getPageContext() {
return pageContext;
}
public void setPageContext(String pageContext) {
this.pageContext = pageContext;
}
public Integer getReleaseState() {
return this.releaseState;
}
public void setReleaseState(Integer value) {
this.releaseState = value;
}
public Integer getReleaseVersion() {
return this.releaseVersion;
}
public void setReleaseVersion(Integer value) {
this.releaseVersion = value;
}
public String getCreateById() {
return this.createById;
}
public void setCreateById(String value) {
this.createById = value;
}
public String getCreateByName() {
return this.createByName;
}
public void setCreateByName(String value) {
this.createByName = value;
}
public String getModifyById() {
return this.modifyById;
}
public void setModifyById(String value) {
this.modifyById = value;
}
public String getModifyByName() {
return this.modifyByName;
}
public void setModifyByName(String value) {
this.modifyByName = value;
}
}
C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/SysPageInfoViewMapper.xml deleted 100644 → 0
View file @ 701c72c8
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.base.mapper.SysPageInfoViewMapper">
<resultMap id="BaseResultMap" type="pps.core.base.entity.SysPageInfoView">
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="page_id" property="pageId" jdbcType="VARCHAR"/>
<result column="page_name" property="pageName" jdbcType="VARCHAR"/>
<result column="page_remark" property="pageRemark" jdbcType="VARCHAR"/>
<result column="page_context" property="pageContext" jdbcType="VARCHAR"/>
<result column="release_state" property="releaseState" jdbcType="INTEGER"/>
<result column="release_version" property="releaseVersion" jdbcType="INTEGER"/>
<result column="create_by_id" property="createById" jdbcType="VARCHAR"/>
<result column="create_by_name" property="createByName" jdbcType="VARCHAR"/>
<result column="modify_by_id" property="modifyById" jdbcType="VARCHAR"/>
<result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
id
,
page_id,
page_name,
page_remark,
page_context,
release_state,
release_version,
create_by_id,
create_by_name,
modify_by_id,
modify_by_name
</sql>
<select id="selectOne" parameterType="pps.core.base.entity.SysPageInfoView" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from sys_page_info
where
id=#{id}
</select>
<select id="selectList" parameterType="pps.core.base.entity.SysPageInfoView" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from sys_page_info
where
id=#{id}
</select>
</mapper>
\ 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