得到的

C00-common/pps-common/src/main/java/pps/core/common/session/MediaTypes.java

 package pps.core.common.session;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import xstartup.annotation.XText;
 
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class MediaTypes {
 
     @XText("介质类型编码")
@@ -12,28 +20,4 @@ public class MediaTypes {
 
     @XText("序号")
     private Integer sort;
-
-    public Integer getSort() {
-        return sort;
-    }
-
-    public void setSort(Integer sort) {
-        this.sort = sort;
-    }
-
-    public String getMediaTypeCode() {
-        return MediaTypeCode;
-    }
-
-    public void setMediaTypeCode(String mediaTypeCode) {
-        MediaTypeCode = mediaTypeCode;
-    }
-
-    public String getMediaTypeName() {
-        return MediaTypeName;
-    }
-
-    public void setMediaTypeName(String mediaTypeName) {
-        MediaTypeName = mediaTypeName;
-    }
 }
\ No newline at end of file

C00-common/pps-common/src/main/java/pps/core/common/utils/BaseUtils.java

@@ -26,6 +26,10 @@ import java.util.stream.Stream;
  */
 public class BaseUtils {
 
+    /**
+     * 按每500个一组分割
+     */
+    public static final Integer BATCH_SIZE = 500;
     /**
      * 数据库类型
      */
@@ -45,11 +49,6 @@ public class BaseUtils {
         }
     }
 
-    /**
-     * 按每500个一组分割
-     */
-    public static final Integer BATCH_SIZE = 500;
-
     /**
      * 计算批次数
      */

C02-system/pps-core-system/src/main/java/pps/core/system/entity/SysAuthOuScopeView.java

 package pps.core.system.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import xstartup.annotation.XText;
 
 import javax.persistence.Transient;
 import java.io.Serializable;
 import java.util.Date;
 
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class SysAuthOuScopeView implements Serializable {
     @XText("范围授权id(主键)")
     @TableField
@@ -63,124 +71,4 @@ public class SysAuthOuScopeView implements Serializable {
     @XText("介质类型")
     @Transient
     private String mediaType;
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-
-    public String getMediaType() {
-        return mediaType;
-    }
-
-    public void setMediaType(String mediaType) {
-        this.mediaType = mediaType;
-    }
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public String getOuId() {
-        return this.ouId;
-    }
-
-    public void setOuId(String value) {
-        this.ouId = value;
-    }
-
-    public String getUserId() {
-        return this.userId;
-    }
-
-    public void setUserId(String value) {
-        this.userId = value;
-    }
-
-    public String getUserGroupId() {
-        return this.userGroupId;
-    }
-
-    public void setUserGroupId(String value) {
-        this.userGroupId = value;
-    }
-
-    public String getMenuId() {
-        return this.menuId;
-    }
-
-    public void setMenuId(String value) {
-        this.menuId = 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 Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = 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;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getOuName() {
-        return ouName;
-    }
-
-    public void setOuName(String ouName) {
-        this.ouName = ouName;
-    }
-
-    public String getMenuName() {
-        return menuName;
-    }
-
-    public void setMenuName(String menuName) {
-        this.menuName = menuName;
-    }
 }

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

@@ -5,10 +5,7 @@ import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import pps.cloud.system.service.SysOrganizationCloudService;
-import pps.cloud.system.service.SystemDictionaryService;
 import pps.cloud.system.service.SystemUserRoleRelService;
-import pps.cloud.system.service.data.sys_dictionary.CreateSysDictionaryInput;
-import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewOutput;
 import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewInput;
 import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput;
 import pps.cloud.system.service.data.user_role.GetSysUserRoleRelInput;
@@ -20,11 +17,9 @@ import pps.core.common.session.SysOrganization;
 import pps.core.system.config.LoginConfig;
 import pps.core.system.constant.OuLevelConstant;
 import pps.core.system.entity.SysAuthOuScopeView;
-import pps.core.system.entity.SysMenuView;
 import pps.core.system.entity.SysOrganizationRelEnt;
 import pps.core.system.entity.SysUserEnt;
 import pps.core.system.mapper.SysAuthOuScopeViewMapper;
-import pps.core.system.mapper.SysMenuViewMapper;
 import pps.core.system.mapper.SysOrganizationRelMapper;
 import pps.core.system.mapper.SysUserMapper;
 import xstartup.annotation.XImplement;
@@ -95,77 +90,11 @@ public class PpsUserSessionInjectProviderImpl implements XSessionInjectProvider
         }
         //获取当前用户所属组织机构的介质类型和当前用户授权的组织机构（最终获取组织机构的介质类型）
         if (CharSequenceUtil.isNotBlank(session.getId())) {
-            SysAuthOuScopeView scopeView = new SysAuthOuScopeView();
-            scopeView.setUserId(session.getId());
-            scopeView.setEndTime(new Date());
-            SysAuthOuScopeView mediaTypesView = scopeViewMapper.selectOuMediaTypeByUserId(scopeView);
-            Set<String> set = new HashSet<>();
-            if (ObjectUtil.isNotNull(mediaTypesView)) {
-                String mediaType = mediaTypesView.getMediaType();
-                if (CharSequenceUtil.isNotBlank(mediaType)) {
-                    set.addAll(CharSequenceUtil.split(mediaType, ','));
-                }
-            }
-            if (CollUtil.isNotEmpty(set)) {
-                SystemDictionaryService dictService = context.getBean(SystemDictionaryService.class);
-                CreateSysDictionaryInput mediaTypesInput = new CreateSysDictionaryInput();
-                mediaTypesInput.setAlias("MEDIUM_TYPE");
-                XListResult<QuerySysDictionaryViewOutput> mediaTypes = dictService.querySysDictionarysByAlias(context, mediaTypesInput);
-                List<String> menuMediaTypes = new ArrayList<>();
-                //通过用户角色加载当前用户可操作的介质类型
-                //获取当前用户所属角色绑定菜单的介质类型（最终获取菜单的介质类型）
-                SysMenuViewMapper menuViewMapper = context.getBean(SysMenuViewMapper.class);
-                SysMenuView menuView = new SysMenuView();
-                menuView.setUserId(session.getId());
-                menuView.setOuId(session.getOuId());
-                List<SysMenuView> menuViews = menuViewMapper.selectMediumTypeByUserId(menuView);
-                for (SysMenuView sysMenuView : menuViews) {
-                    menuMediaTypes.add(sysMenuView.getMediaType());
-                }
-                //根据菜单的介质类型过滤组织机构的介质类型，最终只显示菜单的介质类型和组织机构的介质类型是一致的。
-                //如果菜单中有全介质的话就把组织机构的所有介质类型都展示
-                if (!CollUtil.contains(menuMediaTypes, "ALL")) {
-                    set = set.stream().filter(menuMediaTypes::contains).collect(Collectors.toSet());
-                }
-                List<MediaTypes> list = new ArrayList<>();
-                for (String media : set) {
-                    if (CharSequenceUtil.equals("ALL", media)) {
-                        list.clear();
-                        for (QuerySysDictionaryViewOutput dict : mediaTypes.getResult()) {
-                            if (!CharSequenceUtil.equals(dict.getDicKey(), "ALL")) {
-                                MediaTypes mediaType = new MediaTypes();
-                                mediaType.setMediaTypeCode(dict.getDicKey());
-                                mediaType.setMediaTypeName(dict.getDicName());
-                                if (ObjectUtil.isNull(dict.getSort())) {
-                                    mediaType.setSort(999);
-                                } else {
-                                    mediaType.setSort(dict.getSort());
-                                }
-                                list.add(mediaType);
-                            }
-                        }
-                        break;
-                    } else {
-                        for (QuerySysDictionaryViewOutput dict : mediaTypes.getResult()) {
-                            if (CharSequenceUtil.equals(dict.getDicKey(), media)) {
-                                MediaTypes mediaType = new MediaTypes();
-                                mediaType.setMediaTypeCode(media);
-                                mediaType.setMediaTypeName(dict.getDicName());
-                                if (ObjectUtil.isNull(dict.getSort())) {
-                                    mediaType.setSort(999);
-                                } else {
-                                    mediaType.setSort(dict.getSort());
-                                }
-                                list.add(mediaType);
-                                break;
-                            }
-                        }
-                    }
-                }
-                list.sort(Comparator.comparing(MediaTypes::getSort));
-                list = list.stream().distinct().collect(Collectors.toList());
-                session.setMediaTypes(list);
-            }
+            session.setMediaTypes(CollUtil.list(false, MediaTypes.builder()
+                    .MediaTypeCode("GAS")
+                    .MediaTypeName("天然气")
+                    .sort(2)
+                    .build()));
         }
         if (user.getOrgId().equals(LOGIN_FLAG_SIMULATE)) {
             session.setDevops(1);

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

@@ -8,7 +8,7 @@ import pps.cloud.system.service.data.sys_area.GetSysAreaInput;
 import pps.cloud.system.service.data.sys_area.GetSysAreaOutput;
 import pps.cloud.system.service.data.sys_area.QuerySysAreaInput;
 import pps.cloud.system.service.data.sys_area.QuerySysAreaOutput;
-import pps.core.common.constant.BusinessConstant;
+import pps.core.common.utils.BaseUtils;
 import pps.core.system.entity.SysAreaEnt;
 import pps.core.system.entity.SysAreaView;
 import pps.core.system.mapper.SysAreaMapper;
@@ -51,7 +51,7 @@ public class SystemAreaServiceImpl implements SystemAreaService {
                 .eq(ObjectUtil.isNotNull(id), SysAreaEnt::getId, id)
                 .eq(ObjectUtil.isNotNull(parentId), SysAreaEnt::getParentId, parentId)
                 .eq(CharSequenceUtil.isNotBlank(name), SysAreaEnt::getName, name)
-                .last(BusinessConstant.LAST_LIMIT)
+                .last(BaseUtils.getLastLimit())
         );
         return XSingleResult.success(XCopyUtils.copyNewObject(sysAreaEnt, GetSysAreaOutput.class));
     }

C09-base/pps-core-base/src/main/java/pps/core/base/enums/WeatherIconEnum.java

@@ -58,6 +58,21 @@ public enum WeatherIconEnum {
         this.type = type;
     }
 
+    /**
+     * 按值查找
+     *
+     * @param icon 图标
+     * @return {@link WeatherIconEnum }
+     */
+    public static WeatherIconEnum findByValue(String icon) {
+        for (WeatherIconEnum item : values()) {
+            if (CharSequenceUtil.equals(item.getIcon(), icon)) {
+                return item;
+            }
+        }
+        return WeatherIconEnum.w99;
+    }
+
     public String getIcon() {
         return icon;
     }
@@ -73,19 +88,4 @@ public enum WeatherIconEnum {
     public void setType(Integer type) {
         this.type = type;
     }
-
-    /**
-     * 按值查找
-     *
-     * @param icon 图标
-     * @return {@link WeatherIconEnum }
-     */
-    public static WeatherIconEnum findByValue(String icon) {
-        for (WeatherIconEnum item : values()) {
-            if (CharSequenceUtil.equals(item.getIcon(), icon)) {
-                return item;
-            }
-        }
-        return WeatherIconEnum.w99;
-    }
 }
\ No newline at end of file

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

@@ -15,7 +15,7 @@ import pps.core.base.mapper.BaseDataImportLogMapper;
 import pps.core.base.mapper.BaseDataMapper;
 import pps.core.base.mapper.BaseModelValMapper;
 import pps.core.base.service.data.base_data.*;
-import pps.core.common.constant.BusinessConstant;
+import pps.core.common.utils.BaseUtils;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
@@ -131,7 +131,7 @@ public class BaseDataService {
         BaseDataImportLogEnt ent = logMapper.selectOne(new LambdaQueryWrapper<BaseDataImportLogEnt>()
                 .eq(BaseDataImportLogEnt::getLineId, input.getLineId())
                 .orderByDesc(BaseDataImportLogEnt::getCreateTime)
-                .last(BusinessConstant.LAST_LIMIT));
+                .last(BaseUtils.getLastLimit()));
         List<QueryBaseDataOutput> outputs = new ArrayList<>();
         if (ObjectUtil.isNotNull(ent)) {
             BaseDataMapper mapper = context.getBean(BaseDataMapper.class);
@@ -152,7 +152,7 @@ public class BaseDataService {
         BaseDataImportLogEnt ent = logMapper.selectOne(new LambdaQueryWrapper<BaseDataImportLogEnt>()
                 .eq(BaseDataImportLogEnt::getLineId, input.getLineId())
                 .orderByDesc(BaseDataImportLogEnt::getCreateTime)
-                .last(BusinessConstant.LAST_LIMIT));
+                .last(BaseUtils.getLastLimit()));
         List<GetBaseDataOutput> outputs = new ArrayList<>();
         if (ObjectUtil.isNotNull(ent)) {
             BaseDataMapper mapper = context.getBean(BaseDataMapper.class);
@@ -302,7 +302,7 @@ public class BaseDataService {
         BaseDataImportLogEnt ent = logMapper.selectOne(new LambdaQueryWrapper<BaseDataImportLogEnt>()
                 .eq(BaseDataImportLogEnt::getLineId, input.getLineId())
                 .orderByDesc(BaseDataImportLogEnt::getCreateTime)
-                .last(BusinessConstant.LAST_LIMIT));
+                .last(BaseUtils.getLastLimit()));
         if (ObjectUtil.isNull(ent))
             return XServiceResult.OK;
         if (CollUtil.isNotEmpty(input.getKeyNames())) {
@@ -330,7 +330,7 @@ public class BaseDataService {
         BaseModelValEnt baseModelValEnt = baseModelValMapper.selectOne(new LambdaQueryWrapper<BaseModelValEnt>()
                 .eq(BaseModelValEnt::getLineId, input.getLineId())
                 .eq(BaseModelValEnt::getKeyname, input.getKeyNames())
-                .orderByDesc(BaseModelValEnt::getCreatetime).last(BusinessConstant.LAST_LIMIT));
+                .orderByDesc(BaseModelValEnt::getCreatetime).last(BaseUtils.getLastLimit()));
         TrainBaseModelValOutput output = XCopyUtils.copyNewObject(baseModelValEnt, TrainBaseModelValOutput.class);
         if (ObjectUtil.isNotNull(baseModelValEnt) && CharSequenceUtil.isAllNotBlank(output.getYtrue(), output.getYpred())) {
             Map<String, Object> ytrueMap = XJsonUtils.toMap(output.getYtrue().replace("\\", ""));

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

@@ -30,6 +30,8 @@ import java.util.Map;
 @XService
 public class BaseLineService {
 
+    private static final String storeDir = XStartup.getCurrent().getProperty("weather.file.temp.path");
+
     @XText("线路列表")
     @XApiPost
     public XListResult<DynamicQueryBasePowerLineOutput> queryBaseLineList(XContext context, DynamicQueryBasePowerLineInput input) {
@@ -59,8 +61,6 @@ public class BaseLineService {
         return XServiceResult.OK;
     }
 
-    private static final String storeDir = XStartup.getCurrent().getProperty("weather.file.temp.path");
-
     /**
      * 创建文件路径
      *

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

@@ -10,6 +10,7 @@ import pps.core.base.entity.BaseWellheadEnt;
 import pps.core.base.mapper.BaseWellheadMapper;
 import pps.core.common.constant.BusinessConstant;
 import pps.core.common.entity.BaseModel;
+import pps.core.common.utils.BaseUtils;
 import xstartup.annotation.XService;
 import xstartup.base.XContext;
 import xstartup.base.util.XCopyUtils;
@@ -73,7 +74,7 @@ public class BaseWellheadCloudServiceImpl implements IBaseWellheadCloudService {
                 .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
                 .in(BaseModel::getId, input.getWellheadIds())
                 .orderByDesc(BaseWellheadEnt::getServiceRating)
-                .last(BusinessConstant.LAST_LIMIT)
+                .last(BaseUtils.getLastLimit())
         );
         return XSingleResult.success(XCopyUtils.copyNewObject(one, DynamicQueryBaseWellheadOutput.class));
     }

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

@@ -214,7 +214,7 @@ public class BaseWindTurbineService {
         return mapper.selectOne(new LambdaQueryWrapper<BaseWindTurbineEnt>()
                 .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
                 .eq(BaseModel::getId, id)
-                .last(BusinessConstant.LAST_LIMIT)
+                .last(BaseUtils.getLastLimit())
         );
     }
 

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

@@ -7,6 +7,7 @@ import pps.cloud.base.service.data.config_oil_field.GetConfigOilFieldOutput;
 import pps.core.base.entity.ConfigOilFieldEnt;
 import pps.core.base.mapper.ConfigOilFieldMapper;
 import pps.core.common.constant.BusinessConstant;
+import pps.core.common.utils.BaseUtils;
 import xstartup.annotation.XService;
 import xstartup.base.XContext;
 import xstartup.base.util.XCopyUtils;
@@ -32,7 +33,7 @@ public class ConfigOilFieldCloudServiceImpl implements IConfigOilFieldCloudServi
         ConfigOilFieldMapper mapper = context.getBean(ConfigOilFieldMapper.class);
         ConfigOilFieldEnt ent = mapper.selectOne(new LambdaQueryWrapper<ConfigOilFieldEnt>()
                 .eq(ConfigOilFieldEnt::getIsEnable, BusinessConstant.ZERO)
-                .last(BusinessConstant.LAST_LIMIT)
+                .last(BaseUtils.getLastLimit())
         );
         GetConfigOilFieldOutput output;
         if (ObjectUtil.isNull(ent)) {

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

@@ -9,6 +9,7 @@ import pps.core.base.mapper.ConfigOilFieldMapper;
 import pps.core.base.service.data.config_oil_field.GetConfigOilFieldOutput;
 import pps.core.base.service.data.config_oil_field.GetProjectTitleOutput;
 import pps.core.common.constant.BusinessConstant;
+import pps.core.common.utils.BaseUtils;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
@@ -74,7 +75,7 @@ public class ConfigOilFieldService {
         ConfigOilFieldMapper mapper = context.getBean(ConfigOilFieldMapper.class);
         return mapper.selectOne(new LambdaQueryWrapper<ConfigOilFieldEnt>()
                 .eq(ConfigOilFieldEnt::getIsEnable, BusinessConstant.ZERO)
-                .last(BusinessConstant.LAST_LIMIT)
+                .last(BaseUtils.getLastLimit())
         );
     }
 

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

@@ -11,7 +11,7 @@ import pps.core.base.entity.ThirdWeatherDataEnt;
 import pps.core.base.mapper.ThirdWeatherDataMapper;
 import pps.core.base.service.data.third_weather_data.GetThirdWeatherDataInput;
 import pps.core.base.service.data.third_weather_data.GetThirdWeatherDataOutput;
-import pps.core.common.constant.BusinessConstant;
+import pps.core.common.utils.BaseUtils;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
@@ -52,7 +52,7 @@ public class ThirdWeatherDataService {
                     .lambda()
                     .ge(ThirdWeatherDataEnt::getForecastTime, DateUtil.date())
                     .orderByAsc(ThirdWeatherDataEnt::getForecastTime)
-                    .last(BusinessConstant.LAST_LIMIT)
+                    .last(BaseUtils.getLastLimit())
             );
             output = XCopyUtils.copyNewObject(ent, GetThirdWeatherDataOutput.class);
         } else {

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

@@ -506,7 +506,7 @@ public class WindPredictionFutureService {
                 .eq(WindPredictionFutureEnt::getStationId, input.getStationId())
                 .between(WindPredictionFutureEnt::getDataTime, beginTime, endTime)
                 .orderByDesc(WindPredictionFutureEnt::getDataTime)
-                .last(BusinessConstant.LAST_LIMIT)
+                .last(BaseUtils.getLastLimit())
         );
         if (ObjectUtil.isNotNull(futureEnt)) {
             output.setWindDirection(WindDirection.findByCode(futureEnt.getWindDirection()));
@@ -529,7 +529,7 @@ public class WindPredictionFutureService {
                 .eq(ThirdWindPowerGenerationUpdateEnt::getStationId, input.getStationId())
                 .eq(ThirdWindPowerGenerationUpdateEnt::getSystemSource, oilFieldCode)
                 .orderByDesc(ThirdWindPowerGenerationUpdateEnt::getCollectTime)
-                .last(BusinessConstant.LAST_LIMIT)
+                .last(BaseUtils.getLastLimit())
         );
         //todo 型号暂时不知道从哪来
         output.setModelNumber(BusinessConstant.DEFAULT_VALUE);

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceCalibrationCloudServiceImpl.java

@@ -98,7 +98,7 @@ public class SpaceCalibrationCloudServiceImpl implements ISpaceCalibrationCloudS
                         .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
                         .eq(SpaceCalibrationHistoryEnt::getInstitutionId, institutionId)
                         .orderByDesc(SpaceCalibrationHistoryEnt::getCalibrationDate)
-                        .last(BusinessConstant.LAST_LIMIT)
+                        .last(BaseUtils.getLastLimit())
                 );
                 if (ObjectUtil.isNull(lastHistory)) {
                     //创建周期

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceCalibrationService.java

@@ -243,7 +243,7 @@ public class SpaceCalibrationService {
                 .eq(SpaceOptimizeShortPeriodEnt::getInstitutionId, historyEnt.getInstitutionId())
                 .eq(SpaceOptimizeShortPeriodEnt::getOptimizeDate, inputDate)
                 .orderByDesc(BaseModel::getCreateTime)
-                .last(BusinessConstant.LAST_LIMIT)
+                .last(BaseUtils.getLastLimit())
         );
         //通过井口ID查区间
         if (ObjectUtil.isNotNull(shortPeriodEnt)) {
@@ -263,7 +263,7 @@ public class SpaceCalibrationService {
                     .ge(SpaceOptimizeMidPeriodEnt::getOptimizeDeadline, inputDate)
                     .apply("DATE_FORMAT( create_time, '%Y-%m-%d' ) <= {0}", inputDate)
                     .orderByDesc(BaseModel::getCreateTime)
-                    .last(BusinessConstant.LAST_LIMIT)
+                    .last(BaseUtils.getLastLimit())
             );
             if (ObjectUtil.isNotNull(midPeriodEnt)) {
                 SpaceOptimizeMidDurationMapper midDurationMapper = context.getBean(SpaceOptimizeMidDurationMapper.class);
@@ -283,7 +283,7 @@ public class SpaceCalibrationService {
                         .ge(SpaceOptimizeLongPeriodEnt::getOptimizeDeadline, inputDate)
                         .apply("DATE_FORMAT( create_time, '%Y-%m-%d' ) <= {0}", inputDate)
                         .orderByDesc(BaseModel::getCreateTime)
-                        .last(BusinessConstant.LAST_LIMIT)
+                        .last(BaseUtils.getLastLimit())
                 );
                 if (ObjectUtil.isNotNull(longPeriodEnt)) {
                     SpaceOptimizeLongDurationMapper longDurationMapper = context.getBean(SpaceOptimizeLongDurationMapper.class);
@@ -330,7 +330,7 @@ public class SpaceCalibrationService {
                         .eq(SpaceCalibrationPeriodEnt::getLineId, lineId)
                         .eq(SpaceCalibrationPeriodEnt::getOuId, ouId)
                         .orderByDesc(BaseModel::getModifyTime)
-                        .last(BusinessConstant.LAST_LIMIT)
+                        .last(BaseUtils.getLastLimit())
         );
     }
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceInstitutionDetailService.java

@@ -630,7 +630,7 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
                 .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
                 .eq(SpaceCalibrationHistoryEnt::getInstitutionId, detail.getId())
                 .orderByDesc(SpaceCalibrationHistoryEnt::getCalibrationDate)
-                .last(BusinessConstant.LAST_LIMIT)
+                .last(BaseUtils.getLastLimit())
         );
         DateTime now = DateUtil.beginOfDay(DateUtil.date());
         boolean isCreate = false;
@@ -652,7 +652,7 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
                     .eq(SpaceCalibrationPeriodEnt::getLineId, detail.getLineId())
                     .eq(SpaceCalibrationPeriodEnt::getOuId, detail.getOuId())
                     .orderByDesc(BaseModel::getModifyTime)
-                    .last(BusinessConstant.LAST_LIMIT)
+                    .last(BaseUtils.getLastLimit())
             );
             if (ObjectUtil.isNotNull(periodEnt)) {
                 mapper.insert(this.createCalibrationHistory(session, detail, now, Integer.valueOf(periodEnt.getDayNumber())));

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeShortPeriodService.java

@@ -14,6 +14,7 @@ import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutp
 import pps.core.common.constant.BusinessConstant;
 import pps.core.common.entity.BaseModel;
 import pps.core.common.session.PpsUserSession;
+import pps.core.common.utils.BaseUtils;
 import pps.core.space.entity.*;
 import pps.core.space.mapper.*;
 import pps.core.space.service.data.SpaceOptimizeDateDuration;
@@ -117,7 +118,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
         SpaceOptimizeShortPeriodEnt periodEnt = mapper.selectOne(new LambdaQueryWrapper<SpaceOptimizeShortPeriodEnt>()
                 .eq(SpaceOptimizeShortPeriodEnt::getOptimizeDate, now)
                 .eq(SpaceOptimizeShortPeriodEnt::getLineId, lineId)
-                .last(BusinessConstant.LAST_LIMIT)
+                .last(BaseUtils.getLastLimit())
         );
         if (ObjectUtil.isEmpty(periodEnt)) {
             return XListResult.success(Collections.emptyList());

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/mapper/StationDailyProductionSituationMapper.java

@@ -10,6 +10,6 @@ import pps.core.prediction.entity.StationDailyProductionSituationEnt;
  * @author ZWT
  * @date 2024/10/20
  */
-@Repository(value="pps.core.prediction.mapper.StationDailyProductionSituationMapper")
+@Repository(value = "pps.core.prediction.mapper.StationDailyProductionSituationMapper")
 public interface StationDailyProductionSituationMapper extends BaseMapper<StationDailyProductionSituationEnt> {
 }

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.core.common.constant.BusinessConstant;
+import pps.core.common.utils.BaseUtils;
 import pps.core.prediction.entity.PlantTrainPowerTaskEnt;
 import pps.core.prediction.mapper.PlantTrainPowerTaskMapper;
 import xstartup.annotation.XService;
@@ -19,7 +19,7 @@ public class PlantTrainPowerTaskService implements PlantTrainPowerTaskCloudServi
         PlantTrainPowerTaskMapper mapper = context.getBean(PlantTrainPowerTaskMapper.class);
         LambdaQueryWrapper<PlantTrainPowerTaskEnt> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(PlantTrainPowerTaskEnt::getPlantId, input.getPlantId())
-                .last(BusinessConstant.LAST_LIMIT);
+                .last(BaseUtils.getLastLimit());
         PlantTrainPowerTaskEnt ent = mapper.selectOne(queryWrapper);
         GetPlantTrainPowerTaskCloudOutput output = XCopyUtils.copyNewObject(ent, GetPlantTrainPowerTaskCloudOutput.class);
         return XSingleResult.success(output);

C13-middle/pps-core-middle/src/main/java/pps/core/middle/mapper/WellBaseMapper.java

@@ -4,6 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
 import pps.core.middle.entity.WellBaseEnt;
 
-@Repository(value="pps.core.middle.mapper.WellBaseMapper")
+@Repository(value = "pps.core.middle.mapper.WellBaseMapper")
 public interface WellBaseMapper extends BaseMapper<WellBaseEnt> {
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/mapper/WellBaseViewMapper.java

 package pps.core.middle.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
 import pps.core.middle.entity.WellBaseView;
+
 import java.util.List;
 
-@Repository(value="pps.core.middle.mapper.WellBaseViewMapper")
+@Repository(value = "pps.core.middle.mapper.WellBaseViewMapper")
 public interface WellBaseViewMapper {
     WellBaseView selectOne(WellBaseView record);
+
     List<WellBaseView> selectList(WellBaseView record);
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/StationMappingService.java

@@ -30,30 +30,6 @@ import java.util.List;
 
 @XService
 public class StationMappingService {
-    @XApiAnonymous
-    @XApiGet(anonymous = true)
-    public XSingleResult<GetStationMappingOutput> getStationMapping(XContext context, GetStationMappingInput input) {
-        StationMappingMapper mapper = context.getBean(StationMappingMapper.class);
-        List<StationMappingEnt> list = mapper.selectList(new LambdaQueryWrapper<>());
-        for (StationMappingEnt stationMappingEnt : list) {
-            context.getLogger().info(JSONUtil.toJsonStr(stationMappingEnt));
-        }
-        try {
-            String storeDir = XStartup.getCurrent().getProperty("weather.file.temp.path");
-            StringBuilder stringBuilder = new StringBuilder(storeDir)
-                    .append(File.separator)
-                    .append(DateTime.now().toString("yyyyMMdd"));
-            String filePath = stringBuilder.append(File.separator).append("test.json").toString();
-            String url = "http://192.168.100.128/tqfj/202410181200天气预测数据SY.json";
-            HttpUtil.downloadFile(url, filePath);
-            context.getLogger().info(filePath);
-            context.getLogger().info(FileUtil.readUtf8String(filePath));
-        } catch (Exception e) {
-            context.getLogger().error(e.getMessage(), e);
-        }
-        return XSingleResult.success();
-    }
-
     //Oracle数据库的ip和端口（可以是服务器上的）
     private static final String URL = "192.168.0.128:1521";
     //服务名称（SID）
@@ -74,55 +50,6 @@ public class StationMappingService {
             "    OR U.OBJECT_TYPE = 'TRIGGER' " +
             "    ORDER BY U.OBJECT_TYPE DESC";
 
-
-    @XApiAnonymous
-    @XApiGet(anonymous = true)
-    public XServiceResult test(XContext context) throws SQLException {
-        List<String> list = new ArrayList<>();
-        Connection conn = null;
-        try {
-            File saveFile = new File(PATH);
-            if (!saveFile.exists()) {// 如果目录不存在
-                saveFile.mkdirs();// 创建文件夹
-            }
-            Class.forName("oracle.jdbc.driver.OracleDriver");
-            //三个参数的分别为连接的URL，用户名，密码
-            //JDBC三件套
-//            conn = DriverManager.getConnection("jdbc:oracle:thin:@" + URL + ":" + SERVICE_NAME, USERNAME, PASSWORD);
-            conn = DriverManager.getConnection("jdbc:oracle:thin:@192.168.100.128:1521/ORCL", USERNAME, PASSWORD);
-            PreparedStatement ps = conn.prepareStatement(SQL);
-            ResultSet res = ps.executeQuery();
-            String sql_statement = "";
-            FileWriter writer;
-            //在导出的脚本名称上加时间起到记录的作用,同时避免被覆盖,注意日期格式不要加空格（文件不支持）
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
-            String format = simpleDateFormat.format(new Date());
-            writer = new FileWriter(PATH + "gqdc_" + format + ".sql");
-            list.add(PATH);
-            list.add("gqdc_" + format + ".sql");
-            //得到的字符串较大,不能直接写入到脚本
-            while (res.next()) {
-                sql_statement = res.getString(1) + ";";
-                writer.write(sql_statement);
-            }
-            writer.flush();
-            writer.close();
-            //查询某个用户（数据库）下所有表
-            String sql = "select * from all_tables a where a.OWNER = upper('DB_CONTRACT')";
-            ResultSet resultSet = ps.executeQuery(sql);
-            while (resultSet.next()) {
-                String Bname = getTableInsertSql(conn, resultSet.getString(2));
-                list.add(Bname);
-            }
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            conn.close();
-        }
-        return XServiceResult.OK;
-    }
-
     //导出单表,conn为连接，tableName为表名称
     public static String getTableInsertSql(@NotNull Connection conn, String tableName) throws Exception {
         ResultSet rs = null;
@@ -178,4 +105,76 @@ public class StationMappingService {
                 statement.close();
         }
     }
+
+    @XApiAnonymous
+    @XApiGet(anonymous = true)
+    public XSingleResult<GetStationMappingOutput> getStationMapping(XContext context, GetStationMappingInput input) {
+        StationMappingMapper mapper = context.getBean(StationMappingMapper.class);
+        List<StationMappingEnt> list = mapper.selectList(new LambdaQueryWrapper<>());
+        for (StationMappingEnt stationMappingEnt : list) {
+            context.getLogger().info(JSONUtil.toJsonStr(stationMappingEnt));
+        }
+        try {
+            String storeDir = XStartup.getCurrent().getProperty("weather.file.temp.path");
+            StringBuilder stringBuilder = new StringBuilder(storeDir)
+                    .append(File.separator)
+                    .append(DateTime.now().toString("yyyyMMdd"));
+            String filePath = stringBuilder.append(File.separator).append("test.json").toString();
+            String url = "http://192.168.100.128/tqfj/202410181200天气预测数据SY.json";
+            HttpUtil.downloadFile(url, filePath);
+            context.getLogger().info(filePath);
+            context.getLogger().info(FileUtil.readUtf8String(filePath));
+        } catch (Exception e) {
+            context.getLogger().error(e.getMessage(), e);
+        }
+        return XSingleResult.success();
+    }
+
+    @XApiAnonymous
+    @XApiGet(anonymous = true)
+    public XServiceResult test(XContext context) throws SQLException {
+        List<String> list = new ArrayList<>();
+        Connection conn = null;
+        try {
+            File saveFile = new File(PATH);
+            if (!saveFile.exists()) {// 如果目录不存在
+                saveFile.mkdirs();// 创建文件夹
+            }
+            Class.forName("oracle.jdbc.driver.OracleDriver");
+            //三个参数的分别为连接的URL，用户名，密码
+            //JDBC三件套
+//            conn = DriverManager.getConnection("jdbc:oracle:thin:@" + URL + ":" + SERVICE_NAME, USERNAME, PASSWORD);
+            conn = DriverManager.getConnection("jdbc:oracle:thin:@192.168.100.128:1521/ORCL", USERNAME, PASSWORD);
+            PreparedStatement ps = conn.prepareStatement(SQL);
+            ResultSet res = ps.executeQuery();
+            String sql_statement = "";
+            FileWriter writer;
+            //在导出的脚本名称上加时间起到记录的作用,同时避免被覆盖,注意日期格式不要加空格（文件不支持）
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
+            String format = simpleDateFormat.format(new Date());
+            writer = new FileWriter(PATH + "gqdc_" + format + ".sql");
+            list.add(PATH);
+            list.add("gqdc_" + format + ".sql");
+            //得到的字符串较大,不能直接写入到脚本
+            while (res.next()) {
+                sql_statement = res.getString(1) + ";";
+                writer.write(sql_statement);
+            }
+            writer.flush();
+            writer.close();
+            //查询某个用户（数据库）下所有表
+            String sql = "select * from all_tables a where a.OWNER = upper('DB_CONTRACT')";
+            ResultSet resultSet = ps.executeQuery(sql);
+            while (resultSet.next()) {
+                String Bname = getTableInsertSql(conn, resultSet.getString(2));
+                list.add(Bname);
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            conn.close();
+        }
+        return XServiceResult.OK;
+    }
 }

C13-middle/pps-core-middle/src/main/resources/mybatis/mapper/pps/core/middle/ThirdActivePowerViewMapper.xml

@@ -44,7 +44,8 @@
         ID=#{id}
     </select>
 
-    <select id="selectThirdActivePowerList" parameterType="pps.core.middle.entity.ThirdActivePowerView" resultMap="BaseResultMap">
+    <select id="selectThirdActivePowerList" parameterType="pps.core.middle.entity.ThirdActivePowerView"
+            resultMap="BaseResultMap">
         SELECT
         S.SYSTEM_STATION_NAME AS STATION_NAME,
         SUM( T.PHOTOVOLTAIC_POWER ) AS PHOTOVOLTAIC_POWER,

C13-middle/pps-core-middle/src/main/resources/mybatis/mapper/pps/core/middle/ThirdPhotovoltaicPowerViewMapper.xml

@@ -34,7 +34,8 @@
         ID=#{id}
     </select>
 
-    <select id="selectPhotovoltaicPowerList" parameterType="pps.core.middle.entity.ThirdPhotovoltaicPowerView" resultMap="BaseResultMap">
+    <select id="selectPhotovoltaicPowerList" parameterType="pps.core.middle.entity.ThirdPhotovoltaicPowerView"
+            resultMap="BaseResultMap">
         SELECT S.SYSTEM_STATION_NAME AS STATION_NAME,
         AVG(T.PHOTOVOLTAIC_POWER) AS PHOTOVOLTAIC_POWER,
         TRUNC( T.CREATE_DATE ) AS CREATE_DATE