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/entity/ConfigOilFieldEnt.java

@@ -63,4 +63,8 @@ public class ConfigOilFieldEnt implements Serializable {
     @XText("第三方接口认证配置(JsonString)")
     @TableField
     private String thirdPartyAuthConfig;
+
+    @XText("项目标题(展示sort为0的标题)")
+    @TableField
+    private String projectTitle;
 }
\ No newline at end of file

C09-base/pps-core-base/src/main/java/pps/core/base/entity/ConfigOilFieldView.java

@@ -59,4 +59,8 @@ public class ConfigOilFieldView implements Serializable {
     @XText("第三方接口认证配置(JsonString)")
     @TableField
     private String thirdPartyAuthConfig;
+
+    @XText("项目标题(展示sort为0的标题)")
+    @TableField
+    private String projectTitle;
 }
\ No newline at end of file

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

 package pps.core.base.service;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import pps.cloud.base.service.IConfigOilFieldCloudService;
 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 xstartup.annotation.XService;
 import xstartup.base.XContext;
 import xstartup.base.util.XCopyUtils;
@@ -24,8 +29,17 @@ public class ConfigOilFieldCloudServiceImpl implements IConfigOilFieldCloudServi
      */
     @Override
     public XSingleResult<GetConfigOilFieldOutput> getCurrentConfig(XContext context) {
-        ConfigOilFieldService bean = context.getBean(ConfigOilFieldService.class);
-        return XSingleResult.success(XCopyUtils.copyNewObject(bean.getCurrentConfig(context).getResult(),
-                GetConfigOilFieldOutput.class));
+        ConfigOilFieldMapper mapper = context.getBean(ConfigOilFieldMapper.class);
+        ConfigOilFieldEnt ent = mapper.selectOne(new LambdaQueryWrapper<ConfigOilFieldEnt>()
+                .eq(ConfigOilFieldEnt::getIsEnable, BusinessConstant.ZERO)
+                .last(BusinessConstant.LAST_LIMIT)
+        );
+        GetConfigOilFieldOutput output;
+        if (ObjectUtil.isNull(ent)) {
+            output = new GetConfigOilFieldOutput();
+        } else {
+            output = XCopyUtils.copyNewObject(ent, GetConfigOilFieldOutput.class);
+        }
+        return XSingleResult.success(output);
     }
 }
\ No newline at end of file

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

 package pps.core.base.service;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import pps.core.base.entity.ConfigOilFieldEnt;
 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 xstartup.annotation.XService;
 import xstartup.base.XContext;
-import xstartup.base.util.XCopyUtils;
 import xstartup.data.XSingleResult;
 import xstartup.feature.api.annotation.XApiGet;
 
+import java.util.List;
+
 /**
  * 油田配置模块
  *
@@ -27,19 +32,37 @@ public class ConfigOilFieldService {
      * @param context 上下文
      * @return {@link XSingleResult }<{@link GetConfigOilFieldOutput }>
      */
-    @XApiGet
+    @XApiGet(anonymous = true)
     public XSingleResult<GetConfigOilFieldOutput> getCurrentConfig(XContext context) {
         ConfigOilFieldMapper mapper = context.getBean(ConfigOilFieldMapper.class);
         ConfigOilFieldEnt ent = mapper.selectOne(new LambdaQueryWrapper<ConfigOilFieldEnt>()
                 .eq(ConfigOilFieldEnt::getIsEnable, BusinessConstant.ZERO)
                 .last(BusinessConstant.LAST_LIMIT)
         );
-        GetConfigOilFieldOutput output;
+        String homePagePath, title;
         if (ObjectUtil.isNull(ent)) {
-            output = new GetConfigOilFieldOutput();
+            homePagePath = "/403";
+            title = "零碳井场能量综合管控系统";
         } else {
-            output = XCopyUtils.copyNewObject(ent, GetConfigOilFieldOutput.class);
+            homePagePath = CharSequenceUtil.blankToDefault(ent.getHomePagePath(), "/403");
+            if (JSONUtil.isTypeJSONArray(ent.getProjectTitle())) {
+                List<GetProjectTitleOutput> list = JSONUtil.toList(ent.getProjectTitle(), GetProjectTitleOutput.class);
+                if (CollUtil.isEmpty(list)) {
+                    title = "零碳井场能量综合管控系统";
+                } else {
+                    title = list.stream()
+                            .filter(t -> ObjectUtil.isNotNull(t.getSort()) && ObjectUtil.equals(0, t.getSort()) && CharSequenceUtil.isNotBlank(t.getTitle()))
+                            .map(GetProjectTitleOutput::getTitle)
+                            .findAny()
+                            .orElse("零碳井场能量综合管控系统");
+                }
+            } else {
+                title = "零碳井场能量综合管控系统";
+            }
         }
-        return XSingleResult.success(output);
+        return XSingleResult.success(GetConfigOilFieldOutput.builder()
+                .title(title)
+                .homePagePath(homePagePath)
+                .build());
     }
 }
\ No newline at end of file

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

 package pps.core.base.service.data.config_oil_field;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import xstartup.annotation.XText;
 
-import java.util.Date;
-
 /**
  * 油田配置输出
  *
@@ -12,32 +13,14 @@ import java.util.Date;
  * @date 2024/06/25
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class GetConfigOilFieldOutput {
 
-    @XText("油田名称")
-    private String oilFieldName;
-
-    @XText("油田编码")
-    private String oilFieldCode;
-
-    @XText("省份列表','分割")
-    private String provinceList;
-
     @XText("首页路由")
     private String homePagePath;
 
-    @XText("认证key")
-    private String authKey;
-
-    @XText("模拟用户")
-    private String simulateUser;
-
-    @XText("是否演示修改(1_否,0_是)")
-    private Integer isDemo;
-
-    @XText("演示日期")
-    private Date demoDate;
-
-    @XText("第三方接口认证配置(JsonString)")
-    private String thirdPartyAuthConfig;
+    @XText("标题")
+    private String title;
 }

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

+package pps.core.base.service.data.config_oil_field;
+
+import lombok.Data;
+import xstartup.annotation.XText;
+
+/**
+ * 项目标题
+ *
+ * @author ZWT
+ * @date 2024/06/25
+ */
+@Data
+public class GetProjectTitleOutput {
+
+    @XText("标题")
+    private String title;
+
+    @XText("排序")
+    private Integer sort;
+}

C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/ConfigOilFieldViewMapper.xml

@@ -13,6 +13,7 @@
         <result column="is_demo" property="isDemo" jdbcType="TINYINT"/>
         <result column="demo_date" property="demoDate" jdbcType="VARCHAR"/>
         <result column="third_party_auth_config" property="thirdPartyAuthConfig" jdbcType="VARCHAR"/>
+        <result column="project_title" property="projectTitle" jdbcType="VARCHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
         id
@@ -26,7 +27,8 @@
     simulate_user,
     is_demo,
     demo_date,
-    third_party_auth_config
+    third_party_auth_config,
+    project_title
     </sql>
     <select id="selectOne" parameterType="pps.core.base.entity.ConfigOilFieldView" resultMap="BaseResultMap">
         select