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

 package pps.cloud.system.service;
 
-import pps.cloud.system.service.data.*;
+import pps.cloud.system.service.data.sys_organization.*;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;

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

 package pps.cloud.system.service;
 
-import pps.cloud.system.service.data.CreateSysDictionaryInput;
-import pps.cloud.system.service.data.QuerySysDictionaryViewInput;
-import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
+import pps.cloud.system.service.data.sys_dictionary.CreateSysDictionaryInput;
+import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewInput;
+import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewOutput;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;

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

 package pps.cloud.system.service;
 
-import pps.cloud.system.service.data.GetSysUserRoleRelInput;
-import pps.cloud.system.service.data.GetSysUserRoleRelOutput;
+import pps.cloud.system.service.data.user_role.GetSysUserRoleRelInput;
+import pps.cloud.system.service.data.user_role.GetSysUserRoleRelOutput;
 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/CreateSysDictionaryInput.java → C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/sys_dictionary/CreateSysDictionaryInput.java

-package pps.cloud.system.service.data;
+package pps.cloud.system.service.data.sys_dictionary;
 
 import xstartup.annotation.XText;
 

C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/QuerySysDictionaryViewInput.java → C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/sys_dictionary/QuerySysDictionaryViewInput.java

-package pps.cloud.system.service.data;
+package pps.cloud.system.service.data.sys_dictionary;
 
 import xstartup.annotation.XText;
 import xstartup.base.data.XPageInput;

C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/QuerySysDictionaryViewOutput.java → C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/sys_dictionary/QuerySysDictionaryViewOutput.java

-package pps.cloud.system.service.data;
+package pps.cloud.system.service.data.sys_dictionary;
 
 import xstartup.annotation.XText;
 import xstartup.base.data.XPageInput;

C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/GetAllOuListByOuIdInput.java → C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/sys_organization/GetAllOuListByOuIdInput.java

-package pps.cloud.system.service.data;
+package pps.cloud.system.service.data.sys_organization;
 
 import xstartup.annotation.XText;
 

C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/GetOuListByOuIdsInput.java → C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/sys_organization/GetOuListByOuIdsInput.java

-package pps.cloud.system.service.data;
+package pps.cloud.system.service.data.sys_organization;
 
 import xstartup.annotation.XText;
 

C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/GetOuListTreeOutput.java → C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/sys_organization/GetOuListTreeOutput.java

-package pps.cloud.system.service.data;
+package pps.cloud.system.service.data.sys_organization;
 
 import xstartup.annotation.XText;
 

C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/GetSysOrganizationViewInput.java → C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/sys_organization/GetSysOrganizationViewInput.java

-package pps.cloud.system.service.data;
+package pps.cloud.system.service.data.sys_organization;
 
 import xstartup.annotation.XText;
 

C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/GetSysOrganizationViewOutput.java → C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/sys_organization/GetSysOrganizationViewOutput.java

-package pps.cloud.system.service.data;
+package pps.cloud.system.service.data.sys_organization;
 
 import lombok.Data;
 import xstartup.annotation.XText;

C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/OuIdAndOutNameOutput.java → C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/sys_organization/OuIdAndOutNameOutput.java

-package pps.cloud.system.service.data;
+package pps.cloud.system.service.data.sys_organization;
 
 import xstartup.annotation.XText;
 

C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/QueryUserIdInput.java → C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/sys_organization/QueryUserIdInput.java

-package pps.cloud.system.service.data;
+package pps.cloud.system.service.data.sys_organization;
 
 import xstartup.annotation.XText;
 

C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/SelectRegionFirmInput.java → C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/sys_organization/SelectRegionFirmInput.java

-package pps.cloud.system.service.data;
+package pps.cloud.system.service.data.sys_organization;
 
 import xstartup.annotation.XText;
 

C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/GetSysUserRoleRelInput.java → C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/user_role/GetSysUserRoleRelInput.java

