feat(能源管理系统): 间开制度管理

1.开发定期校准模块-校准周期新增接口,完成接口冒烟测试并生成接口文档;
2.开发定期校准模块-校准周期修改接口,完成接口冒烟测试并生成接口文档;
3.开发定期校准模块-校准周期详情接口,完成接口冒烟测试并生成接口文档;
4.开发定期校准模块-校准历史分页列表接口,完成接口冒烟测试并生成接口文档;
5.开发定期校准模块-校准历史获取线路及井口树接口,完成接口冒烟测试并生成接口文档;
6.开发定期校准模块-校准历史重新优化接口,完成接口冒烟测试并生成接口文档;
7.开发系统管理模块-组织机构管理查询组织和线路列表接口,完成接口冒烟测试并生成接口文档;
8.开发基础间开配置Cloud模块--获取线路配置制度数量接口,完成接口冒烟测试;
9.修改基础信息管理模块-线路删除接口,增加线路删除校验逻辑同时添加space模块调用配置,完成接口冒烟测试;
10.开发基础信息管理Cloud模块--获取输电线路关联井口信息接口,完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/IBasePowerLineCloudService.java

@@ -5,6 +5,8 @@ import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInpu
 import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineOutput;
 import pps.cloud.base.service.data.base_power_line.GetBasePowerLineInput;
 import pps.cloud.base.service.data.base_power_line.GetBasePowerLineViewOutput;
+import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadInput;
+import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadViewOutput;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
@@ -44,4 +46,15 @@ public interface IBasePowerLineCloudService {
     @XText("输电线路配置模块--条件查询线路基本信息列表")
     @XApiPost
     XListResult<DynamicQueryBasePowerLineOutput> getBasePowerLineList(XContext context, DynamicQueryBasePowerLineInput input);
+
+    /**
+     * 输电线路配置模块--条件查询线路关联井口信息
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XListResult}<{@link DynamicQueryBasePowerLineWellheadViewOutput}>
+     */
+    @XText("输电线路配置模块--条件查询线路关联井口信息")
+    @XApiPost
+    XListResult<DynamicQueryBasePowerLineWellheadViewOutput> getPowerLineWellheadList(XContext context, DynamicQueryBasePowerLineWellheadInput input);
 }

C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/data/base_power_line_wellhead/CreateBasePowerLineWellheadInput.java

+package pps.cloud.base.service.data.base_power_line_wellhead;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import xstartup.annotation.XText;
+
+/**
+ * 输电线路井口配置
+ *
+ * @author ZWT
+ * @date 2023/08/25
+ */
+@Data
+public class CreateBasePowerLineWellheadInput {
+
+    @XText("井口ID")
+    @NotBlank(message = "缺少井口ID")
+    private String wellheadId;
+
+    @XText("启动顺序")
+    private Integer startSeq;
+}

C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/data/base_power_line_wellhead/DynamicQueryBasePowerLineWellheadInput.java

+package pps.cloud.base.service.data.base_power_line_wellhead;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import xstartup.annotation.XText;
+
+import java.util.List;
+
+/**
+ * 输电线路井口配置
+ *
+ * @author ZWT
+ * @date 2023/08/29
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class DynamicQueryBasePowerLineWellheadInput {
+
+    @XText("线路ID")
+    private String lineId;
+
+    @XText("井口ID集合")
+    private List<String> wellheadIds;
+}

C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/data/base_power_line_wellhead/DynamicQueryBasePowerLineWellheadViewOutput.java

+package pps.cloud.base.service.data.base_power_line_wellhead;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import xstartup.annotation.XText;
+
+/**
+ * 输电线路井口配置
+ *
+ * @author ZWT
+ * @date 2023/08/29
+ */
+@Data
+public class DynamicQueryBasePowerLineWellheadViewOutput {
+
+    @XText("井口ID")
+    private String wellheadId;
+
+    /**
+     * 井号
+     */
+    @XText("井号")
+    @TableField
+    private String wellNumber;
+
+    /**
+     * 运行类型
+     */
+    @XText("运行类型key(字典获取)")
+    private String runTypeKey;
+}

C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/data/base_power_line_wellhead/GetBasePowerLineWellheadViewOutput.java

+package pps.cloud.base.service.data.base_power_line_wellhead;
+
+import lombok.Data;
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+
+/**
+ * 输电线路井口配置
+ *
+ * @author ZWT
+ * @date 2023/08/25
+ */
+@Data
+public class GetBasePowerLineWellheadViewOutput {
+
+    @XText("ID")
+    private String id;
+
+    @XText("井口ID")
+    private String wellheadId;
+
+    /**
+     * 井号
+     */
+    @XText("井号")
+    private String wellNumber;
+
+    /**
+     * 运行功率
+     */
+    @XText("运行功率(KW)")
+    private BigDecimal serviceRating;
+
+    @XText("启动顺序")
+    private Integer startSeq;
+}

C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/data/base_power_line_wellhead/UpdateBasePowerLineWellheadInput.java

+package pps.cloud.base.service.data.base_power_line_wellhead;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import xstartup.annotation.XText;
+
+/**
+ * 输电线路井口配置
+ *
+ * @author ZWT
+ * @date 2023/08/25
+ */
+@Data
+public class UpdateBasePowerLineWellheadInput {
+
+    @XText("井口ID")
+    @NotBlank(message = "缺少井口ID")
+    private String wellheadId;
+
+    @XText("启动顺序")
+    private Integer startSeq;
+}

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

