Skip to content

G
gf_back
Commit 391a6601 authored by ZWT's avatar ZWT
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents ca1b1148 91c419e5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 435 additions and 4882 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BaseDieselGeneratorEnt.java 100644 → 100755
View file @ 391a6601
package pps.core.base.entity; package pps.core.base.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
@Data
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@TableName("base_diesel_generator") @TableName("base_diesel_generator")
public class BaseDieselGeneratorEnt implements Serializable { public class BaseDieselGeneratorEnt implements Serializable {
@XText("ID") @XText("ID")
@TableId(type = IdType.AUTO) @TableId(type = IdType.ASSIGN_UUID)
private String id; private String id;
@XText("是否删除(0_是;1_否)") @XText("是否删除(1_是;0_否)")
@TableField @TableField
private Integer isDeleted; private Integer isDeleted;
...@@ -48,6 +48,10 @@ public class BaseDieselGeneratorEnt implements Serializable { ...@@ -48,6 +48,10 @@ public class BaseDieselGeneratorEnt implements Serializable {
@TableField @TableField
private String ouId; private String ouId;
@XText("组织机构name")
@TableField
private String ouName;
@XText("设备名称") @XText("设备名称")
@TableField @TableField
private String deviceName; private String deviceName;
...@@ -60,6 +64,10 @@ public class BaseDieselGeneratorEnt implements Serializable { ...@@ -60,6 +64,10 @@ public class BaseDieselGeneratorEnt implements Serializable {
@TableField @TableField
private String unitTypeKey; private String unitTypeKey;
@XText("柴发设备机组型号name(字典获取)")
@TableField
private String unitTypeName;
@XText("常用功率(KW)") @XText("常用功率(KW)")
@TableField @TableField
private BigDecimal normalPower; private BigDecimal normalPower;
...@@ -68,116 +76,4 @@ public class BaseDieselGeneratorEnt implements Serializable { ...@@ -68,116 +76,4 @@ public class BaseDieselGeneratorEnt implements Serializable {
@TableField @TableField
private BigDecimal standbyPower; 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 100644 → 100755
View file @ 391a6601
...@@ -4,14 +4,15 @@ import java.io.Serializable; ...@@ -4,14 +4,15 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
@Data
public class BaseDieselGeneratorView implements Serializable { public class BaseDieselGeneratorView implements Serializable {
@XText("ID") @XText("ID")
@TableField @TableField
private String id; private String id;
@XText("是否删除(0_是;1_否)") @XText("是否删除(1_是;0_否)")
@TableField @TableField
private Integer isDeleted; private Integer isDeleted;
...@@ -43,6 +44,10 @@ public class BaseDieselGeneratorView implements Serializable { ...@@ -43,6 +44,10 @@ public class BaseDieselGeneratorView implements Serializable {
@TableField @TableField
private String ouId; private String ouId;
@XText("组织机构name")
@TableField
private String ouName;
@XText("设备名称") @XText("设备名称")
@TableField @TableField
private String deviceName; private String deviceName;
...@@ -55,6 +60,10 @@ public class BaseDieselGeneratorView implements Serializable { ...@@ -55,6 +60,10 @@ public class BaseDieselGeneratorView implements Serializable {
@TableField @TableField
private String unitTypeKey; private String unitTypeKey;
@XText("柴发设备机组型号name(字典获取)")
@TableField
private String unitTypeName;
@XText("常用功率(KW)") @XText("常用功率(KW)")
@TableField @TableField
private BigDecimal normalPower; private BigDecimal normalPower;
...@@ -63,116 +72,4 @@ public class BaseDieselGeneratorView implements Serializable { ...@@ -63,116 +72,4 @@ public class BaseDieselGeneratorView implements Serializable {
@TableField @TableField
private BigDecimal standbyPower; 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 100644 → 100755
View file @ 391a6601
...@@ -7,15 +7,16 @@ import java.math.BigDecimal; ...@@ -7,15 +7,16 @@ import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
@Data
@TableName("base_energy_storage_device") @TableName("base_energy_storage_device")
public class BaseEnergyStorageDeviceEnt implements Serializable { public class BaseEnergyStorageDeviceEnt implements Serializable {
@XText("ID") @XText("ID")
@TableId(type = IdType.AUTO) @TableId(type = IdType.ASSIGN_UUID)
private String id; private String id;
@XText("是否删除(0_是;1_否)") @XText("是否删除(1_是;0_否)")
@TableField @TableField
private Integer isDeleted; private Integer isDeleted;
...@@ -47,6 +48,10 @@ public class BaseEnergyStorageDeviceEnt implements Serializable { ...@@ -47,6 +48,10 @@ public class BaseEnergyStorageDeviceEnt implements Serializable {
@TableField @TableField
private String ouId; private String ouId;
@XText("组织机构name")
@TableField
private String ouName;
@XText("设备名称") @XText("设备名称")
@TableField @TableField
private String deviceName; private String deviceName;
...@@ -59,6 +64,10 @@ public class BaseEnergyStorageDeviceEnt implements Serializable { ...@@ -59,6 +64,10 @@ public class BaseEnergyStorageDeviceEnt implements Serializable {
@TableField @TableField
private String storageModelKey; private String storageModelKey;
@XText("储能设备规格型号name(字典获取)")
@TableField
private String storageModelName;
@XText("设备容量(KWh)") @XText("设备容量(KWh)")
@TableField @TableField
private BigDecimal apparatusCapacity; private BigDecimal apparatusCapacity;
...@@ -71,124 +80,5 @@ public class BaseEnergyStorageDeviceEnt implements Serializable { ...@@ -71,124 +80,5 @@ public class BaseEnergyStorageDeviceEnt implements Serializable {
@TableField @TableField
private BigDecimal ratedChargingPower; 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 100644 → 100755
View file @ 391a6601
...@@ -4,14 +4,15 @@ import java.io.Serializable; ...@@ -4,14 +4,15 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
@Data
public class BaseEnergyStorageDeviceView implements Serializable { public class BaseEnergyStorageDeviceView implements Serializable {
@XText("ID") @XText("ID")
@TableField @TableField
private String id; private String id;
@XText("是否删除(0_是;1_否)") @XText("是否删除(1_是;0_否)")
@TableField @TableField
private Integer isDeleted; private Integer isDeleted;
...@@ -43,6 +44,10 @@ public class BaseEnergyStorageDeviceView implements Serializable { ...@@ -43,6 +44,10 @@ public class BaseEnergyStorageDeviceView implements Serializable {
@TableField @TableField
private String ouId; private String ouId;
@XText("组织机构name")
@TableField
private String ouName;
@XText("设备名称") @XText("设备名称")
@TableField @TableField
private String deviceName; private String deviceName;
...@@ -55,6 +60,10 @@ public class BaseEnergyStorageDeviceView implements Serializable { ...@@ -55,6 +60,10 @@ public class BaseEnergyStorageDeviceView implements Serializable {
@TableField @TableField
private String storageModelKey; private String storageModelKey;
@XText("储能设备规格型号name(字典获取)")
@TableField
private String storageModelName;
@XText("设备容量(KWh)") @XText("设备容量(KWh)")
@TableField @TableField
private BigDecimal apparatusCapacity; private BigDecimal apparatusCapacity;
...@@ -67,124 +76,4 @@ public class BaseEnergyStorageDeviceView implements Serializable { ...@@ -67,124 +76,4 @@ public class BaseEnergyStorageDeviceView implements Serializable {
@TableField @TableField
private BigDecimal ratedChargingPower; 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service; package pps.core.base.service;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper; import pps.core.base.constant.ScadaConstant;
import com.github.pagehelper.PageInfo;
import pps.core.base.entity.BaseDieselGeneratorEnt; import pps.core.base.entity.BaseDieselGeneratorEnt;
import pps.core.base.entity.BaseDieselGeneratorView;
import pps.core.base.mapper.BaseDieselGeneratorMapper; 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.service.data.base_diesel_generator.*;
import pps.core.base.utils.SessionSimulation;
import pps.core.common.session.PpsUserSession;
import xstartup.annotation.XService; import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext; import xstartup.base.XContext;
import xstartup.base.data.CustomQueryInput;
import xstartup.base.util.XCopyUtils; import xstartup.base.util.XCopyUtils;
import xstartup.data.XPageResult; import xstartup.data.XPageResult;
import xstartup.data.XServiceResult; import xstartup.data.XServiceResult;
...@@ -21,55 +21,88 @@ import xstartup.feature.api.annotation.XApiGet; ...@@ -21,55 +21,88 @@ import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost; import xstartup.feature.api.annotation.XApiPost;
import xstartup.feature.mybatis.helper.XMapperHelper; import xstartup.feature.mybatis.helper.XMapperHelper;
import java.util.List; import java.util.Date;
/**
* @Author luoxiangyang
* @Description: 柴发设备
* @Date 2023/8/25
**/
@XService @XService
public class BaseDieselGeneratorService { public class BaseDieselGeneratorService {
//todo 模拟登陆
private final PpsUserSession session = SessionSimulation.getSession();
@XText("新增")
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
public XServiceResult createBaseDieselGenerator(XContext context, CreateBaseDieselGeneratorInput input) { public XServiceResult createBaseDieselGenerator(XContext context, CreateBaseDieselGeneratorInput input) {
BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class); BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
BaseDieselGeneratorEnt entity = new BaseDieselGeneratorEnt(); BaseDieselGeneratorEnt entity = new BaseDieselGeneratorEnt();
XCopyUtils.copyObject(input, entity); 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); mapper.insert(entity);
return XServiceResult.OK; return XServiceResult.OK;
} }
@XText("更新")
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
public XServiceResult updateBaseDieselGenerator(XContext context, UpdateBaseDieselGeneratorInput input) { public XServiceResult updateBaseDieselGenerator(XContext context, UpdateBaseDieselGeneratorInput input) {
BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class); BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
QueryWrapper<BaseDieselGeneratorEnt> queryWrapper = new QueryWrapper<>(); 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); BaseDieselGeneratorEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) { if (entity == null) {
return XServiceResult.error(context, XError.NotFound); return XServiceResult.error(context, XError.NotFound);
} }
XCopyUtils.copyObject(input, entity); XCopyUtils.copyObject(input, entity);
entity.setModifyById(session.getId());
entity.setModifyByName(session.getUserName());
entity.setModifyTime(new Date());
mapper.updateById(entity); mapper.updateById(entity);
return XServiceResult.OK; return XServiceResult.OK;
} }
@XText("删除")
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
public XServiceResult deleteBaseDieselGenerator(XContext context, DeleteBaseDieselGeneratorInput input) { public XServiceResult deleteBaseDieselGenerator(XContext context, DeleteBaseDieselGeneratorInput input) {
BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class); BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
QueryWrapper<BaseDieselGeneratorEnt> queryWrapper = new QueryWrapper<>(); 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); BaseDieselGeneratorEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) { if (entity == null) {
return XServiceResult.error(context, XError.NotFound); 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; return XServiceResult.OK;
} }
@XText("根据id获取详情")
@XApiAnonymous @XApiAnonymous
@XApiGet @XApiGet
public XSingleResult<GetBaseDieselGeneratorOutput> getBaseDieselGenerator(XContext context, GetBaseDieselGeneratorInput input) { public XSingleResult<GetBaseDieselGeneratorOutput> getBaseDieselGenerator(XContext context, GetBaseDieselGeneratorInput input) {
BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class); BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
QueryWrapper<BaseDieselGeneratorEnt> queryWrapper = new QueryWrapper<>(); 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); BaseDieselGeneratorEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) { if (entity == null) {
return XSingleResult.error(context, XError.NotFound); return XSingleResult.error(context, XError.NotFound);
...@@ -79,61 +112,21 @@ public class BaseDieselGeneratorService { ...@@ -79,61 +112,21 @@ public class BaseDieselGeneratorService {
return XSingleResult.success(output); return XSingleResult.success(output);
} }
@XText("分页查询")
@XApiAnonymous @XApiAnonymous
@XApiGet @XApiGet
public XPageResult<QueryBaseDieselGeneratorOutput> queryBaseDieselGenerator(XContext context, QueryBaseDieselGeneratorInput input) { 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); BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
QueryWrapper<BaseDieselGeneratorEnt> queryWrapper = new QueryWrapper<>(); QueryWrapper<BaseDieselGeneratorEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(BaseDieselGeneratorEnt::getId, input.getId()) queryWrapper.lambda()
.eq(BaseDieselGeneratorEnt::getIsDeleted, input.getIsDeleted()) .eq(BaseDieselGeneratorEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE)
.like(BaseDieselGeneratorEnt::getCreateById, input.getCreateById()) .eq(StrUtil.isNotEmpty(ouId), BaseDieselGeneratorEnt::getOuId, ouId)
.like(BaseDieselGeneratorEnt::getCreateByName, input.getCreateByName()) .like(StrUtil.isNotEmpty(ouName), BaseDieselGeneratorEnt::getOuName, ouName)
.eq(BaseDieselGeneratorEnt::getCreateTime, input.getCreateTime()) .like(StrUtil.isNotEmpty(deviceName), BaseDieselGeneratorEnt::getDeviceName, deviceName)
.like(BaseDieselGeneratorEnt::getModifyById, input.getModifyById()) .orderByDesc(BaseDieselGeneratorEnt::getModifyTime);
.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());
return XMapperHelper.query(mapper, input, queryWrapper, QueryBaseDieselGeneratorOutput.class); 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service; package pps.core.base.service;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper; import pps.core.base.constant.ScadaConstant;
import com.github.pagehelper.PageInfo;
import pps.core.base.entity.BaseEnergyStorageDeviceEnt; import pps.core.base.entity.BaseEnergyStorageDeviceEnt;
import pps.core.base.entity.BaseEnergyStorageDeviceView;
import pps.core.base.mapper.BaseEnergyStorageDeviceMapper; 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.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.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext; import xstartup.base.XContext;
import xstartup.base.data.CustomQueryInput;
import xstartup.base.util.XCopyUtils; import xstartup.base.util.XCopyUtils;
import xstartup.data.XPageResult; import xstartup.data.XPageResult;
import xstartup.data.XServiceResult; import xstartup.data.XServiceResult;
...@@ -21,55 +21,88 @@ import xstartup.feature.api.annotation.XApiGet; ...@@ -21,55 +21,88 @@ import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost; import xstartup.feature.api.annotation.XApiPost;
import xstartup.feature.mybatis.helper.XMapperHelper; import xstartup.feature.mybatis.helper.XMapperHelper;
import java.util.List; import java.util.Date;
/**
* @Author luoxiangyang
* @Description: 储能设备
* @Date 2023/8/25
**/
@XService @XService
public class BaseEnergyStorageDeviceService { public class BaseEnergyStorageDeviceService {
//todo 模拟登陆
private final PpsUserSession session = SessionSimulation.getSession();
@XText("新增")
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
public XServiceResult createBaseEnergyStorageDevice(XContext context, CreateBaseEnergyStorageDeviceInput input) { public XServiceResult createBaseEnergyStorageDevice(XContext context, CreateBaseEnergyStorageDeviceInput input) {
BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class); BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
BaseEnergyStorageDeviceEnt entity = new BaseEnergyStorageDeviceEnt(); BaseEnergyStorageDeviceEnt entity = new BaseEnergyStorageDeviceEnt();
XCopyUtils.copyObject(input, entity); 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); mapper.insert(entity);
return XServiceResult.OK; return XServiceResult.OK;
} }
@XText("更新")
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
public XServiceResult updateBaseEnergyStorageDevice(XContext context, UpdateBaseEnergyStorageDeviceInput input) { public XServiceResult updateBaseEnergyStorageDevice(XContext context, UpdateBaseEnergyStorageDeviceInput input) {
BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class); BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
QueryWrapper<BaseEnergyStorageDeviceEnt> queryWrapper = new QueryWrapper<>(); 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); BaseEnergyStorageDeviceEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) { if (entity == null) {
return XServiceResult.error(context, XError.NotFound); return XServiceResult.error(context, XError.NotFound);
} }
XCopyUtils.copyObject(input, entity); XCopyUtils.copyObject(input, entity);
entity.setModifyById(session.getId());
entity.setModifyByName(session.getUserName());
entity.setModifyTime(new Date());
mapper.updateById(entity); mapper.updateById(entity);
return XServiceResult.OK; return XServiceResult.OK;
} }
@XText("删除")
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
public XServiceResult deleteBaseEnergyStorageDevice(XContext context, DeleteBaseEnergyStorageDeviceInput input) { public XServiceResult deleteBaseEnergyStorageDevice(XContext context, DeleteBaseEnergyStorageDeviceInput input) {
BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class); BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
QueryWrapper<BaseEnergyStorageDeviceEnt> queryWrapper = new QueryWrapper<>(); 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); BaseEnergyStorageDeviceEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) { if (entity == null) {
return XServiceResult.error(context, XError.NotFound); 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; return XServiceResult.OK;
} }
@XText("根据id获取详情")
@XApiAnonymous @XApiAnonymous
@XApiGet @XApiGet
public XSingleResult<GetBaseEnergyStorageDeviceOutput> getBaseEnergyStorageDevice(XContext context, GetBaseEnergyStorageDeviceInput input) { public XSingleResult<GetBaseEnergyStorageDeviceOutput> getBaseEnergyStorageDevice(XContext context, GetBaseEnergyStorageDeviceInput input) {
BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class); BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
QueryWrapper<BaseEnergyStorageDeviceEnt> queryWrapper = new QueryWrapper<>(); 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); BaseEnergyStorageDeviceEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) { if (entity == null) {
return XSingleResult.error(context, XError.NotFound); return XSingleResult.error(context, XError.NotFound);
...@@ -79,62 +112,21 @@ public class BaseEnergyStorageDeviceService { ...@@ -79,62 +112,21 @@ public class BaseEnergyStorageDeviceService {
return XSingleResult.success(output); return XSingleResult.success(output);
} }
@XText("分页查询")
@XApiAnonymous @XApiAnonymous
@XApiGet @XApiGet
public XPageResult<QueryBaseEnergyStorageDeviceOutput> queryBaseEnergyStorageDevice(XContext context, QueryBaseEnergyStorageDeviceInput input) { 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); BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
QueryWrapper<BaseEnergyStorageDeviceEnt> queryWrapper = new QueryWrapper<>(); QueryWrapper<BaseEnergyStorageDeviceEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(BaseEnergyStorageDeviceEnt::getId, input.getId()) queryWrapper.lambda()
.eq(BaseEnergyStorageDeviceEnt::getIsDeleted, input.getIsDeleted()) .eq(BaseEnergyStorageDeviceEnt::getIsDeleted, ScadaConstant.IS_DELETE_FLASE)
.like(BaseEnergyStorageDeviceEnt::getCreateById, input.getCreateById()) .eq(StrUtil.isNotEmpty(ouId),BaseEnergyStorageDeviceEnt::getOuId, ouId)
.like(BaseEnergyStorageDeviceEnt::getCreateByName, input.getCreateByName()) .like(StrUtil.isNotEmpty(ouName),BaseEnergyStorageDeviceEnt::getOuName, ouName)
.eq(BaseEnergyStorageDeviceEnt::getCreateTime, input.getCreateTime()) .like(StrUtil.isNotEmpty(deviceName),BaseEnergyStorageDeviceEnt::getDeviceName, deviceName)
.like(BaseEnergyStorageDeviceEnt::getModifyById, input.getModifyById()) .orderByDesc(BaseEnergyStorageDeviceEnt::getModifyTime);
.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());
return XMapperHelper.query(mapper, input, queryWrapper, QueryBaseEnergyStorageDeviceOutput.class); 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_diesel_generator; package pps.core.base.service.data.base_diesel_generator;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data
public class CreateBaseDieselGeneratorInput { 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") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("设备名称") @XText("设备名称")
private String deviceName; private String deviceName;
...@@ -41,122 +22,13 @@ public class CreateBaseDieselGeneratorInput { ...@@ -41,122 +22,13 @@ public class CreateBaseDieselGeneratorInput {
@XText("柴发设备机组型号key(字典获取)") @XText("柴发设备机组型号key(字典获取)")
private String unitTypeKey; private String unitTypeKey;
@XText("柴发设备机组型号name(字典获取)")
private String unitTypeName;
@XText("常用功率(KW)") @XText("常用功率(KW)")
private BigDecimal normalPower; private BigDecimal normalPower;
@XText("备用功率(KW)") @XText("备用功率(KW)")
private BigDecimal standbyPower; 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_diesel_generator; package pps.core.base.service.data.base_diesel_generator;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data
public class CreateBaseDieselGeneratorOutput { public class CreateBaseDieselGeneratorOutput {
@XText("ID") @XText("ID")
private String id; private String id;
@XText("是否删除(0_是;1_否)") @XText("是否删除(1_是;0_否)")
private Integer isDeleted; private Integer isDeleted;
@XText("创建人ID") @XText("创建人ID")
...@@ -32,6 +33,9 @@ public class CreateBaseDieselGeneratorOutput { ...@@ -32,6 +33,9 @@ public class CreateBaseDieselGeneratorOutput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("设备名称") @XText("设备名称")
private String deviceName; private String deviceName;
...@@ -41,122 +45,13 @@ public class CreateBaseDieselGeneratorOutput { ...@@ -41,122 +45,13 @@ public class CreateBaseDieselGeneratorOutput {
@XText("柴发设备机组型号key(字典获取)") @XText("柴发设备机组型号key(字典获取)")
private String unitTypeKey; private String unitTypeKey;
@XText("柴发设备机组型号name(字典获取)")
private String unitTypeName;
@XText("常用功率(KW)") @XText("常用功率(KW)")
private BigDecimal normalPower; private BigDecimal normalPower;
@XText("备用功率(KW)") @XText("备用功率(KW)")
private BigDecimal standbyPower; 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_diesel_generator; package pps.core.base.service.data.base_diesel_generator;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data
public class DeleteBaseDieselGeneratorInput { public class DeleteBaseDieselGeneratorInput {
@XText("ID") @XText("ID")
private String 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_diesel_generator; package pps.core.base.service.data.base_diesel_generator;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data
public class DeleteBaseDieselGeneratorOutput { public class DeleteBaseDieselGeneratorOutput {
@XText("ID") @XText("ID")
private String id; private String id;
@XText("是否删除(0_是;1_否)") @XText("是否删除(1_是;0_否)")
private Integer isDeleted; private Integer isDeleted;
@XText("创建人ID") @XText("创建人ID")
...@@ -32,6 +33,9 @@ public class DeleteBaseDieselGeneratorOutput { ...@@ -32,6 +33,9 @@ public class DeleteBaseDieselGeneratorOutput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("设备名称") @XText("设备名称")
private String deviceName; private String deviceName;
...@@ -41,122 +45,14 @@ public class DeleteBaseDieselGeneratorOutput { ...@@ -41,122 +45,14 @@ public class DeleteBaseDieselGeneratorOutput {
@XText("柴发设备机组型号key(字典获取)") @XText("柴发设备机组型号key(字典获取)")
private String unitTypeKey; private String unitTypeKey;
@XText("柴发设备机组型号name(字典获取)")
private String unitTypeName;
@XText("常用功率(KW)") @XText("常用功率(KW)")
private BigDecimal normalPower; private BigDecimal normalPower;
@XText("备用功率(KW)") @XText("备用功率(KW)")
private BigDecimal standbyPower; 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_diesel_generator; package pps.core.base.service.data.base_diesel_generator;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data
public class DynamicQueryBaseDieselGeneratorInput { public class DynamicQueryBaseDieselGeneratorInput {
@XText("ID") @XText("ID")
private String id; private String id;
@XText("是否删除(0_是;1_否)") @XText("是否删除(1_是;0_否)")
private Integer isDeleted; private Integer isDeleted;
@XText("创建人ID") @XText("创建人ID")
...@@ -32,6 +33,9 @@ public class DynamicQueryBaseDieselGeneratorInput { ...@@ -32,6 +33,9 @@ public class DynamicQueryBaseDieselGeneratorInput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("设备名称") @XText("设备名称")
private String deviceName; private String deviceName;
...@@ -41,122 +45,13 @@ public class DynamicQueryBaseDieselGeneratorInput { ...@@ -41,122 +45,13 @@ public class DynamicQueryBaseDieselGeneratorInput {
@XText("柴发设备机组型号key(字典获取)") @XText("柴发设备机组型号key(字典获取)")
private String unitTypeKey; private String unitTypeKey;
@XText("柴发设备机组型号name(字典获取)")
private String unitTypeName;
@XText("常用功率(KW)") @XText("常用功率(KW)")
private BigDecimal normalPower; private BigDecimal normalPower;
@XText("备用功率(KW)") @XText("备用功率(KW)")
private BigDecimal standbyPower; 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_diesel_generator; package pps.core.base.service.data.base_diesel_generator;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data
public class DynamicQueryBaseDieselGeneratorOutput { public class DynamicQueryBaseDieselGeneratorOutput {
@XText("ID") @XText("ID")
private String id; private String id;
@XText("是否删除(0_是;1_否)") @XText("是否删除(1_是;0_否)")
private Integer isDeleted; private Integer isDeleted;
@XText("创建人ID") @XText("创建人ID")
...@@ -32,6 +33,9 @@ public class DynamicQueryBaseDieselGeneratorOutput { ...@@ -32,6 +33,9 @@ public class DynamicQueryBaseDieselGeneratorOutput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("设备名称") @XText("设备名称")
private String deviceName; private String deviceName;
...@@ -41,122 +45,14 @@ public class DynamicQueryBaseDieselGeneratorOutput { ...@@ -41,122 +45,14 @@ public class DynamicQueryBaseDieselGeneratorOutput {
@XText("柴发设备机组型号key(字典获取)") @XText("柴发设备机组型号key(字典获取)")
private String unitTypeKey; private String unitTypeKey;
@XText("柴发设备机组型号name(字典获取)")
private String unitTypeName;
@XText("常用功率(KW)") @XText("常用功率(KW)")
private BigDecimal normalPower; private BigDecimal normalPower;
@XText("备用功率(KW)") @XText("备用功率(KW)")
private BigDecimal standbyPower; 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_diesel_generator; package pps.core.base.service.data.base_diesel_generator;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data
public class DynamicQueryBaseDieselGeneratorViewOutput { public class DynamicQueryBaseDieselGeneratorViewOutput {
@XText("ID") @XText("ID")
private String id; private String id;
@XText("是否删除(0_是;1_否)") @XText("是否删除(1_是;0_否)")
private Integer isDeleted; private Integer isDeleted;
@XText("创建人ID") @XText("创建人ID")
...@@ -32,6 +33,9 @@ public class DynamicQueryBaseDieselGeneratorViewOutput { ...@@ -32,6 +33,9 @@ public class DynamicQueryBaseDieselGeneratorViewOutput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("设备名称") @XText("设备名称")
private String deviceName; private String deviceName;
...@@ -41,122 +45,13 @@ public class DynamicQueryBaseDieselGeneratorViewOutput { ...@@ -41,122 +45,13 @@ public class DynamicQueryBaseDieselGeneratorViewOutput {
@XText("柴发设备机组型号key(字典获取)") @XText("柴发设备机组型号key(字典获取)")
private String unitTypeKey; private String unitTypeKey;
@XText("柴发设备机组型号name(字典获取)")
private String unitTypeName;
@XText("常用功率(KW)") @XText("常用功率(KW)")
private BigDecimal normalPower; private BigDecimal normalPower;
@XText("备用功率(KW)") @XText("备用功率(KW)")
private BigDecimal standbyPower; 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_diesel_generator; package pps.core.base.service.data.base_diesel_generator;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data
public class GetBaseDieselGeneratorInput { public class GetBaseDieselGeneratorInput {
@XText("ID") @XText("ID")
private String 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_diesel_generator; package pps.core.base.service.data.base_diesel_generator;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data
public class GetBaseDieselGeneratorOutput { public class GetBaseDieselGeneratorOutput {
@XText("ID") @XText("ID")
private String id; private String id;
@XText("是否删除(0_是;1_否)") @XText("是否删除(1_是;0_否)")
private Integer isDeleted; private Integer isDeleted;
@XText("创建人ID") @XText("创建人ID")
...@@ -32,6 +34,9 @@ public class GetBaseDieselGeneratorOutput { ...@@ -32,6 +34,9 @@ public class GetBaseDieselGeneratorOutput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("设备名称") @XText("设备名称")
private String deviceName; private String deviceName;
...@@ -41,122 +46,13 @@ public class GetBaseDieselGeneratorOutput { ...@@ -41,122 +46,13 @@ public class GetBaseDieselGeneratorOutput {
@XText("柴发设备机组型号key(字典获取)") @XText("柴发设备机组型号key(字典获取)")
private String unitTypeKey; private String unitTypeKey;
@XText("柴发设备机组型号name(字典获取)")
private String unitTypeName;
@XText("常用功率(KW)") @XText("常用功率(KW)")
private BigDecimal normalPower; private BigDecimal normalPower;
@XText("备用功率(KW)") @XText("备用功率(KW)")
private BigDecimal standbyPower; 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_diesel_generator; package pps.core.base.service.data.base_diesel_generator;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data
public class GetBaseDieselGeneratorViewInput { public class GetBaseDieselGeneratorViewInput {
@XText("ID") @XText("ID")
private String id; private String id;
@XText("是否删除(0_是;1_否)") @XText("是否删除(1_是;0_否)")
private Integer isDeleted; private Integer isDeleted;
@XText("创建人ID") @XText("创建人ID")
...@@ -32,6 +33,9 @@ public class GetBaseDieselGeneratorViewInput { ...@@ -32,6 +33,9 @@ public class GetBaseDieselGeneratorViewInput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("设备名称") @XText("设备名称")
private String deviceName; private String deviceName;
...@@ -41,122 +45,13 @@ public class GetBaseDieselGeneratorViewInput { ...@@ -41,122 +45,13 @@ public class GetBaseDieselGeneratorViewInput {
@XText("柴发设备机组型号key(字典获取)") @XText("柴发设备机组型号key(字典获取)")
private String unitTypeKey; private String unitTypeKey;
@XText("柴发设备机组型号name(字典获取)")
private String unitTypeName;
@XText("常用功率(KW)") @XText("常用功率(KW)")
private BigDecimal normalPower; private BigDecimal normalPower;
@XText("备用功率(KW)") @XText("备用功率(KW)")
private BigDecimal standbyPower; 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_diesel_generator; package pps.core.base.service.data.base_diesel_generator;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data
public class GetBaseDieselGeneratorViewOutput { public class GetBaseDieselGeneratorViewOutput {
@XText("ID") @XText("ID")
private String id; private String id;
@XText("是否删除(0_是;1_否)") @XText("是否删除(1_是;0_否)")
private Integer isDeleted; private Integer isDeleted;
@XText("创建人ID") @XText("创建人ID")
...@@ -32,6 +33,9 @@ public class GetBaseDieselGeneratorViewOutput { ...@@ -32,6 +33,9 @@ public class GetBaseDieselGeneratorViewOutput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("设备名称") @XText("设备名称")
private String deviceName; private String deviceName;
...@@ -41,122 +45,13 @@ public class GetBaseDieselGeneratorViewOutput { ...@@ -41,122 +45,13 @@ public class GetBaseDieselGeneratorViewOutput {
@XText("柴发设备机组型号key(字典获取)") @XText("柴发设备机组型号key(字典获取)")
private String unitTypeKey; private String unitTypeKey;
@XText("柴发设备机组型号name(字典获取)")
private String unitTypeName;
@XText("常用功率(KW)") @XText("常用功率(KW)")
private BigDecimal normalPower; private BigDecimal normalPower;
@XText("备用功率(KW)") @XText("备用功率(KW)")
private BigDecimal standbyPower; 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_diesel_generator; package pps.core.base.service.data.base_diesel_generator;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
import xstartup.base.data.XPageInput; import xstartup.base.data.XPageInput;
@Data
public class QueryBaseDieselGeneratorInput extends XPageInput { 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") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("设备名称") @XText("设备名称")
private String deviceName; private String deviceName;
...@@ -42,122 +23,13 @@ public class QueryBaseDieselGeneratorInput extends XPageInput { ...@@ -42,122 +23,13 @@ public class QueryBaseDieselGeneratorInput extends XPageInput {
@XText("柴发设备机组型号key(字典获取)") @XText("柴发设备机组型号key(字典获取)")
private String unitTypeKey; private String unitTypeKey;
@XText("柴发设备机组型号name(字典获取)")
private String unitTypeName;
@XText("常用功率(KW)") @XText("常用功率(KW)")
private BigDecimal normalPower; private BigDecimal normalPower;
@XText("备用功率(KW)") @XText("备用功率(KW)")
private BigDecimal standbyPower; 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_diesel_generator; package pps.core.base.service.data.base_diesel_generator;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
import xstartup.base.data.XPageInput; import xstartup.base.data.XPageInput;
@Data
public class QueryBaseDieselGeneratorOutput extends XPageInput { public class QueryBaseDieselGeneratorOutput extends XPageInput {
@XText("ID") @XText("ID")
private String id; private String id;
@XText("是否删除(0_是;1_否)") @XText("是否删除(1_是;0_否)")
private Integer isDeleted; private Integer isDeleted;
@XText("创建人ID") @XText("创建人ID")
...@@ -33,6 +35,9 @@ public class QueryBaseDieselGeneratorOutput extends XPageInput { ...@@ -33,6 +35,9 @@ public class QueryBaseDieselGeneratorOutput extends XPageInput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("设备名称") @XText("设备名称")
private String deviceName; private String deviceName;
...@@ -42,122 +47,13 @@ public class QueryBaseDieselGeneratorOutput extends XPageInput { ...@@ -42,122 +47,13 @@ public class QueryBaseDieselGeneratorOutput extends XPageInput {
@XText("柴发设备机组型号key(字典获取)") @XText("柴发设备机组型号key(字典获取)")
private String unitTypeKey; private String unitTypeKey;
@XText("柴发设备机组型号name(字典获取)")
private String unitTypeName;
@XText("常用功率(KW)") @XText("常用功率(KW)")
private BigDecimal normalPower; private BigDecimal normalPower;
@XText("备用功率(KW)") @XText("备用功率(KW)")
private BigDecimal standbyPower; 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_diesel_generator; package pps.core.base.service.data.base_diesel_generator;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
import xstartup.base.data.XPageInput; import xstartup.base.data.XPageInput;
@Data
public class QueryBaseDieselGeneratorViewInput extends XPageInput { public class QueryBaseDieselGeneratorViewInput extends XPageInput {
@XText("ID") @XText("ID")
private String id; private String id;
@XText("是否删除(0_是;1_否)") @XText("是否删除(1_是;0_否)")
private Integer isDeleted; private Integer isDeleted;
@XText("创建人ID") @XText("创建人ID")
...@@ -33,6 +34,9 @@ public class QueryBaseDieselGeneratorViewInput extends XPageInput { ...@@ -33,6 +34,9 @@ public class QueryBaseDieselGeneratorViewInput extends XPageInput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("设备名称") @XText("设备名称")
private String deviceName; private String deviceName;
...@@ -42,122 +46,14 @@ public class QueryBaseDieselGeneratorViewInput extends XPageInput { ...@@ -42,122 +46,14 @@ public class QueryBaseDieselGeneratorViewInput extends XPageInput {
@XText("柴发设备机组型号key(字典获取)") @XText("柴发设备机组型号key(字典获取)")
private String unitTypeKey; private String unitTypeKey;
@XText("柴发设备机组型号name(字典获取)")
private String unitTypeName;
@XText("常用功率(KW)") @XText("常用功率(KW)")
private BigDecimal normalPower; private BigDecimal normalPower;
@XText("备用功率(KW)") @XText("备用功率(KW)")
private BigDecimal standbyPower; 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_diesel_generator; package pps.core.base.service.data.base_diesel_generator;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
import xstartup.base.data.XPageInput; import xstartup.base.data.XPageInput;
@Data
public class QueryBaseDieselGeneratorViewOutput extends XPageInput { public class QueryBaseDieselGeneratorViewOutput extends XPageInput {
@XText("ID") @XText("ID")
private String id; private String id;
@XText("是否删除(0_是;1_否)") @XText("是否删除(1_是;0_否)")
private Integer isDeleted; private Integer isDeleted;
@XText("创建人ID") @XText("创建人ID")
...@@ -33,6 +35,9 @@ public class QueryBaseDieselGeneratorViewOutput extends XPageInput { ...@@ -33,6 +35,9 @@ public class QueryBaseDieselGeneratorViewOutput extends XPageInput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("设备名称") @XText("设备名称")
private String deviceName; private String deviceName;
...@@ -42,122 +47,13 @@ public class QueryBaseDieselGeneratorViewOutput extends XPageInput { ...@@ -42,122 +47,13 @@ public class QueryBaseDieselGeneratorViewOutput extends XPageInput {
@XText("柴发设备机组型号key(字典获取)") @XText("柴发设备机组型号key(字典获取)")
private String unitTypeKey; private String unitTypeKey;
@XText("柴发设备机组型号name(字典获取)")
private String unitTypeName;
@XText("常用功率(KW)") @XText("常用功率(KW)")
private BigDecimal normalPower; private BigDecimal normalPower;
@XText("备用功率(KW)") @XText("备用功率(KW)")
private BigDecimal standbyPower; 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_diesel_generator; package pps.core.base.service.data.base_diesel_generator;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data
public class UpdateBaseDieselGeneratorInput { public class UpdateBaseDieselGeneratorInput {
@XText("ID") @XText("ID")
private String 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") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("设备名称") @XText("设备名称")
private String deviceName; private String deviceName;
...@@ -41,122 +24,13 @@ public class UpdateBaseDieselGeneratorInput { ...@@ -41,122 +24,13 @@ public class UpdateBaseDieselGeneratorInput {
@XText("柴发设备机组型号key(字典获取)") @XText("柴发设备机组型号key(字典获取)")
private String unitTypeKey; private String unitTypeKey;
@XText("柴发设备机组型号name(字典获取)")
private String unitTypeName;
@XText("常用功率(KW)") @XText("常用功率(KW)")
private BigDecimal normalPower; private BigDecimal normalPower;
@XText("备用功率(KW)") @XText("备用功率(KW)")
private BigDecimal standbyPower; 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_diesel_generator; package pps.core.base.service.data.base_diesel_generator;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data
public class UpdateBaseDieselGeneratorOutput { public class UpdateBaseDieselGeneratorOutput {
@XText("ID") @XText("ID")
private String id; private String id;
@XText("是否删除(0_是;1_否)") @XText("是否删除(1_是;0_否)")
private Integer isDeleted; private Integer isDeleted;
@XText("创建人ID") @XText("创建人ID")
...@@ -32,6 +33,9 @@ public class UpdateBaseDieselGeneratorOutput { ...@@ -32,6 +33,9 @@ public class UpdateBaseDieselGeneratorOutput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("设备名称") @XText("设备名称")
private String deviceName; private String deviceName;
...@@ -41,122 +45,13 @@ public class UpdateBaseDieselGeneratorOutput { ...@@ -41,122 +45,13 @@ public class UpdateBaseDieselGeneratorOutput {
@XText("柴发设备机组型号key(字典获取)") @XText("柴发设备机组型号key(字典获取)")
private String unitTypeKey; private String unitTypeKey;
@XText("柴发设备机组型号name(字典获取)")
private String unitTypeName;
@XText("常用功率(KW)") @XText("常用功率(KW)")
private BigDecimal normalPower; private BigDecimal normalPower;
@XText("备用功率(KW)") @XText("备用功率(KW)")
private BigDecimal standbyPower; 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_energy_storage_device; package pps.core.base.service.data.base_energy_storage_device;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data
public class CreateBaseEnergyStorageDeviceInput { 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") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("设备名称") @XText("设备名称")
private String deviceName; private String deviceName;
...@@ -41,6 +22,9 @@ public class CreateBaseEnergyStorageDeviceInput { ...@@ -41,6 +22,9 @@ public class CreateBaseEnergyStorageDeviceInput {
@XText("储能设备规格型号key(字典获取)") @XText("储能设备规格型号key(字典获取)")
private String storageModelKey; private String storageModelKey;
@XText("储能设备规格型号name(字典获取)")
private String storageModelName;
@XText("设备容量(KWh)") @XText("设备容量(KWh)")
private BigDecimal apparatusCapacity; private BigDecimal apparatusCapacity;
...@@ -50,124 +34,5 @@ public class CreateBaseEnergyStorageDeviceInput { ...@@ -50,124 +34,5 @@ public class CreateBaseEnergyStorageDeviceInput {
@XText("额定充电功率(KW)") @XText("额定充电功率(KW)")
private BigDecimal ratedChargingPower; 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_energy_storage_device; package pps.core.base.service.data.base_energy_storage_device;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data
public class CreateBaseEnergyStorageDeviceOutput { public class CreateBaseEnergyStorageDeviceOutput {
@XText("ID") @XText("ID")
private String id; private String id;
@XText("是否删除(0_是;1_否)") @XText("是否删除(1_是;0_否)")
private Integer isDeleted; private Integer isDeleted;
@XText("创建人ID") @XText("创建人ID")
...@@ -32,6 +33,9 @@ public class CreateBaseEnergyStorageDeviceOutput { ...@@ -32,6 +33,9 @@ public class CreateBaseEnergyStorageDeviceOutput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("设备名称") @XText("设备名称")
private String deviceName; private String deviceName;
...@@ -41,6 +45,9 @@ public class CreateBaseEnergyStorageDeviceOutput { ...@@ -41,6 +45,9 @@ public class CreateBaseEnergyStorageDeviceOutput {
@XText("储能设备规格型号key(字典获取)") @XText("储能设备规格型号key(字典获取)")
private String storageModelKey; private String storageModelKey;
@XText("储能设备规格型号name(字典获取)")
private String storageModelName;
@XText("设备容量(KWh)") @XText("设备容量(KWh)")
private BigDecimal apparatusCapacity; private BigDecimal apparatusCapacity;
...@@ -50,124 +57,4 @@ public class CreateBaseEnergyStorageDeviceOutput { ...@@ -50,124 +57,4 @@ public class CreateBaseEnergyStorageDeviceOutput {
@XText("额定充电功率(KW)") @XText("额定充电功率(KW)")
private BigDecimal ratedChargingPower; 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_energy_storage_device; package pps.core.base.service.data.base_energy_storage_device;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data
public class DeleteBaseEnergyStorageDeviceInput { public class DeleteBaseEnergyStorageDeviceInput {
@XText("ID") @XText("ID")
private String 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_energy_storage_device; package pps.core.base.service.data.base_energy_storage_device;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data
public class DeleteBaseEnergyStorageDeviceOutput { public class DeleteBaseEnergyStorageDeviceOutput {
@XText("ID") @XText("ID")
private String id; private String id;
@XText("是否删除(0_是;1_否)") @XText("是否删除(1_是;0_否)")
private Integer isDeleted; private Integer isDeleted;
@XText("创建人ID") @XText("创建人ID")
...@@ -32,6 +33,9 @@ public class DeleteBaseEnergyStorageDeviceOutput { ...@@ -32,6 +33,9 @@ public class DeleteBaseEnergyStorageDeviceOutput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("设备名称") @XText("设备名称")
private String deviceName; private String deviceName;
...@@ -41,6 +45,9 @@ public class DeleteBaseEnergyStorageDeviceOutput { ...@@ -41,6 +45,9 @@ public class DeleteBaseEnergyStorageDeviceOutput {
@XText("储能设备规格型号key(字典获取)") @XText("储能设备规格型号key(字典获取)")
private String storageModelKey; private String storageModelKey;
@XText("储能设备规格型号name(字典获取)")
private String storageModelName;
@XText("设备容量(KWh)") @XText("设备容量(KWh)")
private BigDecimal apparatusCapacity; private BigDecimal apparatusCapacity;
...@@ -50,124 +57,4 @@ public class DeleteBaseEnergyStorageDeviceOutput { ...@@ -50,124 +57,4 @@ public class DeleteBaseEnergyStorageDeviceOutput {
@XText("额定充电功率(KW)") @XText("额定充电功率(KW)")
private BigDecimal ratedChargingPower; 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_energy_storage_device; package pps.core.base.service.data.base_energy_storage_device;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data
public class DynamicQueryBaseEnergyStorageDeviceInput { public class DynamicQueryBaseEnergyStorageDeviceInput {
@XText("ID") @XText("ID")
private String id; private String id;
@XText("是否删除(0_是;1_否)") @XText("是否删除(1_是;0_否)")
private Integer isDeleted; private Integer isDeleted;
@XText("创建人ID") @XText("创建人ID")
...@@ -32,6 +33,9 @@ public class DynamicQueryBaseEnergyStorageDeviceInput { ...@@ -32,6 +33,9 @@ public class DynamicQueryBaseEnergyStorageDeviceInput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("设备名称") @XText("设备名称")
private String deviceName; private String deviceName;
...@@ -41,6 +45,9 @@ public class DynamicQueryBaseEnergyStorageDeviceInput { ...@@ -41,6 +45,9 @@ public class DynamicQueryBaseEnergyStorageDeviceInput {
@XText("储能设备规格型号key(字典获取)") @XText("储能设备规格型号key(字典获取)")
private String storageModelKey; private String storageModelKey;
@XText("储能设备规格型号name(字典获取)")
private String storageModelName;
@XText("设备容量(KWh)") @XText("设备容量(KWh)")
private BigDecimal apparatusCapacity; private BigDecimal apparatusCapacity;
...@@ -50,124 +57,5 @@ public class DynamicQueryBaseEnergyStorageDeviceInput { ...@@ -50,124 +57,5 @@ public class DynamicQueryBaseEnergyStorageDeviceInput {
@XText("额定充电功率(KW)") @XText("额定充电功率(KW)")
private BigDecimal ratedChargingPower; 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_energy_storage_device; package pps.core.base.service.data.base_energy_storage_device;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data
public class DynamicQueryBaseEnergyStorageDeviceOutput { public class DynamicQueryBaseEnergyStorageDeviceOutput {
@XText("ID") @XText("ID")
private String id; private String id;
@XText("是否删除(0_是;1_否)") @XText("是否删除(1_是;0_否)")
private Integer isDeleted; private Integer isDeleted;
@XText("创建人ID") @XText("创建人ID")
...@@ -32,6 +33,9 @@ public class DynamicQueryBaseEnergyStorageDeviceOutput { ...@@ -32,6 +33,9 @@ public class DynamicQueryBaseEnergyStorageDeviceOutput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("设备名称") @XText("设备名称")
private String deviceName; private String deviceName;
...@@ -41,6 +45,9 @@ public class DynamicQueryBaseEnergyStorageDeviceOutput { ...@@ -41,6 +45,9 @@ public class DynamicQueryBaseEnergyStorageDeviceOutput {
@XText("储能设备规格型号key(字典获取)") @XText("储能设备规格型号key(字典获取)")
private String storageModelKey; private String storageModelKey;
@XText("储能设备规格型号name(字典获取)")
private String storageModelName;
@XText("设备容量(KWh)") @XText("设备容量(KWh)")
private BigDecimal apparatusCapacity; private BigDecimal apparatusCapacity;
...@@ -50,124 +57,5 @@ public class DynamicQueryBaseEnergyStorageDeviceOutput { ...@@ -50,124 +57,5 @@ public class DynamicQueryBaseEnergyStorageDeviceOutput {
@XText("额定充电功率(KW)") @XText("额定充电功率(KW)")
private BigDecimal ratedChargingPower; 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_energy_storage_device; package pps.core.base.service.data.base_energy_storage_device;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data
public class DynamicQueryBaseEnergyStorageDeviceViewOutput { public class DynamicQueryBaseEnergyStorageDeviceViewOutput {
@XText("ID") @XText("ID")
private String id; private String id;
@XText("是否删除(0_是;1_否)") @XText("是否删除(1_是;0_否)")
private Integer isDeleted; private Integer isDeleted;
@XText("创建人ID") @XText("创建人ID")
...@@ -32,6 +33,9 @@ public class DynamicQueryBaseEnergyStorageDeviceViewOutput { ...@@ -32,6 +33,9 @@ public class DynamicQueryBaseEnergyStorageDeviceViewOutput {
@XText("组织机构ID") @XText("组织机构ID")
private String ouId; private String ouId;
@XText("组织机构name")
private String ouName;
@XText("设备名称") @XText("设备名称")
private String deviceName; private String deviceName;
...@@ -41,6 +45,9 @@ public class DynamicQueryBaseEnergyStorageDeviceViewOutput { ...@@ -41,6 +45,9 @@ public class DynamicQueryBaseEnergyStorageDeviceViewOutput {
@XText("储能设备规格型号key(字典获取)") @XText("储能设备规格型号key(字典获取)")
private String storageModelKey; private String storageModelKey;
@XText("储能设备规格型号name(字典获取)")
private String storageModelName;
@XText("设备容量(KWh)") @XText("设备容量(KWh)")
private BigDecimal apparatusCapacity; private BigDecimal apparatusCapacity;
...@@ -50,124 +57,5 @@ public class DynamicQueryBaseEnergyStorageDeviceViewOutput { ...@@ -50,124 +57,5 @@ public class DynamicQueryBaseEnergyStorageDeviceViewOutput {
@XText("额定充电功率(KW)") @XText("额定充电功率(KW)")
private BigDecimal ratedChargingPower; 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 100644 → 100755
View file @ 391a6601
package pps.core.base.service.data.base_energy_storage_device; package pps.core.base.service.data.base_energy_storage_device;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data
public class GetBaseEnergyStorageDeviceInput { public class GetBaseEnergyStorageDeviceInput {
@XText("ID") @XText("ID")
private String 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/resources/mybatis/mapper/pps/core/base/BaseDieselGeneratorViewMapper.xml 100644 → 100755
View file @ 391a6601
...@@ -11,9 +11,11 @@ ...@@ -11,9 +11,11 @@
<result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR" /> <result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR" />
<result column="modify_time" property="modifyTime" jdbcType="DATE" /> <result column="modify_time" property="modifyTime" jdbcType="DATE" />
<result column="ou_id" property="ouId" jdbcType="VARCHAR" /> <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="device_name" property="deviceName" jdbcType="VARCHAR" />
<result column="maker_number" property="makerNumber" jdbcType="VARCHAR" /> <result column="maker_number" property="makerNumber" jdbcType="VARCHAR" />
<result column="unit_type_key" property="unitTypeKey" 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="normal_power" property="normalPower" jdbcType="DECIMAL" />
<result column="standby_power" property="standbyPower" jdbcType="DECIMAL" /> <result column="standby_power" property="standbyPower" jdbcType="DECIMAL" />
</resultMap> </resultMap>
...@@ -27,9 +29,11 @@ ...@@ -27,9 +29,11 @@
modify_by_name, modify_by_name,
modify_time, modify_time,
ou_id, ou_id,
ou_name,
device_name, device_name,
maker_number, maker_number,
unit_type_key, unit_type_key,
unit_type_name,
normal_power, normal_power,
standby_power standby_power
</sql> </sql>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment