feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/SysOrganizationCloudService.java

@@ -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

 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

-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

-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

-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

+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/SysOrganizationCloudServiceImpl.java

@@ -2,28 +2,19 @@ package pps.core.system.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import org.springframework.util.CollectionUtils;
-import pps.cloud.system.enums.OuLevelDic;
 import pps.cloud.system.service.SysOrganizationCloudService;
 import pps.cloud.system.service.data.*;
 import pps.core.common.constant.BusinessConstant;
-import pps.core.common.session.PpsUserSession;
-import pps.core.system.constant.SysOrganizationCode;
 import pps.core.system.entity.*;
 import pps.core.system.mapper.*;
-import pps.core.system.service.data.sys_organization_rel.GetSysOrganizationRelInput;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
-import xstartup.base.data.XPageInput;
 import xstartup.base.util.XCopyUtils;
 import xstartup.base.util.XStringUtils;
 import xstartup.data.XListResult;
-import xstartup.data.XPageResult;
 import xstartup.data.XSingleResult;
-import xstartup.feature.mybatis.helper.XMapperHelper;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -46,82 +37,6 @@ public class SysOrganizationCloudServiceImpl implements SysOrganizationCloudServ
         return XSingleResult.success(output);
     }
 
-    @Override
-    public XListResult<GetSysOrganizationViewOutput> getSysOrganizationByIds(XContext context, GetSysOrganizationViewInput input) {
-        SysOrganizationMapper mapper = context.getBean(SysOrganizationMapper.class);
-        List<SysOrganizationEnt> list = mapper.selectBatchIds(input.getIds());
-        List<GetSysOrganizationViewOutput> outputs = XCopyUtils.copyNewList(list, GetSysOrganizationViewOutput.class);
-        return XListResult.success(outputs);
-    }
-
-    @Override
-    public XListResult<GetSysOrganizationViewOutput> getSysOrganizationByNames(XContext context, GetSysOrganizationViewInput input) {
-        SysOrganizationMapper mapper = context.getBean(SysOrganizationMapper.class);
-        QueryWrapper<SysOrganizationEnt> queryWrapper = new QueryWrapper<>();
-        LambdaQueryWrapper<SysOrganizationEnt> lambda = queryWrapper.lambda();
-        lambda.in(SysOrganizationEnt::getOuName, input.getIds());
-        XPageInput pageInput = new XPageInput();
-        pageInput.setPage(1);
-        pageInput.setLimit(1000);
-        XPageResult<GetSysOrganizationViewOutput> query = XMapperHelper.query(mapper, pageInput, queryWrapper, GetSysOrganizationViewOutput.class);
-        return XListResult.success(query.getResult().getItems());
-    }
-
-    @Override
-    public XSingleResult<GetSysOrganizationViewOutput> getSysOrganizationByOuLevelAndOuId(XContext context, GetSysOrganizationViewInput input) {
-        SysOrganizationViewMapper viewMapper = context.getBean(SysOrganizationViewMapper.class);
-        SysOrganizationView view = new SysOrganizationView();
-        XCopyUtils.copyObject(input, view);
-        view.setEndTime(new Date());
-        try {
-            view.setUserId(context.getSession(PpsUserSession.class).getId());
-        } catch (Exception e) {
-            view.setUserId("");
-        }
-        SysOrganizationView sysOrganizationView = viewMapper.getSysOrganizationByOuLevelAndOuId(view);
-        GetSysOrganizationViewOutput output = XCopyUtils.copyNewObject(sysOrganizationView, GetSysOrganizationViewOutput.class);
-        return XSingleResult.success(output);
-    }
-
-    @Override
-    public XSingleResult<GetSysOrganizationViewOutput> getSysOrganizationByOuLevelAndUserId(XContext context, GetSysOrganizationViewInput input) {
-        SysOrganizationViewMapper viewMapper = context.getBean(SysOrganizationViewMapper.class);
-        SysOrganizationView view = new SysOrganizationView();
-        XCopyUtils.copyObject(input, view);
-        view.setEndTime(new Date());
-        view.setUserId(context.getSession(PpsUserSession.class).getId());
-        SysOrganizationView sysOrganizationView = viewMapper.getSysOrganizationByOuLevelAndUserId(view);
-        GetSysOrganizationViewOutput output = XCopyUtils.copyNewObject(sysOrganizationView, GetSysOrganizationViewOutput.class);
-        return XSingleResult.success(output);
-    }
-
-    @Override
-    public XListResult<GetSysOrganizationViewOutput> getSysOrganizationListByOuLevelAndUserId(XContext context, GetSysOrganizationViewInput input) {
-        SysOrganizationViewMapper viewMapper = context.getBean(SysOrganizationViewMapper.class);
-        SysOrganizationView view = new SysOrganizationView();
-        XCopyUtils.copyObject(input, view);
-        view.setEndTime(new Date());
-        view.setUserId(input.getUserId());
-        List<SysOrganizationView> sysOrganizationView = viewMapper.getSysOrganizationListByOuLevelAndUserId(view);
-        List<GetSysOrganizationViewOutput> output = new ArrayList<>();
-        for (SysOrganizationView item : sysOrganizationView) {
-            GetSysOrganizationViewOutput itemOutput = XCopyUtils.copyNewObject(item, GetSysOrganizationViewOutput.class);
-            output.add(itemOutput);
-        }
-        return XListResult.success(output);
-    }
-
-    @Override
-    public XListResult<GetSysOrganizationViewOutput> getSysOrganizationByUserId(XContext context, GetSysOrganizationViewInput input) {
-        SysUserOrganizationRelViewMapper userOrganizationRelViewMapper = context.getBean(SysUserOrganizationRelViewMapper.class);
-        SysUserOrganizationRelView record = new SysUserOrganizationRelView();
-        XCopyUtils.copyObject(input, record);
-        record.setEndTime(new Date());
-        List<SysUserOrganizationRelView> list = userOrganizationRelViewMapper.getSysOrganizationByUserId(record);
-        List<GetSysOrganizationViewOutput> outputs = XCopyUtils.copyNewList(list, GetSysOrganizationViewOutput.class);
-        return XListResult.success(outputs);
-    }
-
     @Override
     public XSingleResult<GetSysOrganizationViewOutput> getOuByUserId(XContext context, GetSysOrganizationViewInput input) {
         SysUserOrganizationRelMapper mapper = context.getBean(SysUserOrganizationRelMapper.class);
@@ -154,29 +69,6 @@ public class SysOrganizationCloudServiceImpl implements SysOrganizationCloudServ
         return XSingleResult.success(output);
     }
 
