Merge branch 'master' of https://gitlab.sunboxauto.com/tianchao/gf_back

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

 package pps.cloud.base.service;
 
 
-import pps.cloud.base.service.data.GetBasePowerLineInput;
-import pps.cloud.base.service.data.GetBasePowerLineViewOutput;
+import pps.cloud.base.service.data.base_power_line.GetBasePowerLineInput;
+import pps.cloud.base.service.data.base_power_line.GetBasePowerLineViewOutput;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;

C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/data/GetBasePowerLineInput.java → C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/data/base_power_line/GetBasePowerLineInput.java

-package pps.cloud.base.service.data;
+package pps.cloud.base.service.data.base_power_line;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;

C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/data/GetBasePowerLineViewOutput.java → C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/data/base_power_line/GetBasePowerLineViewOutput.java

-package pps.cloud.base.service.data;
+package pps.cloud.base.service.data.base_power_line;
 
 import lombok.Data;
 import xstartup.annotation.XText;
@@ -41,4 +41,34 @@ public class GetBasePowerLineViewOutput {
 
     @XText("启动间隔(分钟)")
     private Integer startInterval;
+
+    /**
+     * 策略名称
+     */
+    @XText("策略名称")
+    private String policyName;
+
+    /**
+     * 上级线路名称
+     */
+    @XText("上级线路名称")
+    private String upperLineName;
+
+    /**
+     * 电网类型名称
+     */
+    @XText("电网类型名称")
+    private String gridTypeName;
+
+    /**
+     * 线路类型名称
+     */
+    @XText("线路类型名称")
+    private String lineTypeName;
+
+    /**
+     * 组织机构名称
+     */
+    @XText("组织机构名称")
+    private String ouName;
 }

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

@@ -2,8 +2,8 @@ package pps.core.base.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import pps.cloud.base.service.BasePowerLineCloudService;
-import pps.cloud.base.service.data.GetBasePowerLineInput;
-import pps.cloud.base.service.data.GetBasePowerLineViewOutput;
+import pps.cloud.base.service.data.base_power_line.GetBasePowerLineInput;
+import pps.cloud.base.service.data.base_power_line.GetBasePowerLineViewOutput;
 import pps.core.base.entity.BasePowerLineEnt;
 import pps.core.base.mapper.BasePowerLineMapper;
 import pps.core.common.entity.BaseModel;

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import pps.cloud.base.service.data.GetBasePowerLineViewOutput;
 import pps.core.common.constant.BusinessConstant;
 import pps.core.common.entity.BaseModel;
 import pps.core.common.session.PpsUserSession;
@@ -14,7 +13,9 @@ import pps.core.common.utils.BaseUtils;
 import pps.core.space.entity.*;
 import pps.core.space.mapper.*;
 import pps.core.space.service.data.space_institution_detail.*;
+import pps.core.space.service.data.space_institution_duration.GetSpaceInstitutionDurationViewOutput;
 import pps.core.space.service.data.space_institution_wellhead.CreateSpaceInstitutionWellheadInput;
+import pps.core.space.service.data.space_institution_wellhead.GetSpaceInstitutionWellheadViewOutput;
 import pps.core.space.service.data.space_institution_wellhead.UpdateSpaceInstitutionWellheadInput;
 import pps.core.space.utils.ServiceUtil;
 import xstartup.annotation.XService;
@@ -32,10 +33,8 @@ import xstartup.feature.api.annotation.XApiPost;
 import xstartup.feature.mybatis.helper.XMapperHelper;
 import xstartup.helper.XTransactionHelper;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 基础间开配置模块
@@ -196,13 +195,45 @@ public class SpaceInstitutionDetailService {
             return XSingleResult.error(context, XError.NotFound);
         }
         GetSpaceInstitutionDetailViewOutput output = XCopyUtils.copyNewObject(entity, GetSpaceInstitutionDetailViewOutput.class);
-
         SpaceInstitutionWellheadMapper wellheadMapper = context.getBean(SpaceInstitutionWellheadMapper.class);
