Commit ab87f44e authored by ZWT's avatar ZWT

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

1.间开制度管理-基础间开配置模块新增功能,完成接口冒烟测试并生成接口文档;
2.排查无法获取mapper对象导致空指针异常问题,space模块添加mapper配置类;
3.间开制度管理-基础间开配置模块修改功能,完成接口冒烟测试并生成接口文档;
4.间开制度管理-基础间开配置模块逻辑删除功能,完成接口冒烟测试并生成接口文档;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 7a60a21e
package pps.cloud.base.service; package pps.cloud.base.service;
import pps.cloud.base.service.data.GetBasePowerLineInput; import pps.cloud.base.service.data.base_power_line.GetBasePowerLineInput;
import pps.cloud.base.service.data.GetBasePowerLineViewOutput; import pps.cloud.base.service.data.base_power_line.GetBasePowerLineViewOutput;
import xstartup.annotation.XService; import xstartup.annotation.XService;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import xstartup.base.XContext; import xstartup.base.XContext;
......
package pps.cloud.base.service.data; package pps.cloud.base.service.data.base_power_line;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import xstartup.annotation.XText; import xstartup.annotation.XText;
/** /**
...@@ -14,9 +11,6 @@ import xstartup.annotation.XText; ...@@ -14,9 +11,6 @@ import xstartup.annotation.XText;
* @date 2023/08/28 * @date 2023/08/28
*/ */
@Data @Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class GetBasePowerLineInput { public class GetBasePowerLineInput {
@XText("ID") @XText("ID")
......
package pps.cloud.base.service.data; package pps.cloud.base.service.data.base_power_line;
import lombok.Data; import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
...@@ -41,4 +41,34 @@ public class GetBasePowerLineViewOutput { ...@@ -41,4 +41,34 @@ public class GetBasePowerLineViewOutput {
@XText("启动间隔(分钟)") @XText("启动间隔(分钟)")
private Integer startInterval; private Integer startInterval;
/**
* 策略名称
*/
@XText("策略名称")
private String policyName;
/**
* 上级线路名称
*/
@XText("上级线路名称")
private String upperLineName;
/**
* 电网类型名称
*/
@XText("电网类型名称")
private String gridTypeName;
/**
* 线路类型名称
*/
@XText("线路类型名称")
private String lineTypeName;
/**
* 组织机构名称
*/
@XText("组织机构名称")
private String ouName;
} }
...@@ -2,8 +2,6 @@ package pps.core.base.service.impl; ...@@ -2,8 +2,6 @@ package pps.core.base.service.impl;
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;
import pps.cloud.base.service.data.GetBasePowerLineInput;
import pps.cloud.base.service.data.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;
......
...@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import pps.cloud.base.service.data.GetBasePowerLineViewOutput;
import pps.core.common.constant.BusinessConstant; import pps.core.common.constant.BusinessConstant;
import pps.core.common.entity.BaseModel; import pps.core.common.entity.BaseModel;
import pps.core.common.session.PpsUserSession; import pps.core.common.session.PpsUserSession;
......
package pps.core.space.utils; package pps.core.space.utils;
import pps.cloud.base.service.BasePowerLineCloudService; import pps.cloud.base.service.BasePowerLineCloudService;
import pps.cloud.base.service.data.GetBasePowerLineInput;
import pps.cloud.base.service.data.GetBasePowerLineViewOutput;
import pps.cloud.system.service.SysOrganizationCloudService; import pps.cloud.system.service.SysOrganizationCloudService;
import pps.cloud.system.service.SystemAreaService; import pps.cloud.system.service.SystemAreaService;
import pps.cloud.system.service.SystemDictionaryService; import pps.cloud.system.service.SystemDictionaryService;
......
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