-    @Override
-    public XPageResult<GetSysOrganizationViewOutput> getSysOrganizationList(XContext context, QuerySysOrganizationViewInput input) {
-        SysUserOrganizationRelViewMapper userOrganizationRelViewMapper = context.getBean(SysUserOrganizationRelViewMapper.class);
-        SysUserOrganizationRelView record = new SysUserOrganizationRelView();
-        XCopyUtils.copyObject(input, record);
-        PageHelper.startPage(1, 10000);
-        List<SysOrganizationView> list = userOrganizationRelViewMapper.selectOrgList(record);
-        PageInfo<SysOrganizationView> pageInfo = new PageInfo<>(list);
-        List<GetSysOrganizationViewOutput> outputs = XCopyUtils.copyNewList(list, GetSysOrganizationViewOutput.class);
-        return XPageResult.success(outputs, input, pageInfo.getTotal());
-    }
-
-    @Override
-    public XListResult<GetSysOrganizationViewOutput> getOrganizationByParentOuId(XContext context, GetSysOrganizationViewInput input) {
-        SysOrganizationViewMapper userOrganizationRelViewMapper = context.getBean(SysOrganizationViewMapper.class);
-        SysOrganizationView record = new SysOrganizationView();
-        record.setIsDeleted(1);
-        XCopyUtils.copyObject(input, record);
-        List<SysOrganizationView> list = userOrganizationRelViewMapper.selectOrganizationByParentOuId(record);
-        List<GetSysOrganizationViewOutput> outputs = XCopyUtils.copyNewList(list, GetSysOrganizationViewOutput.class);
-        return XListResult.success(outputs);
-    }
-
     @Override
     public XSingleResult<GetSysOrganizationViewOutput> getOrganizationBySubOuId(XContext context, GetSysOrganizationViewInput input) {
         if (input.getId() == null) {
@@ -195,40 +87,6 @@ public class SysOrganizationCloudServiceImpl implements SysOrganizationCloudServ
         return XSingleResult.success(output);
     }
 
-    @Override
-    public XListResult<GetSysOrganizationViewOutput> getOuIdsByUserId(XContext context, GetSysOrganizationViewInput input) {
-        SysAuthOuScopeViewMapper scopeViewMapper = context.getBean(SysAuthOuScopeViewMapper.class);
-        List<SysAuthOuScopeView> sysAuthOuScopeViews = scopeViewMapper.selectOuIdsByUserId(input.getUserId());
-        List<GetSysOrganizationViewOutput> list = new ArrayList<>();
-        if (!CollectionUtils.isEmpty(sysAuthOuScopeViews)) {
-            sysAuthOuScopeViews.forEach(sysAuthOuScopeView -> {
-                GetSysOrganizationViewOutput output = new GetSysOrganizationViewOutput();
-                output.setOuId(sysAuthOuScopeView.getOuId());
-                output.setOuName(sysAuthOuScopeView.getOuName());
-                list.add(output);
-            });
-        }
-        return XListResult.success(list);
-    }
-
-    @Override
-    @XText("获取授权组织机构id")
-    public XListResult<GetSysOrganizationViewOutput> getOuIdsByCondition(XContext context, GetOuIdsByConditionInput input) {
-        SysAuthOuScopeViewMapper scopeViewMapper = context.getBean(SysAuthOuScopeViewMapper.class);
-        SysAuthOuScopeView record = XCopyUtils.copyNewObject(input, SysAuthOuScopeView.class);
-        List<SysAuthOuScopeView> sysAuthOuScopeViews = scopeViewMapper.selectOuInfoByCondition(record);
-        List<GetSysOrganizationViewOutput> list = new ArrayList<>();
-        if (!CollectionUtils.isEmpty(sysAuthOuScopeViews)) {
-            sysAuthOuScopeViews.forEach(sysAuthOuScopeView -> {
-                GetSysOrganizationViewOutput output = new GetSysOrganizationViewOutput();
-                output.setOuId(sysAuthOuScopeView.getOuId());
-                output.setOuName(sysAuthOuScopeView.getOuName());
-                list.add(output);
-            });
-        }
-        return XListResult.success(list);
-    }
-
     @XText("根据用户id获取用户组织机构")
     public XListResult<OuIdAndOutNameOutput> getOrgListByUserId(XContext context, QueryUserIdInput input) {
         SysUserOrganizationRelViewMapper mapper = context.getBean(SysUserOrganizationRelViewMapper.class);
@@ -277,102 +135,6 @@ public class SysOrganizationCloudServiceImpl implements SysOrganizationCloudServ
         return XListResult.success(outputs);
     }
 
-    @Override
-    public XSingleResult<GetOuIdPathByOuIdOutput> getOuIdPathByOuId(XContext context, GetOuIdPathByOuIdInput input) {
-        SysOrganizationRelMapper mapper = context.getBean(SysOrganizationRelMapper.class);
-        QueryWrapper<SysOrganizationRelEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SysOrganizationRelEnt::getOuId, input.getOuId());
-        queryWrapper.lambda().gt(SysOrganizationRelEnt::getEndTime, new Date());// 结束时间
-        queryWrapper.lambda().lt(SysOrganizationRelEnt::getEffectTime, new Date()); //有效时间
-        queryWrapper.lambda().orderByDesc(SysOrganizationRelEnt::getCreateTime);
-        queryWrapper.lambda().last(" limit 1");
-        SysOrganizationRelEnt relEnt = mapper.selectOne(queryWrapper);
-        GetOuIdPathByOuIdOutput output = XCopyUtils.copyNewObject(relEnt, GetOuIdPathByOuIdOutput.class);
-        return XSingleResult.success(output);
-    }
-
-    @Override
-    public XSingleResult<GetSysOrganizationIdPathOutput> getOrganizationPath(XContext context) {
-        GetSysOrganizationViewInput orgInput = new GetSysOrganizationViewInput();
-        GetSysOrganizationIdPathOutput output = new GetSysOrganizationIdPathOutput();
-        output.setStationOuId(context.getSession(PpsUserSession.class).getOuId());
-        orgInput.setOuLevel(OuLevelDic.OuLevelUnit.getKey());
-        XSingleResult<GetSysOrganizationViewOutput> unitResult = getSysOrganizationByOuLevelAndUserId(context, orgInput);
-        output.setUnitOuId(unitResult.getResult().getId());
-        orgInput.setOuLevel(OuLevelDic.OuLevelArea.getKey());
-        XSingleResult<GetSysOrganizationViewOutput> companyResult = getSysOrganizationByOuLevelAndUserId(context, orgInput);
-        output.setCompanyOuId(companyResult.getResult().getId());
-        return XSingleResult.success(output);
-    }
-
-    @Override
-    public XSingleResult<GetOrganizationOuLevel> getOrganizationOuLevelOuId(XContext context) {
-        String ouId = context.getSession(PpsUserSession.class).getOuId();
-        String ouLevel = context.getSession(PpsUserSession.class).getOuLevel();
-        GetOrganizationOuLevel orgOuLevel = getOrgOuLevel(context, ouId, ouLevel);
-        return XSingleResult.success(orgOuLevel);
-    }
-
-    private GetOrganizationOuLevel getOrgOuLevel(XContext context, String ouId, String ouLevel) {
-        OuLevelDic byKey = OuLevelDic.getByKey(ouLevel);
-        if (byKey == null) {
-            GetSysOrganizationViewInput input = new GetSysOrganizationViewInput();
-            input.setId(ouId);
-            XSingleResult<GetSysOrganizationViewOutput> organizationBySubOuId = getOrganizationBySubOuId(context, input);
-            getOrgOuLevel(context, organizationBySubOuId.getResult().getId(), organizationBySubOuId.getResult().getOuLevel());
-        }
-        GetOrganizationOuLevel out = new GetOrganizationOuLevel();
-        out.setOuId(ouId);
-        out.setOuLevel(ouLevel);
-        return out;
-    }
-
-    @Override
-    public XListResult<GetSysOrganizationViewOutput> getOrganizationBySubOuIds(XContext context, GetSysOrganizationViewInput input) {
-        if (CollectionUtils.isEmpty(input.getIds())) {
-            return XListResult.error(context, PARAM_EMPTY);
-        }
-        SysOrganizationViewMapper mapper = context.getBean(SysOrganizationViewMapper.class);
-        List<SysOrganizationView> views = mapper.selectOrganizationBySubOuIds(input.getIds());
-        List<GetSysOrganizationViewOutput> outputs = XCopyUtils.copyNewList(views, GetSysOrganizationViewOutput.class);
-        return XListResult.success(outputs);
-    }
-
-    @Override
-    public XListResult<GetSysOrganizationViewOutput> selectRegionFirmByUserId(XContext context, SelectRegionFirmInput input) {
-        SysOrganizationService bean = context.getBean(SysOrganizationService.class);
-        XListResult<pps.core.system.service.data.sys_organization.GetSysOrganizationViewOutput> listResult = bean.selectRegionFirmByUserId(context, input);
-        if (CollectionUtils.isEmpty(listResult.getResult())) {
-            return XListResult.success(new ArrayList<>());
-        }
-        List<GetSysOrganizationViewOutput> outputs = XCopyUtils.copyNewList(listResult.getResult(), GetSysOrganizationViewOutput.class);
-        return XListResult.success(outputs);
-    }
-
-    @Override
-    public XListResult<GetSysOrganizationViewOutput> queryOuInfoOrStationByParentOuId(XContext context) {
-        PpsUserSession session = context.getSession(PpsUserSession.class);
-        SysOrganizationService organizationService = context.getBean(SysOrganizationService.class);
-        GetSysOrganizationRelInput organizationRelInput = new GetSysOrganizationRelInput();
-        organizationRelInput.setParentOuId(session.getOuId());
-        organizationRelInput.setOuLevel(session.getOuLevel());
-        XListResult<pps.core.system.service.data.sys_organization.GetSysOrganizationViewOutput> listResult = organizationService.selectOuInfoOrStationByParentOuId(context, organizationRelInput);
-        List<GetSysOrganizationViewOutput> outList = XCopyUtils.copyNewList(listResult.getResult(), GetSysOrganizationViewOutput.class);
-        return XListResult.success(outList);
-    }
-
-    @Override
-    public XListResult<GetSysOrganizationViewOutput> selectOrganizationAllByOrganizationName(XContext context, GetSysOrganizationViewInput input) {
-        SysOrganizationViewMapper mapper = context.getBean(SysOrganizationViewMapper.class);
-        SysOrganizationView record = new SysOrganizationView();
-        record.setOuName(input.getOuName());
-        record.setIsDeleted(SysOrganizationCode.NORMAL);
-        record.setEndTime(new Date());
-        List<SysOrganizationView> list = mapper.selectOrganizationEffectiveByOuName(record);
-        List<GetSysOrganizationViewOutput> viewList = XCopyUtils.copyNewList(list, GetSysOrganizationViewOutput.class);
-        return XListResult.success(viewList);
-    }
-
     @Override
     public XListResult<GetSysOrganizationViewOutput> getAllListByOuId(XContext context, GetAllOuListByOuIdInput input) {
         SysOrganizationViewMapper mapper = context.getBean(SysOrganizationViewMapper.class);

C02-system/pps-core-system/src/main/java/pps/core/system/service/SystemAreaServiceImpl.java

 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

@@ -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

@@ -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

@@ -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;