柴发设备配置,储能设备配置

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

 package pps.core.base.entity;
 
+import java.io.Serializable;
+import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
+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;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
+@Data
 @TableName("base_diesel_generator")
 public class BaseDieselGeneratorEnt 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;
 
@@ -48,6 +48,10 @@ public class BaseDieselGeneratorEnt implements Serializable {
     @TableField
     private String ouId;
 
+    @XText("组织机构name")
+    @TableField
+    private String ouName;
+
     @XText("设备名称")
     @TableField
     private String deviceName;
@@ -60,6 +64,10 @@ public class BaseDieselGeneratorEnt implements Serializable {
     @TableField
     private String unitTypeKey;
 
+    @XText("柴发设备机组型号name(字典获取)")
+    @TableField
+    private String unitTypeName;
+
     @XText("常用功率(KW)")
     @TableField
     private BigDecimal normalPower;
@@ -68,116 +76,4 @@ public class BaseDieselGeneratorEnt implements Serializable {
     @TableField
     private BigDecimal standbyPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getUnitTypeKey() {
-        return this.unitTypeKey;
-    }
-
-    public void setUnitTypeKey(String value) {
-        this.unitTypeKey = value;
-    }
-
-    public BigDecimal getNormalPower() {
-        return this.normalPower;
-    }
-
-    public void setNormalPower(BigDecimal value) {
-        this.normalPower = value;
-    }
-
-    public BigDecimal getStandbyPower() {
-        return this.standbyPower;
-    }
-
-    public void setStandbyPower(BigDecimal value) {
-        this.standbyPower = value;
-    }
-
 }

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

@@ -4,14 +4,15 @@ 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 BaseDieselGeneratorView implements Serializable {
     @XText("ID")
     @TableField
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     @TableField
     private Integer isDeleted;
 
@@ -43,6 +44,10 @@ public class BaseDieselGeneratorView implements Serializable {
     @TableField
     private String ouId;
 
+    @XText("组织机构name")
+    @TableField
+    private String ouName;
+
     @XText("设备名称")
     @TableField
     private String deviceName;
@@ -55,6 +60,10 @@ public class BaseDieselGeneratorView implements Serializable {
     @TableField
     private String unitTypeKey;
 
+    @XText("柴发设备机组型号name(字典获取)")
+    @TableField
+    private String unitTypeName;
+
     @XText("常用功率(KW)")
     @TableField
     private BigDecimal normalPower;
@@ -63,116 +72,4 @@ public class BaseDieselGeneratorView implements Serializable {
     @TableField
     private BigDecimal standbyPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getUnitTypeKey() {
-        return this.unitTypeKey;
-    }
-
-    public void setUnitTypeKey(String value) {
-        this.unitTypeKey = value;
-    }
-
-    public BigDecimal getNormalPower() {
-        return this.normalPower;
-    }
-
-    public void setNormalPower(BigDecimal value) {
-        this.normalPower = value;
-    }
-
-    public BigDecimal getStandbyPower() {
-        return this.standbyPower;
-    }
-
-    public void setStandbyPower(BigDecimal value) {
-        this.standbyPower = value;
-    }
-
 }

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

@@ -7,15 +7,16 @@ 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_energy_storage_device")
 public class BaseEnergyStorageDeviceEnt 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 +48,10 @@ public class BaseEnergyStorageDeviceEnt implements Serializable {
     @TableField
     private String ouId;
 
+    @XText("组织机构name")
+    @TableField
+    private String ouName;
+
     @XText("设备名称")
     @TableField
     private String deviceName;
@@ -59,6 +64,10 @@ public class BaseEnergyStorageDeviceEnt implements Serializable {
     @TableField
     private String storageModelKey;
 
+    @XText("储能设备规格型号name(字典获取)")
+    @TableField
+    private String storageModelName;
+
     @XText("设备容量(KWh)")
     @TableField
     private BigDecimal apparatusCapacity;
@@ -71,124 +80,5 @@ public class BaseEnergyStorageDeviceEnt implements Serializable {
     @TableField
     private BigDecimal ratedChargingPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getStorageModelKey() {
-        return this.storageModelKey;
-    }
-
-    public void setStorageModelKey(String value) {
-        this.storageModelKey = value;
-    }
-
-    public BigDecimal getApparatusCapacity() {
-        return this.apparatusCapacity;
-    }
-
-    public void setApparatusCapacity(BigDecimal value) {
-        this.apparatusCapacity = value;
-    }
-
-    public BigDecimal getRatedDischargePower() {
-        return this.ratedDischargePower;
-    }
-
-    public void setRatedDischargePower(BigDecimal value) {
-        this.ratedDischargePower = value;
-    }
-
-    public BigDecimal getRatedChargingPower() {
-        return this.ratedChargingPower;
-    }
-
-    public void setRatedChargingPower(BigDecimal value) {
-        this.ratedChargingPower = value;
-    }
 
 }

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

@@ -4,14 +4,15 @@ 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 BaseEnergyStorageDeviceView implements Serializable {
     @XText("ID")
     @TableField
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     @TableField
     private Integer isDeleted;
 
@@ -43,6 +44,10 @@ public class BaseEnergyStorageDeviceView implements Serializable {
     @TableField
     private String ouId;
 
+    @XText("组织机构name")
+    @TableField
+    private String ouName;
+
     @XText("设备名称")
     @TableField
     private String deviceName;
@@ -55,6 +60,10 @@ public class BaseEnergyStorageDeviceView implements Serializable {
     @TableField
     private String storageModelKey;
 
+    @XText("储能设备规格型号name(字典获取)")
+    @TableField
+    private String storageModelName;
+
     @XText("设备容量(KWh)")
     @TableField
     private BigDecimal apparatusCapacity;
@@ -67,124 +76,4 @@ public class BaseEnergyStorageDeviceView implements Serializable {
     @TableField
     private BigDecimal ratedChargingPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getStorageModelKey() {
-        return this.storageModelKey;
-    }
-
-    public void setStorageModelKey(String value) {
-        this.storageModelKey = value;
-    }
-
-    public BigDecimal getApparatusCapacity() {
-        return this.apparatusCapacity;
-    }
-
-    public void setApparatusCapacity(BigDecimal value) {
-        this.apparatusCapacity = value;
-    }
-
-    public BigDecimal getRatedDischargePower() {
-        return this.ratedDischargePower;
-    }
-
-    public void setRatedDischargePower(BigDecimal value) {
-        this.ratedDischargePower = value;
-    }
-
-    public BigDecimal getRatedChargingPower() {
-        return this.ratedChargingPower;
-    }
-
-    public void setRatedChargingPower(BigDecimal value) {
-        this.ratedChargingPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseDieselGeneratorService.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.BaseDieselGeneratorEnt;
-import pps.core.base.entity.BaseDieselGeneratorView;
 import pps.core.base.mapper.BaseDieselGeneratorMapper;
-import pps.core.base.mapper.BaseDieselGeneratorViewMapper;
 import pps.core.base.service.data.base_diesel_generator.*;
+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,55 +21,88 @@ 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/25
+ **/
 @XService
 public class BaseDieselGeneratorService {
+    //todo 模拟登陆
+    private final PpsUserSession session = SessionSimulation.getSession();
+
+    @XText("新增")
     @XApiAnonymous
     @XApiPost
     public XServiceResult createBaseDieselGenerator(XContext context, CreateBaseDieselGeneratorInput input) {
         BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
         BaseDieselGeneratorEnt entity = new BaseDieselGeneratorEnt();
         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 updateBaseDieselGenerator(XContext context, UpdateBaseDieselGeneratorInput input) {
         BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
         QueryWrapper<BaseDieselGeneratorEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BaseDieselGeneratorEnt::getId, input.getId());
+        queryWrapper.lambda()
+                .eq(BaseDieselGeneratorEnt::getId, input.getId())
+                .eq(BaseDieselGeneratorEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE);
         BaseDieselGeneratorEnt 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 deleteBaseDieselGenerator(XContext context, DeleteBaseDieselGeneratorInput input) {
         BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
         QueryWrapper<BaseDieselGeneratorEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BaseDieselGeneratorEnt::getId, input.getId());
+        queryWrapper.lambda()
+                .eq(BaseDieselGeneratorEnt::getId, input.getId())
+                .eq(BaseDieselGeneratorEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE);
         BaseDieselGeneratorEnt entity = mapper.selectOne(queryWrapper);
         if (entity == null) {
             return XServiceResult.error(context, XError.NotFound);
         }
-        mapper.deleteById(entity);
+        entity = new BaseDieselGeneratorEnt();
+        entity.setId(input.getId());
+        entity.setIsDeleted(ScadaConstant.IS_DELETE_TRUE);
+        entity.setModifyById(session.getId());
+        entity.setModifyByName(session.getUserName());
+        entity.setModifyTime(new Date());
+        mapper.updateById(entity);
         return XServiceResult.OK;
     }
 
+    @XText("根据id获取详情")
     @XApiAnonymous
     @XApiGet
     public XSingleResult<GetBaseDieselGeneratorOutput> getBaseDieselGenerator(XContext context, GetBaseDieselGeneratorInput input) {
         BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
         QueryWrapper<BaseDieselGeneratorEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BaseDieselGeneratorEnt::getId, input.getId());
+        queryWrapper.lambda()
+                .eq(BaseDieselGeneratorEnt::getId, input.getId())
+                .eq(BaseDieselGeneratorEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE);
         BaseDieselGeneratorEnt entity = mapper.selectOne(queryWrapper);
         if (entity == null) {
             return XSingleResult.error(context, XError.NotFound);
@@ -79,61 +112,21 @@ public class BaseDieselGeneratorService {
         return XSingleResult.success(output);
     }
 
+    @XText("分页查询")
     @XApiAnonymous
     @XApiGet
     public XPageResult<QueryBaseDieselGeneratorOutput> queryBaseDieselGenerator(XContext context, QueryBaseDieselGeneratorInput input) {
+        String ouId = input.getOuId();
+        String ouName = input.getOuName();
+        String deviceName = input.getDeviceName();
         BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
         QueryWrapper<BaseDieselGeneratorEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().like(BaseDieselGeneratorEnt::getId, input.getId())
-                .eq(BaseDieselGeneratorEnt::getIsDeleted, input.getIsDeleted())
-                .like(BaseDieselGeneratorEnt::getCreateById, input.getCreateById())
-                .like(BaseDieselGeneratorEnt::getCreateByName, input.getCreateByName())
-                .eq(BaseDieselGeneratorEnt::getCreateTime, input.getCreateTime())
-                .like(BaseDieselGeneratorEnt::getModifyById, input.getModifyById())
-                .like(BaseDieselGeneratorEnt::getModifyByName, input.getModifyByName())
-                .eq(BaseDieselGeneratorEnt::getModifyTime, input.getModifyTime())
-                .like(BaseDieselGeneratorEnt::getOuId, input.getOuId())
-                .like(BaseDieselGeneratorEnt::getDeviceName, input.getDeviceName())
-                .like(BaseDieselGeneratorEnt::getMakerNumber, input.getMakerNumber())
-                .like(BaseDieselGeneratorEnt::getUnitTypeKey, input.getUnitTypeKey())
-                .eq(BaseDieselGeneratorEnt::getNormalPower, input.getNormalPower())
-                .eq(BaseDieselGeneratorEnt::getStandbyPower, input.getStandbyPower());
+        queryWrapper.lambda()
+                .eq(BaseDieselGeneratorEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE)
+                .eq(StrUtil.isNotEmpty(ouId), BaseDieselGeneratorEnt::getOuId, ouId)
+                .like(StrUtil.isNotEmpty(ouName), BaseDieselGeneratorEnt::getOuName, ouName)
+                .like(StrUtil.isNotEmpty(deviceName), BaseDieselGeneratorEnt::getDeviceName, deviceName)
+                .orderByDesc(BaseDieselGeneratorEnt::getModifyTime);
         return XMapperHelper.query(mapper, input, queryWrapper, QueryBaseDieselGeneratorOutput.class);
     }
-
-    @XApiAnonymous
-    @XApiGet
-    public XPageResult<QueryBaseDieselGeneratorOutput> dynamicQueryBaseDieselGenerator(XContext context, CustomQueryInput input) {
-        BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
-        return XMapperHelper.query(mapper, input, BaseDieselGeneratorEnt.class, QueryBaseDieselGeneratorOutput.class);
-    }
-
-    @XApiAnonymous
-    @XApiGet
-    public XSingleResult<GetBaseDieselGeneratorViewOutput> getBaseDieselGeneratorView(XContext context, GetBaseDieselGeneratorViewInput input) {
-        BaseDieselGeneratorViewMapper mapper = context.getBean(BaseDieselGeneratorViewMapper.class);
-        BaseDieselGeneratorView record = new BaseDieselGeneratorView();
-        XCopyUtils.copyObject(input, record);
-        BaseDieselGeneratorView view = mapper.selectOne(record);
-        if (view == null) {
-            return XSingleResult.error(context, XError.NotFound);
-        }
-        GetBaseDieselGeneratorViewOutput output = new GetBaseDieselGeneratorViewOutput();
-        XCopyUtils.copyObject(view, output);
-        return XSingleResult.success(output);
-    }
-
-    @XApiAnonymous
-    @XApiGet
-    public XPageResult<QueryBaseDieselGeneratorViewOutput> queryBaseDieselGeneratorView(XContext context, QueryBaseDieselGeneratorViewInput input) {
-        BaseDieselGeneratorViewMapper mapper = context.getBean(BaseDieselGeneratorViewMapper.class);
-        BaseDieselGeneratorView record = new BaseDieselGeneratorView();
-        XCopyUtils.copyObject(input, record);
-        PageHelper.startPage(input.getPage(), input.getLimit());
-        List<BaseDieselGeneratorView> list = mapper.selectList(record);
-        PageInfo<BaseDieselGeneratorView> pageInfo = new PageInfo<>(list);
-        List<QueryBaseDieselGeneratorViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBaseDieselGeneratorViewOutput.class);
-        return XPageResult.success(outputs, input, pageInfo.getTotal());
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseEnergyStorageDeviceService.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.BaseEnergyStorageDeviceEnt;
-import pps.core.base.entity.BaseEnergyStorageDeviceView;
 import pps.core.base.mapper.BaseEnergyStorageDeviceMapper;
-import pps.core.base.mapper.BaseEnergyStorageDeviceViewMapper;
 import pps.core.base.service.data.base_energy_storage_device.*;
+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,55 +21,88 @@ 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/25
+ **/
 @XService
 public class BaseEnergyStorageDeviceService {
+    //todo 模拟登陆
+    private final PpsUserSession session = SessionSimulation.getSession();
+
+    @XText("新增")
     @XApiAnonymous
     @XApiPost
     public XServiceResult createBaseEnergyStorageDevice(XContext context, CreateBaseEnergyStorageDeviceInput input) {
         BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
         BaseEnergyStorageDeviceEnt entity = new BaseEnergyStorageDeviceEnt();
         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 updateBaseEnergyStorageDevice(XContext context, UpdateBaseEnergyStorageDeviceInput input) {
         BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
         QueryWrapper<BaseEnergyStorageDeviceEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BaseEnergyStorageDeviceEnt::getId, input.getId());
+        queryWrapper.lambda()
+                .eq(BaseEnergyStorageDeviceEnt::getId, input.getId())
+                .eq(BaseEnergyStorageDeviceEnt::getIsDeleted,ScadaConstant.IS_DELETE_FLASE);
         BaseEnergyStorageDeviceEnt 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 deleteBaseEnergyStorageDevice(XContext context, DeleteBaseEnergyStorageDeviceInput input) {
         BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
         QueryWrapper<BaseEnergyStorageDeviceEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BaseEnergyStorageDeviceEnt::getId, input.getId());
+        queryWrapper.lambda()
+                .eq(BaseEnergyStorageDeviceEnt::getId, input.getId())
+                .eq(BaseEnergyStorageDeviceEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE);
         BaseEnergyStorageDeviceEnt entity = mapper.selectOne(queryWrapper);
         if (entity == null) {
             return XServiceResult.error(context, XError.NotFound);
         }
-        mapper.deleteById(entity);
+        entity = new BaseEnergyStorageDeviceEnt();
+        entity.setId(input.getId());
+        entity.setIsDeleted(ScadaConstant.IS_DELETE_TRUE);
+        entity.setModifyById(session.getId());
+        entity.setModifyByName(session.getUserName());
+        entity.setModifyTime(new Date());
+        mapper.updateById(entity);
         return XServiceResult.OK;
     }
 
+    @XText("根据id获取详情")
     @XApiAnonymous
     @XApiGet
     public XSingleResult<GetBaseEnergyStorageDeviceOutput> getBaseEnergyStorageDevice(XContext context, GetBaseEnergyStorageDeviceInput input) {
         BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
         QueryWrapper<BaseEnergyStorageDeviceEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BaseEnergyStorageDeviceEnt::getId, input.getId());
+        queryWrapper.lambda()
+                .eq(BaseEnergyStorageDeviceEnt::getId, input.getId())
+                .eq(BaseEnergyStorageDeviceEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE);
         BaseEnergyStorageDeviceEnt entity = mapper.selectOne(queryWrapper);
         if (entity == null) {
             return XSingleResult.error(context, XError.NotFound);
@@ -79,62 +112,21 @@ public class BaseEnergyStorageDeviceService {
         return XSingleResult.success(output);
     }
 
+    @XText("分页查询")
     @XApiAnonymous
     @XApiGet
     public XPageResult<QueryBaseEnergyStorageDeviceOutput> queryBaseEnergyStorageDevice(XContext context, QueryBaseEnergyStorageDeviceInput input) {
+        String ouId = input.getOuId();
+        String ouName = input.getOuName();
+        String deviceName = input.getDeviceName();
         BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
         QueryWrapper<BaseEnergyStorageDeviceEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().like(BaseEnergyStorageDeviceEnt::getId, input.getId())
-                .eq(BaseEnergyStorageDeviceEnt::getIsDeleted, input.getIsDeleted())
-                .like(BaseEnergyStorageDeviceEnt::getCreateById, input.getCreateById())
-                .like(BaseEnergyStorageDeviceEnt::getCreateByName, input.getCreateByName())
-                .eq(BaseEnergyStorageDeviceEnt::getCreateTime, input.getCreateTime())
-                .like(BaseEnergyStorageDeviceEnt::getModifyById, input.getModifyById())
-                .like(BaseEnergyStorageDeviceEnt::getModifyByName, input.getModifyByName())
-                .eq(BaseEnergyStorageDeviceEnt::getModifyTime, input.getModifyTime())
-                .like(BaseEnergyStorageDeviceEnt::getOuId, input.getOuId())
-                .like(BaseEnergyStorageDeviceEnt::getDeviceName, input.getDeviceName())
-                .like(BaseEnergyStorageDeviceEnt::getMakerNumber, input.getMakerNumber())
-                .like(BaseEnergyStorageDeviceEnt::getStorageModelKey, input.getStorageModelKey())
-                .eq(BaseEnergyStorageDeviceEnt::getApparatusCapacity, input.getApparatusCapacity())
-                .eq(BaseEnergyStorageDeviceEnt::getRatedDischargePower, input.getRatedDischargePower())
-                .eq(BaseEnergyStorageDeviceEnt::getRatedChargingPower, input.getRatedChargingPower());
+        queryWrapper.lambda()
+                .eq(BaseEnergyStorageDeviceEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE)
+                .eq(StrUtil.isNotEmpty(ouId),BaseEnergyStorageDeviceEnt::getOuId, ouId)
+                .like(StrUtil.isNotEmpty(ouName),BaseEnergyStorageDeviceEnt::getOuName, ouName)
+                .like(StrUtil.isNotEmpty(deviceName),BaseEnergyStorageDeviceEnt::getDeviceName, deviceName)
+                .orderByDesc(BaseEnergyStorageDeviceEnt::getModifyTime);
         return XMapperHelper.query(mapper, input, queryWrapper, QueryBaseEnergyStorageDeviceOutput.class);
     }
-
-    @XApiAnonymous
-    @XApiGet
-    public XPageResult<QueryBaseEnergyStorageDeviceOutput> dynamicQueryBaseEnergyStorageDevice(XContext context, CustomQueryInput input) {
-        BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
-        return XMapperHelper.query(mapper, input, BaseEnergyStorageDeviceEnt.class, QueryBaseEnergyStorageDeviceOutput.class);
-    }
-
-    @XApiAnonymous
-    @XApiGet
-    public XSingleResult<GetBaseEnergyStorageDeviceViewOutput> getBaseEnergyStorageDeviceView(XContext context, GetBaseEnergyStorageDeviceViewInput input) {
-        BaseEnergyStorageDeviceViewMapper mapper = context.getBean(BaseEnergyStorageDeviceViewMapper.class);
-        BaseEnergyStorageDeviceView record = new BaseEnergyStorageDeviceView();
-        XCopyUtils.copyObject(input, record);
-        BaseEnergyStorageDeviceView view = mapper.selectOne(record);
-        if (view == null) {
-            return XSingleResult.error(context, XError.NotFound);
-        }
-        GetBaseEnergyStorageDeviceViewOutput output = new GetBaseEnergyStorageDeviceViewOutput();
-        XCopyUtils.copyObject(view, output);
-        return XSingleResult.success(output);
-    }
-
-    @XApiAnonymous
-    @XApiGet
-    public XPageResult<QueryBaseEnergyStorageDeviceViewOutput> queryBaseEnergyStorageDeviceView(XContext context, QueryBaseEnergyStorageDeviceViewInput input) {
-        BaseEnergyStorageDeviceViewMapper mapper = context.getBean(BaseEnergyStorageDeviceViewMapper.class);
-        BaseEnergyStorageDeviceView record = new BaseEnergyStorageDeviceView();
-        XCopyUtils.copyObject(input, record);
-        PageHelper.startPage(input.getPage(), input.getLimit());
-        List<BaseEnergyStorageDeviceView> list = mapper.selectList(record);
-        PageInfo<BaseEnergyStorageDeviceView> pageInfo = new PageInfo<>(list);
-        List<QueryBaseEnergyStorageDeviceViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBaseEnergyStorageDeviceViewOutput.class);
-        return XPageResult.success(outputs, input, pageInfo.getTotal());
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_diesel_generator/CreateBaseDieselGeneratorInput.java

 package pps.core.base.service.data.base_diesel_generator;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class CreateBaseDieselGeneratorInput {
-    @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 deviceName;
 
@@ -41,122 +22,13 @@ public class CreateBaseDieselGeneratorInput {
     @XText("柴发设备机组型号key(字典获取)")
     private String unitTypeKey;
 
+    @XText("柴发设备机组型号name(字典获取)")
+    private String unitTypeName;
+
     @XText("常用功率(KW)")
     private BigDecimal normalPower;
 
     @XText("备用功率(KW)")
     private BigDecimal standbyPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getUnitTypeKey() {
-        return this.unitTypeKey;
-    }
-
-    public void setUnitTypeKey(String value) {
-        this.unitTypeKey = value;
-    }
-
-    public BigDecimal getNormalPower() {
-        return this.normalPower;
-    }
-
-    public void setNormalPower(BigDecimal value) {
-        this.normalPower = value;
-    }
-
-    public BigDecimal getStandbyPower() {
-        return this.standbyPower;
-    }
-
-    public void setStandbyPower(BigDecimal value) {
-        this.standbyPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_diesel_generator/CreateBaseDieselGeneratorOutput.java

 package pps.core.base.service.data.base_diesel_generator;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class CreateBaseDieselGeneratorOutput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -32,6 +33,9 @@ public class CreateBaseDieselGeneratorOutput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -41,122 +45,13 @@ public class CreateBaseDieselGeneratorOutput {
     @XText("柴发设备机组型号key(字典获取)")
     private String unitTypeKey;
 
+    @XText("柴发设备机组型号name(字典获取)")
+    private String unitTypeName;
+
     @XText("常用功率(KW)")
     private BigDecimal normalPower;
 
     @XText("备用功率(KW)")
     private BigDecimal standbyPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getUnitTypeKey() {
-        return this.unitTypeKey;
-    }
-
-    public void setUnitTypeKey(String value) {
-        this.unitTypeKey = value;
-    }
-
-    public BigDecimal getNormalPower() {
-        return this.normalPower;
-    }
-
-    public void setNormalPower(BigDecimal value) {
-        this.normalPower = value;
-    }
-
-    public BigDecimal getStandbyPower() {
-        return this.standbyPower;
-    }
-
-    public void setStandbyPower(BigDecimal value) {
-        this.standbyPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_diesel_generator/DeleteBaseDieselGeneratorInput.java

 package pps.core.base.service.data.base_diesel_generator;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class DeleteBaseDieselGeneratorInput {
     @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 deviceName;
-
-    @XText("出厂编号")
-    private String makerNumber;
-
-    @XText("柴发设备机组型号key(字典获取)")
-    private String unitTypeKey;
-
-    @XText("常用功率(KW)")
-    private BigDecimal normalPower;
-
-    @XText("备用功率(KW)")
-    private BigDecimal standbyPower;
-
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getUnitTypeKey() {
-        return this.unitTypeKey;
-    }
-
-    public void setUnitTypeKey(String value) {
-        this.unitTypeKey = value;
-    }
-
-    public BigDecimal getNormalPower() {
-        return this.normalPower;
-    }
-
-    public void setNormalPower(BigDecimal value) {
-        this.normalPower = value;
-    }
-
-    public BigDecimal getStandbyPower() {
-        return this.standbyPower;
-    }
-
-    public void setStandbyPower(BigDecimal value) {
-        this.standbyPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_diesel_generator/DeleteBaseDieselGeneratorOutput.java

 package pps.core.base.service.data.base_diesel_generator;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class DeleteBaseDieselGeneratorOutput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -32,6 +33,9 @@ public class DeleteBaseDieselGeneratorOutput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -41,122 +45,14 @@ public class DeleteBaseDieselGeneratorOutput {
     @XText("柴发设备机组型号key(字典获取)")
     private String unitTypeKey;
 
+    @XText("柴发设备机组型号name(字典获取)")
+    private String unitTypeName;
+
     @XText("常用功率(KW)")
     private BigDecimal normalPower;
 
     @XText("备用功率(KW)")
     private BigDecimal standbyPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getUnitTypeKey() {
-        return this.unitTypeKey;
-    }
-
-    public void setUnitTypeKey(String value) {
-        this.unitTypeKey = value;
-    }
-
-    public BigDecimal getNormalPower() {
-        return this.normalPower;
-    }
-
-    public void setNormalPower(BigDecimal value) {
-        this.normalPower = value;
-    }
-
-    public BigDecimal getStandbyPower() {
-        return this.standbyPower;
-    }
-
-    public void setStandbyPower(BigDecimal value) {
-        this.standbyPower = value;
-    }
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_diesel_generator/DynamicQueryBaseDieselGeneratorInput.java

 package pps.core.base.service.data.base_diesel_generator;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class DynamicQueryBaseDieselGeneratorInput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -32,6 +33,9 @@ public class DynamicQueryBaseDieselGeneratorInput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -41,122 +45,13 @@ public class DynamicQueryBaseDieselGeneratorInput {
     @XText("柴发设备机组型号key(字典获取)")
     private String unitTypeKey;
 
+    @XText("柴发设备机组型号name(字典获取)")
+    private String unitTypeName;
+
     @XText("常用功率(KW)")
     private BigDecimal normalPower;
 
     @XText("备用功率(KW)")
     private BigDecimal standbyPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getUnitTypeKey() {
-        return this.unitTypeKey;
-    }
-
-    public void setUnitTypeKey(String value) {
-        this.unitTypeKey = value;
-    }
-
-    public BigDecimal getNormalPower() {
-        return this.normalPower;
-    }
-
-    public void setNormalPower(BigDecimal value) {
-        this.normalPower = value;
-    }
-
-    public BigDecimal getStandbyPower() {
-        return this.standbyPower;
-    }
-
-    public void setStandbyPower(BigDecimal value) {
-        this.standbyPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_diesel_generator/DynamicQueryBaseDieselGeneratorOutput.java

 package pps.core.base.service.data.base_diesel_generator;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class DynamicQueryBaseDieselGeneratorOutput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -32,6 +33,9 @@ public class DynamicQueryBaseDieselGeneratorOutput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -41,122 +45,14 @@ public class DynamicQueryBaseDieselGeneratorOutput {
     @XText("柴发设备机组型号key(字典获取)")
     private String unitTypeKey;
 
+    @XText("柴发设备机组型号name(字典获取)")
+    private String unitTypeName;
+
     @XText("常用功率(KW)")
     private BigDecimal normalPower;
 
     @XText("备用功率(KW)")
     private BigDecimal standbyPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getUnitTypeKey() {
-        return this.unitTypeKey;
-    }
-
-    public void setUnitTypeKey(String value) {
-        this.unitTypeKey = value;
-    }
-
-    public BigDecimal getNormalPower() {
-        return this.normalPower;
-    }
-
-    public void setNormalPower(BigDecimal value) {
-        this.normalPower = value;
-    }
-
-    public BigDecimal getStandbyPower() {
-        return this.standbyPower;
-    }
-
-    public void setStandbyPower(BigDecimal value) {
-        this.standbyPower = value;
-    }
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_diesel_generator/DynamicQueryBaseDieselGeneratorViewOutput.java

 package pps.core.base.service.data.base_diesel_generator;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class DynamicQueryBaseDieselGeneratorViewOutput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -32,6 +33,9 @@ public class DynamicQueryBaseDieselGeneratorViewOutput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -41,122 +45,13 @@ public class DynamicQueryBaseDieselGeneratorViewOutput {
     @XText("柴发设备机组型号key(字典获取)")
     private String unitTypeKey;
 
+    @XText("柴发设备机组型号name(字典获取)")
+    private String unitTypeName;
+
     @XText("常用功率(KW)")
     private BigDecimal normalPower;
 
     @XText("备用功率(KW)")
     private BigDecimal standbyPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getUnitTypeKey() {
-        return this.unitTypeKey;
-    }
-
-    public void setUnitTypeKey(String value) {
-        this.unitTypeKey = value;
-    }
-
-    public BigDecimal getNormalPower() {
-        return this.normalPower;
-    }
-
-    public void setNormalPower(BigDecimal value) {
-        this.normalPower = value;
-    }
-
-    public BigDecimal getStandbyPower() {
-        return this.standbyPower;
-    }
-
-    public void setStandbyPower(BigDecimal value) {
-        this.standbyPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_diesel_generator/GetBaseDieselGeneratorInput.java

 package pps.core.base.service.data.base_diesel_generator;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class GetBaseDieselGeneratorInput {
     @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 deviceName;
-
-    @XText("出厂编号")
-    private String makerNumber;
-
-    @XText("柴发设备机组型号key(字典获取)")
-    private String unitTypeKey;
-
-    @XText("常用功率(KW)")
-    private BigDecimal normalPower;
-
-    @XText("备用功率(KW)")
-    private BigDecimal standbyPower;
-
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getUnitTypeKey() {
-        return this.unitTypeKey;
-    }
-
-    public void setUnitTypeKey(String value) {
-        this.unitTypeKey = value;
-    }
-
-    public BigDecimal getNormalPower() {
-        return this.normalPower;
-    }
-
-    public void setNormalPower(BigDecimal value) {
-        this.normalPower = value;
-    }
-
-    public BigDecimal getStandbyPower() {
-        return this.standbyPower;
-    }
-
-    public void setStandbyPower(BigDecimal value) {
-        this.standbyPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_diesel_generator/GetBaseDieselGeneratorOutput.java

 package pps.core.base.service.data.base_diesel_generator;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
 
+@Data
 public class GetBaseDieselGeneratorOutput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -32,6 +34,9 @@ public class GetBaseDieselGeneratorOutput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -41,122 +46,13 @@ public class GetBaseDieselGeneratorOutput {
     @XText("柴发设备机组型号key(字典获取)")
     private String unitTypeKey;
 
+    @XText("柴发设备机组型号name(字典获取)")
+    private String unitTypeName;
+
     @XText("常用功率(KW)")
     private BigDecimal normalPower;
 
     @XText("备用功率(KW)")
     private BigDecimal standbyPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getUnitTypeKey() {
-        return this.unitTypeKey;
-    }
-
-    public void setUnitTypeKey(String value) {
-        this.unitTypeKey = value;
-    }
-
-    public BigDecimal getNormalPower() {
-        return this.normalPower;
-    }
-
-    public void setNormalPower(BigDecimal value) {
-        this.normalPower = value;
-    }
-
-    public BigDecimal getStandbyPower() {
-        return this.standbyPower;
-    }
-
-    public void setStandbyPower(BigDecimal value) {
-        this.standbyPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_diesel_generator/GetBaseDieselGeneratorViewInput.java

 package pps.core.base.service.data.base_diesel_generator;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class GetBaseDieselGeneratorViewInput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -32,6 +33,9 @@ public class GetBaseDieselGeneratorViewInput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -41,122 +45,13 @@ public class GetBaseDieselGeneratorViewInput {
     @XText("柴发设备机组型号key(字典获取)")
     private String unitTypeKey;
 
+    @XText("柴发设备机组型号name(字典获取)")
+    private String unitTypeName;
+
     @XText("常用功率(KW)")
     private BigDecimal normalPower;
 
     @XText("备用功率(KW)")
     private BigDecimal standbyPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getUnitTypeKey() {
-        return this.unitTypeKey;
-    }
-
-    public void setUnitTypeKey(String value) {
-        this.unitTypeKey = value;
-    }
-
-    public BigDecimal getNormalPower() {
-        return this.normalPower;
-    }
-
-    public void setNormalPower(BigDecimal value) {
-        this.normalPower = value;
-    }
-
-    public BigDecimal getStandbyPower() {
-        return this.standbyPower;
-    }
-
-    public void setStandbyPower(BigDecimal value) {
-        this.standbyPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_diesel_generator/GetBaseDieselGeneratorViewOutput.java

 package pps.core.base.service.data.base_diesel_generator;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class GetBaseDieselGeneratorViewOutput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -32,6 +33,9 @@ public class GetBaseDieselGeneratorViewOutput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -41,122 +45,13 @@ public class GetBaseDieselGeneratorViewOutput {
     @XText("柴发设备机组型号key(字典获取)")
     private String unitTypeKey;
 
+    @XText("柴发设备机组型号name(字典获取)")
+    private String unitTypeName;
+
     @XText("常用功率(KW)")
     private BigDecimal normalPower;
 
     @XText("备用功率(KW)")
     private BigDecimal standbyPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getUnitTypeKey() {
-        return this.unitTypeKey;
-    }
-
-    public void setUnitTypeKey(String value) {
-        this.unitTypeKey = value;
-    }
-
-    public BigDecimal getNormalPower() {
-        return this.normalPower;
-    }
-
-    public void setNormalPower(BigDecimal value) {
-        this.normalPower = value;
-    }
-
-    public BigDecimal getStandbyPower() {
-        return this.standbyPower;
-    }
-
-    public void setStandbyPower(BigDecimal value) {
-        this.standbyPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_diesel_generator/QueryBaseDieselGeneratorInput.java

 package pps.core.base.service.data.base_diesel_generator;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
 import xstartup.base.data.XPageInput;
-
+@Data
 public class QueryBaseDieselGeneratorInput 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("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -42,122 +23,13 @@ public class QueryBaseDieselGeneratorInput extends XPageInput {
     @XText("柴发设备机组型号key(字典获取)")
     private String unitTypeKey;
 
+    @XText("柴发设备机组型号name(字典获取)")
+    private String unitTypeName;
+
     @XText("常用功率(KW)")
     private BigDecimal normalPower;
 
     @XText("备用功率(KW)")
     private BigDecimal standbyPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getUnitTypeKey() {
-        return this.unitTypeKey;
-    }
-
-    public void setUnitTypeKey(String value) {
-        this.unitTypeKey = value;
-    }
-
-    public BigDecimal getNormalPower() {
-        return this.normalPower;
-    }
-
-    public void setNormalPower(BigDecimal value) {
-        this.normalPower = value;
-    }
-
-    public BigDecimal getStandbyPower() {
-        return this.standbyPower;
-    }
-
-    public void setStandbyPower(BigDecimal value) {
-        this.standbyPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_diesel_generator/QueryBaseDieselGeneratorOutput.java

 package pps.core.base.service.data.base_diesel_generator;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
 
 import xstartup.base.data.XPageInput;
+@Data
 public class QueryBaseDieselGeneratorOutput extends XPageInput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -33,6 +35,9 @@ public class QueryBaseDieselGeneratorOutput extends XPageInput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -42,122 +47,13 @@ public class QueryBaseDieselGeneratorOutput extends XPageInput {
     @XText("柴发设备机组型号key(字典获取)")
     private String unitTypeKey;
 
+    @XText("柴发设备机组型号name(字典获取)")
+    private String unitTypeName;
+
     @XText("常用功率(KW)")
     private BigDecimal normalPower;
 
     @XText("备用功率(KW)")
     private BigDecimal standbyPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getUnitTypeKey() {
-        return this.unitTypeKey;
-    }
-
-    public void setUnitTypeKey(String value) {
-        this.unitTypeKey = value;
-    }
-
-    public BigDecimal getNormalPower() {
-        return this.normalPower;
-    }
-
-    public void setNormalPower(BigDecimal value) {
-        this.normalPower = value;
-    }
-
-    public BigDecimal getStandbyPower() {
-        return this.standbyPower;
-    }
-
-    public void setStandbyPower(BigDecimal value) {
-        this.standbyPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_diesel_generator/QueryBaseDieselGeneratorViewInput.java

 package pps.core.base.service.data.base_diesel_generator;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
 import xstartup.base.data.XPageInput;
-
+@Data
 public class QueryBaseDieselGeneratorViewInput extends XPageInput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -33,6 +34,9 @@ public class QueryBaseDieselGeneratorViewInput extends XPageInput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -42,122 +46,14 @@ public class QueryBaseDieselGeneratorViewInput extends XPageInput {
     @XText("柴发设备机组型号key(字典获取)")
     private String unitTypeKey;
 
+    @XText("柴发设备机组型号name(字典获取)")
+    private String unitTypeName;
+
     @XText("常用功率(KW)")
     private BigDecimal normalPower;
 
     @XText("备用功率(KW)")
     private BigDecimal standbyPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getUnitTypeKey() {
-        return this.unitTypeKey;
-    }
-
-    public void setUnitTypeKey(String value) {
-        this.unitTypeKey = value;
-    }
-
-    public BigDecimal getNormalPower() {
-        return this.normalPower;
-    }
-
-    public void setNormalPower(BigDecimal value) {
-        this.normalPower = value;
-    }
-
-    public BigDecimal getStandbyPower() {
-        return this.standbyPower;
-    }
-
-    public void setStandbyPower(BigDecimal value) {
-        this.standbyPower = value;
-    }
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_diesel_generator/QueryBaseDieselGeneratorViewOutput.java

 package pps.core.base.service.data.base_diesel_generator;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
 
 import xstartup.base.data.XPageInput;
+@Data
 public class QueryBaseDieselGeneratorViewOutput extends XPageInput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -33,6 +35,9 @@ public class QueryBaseDieselGeneratorViewOutput extends XPageInput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -42,122 +47,13 @@ public class QueryBaseDieselGeneratorViewOutput extends XPageInput {
     @XText("柴发设备机组型号key(字典获取)")
     private String unitTypeKey;
 
+    @XText("柴发设备机组型号name(字典获取)")
+    private String unitTypeName;
+
     @XText("常用功率(KW)")
     private BigDecimal normalPower;
 
     @XText("备用功率(KW)")
     private BigDecimal standbyPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getUnitTypeKey() {
-        return this.unitTypeKey;
-    }
-
-    public void setUnitTypeKey(String value) {
-        this.unitTypeKey = value;
-    }
-
-    public BigDecimal getNormalPower() {
-        return this.normalPower;
-    }
-
-    public void setNormalPower(BigDecimal value) {
-        this.normalPower = value;
-    }
-
-    public BigDecimal getStandbyPower() {
-        return this.standbyPower;
-    }
-
-    public void setStandbyPower(BigDecimal value) {
-        this.standbyPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_diesel_generator/UpdateBaseDieselGeneratorInput.java

 package pps.core.base.service.data.base_diesel_generator;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class UpdateBaseDieselGeneratorInput {
     @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 deviceName;
 
@@ -41,122 +24,13 @@ public class UpdateBaseDieselGeneratorInput {
     @XText("柴发设备机组型号key(字典获取)")
     private String unitTypeKey;
 
+    @XText("柴发设备机组型号name(字典获取)")
+    private String unitTypeName;
+
     @XText("常用功率(KW)")
     private BigDecimal normalPower;
 
     @XText("备用功率(KW)")
     private BigDecimal standbyPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getUnitTypeKey() {
-        return this.unitTypeKey;
-    }
-
-    public void setUnitTypeKey(String value) {
-        this.unitTypeKey = value;
-    }
-
-    public BigDecimal getNormalPower() {
-        return this.normalPower;
-    }
-
-    public void setNormalPower(BigDecimal value) {
-        this.normalPower = value;
-    }
-
-    public BigDecimal getStandbyPower() {
-        return this.standbyPower;
-    }
-
-    public void setStandbyPower(BigDecimal value) {
-        this.standbyPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_diesel_generator/UpdateBaseDieselGeneratorOutput.java

 package pps.core.base.service.data.base_diesel_generator;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class UpdateBaseDieselGeneratorOutput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -32,6 +33,9 @@ public class UpdateBaseDieselGeneratorOutput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -41,122 +45,13 @@ public class UpdateBaseDieselGeneratorOutput {
     @XText("柴发设备机组型号key(字典获取)")
     private String unitTypeKey;
 
+    @XText("柴发设备机组型号name(字典获取)")
+    private String unitTypeName;
+
     @XText("常用功率(KW)")
     private BigDecimal normalPower;
 
     @XText("备用功率(KW)")
     private BigDecimal standbyPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getUnitTypeKey() {
-        return this.unitTypeKey;
-    }
-
-    public void setUnitTypeKey(String value) {
-        this.unitTypeKey = value;
-    }
-
-    public BigDecimal getNormalPower() {
-        return this.normalPower;
-    }
-
-    public void setNormalPower(BigDecimal value) {
-        this.normalPower = value;
-    }
-
-    public BigDecimal getStandbyPower() {
-        return this.standbyPower;
-    }
-
-    public void setStandbyPower(BigDecimal value) {
-        this.standbyPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/CreateBaseEnergyStorageDeviceInput.java

 package pps.core.base.service.data.base_energy_storage_device;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class CreateBaseEnergyStorageDeviceInput {
-    @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 deviceName;
 
@@ -41,6 +22,9 @@ public class CreateBaseEnergyStorageDeviceInput {
     @XText("储能设备规格型号key(字典获取)")
     private String storageModelKey;
 
+    @XText("储能设备规格型号name(字典获取)")
+    private String storageModelName;
+
     @XText("设备容量(KWh)")
     private BigDecimal apparatusCapacity;
 
@@ -50,124 +34,5 @@ public class CreateBaseEnergyStorageDeviceInput {
     @XText("额定充电功率(KW)")
     private BigDecimal ratedChargingPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getStorageModelKey() {
-        return this.storageModelKey;
-    }
-
-    public void setStorageModelKey(String value) {
-        this.storageModelKey = value;
-    }
-
-    public BigDecimal getApparatusCapacity() {
-        return this.apparatusCapacity;
-    }
-
-    public void setApparatusCapacity(BigDecimal value) {
-        this.apparatusCapacity = value;
-    }
-
-    public BigDecimal getRatedDischargePower() {
-        return this.ratedDischargePower;
-    }
-
-    public void setRatedDischargePower(BigDecimal value) {
-        this.ratedDischargePower = value;
-    }
-
-    public BigDecimal getRatedChargingPower() {
-        return this.ratedChargingPower;
-    }
-
-    public void setRatedChargingPower(BigDecimal value) {
-        this.ratedChargingPower = value;
-    }
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/CreateBaseEnergyStorageDeviceOutput.java

 package pps.core.base.service.data.base_energy_storage_device;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class CreateBaseEnergyStorageDeviceOutput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -32,6 +33,9 @@ public class CreateBaseEnergyStorageDeviceOutput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -41,6 +45,9 @@ public class CreateBaseEnergyStorageDeviceOutput {
     @XText("储能设备规格型号key(字典获取)")
     private String storageModelKey;
 
+    @XText("储能设备规格型号name(字典获取)")
+    private String storageModelName;
+
     @XText("设备容量(KWh)")
     private BigDecimal apparatusCapacity;
 
@@ -50,124 +57,4 @@ public class CreateBaseEnergyStorageDeviceOutput {
     @XText("额定充电功率(KW)")
     private BigDecimal ratedChargingPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getStorageModelKey() {
-        return this.storageModelKey;
-    }
-
-    public void setStorageModelKey(String value) {
-        this.storageModelKey = value;
-    }
-
-    public BigDecimal getApparatusCapacity() {
-        return this.apparatusCapacity;
-    }
-
-    public void setApparatusCapacity(BigDecimal value) {
-        this.apparatusCapacity = value;
-    }
-
-    public BigDecimal getRatedDischargePower() {
-        return this.ratedDischargePower;
-    }
-
-    public void setRatedDischargePower(BigDecimal value) {
-        this.ratedDischargePower = value;
-    }
-
-    public BigDecimal getRatedChargingPower() {
-        return this.ratedChargingPower;
-    }
-
-    public void setRatedChargingPower(BigDecimal value) {
-        this.ratedChargingPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/DeleteBaseEnergyStorageDeviceInput.java

 package pps.core.base.service.data.base_energy_storage_device;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class DeleteBaseEnergyStorageDeviceInput {
     @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 deviceName;
-
-    @XText("出厂编号")
-    private String makerNumber;
-
-    @XText("储能设备规格型号key(字典获取)")
-    private String storageModelKey;
-
-    @XText("设备容量(KWh)")
-    private BigDecimal apparatusCapacity;
-
-    @XText("额定放电功率(KW)")
-    private BigDecimal ratedDischargePower;
-
-    @XText("额定充电功率(KW)")
-    private BigDecimal ratedChargingPower;
-
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getStorageModelKey() {
-        return this.storageModelKey;
-    }
-
-    public void setStorageModelKey(String value) {
-        this.storageModelKey = value;
-    }
-
-    public BigDecimal getApparatusCapacity() {
-        return this.apparatusCapacity;
-    }
-
-    public void setApparatusCapacity(BigDecimal value) {
-        this.apparatusCapacity = value;
-    }
-
-    public BigDecimal getRatedDischargePower() {
-        return this.ratedDischargePower;
-    }
-
-    public void setRatedDischargePower(BigDecimal value) {
-        this.ratedDischargePower = value;
-    }
-
-    public BigDecimal getRatedChargingPower() {
-        return this.ratedChargingPower;
-    }
-
-    public void setRatedChargingPower(BigDecimal value) {
-        this.ratedChargingPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/DeleteBaseEnergyStorageDeviceOutput.java

 package pps.core.base.service.data.base_energy_storage_device;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class DeleteBaseEnergyStorageDeviceOutput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -32,6 +33,9 @@ public class DeleteBaseEnergyStorageDeviceOutput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -41,6 +45,9 @@ public class DeleteBaseEnergyStorageDeviceOutput {
     @XText("储能设备规格型号key(字典获取)")
     private String storageModelKey;
 
+    @XText("储能设备规格型号name(字典获取)")
+    private String storageModelName;
+
     @XText("设备容量(KWh)")
     private BigDecimal apparatusCapacity;
 
@@ -50,124 +57,4 @@ public class DeleteBaseEnergyStorageDeviceOutput {
     @XText("额定充电功率(KW)")
     private BigDecimal ratedChargingPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getStorageModelKey() {
-        return this.storageModelKey;
-    }
-
-    public void setStorageModelKey(String value) {
-        this.storageModelKey = value;
-    }
-
-    public BigDecimal getApparatusCapacity() {
-        return this.apparatusCapacity;
-    }
-
-    public void setApparatusCapacity(BigDecimal value) {
-        this.apparatusCapacity = value;
-    }
-
-    public BigDecimal getRatedDischargePower() {
-        return this.ratedDischargePower;
-    }
-
-    public void setRatedDischargePower(BigDecimal value) {
-        this.ratedDischargePower = value;
-    }
-
-    public BigDecimal getRatedChargingPower() {
-        return this.ratedChargingPower;
-    }
-
-    public void setRatedChargingPower(BigDecimal value) {
-        this.ratedChargingPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/DynamicQueryBaseEnergyStorageDeviceInput.java

 package pps.core.base.service.data.base_energy_storage_device;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class DynamicQueryBaseEnergyStorageDeviceInput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -32,6 +33,9 @@ public class DynamicQueryBaseEnergyStorageDeviceInput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -41,6 +45,9 @@ public class DynamicQueryBaseEnergyStorageDeviceInput {
     @XText("储能设备规格型号key(字典获取)")
     private String storageModelKey;
 
+    @XText("储能设备规格型号name(字典获取)")
+    private String storageModelName;
+
     @XText("设备容量(KWh)")
     private BigDecimal apparatusCapacity;
 
@@ -50,124 +57,5 @@ public class DynamicQueryBaseEnergyStorageDeviceInput {
     @XText("额定充电功率(KW)")
     private BigDecimal ratedChargingPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getStorageModelKey() {
-        return this.storageModelKey;
-    }
-
-    public void setStorageModelKey(String value) {
-        this.storageModelKey = value;
-    }
-
-    public BigDecimal getApparatusCapacity() {
-        return this.apparatusCapacity;
-    }
-
-    public void setApparatusCapacity(BigDecimal value) {
-        this.apparatusCapacity = value;
-    }
-
-    public BigDecimal getRatedDischargePower() {
-        return this.ratedDischargePower;
-    }
-
-    public void setRatedDischargePower(BigDecimal value) {
-        this.ratedDischargePower = value;
-    }
-
-    public BigDecimal getRatedChargingPower() {
-        return this.ratedChargingPower;
-    }
-
-    public void setRatedChargingPower(BigDecimal value) {
-        this.ratedChargingPower = value;
-    }
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/DynamicQueryBaseEnergyStorageDeviceOutput.java

 package pps.core.base.service.data.base_energy_storage_device;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class DynamicQueryBaseEnergyStorageDeviceOutput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -32,6 +33,9 @@ public class DynamicQueryBaseEnergyStorageDeviceOutput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -41,6 +45,9 @@ public class DynamicQueryBaseEnergyStorageDeviceOutput {
     @XText("储能设备规格型号key(字典获取)")
     private String storageModelKey;
 
+    @XText("储能设备规格型号name(字典获取)")
+    private String storageModelName;
+
     @XText("设备容量(KWh)")
     private BigDecimal apparatusCapacity;
 
@@ -50,124 +57,5 @@ public class DynamicQueryBaseEnergyStorageDeviceOutput {
     @XText("额定充电功率(KW)")
     private BigDecimal ratedChargingPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getStorageModelKey() {
-        return this.storageModelKey;
-    }
-
-    public void setStorageModelKey(String value) {
-        this.storageModelKey = value;
-    }
-
-    public BigDecimal getApparatusCapacity() {
-        return this.apparatusCapacity;
-    }
-
-    public void setApparatusCapacity(BigDecimal value) {
-        this.apparatusCapacity = value;
-    }
-
-    public BigDecimal getRatedDischargePower() {
-        return this.ratedDischargePower;
-    }
-
-    public void setRatedDischargePower(BigDecimal value) {
-        this.ratedDischargePower = value;
-    }
-
-    public BigDecimal getRatedChargingPower() {
-        return this.ratedChargingPower;
-    }
-
-    public void setRatedChargingPower(BigDecimal value) {
-        this.ratedChargingPower = value;
-    }
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/DynamicQueryBaseEnergyStorageDeviceViewOutput.java

 package pps.core.base.service.data.base_energy_storage_device;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class DynamicQueryBaseEnergyStorageDeviceViewOutput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -32,6 +33,9 @@ public class DynamicQueryBaseEnergyStorageDeviceViewOutput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -41,6 +45,9 @@ public class DynamicQueryBaseEnergyStorageDeviceViewOutput {
     @XText("储能设备规格型号key(字典获取)")
     private String storageModelKey;
 
+    @XText("储能设备规格型号name(字典获取)")
+    private String storageModelName;
+
     @XText("设备容量(KWh)")
     private BigDecimal apparatusCapacity;
 
@@ -50,124 +57,5 @@ public class DynamicQueryBaseEnergyStorageDeviceViewOutput {
     @XText("额定充电功率(KW)")
     private BigDecimal ratedChargingPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getStorageModelKey() {
-        return this.storageModelKey;
-    }
-
-    public void setStorageModelKey(String value) {
-        this.storageModelKey = value;
-    }
-
-    public BigDecimal getApparatusCapacity() {
-        return this.apparatusCapacity;
-    }
-
-    public void setApparatusCapacity(BigDecimal value) {
-        this.apparatusCapacity = value;
-    }
-
-    public BigDecimal getRatedDischargePower() {
-        return this.ratedDischargePower;
-    }
-
-    public void setRatedDischargePower(BigDecimal value) {
-        this.ratedDischargePower = value;
-    }
-
-    public BigDecimal getRatedChargingPower() {
-        return this.ratedChargingPower;
-    }
-
-    public void setRatedChargingPower(BigDecimal value) {
-        this.ratedChargingPower = value;
-    }
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/GetBaseEnergyStorageDeviceInput.java

 package pps.core.base.service.data.base_energy_storage_device;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class GetBaseEnergyStorageDeviceInput {
     @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 deviceName;
-
-    @XText("出厂编号")
-    private String makerNumber;
-
-    @XText("储能设备规格型号key(字典获取)")
-    private String storageModelKey;
-
-    @XText("设备容量(KWh)")
-    private BigDecimal apparatusCapacity;
-
-    @XText("额定放电功率(KW)")
-    private BigDecimal ratedDischargePower;
-
-    @XText("额定充电功率(KW)")
-    private BigDecimal ratedChargingPower;
-
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getStorageModelKey() {
-        return this.storageModelKey;
-    }
-
-    public void setStorageModelKey(String value) {
-        this.storageModelKey = value;
-    }
-
-    public BigDecimal getApparatusCapacity() {
-        return this.apparatusCapacity;
-    }
-
-    public void setApparatusCapacity(BigDecimal value) {
-        this.apparatusCapacity = value;
-    }
-
-    public BigDecimal getRatedDischargePower() {
-        return this.ratedDischargePower;
-    }
-
-    public void setRatedDischargePower(BigDecimal value) {
-        this.ratedDischargePower = value;
-    }
-
-    public BigDecimal getRatedChargingPower() {
-        return this.ratedChargingPower;
-    }
-
-    public void setRatedChargingPower(BigDecimal value) {
-        this.ratedChargingPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/GetBaseEnergyStorageDeviceOutput.java

 package pps.core.base.service.data.base_energy_storage_device;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class GetBaseEnergyStorageDeviceOutput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -32,6 +33,9 @@ public class GetBaseEnergyStorageDeviceOutput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -41,6 +45,9 @@ public class GetBaseEnergyStorageDeviceOutput {
     @XText("储能设备规格型号key(字典获取)")
     private String storageModelKey;
 
+    @XText("储能设备规格型号name(字典获取)")
+    private String storageModelName;
+
     @XText("设备容量(KWh)")
     private BigDecimal apparatusCapacity;
 
@@ -50,124 +57,4 @@ public class GetBaseEnergyStorageDeviceOutput {
     @XText("额定充电功率(KW)")
     private BigDecimal ratedChargingPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getStorageModelKey() {
-        return this.storageModelKey;
-    }
-
-    public void setStorageModelKey(String value) {
-        this.storageModelKey = value;
-    }
-
-    public BigDecimal getApparatusCapacity() {
-        return this.apparatusCapacity;
-    }
-
-    public void setApparatusCapacity(BigDecimal value) {
-        this.apparatusCapacity = value;
-    }
-
-    public BigDecimal getRatedDischargePower() {
-        return this.ratedDischargePower;
-    }
-
-    public void setRatedDischargePower(BigDecimal value) {
-        this.ratedDischargePower = value;
-    }
-
-    public BigDecimal getRatedChargingPower() {
-        return this.ratedChargingPower;
-    }
-
-    public void setRatedChargingPower(BigDecimal value) {
-        this.ratedChargingPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/GetBaseEnergyStorageDeviceViewInput.java

 package pps.core.base.service.data.base_energy_storage_device;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class GetBaseEnergyStorageDeviceViewInput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -32,6 +33,9 @@ public class GetBaseEnergyStorageDeviceViewInput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -41,6 +45,9 @@ public class GetBaseEnergyStorageDeviceViewInput {
     @XText("储能设备规格型号key(字典获取)")
     private String storageModelKey;
 
+    @XText("储能设备规格型号name(字典获取)")
+    private String storageModelName;
+
     @XText("设备容量(KWh)")
     private BigDecimal apparatusCapacity;
 
@@ -50,124 +57,4 @@ public class GetBaseEnergyStorageDeviceViewInput {
     @XText("额定充电功率(KW)")
     private BigDecimal ratedChargingPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getStorageModelKey() {
-        return this.storageModelKey;
-    }
-
-    public void setStorageModelKey(String value) {
-        this.storageModelKey = value;
-    }
-
-    public BigDecimal getApparatusCapacity() {
-        return this.apparatusCapacity;
-    }
-
-    public void setApparatusCapacity(BigDecimal value) {
-        this.apparatusCapacity = value;
-    }
-
-    public BigDecimal getRatedDischargePower() {
-        return this.ratedDischargePower;
-    }
-
-    public void setRatedDischargePower(BigDecimal value) {
-        this.ratedDischargePower = value;
-    }
-
-    public BigDecimal getRatedChargingPower() {
-        return this.ratedChargingPower;
-    }
-
-    public void setRatedChargingPower(BigDecimal value) {
-        this.ratedChargingPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/GetBaseEnergyStorageDeviceViewOutput.java

 package pps.core.base.service.data.base_energy_storage_device;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class GetBaseEnergyStorageDeviceViewOutput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -32,6 +33,9 @@ public class GetBaseEnergyStorageDeviceViewOutput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -41,6 +45,9 @@ public class GetBaseEnergyStorageDeviceViewOutput {
     @XText("储能设备规格型号key(字典获取)")
     private String storageModelKey;
 
+    @XText("储能设备规格型号name(字典获取)")
+    private String storageModelName;
+
     @XText("设备容量(KWh)")
     private BigDecimal apparatusCapacity;
 
@@ -50,124 +57,4 @@ public class GetBaseEnergyStorageDeviceViewOutput {
     @XText("额定充电功率(KW)")
     private BigDecimal ratedChargingPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getStorageModelKey() {
-        return this.storageModelKey;
-    }
-
-    public void setStorageModelKey(String value) {
-        this.storageModelKey = value;
-    }
-
-    public BigDecimal getApparatusCapacity() {
-        return this.apparatusCapacity;
-    }
-
-    public void setApparatusCapacity(BigDecimal value) {
-        this.apparatusCapacity = value;
-    }
-
-    public BigDecimal getRatedDischargePower() {
-        return this.ratedDischargePower;
-    }
-
-    public void setRatedDischargePower(BigDecimal value) {
-        this.ratedDischargePower = value;
-    }
-
-    public BigDecimal getRatedChargingPower() {
-        return this.ratedChargingPower;
-    }
-
-    public void setRatedChargingPower(BigDecimal value) {
-        this.ratedChargingPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/QueryBaseEnergyStorageDeviceInput.java

 package pps.core.base.service.data.base_energy_storage_device;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
 import xstartup.base.data.XPageInput;
-
+@Data
 public class QueryBaseEnergyStorageDeviceInput 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("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -42,6 +23,9 @@ public class QueryBaseEnergyStorageDeviceInput extends XPageInput {
     @XText("储能设备规格型号key(字典获取)")
     private String storageModelKey;
 
+    @XText("储能设备规格型号name(字典获取)")
+    private String storageModelName;
+
     @XText("设备容量(KWh)")
     private BigDecimal apparatusCapacity;
 
@@ -51,124 +35,5 @@ public class QueryBaseEnergyStorageDeviceInput extends XPageInput {
     @XText("额定充电功率(KW)")
     private BigDecimal ratedChargingPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getStorageModelKey() {
-        return this.storageModelKey;
-    }
-
-    public void setStorageModelKey(String value) {
-        this.storageModelKey = value;
-    }
-
-    public BigDecimal getApparatusCapacity() {
-        return this.apparatusCapacity;
-    }
-
-    public void setApparatusCapacity(BigDecimal value) {
-        this.apparatusCapacity = value;
-    }
-
-    public BigDecimal getRatedDischargePower() {
-        return this.ratedDischargePower;
-    }
-
-    public void setRatedDischargePower(BigDecimal value) {
-        this.ratedDischargePower = value;
-    }
-
-    public BigDecimal getRatedChargingPower() {
-        return this.ratedChargingPower;
-    }
-
-    public void setRatedChargingPower(BigDecimal value) {
-        this.ratedChargingPower = value;
-    }
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/QueryBaseEnergyStorageDeviceOutput.java

 package pps.core.base.service.data.base_energy_storage_device;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
 
 import xstartup.base.data.XPageInput;
+@Data
 public class QueryBaseEnergyStorageDeviceOutput extends XPageInput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -33,6 +35,9 @@ public class QueryBaseEnergyStorageDeviceOutput extends XPageInput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -42,6 +47,9 @@ public class QueryBaseEnergyStorageDeviceOutput extends XPageInput {
     @XText("储能设备规格型号key(字典获取)")
     private String storageModelKey;
 
+    @XText("储能设备规格型号name(字典获取)")
+    private String storageModelName;
+
     @XText("设备容量(KWh)")
     private BigDecimal apparatusCapacity;
 
@@ -51,124 +59,4 @@ public class QueryBaseEnergyStorageDeviceOutput extends XPageInput {
     @XText("额定充电功率(KW)")
     private BigDecimal ratedChargingPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getStorageModelKey() {
-        return this.storageModelKey;
-    }
-
-    public void setStorageModelKey(String value) {
-        this.storageModelKey = value;
-    }
-
-    public BigDecimal getApparatusCapacity() {
-        return this.apparatusCapacity;
-    }
-
-    public void setApparatusCapacity(BigDecimal value) {
-        this.apparatusCapacity = value;
-    }
-
-    public BigDecimal getRatedDischargePower() {
-        return this.ratedDischargePower;
-    }
-
-    public void setRatedDischargePower(BigDecimal value) {
-        this.ratedDischargePower = value;
-    }
-
-    public BigDecimal getRatedChargingPower() {
-        return this.ratedChargingPower;
-    }
-
-    public void setRatedChargingPower(BigDecimal value) {
-        this.ratedChargingPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/QueryBaseEnergyStorageDeviceViewInput.java

 package pps.core.base.service.data.base_energy_storage_device;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
 import xstartup.base.data.XPageInput;
-
+@Data
 public class QueryBaseEnergyStorageDeviceViewInput extends XPageInput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -33,6 +34,9 @@ public class QueryBaseEnergyStorageDeviceViewInput extends XPageInput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -42,6 +46,9 @@ public class QueryBaseEnergyStorageDeviceViewInput extends XPageInput {
     @XText("储能设备规格型号key(字典获取)")
     private String storageModelKey;
 
+    @XText("储能设备规格型号name(字典获取)")
+    private String storageModelName;
+
     @XText("设备容量(KWh)")
     private BigDecimal apparatusCapacity;
 
@@ -51,124 +58,5 @@ public class QueryBaseEnergyStorageDeviceViewInput extends XPageInput {
     @XText("额定充电功率(KW)")
     private BigDecimal ratedChargingPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getStorageModelKey() {
-        return this.storageModelKey;
-    }
-
-    public void setStorageModelKey(String value) {
-        this.storageModelKey = value;
-    }
-
-    public BigDecimal getApparatusCapacity() {
-        return this.apparatusCapacity;
-    }
-
-    public void setApparatusCapacity(BigDecimal value) {
-        this.apparatusCapacity = value;
-    }
-
-    public BigDecimal getRatedDischargePower() {
-        return this.ratedDischargePower;
-    }
-
-    public void setRatedDischargePower(BigDecimal value) {
-        this.ratedDischargePower = value;
-    }
-
-    public BigDecimal getRatedChargingPower() {
-        return this.ratedChargingPower;
-    }
-
-    public void setRatedChargingPower(BigDecimal value) {
-        this.ratedChargingPower = value;
-    }
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/QueryBaseEnergyStorageDeviceViewOutput.java

 package pps.core.base.service.data.base_energy_storage_device;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
 
 import xstartup.base.data.XPageInput;
+@Data
 public class QueryBaseEnergyStorageDeviceViewOutput extends XPageInput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -33,6 +35,9 @@ public class QueryBaseEnergyStorageDeviceViewOutput extends XPageInput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -42,6 +47,9 @@ public class QueryBaseEnergyStorageDeviceViewOutput extends XPageInput {
     @XText("储能设备规格型号key(字典获取)")
     private String storageModelKey;
 
+    @XText("储能设备规格型号name(字典获取)")
+    private String storageModelName;
+
     @XText("设备容量(KWh)")
     private BigDecimal apparatusCapacity;
 
@@ -51,124 +59,5 @@ public class QueryBaseEnergyStorageDeviceViewOutput extends XPageInput {
     @XText("额定充电功率(KW)")
     private BigDecimal ratedChargingPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getStorageModelKey() {
-        return this.storageModelKey;
-    }
-
-    public void setStorageModelKey(String value) {
-        this.storageModelKey = value;
-    }
-
-    public BigDecimal getApparatusCapacity() {
-        return this.apparatusCapacity;
-    }
-
-    public void setApparatusCapacity(BigDecimal value) {
-        this.apparatusCapacity = value;
-    }
-
-    public BigDecimal getRatedDischargePower() {
-        return this.ratedDischargePower;
-    }
-
-    public void setRatedDischargePower(BigDecimal value) {
-        this.ratedDischargePower = value;
-    }
-
-    public BigDecimal getRatedChargingPower() {
-        return this.ratedChargingPower;
-    }
-
-    public void setRatedChargingPower(BigDecimal value) {
-        this.ratedChargingPower = value;
-    }
 
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/UpdateBaseEnergyStorageDeviceInput.java

 package pps.core.base.service.data.base_energy_storage_device;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class UpdateBaseEnergyStorageDeviceInput {
     @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 deviceName;
 
@@ -41,6 +24,9 @@ public class UpdateBaseEnergyStorageDeviceInput {
     @XText("储能设备规格型号key(字典获取)")
     private String storageModelKey;
 
+    @XText("储能设备规格型号name(字典获取)")
+    private String storageModelName;
+
     @XText("设备容量(KWh)")
     private BigDecimal apparatusCapacity;
 
@@ -50,124 +36,4 @@ public class UpdateBaseEnergyStorageDeviceInput {
     @XText("额定充电功率(KW)")
     private BigDecimal ratedChargingPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getStorageModelKey() {
-        return this.storageModelKey;
-    }
-
-    public void setStorageModelKey(String value) {
-        this.storageModelKey = value;
-    }
-
-    public BigDecimal getApparatusCapacity() {
-        return this.apparatusCapacity;
-    }
-
-    public void setApparatusCapacity(BigDecimal value) {
-        this.apparatusCapacity = value;
-    }
-
-    public BigDecimal getRatedDischargePower() {
-        return this.ratedDischargePower;
-    }
-
-    public void setRatedDischargePower(BigDecimal value) {
-        this.ratedDischargePower = value;
-    }
-
-    public BigDecimal getRatedChargingPower() {
-        return this.ratedChargingPower;
-    }
-
-    public void setRatedChargingPower(BigDecimal value) {
-        this.ratedChargingPower = value;
-    }
-
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/UpdateBaseEnergyStorageDeviceOutput.java

 package pps.core.base.service.data.base_energy_storage_device;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import java.util.Date;
 import java.math.BigDecimal;
-
+@Data
 public class UpdateBaseEnergyStorageDeviceOutput {
     @XText("ID")
     private String id;
 
-    @XText("是否删除(0_是;1_否)")
+    @XText("是否删除(1_是;0_否)")
     private Integer isDeleted;
 
     @XText("创建人ID")
@@ -32,6 +33,9 @@ public class UpdateBaseEnergyStorageDeviceOutput {
     @XText("组织机构ID")
     private String ouId;
 
+    @XText("组织机构name")
+    private String ouName;
+
     @XText("设备名称")
     private String deviceName;
 
@@ -41,6 +45,9 @@ public class UpdateBaseEnergyStorageDeviceOutput {
     @XText("储能设备规格型号key(字典获取)")
     private String storageModelKey;
 
+    @XText("储能设备规格型号name(字典获取)")
+    private String storageModelName;
+
     @XText("设备容量(KWh)")
     private BigDecimal apparatusCapacity;
 
@@ -50,124 +57,5 @@ public class UpdateBaseEnergyStorageDeviceOutput {
     @XText("额定充电功率(KW)")
     private BigDecimal ratedChargingPower;
 
-    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 getDeviceName() {
-        return this.deviceName;
-    }
-
-    public void setDeviceName(String value) {
-        this.deviceName = value;
-    }
-
-    public String getMakerNumber() {
-        return this.makerNumber;
-    }
-
-    public void setMakerNumber(String value) {
-        this.makerNumber = value;
-    }
-
-    public String getStorageModelKey() {
-        return this.storageModelKey;
-    }
-
-    public void setStorageModelKey(String value) {
-        this.storageModelKey = value;
-    }
-
-    public BigDecimal getApparatusCapacity() {
-        return this.apparatusCapacity;
-    }
-
-    public void setApparatusCapacity(BigDecimal value) {
-        this.apparatusCapacity = value;
-    }
-
-    public BigDecimal getRatedDischargePower() {
-        return this.ratedDischargePower;
-    }
-
-    public void setRatedDischargePower(BigDecimal value) {
-        this.ratedDischargePower = value;
-    }
-
-    public BigDecimal getRatedChargingPower() {
-        return this.ratedChargingPower;
-    }
-
-    public void setRatedChargingPower(BigDecimal value) {
-        this.ratedChargingPower = value;
-    }
 
 }

C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BaseDieselGeneratorViewMapper.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="device_name" property="deviceName" jdbcType="VARCHAR" />
     <result column="maker_number" property="makerNumber" jdbcType="VARCHAR" />
     <result column="unit_type_key" property="unitTypeKey" jdbcType="VARCHAR" />
+    <result column="unit_type_name" property="unitTypeName" jdbcType="VARCHAR" />
     <result column="normal_power" property="normalPower" jdbcType="DECIMAL" />
     <result column="standby_power" property="standbyPower" jdbcType="DECIMAL" />
   </resultMap>
@@ -27,9 +29,11 @@
     modify_by_name,
     modify_time,
     ou_id,
+    ou_name,
     device_name,
     maker_number,
     unit_type_key,
+    unit_type_name,
     normal_power,
     standby_power
   </sql>

C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BaseEnergyStorageDeviceViewMapper.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="device_name" property="deviceName" jdbcType="VARCHAR" />
     <result column="maker_number" property="makerNumber" jdbcType="VARCHAR" />
     <result column="storage_model_key" property="storageModelKey" jdbcType="VARCHAR" />
+    <result column="storage_model_name" property="storageModelName" jdbcType="VARCHAR" />
     <result column="apparatus_capacity" property="apparatusCapacity" jdbcType="DECIMAL" />
     <result column="rated_discharge_power" property="ratedDischargePower" jdbcType="DECIMAL" />
     <result column="rated_charging_power" property="ratedChargingPower" jdbcType="DECIMAL" />
@@ -28,9 +30,11 @@
     modify_by_name,
     modify_time,
     ou_id,
+    ou_name,
     device_name,
     maker_number,
     storage_model_key,
+    storage_model_name,
     apparatus_capacity,
     rated_discharge_power,
     rated_charging_power