Merge remote-tracking branch 'origin/master' into oracle_T001_202411121430

C00-common/pps-common/src/main/java/pps/core/common/constant/BusinessConstant.java

@@ -40,6 +40,11 @@ public class BusinessConstant {
      */
     public static final String LINE_FLAG_ID = "000";
 
+    /**
+     * 开井标识
+     */
+    public static final String OPEN_FLAG = "ON";
+
     /**
      * 光伏电站
      */
@@ -196,7 +201,7 @@ public class BusinessConstant {
     public static final BigDecimal BIG_DECIMAL_0_35 = BigDecimal.valueOf(0.35);
 
     /**
-     * 0.3587
+     * 0.3587 (绿电电费)
      */
     public static final BigDecimal BIG_DECIMAL_0_3587 = BigDecimal.valueOf(0.3587);
 

C00-common/pps-common/src/main/java/pps/core/common/entity/BaseResult.java

+package pps.core.common.entity;
+
+import lombok.Data;
+
+/**
+ * BaseResultVO
+ *
+ * @author ZWT
+ * @date 2024/11/14
+ */
+@Data
+public class BaseResult<T> {
+
+    private Integer code;
+
+    private String message;
+
+    private T data;
+
+    private BaseResult(int code, String message, T data) {
+        this.code = code;
+        this.message = message;
+        this.data = data;
+    }
+}

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeMidCloudServiceImpl.java

@@ -37,7 +37,7 @@ public class SpaceOptimizeMidCloudServiceImpl extends SpaceOptimizeBaseService i
         List<SpaceOptimizeWellheadDTO> wellheadDTOList = new ArrayList<>(64);
         List<SpaceOptimizeDurationDTO> durationDTOList = new ArrayList<>(128);
         List<SpaceOptimizeDurationDTO> unOptimizeDurationList = new ArrayList<>(128);
-        super.dynamicOptimize(context, periodDTOList, wellheadDTOList, durationDTOList, unOptimizeDurationList, BusinessConstant.ONE, BusinessConstant.ONE, 3);
+        super.dynamicOptimize4Api(context, periodDTOList, wellheadDTOList, durationDTOList, unOptimizeDurationList, BusinessConstant.ONE, BusinessConstant.ONE, 3);
         //开启事务
         XServiceResult result = XTransactionHelper.begin(context, () -> {
             int size;

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeShortCloudServiceImpl.java

@@ -57,7 +57,7 @@ public class SpaceOptimizeShortCloudServiceImpl extends SpaceOptimizeBaseService
         List<SpaceOptimizeWellheadDTO> wellheadDTOList = new ArrayList<>(64);
         List<SpaceOptimizeDurationDTO> durationDTOList = new ArrayList<>(128);
         List<SpaceOptimizeDurationDTO> unOptimizeDurationList = new ArrayList<>(128);
-        super.dynamicOptimize(context, periodDTOList, wellheadDTOList, durationDTOList, unOptimizeDurationList, BusinessConstant.ONE, BusinessConstant.THREE, 1);
+        super.dynamicOptimize4Api(context, periodDTOList, wellheadDTOList, durationDTOList, unOptimizeDurationList, BusinessConstant.ONE, BusinessConstant.THREE, 1);
         //开启事务
         XServiceResult result = XTransactionHelper.begin(context, () -> {
             int size;

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/SpaceOptimizeWeight.java

@@ -25,6 +25,11 @@ public class SpaceOptimizeWeight {
      */
     private DateTime timestamp;
 
+    /**
+     * 时间戳
+     */
+    private String timeString;
+
     /**
      * 权重:
      * 光伏发电量: 10 + 发电量

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_institution_detail/OptimizeWellResult.java

+package pps.core.space.service.data.space_institution_detail;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 井口优化结果
+ *
+ * @author ZWT
+ * @date 2024/11/14 17:09
+ */
+@NoArgsConstructor
+@Data
+public class OptimizeWellResult {
+    /**
+     * 井口ID
+     */
+    private String id;
+    /**
+     * 井号
+     */
+    private String name;
+    /**
+     * 最大开井时长
+     */
+    private Integer maxSegment;
+    /**
+     * 最小开井时长
+     */
+    private Integer minSegment;
+    /**
+     * 最大关井时长
+     */
+    private Integer maxSpace;
+    /**
+     * 最小关井时长
+     */
+    private Integer minSpace;
+    /**
+     * 运行功率
+     */
+    private Double power;
+
+    /**
+     * 每日运行时长
+     */
+    private Integer totalOn;
+    /**
+     * 优化结果
+     */
+    private List<OnOffDTO> onOff;
+
+    /**
+     * 优化结果
+     */
+    @NoArgsConstructor
+    @Data
+    public static class OnOffDTO {
+        /**
+         * 开关(ON_开,OFF_关)
+         */
+        private String stat;
+        /**
+         * 开始时间(分钟)
+         */
+        private Integer startTime;
+        /**
+         * 结束时间(分钟)
+         */
+        private Integer endTime;
+    }
+}