+        //查井口列表
+        List<SpaceInstitutionWellheadEnt> wellheadEntList = wellheadMapper.selectList(new LambdaQueryWrapper<SpaceInstitutionWellheadEnt>()
+                .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);
+            Map<String, String> intervalTypeMap = ServiceUtil.getDictMap(context, BusinessConstant.INTERVAL_TYPE);
+            wellheadViewOutputs.forEach(wellhead -> {
+                wellhead.setRunTypeName(runTypeMap.get(wellhead.getRunTypeKey()));
+                wellhead.setIntervalTypeName(intervalTypeMap.get(wellhead.getIntervalTypeKey()));
+            });
+            //查时段列表
             SpaceInstitutionDurationMapper durationMapper = context.getBean(SpaceInstitutionDurationMapper.class);
-
-        Map<String, String> gridTypeMap = ServiceUtil.getDictMap(context, BusinessConstant.GRID_TYPE);
-        Map<String, String> lineTypeMap = ServiceUtil.getDictMap(context, BusinessConstant.LINE_TYPE);
-        GetBasePowerLineViewOutput basePowerLineById = ServiceUtil.getBasePowerLineById(context, entity.getLineId());
+            List<SpaceInstitutionDurationEnt> durationEntList = durationMapper.selectList(new LambdaQueryWrapper<SpaceInstitutionDurationEnt>()
+                    .eq(SpaceInstitutionDurationEnt::getInstitutionId, institutionId)
+                    .orderByAsc(SpaceInstitutionDurationEnt::getOpenWellTime)
+            );
+            if (CollUtil.isNotEmpty(durationEntList)) {
+                List<GetSpaceInstitutionDurationViewOutput> durationViewOutputList = XCopyUtils.copyNewList(durationEntList, GetSpaceInstitutionDurationViewOutput.class);
+                Map<String, List<GetSpaceInstitutionDurationViewOutput>> collect = durationViewOutputList.stream()
+                        .collect(Collectors.groupingBy(GetSpaceInstitutionDurationViewOutput::getWellheadId));
+                wellheadViewOutputs.forEach(wellhead -> {
+                    String wellheadId = wellhead.getWellheadId();
+                    if (collect.containsKey(wellheadId)) {
+                        wellhead.setDurationList(collect.get(wellheadId));
+                    } else {
+                        wellhead.setDurationList(new ArrayList<>(0));
+                    }
+                });
+            }
+            output.setWellheadList(wellheadViewOutputs);
+        } else {
+            output.setWellheadList(new ArrayList<>(0));
+        }
+        output.setOuName(ServiceUtil.getSysOrgNameById(context, output.getOuId()));
+        output.setGridTypeName(ServiceUtil.getDictMap(context, BusinessConstant.GRID_TYPE).get(output.getGridTypeKey()));
         return XSingleResult.success(output);
     }
 

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

 package pps.core.space.service.data.space_institution_duration;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import xstartup.annotation.XText;
 
@@ -12,6 +13,10 @@ import xstartup.annotation.XText;
 @Data
 public class GetSpaceInstitutionDurationViewOutput {
 
+    @XText("井口ID")
+    @TableField
+    private String wellheadId;
+
     @XText("开井时间")
     private String openWellTime;
 

C11-space/pps-core-space/src/main/java/pps/core/space/utils/ServiceUtil.java

 package pps.core.space.utils;
 
 import pps.cloud.base.service.BasePowerLineCloudService;
-import pps.cloud.base.service.data.GetBasePowerLineInput;
-import pps.cloud.base.service.data.GetBasePowerLineViewOutput;
+import pps.cloud.base.service.data.base_power_line.GetBasePowerLineInput;
+import pps.cloud.base.service.data.base_power_line.GetBasePowerLineViewOutput;
 import pps.cloud.system.service.SysOrganizationCloudService;
 import pps.cloud.system.service.SystemAreaService;
 import pps.cloud.system.service.SystemDictionaryService;