Skip to content

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

feat(零碳): 长庆 

1.添加easy excel配置,增加转换器,增加全局excel导出样式,增加场站下拉选解析器;
2.开发光伏电站模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;
3.间开制度管理模块新增设为基础制度开关接口,添加线上接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 9db4ef1c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 415 deletions
C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/SysOrganizationCloudService.java
View file @ dbb0b4d7
......@@ -5,7 +5,6 @@ import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.data.XListResult;
import xstartup.data.XPageResult;
import xstartup.data.XSingleResult;
@XText("组织机构服务")
......@@ -15,72 +14,15 @@ public interface SysOrganizationCloudService {
@XText("根据id获取组织机构详情")
XSingleResult<GetSysOrganizationViewOutput> getSysOrganizationById(XContext context, GetSysOrganizationViewInput input);
@XText("根据ids获取组织机构详情")
XListResult<GetSysOrganizationViewOutput> getSysOrganizationByIds(XContext context, GetSysOrganizationViewInput input);
@XText("根据names获取组织机构详情")
XListResult<GetSysOrganizationViewOutput> getSysOrganizationByNames(XContext context, GetSysOrganizationViewInput input);
@XText("根据用户ID获取指定级别的组织机构详情")
XSingleResult<GetSysOrganizationViewOutput> getSysOrganizationByOuLevelAndUserId(XContext context, GetSysOrganizationViewInput input);
@XText("根据用户ID获取指定级别的组织机构集合详情")
XListResult<GetSysOrganizationViewOutput> getSysOrganizationListByOuLevelAndUserId(XContext context, GetSysOrganizationViewInput input);
@XText("根据组织机构ID获取指定级别的组织机构详情")
XSingleResult<GetSysOrganizationViewOutput> getSysOrganizationByOuLevelAndOuId(XContext context, GetSysOrganizationViewInput input);
@XText("根据用户id获取组织机构和场站详情")
XListResult<GetSysOrganizationViewOutput> getSysOrganizationByUserId(XContext context, GetSysOrganizationViewInput input);
@XText("根据用户id获取组织机构")
XSingleResult<GetSysOrganizationViewOutput> getOuByUserId(XContext context, GetSysOrganizationViewInput input);
@XText("获取组织机构列表")
XPageResult<GetSysOrganizationViewOutput> getSysOrganizationList(XContext context, QuerySysOrganizationViewInput input);
@XText("根据组织机构父id获取儿子集组织机构")
XListResult<GetSysOrganizationViewOutput> getOrganizationByParentOuId(XContext context, GetSysOrganizationViewInput input);
@XText("根据组织机构子id获取父级组织机构")
XSingleResult<GetSysOrganizationViewOutput> getOrganizationBySubOuId(XContext context, GetSysOrganizationViewInput input);
@XText("根据用户id获取授权组织机构id")
XListResult<GetSysOrganizationViewOutput> getOuIdsByUserId(XContext context, GetSysOrganizationViewInput input);
@XText("获取授权组织机构id")
XListResult<GetSysOrganizationViewOutput> getOuIdsByCondition(XContext context, GetOuIdsByConditionInput input);
@XText("根据用户id获取用户组织机构")
XListResult<OuIdAndOutNameOutput> getOrgListByUserId(XContext context, QueryUserIdInput input);
@XText("根据组织机构id获取所有的子级组织机构")
XListResult<GetOuListTreeOutput> getAllOuListByOuId(XContext context, GetAllOuListByOuIdInput input);
@XText("根据组织机构ids获取组织机构")
XListResult<GetOuListTreeOutput> getOuListByOuIds(XContext context, GetOuListByOuIdsInput input);
@XText("根据组织机构id获取组织机构id路径")
XSingleResult<GetOuIdPathByOuIdOutput> getOuIdPathByOuId(XContext context, GetOuIdPathByOuIdInput input);
@XText("获取用户组织机构id路径")
XSingleResult<GetSysOrganizationIdPathOutput> getOrganizationPath(XContext context);
@XText("获取用户组织机构层级ouid")
XSingleResult<GetOrganizationOuLevel> getOrganizationOuLevelOuId(XContext context);
@XText("根据组织机构子ids获取父级组织机构")
XListResult<GetSysOrganizationViewOutput> getOrganizationBySubOuIds(XContext context, GetSysOrganizationViewInput input);
@XText("根据用户id查询地区公司")
XListResult<GetSysOrganizationViewOutput> selectRegionFirmByUserId(XContext context, SelectRegionFirmInput input);
@XText("根据父级id查询儿子级--最后一级查的是场站")
XListResult<GetSysOrganizationViewOutput> queryOuInfoOrStationByParentOuId(XContext context);
@XText("根据组织机构名称获取组织机构id")
XListResult<GetSysOrganizationViewOutput> selectOrganizationAllByOrganizationName(XContext context, GetSysOrganizationViewInput input);
@XText("根据组织机构id获取所有的子级组织机构列表")
XListResult<GetSysOrganizationViewOutput> getAllListByOuId(XContext context, GetAllOuListByOuIdInput input);
......
C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/SystemAreaService.java
View file @ dbb0b4d7
package pps.cloud.system.service;
import pps.cloud.system.service.data.GetSysAreaInput;
import pps.cloud.system.service.data.GetSysAreaOutput;
import pps.cloud.system.service.data.sys_area.GetSysAreaInput;
import pps.cloud.system.service.data.sys_area.GetSysAreaOutput;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
......
C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/AddressInfoModel.java deleted 100644 → 0
View file @ 9db4ef1c
package pps.cloud.system.service.data;
import xstartup.annotation.XText;
public class AddressInfoModel {
@XText("国家")
private String country;
@XText("大区")
private String area;
@XText("省")
private String province;
@XText("市")
private String city;
@XText("县")
private String county;
public String getCountry() {
return country;
}
public void setCountry(String country) {
this.country = country;
}
public String getArea() {
return area;
}
public void setArea(String area) {
this.area = area;
}
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
public String getCounty() {
return county;
}
public void setCounty(String county) {
this.county = county;
}
}
C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/GetSysAreaOutput.java deleted 100644 → 0
View file @ 9db4ef1c
package pps.cloud.system.service.data;
public class GetSysAreaOutput {
private Integer id;
private String name;
private Integer parentId;
private Integer lev;
public Integer getId() {
return this.id;
}
public void setId(Integer value) {
this.id = value;
}
public String getName() {
return this.name;
}
public void setName(String value) {
this.name = value;
}
public Integer getParentId() {
return this.parentId;
}
public void setParentId(Integer value) {
this.parentId = value;
}
public Integer getLev() {
return this.lev;
}
public void setLev(Integer value) {
this.lev = value;
}
}
C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/GetSysAreaInput.java → C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/sys_area/GetSysAreaInput.java
View file @ dbb0b4d7
package pps.cloud.system.service.data;
package pps.cloud.system.service.data.sys_area;
import lombok.AllArgsConstructor;
import lombok.Builder;
......
C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/sys_area/GetSysAreaOutput.java 0 → 100644
View file @ dbb0b4d7
package pps.cloud.system.service.data.sys_area;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class GetSysAreaOutput {
private Integer id;
private String name;
private Integer parentId;
private Integer lev;
}
C02-system/pps-core-system/src/main/java/pps/core/system/service/SystemAreaServiceImpl.java
View file @ dbb0b4d7
package pps.core.system.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import pps.cloud.system.service.SystemAreaService;
import pps.cloud.system.service.data.AddressInfoModel;
import pps.cloud.system.service.data.GetSysAreaInput;
import pps.cloud.system.service.data.GetSysAreaOutput;
import pps.cloud.system.service.data.sys_area.GetSysAreaInput;
import pps.cloud.system.service.data.sys_area.GetSysAreaOutput;
import pps.core.system.entity.SysAreaEnt;
import pps.core.system.entity.SysAreaView;
import pps.core.system.mapper.SysAreaMapper;
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePhotovoltaicPlantService.java
View file @ dbb0b4d7
......@@ -9,8 +9,8 @@ import pps.cloud.prediction.service.PlantTrainPowerTaskCloudService;
import pps.cloud.prediction.service.data.plant_train_power_task.GetPlantTrainPowerTaskCloudInput;
import pps.cloud.prediction.service.data.plant_train_power_task.GetPlantTrainPowerTaskCloudOutput;
import pps.cloud.system.service.SystemAreaService;
import pps.cloud.system.service.data.GetSysAreaInput;
import pps.cloud.system.service.data.GetSysAreaOutput;
import pps.cloud.system.service.data.sys_area.GetSysAreaInput;
import pps.cloud.system.service.data.sys_area.GetSysAreaOutput;
import pps.core.base.entity.BasePhotovoltaicPlantEnt;
import pps.core.base.entity.BasePowerLineEnt;
import pps.core.base.entity.BasePowerLinePlantEnt;
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePriceStrategyService.java
View file @ dbb0b4d7
......@@ -8,8 +8,8 @@ import com.github.pagehelper.PageInfo;
import com.github.pagehelper.page.PageMethod;
import org.apache.commons.lang3.StringUtils;
import pps.cloud.system.service.SystemAreaService;
import pps.cloud.system.service.data.GetSysAreaInput;
import pps.cloud.system.service.data.GetSysAreaOutput;
import pps.cloud.system.service.data.sys_area.GetSysAreaInput;
import pps.cloud.system.service.data.sys_area.GetSysAreaOutput;
import pps.core.base.entity.*;
import pps.core.base.enums.BusinessError;
import pps.core.base.mapper.*;
......
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/HomePageService.java
View file @ dbb0b4d7
......@@ -26,8 +26,8 @@ import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadOutput;
import pps.cloud.system.service.SysOrganizationCloudService;
import pps.cloud.system.service.SystemAreaService;
import pps.cloud.system.service.data.GetAllOuListByOuIdInput;
import pps.cloud.system.service.data.GetSysAreaInput;
import pps.cloud.system.service.data.GetSysAreaOutput;
import pps.cloud.system.service.data.sys_area.GetSysAreaInput;
import pps.cloud.system.service.data.sys_area.GetSysAreaOutput;
import pps.cloud.system.service.data.GetSysOrganizationViewOutput;
import pps.core.common.constant.BusinessConstant;
import pps.core.prediction.constant.ThirdPartyApiConstant;
......
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