feat(吉林演示): 松原

1.修改系统首页大屏总览接口,增加区分组织机构逻辑,完成接口冒烟测试;
2.修改系统首页获取井场列表接口,增加区分组织机构逻辑,完成接口冒烟测试;
3.修改系统首页井场功能下钻后提示报错问题,修改用电功率数据获取逻辑,修复报错问题;
4.修改输电线路分页列表查询接口,增加查询条件,在查询父线路列表时只查询10千伏线路,修改线上接口文档同时完成接口冒烟测试;
5.修改系统首页井场实时监控接口,增加区分组织机构逻辑,完成接口冒烟测试;
6.修改系统首页用能分析接口,增加区分组织机构逻辑,完成接口冒烟测试;
7.修改系统首页井场用能分析(双坐标轴)接口,增加区分组织机构逻辑,完成接口冒烟测试;
8.修改系统首页累积用电接口,增加区分组织机构逻辑,完成接口冒烟测试;
9.修改系统首页光伏实时监控接口,增加区分组织机构逻辑,完成接口冒烟测试;
10.修改系统首页井场效果评价接口,增加区分组织机构逻辑,完成接口冒烟测试;
11.修改系统首页先导实验井间开制度接口,增加区分组织机构逻辑,完成接口冒烟测试;
12.修改极短期间开优化模块井口生产情况油井状态接口,增加区分组织机构逻辑,完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -20,6 +20,9 @@ public class GetConfigOilFieldOutput {
     @XText("油田编码")
     private String oilFieldCode;
 
+    @XText("省份列表','分割")
+    private String provinceList;
+
     @XText("首页路由")
     private String homePagePath;
 

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

@@ -36,6 +36,10 @@ public class ConfigOilFieldEnt implements Serializable {
     @TableField
     private String oilFieldCode;
 
+    @XText("省份列表','分割")
+    @TableField
+    private String provinceList;
+
     @XText("首页路由")
     @TableField
     private String homePagePath;

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

@@ -31,6 +31,10 @@ public class ConfigOilFieldView implements Serializable {
     @TableField
     private String oilFieldCode;
 
+    @XText("省份列表','分割")
+    @TableField
+    private String provinceList;
+
     @XText("首页路由")
     @TableField
     private String homePagePath;

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

@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.text.CharSequenceUtil;
-import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.EasyExcelFactory;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import pps.cloud.base.service.data.config_oil_field.GetConfigOilFieldOutput;
@@ -738,17 +737,12 @@ public class ExcelService {
      * @return {@link List }<{@link QuerySysAreaOutput }>
      */
     private List<QuerySysAreaOutput> getProvinceAndCityList(XContext context) {
-        List<QuerySysAreaOutput> provinceAndCityList;
         //区分环境
         ConfigOilFieldCloudServiceImpl service = context.getBean(ConfigOilFieldCloudServiceImpl.class);
         XSingleResult<GetConfigOilFieldOutput> currentConfig = service.getCurrentConfig(context);
         currentConfig.throwIfFail();
-        String envValue = ObjectUtil.defaultIfNull(currentConfig.getResult().getOilFieldCode(), BusinessConstant.DEFAULT_VALUE);
-        if (envValue.equals(BusinessConstant.ENV_SY)) {
-            provinceAndCityList = ServiceUtil.getProvinceAndCityList(context, "吉林");
-        } else {
-            provinceAndCityList = ServiceUtil.getProvinceAndCityList(context, "陕西", "甘肃");
-        }
-        return provinceAndCityList;
+        GetConfigOilFieldOutput result = currentConfig.getResult();
+        String[] strings = CharSequenceUtil.splitToArray(result.getProvinceList(), ',');
+        return ServiceUtil.getProvinceAndCityList(context, strings);
     }
 }
\ No newline at end of file

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

@@ -20,6 +20,9 @@ public class GetConfigOilFieldOutput {
     @XText("油田编码")
     private String oilFieldCode;
 
+    @XText("省份列表','分割")
+    private String provinceList;
+
     @XText("首页路由")
     private String homePagePath;
 

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

@@ -6,6 +6,7 @@
         <result column="is_enable" property="isEnable" jdbcType="TINYINT"/>
         <result column="oil_field_name" property="oilFieldName" jdbcType="VARCHAR"/>
         <result column="oil_field_code" property="oilFieldCode" jdbcType="VARCHAR"/>
+        <result column="province_list" property="provinceList" jdbcType="VARCHAR"/>
         <result column="home_page_path" property="homePagePath" jdbcType="VARCHAR"/>
         <result column="is_demo" property="isDemo" jdbcType="TINYINT"/>
         <result column="demo_date" property="demoDate" jdbcType="VARCHAR"/>
@@ -16,6 +17,7 @@
     is_enable,
     oil_field_name,
     oil_field_code,
+    province_list,
     home_page_path,
     is_demo,
     demo_date