Merge remote-tracking branch 'origin/master'

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

@@ -7,12 +7,14 @@ import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 import xstartup.annotation.XText;
 
+@Data
 @TableName("base_photovoltaic_plant")
 public class BasePhotovoltaicPlantEnt implements Serializable {
     @XText("ID")
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 
     @XText("是否删除(0_是;1_否)")
@@ -71,124 +73,10 @@ public class BasePhotovoltaicPlantEnt implements Serializable {
     @TableField
     private BigDecimal arrayOrientation;
 
-    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 getStationName() {
-        return this.stationName;
-    }
-
-    public void setStationName(String value) {
-        this.stationName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getPhotovoltaicModelKey() {
-        return this.photovoltaicModelKey;
-    }
-
-    public void setPhotovoltaicModelKey(String value) {
-        this.photovoltaicModelKey = value;
-    }
-
-    public BigDecimal getMountingAngle() {
-        return this.mountingAngle;
-    }
-
-    public void setMountingAngle(BigDecimal value) {
-        this.mountingAngle = value;
-    }
-
-    public BigDecimal getTotalPower() {
-        return this.totalPower;
-    }
-
-    public void setTotalPower(BigDecimal value) {
-        this.totalPower = value;
-    }
-
-    public BigDecimal getArrayOrientation() {
-        return this.arrayOrientation;
-    }
-
-    public void setArrayOrientation(BigDecimal value) {
-        this.arrayOrientation = value;
-    }
-
+    @XText("组织机构name")
+    @TableField
+    private String ouName;
+    @XText("光伏设备规格型号name(字典获取)")
+    @TableField
+    private String photovoltaicModelName;
 }

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

@@ -4,8 +4,10 @@ import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
 import xstartup.annotation.XText;
 
+@Data
 public class BasePhotovoltaicPlantView implements Serializable {
     @XText("ID")
     @TableField
@@ -67,124 +69,11 @@ public class BasePhotovoltaicPlantView implements Serializable {
     @TableField
     private BigDecimal arrayOrientation;
 
-    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 getStationName() {
-        return this.stationName;
-    }
-
-    public void setStationName(String value) {
-        this.stationName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getPhotovoltaicModelKey() {
-        return this.photovoltaicModelKey;
-    }
-
-    public void setPhotovoltaicModelKey(String value) {
-        this.photovoltaicModelKey = value;
-    }
-
-    public BigDecimal getMountingAngle() {
-        return this.mountingAngle;
-    }
-
-    public void setMountingAngle(BigDecimal value) {
-        this.mountingAngle = value;
-    }
-
-    public BigDecimal getTotalPower() {
-        return this.totalPower;
-    }
-
-    public void setTotalPower(BigDecimal value) {
-        this.totalPower = value;
-    }
-
-    public BigDecimal getArrayOrientation() {
-        return this.arrayOrientation;
-    }
-
-    public void setArrayOrientation(BigDecimal value) {
-        this.arrayOrientation = value;
-    }
+    @XText("组织机构name")
+    @TableField
+    private String ouName;
+    @XText("光伏设备规格型号name(字典获取)")
+    @TableField
+    private String photovoltaicModelName;
 
 }

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

@@ -13,10 +13,10 @@ import java.util.Date;
 @TableName("base_wellhead")
 public class BaseWellheadEnt implements Serializable {
     @XText("ID")
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 
-    @XText("是否删除(0_是；1_否)")
+    @XText("是否删除(1_是；0_否)")
     @TableField
     private Integer isDeleted;
 
@@ -47,6 +47,9 @@ public class BaseWellheadEnt implements Serializable {
     @XText("组织机构ID")
     @TableField
     private String ouId;
+    @XText("组织机构名称")
+    @TableField
+    private String ouName;
 
     @XText("井号")
     @TableField
@@ -56,6 +59,10 @@ public class BaseWellheadEnt implements Serializable {
     @TableField
     private String runTypeKey;
 
+    @XText("运行类型name(字典获取)")
+    @TableField
+    private String runTypeName;
+
     @XText("运行功率(KW)")
     @TableField
     private BigDecimal serviceRating;
@@ -156,4 +163,19 @@ public class BaseWellheadEnt implements Serializable {
         this.serviceRating = value;
     }
 
+    public String getOuName() {
+        return ouName;
+    }
+
+    public void setOuName(String ouName) {
+        this.ouName = ouName;
+    }
+
+    public String getRunTypeName() {
+        return runTypeName;
+    }
+
+    public void setRunTypeName(String runTypeName) {
+        this.runTypeName = runTypeName;
+    }
 }

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

@@ -43,6 +43,9 @@ public class BaseWellheadView implements Serializable {
     @XText("组织机构ID")
     @TableField
     private String ouId;
+    @XText("组织机构name")
+    @TableField
+    private String ouName;
 
     @XText("井号")
     @TableField
@@ -51,6 +54,9 @@ public class BaseWellheadView implements Serializable {
     @XText("运行类型key(字典获取)")
     @TableField
     private String runTypeKey;
+    @XText("运行类型name(字典获取)")
+    @TableField
+    private String runTypeName;
 
     @XText("运行功率(KW)")
     @TableField
@@ -152,4 +158,19 @@ public class BaseWellheadView implements Serializable {
         this.serviceRating = value;
     }
 
+    public String getOuName() {
+        return ouName;
+    }
+
+    public void setOuName(String ouName) {
+        this.ouName = ouName;
+    }
+
+    public String getRunTypeName() {
+        return runTypeName;
+    }
+
+    public void setRunTypeName(String runTypeName) {
+        this.runTypeName = runTypeName;
+    }
 }

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

 package pps.core.base.service;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import pps.core.base.constant.ScadaConstant;
 import pps.core.base.entity.BasePhotovoltaicPlantEnt;
 import pps.core.base.entity.BasePhotovoltaicPlantView;
+import pps.core.base.entity.BaseWellheadEnt;
 import pps.core.base.mapper.BasePhotovoltaicPlantMapper;
 import pps.core.base.mapper.BasePhotovoltaicPlantViewMapper;
 import pps.core.base.service.data.base_photovoltaic_plant.*;
+import pps.core.base.utils.SessionSimulation;
+import pps.core.common.session.PpsUserSession;
 import xstartup.annotation.XService;
+import xstartup.annotation.XText;
 import xstartup.base.XContext;
 import xstartup.base.data.CustomQueryInput;
 import xstartup.base.util.XCopyUtils;
@@ -21,55 +27,87 @@ import xstartup.feature.api.annotation.XApiGet;
 import xstartup.feature.api.annotation.XApiPost;
 import xstartup.feature.mybatis.helper.XMapperHelper;
 
+import java.util.Date;
 import java.util.List;
 
+/**
+ * @Author luoxiangyang
+ * @Description: 光伏电站配置
+ * @Date 2023/8/24
+ **/
 @XService
 public class BasePhotovoltaicPlantService {
+    //todo 模拟登陆
+    private final PpsUserSession session = SessionSimulation.getSession();
+
+    @XText("新增")
     @XApiAnonymous
     @XApiPost
     public XServiceResult createBasePhotovoltaicPlant(XContext context, CreateBasePhotovoltaicPlantInput input) {
         BasePhotovoltaicPlantMapper mapper = context.getBean(BasePhotovoltaicPlantMapper.class);
         BasePhotovoltaicPlantEnt entity = new BasePhotovoltaicPlantEnt();
         XCopyUtils.copyObject(input, entity);
+        entity.setCreateById(session.getId());
+        entity.setCreateByName(session.getUserName());
+        entity.setCreateTime(new Date());
+        entity.setModifyById(session.getId());
+        entity.setModifyByName(session.getUserName());
+        entity.setModifyTime(new Date());
         mapper.insert(entity);
         return XServiceResult.OK;
     }
-
+    @XText("更新")
     @XApiAnonymous
     @XApiPost
     public XServiceResult updateBasePhotovoltaicPlant(XContext context, UpdateBasePhotovoltaicPlantInput input) {
         BasePhotovoltaicPlantMapper mapper = context.getBean(BasePhotovoltaicPlantMapper.class);
         QueryWrapper<BasePhotovoltaicPlantEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BasePhotovoltaicPlantEnt::getId, input.getId());
+        queryWrapper.lambda()
+                .eq(BasePhotovoltaicPlantEnt::getId, input.getId())
+                .eq(BasePhotovoltaicPlantEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE);
         BasePhotovoltaicPlantEnt entity = mapper.selectOne(queryWrapper);
         if (entity == null) {
             return XServiceResult.error(context, XError.NotFound);
         }
         XCopyUtils.copyObject(input, entity);
+        entity.setModifyById(session.getId());
+        entity.setModifyByName(session.getUserName());
+        entity.setModifyTime(new Date());
         mapper.updateById(entity);
         return XServiceResult.OK;
     }
-
+    @XText("删除")
     @XApiAnonymous
     @XApiPost
     public XServiceResult deleteBasePhotovoltaicPlant(XContext context, DeleteBasePhotovoltaicPlantInput input) {
         BasePhotovoltaicPlantMapper mapper = context.getBean(BasePhotovoltaicPlantMapper.class);
         QueryWrapper<BasePhotovoltaicPlantEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BasePhotovoltaicPlantEnt::getId, input.getId());
+        queryWrapper.lambda()
+                .eq(BasePhotovoltaicPlantEnt::getId, input.getId())
+                .eq(BasePhotovoltaicPlantEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE);
         BasePhotovoltaicPlantEnt entity = mapper.selectOne(queryWrapper);
         if (entity == null) {
             return XServiceResult.error(context, XError.NotFound);
         }
-        mapper.deleteById(entity);
+        entity = new BasePhotovoltaicPlantEnt();
+        entity.setId(input.getId());
+        entity.setIsDeleted(ScadaConstant.IS_DELETE_TRUE);
+        //PpsUserSession session = context.getSession(PpsUserSession.class);
+        entity.setModifyById(session.getId());
+        entity.setModifyByName(session.getUserName());
+        entity.setModifyTime(new Date());
+        mapper.updateById(entity);
         return XServiceResult.OK;
     }
-
+    @XText("根据id获取详情")
     @XApiAnonymous
     @XApiGet
     public XSingleResult<GetBasePhotovoltaicPlantOutput> getBasePhotovoltaicPlant(XContext context, GetBasePhotovoltaicPlantInput input) {
         BasePhotovoltaicPlantMapper mapper = context.getBean(BasePhotovoltaicPlantMapper.class);
         QueryWrapper<BasePhotovoltaicPlantEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BasePhotovoltaicPlantEnt::getId, input.getId());
+        queryWrapper.lambda()
+                .eq(BasePhotovoltaicPlantEnt::getId, input.getId())
+                .eq(BasePhotovoltaicPlantEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE);
         BasePhotovoltaicPlantEnt entity = mapper.selectOne(queryWrapper);
         if (entity == null) {
             return XSingleResult.error(context, XError.NotFound);
@@ -78,63 +116,20 @@ public class BasePhotovoltaicPlantService {
         XCopyUtils.copyObject(entity, output);
         return XSingleResult.success(output);
     }
-
+    @XText("分页查询")
     @XApiAnonymous
     @XApiGet
     public XPageResult<QueryBasePhotovoltaicPlantOutput> queryBasePhotovoltaicPlant(XContext context, QueryBasePhotovoltaicPlantInput input) {
         BasePhotovoltaicPlantMapper mapper = context.getBean(BasePhotovoltaicPlantMapper.class);
+        String stationName = input.getStationName();
+        String ouId = input.getOuId();
         QueryWrapper<BasePhotovoltaicPlantEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().like(BasePhotovoltaicPlantEnt::getId, input.getId())
-                .eq(BasePhotovoltaicPlantEnt::getIsDeleted, input.getIsDeleted())
-                .like(BasePhotovoltaicPlantEnt::getCreateById, input.getCreateById())
-                .like(BasePhotovoltaicPlantEnt::getCreateByName, input.getCreateByName())
-                .eq(BasePhotovoltaicPlantEnt::getCreateTime, input.getCreateTime())
-                .like(BasePhotovoltaicPlantEnt::getModifyById, input.getModifyById())
-                .like(BasePhotovoltaicPlantEnt::getModifyByName, input.getModifyByName())
-                .eq(BasePhotovoltaicPlantEnt::getModifyTime, input.getModifyTime())
-                .like(BasePhotovoltaicPlantEnt::getOuId, input.getOuId())
-                .like(BasePhotovoltaicPlantEnt::getStationName, input.getStationName())
-                .like(BasePhotovoltaicPlantEnt::getMakerNumber, input.getMakerNumber())
-                .like(BasePhotovoltaicPlantEnt::getPhotovoltaicModelKey, input.getPhotovoltaicModelKey())
-                .eq(BasePhotovoltaicPlantEnt::getMountingAngle, input.getMountingAngle())
-                .eq(BasePhotovoltaicPlantEnt::getTotalPower, input.getTotalPower())
-                .eq(BasePhotovoltaicPlantEnt::getArrayOrientation, input.getArrayOrientation());
+        queryWrapper.lambda()
+                .eq(BasePhotovoltaicPlantEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE)
+                .eq(StrUtil.isNotEmpty(ouId),BasePhotovoltaicPlantEnt::getOuId, ouId)
+                .like(StrUtil.isNotEmpty(stationName),BasePhotovoltaicPlantEnt::getStationName,stationName )
+                .orderByDesc(BasePhotovoltaicPlantEnt::getModifyTime);
         return XMapperHelper.query(mapper, input, queryWrapper, QueryBasePhotovoltaicPlantOutput.class);
     }
 
-    @XApiAnonymous
-    @XApiGet
-    public XPageResult<QueryBasePhotovoltaicPlantOutput> dynamicQueryBasePhotovoltaicPlant(XContext context, CustomQueryInput input) {
-        BasePhotovoltaicPlantMapper mapper = context.getBean(BasePhotovoltaicPlantMapper.class);
-        return XMapperHelper.query(mapper, input, BasePhotovoltaicPlantEnt.class, QueryBasePhotovoltaicPlantOutput.class);
-    }
-
-    @XApiAnonymous
-    @XApiGet
-    public XSingleResult<GetBasePhotovoltaicPlantViewOutput> getBasePhotovoltaicPlantView(XContext context, GetBasePhotovoltaicPlantViewInput input) {
-        BasePhotovoltaicPlantViewMapper mapper = context.getBean(BasePhotovoltaicPlantViewMapper.class);
-        BasePhotovoltaicPlantView record = new BasePhotovoltaicPlantView();
-        XCopyUtils.copyObject(input, record);
-        BasePhotovoltaicPlantView view = mapper.selectOne(record);
-        if (view == null) {
-            return XSingleResult.error(context, XError.NotFound);
-        }
-        GetBasePhotovoltaicPlantViewOutput output = new GetBasePhotovoltaicPlantViewOutput();
-        XCopyUtils.copyObject(view, output);
-        return XSingleResult.success(output);
-    }
-
-    @XApiAnonymous
-    @XApiGet
-    public XPageResult<QueryBasePhotovoltaicPlantViewOutput> queryBasePhotovoltaicPlantView(XContext context, QueryBasePhotovoltaicPlantViewInput input) {
-        BasePhotovoltaicPlantViewMapper mapper = context.getBean(BasePhotovoltaicPlantViewMapper.class);
-        BasePhotovoltaicPlantView record = new BasePhotovoltaicPlantView();
-        XCopyUtils.copyObject(input, record);
-        PageHelper.startPage(input.getPage(), input.getLimit());
-        List<BasePhotovoltaicPlantView> list = mapper.selectList(record);
-        PageInfo<BasePhotovoltaicPlantView> pageInfo = new PageInfo<>(list);
-        List<QueryBasePhotovoltaicPlantViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePhotovoltaicPlantViewOutput.class);
-        return XPageResult.success(outputs, input, pageInfo.getTotal());
-    }
-
 }

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

 package pps.core.base.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
+import pps.core.base.constant.ScadaConstant;
 import pps.core.base.entity.BaseWellheadEnt;
-import pps.core.base.entity.BaseWellheadView;
 import pps.core.base.mapper.BaseWellheadMapper;
-import pps.core.base.mapper.BaseWellheadViewMapper;
 import pps.core.base.service.data.base_wellhead.*;
+import pps.core.base.utils.SessionSimulation;
+import pps.core.common.session.PpsUserSession;
 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;
@@ -21,20 +20,37 @@ import xstartup.feature.api.annotation.XApiGet;
 import xstartup.feature.api.annotation.XApiPost;
 import xstartup.feature.mybatis.helper.XMapperHelper;
 
-import java.util.List;
+import java.util.Date;
 
+/**
+ * @Author luoxiangyang
+ * @Description: 井口配置
+ * @Date 2023/8/24
+ **/
 @XService
 public class BaseWellheadService {
+    //todo 模拟登陆
+    private final PpsUserSession session = SessionSimulation.getSession();
+
+    @XText("新增")
     @XApiAnonymous
     @XApiPost
     public XServiceResult createBaseWellhead(XContext context, CreateBaseWellheadInput input) {
         BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
         BaseWellheadEnt entity = new BaseWellheadEnt();
         XCopyUtils.copyObject(input, entity);
+        //PpsUserSession session = context.getSession(PpsUserSession.class);
+        entity.setCreateById(session.getId());
+        entity.setCreateByName(session.getUserName());
+        entity.setCreateTime(new Date());
+        entity.setModifyById(session.getId());
+        entity.setModifyByName(session.getUserName());
+        entity.setModifyTime(new Date());
         mapper.insert(entity);
         return XServiceResult.OK;
     }
 
+    @XText("更新")
     @XApiAnonymous
     @XApiPost
     public XServiceResult updateBaseWellhead(XContext context, UpdateBaseWellheadInput input) {
@@ -46,10 +62,15 @@ public class BaseWellheadService {
             return XServiceResult.error(context, XError.NotFound);
         }
         XCopyUtils.copyObject(input, entity);
+        //PpsUserSession session = context.getSession(PpsUserSession.class);
+        entity.setModifyById(session.getId());
+        entity.setModifyByName(session.getUserName());
+        entity.setModifyTime(new Date());
         mapper.updateById(entity);
         return XServiceResult.OK;
     }
 
+    @XText("删除")
     @XApiAnonymous
     @XApiPost
     public XServiceResult deleteBaseWellhead(XContext context, DeleteBaseWellheadInput input) {
@@ -60,16 +81,26 @@ public class BaseWellheadService {
         if (entity == null) {
             return XServiceResult.error(context, XError.NotFound);
         }
-        mapper.deleteById(entity);
+        entity = new BaseWellheadEnt();
+        entity.setId(input.getId());
+        entity.setIsDeleted(ScadaConstant.IS_DELETE_TRUE);
+        //PpsUserSession session = context.getSession(PpsUserSession.class);
+        entity.setModifyById(session.getId());
+        entity.setModifyByName(session.getUserName());
+        entity.setModifyTime(new Date());
+        mapper.updateById(entity);
         return XServiceResult.OK;
     }
 
+    @XText("根据ID获取详情")
     @XApiAnonymous
     @XApiGet
     public XSingleResult<GetBaseWellheadOutput> getBaseWellhead(XContext context, GetBaseWellheadInput input) {
         BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
         QueryWrapper<BaseWellheadEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BaseWellheadEnt::getId, input.getId());
+        queryWrapper.lambda()
+                .eq(BaseWellheadEnt::getId, input.getId())
+                .eq(BaseWellheadEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE);
         BaseWellheadEnt entity = mapper.selectOne(queryWrapper);
         if (entity == null) {
             return XSingleResult.error(context, XError.NotFound);
@@ -79,59 +110,16 @@ public class BaseWellheadService {
         return XSingleResult.success(output);
     }
 
+    @XText("分页查询")
     @XApiAnonymous
     @XApiGet
     public XPageResult<QueryBaseWellheadOutput> queryBaseWellhead(XContext context, QueryBaseWellheadInput input) {
         BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
         QueryWrapper<BaseWellheadEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().like(BaseWellheadEnt::getId, input.getId())
-                .eq(BaseWellheadEnt::getIsDeleted, input.getIsDeleted())
-                .like(BaseWellheadEnt::getCreateById, input.getCreateById())
-                .like(BaseWellheadEnt::getCreateByName, input.getCreateByName())
-                .eq(BaseWellheadEnt::getCreateTime, input.getCreateTime())
-                .like(BaseWellheadEnt::getModifyById, input.getModifyById())
-                .like(BaseWellheadEnt::getModifyByName, input.getModifyByName())
-                .eq(BaseWellheadEnt::getModifyTime, input.getModifyTime())
-                .like(BaseWellheadEnt::getOuId, input.getOuId())
-                .like(BaseWellheadEnt::getWellNumber, input.getWellNumber())
-                .like(BaseWellheadEnt::getRunTypeKey, input.getRunTypeKey())
-                .eq(BaseWellheadEnt::getServiceRating, input.getServiceRating());
+        queryWrapper.lambda()
+                .eq(BaseWellheadEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE)
+                .eq(BaseWellheadEnt::getOuId, input.getOuId())
+                .orderByDesc(BaseWellheadEnt::getModifyTime);
         return XMapperHelper.query(mapper, input, queryWrapper, QueryBaseWellheadOutput.class);
     }
-
-    @XApiAnonymous
-    @XApiGet
-    public XPageResult<QueryBaseWellheadOutput> dynamicQueryBaseWellhead(XContext context, CustomQueryInput input) {
-        BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
-        return XMapperHelper.query(mapper, input, BaseWellheadEnt.class, QueryBaseWellheadOutput.class);
-    }
-
-    @XApiAnonymous
-    @XApiGet
-    public XSingleResult<GetBaseWellheadViewOutput> getBaseWellheadView(XContext context, GetBaseWellheadViewInput input) {
-        BaseWellheadViewMapper mapper = context.getBean(BaseWellheadViewMapper.class);
-        BaseWellheadView record = new BaseWellheadView();
-        XCopyUtils.copyObject(input, record);
-        BaseWellheadView view = mapper.selectOne(record);
-        if (view == null) {
-            return XSingleResult.error(context, XError.NotFound);
-        }
-        GetBaseWellheadViewOutput output = new GetBaseWellheadViewOutput();
-        XCopyUtils.copyObject(view, output);
-        return XSingleResult.success(output);
-    }
-
-    @XApiAnonymous
-    @XApiGet
-    public XPageResult<QueryBaseWellheadViewOutput> queryBaseWellheadView(XContext context, QueryBaseWellheadViewInput input) {
-        BaseWellheadViewMapper mapper = context.getBean(BaseWellheadViewMapper.class);
-        BaseWellheadView record = new BaseWellheadView();
-        XCopyUtils.copyObject(input, record);
-        PageHelper.startPage(input.getPage(), input.getLimit());
-        List<BaseWellheadView> list = mapper.selectList(record);
-        PageInfo<BaseWellheadView> pageInfo = new PageInfo<>(list);
-        List<QueryBaseWellheadViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBaseWellheadViewOutput.class);
-        return XPageResult.success(outputs, input, pageInfo.getTotal());
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/CreateBasePhotovoltaicPlantInput.java

 package pps.core.base.service.data.base_photovoltaic_plant;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
 
+@Data
 public class CreateBasePhotovoltaicPlantInput {
-    @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;
@@ -49,125 +29,9 @@ public class CreateBasePhotovoltaicPlantInput {
 
     @XText("阵列朝向")
     private BigDecimal arrayOrientation;
-
-    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 getStationName() {
-        return this.stationName;
-    }
-
-    public void setStationName(String value) {
-        this.stationName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getPhotovoltaicModelKey() {
-        return this.photovoltaicModelKey;
-    }
-
-    public void setPhotovoltaicModelKey(String value) {
-        this.photovoltaicModelKey = value;
-    }
-
-    public BigDecimal getMountingAngle() {
-        return this.mountingAngle;
-    }
-
-    public void setMountingAngle(BigDecimal value) {
-        this.mountingAngle = value;
-    }
-
-    public BigDecimal getTotalPower() {
-        return this.totalPower;
-    }
-
-    public void setTotalPower(BigDecimal value) {
-        this.totalPower = value;
-    }
-
-    public BigDecimal getArrayOrientation() {
-        return this.arrayOrientation;
-    }
-
-    public void setArrayOrientation(BigDecimal value) {
-        this.arrayOrientation = value;
-    }
+    @XText("组织机构name")
+    private String ouName;
+    @XText("光伏设备规格型号name(字典获取)")
+    private String photovoltaicModelName;
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/CreateBasePhotovoltaicPlantOutput.java

 package pps.core.base.service.data.base_photovoltaic_plant;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
 
+@Data
 public class CreateBasePhotovoltaicPlantOutput {
     @XText("ID")
     private String id;
@@ -50,124 +53,9 @@ public class CreateBasePhotovoltaicPlantOutput {
     @XText("阵列朝向")
     private BigDecimal arrayOrientation;
 
-    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 getStationName() {
-        return this.stationName;
-    }
-
-    public void setStationName(String value) {
-        this.stationName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getPhotovoltaicModelKey() {
-        return this.photovoltaicModelKey;
-    }
-
-    public void setPhotovoltaicModelKey(String value) {
-        this.photovoltaicModelKey = value;
-    }
-
-    public BigDecimal getMountingAngle() {
-        return this.mountingAngle;
-    }
-
-    public void setMountingAngle(BigDecimal value) {
-        this.mountingAngle = value;
-    }
-
-    public BigDecimal getTotalPower() {
-        return this.totalPower;
-    }
-
-    public void setTotalPower(BigDecimal value) {
-        this.totalPower = value;
-    }
-
-    public BigDecimal getArrayOrientation() {
-        return this.arrayOrientation;
-    }
-
-    public void setArrayOrientation(BigDecimal value) {
-        this.arrayOrientation = value;
-    }
+    @XText("组织机构name")
+    private String ouName;
+    @XText("光伏设备规格型号name(字典获取)")
+    private String photovoltaicModelName;
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/DeleteBasePhotovoltaicPlantInput.java

 package pps.core.base.service.data.base_photovoltaic_plant;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class DeleteBasePhotovoltaicPlantInput {
     @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("电站名称")
-    private String stationName;
-
-    @XText("出厂编号")
-    private String makerNumber;
-
-    @XText("光伏设备规格型号key(字典获取)")
-    private String photovoltaicModelKey;
-
-    @XText("安装倾角")
-    private BigDecimal mountingAngle;
-
-    @XText("装机总量(KWP)")
-    private BigDecimal totalPower;
-
-    @XText("阵列朝向")
-    private BigDecimal arrayOrientation;
-
-    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 getStationName() {
-        return this.stationName;
-    }
-
-    public void setStationName(String value) {
-        this.stationName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getPhotovoltaicModelKey() {
-        return this.photovoltaicModelKey;
-    }
-
-    public void setPhotovoltaicModelKey(String value) {
-        this.photovoltaicModelKey = value;
-    }
-
-    public BigDecimal getMountingAngle() {
-        return this.mountingAngle;
-    }
-
-    public void setMountingAngle(BigDecimal value) {
-        this.mountingAngle = value;
-    }
-
-    public BigDecimal getTotalPower() {
-        return this.totalPower;
-    }
-
-    public void setTotalPower(BigDecimal value) {
-        this.totalPower = value;
-    }
-
-    public BigDecimal getArrayOrientation() {
-        return this.arrayOrientation;
-    }
-
-    public void setArrayOrientation(BigDecimal value) {
-        this.arrayOrientation = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/DeleteBasePhotovoltaicPlantOutput.java

 package pps.core.base.service.data.base_photovoltaic_plant;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
 
+@Data
 public class DeleteBasePhotovoltaicPlantOutput {
     @XText("ID")
     private String id;
@@ -50,124 +52,9 @@ public class DeleteBasePhotovoltaicPlantOutput {
     @XText("阵列朝向")
     private BigDecimal arrayOrientation;
 
-    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 getStationName() {
-        return this.stationName;
-    }
-
-    public void setStationName(String value) {
-        this.stationName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getPhotovoltaicModelKey() {
-        return this.photovoltaicModelKey;
-    }
-
-    public void setPhotovoltaicModelKey(String value) {
-        this.photovoltaicModelKey = value;
-    }
-
-    public BigDecimal getMountingAngle() {
-        return this.mountingAngle;
-    }
-
-    public void setMountingAngle(BigDecimal value) {
-        this.mountingAngle = value;
-    }
-
-    public BigDecimal getTotalPower() {
-        return this.totalPower;
-    }
-
-    public void setTotalPower(BigDecimal value) {
-        this.totalPower = value;
-    }
-
-    public BigDecimal getArrayOrientation() {
-        return this.arrayOrientation;
-    }
-
-    public void setArrayOrientation(BigDecimal value) {
-        this.arrayOrientation = value;
-    }
+    @XText("组织机构name")
+    private String ouName;
+    @XText("光伏设备规格型号name(字典获取)")
+    private String photovoltaicModelName;
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/DynamicQueryBasePhotovoltaicPlantInput.java

 package pps.core.base.service.data.base_photovoltaic_plant;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
 
+@Data
 public class DynamicQueryBasePhotovoltaicPlantInput {
     @XText("ID")
     private String id;
@@ -49,125 +51,9 @@ public class DynamicQueryBasePhotovoltaicPlantInput {
 
     @XText("阵列朝向")
     private BigDecimal arrayOrientation;
-
-    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 getStationName() {
-        return this.stationName;
-    }
-
-    public void setStationName(String value) {
-        this.stationName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getPhotovoltaicModelKey() {
-        return this.photovoltaicModelKey;
-    }
-
-    public void setPhotovoltaicModelKey(String value) {
-        this.photovoltaicModelKey = value;
-    }
-
-    public BigDecimal getMountingAngle() {
-        return this.mountingAngle;
-    }
-
-    public void setMountingAngle(BigDecimal value) {
-        this.mountingAngle = value;
-    }
-
-    public BigDecimal getTotalPower() {
-        return this.totalPower;
-    }
-
-    public void setTotalPower(BigDecimal value) {
-        this.totalPower = value;
-    }
-
-    public BigDecimal getArrayOrientation() {
-        return this.arrayOrientation;
-    }
-
-    public void setArrayOrientation(BigDecimal value) {
-        this.arrayOrientation = value;
-    }
+    @XText("组织机构name")
+    private String ouName;
+    @XText("光伏设备规格型号name(字典获取)")
+    private String photovoltaicModelName;
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/DynamicQueryBasePhotovoltaicPlantOutput.java

 package pps.core.base.service.data.base_photovoltaic_plant;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class DynamicQueryBasePhotovoltaicPlantOutput {
     @XText("ID")
     private String id;
@@ -49,125 +50,9 @@ public class DynamicQueryBasePhotovoltaicPlantOutput {
 
     @XText("阵列朝向")
     private BigDecimal arrayOrientation;
-
-    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 getStationName() {
-        return this.stationName;
-    }
-
-    public void setStationName(String value) {
-        this.stationName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getPhotovoltaicModelKey() {
-        return this.photovoltaicModelKey;
-    }
-
-    public void setPhotovoltaicModelKey(String value) {
-        this.photovoltaicModelKey = value;
-    }
-
-    public BigDecimal getMountingAngle() {
-        return this.mountingAngle;
-    }
-
-    public void setMountingAngle(BigDecimal value) {
-        this.mountingAngle = value;
-    }
-
-    public BigDecimal getTotalPower() {
-        return this.totalPower;
-    }
-
-    public void setTotalPower(BigDecimal value) {
-        this.totalPower = value;
-    }
-
-    public BigDecimal getArrayOrientation() {
-        return this.arrayOrientation;
-    }
-
-    public void setArrayOrientation(BigDecimal value) {
-        this.arrayOrientation = value;
-    }
+    @XText("组织机构name")
+    private String ouName;
+    @XText("光伏设备规格型号name(字典获取)")
+    private String photovoltaicModelName;
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/DynamicQueryBasePhotovoltaicPlantViewOutput.java

 package pps.core.base.service.data.base_photovoltaic_plant;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class DynamicQueryBasePhotovoltaicPlantViewOutput {
     @XText("ID")
     private String id;
@@ -49,125 +50,9 @@ public class DynamicQueryBasePhotovoltaicPlantViewOutput {
 
     @XText("阵列朝向")
     private BigDecimal arrayOrientation;
-
-    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 getStationName() {
-        return this.stationName;
-    }
-
-    public void setStationName(String value) {
-        this.stationName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getPhotovoltaicModelKey() {
-        return this.photovoltaicModelKey;
-    }
-
-    public void setPhotovoltaicModelKey(String value) {
-        this.photovoltaicModelKey = value;
-    }
-
-    public BigDecimal getMountingAngle() {
-        return this.mountingAngle;
-    }
-
-    public void setMountingAngle(BigDecimal value) {
-        this.mountingAngle = value;
-    }
-
-    public BigDecimal getTotalPower() {
-        return this.totalPower;
-    }
-
-    public void setTotalPower(BigDecimal value) {
-        this.totalPower = value;
-    }
-
-    public BigDecimal getArrayOrientation() {
-        return this.arrayOrientation;
-    }
-
-    public void setArrayOrientation(BigDecimal value) {
-        this.arrayOrientation = value;
-    }
+    @XText("组织机构name")
+    private String ouName;
+    @XText("光伏设备规格型号name(字典获取)")
+    private String photovoltaicModelName;
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/GetBasePhotovoltaicPlantInput.java

 package pps.core.base.service.data.base_photovoltaic_plant;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class GetBasePhotovoltaicPlantInput {
     @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("电站名称")
-    private String stationName;
-
-    @XText("出厂编号")
-    private String makerNumber;
-
-    @XText("光伏设备规格型号key(字典获取)")
-    private String photovoltaicModelKey;
-
-    @XText("安装倾角")
-    private BigDecimal mountingAngle;
-
-    @XText("装机总量(KWP)")
-    private BigDecimal totalPower;
-
-    @XText("阵列朝向")
-    private BigDecimal arrayOrientation;
-
-    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 getStationName() {
-        return this.stationName;
-    }
-
-    public void setStationName(String value) {
-        this.stationName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getPhotovoltaicModelKey() {
-        return this.photovoltaicModelKey;
-    }
-
-    public void setPhotovoltaicModelKey(String value) {
-        this.photovoltaicModelKey = value;
-    }
-
-    public BigDecimal getMountingAngle() {
-        return this.mountingAngle;
-    }
-
-    public void setMountingAngle(BigDecimal value) {
-        this.mountingAngle = value;
-    }
-
-    public BigDecimal getTotalPower() {
-        return this.totalPower;
-    }
-
-    public void setTotalPower(BigDecimal value) {
-        this.totalPower = value;
-    }
-
-    public BigDecimal getArrayOrientation() {
-        return this.arrayOrientation;
-    }
 
-    public void setArrayOrientation(BigDecimal value) {
-        this.arrayOrientation = value;
-    }
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/GetBasePhotovoltaicPlantOutput.java

 package pps.core.base.service.data.base_photovoltaic_plant;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
 
+@Data
 public class GetBasePhotovoltaicPlantOutput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -49,125 +51,9 @@ public class GetBasePhotovoltaicPlantOutput {
 
     @XText("阵列朝向")
     private BigDecimal arrayOrientation;
-
-    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 getStationName() {
-        return this.stationName;
-    }
-
-    public void setStationName(String value) {
-        this.stationName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getPhotovoltaicModelKey() {
-        return this.photovoltaicModelKey;
-    }
-
-    public void setPhotovoltaicModelKey(String value) {
-        this.photovoltaicModelKey = value;
-    }
-
-    public BigDecimal getMountingAngle() {
-        return this.mountingAngle;
-    }
-
-    public void setMountingAngle(BigDecimal value) {
-        this.mountingAngle = value;
-    }
-
-    public BigDecimal getTotalPower() {
-        return this.totalPower;
-    }
-
-    public void setTotalPower(BigDecimal value) {
-        this.totalPower = value;
-    }
-
-    public BigDecimal getArrayOrientation() {
-        return this.arrayOrientation;
-    }
-
-    public void setArrayOrientation(BigDecimal value) {
-        this.arrayOrientation = value;
-    }
+    @XText("组织机构name")
+    private String ouName;
+    @XText("光伏设备规格型号name(字典获取)")
+    private String photovoltaicModelName;
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/GetBasePhotovoltaicPlantViewInput.java

 package pps.core.base.service.data.base_photovoltaic_plant;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class GetBasePhotovoltaicPlantViewInput {
     @XText("ID")
     private String id;
@@ -50,124 +51,9 @@ public class GetBasePhotovoltaicPlantViewInput {
     @XText("阵列朝向")
     private BigDecimal arrayOrientation;
 
-    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 getStationName() {
-        return this.stationName;
-    }
-
-    public void setStationName(String value) {
-        this.stationName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getPhotovoltaicModelKey() {
-        return this.photovoltaicModelKey;
-    }
-
-    public void setPhotovoltaicModelKey(String value) {
-        this.photovoltaicModelKey = value;
-    }
-
-    public BigDecimal getMountingAngle() {
-        return this.mountingAngle;
-    }
-
-    public void setMountingAngle(BigDecimal value) {
-        this.mountingAngle = value;
-    }
-
-    public BigDecimal getTotalPower() {
-        return this.totalPower;
-    }
-
-    public void setTotalPower(BigDecimal value) {
-        this.totalPower = value;
-    }
-
-    public BigDecimal getArrayOrientation() {
-        return this.arrayOrientation;
-    }
-
-    public void setArrayOrientation(BigDecimal value) {
-        this.arrayOrientation = value;
-    }
+    @XText("组织机构name")
+    private String ouName;
+    @XText("光伏设备规格型号name(字典获取)")
+    private String photovoltaicModelName;
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/GetBasePhotovoltaicPlantViewOutput.java

 package pps.core.base.service.data.base_photovoltaic_plant;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class GetBasePhotovoltaicPlantViewOutput {
     @XText("ID")
     private String id;
@@ -50,124 +51,9 @@ public class GetBasePhotovoltaicPlantViewOutput {
     @XText("阵列朝向")
     private BigDecimal arrayOrientation;
 
-    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 getStationName() {
-        return this.stationName;
-    }
-
-    public void setStationName(String value) {
-        this.stationName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getPhotovoltaicModelKey() {
-        return this.photovoltaicModelKey;
-    }
-
-    public void setPhotovoltaicModelKey(String value) {
-        this.photovoltaicModelKey = value;
-    }
-
-    public BigDecimal getMountingAngle() {
-        return this.mountingAngle;
-    }
-
-    public void setMountingAngle(BigDecimal value) {
-        this.mountingAngle = value;
-    }
-
-    public BigDecimal getTotalPower() {
-        return this.totalPower;
-    }
-
-    public void setTotalPower(BigDecimal value) {
-        this.totalPower = value;
-    }
-
-    public BigDecimal getArrayOrientation() {
-        return this.arrayOrientation;
-    }
-
-    public void setArrayOrientation(BigDecimal value) {
-        this.arrayOrientation = value;
-    }
+    @XText("组织机构name")
+    private String ouName;
+    @XText("光伏设备规格型号name(字典获取)")
+    private String photovoltaicModelName;
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/QueryBasePhotovoltaicPlantInput.java

 package pps.core.base.service.data.base_photovoltaic_plant;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
 import xstartup.base.data.XPageInput;
-
+@Data
 public class QueryBasePhotovoltaicPlantInput 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;
@@ -51,124 +29,9 @@ public class QueryBasePhotovoltaicPlantInput extends XPageInput {
     @XText("阵列朝向")
     private BigDecimal arrayOrientation;
 
-    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 getStationName() {
-        return this.stationName;
-    }
-
-    public void setStationName(String value) {
-        this.stationName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getPhotovoltaicModelKey() {
-        return this.photovoltaicModelKey;
-    }
-
-    public void setPhotovoltaicModelKey(String value) {
-        this.photovoltaicModelKey = value;
-    }
-
-    public BigDecimal getMountingAngle() {
-        return this.mountingAngle;
-    }
-
-    public void setMountingAngle(BigDecimal value) {
-        this.mountingAngle = value;
-    }
-
-    public BigDecimal getTotalPower() {
-        return this.totalPower;
-    }
-
-    public void setTotalPower(BigDecimal value) {
-        this.totalPower = value;
-    }
-
-    public BigDecimal getArrayOrientation() {
-        return this.arrayOrientation;
-    }
-
-    public void setArrayOrientation(BigDecimal value) {
-        this.arrayOrientation = value;
-    }
+    @XText("组织机构name")
+    private String ouName;
+    @XText("光伏设备规格型号name(字典获取)")
+    private String photovoltaicModelName;
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/QueryBasePhotovoltaicPlantOutput.java

 package pps.core.base.service.data.base_photovoltaic_plant;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
 
 import xstartup.base.data.XPageInput;
+@Data
 public class QueryBasePhotovoltaicPlantOutput extends XPageInput {
     @XText("ID")
     private String id;
@@ -50,125 +52,9 @@ public class QueryBasePhotovoltaicPlantOutput extends XPageInput {
 
     @XText("阵列朝向")
     private BigDecimal arrayOrientation;
-
-    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 getStationName() {
-        return this.stationName;
-    }
-
-    public void setStationName(String value) {
-        this.stationName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getPhotovoltaicModelKey() {
-        return this.photovoltaicModelKey;
-    }
-
-    public void setPhotovoltaicModelKey(String value) {
-        this.photovoltaicModelKey = value;
-    }
-
-    public BigDecimal getMountingAngle() {
-        return this.mountingAngle;
-    }
-
-    public void setMountingAngle(BigDecimal value) {
-        this.mountingAngle = value;
-    }
-
-    public BigDecimal getTotalPower() {
-        return this.totalPower;
-    }
-
-    public void setTotalPower(BigDecimal value) {
-        this.totalPower = value;
-    }
-
-    public BigDecimal getArrayOrientation() {
-        return this.arrayOrientation;
-    }
-
-    public void setArrayOrientation(BigDecimal value) {
-        this.arrayOrientation = value;
-    }
+    @XText("组织机构name")
+    private String ouName;
+    @XText("光伏设备规格型号name(字典获取)")
+    private String photovoltaicModelName;
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/QueryBasePhotovoltaicPlantViewInput.java

 package pps.core.base.service.data.base_photovoltaic_plant;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
 import xstartup.base.data.XPageInput;
-
+@Data
 public class QueryBasePhotovoltaicPlantViewInput extends XPageInput {
     @XText("ID")
     private String id;
@@ -51,124 +52,9 @@ public class QueryBasePhotovoltaicPlantViewInput extends XPageInput {
     @XText("阵列朝向")
     private BigDecimal arrayOrientation;
 
-    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 getStationName() {
-        return this.stationName;
-    }
-
-    public void setStationName(String value) {
-        this.stationName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getPhotovoltaicModelKey() {
-        return this.photovoltaicModelKey;
-    }
-
-    public void setPhotovoltaicModelKey(String value) {
-        this.photovoltaicModelKey = value;
-    }
-
-    public BigDecimal getMountingAngle() {
-        return this.mountingAngle;
-    }
-
-    public void setMountingAngle(BigDecimal value) {
-        this.mountingAngle = value;
-    }
-
-    public BigDecimal getTotalPower() {
-        return this.totalPower;
-    }
-
-    public void setTotalPower(BigDecimal value) {
-        this.totalPower = value;
-    }
-
-    public BigDecimal getArrayOrientation() {
-        return this.arrayOrientation;
-    }
-
-    public void setArrayOrientation(BigDecimal value) {
-        this.arrayOrientation = value;
-    }
+    @XText("组织机构name")
+    private String ouName;
+    @XText("光伏设备规格型号name(字典获取)")
+    private String photovoltaicModelName;
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/QueryBasePhotovoltaicPlantViewOutput.java

 package pps.core.base.service.data.base_photovoltaic_plant;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
 
 import xstartup.base.data.XPageInput;
+@Data
 public class QueryBasePhotovoltaicPlantViewOutput extends XPageInput {
     @XText("ID")
     private String id;
@@ -51,124 +53,9 @@ public class QueryBasePhotovoltaicPlantViewOutput extends XPageInput {
     @XText("阵列朝向")
     private BigDecimal arrayOrientation;
 
-    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 getStationName() {
-        return this.stationName;
-    }
-
-    public void setStationName(String value) {
-        this.stationName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getPhotovoltaicModelKey() {
-        return this.photovoltaicModelKey;
-    }
-
-    public void setPhotovoltaicModelKey(String value) {
-        this.photovoltaicModelKey = value;
-    }
-
-    public BigDecimal getMountingAngle() {
-        return this.mountingAngle;
-    }
-
-    public void setMountingAngle(BigDecimal value) {
-        this.mountingAngle = value;
-    }
-
-    public BigDecimal getTotalPower() {
-        return this.totalPower;
-    }
-
-    public void setTotalPower(BigDecimal value) {
-        this.totalPower = value;
-    }
-
-    public BigDecimal getArrayOrientation() {
-        return this.arrayOrientation;
-    }
-
-    public void setArrayOrientation(BigDecimal value) {
-        this.arrayOrientation = value;
-    }
+    @XText("组织机构name")
+    private String ouName;
+    @XText("光伏设备规格型号name(字典获取)")
+    private String photovoltaicModelName;
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/UpdateBasePhotovoltaicPlantInput.java

 package pps.core.base.service.data.base_photovoltaic_plant;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class UpdateBasePhotovoltaicPlantInput {
     @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;
 
@@ -50,124 +30,9 @@ public class UpdateBasePhotovoltaicPlantInput {
     @XText("阵列朝向")
     private BigDecimal arrayOrientation;
 
-    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 getStationName() {
-        return this.stationName;
-    }
-
-    public void setStationName(String value) {
-        this.stationName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getPhotovoltaicModelKey() {
-        return this.photovoltaicModelKey;
-    }
-
-    public void setPhotovoltaicModelKey(String value) {
-        this.photovoltaicModelKey = value;
-    }
-
-    public BigDecimal getMountingAngle() {
-        return this.mountingAngle;
-    }
-
-    public void setMountingAngle(BigDecimal value) {
-        this.mountingAngle = value;
-    }
-
-    public BigDecimal getTotalPower() {
-        return this.totalPower;
-    }
-
-    public void setTotalPower(BigDecimal value) {
-        this.totalPower = value;
-    }
-
-    public BigDecimal getArrayOrientation() {
-        return this.arrayOrientation;
-    }
-
-    public void setArrayOrientation(BigDecimal value) {
-        this.arrayOrientation = value;
-    }
+    @XText("组织机构name")
+    private String ouName;
+    @XText("光伏设备规格型号name(字典获取)")
+    private String photovoltaicModelName;
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/UpdateBasePhotovoltaicPlantOutput.java

 package pps.core.base.service.data.base_photovoltaic_plant;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class UpdateBasePhotovoltaicPlantOutput {
     @XText("ID")
     private String id;
@@ -49,125 +50,9 @@ public class UpdateBasePhotovoltaicPlantOutput {
 
     @XText("阵列朝向")
     private BigDecimal arrayOrientation;
-
-    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 getStationName() {
-        return this.stationName;
-    }
-
-    public void setStationName(String value) {
-        this.stationName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getPhotovoltaicModelKey() {
-        return this.photovoltaicModelKey;
-    }
-
-    public void setPhotovoltaicModelKey(String value) {
-        this.photovoltaicModelKey = value;
-    }
-
-    public BigDecimal getMountingAngle() {
-        return this.mountingAngle;
-    }
-
-    public void setMountingAngle(BigDecimal value) {
-        this.mountingAngle = value;
-    }
-
-    public BigDecimal getTotalPower() {
-        return this.totalPower;
-    }
-
-    public void setTotalPower(BigDecimal value) {
-        this.totalPower = value;
-    }
-
-    public BigDecimal getArrayOrientation() {
-        return this.arrayOrientation;
-    }
-
-    public void setArrayOrientation(BigDecimal value) {
-        this.arrayOrientation = value;
-    }
+    @XText("组织机构name")
+    private String ouName;
+    @XText("光伏设备规格型号name(字典获取)")
+    private String photovoltaicModelName;
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wellhead/CreateBaseWellheadInput.java

@@ -5,105 +5,24 @@ import java.util.Date;
 import java.math.BigDecimal;
 
 public class CreateBaseWellheadInput {
-    @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("组织机构name")
+    private String ouName;
 
     @XText("井号")
     private String wellNumber;
 
     @XText("运行类型key(字典获取)")
     private String runTypeKey;
+    @XText("运行类型name(字典获取)")
+    private String runTypeName;
 
     @XText("运行功率(KW)")
     private BigDecimal serviceRating;
 
-    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;
@@ -137,4 +56,19 @@ public class CreateBaseWellheadInput {
         this.serviceRating = value;
     }
 
+    public String getOuName() {
+        return ouName;
+    }
+
+    public void setOuName(String ouName) {
+        this.ouName = ouName;
+    }
+
+    public String getRunTypeName() {
+        return runTypeName;
+    }
+
+    public void setRunTypeName(String runTypeName) {
+        this.runTypeName = runTypeName;
+    }
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wellhead/DeleteBaseWellheadInput.java

 package pps.core.base.service.data.base_wellhead;
 
 import xstartup.annotation.XText;
+
 import java.util.Date;
 import java.math.BigDecimal;
 
@@ -8,39 +9,6 @@ public class DeleteBaseWellheadInput {
     @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("井号")
-    private String wellNumber;
-
-    @XText("运行类型key(字典获取)")
-    private String runTypeKey;
-
-    @XText("运行功率(KW)")
-    private BigDecimal serviceRating;
-
     public String getId() {
         return this.id;
     }
@@ -49,92 +17,5 @@ public class DeleteBaseWellheadInput {
         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 getWellNumber() {
-        return this.wellNumber;
-    }
-
-    public void setWellNumber(String value) {
-        this.wellNumber = value;
-    }
-
-    public String getRunTypeKey() {
-        return this.runTypeKey;
-    }
-
-    public void setRunTypeKey(String value) {
-        this.runTypeKey = value;
-    }
-
-    public BigDecimal getServiceRating() {
-        return this.serviceRating;
-    }
-
-    public void setServiceRating(BigDecimal value) {
-        this.serviceRating = value;
-    }
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wellhead/GetBaseWellheadInput.java

 package pps.core.base.service.data.base_wellhead;
 
 import xstartup.annotation.XText;
+
 import java.util.Date;
 import java.math.BigDecimal;
 
@@ -8,39 +9,6 @@ public class GetBaseWellheadInput {
     @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("井号")
-    private String wellNumber;
-
-    @XText("运行类型key(字典获取)")
-    private String runTypeKey;
-
-    @XText("运行功率(KW)")
-    private BigDecimal serviceRating;
-
     public String getId() {
         return this.id;
     }
@@ -49,92 +17,5 @@ public class GetBaseWellheadInput {
         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 getWellNumber() {
-        return this.wellNumber;
-    }
-
-    public void setWellNumber(String value) {
-        this.wellNumber = value;
-    }
-
-    public String getRunTypeKey() {
-        return this.runTypeKey;
-    }
-
-    public void setRunTypeKey(String value) {
-        this.runTypeKey = value;
-    }
-
-    public BigDecimal getServiceRating() {
-        return this.serviceRating;
-    }
-
-    public void setServiceRating(BigDecimal value) {
-        this.serviceRating = value;
-    }
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wellhead/GetBaseWellheadOutput.java

@@ -31,12 +31,16 @@ public class GetBaseWellheadOutput {
 
     @XText("组织机构ID")
     private String ouId;
+    @XText("组织机构name")
+    private String ouName;
 
     @XText("井号")
     private String wellNumber;
 
     @XText("运行类型key(字典获取)")
     private String runTypeKey;
+    @XText("运行类型name(字典获取)")
+    private String runTypeName;
 
     @XText("运行功率(KW)")
     private BigDecimal serviceRating;
@@ -137,4 +141,19 @@ public class GetBaseWellheadOutput {
         this.serviceRating = value;
     }
 
+    public String getOuName() {
+        return ouName;
+    }
+
+    public void setOuName(String ouName) {
+        this.ouName = ouName;
+    }
+
+    public String getRunTypeName() {
+        return runTypeName;
+    }
+
+    public void setRunTypeName(String runTypeName) {
+        this.runTypeName = runTypeName;
+    }
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wellhead/QueryBaseWellheadInput.java

@@ -6,105 +6,24 @@ import java.math.BigDecimal;
 import xstartup.base.data.XPageInput;
 
 public class QueryBaseWellheadInput 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 ouName;
 
     @XText("井号")
     private String wellNumber;
 
     @XText("运行类型key(字典获取)")
     private String runTypeKey;
+    @XText("运行类型name(字典获取)")
+    private String runTypeName;
 
     @XText("运行功率(KW)")
     private BigDecimal serviceRating;
 
-    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;
@@ -138,4 +57,19 @@ public class QueryBaseWellheadInput extends XPageInput {
         this.serviceRating = value;
     }
 
+    public String getOuName() {
+        return ouName;
+    }
+
+    public void setOuName(String ouName) {
+        this.ouName = ouName;
+    }
+
+    public String getRunTypeName() {
+        return runTypeName;
+    }
+
+    public void setRunTypeName(String runTypeName) {
+        this.runTypeName = runTypeName;
+    }
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wellhead/QueryBaseWellheadOutput.java

@@ -9,7 +9,7 @@ public class QueryBaseWellheadOutput extends XPageInput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是；1_否)")
+    @XText("是否删除(1_是；0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -32,12 +32,16 @@ public class QueryBaseWellheadOutput extends XPageInput {
 
     @XText("组织机构ID")
     private String ouId;
+    @XText("组织机构名称")
+    private String ouName;
 
     @XText("井号")
     private String wellNumber;
 
     @XText("运行类型key(字典获取)")
     private String runTypeKey;
+    @XText("运行类型Name(字典获取)")
+    private String runTypeName;
 
     @XText("运行功率(KW)")
     private BigDecimal serviceRating;
@@ -138,4 +142,19 @@ public class QueryBaseWellheadOutput extends XPageInput {
         this.serviceRating = value;
     }
 
+    public String getOuName() {
+        return ouName;
+    }
+
+    public void setOuName(String ouName) {
+        this.ouName = ouName;
+    }
+
+    public String getRunTypeName() {
+        return runTypeName;
+    }
+
+    public void setRunTypeName(String runTypeName) {
+        this.runTypeName = runTypeName;
+    }
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wellhead/UpdateBaseWellheadInput.java

@@ -8,27 +8,6 @@ public class UpdateBaseWellheadInput {
     @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;
 
@@ -49,62 +28,6 @@ public class UpdateBaseWellheadInput {
         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;
     }

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

+package pps.core.base.utils;
+
+import pps.core.common.session.PpsUserSession;
+
+/**
+ * @Description 模拟
+ * @Author luoxiangyang
+ * @Date 2023/8/24 16:32
+ **/
+public class SessionSimulation {
+    public static PpsUserSession getSession (){
+        PpsUserSession session = new PpsUserSession();
+        session.setId("123");
+        session.setUserName("ceshi");
+        return session;
+    }
+}

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

@@ -11,9 +11,11 @@
     <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="ou_name" property="ouName" jdbcType="VARCHAR" />
     <result column="station_name" property="stationName" jdbcType="VARCHAR" />
     <result column="maker_number" property="makerNumber" jdbcType="VARCHAR" />
     <result column="photovoltaic_model_key" property="photovoltaicModelKey" jdbcType="VARCHAR" />
+    <result column="photovoltaic_model_name" property="photovoltaicModelName" jdbcType="VARCHAR" />
     <result column="mounting_angle" property="mountingAngle" jdbcType="DECIMAL" />
     <result column="total_power" property="totalPower" jdbcType="DECIMAL" />
     <result column="array_orientation" property="arrayOrientation" jdbcType="DECIMAL" />
@@ -28,9 +30,11 @@
     modify_by_name,
     modify_time,
     ou_id,
+    ou_name,
     station_name,
     maker_number,
     photovoltaic_model_key,
+    photovoltaic_model_name,
     mounting_angle,
     total_power,
     array_orientation

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

@@ -11,8 +11,10 @@
     <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="ou_name" property="ouName" jdbcType="VARCHAR" />
     <result column="well_number" property="wellNumber" jdbcType="VARCHAR" />
     <result column="run_type_key" property="runTypeKey" jdbcType="VARCHAR" />
+    <result column="run_type_name" property="runTypeName" jdbcType="VARCHAR" />
     <result column="service_rating" property="serviceRating" jdbcType="DECIMAL" />
   </resultMap>
   <sql id="Base_Column_List">
@@ -25,8 +27,10 @@
     modify_by_name,
     modify_time,
     ou_id,
+    ou_name,
     well_number,
     run_type_key,
+    run_type_name,
     service_rating
   </sql>
   <select id="selectOne" parameterType="pps.core.base.entity.BaseWellheadView" resultMap="BaseResultMap">