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

1.新建数据库表:
	基础间开:
		space_institution_institution
间开制度详情
		space_institution_wellhead
间开制度井口配置
		space_institution_duration
间开制度小间开时段配置

	定期校准:
		space_calibration_period
周期设定
		space_calibration_history
执行历史

	长期:
		space_optimize_long_period	长期间开优化周期记录
		space_optimize_long_wellhead
长期间开优化井口记录
		space_optimize_long_duration
长期间开优化井口制度记录

	中短期:
		space_optimize_mid_period
中短期间开优化周期记录
		space_optimize_mid_wellhead
中短期间开优化井口记录
		space_optimize_mid_duration
中短期间开优化井口制度记录

	短期:
		space_optimize_short_period
短期间开优化周期记录
		space_optimize_short_wellhead
短期间开优化井口记录
		space_optimize_short_duration 短期间开优化井口制度记录
2.生成代码

BREAKING CHANGE: 无

Closes 无

[skip ci]

C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceInstitutionInstitutionEnt.java → C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceInstitutionDetailEnt.java

@@ -16,8 +16,8 @@ import java.util.Date;
  * @date 2023/09/05
  */
 @Data
-@TableName("space_institution_institution")
-public class SpaceInstitutionInstitutionEnt extends BaseModel implements Serializable {
+@TableName("space_institution_detail")
+public class SpaceInstitutionDetailEnt extends BaseModel implements Serializable {
 
     @XText("组织机构ID")
     @TableField

C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceInstitutionInstitutionView.java → C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceInstitutionDetailView.java

@@ -14,7 +14,7 @@ import java.util.Date;
  * @date 2023/09/05
  */
 @Data
-public class SpaceInstitutionInstitutionView implements Serializable {
+public class SpaceInstitutionDetailView implements Serializable {
     @XText("ID")
     @TableField
     private String id;

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

 package pps.core.space.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
@@ -16,6 +17,7 @@ import java.util.List;
  * @date 2023/09/05
  */
 @Data
+@TableName("space_institution_wellhead")
 public class SpaceInstitutionWellheadView extends BaseModel implements Serializable {
 
     @XText("间开制度ID")

C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceInstitutionInstitutionMapper.java → C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceInstitutionDetailMapper.java

@@ -2,7 +2,7 @@ package pps.core.space.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
-import pps.core.space.entity.SpaceInstitutionInstitutionEnt;
+import pps.core.space.entity.SpaceInstitutionDetailEnt;
 
 /**
  * 基础间开配置
@@ -10,6 +10,6 @@ import pps.core.space.entity.SpaceInstitutionInstitutionEnt;
  * @author ZWT
  * @date 2023/09/05
  */
-@Repository(value = "pps.core.space.mapper.SpaceInstitutionInstitutionMapper")
-public interface SpaceInstitutionInstitutionMapper extends BaseMapper<SpaceInstitutionInstitutionEnt> {
+@Repository(value = "pps.core.space.mapper.SpaceInstitutionDetailMapper")
+public interface SpaceInstitutionDetailMapper extends BaseMapper<SpaceInstitutionDetailEnt> {
 }

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

+package pps.core.space.mapper;
+
+import org.springframework.stereotype.Repository;
+import pps.core.space.entity.SpaceInstitutionDetailView;
+
+import java.util.List;
+
+@Repository(value = "pps.core.space.mapper.SpaceInstitutionDetailViewMapper")
+public interface SpaceInstitutionDetailViewMapper {
+    SpaceInstitutionDetailView selectOne(SpaceInstitutionDetailView record);
+
+    List<SpaceInstitutionDetailView> selectList(SpaceInstitutionDetailView record);
+}

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

-package pps.core.space.mapper;
-
-import org.springframework.stereotype.Repository;
-import pps.core.space.entity.SpaceInstitutionInstitutionView;
-
-import java.util.List;
-
-@Repository(value = "pps.core.space.mapper.SpaceInstitutionInstitutionViewMapper")
-public interface SpaceInstitutionInstitutionViewMapper {
-    SpaceInstitutionInstitutionView selectOne(SpaceInstitutionInstitutionView record);
-
-    List<SpaceInstitutionInstitutionView> selectList(SpaceInstitutionInstitutionView record);
-}

C11-space/pps-core-space/src/main/java/pps/core/space/mybatis/PpsCoreSpaceMybatis.java

+package pps.core.space.mybatis;
+
+import com.baomidou.mybatisplus.core.config.GlobalConfig;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import pps.core.common.mybatis.MybaitisGlobalConfigSuppiler;
+import xstartup.service.mybatis.XMybatis;
+
+
+/**
+ * mybatis配置
+ *
+ * @author ZWT
+ * @date 2023/09/05
+ */
+@Component
+@EnableTransactionManagement
+@MapperScan(sqlSessionTemplateRef = "sqlSessionTemplateRef.pps.core.space",
+        sqlSessionFactoryRef = "sqlSessionFactoryRef.pps.core.space",
+        basePackages = {"pps.core.space.mapper"})
+public class PpsCoreSpaceMybatis extends XMybatis {
+
+    @Override
+    public GlobalConfig getGlobalConfig() {
+        return MybaitisGlobalConfigSuppiler.INSTANCE.get();
+    }
+}

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

@@ -6,15 +6,15 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import pps.core.common.session.PpsUserSession;
 import pps.core.common.utils.BaseUtils;
+import pps.core.space.entity.SpaceInstitutionDetailEnt;
+import pps.core.space.entity.SpaceInstitutionDetailView;
 import pps.core.space.entity.SpaceInstitutionDurationEnt;
-import pps.core.space.entity.SpaceInstitutionInstitutionEnt;
-import pps.core.space.entity.SpaceInstitutionInstitutionView;
 import pps.core.space.entity.SpaceInstitutionWellheadView;
+import pps.core.space.mapper.SpaceInstitutionDetailMapper;
+import pps.core.space.mapper.SpaceInstitutionDetailViewMapper;
 import pps.core.space.mapper.SpaceInstitutionDurationMapper;
-import pps.core.space.mapper.SpaceInstitutionInstitutionMapper;
-import pps.core.space.mapper.SpaceInstitutionInstitutionViewMapper;
 import pps.core.space.mapper.SpaceInstitutionWellheadViewMapper;
-import pps.core.space.service.data.space_institution_institution.*;
+import pps.core.space.service.data.space_institution_detail.*;
 import pps.core.space.service.data.space_institution_wellhead.CreateSpaceInstitutionWellheadInput;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
@@ -41,7 +41,7 @@ import java.util.List;
  */
 @XService
 @XText("基础间开配置模块")
-public class SpaceInstitutionInstitutionService {
+public class SpaceInstitutionDetailService {
 
     /**
      * 基础间开配置--新增
@@ -53,15 +53,15 @@ public class SpaceInstitutionInstitutionService {
     @XApiAnonymous
     @XApiPost
     @XText("基础间开配置--新增")
-    public XServiceResult createSpaceInstitutionInstitution(XContext context, CreateSpaceInstitutionInstitutionInput input) {
+    public XServiceResult createSpaceInstitutionInstitution(XContext context, CreateSpaceInstitutionDetailInput input) {
         PpsUserSession session = new PpsUserSession();
         session.setId("123");
         session.setUserName("ceshi");
 //        PpsUserSession session = context.getSession(PpsUserSession.class);
         return XTransactionHelper.begin(context, () -> {
             //新增间开配置
-            SpaceInstitutionInstitutionMapper mapper = context.getBean(SpaceInstitutionInstitutionMapper.class);
-            SpaceInstitutionInstitutionEnt entity = XCopyUtils.copyNewObject(input, SpaceInstitutionInstitutionEnt.class);
+            SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
+            SpaceInstitutionDetailEnt entity = XCopyUtils.copyNewObject(input, SpaceInstitutionDetailEnt.class);
             BaseUtils.setBaseModelDefault(entity, session);
             mapper.insert(entity);
             String institutionId = entity.getId();
@@ -94,11 +94,11 @@ public class SpaceInstitutionInstitutionService {
 
     @XApiAnonymous
     @XApiPost
-    public XServiceResult updateSpaceInstitutionInstitution(XContext context, UpdateSpaceInstitutionInstitutionInput input) {
-        SpaceInstitutionInstitutionMapper mapper = context.getBean(SpaceInstitutionInstitutionMapper.class);
-        QueryWrapper<SpaceInstitutionInstitutionEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SpaceInstitutionInstitutionEnt::getId, input.getId());
-        SpaceInstitutionInstitutionEnt entity = mapper.selectOne(queryWrapper);
+    public XServiceResult updateSpaceInstitutionInstitution(XContext context, UpdateSpaceInstitutionDetailInput input) {
+        SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
+        QueryWrapper<SpaceInstitutionDetailEnt> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(SpaceInstitutionDetailEnt::getId, input.getId());
+        SpaceInstitutionDetailEnt entity = mapper.selectOne(queryWrapper);
         if (entity == null) {
             return XServiceResult.error(context, XError.NotFound);
         }
@@ -109,11 +109,11 @@ public class SpaceInstitutionInstitutionService {
 
     @XApiAnonymous
     @XApiPost
-    public XServiceResult deleteSpaceInstitutionInstitution(XContext context, DeleteSpaceInstitutionInstitutionInput input) {
-        SpaceInstitutionInstitutionMapper mapper = context.getBean(SpaceInstitutionInstitutionMapper.class);
-        QueryWrapper<SpaceInstitutionInstitutionEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SpaceInstitutionInstitutionEnt::getId, input.getId());
-        SpaceInstitutionInstitutionEnt entity = mapper.selectOne(queryWrapper);
+    public XServiceResult deleteSpaceInstitutionInstitution(XContext context, DeleteSpaceInstitutionDetailInput input) {
+        SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
+        QueryWrapper<SpaceInstitutionDetailEnt> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(SpaceInstitutionDetailEnt::getId, input.getId());
+        SpaceInstitutionDetailEnt entity = mapper.selectOne(queryWrapper);
         if (entity == null) {
             return XServiceResult.error(context, XError.NotFound);
         }
@@ -123,77 +123,77 @@ public class SpaceInstitutionInstitutionService {
 
     @XApiAnonymous
     @XApiGet
-    public XSingleResult<GetSpaceInstitutionInstitutionOutput> getSpaceInstitutionInstitution(XContext context, GetSpaceInstitutionInstitutionInput input) {
-        SpaceInstitutionInstitutionMapper mapper = context.getBean(SpaceInstitutionInstitutionMapper.class);
-        QueryWrapper<SpaceInstitutionInstitutionEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SpaceInstitutionInstitutionEnt::getId, input.getId());
-        SpaceInstitutionInstitutionEnt entity = mapper.selectOne(queryWrapper);
+    public XSingleResult<GetSpaceInstitutionDetailOutput> getSpaceInstitutionInstitution(XContext context, GetSpaceInstitutionDetailInput input) {
+        SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
+        QueryWrapper<SpaceInstitutionDetailEnt> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(SpaceInstitutionDetailEnt::getId, input.getId());
+        SpaceInstitutionDetailEnt entity = mapper.selectOne(queryWrapper);
         if (entity == null) {
             return XSingleResult.error(context, XError.NotFound);
         }
-        GetSpaceInstitutionInstitutionOutput output = new GetSpaceInstitutionInstitutionOutput();
+        GetSpaceInstitutionDetailOutput output = new GetSpaceInstitutionDetailOutput();
         XCopyUtils.copyObject(entity, output);
         return XSingleResult.success(output);
     }
 
     @XApiAnonymous
     @XApiGet
-    public XPageResult<QuerySpaceInstitutionInstitutionOutput> querySpaceInstitutionInstitution(XContext context, QuerySpaceInstitutionInstitutionInput input) {
-        SpaceInstitutionInstitutionMapper mapper = context.getBean(SpaceInstitutionInstitutionMapper.class);
-        QueryWrapper<SpaceInstitutionInstitutionEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().like(SpaceInstitutionInstitutionEnt::getId, input.getId())
-                .eq(SpaceInstitutionInstitutionEnt::getIsDeleted, input.getIsDeleted())
-                .like(SpaceInstitutionInstitutionEnt::getCreateById, input.getCreateById())
-                .like(SpaceInstitutionInstitutionEnt::getCreateByName, input.getCreateByName())
-                .eq(SpaceInstitutionInstitutionEnt::getCreateTime, input.getCreateTime())
-                .like(SpaceInstitutionInstitutionEnt::getModifyById, input.getModifyById())
-                .like(SpaceInstitutionInstitutionEnt::getModifyByName, input.getModifyByName())
-                .eq(SpaceInstitutionInstitutionEnt::getModifyTime, input.getModifyTime())
-                .like(SpaceInstitutionInstitutionEnt::getOuId, input.getOuId())
-                .like(SpaceInstitutionInstitutionEnt::getLineId, input.getLineId())
-                .like(SpaceInstitutionInstitutionEnt::getGridTypeKey, input.getGridTypeKey())
-                .like(SpaceInstitutionInstitutionEnt::getInstitutionName, input.getInstitutionName())
-                .eq(SpaceInstitutionInstitutionEnt::getInstitutionStartDate, input.getInstitutionStartDate())
-                .eq(SpaceInstitutionInstitutionEnt::getInstitutionEndDate, input.getInstitutionEndDate())
-                .eq(SpaceInstitutionInstitutionEnt::getOptimizeDeadline, input.getOptimizeDeadline())
-                .eq(SpaceInstitutionInstitutionEnt::getOptimizeState, input.getOptimizeState())
-                .eq(SpaceInstitutionInstitutionEnt::getIsCurrentBasic, input.getIsCurrentBasic())
-                .eq(SpaceInstitutionInstitutionEnt::getStartInterval, input.getStartInterval());
-        return XMapperHelper.query(mapper, input, queryWrapper, QuerySpaceInstitutionInstitutionOutput.class);
+    public XPageResult<QuerySpaceInstitutionDetailOutput> querySpaceInstitutionInstitution(XContext context, QuerySpaceInstitutionDetailInput input) {
+        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);
     }
 
     @XApiAnonymous
     @XApiGet
-    public XPageResult<QuerySpaceInstitutionInstitutionOutput> dynamicQuerySpaceInstitutionInstitution(XContext context, CustomQueryInput input) {
-        SpaceInstitutionInstitutionMapper mapper = context.getBean(SpaceInstitutionInstitutionMapper.class);
-        return XMapperHelper.query(mapper, input, SpaceInstitutionInstitutionEnt.class, QuerySpaceInstitutionInstitutionOutput.class);
+    public XPageResult<QuerySpaceInstitutionDetailOutput> dynamicQuerySpaceInstitutionInstitution(XContext context, CustomQueryInput input) {
+        SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
+        return XMapperHelper.query(mapper, input, SpaceInstitutionDetailEnt.class, QuerySpaceInstitutionDetailOutput.class);
     }
 
     @XApiAnonymous
     @XApiGet
-    public XSingleResult<GetSpaceInstitutionInstitutionViewOutput> getSpaceInstitutionInstitutionView(XContext context, GetSpaceInstitutionInstitutionViewInput input) {
-        SpaceInstitutionInstitutionViewMapper mapper = context.getBean(SpaceInstitutionInstitutionViewMapper.class);
-        SpaceInstitutionInstitutionView record = new SpaceInstitutionInstitutionView();
+    public XSingleResult<GetSpaceInstitutionDetailViewOutput> getSpaceInstitutionInstitutionView(XContext context, GetSpaceInstitutionDetailViewInput input) {
+        SpaceInstitutionDetailViewMapper mapper = context.getBean(SpaceInstitutionDetailViewMapper.class);
+        SpaceInstitutionDetailView record = new SpaceInstitutionDetailView();
         XCopyUtils.copyObject(input, record);
-        SpaceInstitutionInstitutionView view = mapper.selectOne(record);
+        SpaceInstitutionDetailView view = mapper.selectOne(record);
         if (view == null) {
             return XSingleResult.error(context, XError.NotFound);
         }
-        GetSpaceInstitutionInstitutionViewOutput output = new GetSpaceInstitutionInstitutionViewOutput();
+        GetSpaceInstitutionDetailViewOutput output = new GetSpaceInstitutionDetailViewOutput();
         XCopyUtils.copyObject(view, output);
         return XSingleResult.success(output);
     }
 
     @XApiAnonymous
     @XApiGet
-    public XPageResult<QuerySpaceInstitutionInstitutionViewOutput> querySpaceInstitutionInstitutionView(XContext context, QuerySpaceInstitutionInstitutionViewInput input) {
-        SpaceInstitutionInstitutionViewMapper mapper = context.getBean(SpaceInstitutionInstitutionViewMapper.class);
-        SpaceInstitutionInstitutionView record = new SpaceInstitutionInstitutionView();
+    public XPageResult<QuerySpaceInstitutionDetailViewOutput> querySpaceInstitutionInstitutionView(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<SpaceInstitutionInstitutionView> list = mapper.selectList(record);
-        PageInfo<SpaceInstitutionInstitutionView> pageInfo = new PageInfo<>(list);
-        List<QuerySpaceInstitutionInstitutionViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QuerySpaceInstitutionInstitutionViewOutput.class);
+        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());
     }
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_institution_institution/CreateSpaceInstitutionInstitutionInput.java → C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_institution_detail/CreateSpaceInstitutionDetailInput.java

-package pps.core.space.service.data.space_institution_institution;
+package pps.core.space.service.data.space_institution_detail;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -16,7 +16,7 @@ import java.util.List;
  * @date 2023/09/05
  */
 @Data
-public class CreateSpaceInstitutionInstitutionInput {
+public class CreateSpaceInstitutionDetailInput {
 
     @XText("组织机构ID")
     @NotBlank(message = "缺少组织机构ID")

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_institution_institution/GetSpaceInstitutionInstitutionInput.java → C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_institution_detail/DeleteSpaceInstitutionDetailInput.java

-package pps.core.space.service.data.space_institution_institution;
+package pps.core.space.service.data.space_institution_detail;
 
 import xstartup.annotation.XText;
 
 import java.util.Date;
 
-public class GetSpaceInstitutionInstitutionInput {
+public class DeleteSpaceInstitutionDetailInput {
     @XText("ID")
     private String id;
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_institution_institution/GetSpaceInstitutionInstitutionOutput.java → 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_institution;
+package pps.core.space.service.data.space_institution_detail;
 
 import xstartup.annotation.XText;
 
 import java.util.Date;
 
-public class GetSpaceInstitutionInstitutionOutput {
+public class DynamicQuerySpaceInstitutionDetailInput {
     @XText("ID")
     private String id;
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_institution_institution/UpdateSpaceInstitutionInstitutionInput.java → 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_institution;
+package pps.core.space.service.data.space_institution_detail;
 
 import xstartup.annotation.XText;
 
 import java.util.Date;
 
-public class UpdateSpaceInstitutionInstitutionInput {
+public class DynamicQuerySpaceInstitutionDetailOutput {
     @XText("ID")
     private String id;
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_institution_institution/DeleteSpaceInstitutionInstitutionOutput.java → 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_institution;
+package pps.core.space.service.data.space_institution_detail;
 
 import xstartup.annotation.XText;
 
 import java.util.Date;
 
-public class DeleteSpaceInstitutionInstitutionOutput {
+public class DynamicQuerySpaceInstitutionDetailViewOutput {
     @XText("ID")
     private String id;
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_institution_institution/DeleteSpaceInstitutionInstitutionInput.java → C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_institution_detail/GetSpaceInstitutionDetailInput.java

-package pps.core.space.service.data.space_institution_institution;
+package pps.core.space.service.data.space_institution_detail;
 
 import xstartup.annotation.XText;
 
 import java.util.Date;
 
-public class DeleteSpaceInstitutionInstitutionInput {
+public class GetSpaceInstitutionDetailInput {
     @XText("ID")
     private String id;
 

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

+package pps.core.space.service.data.space_institution_detail;
+
+import xstartup.annotation.XText;
+
+import java.util.Date;
+
+public class GetSpaceInstitutionDetailOutput {
+    @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/GetSpaceInstitutionDetailViewInput.java

+package pps.core.space.service.data.space_institution_detail;
+
+import xstartup.annotation.XText;
+
+import java.util.Date;
+
+public class GetSpaceInstitutionDetailViewInput {
+    @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

+package pps.core.space.service.data.space_institution_detail;
+
+import xstartup.annotation.XText;
+
+import java.util.Date;
+
+public class GetSpaceInstitutionDetailViewOutput {
+    @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_institution/QuerySpaceInstitutionInstitutionOutput.java → 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_institution;
+package pps.core.space.service.data.space_institution_detail;
 
 import xstartup.annotation.XText;
 import xstartup.base.data.XPageInput;
 
 import java.util.Date;
 
-public class QuerySpaceInstitutionInstitutionOutput extends XPageInput {
+public class QuerySpaceInstitutionDetailInput extends XPageInput {
     @XText("ID")
     private String id;
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_institution_institution/QuerySpaceInstitutionInstitutionViewInput.java → 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_institution;
+package pps.core.space.service.data.space_institution_detail;
 
 import xstartup.annotation.XText;
 import xstartup.base.data.XPageInput;
 
 import java.util.Date;
 
-public class QuerySpaceInstitutionInstitutionViewInput extends XPageInput {
+public class QuerySpaceInstitutionDetailOutput extends XPageInput {
     @XText("ID")
     private String id;
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_institution_institution/QuerySpaceInstitutionInstitutionViewOutput.java → 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_institution;
+package pps.core.space.service.data.space_institution_detail;
 
 import xstartup.annotation.XText;
 import xstartup.base.data.XPageInput;
 
 import java.util.Date;
 
-public class QuerySpaceInstitutionInstitutionViewOutput extends XPageInput {
+public class QuerySpaceInstitutionDetailViewInput extends XPageInput {
     @XText("ID")
     private String id;
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_institution_institution/QuerySpaceInstitutionInstitutionInput.java → 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_institution;
+package pps.core.space.service.data.space_institution_detail;
 
 import xstartup.annotation.XText;
 import xstartup.base.data.XPageInput;
 
 import java.util.Date;
 
-public class QuerySpaceInstitutionInstitutionInput extends XPageInput {
+public class QuerySpaceInstitutionDetailViewOutput extends XPageInput {
     @XText("ID")
     private String id;
 

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

+package pps.core.space.service.data.space_institution_detail;
+
+import xstartup.annotation.XText;
+
+import java.util.Date;
+
+public class UpdateSpaceInstitutionDetailInput {
+    @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_institution/CreateSpaceInstitutionInstitutionOutput.java

-package pps.core.space.service.data.space_institution_institution;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class CreateSpaceInstitutionInstitutionOutput {
-    @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_institution/DynamicQuerySpaceInstitutionInstitutionInput.java

-package pps.core.space.service.data.space_institution_institution;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class DynamicQuerySpaceInstitutionInstitutionInput {
-    @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_institution/DynamicQuerySpaceInstitutionInstitutionOutput.java

-package pps.core.space.service.data.space_institution_institution;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class DynamicQuerySpaceInstitutionInstitutionOutput {
-    @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_institution/DynamicQuerySpaceInstitutionInstitutionViewOutput.java

-package pps.core.space.service.data.space_institution_institution;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class DynamicQuerySpaceInstitutionInstitutionViewOutput {
-    @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_institution/GetSpaceInstitutionInstitutionViewInput.java

-package pps.core.space.service.data.space_institution_institution;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class GetSpaceInstitutionInstitutionViewInput {
-    @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_institution/GetSpaceInstitutionInstitutionViewOutput.java

-package pps.core.space.service.data.space_institution_institution;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class GetSpaceInstitutionInstitutionViewOutput {
-    @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_institution/UpdateSpaceInstitutionInstitutionOutput.java

-package pps.core.space.service.data.space_institution_institution;
-
-import xstartup.annotation.XText;
-
-import java.util.Date;
-
-public class UpdateSpaceInstitutionInstitutionOutput {
-    @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/resources/mybatis/mapper/pps/core/space/SpaceInstitutionInstitutionViewMapper.xml → C11-space/pps-core-space/src/main/resources/mybatis/mapper/pps/core/space/SpaceInstitutionDetailViewMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="pps.core.space.mapper.SpaceInstitutionInstitutionViewMapper">
-    <resultMap id="BaseResultMap" type="pps.core.space.entity.SpaceInstitutionInstitutionView">
+<mapper namespace="pps.core.space.mapper.SpaceInstitutionDetailViewMapper">
+    <resultMap id="BaseResultMap" type="pps.core.space.entity.SpaceInstitutionDetailView">
         <id column="id" property="id" jdbcType="VARCHAR"/>
         <result column="is_deleted" property="isDeleted" jdbcType="INTEGER"/>
         <result column="create_by_id" property="createById" jdbcType="VARCHAR"/>
@@ -42,19 +42,19 @@
     is_current_basic,
     start_interval
     </sql>
-    <select id="selectOne" parameterType="pps.core.space.entity.SpaceInstitutionInstitutionView"
+    <select id="selectOne" parameterType="pps.core.space.entity.SpaceInstitutionDetailView"
             resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
-        from space_institution_institution
+        from space_institution_detail
         where
         id=#{id}
     </select>
-    <select id="selectList" parameterType="pps.core.space.entity.SpaceInstitutionInstitutionView"
+    <select id="selectList" parameterType="pps.core.space.entity.SpaceInstitutionDetailView"
             resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
-        from space_institution_institution
+        from space_institution_detail
         where
         id=#{id}
     </select>

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

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="pps.core.space.mapper.SpaceOptimizeMidWellheadViewMapper">
-    <resultMap id="BaseResultMap" type="pps.core.space.entity.SpaceOptimizeMidWellheadView">
-        <id column="id" property="id" jdbcType="VARCHAR"/>
-        <result column="is_deleted" property="isDeleted" jdbcType="INTEGER"/>
-        <result column="create_by_id" property="createById" jdbcType="VARCHAR"/>
-        <result column="create_by_name" property="createByName" jdbcType="VARCHAR"/>
-        <result column="create_time" property="createTime" jdbcType="DATE"/>
-        <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="mid_period_id" property="midPeriodId" jdbcType="VARCHAR"/>
-        <result column="wellhead_id" property="wellheadId" jdbcType="VARCHAR"/>
-        <result column="well_number" property="wellNumber" jdbcType="VARCHAR"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        id
-        ,
-    is_deleted,
-    create_by_id,
-    create_by_name,
-    create_time,
-    modify_by_id,
-    modify_by_name,
-    modify_time,
-    mid_period_id,
-    wellhead_id,
-    well_number
-    </sql>
-    <select id="selectOne" parameterType="pps.core.space.entity.SpaceOptimizeMidWellheadView" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from space_optimize_mid_wellhead
-        where
-        id=#{id}
-    </select>
-    <select id="selectList" parameterType="pps.core.space.entity.SpaceOptimizeMidWellheadView"
-            resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from space_optimize_mid_wellhead
-        where
-        id=#{id}
-    </select>
-</mapper>
\ No newline at end of file