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

 Conflicts:
	C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/PredictionService.java

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

@@ -9,14 +9,19 @@ package pps.core.common.constant;
 public class BusinessConstant {
 
     /**
-     * 正常
+     * 是
      */
-    public static final Integer NORMAL = 1;
+    public static final Integer NO = 1;
 
     /**
-     * 删除
+     * 否
      */
-    public static final Integer DELETE = 0;
+    public static final Integer YES = 0;
+
+    /**
+     * 初始父级组织机构ID
+     */
+    public static final String PARENT_OU_ID = "00000000-0000-0000-0000-000000000000";
 
     /*------------------------------字典------------------------------*/
 

C02-system/pps-core-system/pom.xml

@@ -34,6 +34,13 @@
             <artifactId>pps-cloud-system</artifactId>
             <version>1.0.0-pps</version>
         </dependency>
+
+        <dependency>
+            <groupId>gf</groupId>
+            <artifactId>pps-cloud-space</artifactId>
+            <version>1.0.0-pps</version>
+        </dependency>
+
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt</artifactId>

C02-system/pps-core-system/src/main/java/pps/core/system/entity/SysOrganizationView.java

 package pps.core.system.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import java.util.List;
-
 import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
 import xstartup.annotation.XText;
 
 import javax.persistence.Transient;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
+@Data
 public class SysOrganizationView implements Serializable {
     @XText("主键")
     @TableField
@@ -148,291 +149,10 @@ public class SysOrganizationView implements Serializable {
     @TableField
     private BigDecimal elevation;
 
-    public List<String> getOuIds() {
-        return ouIds;
-    }
-
-    public void setOuIds(List<String> ouIds) {
-        this.ouIds = ouIds;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public String getMediaType() {
-        return mediaType;
-    }
-
-    public void setMediaType(String mediaType) {
-        this.mediaType = mediaType;
-    }
-
-    public Integer getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(Integer isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Integer getIsHasChildren() {
-        return isHasChildren;
-    }
-
-    public void setIsHasChildren(Integer isHasChildren) {
-        this.isHasChildren = isHasChildren;
-    }
-
-    public Integer getSort() {
-        return sort;
-    }
-
-    public void setSort(Integer sort) {
-        this.sort = sort;
-    }
-
-    public String getParentOuId() {
-        return parentOuId;
-    }
-
-    public void setParentOuId(String parentOuId) {
-        this.parentOuId = parentOuId;
-    }
-
-    public String getLevelDicName() {
-        return levelDicName;
-    }
-
-    public void setLevelDicName(String levelDicName) {
-        this.levelDicName = levelDicName;
-    }
-
-    public String getCountryName() {
-        return countryName;
-    }
-
-    public void setCountryName(String countryName) {
-        this.countryName = countryName;
-    }
-
-    public String getProvinceName() {
-        return provinceName;
-    }
-
-    public void setProvinceName(String provinceName) {
-        this.provinceName = provinceName;
-    }
-
-    public String getPropertyName() {
-        return propertyName;
-    }
-
-    public void setPropertyName(String propertyName) {
-        this.propertyName = propertyName;
-    }
-
-    public String getSorId() {
-        return sorId;
-    }
-
-    public void setSorId(String sorId) {
-        this.sorId = sorId;
-    }
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public String getOuCode() {
-        return this.ouCode;
-    }
-
-    public void setOuCode(String value) {
-        this.ouCode = value;
-    }
-
-    public String getOuName() {
-        return this.ouName;
-    }
-
-    public void setOuName(String value) {
-        this.ouName = value;
-    }
-
-    public String getShortName() {
-        return this.shortName;
-    }
-
-    public void setShortName(String value) {
-        this.shortName = value;
-    }
-
-    public String getOuLevel() {
-        return this.ouLevel;
-    }
-
-    public void setOuLevel(String value) {
-        this.ouLevel = value;
-    }
-
-    public String getDescription() {
-        return this.description;
-    }
-
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public Date getEndTime() {
-        return this.endTime;
-    }
-
-    public void setEndTime(Date value) {
-        this.endTime = value;
-    }
-
-    public String getPostCode() {
-        return this.postCode;
-    }
-
-    public void setPostCode(String value) {
-        this.postCode = value;
-    }
-
-    public String getPostAddress() {
-        return this.postAddress;
-    }
-
-    public void setPostAddress(String value) {
-        this.postAddress = value;
-    }
-
-    public String getFaxNo() {
-        return this.faxNo;
-    }
-
-    public void setFaxNo(String value) {
-        this.faxNo = value;
-    }
-
-    public String getPhone() {
-        return this.phone;
-    }
-
-    public void setPhone(String value) {
-        this.phone = value;
-    }
-
-    public String getCountry() {
-        return this.country;
-    }
-
-    public void setCountry(String value) {
-        this.country = value;
-    }
-
-    public Integer getProvince() {
-        return this.province;
-    }
-
-    public void setProvince(Integer value) {
-        this.province = value;
-    }
-
-    public String getPartentName() {
-        return partentName;
-    }
-
-    public void setPartentName(String partentName) {
-        this.partentName = partentName;
-    }
-
-    public BigDecimal getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(BigDecimal longitude) {
-        this.longitude = longitude;
-    }
-
-    public BigDecimal getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(BigDecimal latitude) {
-        this.latitude = latitude;
-    }
-
-    public BigDecimal getElevation() {
-        return elevation;
-    }
-
-    public void setElevation(BigDecimal elevation) {
-        this.elevation = elevation;
-    }
+    /**
+     * 线路ID
+     */
+    @XText("线路ID")
+    @TableField(exist = false)
+    private String lineId;
 }

C02-system/pps-core-system/src/main/java/pps/core/system/mapper/SysOrganizationViewMapper.java

@@ -60,4 +60,20 @@ public interface SysOrganizationViewMapper {
      * @return {@link List}<{@link SysOrganizationView}>
      */
     List<SysOrganizationView> selectOrgListDynamicQuery(SysOrganizationView record);
+
+    /**
+     * 查询登录人组织下线路列表
+     *
+     * @param record 记录
+     * @return {@link List}<{@link SysOrganizationView}>
+     */
+    List<SysOrganizationView> selectLineList(SysOrganizationView record);
+
+    /**
+     * 查询组织和线路列表
+     *
+     * @param record 记录
+     * @return {@link List}<{@link SysOrganizationView}>
+     */
+    List<SysOrganizationView> selectOrgAndLineList(SysOrganizationView record);
 }

C02-system/pps-core-system/src/main/java/pps/core/system/service/SysOrganizationService.java

@@ -14,6 +14,7 @@ import pps.cloud.system.service.data.CreateSysDictionaryInput;
 import pps.cloud.system.service.data.GetOuListTreeOutput;
 import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
 import pps.cloud.system.service.data.SelectRegionFirmInput;
+import pps.core.common.constant.BusinessConstant;
 import pps.core.common.constant.Constant;
 import pps.core.common.constant.UserConstant;
 import pps.core.common.session.PpsUserSession;
@@ -436,7 +437,7 @@ public class SysOrganizationService {
             view = new SysOrganizationView();
             PpsUserSession session = context.getSession(PpsUserSession.class);
             if (UserConstant.ISSUPERADMIN_TRUE.equals(session.getIsSuperAdmin())) {
-                view.setParentOuId("00000000-0000-0000-0000-000000000000");
+                view.setParentOuId(BusinessConstant.PARENT_OU_ID);
             } else {
                 view.setId(session.getOuId());
             }
@@ -448,6 +449,41 @@ public class SysOrganizationService {
         return XListResult.success(outputs);
     }
 
+    /**
+     * 组织机构管理--查询组织和线路列表
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XListResult}<{@link DynamicQuerySysOrganizationOutput}>
+     */
+    @XText("组织机构管理--查询组织和线路列表")
+    @XApiGet
+    public XListResult<DynamicQuerySysOrganizationOutput> queryOrgAndLineList(XContext context, DynamicQuerySysOrganizationInput input) {
+        SysOrganizationViewMapper mapper = context.getBean(SysOrganizationViewMapper.class);
+        SysOrganizationView view = new SysOrganizationView();
+        if (StringUtils.isBlank(input.getId())) {
+            //如果条件都为空,则从登录信息获取条件
+            PpsUserSession session = context.getSession(PpsUserSession.class);
+            if (UserConstant.ISSUPERADMIN_TRUE.equals(session.getIsSuperAdmin())) {
+                view.setId(BusinessConstant.PARENT_OU_ID);
+            } else {
+                view.setId(session.getOuId());
+            }
+        } else {
+            view.setId(input.getId());
+        }
+        List<SysOrganizationView> viewList;
+        if (StringUtils.isNotBlank(input.getOuName())) {
+            view.setOuName(input.getOuName());
+            viewList = mapper.selectLineList(view);
+        } else {
+            viewList = mapper.selectOrgAndLineList(view);
+        }
+        List<DynamicQuerySysOrganizationOutput> outputs = XCopyUtils.copyNewList(viewList, DynamicQuerySysOrganizationOutput.class);
+        return XListResult.success(outputs);
+    }
+
+
     @XText("根据父级id查询儿子级-特殊")
     @XApiPost
     public XListResult<GetSysOrganizationViewOutput> selectSpecailOuInfoByParentOuId(XContext context, GetSysOrganizationRelInput input) {

C02-system/pps-core-system/src/main/java/pps/core/system/service/data/sys_organization/DynamicQuerySysOrganizationOutput.java

@@ -17,4 +17,10 @@ public class DynamicQuerySysOrganizationOutput {
 
     @XText("组织机构名称")
     private String ouName;
+
+    @XText("类型(ORG_组织;LINE_线路)")
+    private String ouLevel;
+
+    @XText("线路ID")
+    private String lineId;
 }

C02-system/pps-core-system/src/main/resources/mybatis/mapper/pps/core/system/SysOrganizationViewMapper.xml

@@ -552,4 +552,37 @@
         ORDER BY
         r.sort
     </select>
+
+    <resultMap id="ExtendResultMap" type="pps.core.system.entity.SysOrganizationView" extends="BaseResultMap">
+        <result column="line_id" property="lineId" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <select id="selectLineList" parameterType="pps.core.system.entity.SysOrganizationView"
+            resultMap="ExtendResultMap">
+        SELECT ou_id     AS id,
+               line_name AS ou_name,
+               id        AS line_id,
+               'LINE'    AS ou_level
+        FROM base_power_line
+        WHERE ou_id = #{id}
+          AND line_name LIKE CONCAT('%', #{ouName}, '%')
+        ORDER BY modify_time DESC
+    </select>
+
+    <select id="selectOrgAndLineList" parameterType="pps.core.system.entity.SysOrganizationView"
+            resultMap="ExtendResultMap">
+        (SELECT o.id,
+                o.ou_name AS ou_name,
+                ''        AS line_id,
+                'ORG'     AS ou_level
+         FROM sys_organization_rel r
+                  LEFT JOIN sys_organization o ON o.id = r.ou_id
+         WHERE r.parent_ou_id = #{id}
+         ORDER BY r.sort)
+        UNION ALL
+        (SELECT ou_id AS id, line_name AS ou_name, id AS line_id, 'LINE' AS ou_level
+         FROM base_power_line
+         WHERE ou_id = #{id}
+         ORDER BY modify_time DESC)
+    </select>
 </mapper>

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

 package pps.cloud.base.service;
 
 
+import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInput;
+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 xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
+import xstartup.data.XListResult;
 import xstartup.data.XSingleResult;
+import xstartup.feature.api.annotation.XApiGet;
+import xstartup.feature.api.annotation.XApiPost;
 
 /**
  * 输电线路配置
@@ -16,7 +21,7 @@ import xstartup.data.XSingleResult;
  */
 @XService
 @XText("输电线路配置模块")
-public interface BasePowerLineCloudService {
+public interface IBasePowerLineCloudService {
 
     /**
      * 输电线路配置模块--通过ID查询线路基本信息
@@ -26,5 +31,17 @@ public interface BasePowerLineCloudService {
      * @return {@link XSingleResult}<{@link GetBasePowerLineViewOutput}>
      */
     @XText("输电线路配置模块--通过ID查询线路基本信息")
+    @XApiGet
     XSingleResult<GetBasePowerLineViewOutput> getBasePowerLineById(XContext context, GetBasePowerLineInput input);
+
+    /**
+     * 输电线路配置模块--条件查询线路基本信息列表
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XListResult}<{@link DynamicQueryBasePowerLineOutput}>
+     */
+    @XText("输电线路配置模块--条件查询线路基本信息列表")
+    @XApiPost
+    XListResult<DynamicQueryBasePowerLineOutput> getBasePowerLineList(XContext context, DynamicQueryBasePowerLineInput input);
 }

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

+package pps.cloud.base.service.data.base_power_line;
+
+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 DynamicQueryBasePowerLineInput {
+
+    @XText("线路ID")
+    private String lineId;
+
+    @XText("线路ID集合")
+    private List<String> lineIds;
+
+    @XText("组织机构ID")
+    private String ouId;
+
+    @XText("上级线路ID")
+    private String upperLineId;
+
+    @XText("线路名称")
+    private String lineName;
+
+    @XText("电网类型key(字典获取)")
+    private String gridTypeKey;
+
+    @XText("线路类型key(字典获取)")
+    private String lineTypeKey;
+
+    @XText("市电峰谷配置ID")
+    private String strategyId;
+}

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

+package pps.cloud.base.service.data.base_power_line;
+
+import lombok.Data;
+import xstartup.annotation.XText;
+
+/**
+ * 输电线路配置
+ *
+ * @author ZWT
+ * @date 2023/08/29
+ */
+@Data
+public class DynamicQueryBasePowerLineOutput {
+
+    @XText("ID")
+    private String id;
+
+    @XText("线路名称")
+    private String lineName;
+}

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

-package pps.core.base.service.impl;
+package pps.core.base.service;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import pps.cloud.base.service.BasePowerLineCloudService;
+import org.apache.commons.lang3.StringUtils;
+import pps.cloud.base.service.IBasePowerLineCloudService;
+import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInput;
+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.core.base.entity.BasePowerLineEnt;
 import pps.core.base.mapper.BasePowerLineMapper;
 import pps.core.common.entity.BaseModel;
+import xstartup.annotation.XService;
 import xstartup.base.XContext;
 import xstartup.base.util.XCopyUtils;
+import xstartup.data.XListResult;
 import xstartup.data.XSingleResult;
 
+import java.util.List;
+
 /**
  * 输电线路配置模块
  *
  * @author ZWT
  * @date 2023/09/05 15:37
  */
-public class BasePowerLineCloudServiceImpl implements BasePowerLineCloudService {
+@XService
+public class BasePowerLineCloudServiceImpl implements IBasePowerLineCloudService {
 
     /**
      * 输电线路配置模块--通过ID查询线路基本信息
@@ -35,4 +44,38 @@ public class BasePowerLineCloudServiceImpl implements BasePowerLineCloudService
         GetBasePowerLineViewOutput output = XCopyUtils.copyNewObject(entity, GetBasePowerLineViewOutput.class);
         return XSingleResult.success(output);
     }
+
+    /**
+     * 输电线路配置模块--条件查询线路基本信息列表
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XListResult}<{@link DynamicQueryBasePowerLineOutput}>
+     */
+    @Override
+    public XListResult<DynamicQueryBasePowerLineOutput> getBasePowerLineList(XContext context, DynamicQueryBasePowerLineInput input) {
+        String lineId = input.getLineId();
+        List<String> lineIds = input.getLineIds();
+        String ouId = input.getOuId();
+        String upperLineId = input.getUpperLineId();
+        String lineName = input.getLineName();
+        String gridTypeKey = input.getGridTypeKey();
+        String lineTypeKey = input.getLineTypeKey();
+        String strategyId = input.getStrategyId();
+        BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);
+        List<BasePowerLineEnt> selectList = mapper.selectList(new LambdaQueryWrapper<BasePowerLineEnt>()
+                .select(BaseModel::getId, BasePowerLineEnt::getLineName)
+                .in(CollUtil.isNotEmpty(lineIds), BaseModel::getId, lineIds)
+                .eq(StringUtils.isNotBlank(lineId), BaseModel::getId, lineId)
+                .eq(StringUtils.isNotBlank(ouId), BasePowerLineEnt::getOuId, ouId)
+                .eq(StringUtils.isNotBlank(upperLineId), BasePowerLineEnt::getUpperLineId, upperLineId)
+                .like(StringUtils.isNotBlank(lineName), BasePowerLineEnt::getLineName, lineName)
+                .eq(StringUtils.isNotBlank(gridTypeKey), BasePowerLineEnt::getGridTypeKey, gridTypeKey)
+                .eq(StringUtils.isNotBlank(lineTypeKey), BasePowerLineEnt::getLineTypeKey, lineTypeKey)
+                .eq(StringUtils.isNotBlank(strategyId), BasePowerLineEnt::getStrategyId, strategyId)
+                .orderByDesc(BaseModel::getModifyTime)
+        );
+        List<DynamicQueryBasePowerLineOutput> lineOutputList = XCopyUtils.copyNewList(selectList, DynamicQueryBasePowerLineOutput.class);
+        return XListResult.success(lineOutputList);
+    }
 }
\ No newline at end of file

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

@@ -120,7 +120,9 @@ public class BasePowerLineService {
     @XText("输电线路配置--删除")
     public XServiceResult deleteBasePowerLine(XContext context, DeleteBasePowerLineInput input) {
         String lineId = input.getId();
-        //todo: 检查是否被其它功能引用
+        if (ServiceUtil.checkLineIsReference(context, lineId)) {
+            return XServiceResult.error(992, "当前线路已被引用");
+        }
         return XTransactionHelper.begin(context, () -> {
             BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);
             BasePowerLineEnt entity = this.selectOneByLineId(lineId, mapper);

C09-base/pps-core-base/src/main/java/pps/core/base/utils/ServiceUtil.java

 package pps.core.base.utils;
 
+import pps.cloud.space.service.ISpaceInstitutionDetailCloudService;
 import pps.cloud.system.service.SysOrganizationCloudService;
 import pps.cloud.system.service.SystemAreaService;
 import pps.cloud.system.service.SystemDictionaryService;
@@ -110,4 +111,18 @@ public class ServiceUtil {
                         GetOuListTreeOutput::getOuId, GetOuListTreeOutput::getOuName
                 ));
     }
+
+    /**
+     * 检查线路是否被间开制度引用
+     *
+     * @param context 上下文
+     * @param lineId  线路id
+     * @return boolean
+     */
+    public static boolean checkLineIsReference(XContext context, String lineId) {
+        ISpaceInstitutionDetailCloudService contextBean = context.getBean(ISpaceInstitutionDetailCloudService.class);
+        XSingleResult<Long> result = contextBean.getInstitutionLineCountByLineId(context, lineId);
+        result.throwIfFail();
+        return result.getResult() > 0;
+    }
 }
\ No newline at end of file

C11-space/pps-cloud-space/pom.xml

@@ -15,6 +15,14 @@
     <properties>
         <maven.build.timestamp.format>yyyy.MMdd.HHmmss</maven.build.timestamp.format>
     </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>

C11-space/pps-cloud-space/src/main/java/pps/cloud/space/Readme.md

-**模块介绍**

C11-space/pps-cloud-space/src/main/java/pps/cloud/space/service/ISpaceInstitutionDetailCloudService.java

+package pps.cloud.space.service;
+
+import xstartup.annotation.XService;
+import xstartup.annotation.XText;
+import xstartup.base.XContext;
+import xstartup.data.XSingleResult;
+import xstartup.feature.api.annotation.XApiGet;
+
+/**
+ * 基础间开配置模块
+ *
+ * @author ZWT
+ * @date 2023/09/06 17:07
+ */
+@XService
+@XText("基础间开配置模块")
+public interface ISpaceInstitutionDetailCloudService {
+
+    /**
+     * 基础间开配置模块--获取线路配置制度数量
+     *
+     * @param context 上下文
+     * @param lineId  线路id
+     * @return {@link XSingleResult}<{@link Long}>
+     */
+    @XText("基础间开配置模块--获取线路配置制度数量")
+    @XApiGet
+    XSingleResult<Long> getInstitutionLineCountByLineId(XContext context, String lineId);
+}

C11-space/pps-cloud-space/src/main/java/pps/cloud/space/service/Readme.md

-**项目介绍**
-- 
-- pps3.0项目采用全新方案 ，解决pps2.0中的问题
-
-**项目模块**
-- C00-common      公共模块：通用Util、基础服务接口、基础dao接口、异常、分页等
-- C02-system      系统模块：机构管理、用户管理、角色管理、菜单管理、用户组管理、字典管理
-- C03-plan        计划管理模块：管输日指定、LNG装车日指定、周平衡（周计划）、调度令管理（低）、作业计划（高）、输油日计划、批次计划、LNG船期计划
-- C04-calc        专业计算模块：管存计算、剩余能力管理、批次界面位置计算、周转量
-- C05-dispatch    调度运行模块：生产、运销日报、生产、运销、能耗月报、数据模型配置、数据模型数据管理、默认值管理、布局表单配置、值班管理（低）、运行记录（低）、运行方案（低）、LNG储罐预警、LNG储罐预测
-- C06-online      投产管理模块：投产用户管理、气头跟踪管理、气头预测计算、投产记录查询、管存变化量管理
-- C07-energy      能耗管理模块：能耗指标管理、能耗数据计算
-- C08-measure     运销计量模块：计量交接凭证、多托运商分割单、气质分析报告、原油化验单、清罐及落地油管理、汽油/柴油化验单、输损计算
-- C09-base         运维模块：管线、场站、管段管理、计量设备数据管理、SCADA配置、生产短信管理（高）、小时参数确认（高）、系统运维管理
-- C10-task        任务模块：
-- C11-frame       表单模块：
-- C12-report        报表模块：
-- D00-third-party 调用第三方模块：IAM、短信等等
-- D01-dependency  模块的依赖整合模块：
-- D03-deploy      微服务整合部署模块， 各种Application
-
-**项目结构**
-```
-platform
-├─C00-common        公共模块
-├─C02-system        系统模块
-├─C03-plan          计划管理模块
-├─C04-dispatch      调控运行：
-├─C05-online        投产管理：
-├─C06-energy        能源管理：
-├─C07-measure      运销计量：
-│    ├─pps-measure-core        运销计量-核心模块：
-│    │  ├─pps.core.measure    module 总包名
-│    │  │   ├─constant  常量
-│    │  │   ├─entity  实体
-│    │  │   ├─mapper  映射
-│    │  │   ├─module  包含的模块，以及初始化架构模块实现类
-│    │  │   ├─mybatis  mybatis 配置类
-│    │  │   ├─service  服务实现类
-│    │  │   │   ├─data.{表名}  出入参model
-│    │  │   ├─utils  工具类
-│    │  │   ├─provider.impl  架构基础功能实现类
-│    ├─pps-measure-cloud         运销计量-api模块：
-├─D00-third-party   调用第三方模块
-├─D01-dependency    产品依赖整合模块
-├─D03-deploy        微服务部署模块
-│    ├─deploy-pps-analysis        分析服务       
-│    ├─deploy-pps-auth            认证服务       
-│    ├─deploy-pps-bpm             工作流服务       
-│    ├─deploy-pps-calc            专业计算服务       
-│    ├─deploy-pps-dispatch        调度运行服务       
-│    ├─deploy-pps-energy          能耗服务       
-│    ├─deploy-pps-measure         计量服务       
-│    ├─deploy-pps-online          投产服务       
-│    ├─deploy-pps-online          运维服务       
-│    ├─deploy-pps-plan            计划管理服务       
-│    ├─deploy-pps-signature       电子签章服务       
-│    ├─deploy-pps-system          系统服务       
-│    ├─deploy-pps-task            任务服务       
-│    ├─deploy-pps-report          报表服务       
-│    ├─deploy-pps-third-interface 第三方接口服务       
-│ 
-│
-```
-
-**快速开始：**
-```shell
-1 导入项目
-pom.xml
-
-2 执行
-mvn clean install
-```
-
-```shell
-1 导入项目
-D03-deploy/pom.xml
-
-2 执行
-mvn clean package
-```
-
-<br>
-
-**技术选型：**
-- 核心框架：Spring Boot 2.6.7 + Spring Cloud 3.1.1 + Spring 5.3.19
-- 持久层框架：MyBatis 3.5
-- 缓存中间件：Redis 4.x
-- 定时器：Quartz 2.3
-- 日志管理：Logback
-- 页面交互：Vue2.x
-- 接口文档：Swagger3.x
-- 数据库版本管理：Flayway6.x
-- 数据校验：JSR303
-- 方法构建：Lombook
-
-<br>
-
-
-**项目架构**
-1、springboot + flyway + swagger + huawei
-
-**项目规范**
-一、 命名规范
-- 1、遵守java命名规范
-- 2、在常量与变量的命名时，表示类型的名词放在词尾
-
-二、结构规范
-- 1、每个模块包括 core 和 api 两部分，core模块之间不可依赖
-
-三、表命名规范
-- 1、小写
-- 2、公用模块表命名  以base_ 为前缀，业务含义的英文单词结尾，多个中间添加 下划线“_”
-
-四、表结构升级规范
-- 1、flyway 规范
-
-
-**技术点**
-- 分布式id：  gaussdb 的UUID 数据类型，不合适用于分布式数据库中，可能产生相同UUID，建议业间件平台提供的分布式ID
-
-- 2022-11-30 10:46  进行git 迁移

C11-space/pps-cloud-space/src/main/java/pps/cloud/space/service/data/Readme.md

-**项目介绍**
-- 
-- pps3.0项目采用全新方案 ，解决pps2.0中的问题
-
-**项目模块**
-- C00-common      公共模块：通用Util、基础服务接口、基础dao接口、异常、分页等
-- C02-system      系统模块：机构管理、用户管理、角色管理、菜单管理、用户组管理、字典管理
-- C03-plan        计划管理模块：管输日指定、LNG装车日指定、周平衡（周计划）、调度令管理（低）、作业计划（高）、输油日计划、批次计划、LNG船期计划
-- C04-calc        专业计算模块：管存计算、剩余能力管理、批次界面位置计算、周转量
-- C05-dispatch    调度运行模块：生产、运销日报、生产、运销、能耗月报、数据模型配置、数据模型数据管理、默认值管理、布局表单配置、值班管理（低）、运行记录（低）、运行方案（低）、LNG储罐预警、LNG储罐预测
-- C06-online      投产管理模块：投产用户管理、气头跟踪管理、气头预测计算、投产记录查询、管存变化量管理
-- C07-energy      能耗管理模块：能耗指标管理、能耗数据计算
-- C08-measure     运销计量模块：计量交接凭证、多托运商分割单、气质分析报告、原油化验单、清罐及落地油管理、汽油/柴油化验单、输损计算
-- C09-base         运维模块：管线、场站、管段管理、计量设备数据管理、SCADA配置、生产短信管理（高）、小时参数确认（高）、系统运维管理
-- C10-task        任务模块：
-- C11-frame       表单模块：
-- C12-report        报表模块：
-- D00-third-party 调用第三方模块：IAM、短信等等
-- D01-dependency  模块的依赖整合模块：
-- D03-deploy      微服务整合部署模块， 各种Application
-
-**项目结构**
-```
-platform
-├─C00-common        公共模块
-├─C02-system        系统模块
-├─C03-plan          计划管理模块
-├─C04-dispatch      调控运行：
-├─C05-online        投产管理：
-├─C06-energy        能源管理：
-├─C07-measure      运销计量：
-│    ├─pps-measure-core        运销计量-核心模块：
-│    │  ├─pps.core.measure    module 总包名
-│    │  │   ├─constant  常量
-│    │  │   ├─entity  实体
-│    │  │   ├─mapper  映射
-│    │  │   ├─module  包含的模块，以及初始化架构模块实现类
-│    │  │   ├─mybatis  mybatis 配置类
-│    │  │   ├─service  服务实现类
-│    │  │   │   ├─data.{表名}  出入参model
-│    │  │   ├─utils  工具类
-│    │  │   ├─provider.impl  架构基础功能实现类
-│    ├─pps-measure-cloud         运销计量-api模块：
-├─D00-third-party   调用第三方模块
-├─D01-dependency    产品依赖整合模块
-├─D03-deploy        微服务部署模块
-│    ├─deploy-pps-analysis        分析服务       
-│    ├─deploy-pps-auth            认证服务       
-│    ├─deploy-pps-bpm             工作流服务       
-│    ├─deploy-pps-calc            专业计算服务       
-│    ├─deploy-pps-dispatch        调度运行服务       
-│    ├─deploy-pps-energy          能耗服务       
-│    ├─deploy-pps-measure         计量服务       
-│    ├─deploy-pps-online          投产服务       
-│    ├─deploy-pps-online          运维服务       
-│    ├─deploy-pps-plan            计划管理服务       
-│    ├─deploy-pps-signature       电子签章服务       
-│    ├─deploy-pps-system          系统服务       
-│    ├─deploy-pps-task            任务服务       
-│    ├─deploy-pps-report          报表服务       
-│    ├─deploy-pps-third-interface 第三方接口服务       
-│ 
-│
-```
-
-**快速开始：**
-```shell
-1 导入项目
-pom.xml
-
-2 执行
-mvn clean install
-```
-
-```shell
-1 导入项目
-D03-deploy/pom.xml
-
-2 执行
-mvn clean package
-```
-
-<br>
-
-**技术选型：**
-- 核心框架：Spring Boot 2.6.7 + Spring Cloud 3.1.1 + Spring 5.3.19
-- 持久层框架：MyBatis 3.5
-- 缓存中间件：Redis 4.x
-- 定时器：Quartz 2.3
-- 日志管理：Logback
-- 页面交互：Vue2.x
-- 接口文档：Swagger3.x
-- 数据库版本管理：Flayway6.x
-- 数据校验：JSR303
-- 方法构建：Lombook
-
-<br>
-
-
-**项目架构**
-1、springboot + flyway + swagger + huawei
-
-**项目规范**
-一、 命名规范
-- 1、遵守java命名规范
-- 2、在常量与变量的命名时，表示类型的名词放在词尾
-
-二、结构规范
-- 1、每个模块包括 core 和 api 两部分，core模块之间不可依赖
-
-三、表命名规范
-- 1、小写
-- 2、公用模块表命名  以base_ 为前缀，业务含义的英文单词结尾，多个中间添加 下划线“_”
-
-四、表结构升级规范
-- 1、flyway 规范
-
-
-**技术点**
-- 分布式id：  gaussdb 的UUID 数据类型，不合适用于分布式数据库中，可能产生相同UUID，建议业间件平台提供的分布式ID
-
-- 2022-11-30 10:46  进行git 迁移

C11-space/pps-cloud-space/src/main/java/pps/cloud/space/service/data/space_institution_detail/QuerySpaceInstitutionDetailViewInput.java

+package pps.cloud.space.service.data.space_institution_detail;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import xstartup.annotation.XText;
+
+/**
+ * 基础间开配置
+ *
+ * @author ZWT
+ * @date 2023/09/05
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class QuerySpaceInstitutionDetailViewInput {
+
+    @XText("线路ID")
+    private String lineId;
+}

C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceCalibrationHistoryView.java

@@ -2,6 +2,7 @@ package pps.core.space.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
+import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
@@ -14,38 +15,7 @@ import java.util.Date;
  * @date 2023/09/05
  */
 @Data
-public class SpaceCalibrationHistoryView 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 SpaceCalibrationHistoryView extends BaseModel implements Serializable {
 
     @XText("线路ID")
     @TableField
@@ -62,4 +32,25 @@ public class SpaceCalibrationHistoryView implements Serializable {
     @XText("校准日期")
     @TableField
     private Date calibrationDate;
+
+    /**
+     * 组织机构ID
+     */
+    @XText("组织机构ID")
+    @TableField
+    private String ouId;
+
+    /**
+     * 电网类型key(字典获取)
+     */
+    @XText("电网类型key(字典获取)")
+    @TableField
+    private String gridTypeKey;
+
+    /**
+     * 制度名称
+     */
+    @XText("制度名称")
+    @TableField
+    private String institutionName;
 }

C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceCalibrationPeriodEnt.java

@@ -18,6 +18,10 @@ import java.io.Serializable;
 @TableName("space_calibration_period")
 public class SpaceCalibrationPeriodEnt extends BaseModel implements Serializable {
 
+    @XText("组织机构ID")
+    @TableField
+    private String ouId;
+
     @XText("线路ID")
     @TableField
     private String lineId;

C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceCalibrationPeriodView.java

@@ -2,10 +2,10 @@ package pps.core.space.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
+import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 周期设定
@@ -14,38 +14,11 @@ import java.util.Date;
  * @date 2023/09/05
  */
 @Data
-public class SpaceCalibrationPeriodView 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;
+public class SpaceCalibrationPeriodView extends BaseModel implements Serializable {
 
-    @XText("修改时间")
+    @XText("组织机构ID")
     @TableField
-    private Date modifyTime;
+    private String ouId;
 
     @XText("线路ID")
     @TableField

C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceCalibrationHistoryViewMapper.java

@@ -5,9 +5,28 @@ import pps.core.space.entity.SpaceCalibrationHistoryView;
 
 import java.util.List;
 
+/**
+ * 校准历史
+ *
+ * @author ZWT
+ * @date 2023/09/06
+ */
 @Repository(value = "pps.core.space.mapper.SpaceCalibrationHistoryViewMapper")
 public interface SpaceCalibrationHistoryViewMapper {
+
+    /**
+     * 选择一个
+     *
+     * @param record 记录
+     * @return {@link SpaceCalibrationHistoryView}
+     */
     SpaceCalibrationHistoryView selectOne(SpaceCalibrationHistoryView record);
 
+    /**
+     * 条件查询列表
+     *
+     * @param record 记录
+     * @return {@link List}<{@link SpaceCalibrationHistoryView}>
+     */
     List<SpaceCalibrationHistoryView> selectList(SpaceCalibrationHistoryView record);
 }

C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceCalibrationPeriodMapper.java

@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
 import pps.core.space.entity.SpaceCalibrationPeriodEnt;
 
+/**
+ * 周期设定
+ *
+ * @author ZWT
+ * @date 2023/09/06
+ */
 @Repository(value = "pps.core.space.mapper.SpaceCalibrationPeriodMapper")
 public interface SpaceCalibrationPeriodMapper extends BaseMapper<SpaceCalibrationPeriodEnt> {
 }

C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceCalibrationPeriodViewMapper.java

@@ -5,6 +5,12 @@ import pps.core.space.entity.SpaceCalibrationPeriodView;
 
 import java.util.List;
 
+/**
+ * 周期设定
+ *
+ * @author ZWT
+ * @date 2023/09/06
+ */
 @Repository(value = "pps.core.space.mapper.SpaceCalibrationPeriodViewMapper")
 public interface SpaceCalibrationPeriodViewMapper {
     SpaceCalibrationPeriodView selectOne(SpaceCalibrationPeriodView record);

C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceInstitutionDetailViewMapper.java

@@ -5,6 +5,12 @@ import pps.core.space.entity.SpaceInstitutionDetailView;
 
 import java.util.List;
 
+/**
+ * 基础间开配置
+ *
+ * @author ZWT
+ * @date 2023/09/06
+ */
 @Repository(value = "pps.core.space.mapper.SpaceInstitutionDetailViewMapper")
 public interface SpaceInstitutionDetailViewMapper {
     SpaceInstitutionDetailView selectOne(SpaceInstitutionDetailView record);

C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceInstitutionDurationViewMapper.java

@@ -5,6 +5,12 @@ import pps.core.space.entity.SpaceInstitutionDurationView;
 
 import java.util.List;
 
+/**
+ * 间开制度小间开时段配置
+ *
+ * @author ZWT
+ * @date 2023/09/06
+ */
 @Repository(value = "pps.core.space.mapper.SpaceInstitutionDurationViewMapper")
 public interface SpaceInstitutionDurationViewMapper {
     SpaceInstitutionDurationView selectOne(SpaceInstitutionDurationView record);

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

-package pps.core.space.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import pps.core.space.entity.SpaceCalibrationHistoryEnt;
-import pps.core.space.entity.SpaceCalibrationHistoryView;
-import pps.core.space.mapper.SpaceCalibrationHistoryMapper;
-import pps.core.space.mapper.SpaceCalibrationHistoryViewMapper;
-import pps.core.space.service.data.space_calibration_history.*;
-import xstartup.annotation.XService;
-import xstartup.base.XContext;
-import xstartup.base.data.CustomQueryInput;
-import xstartup.base.util.XCopyUtils;
-import xstartup.data.XPageResult;
-import xstartup.data.XServiceResult;
-import xstartup.data.XSingleResult;
-import xstartup.error.XError;
-import xstartup.feature.api.annotation.XApiAnonymous;
-import xstartup.feature.api.annotation.XApiGet;
-import xstartup.feature.api.annotation.XApiPost;
-import xstartup.feature.mybatis.helper.XMapperHelper;
-
-import java.util.List;
-
-@XService
-public class SpaceCalibrationHistoryService {
-    @XApiAnonymous
-    @XApiPost
-    public XServiceResult createSpaceCalibrationHistory(XContext context, CreateSpaceCalibrationHistoryInput input) {
-        SpaceCalibrationHistoryMapper mapper = context.getBean(SpaceCalibrationHistoryMapper.class);
-        SpaceCalibrationHistoryEnt entity = new SpaceCalibrationHistoryEnt();
-        XCopyUtils.copyObject(input, entity);
-        mapper.insert(entity);
-        return XServiceResult.OK;
-    }
-
-    @XApiAnonymous
-    @XApiPost
-    public XServiceResult updateSpaceCalibrationHistory(XContext context, UpdateSpaceCalibrationHistoryInput input) {
-        SpaceCalibrationHistoryMapper mapper = context.getBean(SpaceCalibrationHistoryMapper.class);
-        QueryWrapper<SpaceCalibrationHistoryEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SpaceCalibrationHistoryEnt::getId, input.getId());
-        SpaceCalibrationHistoryEnt entity = mapper.selectOne(queryWrapper);
-        if (entity == null) {
-            return XServiceResult.error(context, XError.NotFound);
-        }
-        XCopyUtils.copyObject(input, entity);
-        mapper.updateById(entity);
-        return XServiceResult.OK;
-    }
-
-    @XApiAnonymous
-    @XApiPost
-    public XServiceResult deleteSpaceCalibrationHistory(XContext context, DeleteSpaceCalibrationHistoryInput input) {
-        SpaceCalibrationHistoryMapper mapper = context.getBean(SpaceCalibrationHistoryMapper.class);
-        QueryWrapper<SpaceCalibrationHistoryEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SpaceCalibrationHistoryEnt::getId, input.getId());
-        SpaceCalibrationHistoryEnt entity = mapper.selectOne(queryWrapper);
-        if (entity == null) {
-            return XServiceResult.error(context, XError.NotFound);
-        }
-        mapper.deleteById(entity);
-        return XServiceResult.OK;
-    }
-
-    @XApiAnonymous
-    @XApiGet
-    public XSingleResult<GetSpaceCalibrationHistoryOutput> getSpaceCalibrationHistory(XContext context, GetSpaceCalibrationHistoryInput input) {
-        SpaceCalibrationHistoryMapper mapper = context.getBean(SpaceCalibrationHistoryMapper.class);
-        QueryWrapper<SpaceCalibrationHistoryEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SpaceCalibrationHistoryEnt::getId, input.getId());
-        SpaceCalibrationHistoryEnt entity = mapper.selectOne(queryWrapper);
-        if (entity == null) {
-            return XSingleResult.error(context, XError.NotFound);
-        }
-        GetSpaceCalibrationHistoryOutput output = new GetSpaceCalibrationHistoryOutput();
-        XCopyUtils.copyObject(entity, output);
-        return XSingleResult.success(output);
-    }
-
-    @XApiAnonymous
-    @XApiGet
-    public XPageResult<QuerySpaceCalibrationHistoryOutput> querySpaceCalibrationHistory(XContext context, QuerySpaceCalibrationHistoryInput input) {
-        SpaceCalibrationHistoryMapper mapper = context.getBean(SpaceCalibrationHistoryMapper.class);
-        QueryWrapper<SpaceCalibrationHistoryEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().like(SpaceCalibrationHistoryEnt::getId, input.getId())
-                .eq(SpaceCalibrationHistoryEnt::getIsDeleted, input.getIsDeleted())
-                .like(SpaceCalibrationHistoryEnt::getCreateById, input.getCreateById())
-                .like(SpaceCalibrationHistoryEnt::getCreateByName, input.getCreateByName())
-                .eq(SpaceCalibrationHistoryEnt::getCreateTime, input.getCreateTime())
-                .like(SpaceCalibrationHistoryEnt::getModifyById, input.getModifyById())
-                .like(SpaceCalibrationHistoryEnt::getModifyByName, input.getModifyByName())
-                .eq(SpaceCalibrationHistoryEnt::getModifyTime, input.getModifyTime())
-                .like(SpaceCalibrationHistoryEnt::getLineId, input.getLineId())
-                .like(SpaceCalibrationHistoryEnt::getInstitutionId, input.getInstitutionId())
-                .like(SpaceCalibrationHistoryEnt::getExecutionCycle, input.getExecutionCycle())
-                .eq(SpaceCalibrationHistoryEnt::getCalibrationDate, input.getCalibrationDate());
-        return XMapperHelper.query(mapper, input, queryWrapper, QuerySpaceCalibrationHistoryOutput.class);
-    }
-
-    @XApiAnonymous
-    @XApiGet
-    public XPageResult<QuerySpaceCalibrationHistoryOutput> dynamicQuerySpaceCalibrationHistory(XContext context, CustomQueryInput input) {
-        SpaceCalibrationHistoryMapper mapper = context.getBean(SpaceCalibrationHistoryMapper.class);
-        return XMapperHelper.query(mapper, input, SpaceCalibrationHistoryEnt.class, QuerySpaceCalibrationHistoryOutput.class);
-    }
-
-    @XApiAnonymous
-    @XApiGet
-    public XSingleResult<GetSpaceCalibrationHistoryViewOutput> getSpaceCalibrationHistoryView(XContext context, GetSpaceCalibrationHistoryViewInput input) {
-        SpaceCalibrationHistoryViewMapper mapper = context.getBean(SpaceCalibrationHistoryViewMapper.class);
-        SpaceCalibrationHistoryView record = new SpaceCalibrationHistoryView();
-        XCopyUtils.copyObject(input, record);
-        SpaceCalibrationHistoryView view = mapper.selectOne(record);
-        if (view == null) {
-            return XSingleResult.error(context, XError.NotFound);
-        }
-        GetSpaceCalibrationHistoryViewOutput output = new GetSpaceCalibrationHistoryViewOutput();
-        XCopyUtils.copyObject(view, output);
-        return XSingleResult.success(output);
-    }
-
-    @XApiAnonymous
-    @XApiGet
-    public XPageResult<QuerySpaceCalibrationHistoryViewOutput> querySpaceCalibrationHistoryView(XContext context, QuerySpaceCalibrationHistoryViewInput input) {
-        SpaceCalibrationHistoryViewMapper mapper = context.getBean(SpaceCalibrationHistoryViewMapper.class);
-        SpaceCalibrationHistoryView record = new SpaceCalibrationHistoryView();
-        XCopyUtils.copyObject(input, record);
-        PageHelper.startPage(input.getPage(), input.getLimit());
-        List<SpaceCalibrationHistoryView> list = mapper.selectList(record);
-        PageInfo<SpaceCalibrationHistoryView> pageInfo = new PageInfo<>(list);
-        List<QuerySpaceCalibrationHistoryViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QuerySpaceCalibrationHistoryViewOutput.class);
-        return XPageResult.success(outputs, input, pageInfo.getTotal());
-    }
-
-}

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

-package pps.core.space.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import pps.core.space.entity.SpaceCalibrationPeriodEnt;
-import pps.core.space.entity.SpaceCalibrationPeriodView;
-import pps.core.space.mapper.SpaceCalibrationPeriodMapper;
-import pps.core.space.mapper.SpaceCalibrationPeriodViewMapper;
-import pps.core.space.service.data.space_calibration_period.*;
-import xstartup.annotation.XService;
-import xstartup.base.XContext;
-import xstartup.base.data.CustomQueryInput;
-import xstartup.base.util.XCopyUtils;
-import xstartup.data.XPageResult;
-import xstartup.data.XServiceResult;
-import xstartup.data.XSingleResult;
-import xstartup.error.XError;
-import xstartup.feature.api.annotation.XApiAnonymous;
-import xstartup.feature.api.annotation.XApiGet;
-import xstartup.feature.api.annotation.XApiPost;
-import xstartup.feature.mybatis.helper.XMapperHelper;
-
-import java.util.List;
-
-@XService
-public class SpaceCalibrationPeriodService {
-    @XApiAnonymous
-    @XApiPost
-    public XServiceResult createSpaceCalibrationPeriod(XContext context, CreateSpaceCalibrationPeriodInput input) {
-        SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
-        SpaceCalibrationPeriodEnt entity = new SpaceCalibrationPeriodEnt();
-        XCopyUtils.copyObject(input, entity);
-        mapper.insert(entity);
-        return XServiceResult.OK;
-    }
-
-    @XApiAnonymous
-    @XApiPost
-    public XServiceResult updateSpaceCalibrationPeriod(XContext context, UpdateSpaceCalibrationPeriodInput input) {
-        SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
-        QueryWrapper<SpaceCalibrationPeriodEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SpaceCalibrationPeriodEnt::getId, input.getId());
-        SpaceCalibrationPeriodEnt entity = mapper.selectOne(queryWrapper);
-        if (entity == null) {
-            return XServiceResult.error(context, XError.NotFound);
-        }
-        XCopyUtils.copyObject(input, entity);
-        mapper.updateById(entity);
-        return XServiceResult.OK;
-    }
-
-    @XApiAnonymous
-    @XApiPost
-    public XServiceResult deleteSpaceCalibrationPeriod(XContext context, DeleteSpaceCalibrationPeriodInput input) {
-        SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
-        QueryWrapper<SpaceCalibrationPeriodEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SpaceCalibrationPeriodEnt::getId, input.getId());
-        SpaceCalibrationPeriodEnt entity = mapper.selectOne(queryWrapper);
-        if (entity == null) {
-            return XServiceResult.error(context, XError.NotFound);
-        }
-        mapper.deleteById(entity);
-        return XServiceResult.OK;
-    }
-
-    @XApiAnonymous
-    @XApiGet
-    public XSingleResult<GetSpaceCalibrationPeriodOutput> getSpaceCalibrationPeriod(XContext context, GetSpaceCalibrationPeriodInput input) {
-        SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
-        QueryWrapper<SpaceCalibrationPeriodEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SpaceCalibrationPeriodEnt::getId, input.getId());
-        SpaceCalibrationPeriodEnt entity = mapper.selectOne(queryWrapper);
-        if (entity == null) {
-            return XSingleResult.error(context, XError.NotFound);
-        }
-        GetSpaceCalibrationPeriodOutput output = new GetSpaceCalibrationPeriodOutput();
-        XCopyUtils.copyObject(entity, output);
-        return XSingleResult.success(output);
-    }
-
-    @XApiAnonymous
-    @XApiGet
-    public XPageResult<QuerySpaceCalibrationPeriodOutput> querySpaceCalibrationPeriod(XContext context, QuerySpaceCalibrationPeriodInput input) {
-        SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
-        QueryWrapper<SpaceCalibrationPeriodEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().like(SpaceCalibrationPeriodEnt::getId, input.getId())
-                .eq(SpaceCalibrationPeriodEnt::getIsDeleted, input.getIsDeleted())
-                .like(SpaceCalibrationPeriodEnt::getCreateById, input.getCreateById())
-                .like(SpaceCalibrationPeriodEnt::getCreateByName, input.getCreateByName())
-                .eq(SpaceCalibrationPeriodEnt::getCreateTime, input.getCreateTime())
-                .like(SpaceCalibrationPeriodEnt::getModifyById, input.getModifyById())
-                .like(SpaceCalibrationPeriodEnt::getModifyByName, input.getModifyByName())
-                .eq(SpaceCalibrationPeriodEnt::getModifyTime, input.getModifyTime())
-                .like(SpaceCalibrationPeriodEnt::getLineId, input.getLineId())
-                .like(SpaceCalibrationPeriodEnt::getDayNumber, input.getDayNumber());
-        return XMapperHelper.query(mapper, input, queryWrapper, QuerySpaceCalibrationPeriodOutput.class);
-    }
-
-    @XApiAnonymous
-    @XApiGet
-    public XPageResult<QuerySpaceCalibrationPeriodOutput> dynamicQuerySpaceCalibrationPeriod(XContext context, CustomQueryInput input) {
-        SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
-        return XMapperHelper.query(mapper, input, SpaceCalibrationPeriodEnt.class, QuerySpaceCalibrationPeriodOutput.class);
-    }
-
-    @XApiAnonymous
-    @XApiGet
-    public XSingleResult<GetSpaceCalibrationPeriodViewOutput> getSpaceCalibrationPeriodView(XContext context, GetSpaceCalibrationPeriodViewInput input) {
-        SpaceCalibrationPeriodViewMapper mapper = context.getBean(SpaceCalibrationPeriodViewMapper.class);
-        SpaceCalibrationPeriodView record = new SpaceCalibrationPeriodView();
-        XCopyUtils.copyObject(input, record);
-        SpaceCalibrationPeriodView view = mapper.selectOne(record);
-        if (view == null) {
-            return XSingleResult.error(context, XError.NotFound);
-        }
-        GetSpaceCalibrationPeriodViewOutput output = new GetSpaceCalibrationPeriodViewOutput();
-        XCopyUtils.copyObject(view, output);
-        return XSingleResult.success(output);
-    }
-
-    @XApiAnonymous
-    @XApiGet
-    public XPageResult<QuerySpaceCalibrationPeriodViewOutput> querySpaceCalibrationPeriodView(XContext context, QuerySpaceCalibrationPeriodViewInput input) {
-        SpaceCalibrationPeriodViewMapper mapper = context.getBean(SpaceCalibrationPeriodViewMapper.class);
-        SpaceCalibrationPeriodView record = new SpaceCalibrationPeriodView();
-        XCopyUtils.copyObject(input, record);
-        PageHelper.startPage(input.getPage(), input.getLimit());
-        List<SpaceCalibrationPeriodView> list = mapper.selectList(record);
-        PageInfo<SpaceCalibrationPeriodView> pageInfo = new PageInfo<>(list);
-        List<QuerySpaceCalibrationPeriodViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QuerySpaceCalibrationPeriodViewOutput.class);
-        return XPageResult.success(outputs, input, pageInfo.getTotal());
-    }
-
-}

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

+package pps.core.space.service;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import pps.core.common.constant.BusinessConstant;
+import pps.core.common.entity.BaseModel;
+import pps.core.common.session.PpsUserSession;
+import pps.core.common.utils.BaseUtils;
+import pps.core.space.entity.SpaceCalibrationHistoryView;
+import pps.core.space.entity.SpaceCalibrationPeriodEnt;
+import pps.core.space.entity.SpaceInstitutionWellheadEnt;
+import pps.core.space.mapper.SpaceCalibrationHistoryViewMapper;
+import pps.core.space.mapper.SpaceCalibrationPeriodMapper;
+import pps.core.space.mapper.SpaceInstitutionWellheadMapper;
+import pps.core.space.service.data.space_calibration_history.QuerySpaceCalibrationHistoryInput;
+import pps.core.space.service.data.space_calibration_history.QuerySpaceCalibrationHistoryOutput;
+import pps.core.space.service.data.space_calibration_history.QuerySpaceCalibrationHistoryViewInput;
+import pps.core.space.service.data.space_calibration_history.QuerySpaceCalibrationHistoryViewOutput;
+import pps.core.space.service.data.space_calibration_period.CreateSpaceCalibrationPeriodInput;
+import pps.core.space.service.data.space_calibration_period.GetSpaceCalibrationPeriodViewInput;
+import pps.core.space.service.data.space_calibration_period.GetSpaceCalibrationPeriodViewOutput;
+import pps.core.space.service.data.space_calibration_period.UpdateSpaceCalibrationPeriodInput;
+import pps.core.space.service.data.space_institution_wellhead.QuerySpaceInstitutionWellheadOutput;
+import pps.core.space.utils.ServiceUtil;
+import xstartup.annotation.XService;
+import xstartup.annotation.XText;
+import xstartup.base.XContext;
+import xstartup.base.util.XCopyUtils;
+import xstartup.data.XPageResult;
+import xstartup.data.XServiceResult;
+import xstartup.data.XSingleResult;
+import xstartup.error.XError;
+import xstartup.feature.api.annotation.XApiAnonymous;
+import xstartup.feature.api.annotation.XApiGet;
+import xstartup.feature.api.annotation.XApiPost;
+import xstartup.helper.XTransactionHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * 定期校准模块
+ *
+ * @author ZWT
+ * @date 2023/09/06
+ */
+@XService
+@XText("定期校准模块")
+public class SpaceCalibrationService {
+
+    /**
+     * 校准周期--新增
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XServiceResult}
+     */
+    @XApiAnonymous
+    @XApiPost
+    @XText("校准周期--新增")
+    public XServiceResult createSpaceCalibrationPeriod(XContext context, CreateSpaceCalibrationPeriodInput input) {
+        PpsUserSession session = new PpsUserSession();
+        session.setId("123");
+        session.setUserName("ceshi");
+//        PpsUserSession session = context.getSession(PpsUserSession.class);
+        return XTransactionHelper.begin(context, () -> {
+            SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
+            SpaceCalibrationPeriodEnt periodEnt = this.getPeriodEntByParam(mapper, input.getLineId(), input.getOuId());
+            if (Objects.nonNull(periodEnt)) {
+                return XServiceResult.error(992, "当前线路已设定周期");
+            }
+            SpaceCalibrationPeriodEnt entity = XCopyUtils.copyNewObject(input, SpaceCalibrationPeriodEnt.class);
+            BaseUtils.setBaseModelDefault(entity, session);
+            mapper.insert(entity);
+            return XServiceResult.OK;
+        });
+    }
+
+    /**
+     * 校准周期--修改
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XServiceResult}
+     */
+    @XApiAnonymous
+    @XApiPost
+    @XText("校准周期--修改")
+    public XServiceResult updateSpaceCalibrationPeriod(XContext context, UpdateSpaceCalibrationPeriodInput input) {
+        PpsUserSession session = new PpsUserSession();
+        session.setId("123");
+        session.setUserName("ceshi");
+//        PpsUserSession session = context.getSession(PpsUserSession.class);
+        return XTransactionHelper.begin(context, () -> {
+            SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
+            SpaceCalibrationPeriodEnt entity = mapper.selectOne(
+                    new LambdaQueryWrapper<SpaceCalibrationPeriodEnt>()
+                            .eq(BaseModel::getId, input.getId())
+            );
+            if (Objects.isNull(entity)) {
+                return XServiceResult.error(context, XError.NotFound);
+            }
+            XCopyUtils.copyObject(input, entity);
+            BaseUtils.setBaseModelDefault(entity, session);
+            mapper.updateById(entity);
+            return XServiceResult.OK;
+        });
+    }
+
+    /**
+     * 校准周期--详情
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XSingleResult}<{@link GetSpaceCalibrationPeriodViewOutput}>
+     */
+    @XApiAnonymous
+    @XApiGet
+    @XText("校准周期--详情")
+    public XSingleResult<GetSpaceCalibrationPeriodViewOutput> getSpaceCalibrationPeriodView(XContext context, GetSpaceCalibrationPeriodViewInput input) {
+        String lineId = input.getLineId();
+        String ouId = input.getOuId();
+        SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
+        SpaceCalibrationPeriodEnt entity = this.getPeriodEntByParam(mapper, lineId, ouId);
+        GetSpaceCalibrationPeriodViewOutput output = new GetSpaceCalibrationPeriodViewOutput();
+        if (Objects.nonNull(entity)) {
+            XCopyUtils.copyObject(entity, output);
+        }
+        output.setLineName(
+                ServiceUtil.getPowerLineNameById(context, lineId)
+        );
+        output.setOuName(
+                ServiceUtil.getSysOrgNameById(context, ouId)
+        );
+        return XSingleResult.success(output);
+    }
+
+    /**
+     * 校准历史--分页列表
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XPageResult}<{@link QuerySpaceCalibrationHistoryViewOutput}>
+     */
+    @XApiAnonymous
+    @XApiGet
+    @XText("校准历史--分页列表")
+    public XPageResult<QuerySpaceCalibrationHistoryViewOutput> querySpaceCalibrationHistoryView(XContext context, QuerySpaceCalibrationHistoryViewInput input) {
+        SpaceCalibrationHistoryViewMapper mapper = context.getBean(SpaceCalibrationHistoryViewMapper.class);
+        SpaceCalibrationHistoryView record = XCopyUtils.copyNewObject(input, SpaceCalibrationHistoryView.class);
+        PageHelper.startPage(input.getPage(), input.getLimit());
+        List<SpaceCalibrationHistoryView> list = mapper.selectList(record);
+        PageInfo<SpaceCalibrationHistoryView> pageInfo = new PageInfo<>(list);
+        List<QuerySpaceCalibrationHistoryViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QuerySpaceCalibrationHistoryViewOutput.class);
+        if (CollUtil.isNotEmpty(outputs)) {
+            Map<String, String> gridTypeMap = ServiceUtil.getDictMap(context, BusinessConstant.GRID_TYPE);
+            Map<String, String> ouMap = ServiceUtil.getOuMapByOuIds(context, outputs.stream()
+                    .map(QuerySpaceCalibrationHistoryViewOutput::getOuId)
+                    .distinct()
+                    .collect(Collectors.toList())
+            );
+            String lineName = ServiceUtil.getPowerLineNameById(context, input.getLineId());
+            outputs.forEach(output -> {
+                output.setLineName(lineName);
+                output.setOuName(ouMap.get(output.getOuId()));
+                output.setGridTypeName(gridTypeMap.get(output.getGridTypeKey()));
+            });
+        }
+        return XPageResult.success(outputs, input, pageInfo.getTotal());
+    }
+
+    /**
+     * 校准周期--获取线路及井口树
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XSingleResult}<{@link QuerySpaceCalibrationHistoryOutput}>
+     */
+    @XApiAnonymous
+    @XApiGet
+    @XText("校准周期--获取线路及井口树")
+    public XSingleResult<QuerySpaceCalibrationHistoryOutput> querySpaceCalibrationLineView(XContext context, QuerySpaceCalibrationHistoryInput input) {
+        QuerySpaceCalibrationHistoryOutput output = new QuerySpaceCalibrationHistoryOutput();
+        String institutionId = input.getInstitutionId();
+        String lineId = input.getLineId();
+        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)) {
+            output.setWellheadList(XCopyUtils.copyNewList(wellheadEntList, QuerySpaceInstitutionWellheadOutput.class));
+        } else {
+            output.setWellheadList(new ArrayList<>(0));
+        }
+        output.setInstitutionId(institutionId);
+        output.setLineId(lineId);
+        output.setLineName(ServiceUtil.getPowerLineNameById(context, lineId));
+        return XSingleResult.success(output);
+    }
+
+    /*-----------------------------------private-----------------------------------*/
+
+    /**
+     * 通过参数获取周期
+     *
+     * @param mapper 映射器
+     * @param lineId 线路id
+     * @param ouId   ou-id
+     * @return {@link SpaceCalibrationPeriodEnt}
+     */
+    private SpaceCalibrationPeriodEnt getPeriodEntByParam(SpaceCalibrationPeriodMapper mapper, String lineId, String ouId) {
+        return mapper.selectOne(
+                new LambdaQueryWrapper<SpaceCalibrationPeriodEnt>()
+                        .eq(SpaceCalibrationPeriodEnt::getLineId, lineId)
+                        .eq(SpaceCalibrationPeriodEnt::getOuId, ouId)
+        );
+    }
+}

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

+package pps.core.space.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import pps.cloud.space.service.ISpaceInstitutionDetailCloudService;
+import pps.core.common.constant.BusinessConstant;
+import pps.core.common.entity.BaseModel;
+import pps.core.space.entity.SpaceInstitutionDetailEnt;
+import pps.core.space.mapper.SpaceInstitutionDetailMapper;
+import xstartup.annotation.XService;
+import xstartup.base.XContext;
+import xstartup.data.XSingleResult;
+
+/**
+ * 基础间开配置模块
+ *
+ * @author ZWT
+ * @date 2023/09/06 17:09
+ */
+@XService
+public class SpaceInstitutionDetailCloudServiceImpl implements ISpaceInstitutionDetailCloudService {
+
+    /**
+     * 基础间开配置模块--获取线路配置制度数量
+     *
+     * @param context 上下文
+     * @param lineId  线路id
+     * @return {@link XSingleResult}<{@link Long}>
+     */
+    @Override
+    public XSingleResult<Long> getInstitutionLineCountByLineId(XContext context, String lineId) {
+        SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
+        return XSingleResult.success(mapper.selectCount(
+                new LambdaQueryWrapper<SpaceInstitutionDetailEnt>()
+                        .eq(BaseModel::getIsDeleted, BusinessConstant.NO)
+                        .eq(SpaceInstitutionDetailEnt::getLineId, lineId)
+        ));
+    }
+}

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

@@ -2,16 +2,22 @@ package pps.core.space.service;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-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 org.apache.commons.lang3.StringUtils;
 import pps.core.common.constant.BusinessConstant;
 import pps.core.common.entity.BaseModel;
 import pps.core.common.session.PpsUserSession;
 import pps.core.common.utils.BaseUtils;
-import pps.core.space.entity.*;
-import pps.core.space.mapper.*;
+import pps.core.space.entity.SpaceInstitutionDetailEnt;
+import pps.core.space.entity.SpaceInstitutionDurationEnt;
+import pps.core.space.entity.SpaceInstitutionWellheadEnt;
+import pps.core.space.entity.SpaceInstitutionWellheadView;
+import pps.core.space.mapper.SpaceInstitutionDetailMapper;
+import pps.core.space.mapper.SpaceInstitutionDurationMapper;
+import pps.core.space.mapper.SpaceInstitutionWellheadMapper;
+import pps.core.space.mapper.SpaceInstitutionWellheadViewMapper;
 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;
@@ -21,7 +27,6 @@ import pps.core.space.utils.ServiceUtil;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
-import xstartup.base.data.CustomQueryInput;
 import xstartup.base.util.XCopyUtils;
 import xstartup.data.XPageResult;
 import xstartup.data.XServiceResult;
@@ -30,7 +35,6 @@ import xstartup.error.XError;
 import xstartup.feature.api.annotation.XApiAnonymous;
 import xstartup.feature.api.annotation.XApiGet;
 import xstartup.feature.api.annotation.XApiPost;
-import xstartup.feature.mybatis.helper.XMapperHelper;
 import xstartup.helper.XTransactionHelper;
 
 import java.util.*;
@@ -103,23 +107,7 @@ public class SpaceInstitutionDetailService {
             if (isCurrentBasic.equals(0)) {
                 return XServiceResult.error(992, "基础制度无法修改");
             }
-            List<UpdateSpaceInstitutionWellheadInput> wellheadList = input.getWellheadList();
-            if (CollUtil.isNotEmpty(wellheadList)) {
-                //删除之前关联的信息
-                SpaceInstitutionWellheadViewMapper wellheadMapper = context.getBean(SpaceInstitutionWellheadViewMapper.class);
-                wellheadMapper.delete(new LambdaQueryWrapper<SpaceInstitutionWellheadView>()
-                        .eq(SpaceInstitutionWellheadView::getInstitutionId, institutionId)
-                );
-                SpaceInstitutionDurationMapper durationMapper = context.getBean(SpaceInstitutionDurationMapper.class);
-                durationMapper.delete(new LambdaQueryWrapper<SpaceInstitutionDurationEnt>()
-                        .eq(SpaceInstitutionDurationEnt::getInstitutionId, institutionId)
-                );
-                //重新添加关联信息
-                this.saveInstitutionWellhead(session, institutionId, wellheadList, wellheadMapper);
-            }
-            XCopyUtils.copyObject(input, entity);
-            BaseUtils.setBaseModelDefault(entity, session);
-            mapper.updateById(entity);
+            this.updateInstitutionDetail(context, session, mapper, institutionId, input, entity);
             return XServiceResult.OK;
         });
     }
@@ -153,7 +141,7 @@ public class SpaceInstitutionDetailService {
             SpaceInstitutionDurationMapper durationMapper = context.getBean(SpaceInstitutionDurationMapper.class);
             durationMapper.update(null, new LambdaUpdateWrapper<SpaceInstitutionDurationEnt>()
                     .eq(SpaceInstitutionDurationEnt::getInstitutionId, institutionId)
-                    .set(BaseModel::getIsDeleted, BusinessConstant.DELETE)
+                    .set(BaseModel::getIsDeleted, BusinessConstant.YES)
                     .set(SpaceInstitutionDurationEnt::getModifyById, session.getId())
                     .set(SpaceInstitutionDurationEnt::getModifyByName, session.getUserName())
                     .set(SpaceInstitutionDurationEnt::getModifyTime, new Date())
@@ -161,14 +149,14 @@ public class SpaceInstitutionDetailService {
             SpaceInstitutionWellheadMapper wellheadMapper = context.getBean(SpaceInstitutionWellheadMapper.class);
             wellheadMapper.update(null, new LambdaUpdateWrapper<SpaceInstitutionWellheadEnt>()
                     .eq(SpaceInstitutionWellheadEnt::getInstitutionId, institutionId)
-                    .set(BaseModel::getIsDeleted, BusinessConstant.DELETE)
+                    .set(BaseModel::getIsDeleted, BusinessConstant.YES)
                     .set(SpaceInstitutionWellheadEnt::getModifyById, session.getId())
                     .set(SpaceInstitutionWellheadEnt::getModifyByName, session.getUserName())
                     .set(SpaceInstitutionWellheadEnt::getModifyTime, new Date())
             );
             mapper.update(null, new LambdaUpdateWrapper<SpaceInstitutionDetailEnt>()
                     .eq(BaseModel::getId, institutionId)
-                    .set(BaseModel::getIsDeleted, BusinessConstant.DELETE)
+                    .set(BaseModel::getIsDeleted, BusinessConstant.YES)
                     .set(SpaceInstitutionDetailEnt::getModifyById, session.getId())
                     .set(SpaceInstitutionDetailEnt::getModifyByName, session.getUserName())
                     .set(SpaceInstitutionDetailEnt::getModifyTime, new Date())
@@ -234,53 +222,121 @@ public class SpaceInstitutionDetailService {
         }
         output.setOuName(ServiceUtil.getSysOrgNameById(context, output.getOuId()));
         output.setGridTypeName(ServiceUtil.getDictMap(context, BusinessConstant.GRID_TYPE).get(output.getGridTypeKey()));
+        output.setLineName(ServiceUtil.getPowerLineNameById(context, output.getLineId()));
         return XSingleResult.success(output);
     }
 
+    /**
+     * 基础间开配置--分页列表
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XPageResult}<{@link QuerySpaceInstitutionDetailViewOutput}>
+     */
     @XApiAnonymous
     @XApiGet
-    public XPageResult<QuerySpaceInstitutionDetailOutput> querySpaceInstitutionDetail(XContext context, QuerySpaceInstitutionDetailInput input) {
+    @XText("基础间开配置--分页列表")
+    public XPageResult<QuerySpaceInstitutionDetailViewOutput> querySpaceInstitutionDetailView(XContext context, QuerySpaceInstitutionDetailViewInput input) {
+        String lineId = input.getLineId();
+        String institutionName = input.getInstitutionName();
         SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
-        QueryWrapper<SpaceInstitutionDetailEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().like(SpaceInstitutionDetailEnt::getId, input.getId())
-                .eq(SpaceInstitutionDetailEnt::getIsDeleted, input.getIsDeleted())
-                .like(SpaceInstitutionDetailEnt::getCreateById, input.getCreateById())
-                .like(SpaceInstitutionDetailEnt::getCreateByName, input.getCreateByName())
-                .eq(SpaceInstitutionDetailEnt::getCreateTime, input.getCreateTime())
-                .like(SpaceInstitutionDetailEnt::getModifyById, input.getModifyById())
-                .like(SpaceInstitutionDetailEnt::getModifyByName, input.getModifyByName())
-                .eq(SpaceInstitutionDetailEnt::getModifyTime, input.getModifyTime())
-                .like(SpaceInstitutionDetailEnt::getOuId, input.getOuId())
-                .like(SpaceInstitutionDetailEnt::getLineId, input.getLineId())
-                .like(SpaceInstitutionDetailEnt::getGridTypeKey, input.getGridTypeKey())
-                .like(SpaceInstitutionDetailEnt::getInstitutionName, input.getInstitutionName())
-                .eq(SpaceInstitutionDetailEnt::getInstitutionStartDate, input.getInstitutionStartDate())
-                .eq(SpaceInstitutionDetailEnt::getInstitutionEndDate, input.getInstitutionEndDate())
-                .eq(SpaceInstitutionDetailEnt::getOptimizeDeadline, input.getOptimizeDeadline())
-                .eq(SpaceInstitutionDetailEnt::getOptimizeState, input.getOptimizeState())
-                .eq(SpaceInstitutionDetailEnt::getIsCurrentBasic, input.getIsCurrentBasic())
-                .eq(SpaceInstitutionDetailEnt::getStartInterval, input.getStartInterval());
-        return XMapperHelper.query(mapper, input, queryWrapper, QuerySpaceInstitutionDetailOutput.class);
+        PageHelper.startPage(input.getPage(), input.getLimit());
+        List<SpaceInstitutionDetailEnt> detailEntList = mapper.selectList(new LambdaQueryWrapper<SpaceInstitutionDetailEnt>()
+                .eq(BaseModel::getIsDeleted, BusinessConstant.NO)
+                .eq(SpaceInstitutionDetailEnt::getOuId, input.getOuId())
+                .eq(StringUtils.isNotBlank(lineId), SpaceInstitutionDetailEnt::getLineId, lineId)
+                .like(StringUtils.isNotBlank(institutionName), SpaceInstitutionDetailEnt::getInstitutionName, institutionName)
+        );
+        PageInfo<SpaceInstitutionDetailEnt> pageInfo = new PageInfo<>(detailEntList);
+        List<QuerySpaceInstitutionDetailViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QuerySpaceInstitutionDetailViewOutput.class);
+        if (CollUtil.isNotEmpty(outputs)) {
+            Map<String, String> gridTypeMap = ServiceUtil.getDictMap(context, BusinessConstant.GRID_TYPE);
+            Map<String, String> lineNameMap = ServiceUtil.getPowerLineNameMap(context, outputs.stream()
+                    .map(QuerySpaceInstitutionDetailViewOutput::getLineId)
+                    .distinct()
+                    .collect(Collectors.toList())
+            );
+            String orgName = ServiceUtil.getSysOrgNameById(context, input.getOuId());
+            outputs.forEach(output -> {
+                output.setOuName(orgName);
+                output.setGridTypeName(gridTypeMap.get(output.getGridTypeKey()));
+                output.setLineName(lineNameMap.get(output.getLineId()));
+                output.setIsCurrentBasicValue(output.getIsCurrentBasic().equals(0) ? "是" : "否");
+            });
+        }
+        return XPageResult.success(outputs, input, pageInfo.getTotal());
     }
 
+    /**
+     * 基础间开配置--设为基础制度
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XServiceResult}
+     */
     @XApiAnonymous
-    @XApiGet
-    public XPageResult<QuerySpaceInstitutionDetailOutput> dynamicQuerySpaceInstitutionDetail(XContext context, CustomQueryInput input) {
-        SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
-        return XMapperHelper.query(mapper, input, SpaceInstitutionDetailEnt.class, QuerySpaceInstitutionDetailOutput.class);
+    @XApiPost
+    @XText("基础间开配置--设为基础制度")
+    public XServiceResult updateBasicInstitution(XContext context, UpdateSpaceInstitutionDetailInput input) {
+        String ouId = input.getOuId();
+        String lineId = input.getLineId();
+        if (StringUtils.isAnyBlank(ouId, lineId)) {
+            return XServiceResult.error(992, "缺少必填项");
+        }
+        String institutionId = input.getId();
+        return XTransactionHelper.begin(context, () -> {
+            SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
+            SpaceInstitutionDetailEnt entity = this.getInstitutionDetail(mapper, institutionId);
+            if (Objects.isNull(entity)) {
+                return XServiceResult.error(context, XError.NotFound);
+            }
+            Integer isCurrentBasic = entity.getIsCurrentBasic();
+            if (isCurrentBasic.equals(BusinessConstant.YES)) {
+                return XServiceResult.error(992, "请勿重复设定");
+            }
+            //关闭当前基础制度
+            mapper.update(null, new LambdaUpdateWrapper<SpaceInstitutionDetailEnt>()
+                    .eq(SpaceInstitutionDetailEnt::getOuId, ouId)
+                    .eq(SpaceInstitutionDetailEnt::getLineId, lineId)
+                    .eq(SpaceInstitutionDetailEnt::getIsCurrentBasic, BusinessConstant.YES)
+                    .set(SpaceInstitutionDetailEnt::getIsCurrentBasic, BusinessConstant.NO)
+            );
+            //设定当前制度为基础制度
+            mapper.update(null, new LambdaUpdateWrapper<SpaceInstitutionDetailEnt>()
+                    .eq(BaseModel::getId, institutionId)
+                    .set(SpaceInstitutionDetailEnt::getIsCurrentBasic, BusinessConstant.YES)
+            );
+            //todo: 初始化长期/中短期优化
+            return XServiceResult.OK;
+        });
     }
 
+    /**
+     * 校准历史--重新优化
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XServiceResult}
+     */
     @XApiAnonymous
-    @XApiGet
-    public XPageResult<QuerySpaceInstitutionDetailViewOutput> querySpaceInstitutionDetailView(XContext context, QuerySpaceInstitutionDetailViewInput input) {
-        SpaceInstitutionDetailViewMapper mapper = context.getBean(SpaceInstitutionDetailViewMapper.class);
-        SpaceInstitutionDetailView record = new SpaceInstitutionDetailView();
-        XCopyUtils.copyObject(input, record);
-        PageHelper.startPage(input.getPage(), input.getLimit());
-        List<SpaceInstitutionDetailView> list = mapper.selectList(record);
-        PageInfo<SpaceInstitutionDetailView> pageInfo = new PageInfo<>(list);
-        List<QuerySpaceInstitutionDetailViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QuerySpaceInstitutionDetailViewOutput.class);
-        return XPageResult.success(outputs, input, pageInfo.getTotal());
+    @XApiPost
+    @XText("校准历史--重新优化")
+    public XServiceResult anewOptimizeInstitution(XContext context, UpdateSpaceInstitutionDetailInput input) {
+        PpsUserSession session = new PpsUserSession();
+        session.setId("123");
+        session.setUserName("ceshi");
+//        PpsUserSession session = context.getSession(PpsUserSession.class);
+        String institutionId = input.getId();
+        return XTransactionHelper.begin(context, () -> {
+            SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
+            SpaceInstitutionDetailEnt entity = this.getInstitutionDetail(mapper, institutionId);
+            if (Objects.isNull(entity)) {
+                return XServiceResult.error(context, XError.NotFound);
+            }
+            this.updateInstitutionDetail(context, session, mapper, institutionId, input, entity);
+            //todo: 如果前往校准修改制度,长期/中短期优化重新跑
+            return XServiceResult.OK;
+        });
     }
 
     /*-----------------------------------private-----------------------------------*/
@@ -328,4 +384,35 @@ public class SpaceInstitutionDetailService {
                 .eq(BaseModel::getId, institutionId)
         );
     }
+
+    /**
+     * 更新间开制度及关联信息
+     *
+     * @param context       上下文
+     * @param session       一场
+     * @param mapper        映射器
+     * @param institutionId 机构id
+     * @param input         输入
+     * @param entity        实体
+     */
+    private void updateInstitutionDetail(XContext context, PpsUserSession session, SpaceInstitutionDetailMapper mapper, String institutionId,
+                                         UpdateSpaceInstitutionDetailInput input, SpaceInstitutionDetailEnt entity) {
+        List<UpdateSpaceInstitutionWellheadInput> wellheadList = input.getWellheadList();
+        if (CollUtil.isNotEmpty(wellheadList)) {
+            //删除之前关联的信息
+            SpaceInstitutionWellheadViewMapper wellheadMapper = context.getBean(SpaceInstitutionWellheadViewMapper.class);
+            wellheadMapper.delete(new LambdaQueryWrapper<SpaceInstitutionWellheadView>()
+                    .eq(SpaceInstitutionWellheadView::getInstitutionId, institutionId)
+            );
+            SpaceInstitutionDurationMapper durationMapper = context.getBean(SpaceInstitutionDurationMapper.class);
+            durationMapper.delete(new LambdaQueryWrapper<SpaceInstitutionDurationEnt>()
+                    .eq(SpaceInstitutionDurationEnt::getInstitutionId, institutionId)
+            );
+            //重新添加关联信息
+            this.saveInstitutionWellhead(session, institutionId, wellheadList, wellheadMapper);
+        }
+        XCopyUtils.copyObject(input, entity);
+        BaseUtils.setBaseModelDefault(entity, session);
+        mapper.updateById(entity);
+    }
 }

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

-package pps.core.space.service.data.space_calibration_history;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class CreateSpaceCalibrationHistoryInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(执行开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("间开制度ID")
-    private String institutionId;
-
-    @XText("执行周期")
-    private String executionCycle;
-
-    @XText("校准日期")
-    private Date calibrationDate;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getInstitutionId() {
-        return this.institutionId;
-    }
-
-    public void setInstitutionId(String value) {
-        this.institutionId = value;
-    }
-
-    public String getExecutionCycle() {
-        return this.executionCycle;
-    }
-
-    public void setExecutionCycle(String value) {
-        this.executionCycle = value;
-    }
-
-    public Date getCalibrationDate() {
-        return this.calibrationDate;
-    }
-
-    public void setCalibrationDate(Date value) {
-        this.calibrationDate = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_calibration_history;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class CreateSpaceCalibrationHistoryOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(执行开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("间开制度ID")
-    private String institutionId;
-
-    @XText("执行周期")
-    private String executionCycle;
-
-    @XText("校准日期")
-    private Date calibrationDate;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getInstitutionId() {
-        return this.institutionId;
-    }
-
-    public void setInstitutionId(String value) {
-        this.institutionId = value;
-    }
-
-    public String getExecutionCycle() {
-        return this.executionCycle;
-    }
-
-    public void setExecutionCycle(String value) {
-        this.executionCycle = value;
-    }
-
-    public Date getCalibrationDate() {
-        return this.calibrationDate;
-    }
-
-    public void setCalibrationDate(Date value) {
-        this.calibrationDate = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_calibration_history;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class DeleteSpaceCalibrationHistoryInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(执行开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("间开制度ID")
-    private String institutionId;
-
-    @XText("执行周期")
-    private String executionCycle;
-
-    @XText("校准日期")
-    private Date calibrationDate;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getInstitutionId() {
-        return this.institutionId;
-    }
-
-    public void setInstitutionId(String value) {
-        this.institutionId = value;
-    }
-
-    public String getExecutionCycle() {
-        return this.executionCycle;
-    }
-
-    public void setExecutionCycle(String value) {
-        this.executionCycle = value;
-    }
-
-    public Date getCalibrationDate() {
-        return this.calibrationDate;
-    }
-
-    public void setCalibrationDate(Date value) {
-        this.calibrationDate = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_calibration_history;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class DeleteSpaceCalibrationHistoryOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(执行开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("间开制度ID")
-    private String institutionId;
-
-    @XText("执行周期")
-    private String executionCycle;
-
-    @XText("校准日期")
-    private Date calibrationDate;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getInstitutionId() {
-        return this.institutionId;
-    }
-
-    public void setInstitutionId(String value) {
-        this.institutionId = value;
-    }
-
-    public String getExecutionCycle() {
-        return this.executionCycle;
-    }
-
-    public void setExecutionCycle(String value) {
-        this.executionCycle = value;
-    }
-
-    public Date getCalibrationDate() {
-        return this.calibrationDate;
-    }
-
-    public void setCalibrationDate(Date value) {
-        this.calibrationDate = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_calibration_history;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class DynamicQuerySpaceCalibrationHistoryInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(执行开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("间开制度ID")
-    private String institutionId;
-
-    @XText("执行周期")
-    private String executionCycle;
-
-    @XText("校准日期")
-    private Date calibrationDate;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getInstitutionId() {
-        return this.institutionId;
-    }
-
-    public void setInstitutionId(String value) {
-        this.institutionId = value;
-    }
-
-    public String getExecutionCycle() {
-        return this.executionCycle;
-    }
-
-    public void setExecutionCycle(String value) {
-        this.executionCycle = value;
-    }
-
-    public Date getCalibrationDate() {
-        return this.calibrationDate;
-    }
-
-    public void setCalibrationDate(Date value) {
-        this.calibrationDate = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_calibration_history;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class DynamicQuerySpaceCalibrationHistoryOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(执行开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("间开制度ID")
-    private String institutionId;
-
-    @XText("执行周期")
-    private String executionCycle;
-
-    @XText("校准日期")
-    private Date calibrationDate;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getInstitutionId() {
-        return this.institutionId;
-    }
-
-    public void setInstitutionId(String value) {
-        this.institutionId = value;
-    }
-
-    public String getExecutionCycle() {
-        return this.executionCycle;
-    }
-
-    public void setExecutionCycle(String value) {
-        this.executionCycle = value;
-    }
-
-    public Date getCalibrationDate() {
-        return this.calibrationDate;
-    }
-
-    public void setCalibrationDate(Date value) {
-        this.calibrationDate = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_calibration_history;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class DynamicQuerySpaceCalibrationHistoryViewOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(执行开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("间开制度ID")
-    private String institutionId;
-
-    @XText("执行周期")
-    private String executionCycle;
-
-    @XText("校准日期")
-    private Date calibrationDate;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getInstitutionId() {
-        return this.institutionId;
-    }
-
-    public void setInstitutionId(String value) {
-        this.institutionId = value;
-    }
-
-    public String getExecutionCycle() {
-        return this.executionCycle;
-    }
-
-    public void setExecutionCycle(String value) {
-        this.executionCycle = value;
-    }
-
-    public Date getCalibrationDate() {
-        return this.calibrationDate;
-    }
-
-    public void setCalibrationDate(Date value) {
-        this.calibrationDate = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_calibration_history;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class GetSpaceCalibrationHistoryInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(执行开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("间开制度ID")
-    private String institutionId;
-
-    @XText("执行周期")
-    private String executionCycle;
-
-    @XText("校准日期")
-    private Date calibrationDate;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getInstitutionId() {
-        return this.institutionId;
-    }
-
-    public void setInstitutionId(String value) {
-        this.institutionId = value;
-    }
-
-    public String getExecutionCycle() {
-        return this.executionCycle;
-    }
-
-    public void setExecutionCycle(String value) {
-        this.executionCycle = value;
-    }
-
-    public Date getCalibrationDate() {
-        return this.calibrationDate;
-    }
-
-    public void setCalibrationDate(Date value) {
-        this.calibrationDate = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_calibration_history;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class GetSpaceCalibrationHistoryOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(执行开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("间开制度ID")
-    private String institutionId;
-
-    @XText("执行周期")
-    private String executionCycle;
-
-    @XText("校准日期")
-    private Date calibrationDate;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getInstitutionId() {
-        return this.institutionId;
-    }
-
-    public void setInstitutionId(String value) {
-        this.institutionId = value;
-    }
-
-    public String getExecutionCycle() {
-        return this.executionCycle;
-    }
-
-    public void setExecutionCycle(String value) {
-        this.executionCycle = value;
-    }
-
-    public Date getCalibrationDate() {
-        return this.calibrationDate;
-    }
-
-    public void setCalibrationDate(Date value) {
-        this.calibrationDate = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_calibration_history;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class GetSpaceCalibrationHistoryViewInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(执行开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("间开制度ID")
-    private String institutionId;
-
-    @XText("执行周期")
-    private String executionCycle;
-
-    @XText("校准日期")
-    private Date calibrationDate;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getInstitutionId() {
-        return this.institutionId;
-    }
-
-    public void setInstitutionId(String value) {
-        this.institutionId = value;
-    }
-
-    public String getExecutionCycle() {
-        return this.executionCycle;
-    }
-
-    public void setExecutionCycle(String value) {
-        this.executionCycle = value;
-    }
-
-    public Date getCalibrationDate() {
-        return this.calibrationDate;
-    }
-
-    public void setCalibrationDate(Date value) {
-        this.calibrationDate = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_calibration_history;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class GetSpaceCalibrationHistoryViewOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(执行开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("间开制度ID")
-    private String institutionId;
-
-    @XText("执行周期")
-    private String executionCycle;
-
-    @XText("校准日期")
-    private Date calibrationDate;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getInstitutionId() {
-        return this.institutionId;
-    }
-
-    public void setInstitutionId(String value) {
-        this.institutionId = value;
-    }
-
-    public String getExecutionCycle() {
-        return this.executionCycle;
-    }
-
-    public void setExecutionCycle(String value) {
-        this.executionCycle = value;
-    }
-
-    public Date getCalibrationDate() {
-        return this.calibrationDate;
-    }
-
-    public void setCalibrationDate(Date value) {
-        this.calibrationDate = value;
-    }
-
-}

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

 package pps.core.space.service.data.space_calibration_history;
 
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
 import xstartup.annotation.XText;
-import xstartup.base.data.XPageInput;
 
-import java.util.Date;
-
-public class QuerySpaceCalibrationHistoryInput extends XPageInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(执行开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
+/**
+ * 校准历史
+ *
+ * @author ZWT
+ * @date 2023/09/06
+ */
+@Data
+public class QuerySpaceCalibrationHistoryInput {
 
     @XText("间开制度ID")
+    @NotBlank(message = "缺少间开制度ID")
     private String institutionId;
 
-    @XText("执行周期")
-    private String executionCycle;
-
-    @XText("校准日期")
-    private Date calibrationDate;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getInstitutionId() {
-        return this.institutionId;
-    }
-
-    public void setInstitutionId(String value) {
-        this.institutionId = value;
-    }
-
-    public String getExecutionCycle() {
-        return this.executionCycle;
-    }
-
-    public void setExecutionCycle(String value) {
-        this.executionCycle = value;
-    }
-
-    public Date getCalibrationDate() {
-        return this.calibrationDate;
-    }
-
-    public void setCalibrationDate(Date value) {
-        this.calibrationDate = value;
-    }
-
+    @XText("线路ID")
+    @NotBlank(message = "缺少线路ID")
+    private String lineId;
 }

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

 package pps.core.space.service.data.space_calibration_history;
 
+import lombok.Data;
+import pps.core.space.service.data.space_institution_wellhead.QuerySpaceInstitutionWellheadOutput;
 import xstartup.annotation.XText;
-import xstartup.base.data.XPageInput;
 
-import java.util.Date;
+import java.util.List;
 
-public class QuerySpaceCalibrationHistoryOutput extends XPageInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(执行开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
+/**
+ * 校准历史
+ *
+ * @author ZWT
+ * @date 2023/09/06
+ */
+@Data
+public class QuerySpaceCalibrationHistoryOutput {
 
     @XText("线路ID")
     private String lineId;
@@ -36,106 +21,15 @@ public class QuerySpaceCalibrationHistoryOutput extends XPageInput {
     @XText("间开制度ID")
     private String institutionId;
 
-    @XText("执行周期")
-    private String executionCycle;
-
-    @XText("校准日期")
-    private Date calibrationDate;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getInstitutionId() {
-        return this.institutionId;
-    }
-
-    public void setInstitutionId(String value) {
-        this.institutionId = value;
-    }
-
-    public String getExecutionCycle() {
-        return this.executionCycle;
-    }
-
-    public void setExecutionCycle(String value) {
-        this.executionCycle = value;
-    }
-
-    public Date getCalibrationDate() {
-        return this.calibrationDate;
-    }
-
-    public void setCalibrationDate(Date value) {
-        this.calibrationDate = value;
-    }
-
+    /**
+     * 线路名称
+     */
+    @XText("线路名称")
+    private String lineName;
+
+    /**
+     * 间开制度井口配置
+     */
+    @XText("间开制度井口配置")
+    private List<QuerySpaceInstitutionWellheadOutput> wellheadList;
 }

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

 package pps.core.space.service.data.space_calibration_history;
 
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
 import xstartup.annotation.XText;
 import xstartup.base.data.XPageInput;
 
-import java.util.Date;
-
+/**
+ * 校准历史
+ *
+ * @author ZWT
+ * @date 2023/09/06
+ */
+@Data
 public class QuerySpaceCalibrationHistoryViewInput extends XPageInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(执行开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
 
     @XText("线路ID")
+    @NotBlank(message = "缺少线路ID")
     private String lineId;
-
-    @XText("间开制度ID")
-    private String institutionId;
-
-    @XText("执行周期")
-    private String executionCycle;
-
-    @XText("校准日期")
-    private Date calibrationDate;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getInstitutionId() {
-        return this.institutionId;
-    }
-
-    public void setInstitutionId(String value) {
-        this.institutionId = value;
-    }
-
-    public String getExecutionCycle() {
-        return this.executionCycle;
-    }
-
-    public void setExecutionCycle(String value) {
-        this.executionCycle = value;
-    }
-
-    public Date getCalibrationDate() {
-        return this.calibrationDate;
-    }
-
-    public void setCalibrationDate(Date value) {
-        this.calibrationDate = value;
-    }
-
-}
+}
\ No newline at end of file

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

 package pps.core.space.service.data.space_calibration_history;
 
+import lombok.Data;
 import xstartup.annotation.XText;
-import xstartup.base.data.XPageInput;
 
 import java.util.Date;
 
-public class QuerySpaceCalibrationHistoryViewOutput extends XPageInput {
+/**
+ * 执行历史
+ *
+ * @author ZWT
+ * @date 2023/09/06
+ */
+@Data
+public class QuerySpaceCalibrationHistoryViewOutput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(执行开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
     @XText("线路ID")
     private String lineId;
 
@@ -42,100 +28,39 @@ public class QuerySpaceCalibrationHistoryViewOutput extends XPageInput {
     @XText("校准日期")
     private Date calibrationDate;
 
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getInstitutionId() {
-        return this.institutionId;
-    }
-
-    public void setInstitutionId(String value) {
-        this.institutionId = value;
-    }
-
-    public String getExecutionCycle() {
-        return this.executionCycle;
-    }
-
-    public void setExecutionCycle(String value) {
-        this.executionCycle = value;
-    }
-
-    public Date getCalibrationDate() {
-        return this.calibrationDate;
-    }
-
-    public void setCalibrationDate(Date value) {
-        this.calibrationDate = value;
-    }
-
+    /**
+     * 组织机构ID
+     */
+    @XText("组织机构ID")
+    private String ouId;
+
+    /**
+     * 电网类型key(字典获取)
+     */
+    @XText("电网类型key(字典获取)")
+    private String gridTypeKey;
+
+    /**
+     * 制度名称
+     */
+    @XText("制度名称")
+    private String institutionName;
+
+    /**
+     * 线路名称
+     */
+    @XText("线路名称")
+    private String lineName;
+
+    /**
+     * 组织机构名称
+     */
+    @XText("组织机构名称")
+    private String ouName;
+
+    /**
+     * 电网类型名称
+     */
+    @XText("电网类型名称")
+    private String gridTypeName;
 }

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

-package pps.core.space.service.data.space_calibration_history;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class UpdateSpaceCalibrationHistoryInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(执行开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("间开制度ID")
-    private String institutionId;
-
-    @XText("执行周期")
-    private String executionCycle;
-
-    @XText("校准日期")
-    private Date calibrationDate;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getInstitutionId() {
-        return this.institutionId;
-    }
-
-    public void setInstitutionId(String value) {
-        this.institutionId = value;
-    }
-
-    public String getExecutionCycle() {
-        return this.executionCycle;
-    }
-
-    public void setExecutionCycle(String value) {
-        this.executionCycle = value;
-    }
-
-    public Date getCalibrationDate() {
-        return this.calibrationDate;
-    }
-
-    public void setCalibrationDate(Date value) {
-        this.calibrationDate = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_calibration_history;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class UpdateSpaceCalibrationHistoryOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(执行开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("间开制度ID")
-    private String institutionId;
-
-    @XText("执行周期")
-    private String executionCycle;
-
-    @XText("校准日期")
-    private Date calibrationDate;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getInstitutionId() {
-        return this.institutionId;
-    }
-
-    public void setInstitutionId(String value) {
-        this.institutionId = value;
-    }
-
-    public String getExecutionCycle() {
-        return this.executionCycle;
-    }
-
-    public void setExecutionCycle(String value) {
-        this.executionCycle = value;
-    }
-
-    public Date getCalibrationDate() {
-        return this.calibrationDate;
-    }
-
-    public void setCalibrationDate(Date value) {
-        this.calibrationDate = value;
-    }
-
-}

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

 package pps.core.space.service.data.space_calibration_period;
 
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
 import xstartup.annotation.XText;
 
-import java.util.Date;
-
+/**
+ * 定期校准
+ *
+ * @author ZWT
+ * @date 2023/09/06
+ */
+@Data
 public class CreateSpaceCalibrationPeriodInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(周期开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
 
-    @XText("修改时间")
-    private Date modifyTime;
+    @XText("组织机构ID")
+    @NotBlank(message = "缺少组织机构ID")
+    private String ouId;
 
     @XText("线路ID")
+    @NotBlank(message = "缺少线路ID")
     private String lineId;
 
     @XText("天数")
+    @NotBlank(message = "缺少天数")
     private String dayNumber;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getDayNumber() {
-        return this.dayNumber;
-    }
-
-    public void setDayNumber(String value) {
-        this.dayNumber = value;
-    }
-
 }

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

-package pps.core.space.service.data.space_calibration_period;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class CreateSpaceCalibrationPeriodOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(周期开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("天数")
-    private String dayNumber;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getDayNumber() {
-        return this.dayNumber;
-    }
-
-    public void setDayNumber(String value) {
-        this.dayNumber = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_calibration_period;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class DeleteSpaceCalibrationPeriodInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(周期开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("天数")
-    private String dayNumber;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getDayNumber() {
-        return this.dayNumber;
-    }
-
-    public void setDayNumber(String value) {
-        this.dayNumber = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_calibration_period;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class DeleteSpaceCalibrationPeriodOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(周期开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("天数")
-    private String dayNumber;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getDayNumber() {
-        return this.dayNumber;
-    }
-
-    public void setDayNumber(String value) {
-        this.dayNumber = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_calibration_period;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class DynamicQuerySpaceCalibrationPeriodInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(周期开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("天数")
-    private String dayNumber;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getDayNumber() {
-        return this.dayNumber;
-    }
-
-    public void setDayNumber(String value) {
-        this.dayNumber = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_calibration_period;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class DynamicQuerySpaceCalibrationPeriodOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(周期开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("天数")
-    private String dayNumber;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getDayNumber() {
-        return this.dayNumber;
-    }
-
-    public void setDayNumber(String value) {
-        this.dayNumber = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_calibration_period;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class DynamicQuerySpaceCalibrationPeriodViewOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(周期开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("天数")
-    private String dayNumber;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getDayNumber() {
-        return this.dayNumber;
-    }
-
-    public void setDayNumber(String value) {
-        this.dayNumber = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_calibration_period;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class GetSpaceCalibrationPeriodInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(周期开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("天数")
-    private String dayNumber;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getDayNumber() {
-        return this.dayNumber;
-    }
-
-    public void setDayNumber(String value) {
-        this.dayNumber = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_calibration_period;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class GetSpaceCalibrationPeriodOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(周期开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("天数")
-    private String dayNumber;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getDayNumber() {
-        return this.dayNumber;
-    }
-
-    public void setDayNumber(String value) {
-        this.dayNumber = value;
-    }
-
-}

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

 package pps.core.space.service.data.space_calibration_period;
 
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
 import xstartup.annotation.XText;
 
-import java.util.Date;
-
+/**
+ * 定期校准
+ *
+ * @author ZWT
+ * @date 2023/09/06
+ */
+@Data
 public class GetSpaceCalibrationPeriodViewInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
 
-    @XText("创建时间(周期开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
+    @XText("组织机构ID")
+    @NotBlank(message = "缺少组织机构ID")
+    private String ouId;
 
     @XText("线路ID")
+    @NotBlank(message = "缺少线路ID")
     private String lineId;
-
-    @XText("天数")
-    private String dayNumber;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getDayNumber() {
-        return this.dayNumber;
-    }
-
-    public void setDayNumber(String value) {
-        this.dayNumber = value;
-    }
-
 }

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

 package pps.core.space.service.data.space_calibration_period;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 
-import java.util.Date;
-
+/**
+ * 定期校准
+ *
+ * @author ZWT
+ * @date 2023/09/06
+ */
+@Data
 public class GetSpaceCalibrationPeriodViewOutput {
+
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(周期开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
+    @XText("组织机构ID")
+    private String ouId;
 
     @XText("线路ID")
     private String lineId;
@@ -35,84 +24,15 @@ public class GetSpaceCalibrationPeriodViewOutput {
     @XText("天数")
     private String dayNumber;
 
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getDayNumber() {
-        return this.dayNumber;
-    }
-
-    public void setDayNumber(String value) {
-        this.dayNumber = value;
-    }
-
+    /**
+     * 线路名称
+     */
+    @XText("线路名称")
+    private String lineName;
+
+    /**
+     * 组织机构名称
+     */
+    @XText("组织机构名称")
+    private String ouName;
 }

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

-package pps.core.space.service.data.space_calibration_period;
-
-import xstartup.annotation.XText;
-import xstartup.base.data.XPageInput;
-
-import java.util.Date;
-
-public class QuerySpaceCalibrationPeriodInput extends XPageInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(周期开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("天数")
-    private String dayNumber;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getDayNumber() {
-        return this.dayNumber;
-    }
-
-    public void setDayNumber(String value) {
-        this.dayNumber = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_calibration_period;
-
-import xstartup.annotation.XText;
-import xstartup.base.data.XPageInput;
-
-import java.util.Date;
-
-public class QuerySpaceCalibrationPeriodOutput extends XPageInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(周期开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("天数")
-    private String dayNumber;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getDayNumber() {
-        return this.dayNumber;
-    }
-
-    public void setDayNumber(String value) {
-        this.dayNumber = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_calibration_period;
-
-import xstartup.annotation.XText;
-import xstartup.base.data.XPageInput;
-
-import java.util.Date;
-
-public class QuerySpaceCalibrationPeriodViewInput extends XPageInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(周期开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("天数")
-    private String dayNumber;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getDayNumber() {
-        return this.dayNumber;
-    }
-
-    public void setDayNumber(String value) {
-        this.dayNumber = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_calibration_period;
-
-import xstartup.annotation.XText;
-import xstartup.base.data.XPageInput;
-
-import java.util.Date;
-
-public class QuerySpaceCalibrationPeriodViewOutput extends XPageInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(周期开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("天数")
-    private String dayNumber;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getDayNumber() {
-        return this.dayNumber;
-    }
-
-    public void setDayNumber(String value) {
-        this.dayNumber = value;
-    }
-
-}

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

 package pps.core.space.service.data.space_calibration_period;
 
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
 import xstartup.annotation.XText;
 
-import java.util.Date;
-
+/**
+ * 定期校准
+ *
+ * @author ZWT
+ * @date 2023/09/06
+ */
+@Data
 public class UpdateSpaceCalibrationPeriodInput {
+
     @XText("ID")
+    @NotBlank(message = "缺少周期ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(周期开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
+    @XText("组织机构ID")
+    @NotBlank(message = "缺少组织机构ID")
+    private String ouId;
 
     @XText("线路ID")
+    @NotBlank(message = "缺少线路ID")
     private String lineId;
 
     @XText("天数")
+    @NotBlank(message = "缺少天数")
     private String dayNumber;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getDayNumber() {
-        return this.dayNumber;
-    }
-
-    public void setDayNumber(String value) {
-        this.dayNumber = value;
-    }
-
 }

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

-package pps.core.space.service.data.space_calibration_period;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class UpdateSpaceCalibrationPeriodOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是;1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间(周期开始时间)")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("天数")
-    private String dayNumber;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getDayNumber() {
-        return this.dayNumber;
-    }
-
-    public void setDayNumber(String value) {
-        this.dayNumber = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_institution_detail;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class DynamicQuerySpaceInstitutionDetailInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是,1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("组织机构ID")
-    private String ouId;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("电网类型key(字典获取)")
-    private String gridTypeKey;
-
-    @XText("制度名称")
-    private String institutionName;
-
-    @XText("制度开始时间")
-    private Date institutionStartDate;
-
-    @XText("制度结束时间")
-    private Date institutionEndDate;
-
-    @XText("优化至")
-    private Date optimizeDeadline;
-
-    @XText("优化状态(0_已优化,1_未优化)")
-    private Integer optimizeState;
-
-    @XText("当前基础制度(0_是,1_否)")
-    private Integer isCurrentBasic;
-
-    @XText("启动间隔(分钟)")
-    private Integer startInterval;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getOuId() {
-        return this.ouId;
-    }
-
-    public void setOuId(String value) {
-        this.ouId = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getGridTypeKey() {
-        return this.gridTypeKey;
-    }
-
-    public void setGridTypeKey(String value) {
-        this.gridTypeKey = value;
-    }
-
-    public String getInstitutionName() {
-        return this.institutionName;
-    }
-
-    public void setInstitutionName(String value) {
-        this.institutionName = value;
-    }
-
-    public Date getInstitutionStartDate() {
-        return this.institutionStartDate;
-    }
-
-    public void setInstitutionStartDate(Date value) {
-        this.institutionStartDate = value;
-    }
-
-    public Date getInstitutionEndDate() {
-        return this.institutionEndDate;
-    }
-
-    public void setInstitutionEndDate(Date value) {
-        this.institutionEndDate = value;
-    }
-
-    public Date getOptimizeDeadline() {
-        return this.optimizeDeadline;
-    }
-
-    public void setOptimizeDeadline(Date value) {
-        this.optimizeDeadline = value;
-    }
-
-    public Integer getOptimizeState() {
-        return this.optimizeState;
-    }
-
-    public void setOptimizeState(Integer value) {
-        this.optimizeState = value;
-    }
-
-    public Integer getIsCurrentBasic() {
-        return this.isCurrentBasic;
-    }
-
-    public void setIsCurrentBasic(Integer value) {
-        this.isCurrentBasic = value;
-    }
-
-    public Integer getStartInterval() {
-        return this.startInterval;
-    }
-
-    public void setStartInterval(Integer value) {
-        this.startInterval = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_institution_detail;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class DynamicQuerySpaceInstitutionDetailOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是,1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("组织机构ID")
-    private String ouId;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("电网类型key(字典获取)")
-    private String gridTypeKey;
-
-    @XText("制度名称")
-    private String institutionName;
-
-    @XText("制度开始时间")
-    private Date institutionStartDate;
-
-    @XText("制度结束时间")
-    private Date institutionEndDate;
-
-    @XText("优化至")
-    private Date optimizeDeadline;
-
-    @XText("优化状态(0_已优化,1_未优化)")
-    private Integer optimizeState;
-
-    @XText("当前基础制度(0_是,1_否)")
-    private Integer isCurrentBasic;
-
-    @XText("启动间隔(分钟)")
-    private Integer startInterval;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getOuId() {
-        return this.ouId;
-    }
-
-    public void setOuId(String value) {
-        this.ouId = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getGridTypeKey() {
-        return this.gridTypeKey;
-    }
-
-    public void setGridTypeKey(String value) {
-        this.gridTypeKey = value;
-    }
-
-    public String getInstitutionName() {
-        return this.institutionName;
-    }
-
-    public void setInstitutionName(String value) {
-        this.institutionName = value;
-    }
-
-    public Date getInstitutionStartDate() {
-        return this.institutionStartDate;
-    }
-
-    public void setInstitutionStartDate(Date value) {
-        this.institutionStartDate = value;
-    }
-
-    public Date getInstitutionEndDate() {
-        return this.institutionEndDate;
-    }
-
-    public void setInstitutionEndDate(Date value) {
-        this.institutionEndDate = value;
-    }
-
-    public Date getOptimizeDeadline() {
-        return this.optimizeDeadline;
-    }
-
-    public void setOptimizeDeadline(Date value) {
-        this.optimizeDeadline = value;
-    }
-
-    public Integer getOptimizeState() {
-        return this.optimizeState;
-    }
-
-    public void setOptimizeState(Integer value) {
-        this.optimizeState = value;
-    }
-
-    public Integer getIsCurrentBasic() {
-        return this.isCurrentBasic;
-    }
-
-    public void setIsCurrentBasic(Integer value) {
-        this.isCurrentBasic = value;
-    }
-
-    public Integer getStartInterval() {
-        return this.startInterval;
-    }
-
-    public void setStartInterval(Integer value) {
-        this.startInterval = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_institution_detail;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class DynamicQuerySpaceInstitutionDetailViewOutput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是,1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("组织机构ID")
-    private String ouId;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("电网类型key(字典获取)")
-    private String gridTypeKey;
-
-    @XText("制度名称")
-    private String institutionName;
-
-    @XText("制度开始时间")
-    private Date institutionStartDate;
-
-    @XText("制度结束时间")
-    private Date institutionEndDate;
-
-    @XText("优化至")
-    private Date optimizeDeadline;
-
-    @XText("优化状态(0_已优化,1_未优化)")
-    private Integer optimizeState;
-
-    @XText("当前基础制度(0_是,1_否)")
-    private Integer isCurrentBasic;
-
-    @XText("启动间隔(分钟)")
-    private Integer startInterval;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getOuId() {
-        return this.ouId;
-    }
-
-    public void setOuId(String value) {
-        this.ouId = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getGridTypeKey() {
-        return this.gridTypeKey;
-    }
-
-    public void setGridTypeKey(String value) {
-        this.gridTypeKey = value;
-    }
-
-    public String getInstitutionName() {
-        return this.institutionName;
-    }
-
-    public void setInstitutionName(String value) {
-        this.institutionName = value;
-    }
-
-    public Date getInstitutionStartDate() {
-        return this.institutionStartDate;
-    }
-
-    public void setInstitutionStartDate(Date value) {
-        this.institutionStartDate = value;
-    }
-
-    public Date getInstitutionEndDate() {
-        return this.institutionEndDate;
-    }
-
-    public void setInstitutionEndDate(Date value) {
-        this.institutionEndDate = value;
-    }
-
-    public Date getOptimizeDeadline() {
-        return this.optimizeDeadline;
-    }
-
-    public void setOptimizeDeadline(Date value) {
-        this.optimizeDeadline = value;
-    }
-
-    public Integer getOptimizeState() {
-        return this.optimizeState;
-    }
-
-    public void setOptimizeState(Integer value) {
-        this.optimizeState = value;
-    }
-
-    public Integer getIsCurrentBasic() {
-        return this.isCurrentBasic;
-    }
-
-    public void setIsCurrentBasic(Integer value) {
-        this.isCurrentBasic = value;
-    }
-
-    public Integer getStartInterval() {
-        return this.startInterval;
-    }
-
-    public void setStartInterval(Integer value) {
-        this.startInterval = value;
-    }
-
-}

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

@@ -62,5 +62,5 @@ public class GetSpaceInstitutionDetailViewOutput {
      * 间开制度井口配置
      */
     @XText("间开制度井口配置")
-    List<GetSpaceInstitutionWellheadViewOutput> wellheadList;
+    private List<GetSpaceInstitutionWellheadViewOutput> wellheadList;
 }

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

-package pps.core.space.service.data.space_institution_detail;
-
-import xstartup.annotation.XText;
-import xstartup.base.data.XPageInput;
-
-import java.util.Date;
-
-public class QuerySpaceInstitutionDetailInput extends XPageInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是,1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("组织机构ID")
-    private String ouId;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("电网类型key(字典获取)")
-    private String gridTypeKey;
-
-    @XText("制度名称")
-    private String institutionName;
-
-    @XText("制度开始时间")
-    private Date institutionStartDate;
-
-    @XText("制度结束时间")
-    private Date institutionEndDate;
-
-    @XText("优化至")
-    private Date optimizeDeadline;
-
-    @XText("优化状态(0_已优化,1_未优化)")
-    private Integer optimizeState;
-
-    @XText("当前基础制度(0_是,1_否)")
-    private Integer isCurrentBasic;
-
-    @XText("启动间隔(分钟)")
-    private Integer startInterval;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getOuId() {
-        return this.ouId;
-    }
-
-    public void setOuId(String value) {
-        this.ouId = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getGridTypeKey() {
-        return this.gridTypeKey;
-    }
-
-    public void setGridTypeKey(String value) {
-        this.gridTypeKey = value;
-    }
-
-    public String getInstitutionName() {
-        return this.institutionName;
-    }
-
-    public void setInstitutionName(String value) {
-        this.institutionName = value;
-    }
-
-    public Date getInstitutionStartDate() {
-        return this.institutionStartDate;
-    }
-
-    public void setInstitutionStartDate(Date value) {
-        this.institutionStartDate = value;
-    }
-
-    public Date getInstitutionEndDate() {
-        return this.institutionEndDate;
-    }
-
-    public void setInstitutionEndDate(Date value) {
-        this.institutionEndDate = value;
-    }
-
-    public Date getOptimizeDeadline() {
-        return this.optimizeDeadline;
-    }
-
-    public void setOptimizeDeadline(Date value) {
-        this.optimizeDeadline = value;
-    }
-
-    public Integer getOptimizeState() {
-        return this.optimizeState;
-    }
-
-    public void setOptimizeState(Integer value) {
-        this.optimizeState = value;
-    }
-
-    public Integer getIsCurrentBasic() {
-        return this.isCurrentBasic;
-    }
-
-    public void setIsCurrentBasic(Integer value) {
-        this.isCurrentBasic = value;
-    }
-
-    public Integer getStartInterval() {
-        return this.startInterval;
-    }
-
-    public void setStartInterval(Integer value) {
-        this.startInterval = value;
-    }
-
-}

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

-package pps.core.space.service.data.space_institution_detail;
-
-import xstartup.annotation.XText;
-import xstartup.base.data.XPageInput;
-
-import java.util.Date;
-
-public class QuerySpaceInstitutionDetailOutput extends XPageInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是,1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
-    @XText("组织机构ID")
-    private String ouId;
-
-    @XText("线路ID")
-    private String lineId;
-
-    @XText("电网类型key(字典获取)")
-    private String gridTypeKey;
-
-    @XText("制度名称")
-    private String institutionName;
-
-    @XText("制度开始时间")
-    private Date institutionStartDate;
-
-    @XText("制度结束时间")
-    private Date institutionEndDate;
-
-    @XText("优化至")
-    private Date optimizeDeadline;
-
-    @XText("优化状态(0_已优化,1_未优化)")
-    private Integer optimizeState;
-
-    @XText("当前基础制度(0_是,1_否)")
-    private Integer isCurrentBasic;
-
-    @XText("启动间隔(分钟)")
-    private Integer startInterval;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getOuId() {
-        return this.ouId;
-    }
-
-    public void setOuId(String value) {
-        this.ouId = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getGridTypeKey() {
-        return this.gridTypeKey;
-    }
-
-    public void setGridTypeKey(String value) {
-        this.gridTypeKey = value;
-    }
-
-    public String getInstitutionName() {
-        return this.institutionName;
-    }
-
-    public void setInstitutionName(String value) {
-        this.institutionName = value;
-    }
-
-    public Date getInstitutionStartDate() {
-        return this.institutionStartDate;
-    }
-
-    public void setInstitutionStartDate(Date value) {
-        this.institutionStartDate = value;
-    }
-
-    public Date getInstitutionEndDate() {
-        return this.institutionEndDate;
-    }
-
-    public void setInstitutionEndDate(Date value) {
-        this.institutionEndDate = value;
-    }
-
-    public Date getOptimizeDeadline() {
-        return this.optimizeDeadline;
-    }
-
-    public void setOptimizeDeadline(Date value) {
-        this.optimizeDeadline = value;
-    }
-
-    public Integer getOptimizeState() {
-        return this.optimizeState;
-    }
-
-    public void setOptimizeState(Integer value) {
-        this.optimizeState = value;
-    }
-
-    public Integer getIsCurrentBasic() {
-        return this.isCurrentBasic;
-    }
-
-    public void setIsCurrentBasic(Integer value) {
-        this.isCurrentBasic = value;
-    }
-
-    public Integer getStartInterval() {
-        return this.startInterval;
-    }
-
-    public void setStartInterval(Integer value) {
-        this.startInterval = value;
-    }
-
-}

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

 package pps.core.space.service.data.space_institution_detail;
 
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
 import xstartup.annotation.XText;
 import xstartup.base.data.XPageInput;
 
-import java.util.Date;
-
+/**
+ * 基础间开配置
+ *
+ * @author ZWT
+ * @date 2023/09/05
+ */
+@Data
 public class QuerySpaceInstitutionDetailViewInput extends XPageInput {
-    @XText("ID")
-    private String id;
-
-    @XText("是否删除(0_是,1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
 
     @XText("组织机构ID")
+    @NotBlank(message = "缺少组织机构ID")
     private String ouId;
 
     @XText("线路ID")
     private String lineId;
 
-    @XText("电网类型key(字典获取)")
-    private String gridTypeKey;
-
     @XText("制度名称")
     private String institutionName;
-
-    @XText("制度开始时间")
-    private Date institutionStartDate;
-
-    @XText("制度结束时间")
-    private Date institutionEndDate;
-
-    @XText("优化至")
-    private Date optimizeDeadline;
-
-    @XText("优化状态(0_已优化,1_未优化)")
-    private Integer optimizeState;
-
-    @XText("当前基础制度(0_是,1_否)")
-    private Integer isCurrentBasic;
-
-    @XText("启动间隔(分钟)")
-    private Integer startInterval;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getOuId() {
-        return this.ouId;
-    }
-
-    public void setOuId(String value) {
-        this.ouId = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getGridTypeKey() {
-        return this.gridTypeKey;
-    }
-
-    public void setGridTypeKey(String value) {
-        this.gridTypeKey = value;
-    }
-
-    public String getInstitutionName() {
-        return this.institutionName;
-    }
-
-    public void setInstitutionName(String value) {
-        this.institutionName = value;
-    }
-
-    public Date getInstitutionStartDate() {
-        return this.institutionStartDate;
-    }
-
-    public void setInstitutionStartDate(Date value) {
-        this.institutionStartDate = value;
-    }
-
-    public Date getInstitutionEndDate() {
-        return this.institutionEndDate;
-    }
-
-    public void setInstitutionEndDate(Date value) {
-        this.institutionEndDate = value;
-    }
-
-    public Date getOptimizeDeadline() {
-        return this.optimizeDeadline;
-    }
-
-    public void setOptimizeDeadline(Date value) {
-        this.optimizeDeadline = value;
-    }
-
-    public Integer getOptimizeState() {
-        return this.optimizeState;
-    }
-
-    public void setOptimizeState(Integer value) {
-        this.optimizeState = value;
-    }
-
-    public Integer getIsCurrentBasic() {
-        return this.isCurrentBasic;
-    }
-
-    public void setIsCurrentBasic(Integer value) {
-        this.isCurrentBasic = value;
-    }
-
-    public Integer getStartInterval() {
-        return this.startInterval;
-    }
-
-    public void setStartInterval(Integer value) {
-        this.startInterval = value;
-    }
-
 }

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

 package pps.core.space.service.data.space_institution_detail;
 
+import lombok.Data;
 import xstartup.annotation.XText;
-import xstartup.base.data.XPageInput;
 
-import java.util.Date;
+/**
+ * 基础间开配置
+ *
+ * @author ZWT
+ * @date 2023/09/05
+ */
+@Data
+public class QuerySpaceInstitutionDetailViewOutput {
 
-public class QuerySpaceInstitutionDetailViewOutput extends XPageInput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是,1_否)")
-    private Integer isDeleted;
-
-    @XText("创建人ID")
-    private String createById;
-
-    @XText("创建人名称")
-    private String createByName;
-
-    @XText("创建时间")
-    private Date createTime;
-
-    @XText("修改人ID")
-    private String modifyById;
-
-    @XText("修改人名称")
-    private String modifyByName;
-
-    @XText("修改时间")
-    private Date modifyTime;
-
     @XText("组织机构ID")
     private String ouId;
 
@@ -42,166 +27,30 @@ public class QuerySpaceInstitutionDetailViewOutput extends XPageInput {
     @XText("制度名称")
     private String institutionName;
 
-    @XText("制度开始时间")
-    private Date institutionStartDate;
-
-    @XText("制度结束时间")
-    private Date institutionEndDate;
-
-    @XText("优化至")
-    private Date optimizeDeadline;
-
-    @XText("优化状态(0_已优化,1_未优化)")
-    private Integer optimizeState;
-
     @XText("当前基础制度(0_是,1_否)")
     private Integer isCurrentBasic;
 
-    @XText("启动间隔(分钟)")
-    private Integer startInterval;
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public Integer getIsDeleted() {
-        return this.isDeleted;
-    }
-
-    public void setIsDeleted(Integer value) {
-        this.isDeleted = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public String getOuId() {
-        return this.ouId;
-    }
-
-    public void setOuId(String value) {
-        this.ouId = value;
-    }
-
-    public String getLineId() {
-        return this.lineId;
-    }
-
-    public void setLineId(String value) {
-        this.lineId = value;
-    }
-
-    public String getGridTypeKey() {
-        return this.gridTypeKey;
-    }
-
-    public void setGridTypeKey(String value) {
-        this.gridTypeKey = value;
-    }
-
-    public String getInstitutionName() {
-        return this.institutionName;
-    }
-
-    public void setInstitutionName(String value) {
-        this.institutionName = value;
-    }
-
-    public Date getInstitutionStartDate() {
-        return this.institutionStartDate;
-    }
-
-    public void setInstitutionStartDate(Date value) {
-        this.institutionStartDate = value;
-    }
-
-    public Date getInstitutionEndDate() {
-        return this.institutionEndDate;
-    }
-
-    public void setInstitutionEndDate(Date value) {
-        this.institutionEndDate = value;
-    }
-
-    public Date getOptimizeDeadline() {
-        return this.optimizeDeadline;
-    }
-
-    public void setOptimizeDeadline(Date value) {
-        this.optimizeDeadline = value;
-    }
-
-    public Integer getOptimizeState() {
-        return this.optimizeState;
-    }
-
-    public void setOptimizeState(Integer value) {
-        this.optimizeState = value;
-    }
-
-    public Integer getIsCurrentBasic() {
-        return this.isCurrentBasic;
-    }
-
-    public void setIsCurrentBasic(Integer value) {
-        this.isCurrentBasic = value;
-    }
-
-    public Integer getStartInterval() {
-        return this.startInterval;
-    }
-
-    public void setStartInterval(Integer value) {
-        this.startInterval = value;
-    }
-
+    /**
+     * 线路名称
+     */
+    @XText("线路名称")
+    private String lineName;
+
+    /**
+     * 组织机构名称
+     */
+    @XText("组织机构名称")
+    private String ouName;
+
+    /**
+     * 电网类型名称
+     */
+    @XText("电网类型名称")
+    private String gridTypeName;
+
+    /**
+     * 当前基础制度值
+     */
+    @XText("当前基础制度值")
+    private String isCurrentBasicValue;
 }

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;
 
@@ -14,7 +13,6 @@ import xstartup.annotation.XText;
 public class GetSpaceInstitutionDurationViewOutput {
 
     @XText("井口ID")
-    @TableField
     private String wellheadId;
 
     @XText("开井时间")

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

+package pps.core.space.service.data.space_institution_wellhead;
+
+import lombok.Data;
+import xstartup.annotation.XText;
+
+/**
+ * 间开制度井口配置
+ *
+ * @author ZWT
+ * @date 2023/09/06
+ */
+@Data
+public class QuerySpaceInstitutionWellheadOutput {
+
+    @XText("井口ID")
+    private String wellheadId;
+
+    @XText("井号")
+    private String wellNumber;
+
+    @XText("运行类型key(字典获取)")
+    private String runTypeKey;
+
+    @XText("间开类型key(字典获取)")
+    private String intervalTypeKey;
+
+    @XText("启动顺序")
+    private Integer startSeq;
+}

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.IBasePowerLineCloudService;
+import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInput;
+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.system.service.SysOrganizationCloudService;
@@ -96,7 +98,7 @@ public class ServiceUtil {
     }
 
     /**
-     * 通过组织机构ID集合获取详情列表
+     * 通过组织机构ID集合获取组织名称
      *
      * @param context 上下文
      * @param ouIds   ou id
@@ -115,18 +117,39 @@ public class ServiceUtil {
     }
 
     /**
-     * 通过ID查询线路基本信息
+     * 通过ID查询线路名称
      *
      * @param context 上下文
      * @param lineId  线路id
-     * @return {@link GetBasePowerLineViewOutput}
+     * @return {@link String}
      */
-    public static GetBasePowerLineViewOutput getBasePowerLineById(XContext context, String lineId) {
-        BasePowerLineCloudService lineService = context.getBean(BasePowerLineCloudService.class);
+    public static String getPowerLineNameById(XContext context, String lineId) {
+        IBasePowerLineCloudService lineService = context.getBean(IBasePowerLineCloudService.class);
         XSingleResult<GetBasePowerLineViewOutput> result = lineService.getBasePowerLineById(context, GetBasePowerLineInput.builder()
                 .id(lineId)
                 .build());
         result.throwIfFail();
-        return result.getResult();
+        return Optional.ofNullable(result.getResult())
+                .map(GetBasePowerLineViewOutput::getLineName)
+                .orElse(null);
+    }
+
+    /**
+     * 通过线路ID集合获取线路名称Map
+     *
+     * @param context 上下文
+     * @param lineIds 线路ID
+     * @return {@link Map}<{@link String}, {@link String}>
+     */
+    public static Map<String, String> getPowerLineNameMap(XContext context, List<String> lineIds) {
+        IBasePowerLineCloudService lineService = context.getBean(IBasePowerLineCloudService.class);
+        XListResult<DynamicQueryBasePowerLineOutput> result = lineService.getBasePowerLineList(context, DynamicQueryBasePowerLineInput.builder()
+                .lineIds(lineIds)
+                .build());
+        result.throwIfFail();
+        return result.getResult().stream()
+                .collect(
+                        Collectors.toMap(DynamicQueryBasePowerLineOutput::getId, DynamicQueryBasePowerLineOutput::getLineName)
+                );
     }
 }
\ No newline at end of file

C11-space/pps-core-space/src/main/resources/mybatis/mapper/pps/core/space/SpaceCalibrationHistoryViewMapper.xml

@@ -30,6 +30,7 @@
     execution_cycle,
     calibration_date
     </sql>
+
     <select id="selectOne" parameterType="pps.core.space.entity.SpaceCalibrationHistoryView" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
@@ -37,11 +38,29 @@
         where
         id=#{id}
     </select>
+
+    <resultMap id="ExtendResultMap" type="pps.core.space.entity.SpaceCalibrationHistoryView" extends="BaseResultMap">
+        <result column="ou_id" property="ouId" jdbcType="VARCHAR"/>
+        <result column="grid_type_key" property="gridTypeKey" jdbcType="VARCHAR"/>
+        <result column="institution_name" property="institutionName" jdbcType="VARCHAR"/>
+    </resultMap>
+
     <select id="selectList" parameterType="pps.core.space.entity.SpaceCalibrationHistoryView" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from space_calibration_history
-        where
-        id=#{id}
+        SELECT h.id,
+               h.line_id,
+               h.institution_id,
+               h.execution_cycle,
+               h.calibration_date,
+               d.ou_id,
+               d.grid_type_key,
+               d.institution_name
+        FROM space_institution_detail d
+                 JOIN space_calibration_history h ON d.id = h.institution_id
+        WHERE d.is_current_basic = 0
+          AND d.is_deleted = 1
+          AND h.is_deleted = 1
+          AND d.line_id = #{lineId}
+          AND h.line_id = #{lineId}
+        ORDER BY h.calibration_date DESC
     </select>
 </mapper>
\ No newline at end of file

C11-space/pps-core-space/src/main/resources/mybatis/mapper/pps/core/space/SpaceCalibrationPeriodViewMapper.xml

@@ -10,6 +10,7 @@
         <result column="modify_by_id" property="modifyById" jdbcType="VARCHAR"/>
         <result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR"/>
         <result column="modify_time" property="modifyTime" jdbcType="DATE"/>
+        <result column="ou_id" property="ouId" jdbcType="VARCHAR"/>
         <result column="line_id" property="lineId" jdbcType="VARCHAR"/>
         <result column="day_number" property="dayNumber" jdbcType="VARCHAR"/>
     </resultMap>
@@ -23,6 +24,7 @@
     modify_by_id,
     modify_by_name,
     modify_time,
+    ou_id,
     line_id,
     day_number
     </sql>

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/PredictionService.java

 package pps.core.prediction.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import pps.cloud.base.service.data.GetBasePowerLineInput;
+import pps.cloud.base.service.data.GetBasePowerLineViewOutput;
 import pps.core.prediction.entity.BaseDataEnt;
 import pps.core.prediction.entity.BaseDataView;
 import pps.core.prediction.mapper.BaseDataMapper;