feat(零碳): 长庆演示系统新增功能

1.修改第三方日累计数据推送表表结构,增加日累计储能放电量字段,同时修改代码对应实体及mapper文件,修改相关接口增加储能日累计放电量接收逻辑;
2.修改首页井场收益分析模块接口,修改获取储能累计放电量逻辑;
3.设计并创建井口日用电趋势表,生成对应实体类及mapper文件;
4.统计分析模块,新增本月累计节电经济效益查询接口,添加线上接口文档并完成接口冒烟测试;
5.统计分析模块,新增本月累计减碳量查询接口,添加线上接口文档并完成接口冒烟测试;
6.统计分析模块,新增光伏发电趋势查询接口,添加线上接口文档并完成接口冒烟测试;
7.统计分析模块,新增月度总览查询接口,添加线上接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -15,6 +15,9 @@ public class GetConfigOilFieldOutput {
     @XText("油田名称")
     private String oilFieldName;
 
+    @XText("油田编码")
+    private String oilFieldCode;
+
     @XText("首页路由")
     private String homePagePath;
 

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

@@ -31,6 +31,10 @@ public class ConfigOilFieldEnt implements Serializable {
     @TableField
     private String oilFieldName;
 
+    @XText("油田编码")
+    @TableField
+    private String oilFieldCode;
+
     @XText("首页路由")
     @TableField
     private String homePagePath;

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

@@ -26,6 +26,10 @@ public class ConfigOilFieldView implements Serializable {
     @TableField
     private String oilFieldName;
 
+    @XText("油田编码")
+    @TableField
+    private String oilFieldCode;
+
     @XText("首页路由")
     @TableField
     private String homePagePath;

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

@@ -31,7 +31,7 @@ public class BaseLineService {
     @XApiGet(anonymous = true)
     public XServiceResult test(XContext context) {
         BaseWeatherCloudServiceImpl bean = context.getBean(BaseWeatherCloudServiceImpl.class);
-        bean.weatherDataProcess(context, "长庆");
+        bean.weatherDataProcess(context, "CQ");
         return XServiceResult.OK;
     }
 

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

@@ -66,12 +66,12 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
      * 天气数据接收Cloud模块--天气数据处理
      *
      * @param context      上下文
-     * @param oilFieldName 油田名称
+     * @param oilFieldCode 油田编码
      * @return {@link XServiceResult }
      * @throws ParseException 解析异常
      */
     @Override
-    public XServiceResult weatherDataProcess(XContext context, String oilFieldName) {
+    public XServiceResult weatherDataProcess(XContext context, String oilFieldCode) {
         XLoggerTool logger = context.getLogger();
         //取未读邮件
         Store store = null;
@@ -105,7 +105,7 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
                 for (Message message : messageList) {
                     re = new ReceivedIMAPMail((MimeMessage) message);
                     String subject = re.getSubject();
-                    if (!CharSequenceUtil.endWith(subject, oilFieldName + "天气预测数据")) {
+                    if (!CharSequenceUtil.endWith(subject, "天气预测数据" + oilFieldCode)) {
                         continue;
                     }
                     logger.info("------ weatherDataProcess subject: {}", subject);

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

@@ -15,6 +15,9 @@ public class GetConfigOilFieldOutput {
     @XText("油田名称")
     private String oilFieldName;
 
+    @XText("油田编码")
+    private String oilFieldCode;
+
     @XText("首页路由")
     private String homePagePath;
 

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

@@ -5,6 +5,7 @@
     <id column="id" property="id" jdbcType="BIGINT" />
     <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="home_page_path" property="homePagePath" jdbcType="VARCHAR" />
     <result column="api_task_is_enable" property="apiTaskIsEnable" jdbcType="TINYINT" />
   </resultMap>
@@ -13,6 +14,7 @@
       ,
     is_enable,
     oil_field_name,
+    oil_field_code,
     home_page_path,
     api_task_is_enable
   </sql>

C10-task/pps-core-task/src/main/java/pps/core/task/job/WeatherReceiveJob.java

@@ -35,9 +35,9 @@ public class WeatherReceiveJob extends JobCommonService implements XJob {
         String key = TaskConstant.TASK_LOCK_KEY + "WeatherReceiveJob";
         TaskLockCache exist = TaskLockCache.exist(xContext, key);
         if (ObjectUtil.isNull(exist)) {
-            String oilFieldName = this.getCurrentConfig(xContext).getOilFieldName();
-            if (CharSequenceUtil.isBlank(oilFieldName)) {
-                xContext.getLogger().info("------ WeatherReceiveJob oilFieldName is blank");
+            String oilFieldCode = this.getCurrentConfig(xContext).getOilFieldCode();
+            if (CharSequenceUtil.isBlank(oilFieldCode)) {
+                xContext.getLogger().info("------ WeatherReceiveJob oilFieldCode is blank");
                 return XServiceResult.OK;
             }
             TaskLockCache cache = new TaskLockCache();
@@ -46,7 +46,7 @@ public class WeatherReceiveJob extends JobCommonService implements XJob {
             TaskLockCache.set(xContext, cache);
             try {
                 IBaseWeatherCloudService service = xContext.getBean(IBaseWeatherCloudService.class);
-                XServiceResult result = service.weatherDataProcess(xContext, oilFieldName);
+                XServiceResult result = service.weatherDataProcess(xContext, oilFieldCode);
                 result.throwIfFail();
             } catch (Exception e) {
                 xContext.getLogger().error("------ WeatherReceiveJob Exception: ", e);