-package pps.cloud.system.service.data;
+package pps.cloud.system.service.data.user_role;
 
 import xstartup.annotation.XText;
 

C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/GetSysUserRoleRelOutput.java → C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/user_role/GetSysUserRoleRelOutput.java

-package pps.cloud.system.service.data;
+package pps.cloud.system.service.data.user_role;
 
 import xstartup.annotation.XText;
 

C02-system/pps-core-system/src/main/java/pps/core/system/provider/impl/PpsUserSessionInjectProviderImpl.java

@@ -8,7 +8,12 @@ import org.springframework.util.CollectionUtils;
 import pps.cloud.system.service.SysOrganizationCloudService;
 import pps.cloud.system.service.SystemDictionaryService;
 import pps.cloud.system.service.SystemUserRoleRelService;
-import pps.cloud.system.service.data.*;
+import pps.cloud.system.service.data.sys_dictionary.CreateSysDictionaryInput;
+import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewInput;
+import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput;
+import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewOutput;
+import pps.cloud.system.service.data.user_role.GetSysUserRoleRelInput;
+import pps.cloud.system.service.data.user_role.GetSysUserRoleRelOutput;
 import pps.core.common.constant.UserConstant;
 import pps.core.common.session.MediaTypes;
 import pps.core.common.session.PpsUserSession;

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

@@ -5,8 +5,8 @@ import com.google.common.base.Strings;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.CollectionUtils;
 import pps.cloud.system.service.SysOrganizationCloudService;
-import pps.cloud.system.service.data.GetSysOrganizationViewInput;
-import pps.cloud.system.service.data.GetSysOrganizationViewOutput;
+import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewInput;
+import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput;
 import pps.core.common.entity.BaseSysConfigEnt;
 import pps.core.common.mapper.BaseSysConfigMapper;
 import pps.core.common.session.PpsUserSession;

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

@@ -4,9 +4,9 @@ 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.SystemDictionaryService;
-import pps.cloud.system.service.data.CreateSysDictionaryInput;
-import pps.cloud.system.service.data.QuerySysDictionaryViewInput;
-import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
+import pps.cloud.system.service.data.sys_dictionary.CreateSysDictionaryInput;
+import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewInput;
+import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewOutput;
 import pps.core.common.pattern.Builder;
 import pps.core.system.cache.SysDictionaryCache;
 import pps.core.system.entity.SysDictionaryEnt;

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

@@ -5,8 +5,8 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.util.CollectionUtils;
 import pps.cloud.system.service.SystemDictionaryService;
-import pps.cloud.system.service.data.CreateSysDictionaryInput;
-import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
+import pps.cloud.system.service.data.sys_dictionary.CreateSysDictionaryInput;
+import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewOutput;
 import pps.core.common.constant.UserConstant;
 import pps.core.common.session.PpsUserSession;
 import pps.core.common.utils.TreeUtils;

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.util.CollectionUtils;
 import pps.cloud.system.service.SysOrganizationCloudService;
-import pps.cloud.system.service.data.*;
+import pps.cloud.system.service.data.sys_organization.*;
 import pps.core.common.constant.BusinessConstant;
 import pps.core.system.entity.*;
 import pps.core.system.mapper.*;

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

@@ -6,7 +6,7 @@ import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import pps.cloud.system.service.SysOrganizationCloudService;
-import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
+import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewOutput;
 import pps.core.common.session.PpsUserSession;
 import pps.core.common.utils.DateUtil;
 import pps.core.system.entity.SysDictionaryEnt;

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

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import pps.cloud.system.service.SystemDictionaryService;
-import pps.cloud.system.service.data.CreateSysDictionaryInput;
-import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
+import pps.cloud.system.service.data.sys_dictionary.CreateSysDictionaryInput;
+import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewOutput;
 import pps.core.common.constant.UserConstant;
 import pps.core.common.session.PpsUserSession;
 import pps.core.system.entity.SysOrganizationPropertyEnt;

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