@@ -5,11 +5,12 @@ 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.Date;
+import java.util.List;
 
 /**
  * 输电线路井口配置
@@ -21,38 +22,7 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class BasePowerLineWellheadView implements Serializable {
-    @XText("ID")
-    @TableField
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    @TableField
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    @TableField
-    private String createById;
-
-    @XText("创建人名称")
-    @TableField
-    private String createByName;
-
-    @XText("创建时间")
-    @TableField
-    private Date createTime;
-
-    @XText("修改人ID")
-    @TableField
-    private String modifyById;
-
-    @XText("修改人名称")
-    @TableField
-    private String modifyByName;
-
-    @XText("修改时间")
-    @TableField
-    private Date modifyTime;
+public class BasePowerLineWellheadView extends BaseModel implements Serializable {
 
     @XText("线路ID")
     @TableField
@@ -89,4 +59,11 @@ public class BasePowerLineWellheadView implements Serializable {
     @XText("运行功率(KW)")
     @TableField
     private BigDecimal serviceRating;
+
+    /**
+     * 井口ID集合
+     */
+    @XText("井口ID集合")
+    @TableField(exist = false)
+    private List<String> wellheadIds;
 }

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

@@ -22,4 +22,12 @@ public interface BasePowerLineWellheadViewMapper {
      * @return {@link List}<{@link BasePowerLineWellheadView}>
      */
     List<BasePowerLineWellheadView> selectList(BasePowerLineWellheadView record);
+
+    /**
+     * 条件查询井口信息
+     *
+     * @param record 记录
+     * @return {@link List}<{@link BasePowerLineWellheadView}>
+     */
+    List<BasePowerLineWellheadView> selectWellheadListByParam(BasePowerLineWellheadView record);
 }

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

@@ -8,8 +8,12 @@ import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInpu
 import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineOutput;
 import pps.cloud.base.service.data.base_power_line.GetBasePowerLineInput;
 import pps.cloud.base.service.data.base_power_line.GetBasePowerLineViewOutput;
+import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadInput;
+import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadViewOutput;
 import pps.core.base.entity.BasePowerLineEnt;
+import pps.core.base.entity.BasePowerLineWellheadView;
 import pps.core.base.mapper.BasePowerLineMapper;
+import pps.core.base.mapper.BasePowerLineWellheadViewMapper;
 import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XService;
 import xstartup.base.XContext;
@@ -17,6 +21,7 @@ import xstartup.base.util.XCopyUtils;
 import xstartup.data.XListResult;
 import xstartup.data.XSingleResult;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -78,4 +83,29 @@ public class BasePowerLineCloudServiceImpl implements IBasePowerLineCloudService
         List<DynamicQueryBasePowerLineOutput> lineOutputList = XCopyUtils.copyNewList(selectList, DynamicQueryBasePowerLineOutput.class);
         return XListResult.success(lineOutputList);
     }
+
+    /**
+     * 输电线路配置模块--条件查询线路关联井口信息
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XListResult}<{@link DynamicQueryBasePowerLineWellheadViewOutput}>
+     */
+    @Override
+    public XListResult<DynamicQueryBasePowerLineWellheadViewOutput> getPowerLineWellheadList(XContext context, DynamicQueryBasePowerLineWellheadInput input) {
+        BasePowerLineWellheadViewMapper wellheadViewMapper = context.getBean(BasePowerLineWellheadViewMapper.class);
+        List<BasePowerLineWellheadView> wellheadViews = wellheadViewMapper.selectWellheadListByParam(
+                BasePowerLineWellheadView.builder()
+                        .lineId(input.getLineId())
+                        .wellheadIds(input.getWellheadIds())
+                        .build()
+        );
+        List<DynamicQueryBasePowerLineWellheadViewOutput> outputs;
+        if (CollUtil.isEmpty(wellheadViews)) {
+            outputs = new ArrayList<>(0);
+        } else {
+            outputs = XCopyUtils.copyNewList(wellheadViews, DynamicQueryBasePowerLineWellheadViewOutput.class);
+        }
+        return XListResult.success(outputs);
+    }
 }
\ No newline at end of file

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

@@ -62,4 +62,23 @@
         ORDER BY
         l.create_time ASC
     </select>
+
+    <select id="selectWellheadListByParam" parameterType="pps.core.base.entity.BasePowerLineWellheadView"
+            resultMap="ExtendsResultMap">
+        SELECT
+        w.id AS wellhead_id,
+        w.well_number,
+        w.run_type_key
+        FROM
+        base_power_line_wellhead l
+        JOIN base_wellhead w ON l.wellhead_id = w.id
+        WHERE
+        l.line_id = #{lineId}
+        <if test="wellheadIds != null">
+            AND l.wellhead_id NOT IN
+            <foreach collection="wellheadIds" open="(" close=")" separator="," item="item">
+                #{item}
+            </foreach>
+        </if>
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -189,6 +189,9 @@ public class SpaceInstitutionDetailService {
                 .eq(SpaceInstitutionWellheadEnt::getInstitutionId, institutionId)
                 .orderByAsc(SpaceInstitutionWellheadEnt::getStartSeq)
         );
+
+
+
         if (CollUtil.isNotEmpty(wellheadEntList)) {
             List<GetSpaceInstitutionWellheadViewOutput> wellheadViewOutputs = XCopyUtils.copyNewList(wellheadEntList, GetSpaceInstitutionWellheadViewOutput.class);
             Map<String, String> runTypeMap = ServiceUtil.getDictMap(context, BusinessConstant.RUN_TYPE);