feat(吉林演示): 松原

1.天气数据接收定时任务,解决代码扫描问题,修改文件读取相关代码,解决资源未关流问题;
2.修改登录验证码生成工具类,解决代码扫描问题,修复随机数不安全问题;
3.删除除主程序启动类外其他启动类模块,解决代码扫描问题;
4.删除自定义httputlis类,解决代码扫描问题,替换部分代码远程调用方法;
5.重构光伏预测模块下载电站实际发电数据导入模板接口,解决代码扫描问题;
6.重构光伏预测模块导入电站实际发电数据接口,解决代码扫描问题;
7.删除公用excel导入导出工具类及poi相关pom依赖,解决代码扫描问题;
8.光伏功率预测模块,增加查询线路列表接口,解决页面接口报错问题;
9.增加测试用历史数据导入接口;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -10,8 +10,11 @@ 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 xstartup.annotation.XService;
+import xstartup.annotation.XText;
 import xstartup.base.XContext;
 import xstartup.base.XStartup;
+import xstartup.data.XFileResult;
+import xstartup.data.XFileType;
 import xstartup.data.XSingleResult;
 import xstartup.feature.api.annotation.XApiGet;
 
@@ -34,22 +37,59 @@ public class ConfigOilFieldService {
      * @param context 上下文
      * @return {@link XSingleResult }<{@link GetConfigOilFieldOutput }>
      */
+    @XText("获取当前配置")
     @XApiGet(anonymous = true)
     public XSingleResult<GetConfigOilFieldOutput> getCurrentConfig(XContext context) {
+        ConfigOilFieldEnt ent = this.getCurrentConfigOil(context);
+        GetProjectTitleOutput output = this.getProjectTitleOutput(ent.getProjectTitle());
+        return XSingleResult.success(GetConfigOilFieldOutput.builder()
+                .title(output.getTitle())
+                .homePagePath(ent.getHomePagePath())
+                .imagePath("/base/config-oil-field/home-image-load")
+                .build());
+    }
+
+    /**
+     * 首页图片下载
+     *
+     * @param context 上下文
+     * @return {@link XFileResult }
+     */
+    @XText("首页图片下载")
+    @XApiGet(anonymous = true)
+    public XFileResult homeImageLoad(XContext context) {
+        ConfigOilFieldEnt ent = this.getCurrentConfigOil(context);
+        GetProjectTitleOutput output = this.getProjectTitleOutput(ent.getProjectTitle());
+        return XFileResult.success(XFileType.IMAGE_PNG, storeDir + FileUtil.FILE_SEPARATOR + output.getImageRelativePath());
+    }
+
+    /*--------------------------------- private ---------------------------------*/
+
+    /**
+     * 获取当前配置
+     *
+     * @param context 上下文
+     * @return {@link ConfigOilFieldEnt }
+     */
+    private ConfigOilFieldEnt getCurrentConfigOil(XContext context) {
         ConfigOilFieldMapper mapper = context.getBean(ConfigOilFieldMapper.class);
-        ConfigOilFieldEnt ent = mapper.selectOne(new LambdaQueryWrapper<ConfigOilFieldEnt>()
+        return mapper.selectOne(new LambdaQueryWrapper<ConfigOilFieldEnt>()
                 .eq(ConfigOilFieldEnt::getIsEnable, BusinessConstant.ZERO)
                 .last(BusinessConstant.LAST_LIMIT)
         );
-        List<GetProjectTitleOutput> list = JSONUtil.toList(ent.getProjectTitle(), GetProjectTitleOutput.class);
-        GetProjectTitleOutput output = list.stream()
+    }
+
+    /**
+     * 获取项目标题输出
+     *
+     * @param projectTitle 项目名称
+     * @return {@link GetProjectTitleOutput }
+     */
+    private GetProjectTitleOutput getProjectTitleOutput(String projectTitle) {
+        List<GetProjectTitleOutput> list = JSONUtil.toList(projectTitle, GetProjectTitleOutput.class);
+        return list.stream()
                 .filter(t -> ObjectUtil.isNotNull(t.getSort()) && ObjectUtil.equals(0, t.getSort()))
                 .findAny()
                 .orElse(new GetProjectTitleOutput());
-        return XSingleResult.success(GetConfigOilFieldOutput.builder()
-                .title(output.getTitle())
-                .homePagePath(ent.getHomePagePath())
-                .imagePath(storeDir + FileUtil.FILE_SEPARATOR + output.getImageRelativePath())
-                .build());
     }
 }
\ No newline at end of file

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/config_oil_field/GetConfigOilFieldInput.java

+package pps.core.base.service.data.config_oil_field;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import xstartup.annotation.XText;
+
+/**
+ * 油田配置入参
+ *
+ * @author ZWT
+ * @date 2024/09/26
+ */
+@Data
+public class GetConfigOilFieldInput {
+
+    @XText("来源")
+    @NotBlank(message = "缺少系统来源")
+    private String source;
+}

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/config_oil_field/GetConfigOilFieldOutput.java

@@ -24,6 +24,6 @@ public class GetConfigOilFieldOutput {
     @XText("标题")
     private String title;
 
-    @XText("图片路径")
+    @XText("图片地址")
     private String imagePath;
 }