@@ -11,10 +11,10 @@ import pps.cloud.base.service.data.BaseOuIdInput;
 import pps.cloud.base.service.data.QueryBaseStationInput;
 import pps.cloud.base.service.data.QueryBaseStationOutput;
 import pps.cloud.system.service.SystemDictionaryService;
-import pps.cloud.system.service.data.CreateSysDictionaryInput;
-import pps.cloud.system.service.data.GetOuListTreeOutput;
-import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
-import pps.cloud.system.service.data.SelectRegionFirmInput;
+import pps.cloud.system.service.data.sys_dictionary.CreateSysDictionaryInput;
+import pps.cloud.system.service.data.sys_organization.GetOuListTreeOutput;
+import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewOutput;
+import pps.cloud.system.service.data.sys_organization.SelectRegionFirmInput;
 import pps.core.common.constant.BusinessConstant;
 import pps.core.common.constant.Constant;
 import pps.core.common.constant.UserConstant;

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

@@ -6,8 +6,8 @@ import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.CollectionUtils;
 import pps.cloud.system.service.SystemDictionaryService;
-import pps.cloud.system.service.data.CreateSysDictionaryInput;
-import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
+import pps.cloud.system.service.data.sys_dictionary.CreateSysDictionaryInput;
+import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewOutput;
 import pps.core.common.constant.UserConstant;
 import pps.core.common.session.PpsUserSession;
 import pps.core.system.config.LoginConfig;

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

@@ -6,8 +6,8 @@ import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.util.CollectionUtils;
 import pps.cloud.system.service.SystemDictionaryService;
-import pps.cloud.system.service.data.QuerySysDictionaryViewInput;
-import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
+import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewInput;
+import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewOutput;
 import pps.core.common.session.PpsUserSession;
 import pps.core.common.utils.ExportExcelUtils;
 import pps.core.common.utils.ImportExcelUtils;

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

@@ -2,8 +2,8 @@ package pps.core.system.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import pps.cloud.system.service.SystemUserRoleRelService;
-import pps.cloud.system.service.data.GetSysUserRoleRelInput;
-import pps.cloud.system.service.data.GetSysUserRoleRelOutput;
+import pps.cloud.system.service.data.user_role.GetSysUserRoleRelInput;
+import pps.cloud.system.service.data.user_role.GetSysUserRoleRelOutput;
 import pps.core.system.entity.SysUserRoleRelEnt;
 import pps.core.system.mapper.SysUserRoleRelMapper;
 import xstartup.annotation.XService;

C09-base/pps-core-base/src/main/java/pps/core/base/excel/OilExtractionPlantImpl.java

@@ -3,7 +3,7 @@ package pps.core.base.excel;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import pps.cloud.system.service.SysOrganizationCloudService;
-import pps.cloud.system.service.data.GetSysOrganizationViewOutput;
+import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput;
 import pps.core.common.excel.ExcelDynamicSelect;
 import xstartup.base.XSelfServiceContext;
 import xstartup.data.XListResult;

C09-base/pps-core-base/src/main/java/pps/core/base/excel/RunTypeImpl.java

+package pps.core.base.excel;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.text.CharSequenceUtil;
+import pps.cloud.system.service.SysOrganizationCloudService;
+import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput;
+import pps.core.common.excel.ExcelDynamicSelect;
+import xstartup.base.XSelfServiceContext;
+import xstartup.data.XListResult;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 运行类型下拉
+ *
+ * @author ZWT
+ * @date 2024/05/09 10:28
+ */
+public class RunTypeImpl implements ExcelDynamicSelect {
+
+    @Override
+    public String[] getSource() {
+        XSelfServiceContext build = XSelfServiceContext.build(SysOrganizationCloudService.class);
+        SysOrganizationCloudService bean = build.getBean(SysOrganizationCloudService.class);
+        XListResult<GetSysOrganizationViewOutput> result = bean.getPlantList(build);
+        result.throwIfFail();
+        List<GetSysOrganizationViewOutput> list = result.getResult();
+        if (CollUtil.isNotEmpty(list)) {
+            return CharSequenceUtil.splitToArray(list.stream()
+                    .map(GetSysOrganizationViewOutput::getOuName)
+                    .collect(Collectors.joining(",")), ",");
+        }
+        return new String[0];
+    }
+}
\ No newline at end of file

