feat(零碳): 长庆

1.修复登录页面登录接口验证码输入后不需要验证直接能登录的问题;
2.长庆演示,首页展示大屏功能修改,修改线路详情接口,增加查询日平均用电量逻辑,同时重构查询日产液量和日发电量逻辑,更新接口文档并完成接口冒烟测试,同时生成用例;
3.长庆极短期间开优化随动算法功能开发,设置自定义参数,初步完成极短时间,间开时间段优化测试功能;
4.间开制度管理模块,间开制度关联井口信息表表结构修改,增加"单次最高开井时长(h)","单次最低开井时长(h)","单次最高关井时长(h)","单次最低关井时长(h)"字段,同时修改数据表对应代码实体及表单参数,修改部分相关模块功能查询修改逻辑;
5.接收天气服务定时任务优化,优化代码结构,修改保存删除逻辑,减少数据库链接次数,优化各类变量大小,修改日期拆分逻辑,解决插入重复数据bug,修改查询电站信息逻辑,增加过滤条件排除第二采油厂数据;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

 package pps.core.base.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 光伏电站
@@ -15,6 +19,9 @@ import java.math.BigDecimal;
  * @date 2023/09/08
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class BasePhotovoltaicPlantView extends BaseModel implements Serializable {
 
     @XText("组织机构ID")
@@ -76,4 +83,12 @@ public class BasePhotovoltaicPlantView extends BaseModel implements Serializable
     @XText("地区编码")
     @TableField
     private Integer areaCode;
+
+    @XText("所属省份")
+    @TableField(exist = false)
+    private List<String> ouIdIn;
+
+    @XText("所属省份")
+    @TableField(exist = false)
+    private List<String> ouIdNotIn;
 }

C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BasePhotovoltaicPlantViewMapper.java

@@ -24,5 +24,5 @@ public interface BasePhotovoltaicPlantViewMapper {
      *
      * @return {@link List}<{@link BasePhotovoltaicPlantView}>
      */
-    List<BasePhotovoltaicPlantView> selectPlantList();
+    List<BasePhotovoltaicPlantView> selectPlantList(BasePhotovoltaicPlantView view);
 }

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

@@ -84,9 +84,11 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
             logger.info("------ weatherDataProcess connect mail ------");
             List<Message> messageList = ReceivedIMAPMail.filterMessage(folder.getMessages(), null, null);
             if (CollUtil.isNotEmpty(messageList)) {
-                //取电站
+                //取电站(排除第二采油厂)
                 BasePhotovoltaicPlantViewMapper viewMapper = context.getBean(BasePhotovoltaicPlantViewMapper.class);
-                List<BasePhotovoltaicPlantView> plantList = viewMapper.selectPlantList();
+                List<BasePhotovoltaicPlantView> plantList = viewMapper.selectPlantList(BasePhotovoltaicPlantView.builder()
+                        .ouIdNotIn(CollUtil.list(false, "2c4c9d1c-ad55-4c14-b889-4dc33e3461e2"))
+                        .build());
                 if (CollUtil.isEmpty(plantList)) {
                     logger.info("------ weatherDataProcess plantList is empty ------");
                     return null;

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

@@ -93,28 +93,34 @@
 
     <select id="selectPlantList" resultMap="BaseResultMap">
         SELECT p.id,
-               p.is_deleted,
-               p.create_by_id,
-               p.create_by_name,
-               p.create_time,
-               p.modify_by_id,
-               p.modify_by_name,
-               p.modify_time,
-               p.ou_id,
-               p.ou_name,
-               p.station_name,
-               p.maker_number,
-               p.photovoltaic_model_key,
-               p.photovoltaic_model_name,
-               p.mounting_angle,
-               p.total_power,
-               p.array_orientation,
-               p.area_code,
-               a.city_code
+        p.is_deleted,
+        p.create_by_id,
+        p.create_by_name,
+        p.create_time,
+        p.modify_by_id,
+        p.modify_by_name,
+        p.modify_time,
+        p.ou_id,
+        p.ou_name,
+        p.station_name,
+        p.maker_number,
+        p.photovoltaic_model_key,
+        p.photovoltaic_model_name,
+        p.mounting_angle,
+        p.total_power,
+        p.array_orientation,
+        p.area_code,
+        a.city_code
         FROM base_photovoltaic_plant p
-                 LEFT JOIN sys_area a ON a.id = p.area_code
+        LEFT JOIN sys_area a ON a.id = p.area_code
         WHERE p.is_deleted = 1
-          AND p.area_code IS NOT NULL
+        AND p.area_code IS NOT NULL
+        <if test="ouIdNotIn != null">
+            AND p.ou_id NOT IN
+            <foreach collection="ouIdNotIn" open="(" close=")" separator="," item="item">
+                #{item}
+            </foreach>
+        </if>
         ORDER BY modify_time DESC
     </select>
 </mapper>
\ No newline at end of file