C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePhotovoltaicPlantService.java

@@ -11,10 +11,10 @@ import pps.cloud.prediction.service.data.plant_train_power_task.GetPlantTrainPow
 import pps.cloud.system.service.SystemAreaService;
 import pps.cloud.system.service.SystemDictionaryService;
 import pps.cloud.system.service.SystemUserRoleRelService;
-import pps.cloud.system.service.data.CreateSysDictionaryInput;
-import pps.cloud.system.service.data.GetSysUserRoleRelInput;
-import pps.cloud.system.service.data.GetSysUserRoleRelOutput;
-import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
+import pps.cloud.system.service.data.sys_dictionary.CreateSysDictionaryInput;
+import pps.cloud.system.service.data.user_role.GetSysUserRoleRelInput;
+import pps.cloud.system.service.data.user_role.GetSysUserRoleRelOutput;
+import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewOutput;
 import pps.cloud.system.service.data.sys_area.GetSysAreaInput;
 import pps.cloud.system.service.data.sys_area.GetSysAreaOutput;
 import pps.core.base.constant.MapeConstant;

C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePowerLineService.java

@@ -9,10 +9,10 @@ import com.github.pagehelper.page.PageMethod;
 import org.apache.commons.lang3.StringUtils;
 import pps.cloud.space.service.ISpaceInstitutionDetailCloudService;
 import pps.cloud.system.service.SysOrganizationCloudService;
-import pps.cloud.system.service.data.GetOuListByOuIdsInput;
-import pps.cloud.system.service.data.GetOuListTreeOutput;
-import pps.cloud.system.service.data.GetSysOrganizationViewInput;
-import pps.cloud.system.service.data.GetSysOrganizationViewOutput;
+import pps.cloud.system.service.data.sys_organization.GetOuListByOuIdsInput;
+import pps.cloud.system.service.data.sys_organization.GetOuListTreeOutput;
+import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewInput;
+import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput;
 import pps.core.base.entity.*;
 import pps.core.base.enums.BusinessError;
 import pps.core.base.mapper.*;

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_excel/ExcelWellheadTemplate.java

+package pps.core.base.service.data.base_excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import pps.core.base.excel.OilExtractionPlantImpl;
+import pps.core.base.excel.RunTypeImpl;
+import pps.core.common.excel.ExcelSelected;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * excel井口模板
+ *
+ * @author ZWT
+ * @date 2024/05/09
+ */
+@Data
+public class ExcelWellheadTemplate implements Serializable {
+
+    private static final long serialVersionUID = -6773651457799858074L;
+
+    /**
+     * 采油厂名称
+     */
+    @ExcelSelected(sourceClass = OilExtractionPlantImpl.class)
+    @ExcelProperty(index = 0, value = "采油厂名称")
+    private String ouName;
+
+    /**
+     * 井号
+     */
+    @ExcelProperty(index = 1, value = "井号")
+    private String wellNumber;
+
+    /**
+     * 运行类型
+     */
+    @ExcelSelected(sourceClass = RunTypeImpl.class)
+    @ExcelProperty(index = 2, value = "运行类型")
+    private String runTypeName;
+
+    /**
+     * 运行功率(KW)
+     */
+    @ExcelProperty(index = 3, value = "运行功率(KW)")
+    private BigDecimal serviceRating;
+
+    /**
+     * 额定功率(KW)
+     */
+    @ExcelProperty(index = 4, value = "额定功率(KW)")
+    private BigDecimal ratedPower;
+}
\ No newline at end of file

C09-base/pps-core-base/src/main/java/pps/core/base/utils/ServiceUtil.java

@@ -2,10 +2,10 @@ package pps.core.base.utils;
 
 import pps.cloud.system.service.SysOrganizationCloudService;
 import pps.cloud.system.service.SystemDictionaryService;
-import pps.cloud.system.service.data.GetAllOuListByOuIdInput;
-import pps.cloud.system.service.data.GetSysOrganizationViewOutput;
-import pps.cloud.system.service.data.QuerySysDictionaryViewInput;
-import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
+import pps.cloud.system.service.data.sys_organization.GetAllOuListByOuIdInput;
+import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput;
+import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewInput;
+import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewOutput;
 import xstartup.base.XContext;
 import xstartup.data.XListResult;
 

C11-space/pps-core-space/src/main/java/pps/core/space/utils/ServiceUtil.java

@@ -18,7 +18,9 @@ import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadInput;
 import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadOutput;
 import pps.cloud.system.service.SysOrganizationCloudService;
 import pps.cloud.system.service.SystemDictionaryService;
-import pps.cloud.system.service.data.*;
+import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewInput;
+import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewOutput;
+import pps.cloud.system.service.data.sys_organization.*;
 import pps.core.common.constant.BusinessConstant;
 import pps.core.space.service.data.SpaceOptimizeDateDuration;
 import pps.core.space.service.data.SpaceOptimizeDateOutput;

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/EnergyConsumptionAnalysisService.java

@@ -11,8 +11,8 @@ import pps.cloud.base.service.IBasePowerLineCloudService;
 import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInput;
 import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineOutput;
 import pps.cloud.system.service.SysOrganizationCloudService;
-import pps.cloud.system.service.data.GetAllOuListByOuIdInput;
-import pps.cloud.system.service.data.GetSysOrganizationViewOutput;
+import pps.cloud.system.service.data.sys_organization.GetAllOuListByOuIdInput;
+import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput;
 import pps.core.prediction.entity.EnergyConsumptionAnalysisEnt;
 import pps.core.prediction.entity.ThirdDailyAccumulationUpdateEnt;
 import pps.core.prediction.enums.BusinessError;

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/HomePageService.java

@@ -25,10 +25,10 @@ import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadInput;
 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.sys_organization.GetAllOuListByOuIdInput;
 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.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput;
 import pps.core.common.constant.BusinessConstant;
 import pps.core.prediction.constant.ThirdPartyApiConstant;
 import pps.core.prediction.entity.*;

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/StatisticAnalysisBaseService.java

@@ -8,8 +8,8 @@ import pps.cloud.base.service.BasePhotovoltaicPlantCloudService;
 import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudInput;
 import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudOutput;
 import pps.cloud.system.service.SysOrganizationCloudService;
-import pps.cloud.system.service.data.GetAllOuListByOuIdInput;
-import pps.cloud.system.service.data.GetSysOrganizationViewOutput;
+import pps.cloud.system.service.data.sys_organization.GetAllOuListByOuIdInput;
+import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput;
 import pps.core.common.constant.BusinessConstant;
 import pps.core.common.utils.BaseUtils;
 import pps.core.prediction.entity.PlantPredictedPowerDataEnt;

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/ThirdPhotovoltaicPowerService.java

@@ -9,8 +9,8 @@ import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineOutp
 import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadInput;
 import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadViewOutput;
 import pps.cloud.system.service.SysOrganizationCloudService;
-import pps.cloud.system.service.data.GetAllOuListByOuIdInput;
-import pps.cloud.system.service.data.GetSysOrganizationViewOutput;
+import pps.cloud.system.service.data.sys_organization.GetAllOuListByOuIdInput;
+import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput;
 import pps.core.prediction.entity.EnergyConsumptionAnalysisEnt;
 import pps.core.prediction.entity.ThirdPhotovoltaicPowerEnt;
 import pps.core.prediction.entity.WellheadDailyProductionSituationEnt;