xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
dashixiong
2025-07-14 16:16:19 +08:00
parent bf1d70c953 cceafdca92
commit d22a71739f
50 changed files with 2728 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ems-system/src/main/java/com/xzzn/ems/domain/EmsDevicesSetting.java
View File

@ -11,7 +11,7 @@ import com.xzzn.common.annotation.Excel;
* Modbus设备配置对象 ems_devices_setting
*
* @author xzzn
* @date 2025-07-02
* @date 2025-07-12
*/
public class EmsDevicesSetting extends BaseEntity
{
@ -102,6 +102,10 @@ public class EmsDevicesSetting extends BaseEntity
@Excel(name = "设备类别，例如“STACK/CLUSTER/PCS等”")
private String deviceCategory;
/** 设备图像地址 */
@Excel(name = "设备图像地址")
private String pictureUrl;
public void setId(Long id)
{
this.id = id;
@ -312,6 +316,16 @@ public class EmsDevicesSetting extends BaseEntity
return deviceCategory;
}
public void setPictureUrl(String pictureUrl)
{
this.pictureUrl = pictureUrl;
}
public String getPictureUrl()
{
return pictureUrl;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@ -336,6 +350,7 @@ public class EmsDevicesSetting extends BaseEntity
.append("deviceId", getDeviceId())
.append("parentId", getParentId())
.append("deviceCategory", getDeviceCategory())
.append("pictureUrl", getPictureUrl())
.toString();
}
}

136
ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyCurve.java Normal file
View File

@ -0,0 +1,136 @@
package com.xzzn.ems.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xzzn.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.xzzn.common.annotation.Excel;
/**
* 策曲线对象 ems_strategy_curve
*
* @author xzzn
* @date 2025-07-11
*/
public class EmsStrategyCurve extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
private Long id;
/** 关联的策略ID */
@Excel(name = "关联的策略ID")
private Long strategyId;
/** 任务编号 */
@Excel(name = "任务编号")
private Long taskNumber;
/** 开始日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "开始日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date startDate;
/** 结束日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "结束日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date endDate;
/** 功率数据，可以是JSON格式存储曲线数据 */
@Excel(name = "功率数据，可以是JSON格式存储曲线数据")
private String powerData;
/** 站点id */
@Excel(name = "站点id")
private String siteId;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setStrategyId(Long strategyId)
{
this.strategyId = strategyId;
}
public Long getStrategyId()
{
return strategyId;
}
public void setTaskNumber(Long taskNumber)
{
this.taskNumber = taskNumber;
}
public Long getTaskNumber()
{
return taskNumber;
}
public void setStartDate(Date startDate)
{
this.startDate = startDate;
}
public Date getStartDate()
{
return startDate;
}
public void setEndDate(Date endDate)
{
this.endDate = endDate;
}
public Date getEndDate()
{
return endDate;
}
public void setPowerData(String powerData)
{
this.powerData = powerData;
}
public String getPowerData()
{
return powerData;
}
public void setSiteId(String siteId)
{
this.siteId = siteId;
}
public String getSiteId()
{
return siteId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("strategyId", getStrategyId())
.append("taskNumber", getTaskNumber())
.append("startDate", getStartDate())
.append("endDate", getEndDate())
.append("powerData", getPowerData())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("siteId", getSiteId())
.toString();
}
}

212
ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTemp.java Normal file
View File

@ -0,0 +1,212 @@
package com.xzzn.ems.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xzzn.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.xzzn.common.annotation.Excel;
/**
* 模板对象 ems_strategy_temp
*
* @author xzzn
* @date 2025-07-13
*/
public class EmsStrategyTemp extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** */
private Long id;
/** 关联的策略ID */
@Excel(name = "关联的策略ID")
private Long strategyId;
/** 模板名称，如“模板一” */
@Excel(name = "模板名称，如“模板一”")
private String templateName;
/** SDC限制 (%) 1 = 开，0 = 关 */
@Excel(name = "SDC限制 (%) 1 = 开，0 = 关")
private Integer sdcLimit;
/** SDC下限 (%) */
@Excel(name = "SDC下限 (%)")
private BigDecimal sdcDown;
/** SDC上限 (%) */
@Excel(name = "SDC上限 (%)")
private BigDecimal sdcUp;
/** 开始时间 */
@JsonFormat(pattern = "HH:mm")
@Excel(name = "开始时间", width = 30, dateFormat = "HH:mm")
private Date startTime;
/** 结束时间 */
@JsonFormat(pattern = "HH:mm")
@Excel(name = "结束时间", width = 30, dateFormat = "HH:mm")
private Date endTime;
/** 充放功率 (kW) */
@Excel(name = "充放功率 (kW)")
private BigDecimal chargeDischargePower;
/** 充电状态，如“1-充电”、“2-待机” */
@Excel(name = "充电状态，如“1-充电”、“2-待机”")
private String chargeStatus;
/** 站点id */
@Excel(name = "站点id")
private String siteId;
/** 模板id */
@Excel(name = "模板id")
private String templateId;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setStrategyId(Long strategyId)
{
this.strategyId = strategyId;
}
public Long getStrategyId()
{
return strategyId;
}
public void setTemplateName(String templateName)
{
this.templateName = templateName;
}
public String getTemplateName()
{
return templateName;
}
public void setSdcLimit(Integer sdcLimit)
{
this.sdcLimit = sdcLimit;
}
public Integer getSdcLimit()
{
return sdcLimit;
}
public void setSdcDown(BigDecimal sdcDown)
{
this.sdcDown = sdcDown;
}
public BigDecimal getSdcDown()
{
return sdcDown;
}
public void setSdcUp(BigDecimal sdcUp)
{
this.sdcUp = sdcUp;
}
public BigDecimal getSdcUp()
{
return sdcUp;
}
public void setStartTime(Date startTime)
{
this.startTime = startTime;
}
public Date getStartTime()
{
return startTime;
}
public void setEndTime(Date endTime)
{
this.endTime = endTime;
}
public Date getEndTime()
{
return endTime;
}
public void setChargeDischargePower(BigDecimal chargeDischargePower)
{
this.chargeDischargePower = chargeDischargePower;
}
public BigDecimal getChargeDischargePower()
{
return chargeDischargePower;
}
public void setChargeStatus(String chargeStatus)
{
this.chargeStatus = chargeStatus;
}
public String getChargeStatus()
{
return chargeStatus;
}
public void setSiteId(String siteId)
{
this.siteId = siteId;
}
public String getSiteId()
{
return siteId;
}
public void setTemplateId(String templateId)
{
this.templateId = templateId;
}
public String getTemplateId()
{
return templateId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("strategyId", getStrategyId())
.append("templateName", getTemplateName())
.append("sdcLimit", getSdcLimit())
.append("sdcDown", getSdcDown())
.append("sdcUp", getSdcUp())
.append("startTime", getStartTime())
.append("endTime", getEndTime())
.append("chargeDischargePower", getChargeDischargePower())
.append("chargeStatus", getChargeStatus())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("siteId", getSiteId())
.append("templateId", getTemplateId())
.toString();
}
}

122
ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTempTimeConfig.java Normal file
View File

@ -0,0 +1,122 @@
package com.xzzn.ems.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xzzn.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.xzzn.common.annotation.Excel;
/**
* 模板配置对象 ems_strategy_temp_time_config
*
* @author xzzn
* @date 2025-07-12
*/
public class EmsStrategyTempTimeConfig extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
private Long id;
/** 开始时间 */
@JsonFormat(pattern = "HH:mm")
@Excel(name = "开始时间", width = 30, dateFormat = "HH:mm")
private Date startTime;
/** 结束时间 */
@JsonFormat(pattern = "HH:mm")
@Excel(name = "结束时间", width = 30, dateFormat = "HH:mm")
private Date endTime;
/** 充放功率 (kW) */
@Excel(name = "充放功率 (kW)")
private BigDecimal chargeDischargePower;
/** 充电状态，如“1-充电”、“2-待机” */
@Excel(name = "充电状态，如“1-充电”、“2-待机”")
private String chargeStatus;
/** 模板id */
@Excel(name = "模板id")
private String templateId;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setStartTime(Date startTime)
{
this.startTime = startTime;
}
public Date getStartTime()
{
return startTime;
}
public void setEndTime(Date endTime)
{
this.endTime = endTime;
}
public Date getEndTime()
{
return endTime;
}
public void setChargeDischargePower(BigDecimal chargeDischargePower)
{
this.chargeDischargePower = chargeDischargePower;
}
public BigDecimal getChargeDischargePower()
{
return chargeDischargePower;
}
public void setChargeStatus(String chargeStatus)
{
this.chargeStatus = chargeStatus;
}
public String getChargeStatus()
{
return chargeStatus;
}
public void setTemplateId(String templateId)
{
this.templateId = templateId;
}
public String getTemplateId()
{
return templateId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("startTime", getStartTime())
.append("endTime", getEndTime())
.append("chargeDischargePower", getChargeDischargePower())
.append("chargeStatus", getChargeStatus())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("templateId", getTemplateId())
.toString();
}
}

117
ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTimeConfig.java Normal file
View File

@ -0,0 +1,117 @@
package com.xzzn.ems.domain;
import com.xzzn.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.xzzn.common.annotation.Excel;
/**
* 时间配置对象 ems_strategy_time_config
*
* @author xzzn
* @date 2025-07-12
*/
public class EmsStrategyTimeConfig extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** */
private Long id;
/** 关联的策略ID */
@Excel(name = "关联的策略ID")
private Long strategyId;
/** 月份，1-12 */
@Excel(name = "月份，1-12")
private Long month;
/** 充放电模式，如“两充两放” */
@Excel(name = "充放电模式，如“两充两放”")
private String chargeDischargeMode;
/** 站点id */
@Excel(name = "站点id")
private String siteId;
/** 模版id */
@Excel(name = "模版id")
private String templateId;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setStrategyId(Long strategyId)
{
this.strategyId = strategyId;
}
public Long getStrategyId()
{
return strategyId;
}
public void setMonth(Long month)
{
this.month = month;
}
public Long getMonth()
{
return month;
}
public void setChargeDischargeMode(String chargeDischargeMode)
{
this.chargeDischargeMode = chargeDischargeMode;
}
public String getChargeDischargeMode()
{
return chargeDischargeMode;
}
public void setSiteId(String siteId)
{
this.siteId = siteId;
}
public String getSiteId()
{
return siteId;
}
public void setTemplateId(String templateId)
{
this.templateId = templateId;
}
public String getTemplateId()
{
return templateId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("strategyId", getStrategyId())
.append("month", getMonth())
.append("chargeDischargeMode", getChargeDischargeMode())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("siteId", getSiteId())
.append("templateId", getTemplateId())
.toString();
}
}

6
ems-system/src/main/java/com/xzzn/ems/domain/EmsTicket.java
View File

@ -26,7 +26,7 @@ public class EmsTicket extends BaseEntity
/** 提交用户ID */
@Excel(name = "提交用户ID")
private String userId;
private Long userId;
/** 工单标题 */
@Excel(name = "工单标题")
@ -77,12 +77,12 @@ public class EmsTicket extends BaseEntity
return ticketNo;
}
public void setUserId(String userId)
public void setUserId(Long userId)
{
this.userId = userId;
}
public String getUserId()
public Long getUserId()
{
return userId;
}

20
ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteDeviceListVo.java
View File

@ -19,6 +19,10 @@ public class SiteDeviceListVo {
private String communicationStatus;
/** 设备类型 */
private String deviceCategory;
/** 设备类型 */
private String pictureUrl;
/** 唯一标识 */
private String id;
public String getSiteId() {
return siteId;
@ -75,4 +79,20 @@ public class SiteDeviceListVo {
public void setDeviceCategory(String deviceCategory) {
this.deviceCategory = deviceCategory;
}
public String getPictureUrl() {
return pictureUrl;
}
public void setPictureUrl(String pictureUrl) {
this.pictureUrl = pictureUrl;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
}

22
ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyRunningVo.java
View File

@ -26,6 +26,12 @@ public class StrategyRunningVo
/** 策略运行id */
private Long id;
/** 主策略id */
private Long mainStrategyId;
/** 辅助策略id */
private Long auxStrategyId;
public void setStatus(String status)
{
this.status = status;
@ -79,4 +85,20 @@ public class StrategyRunningVo
public void setId(Long id) {
this.id = id;
}
public Long getAuxStrategyId() {
return auxStrategyId;
}
public void setAuxStrategyId(Long auxStrategyId) {
this.auxStrategyId = auxStrategyId;
}
public Long getMainStrategyId() {
return mainStrategyId;
}
public void setMainStrategyId(Long mainStrategyId) {
this.mainStrategyId = mainStrategyId;
}
}

115
ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyTempConfigRequest.java Normal file
View File

@ -0,0 +1,115 @@
package com.xzzn.ems.domain.vo;
import com.xzzn.ems.domain.EmsStrategyTempTimeConfig;
import java.math.BigDecimal;
import java.util.List;
/**
* 新增模板+模板时间数据
*
* @author xzzn
* @date 2025-07-12
*/
public class StrategyTempConfigRequest
{
/** 模板id */
private String templateId;
/** 站点id */
private String siteId;
/** 关联的策略ID */
private Long strategyId;
/** 模板名称，如“模板一” */
private String templateName;
/** SDC限制 (%) 1 = 开，0 = 关 */
private Integer sdcLimit;
/** SDC下限 (%) */
private BigDecimal sdcDown;
/** SDC上限 (%) */
private BigDecimal sdcUp;
/** 模板时间 */
private List<EmsStrategyTempTimeConfig> timeConfigList;
public String getTemplateId() {
return templateId;
}
public void setTemplateId(String templateId) {
this.templateId = templateId;
}
public void setStrategyId(Long strategyId)
{
this.strategyId = strategyId;
}
public Long getStrategyId()
{
return strategyId;
}
public void setTemplateName(String templateName)
{
this.templateName = templateName;
}
public String getTemplateName()
{
return templateName;
}
public void setSdcLimit(Integer sdcLimit)
{
this.sdcLimit = sdcLimit;
}
public Integer getSdcLimit()
{
return sdcLimit;
}
public void setSdcDown(BigDecimal sdcDown)
{
this.sdcDown = sdcDown;
}
public BigDecimal getSdcDown()
{
return sdcDown;
}
public void setSdcUp(BigDecimal sdcUp)
{
this.sdcUp = sdcUp;
}
public BigDecimal getSdcUp()
{
return sdcUp;
}
public void setSiteId(String siteId)
{
this.siteId = siteId;
}
public String getSiteId()
{
return siteId;
}
public List<EmsStrategyTempTimeConfig> getTimeConfigList() {
return timeConfigList;
}
public void setTimeConfigList(List<EmsStrategyTempTimeConfig> timeConfigList) {
this.timeConfigList = timeConfigList;
}
}

152
ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyTempTimeConfigVo.java Normal file
View File

@ -0,0 +1,152 @@
package com.xzzn.ems.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
/**
* 模板+模板时间数据
*
* @author xzzn
* @date 2025-07-12
*/
public class StrategyTempTimeConfigVo
{
/** 模版id */
private Long id;
/** 关联的策略ID */
private Long strategyId;
/** 模板名称，如“模板一” */
private String templateName;
/** SDC限制 (%) 1 = 开，0 = 关 */
private Integer sdcLimit;
/** SDC下限 (%) */
private BigDecimal sdcDown;
/** SDC上限 (%) */
private BigDecimal sdcUp;
/** 站点id */
private String siteId;
/** 开始时间 */
@JsonFormat(pattern = "HH:mm:ss")
private Date startTime;
/** 结束时间 */
@JsonFormat(pattern = "HH:mm:ss")
private Date endTime;
/** 充放功率 (kW) */
private BigDecimal chargeDischargePower;
/** 充电状态，如“1-充电”、“2-待机” */
private String chargeStatus;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setStrategyId(Long strategyId)
{
this.strategyId = strategyId;
}
public Long getStrategyId()
{
return strategyId;
}
public void setTemplateName(String templateName)
{
this.templateName = templateName;
}
public String getTemplateName()
{
return templateName;
}
public void setSdcLimit(Integer sdcLimit)
{
this.sdcLimit = sdcLimit;
}
public Integer getSdcLimit()
{
return sdcLimit;
}
public void setSdcDown(BigDecimal sdcDown)
{
this.sdcDown = sdcDown;
}
public BigDecimal getSdcDown()
{
return sdcDown;
}
public void setSdcUp(BigDecimal sdcUp)
{
this.sdcUp = sdcUp;
}
public BigDecimal getSdcUp()
{
return sdcUp;
}
public void setSiteId(String siteId)
{
this.siteId = siteId;
}
public String getSiteId()
{
return siteId;
}
public Date getStartTime() {
return startTime;
}
public void setStartTime(Date startTime) {
this.startTime = startTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public BigDecimal getChargeDischargePower() {
return chargeDischargePower;
}
public void setChargeDischargePower(BigDecimal chargeDischargePower) {
this.chargeDischargePower = chargeDischargePower;
}
public String getChargeStatus() {
return chargeStatus;
}
public void setChargeStatus(String chargeStatus) {
this.chargeStatus = chargeStatus;
}
}

99
ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyTimeConfigVo.java Normal file
View File

@ -0,0 +1,99 @@
package com.xzzn.ems.domain.vo;
/**
* 时间配置显示对象
*
* @author xzzn
* @date 2025-07-12
*/
public class StrategyTimeConfigVo
{
/** */
private Long id;
/** 关联的策略ID */
private Long strategyId;
/** 月份，1-12 */
private Long month;
/** 站点id */
private String siteId;
/** 充放电模式 */
private String chargeDischargeMode;
/** 模板id */
private String templateId;
/** 模板名称 */
private String templateName;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setStrategyId(Long strategyId)
{
this.strategyId = strategyId;
}
public Long getStrategyId()
{
return strategyId;
}
public void setMonth(Long month)
{
this.month = month;
}
public Long getMonth()
{
return month;
}
public void setChargeDischargeMode(String chargeDischargeMode)
{
this.chargeDischargeMode = chargeDischargeMode;
}
public String getChargeDischargeMode()
{
return chargeDischargeMode;
}
public void setSiteId(String siteId)
{
this.siteId = siteId;
}
public String getSiteId()
{
return siteId;
}
public void setTemplateId(String templateId)
{
this.templateId = templateId;
}
public String getTemplateId()
{
return templateId;
}
public String getTemplateName() {
return templateName;
}
public void setTemplateName(String templateName) {
this.templateName = templateName;
}
}

40
ems-system/src/main/java/com/xzzn/ems/domain/vo/TicketListVo.java Normal file
View File

@ -0,0 +1,40 @@
package com.xzzn.ems.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xzzn.common.annotation.Excel;
import com.xzzn.common.core.domain.BaseEntity;
import com.xzzn.ems.domain.EmsTicket;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
/**
* 工单列表对象
*
*/
public class TicketListVo extends EmsTicket
{
private static final long serialVersionUID = 1L;
// 提交人姓名
private String userName;
// 处理人姓名
private String workName;
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getWorkName() {
return workName;
}
public void setWorkName(String workName) {
this.workName = workName;
}
}

9
ems-system/src/main/java/com/xzzn/ems/mapper/EmsDevicesSettingMapper.java
View File

@ -76,17 +76,12 @@ public interface EmsDevicesSettingMapper
*/
public List<Map<String, Object>> getDeviceInfosBySiteIdAndCategory(@Param("siteId")String siteId, @Param("deviceCategory")String deviceCategory);
/**
* 获取该设备的详细数据
* @param deviceId
* @return
*/
public EmsDevicesSetting getDeviceDetailInfo(String deviceId);
/**
* 获取该设备下的总表
* @param siteId
* @return
*/
public List<Map<String, Object>> getLoadNameList(String siteId);
public EmsDevicesSetting getDeviceBySiteAndDeviceId(@Param("deviceId")String deviceId, @Param("siteId")String siteId);
}

61
ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyCurveMapper.java Normal file
View File

@ -0,0 +1,61 @@
package com.xzzn.ems.mapper;
import java.util.List;
import com.xzzn.ems.domain.EmsStrategyCurve;
/**
* 策曲线Mapper接口
*
* @author xzzn
* @date 2025-07-11
*/
public interface EmsStrategyCurveMapper
{
/**
* 查询策曲线
*
* @param id 策曲线主键
* @return 策曲线
*/
public EmsStrategyCurve selectEmsStrategyCurveById(Long id);
/**
* 查询策曲线列表
*
* @param emsStrategyCurve 策曲线
* @return 策曲线集合
*/
public List<EmsStrategyCurve> selectEmsStrategyCurveList(EmsStrategyCurve emsStrategyCurve);
/**
* 新增策曲线
*
* @param emsStrategyCurve 策曲线
* @return 结果
*/
public int insertEmsStrategyCurve(EmsStrategyCurve emsStrategyCurve);
/**
* 修改策曲线
*
* @param emsStrategyCurve 策曲线
* @return 结果
*/
public int updateEmsStrategyCurve(EmsStrategyCurve emsStrategyCurve);
/**
* 删除策曲线
*
* @param id 策曲线主键
* @return 结果
*/
public int deleteEmsStrategyCurveById(Long id);
/**
* 批量删除策曲线
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteEmsStrategyCurveByIds(Long[] ids);
}

2
ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyRunningMapper.java
View File

@ -60,7 +60,7 @@ public interface EmsStrategyRunningMapper
*/
public int deleteEmsStrategyRunningByIds(Long[] ids);
// 获取站点运行策略
// 获取站点运行策略列表
public List<StrategyRunningVo> getRunningList(String siteId);
// 停止策略

73
ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyTempMapper.java Normal file
View File

@ -0,0 +1,73 @@
package com.xzzn.ems.mapper;
import java.util.List;
import java.util.Map;
import com.xzzn.ems.domain.EmsStrategyTemp;
import org.apache.ibatis.annotations.Param;
/**
* 模板Mapper接口
*
* @author xzzn
* @date 2025-07-11
*/
public interface EmsStrategyTempMapper
{
/**
* 查询模板
*
* @param id 模板主键
* @return 模板
*/
public EmsStrategyTemp selectEmsStrategyTempById(Long id);
/**
* 查询模板列表
*
* @param emsStrategyTemp 模板
* @return 模板集合
*/
public List<EmsStrategyTemp> selectEmsStrategyTempList(EmsStrategyTemp emsStrategyTemp);
/**
* 新增模板
*
* @param emsStrategyTemp 模板
* @return 结果
*/
public int insertEmsStrategyTemp(EmsStrategyTemp emsStrategyTemp);
/**
* 修改模板
*
* @param emsStrategyTemp 模板
* @return 结果
*/
public int updateEmsStrategyTemp(EmsStrategyTemp emsStrategyTemp);
/**
* 删除模板
*
* @param id 模板主键
* @return 结果
*/
public int deleteEmsStrategyTempById(Long id);
/**
* 批量删除模板
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteEmsStrategyTempByIds(Long[] ids);
// 获取模板名称和id
public List<Map<String,String>> getTempNameList(@Param("strategyId")Long strategyId, @Param("siteId")String siteId);
// 根据模板id获取模板所有的时间配置
public List<EmsStrategyTemp> selectStrategyTempByTempId(String templateId);
// 根据模板id全部删除
public int deleteTempByTempId(String templateId);
}

68
ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyTimeConfigMapper.java Normal file
View File

@ -0,0 +1,68 @@
package com.xzzn.ems.mapper;
import java.util.List;
import com.xzzn.ems.domain.EmsStrategyTimeConfig;
import com.xzzn.ems.domain.vo.StrategyTimeConfigVo;
/**
* 时间配置Mapper接口
*
* @author xzzn
* @date 2025-07-11
*/
public interface EmsStrategyTimeConfigMapper
{
/**
* 查询时间配置
*
* @param id 时间配置主键
* @return 时间配置
*/
public EmsStrategyTimeConfig selectEmsStrategyTimeConfigById(Long id);
/**
* 查询时间配置列表
*
* @param emsStrategyTimeConfig 时间配置
* @return 时间配置集合
*/
public List<EmsStrategyTimeConfig> selectEmsStrategyTimeConfigList(EmsStrategyTimeConfig emsStrategyTimeConfig);
/**
* 新增时间配置
*
* @param emsStrategyTimeConfig 时间配置
* @return 结果
*/
public int insertEmsStrategyTimeConfig(EmsStrategyTimeConfig emsStrategyTimeConfig);
/**
* 修改时间配置
*
* @param emsStrategyTimeConfig 时间配置
* @return 结果
*/
public int updateEmsStrategyTimeConfig(EmsStrategyTimeConfig emsStrategyTimeConfig);
/**
* 删除时间配置
*
* @param id 时间配置主键
* @return 结果
*/
public int deleteEmsStrategyTimeConfigById(Long id);
/**
* 批量删除时间配置
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteEmsStrategyTimeConfigByIds(Long[] ids);
// 获取该策略下的时间配置
public List<StrategyTimeConfigVo> getStrategyTimeList(EmsStrategyTimeConfig emsStrategyTimeConfig);
// 清空该月的模板信息
public void cleanTemplateId(String templateId);
}

8
ems-system/src/main/java/com/xzzn/ems/mapper/EmsTicketMapper.java
View File

@ -1,6 +1,7 @@
package com.xzzn.ems.mapper;
import com.xzzn.ems.domain.EmsTicket;
import com.xzzn.ems.domain.vo.TicketListVo;
import java.util.List;
@ -66,4 +67,11 @@ public interface EmsTicketMapper
* @return
*/
public int dropEmsTicketById(String id);
/**
* 获取工单列表
* @param emsTicket
* @return
*/
public List<TicketListVo> getAllTicketList(EmsTicket emsTicket);
}

13
ems-system/src/main/java/com/xzzn/ems/service/IEmsDeviceSettingService.java
View File

@ -1,7 +1,10 @@
package com.xzzn.ems.service;
import com.xzzn.common.enums.DeviceCategory;
import com.xzzn.ems.domain.EmsDevicesSetting;
import java.util.List;
/**
* 设备信息 服务层
*
@ -9,5 +12,13 @@ import com.xzzn.ems.domain.EmsDevicesSetting;
public interface IEmsDeviceSettingService
{
public EmsDevicesSetting getDeviceDetailInfo(String deviceId);
public EmsDevicesSetting getDeviceDetailInfo(Long deviceId);
public int addDevice(EmsDevicesSetting devicesSetting);
public int updateDevice(EmsDevicesSetting emsDevicesSetting);
public int deleteEmsDevicesSettingById(Long id);
public List<DeviceCategory> getDeviceCategory();
}

61
ems-system/src/main/java/com/xzzn/ems/service/IEmsStrategyCurveService.java Normal file
View File

@ -0,0 +1,61 @@
package com.xzzn.ems.service;
import java.util.List;
import com.xzzn.ems.domain.EmsStrategyCurve;
/**
* 策曲线Service接口
*
* @author xzzn
* @date 2025-07-11
*/
public interface IEmsStrategyCurveService
{
/**
* 查询策曲线
*
* @param id 策曲线主键
* @return 策曲线
*/
public EmsStrategyCurve selectEmsStrategyCurveById(Long id);
/**
* 查询策曲线列表
*
* @param emsStrategyCurve 策曲线
* @return 策曲线集合
*/
public List<EmsStrategyCurve> selectEmsStrategyCurveList(EmsStrategyCurve emsStrategyCurve);
/**
* 新增策曲线
*
* @param emsStrategyCurve 策曲线
* @return 结果
*/
public int insertEmsStrategyCurve(EmsStrategyCurve emsStrategyCurve);
/**
* 修改策曲线
*
* @param emsStrategyCurve 策曲线
* @return 结果
*/
public int updateEmsStrategyCurve(EmsStrategyCurve emsStrategyCurve);
/**
* 批量删除策曲线
*
* @param ids 需要删除的策曲线主键集合
* @return 结果
*/
public int deleteEmsStrategyCurveByIds(Long[] ids);
/**
* 删除策曲线信息
*
* @param id 策曲线主键
* @return 结果
*/
public int deleteEmsStrategyCurveById(Long id);
}

35
ems-system/src/main/java/com/xzzn/ems/service/IEmsStrategyTempService.java Normal file
View File

@ -0,0 +1,35 @@
package com.xzzn.ems.service;
import java.util.List;
import java.util.Map;
import com.xzzn.ems.domain.EmsStrategyTemp;
import com.xzzn.ems.domain.vo.StrategyTempConfigRequest;
/**
* 模板Service接口
*
* @author xzzn
* @date 2025-07-11
*/
public interface IEmsStrategyTempService
{
/**
* 修改模板
*
* @param requestVo 模板
* @return 结果
*/
public boolean updateEmsStrategyTemp(StrategyTempConfigRequest requestVo);
public List<Map<String,String>> getTempNameList(Long strategyId, String siteId);
// 获取该模板下的时间配置
public List<EmsStrategyTemp> selectEmsStrategyTempList(String templateId);
// 新增模板及时间配置
public boolean addNewTempAndTimeConfig(StrategyTempConfigRequest requestVo);
//根据templateId删除模板
public int deleteStrategyTempById(String templateId);
}

70
ems-system/src/main/java/com/xzzn/ems/service/IEmsStrategyTimeConfigService.java Normal file
View File

@ -0,0 +1,70 @@
package com.xzzn.ems.service;
import java.util.List;
import com.xzzn.ems.domain.EmsStrategyTimeConfig;
import com.xzzn.ems.domain.vo.StrategyTimeConfigVo;
/**
* 时间配置Service接口
*
* @author xzzn
* @date 2025-07-11
*/
public interface IEmsStrategyTimeConfigService
{
/**
* 查询时间配置
*
* @param id 时间配置主键
* @return 时间配置
*/
public EmsStrategyTimeConfig selectEmsStrategyTimeConfigById(Long id);
/**
* 查询时间配置列表
*
* @param emsStrategyTimeConfig 时间配置
* @return 时间配置集合
*/
public List<EmsStrategyTimeConfig> selectEmsStrategyTimeConfigList(EmsStrategyTimeConfig emsStrategyTimeConfig);
/**
* 新增时间配置
*
* @param emsStrategyTimeConfig 时间配置
* @return 结果
*/
public boolean insertEmsStrategyTimeConfig(List<EmsStrategyTimeConfig> emsStrategyTimeConfig);
/**
* 修改时间配置
*
* @param emsStrategyTimeConfig 时间配置
* @return 结果
*/
public int updateEmsStrategyTimeConfig(EmsStrategyTimeConfig emsStrategyTimeConfig);
/**
* 批量删除时间配置
*
* @param ids 需要删除的时间配置主键集合
* @return 结果
*/
public int deleteEmsStrategyTimeConfigByIds(Long[] ids);
/**
* 删除时间配置信息
*
* @param id 时间配置主键
* @return 结果
*/
public int deleteEmsStrategyTimeConfigById(Long id);
/**
* 获取策略的时间配置列表
*
* @param emsStrategyTimeConfig 时间配置
* @return 时间配置集合
*/
public List<StrategyTimeConfigVo> getStrategyTimeList(EmsStrategyTimeConfig emsStrategyTimeConfig);
}

9
ems-system/src/main/java/com/xzzn/ems/service/IEmsTicketService.java
View File

@ -1,6 +1,7 @@
package com.xzzn.ems.service;
import com.xzzn.ems.domain.EmsTicket;
import com.xzzn.ems.domain.vo.TicketListVo;
import java.util.List;
@ -66,4 +67,12 @@ public interface IEmsTicketService
* @return
*/
public int dropEmsTicketById(String id);
/**
* 获取工单列表
*
* @param emsTicket 工单主
* @return 工单主集合
*/
public List<TicketListVo> getAllTicketList(EmsTicket emsTicket);
}

2
ems-system/src/main/java/com/xzzn/ems/service/impl/EmsAlarmRecordsServiceImpl.java
View File

@ -143,7 +143,7 @@ public class EmsAlarmRecordsServiceImpl implements IEmsAlarmRecordsService
emsTicket.setTicketNo(ticketNo);
emsTicket.setTitle("工单"+id.toString());
emsTicket.setContent(emsAlarmRecords.getAlarmContent());
emsTicket.setUserId(userId.toString());
emsTicket.setUserId(userId);
emsTicket.setWorkUserId(userId);
emsTicket.setCreateTime(DateUtils.getNowDate());
emsTicket.setCreateBy(user.getUserName());

87
ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java
View File

@ -1,11 +1,17 @@
package com.xzzn.ems.service.impl;
import com.xzzn.common.enums.DeviceCategory;
import com.xzzn.common.utils.DateUtils;
import com.xzzn.common.utils.StringUtils;
import com.xzzn.ems.domain.EmsDevicesSetting;
import com.xzzn.ems.mapper.EmsDevicesSettingMapper;
import com.xzzn.ems.service.IEmsDeviceSettingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.List;
/**
* 站点信息 服务层实现
*
@ -18,11 +24,86 @@ public class EmsDeviceSettingServiceImpl implements IEmsDeviceSettingService
/**
* 获取设备详细信息
* @param deviceId
* @param id
* @return
*/
@Override
public EmsDevicesSetting getDeviceDetailInfo(String deviceId) {
return emsDevicesMapper.getDeviceDetailInfo(deviceId);
public EmsDevicesSetting getDeviceDetailInfo(Long id) {
return emsDevicesMapper.selectEmsDevicesSettingById(id);
}
/**
* 新增设备
* @param devicesSetting
* @return
*/
@Override
public int addDevice(EmsDevicesSetting devicesSetting) {
boolean flag = checkDeviceExist(devicesSetting);
if (flag) {
return -1;
}
devicesSetting.setCreateTime(DateUtils.getNowDate());
return emsDevicesMapper.insertEmsDevicesSetting(devicesSetting);
}
/**
* 更新设备
* @param devicesSetting
* @return
*/
@Override
public int updateDevice(EmsDevicesSetting devicesSetting) {
boolean checkExist = false;
if (devicesSetting.getId() != null) {
// 根据id判断该数据是否存在
EmsDevicesSetting existDevice = emsDevicesMapper.selectEmsDevicesSettingById(devicesSetting.getId());
if (existDevice == null) {
return -1;
}
// 存在判断是否修改deviceId和siteId
String deviceId = existDevice.getDeviceId();
String siteId = existDevice.getSiteId();
if (!deviceId.equals(devicesSetting.getDeviceId())
|| !siteId.equals(devicesSetting.getSiteId())) {
checkExist = checkDeviceExist(devicesSetting);
}
}
// 已修改校验修改后数据是否存在
if (checkExist) {
return -2;
}
devicesSetting.setUpdateTime(DateUtils.getNowDate());
return emsDevicesMapper.updateEmsDevicesSetting(devicesSetting);
}
private boolean checkDeviceExist(EmsDevicesSetting devicesSetting) {
String deviceId = devicesSetting.getDeviceId();
String siteId = devicesSetting.getSiteId();
if (!StringUtils.isEmpty(deviceId) && !StringUtils.isEmpty(siteId)) {
EmsDevicesSetting emsDevicesSetting = emsDevicesMapper.getDeviceBySiteAndDeviceId(deviceId, siteId);
if (emsDevicesSetting != null) {
return true;
}
}
return false;
}
/**
* 删除设备配置信息
*
* @param id Modbus设备配置主键
* @return 结果
*/
@Override
public int deleteEmsDevicesSettingById(Long id){
return emsDevicesMapper.deleteEmsDevicesSettingById(id);
}
@Override
public List<DeviceCategory> getDeviceCategory() {
List<DeviceCategory> deviceList = Arrays.asList(DeviceCategory.values());
return deviceList;
}
}

96
ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyCurveServiceImpl.java Normal file
View File

@ -0,0 +1,96 @@
package com.xzzn.ems.service.impl;
import java.util.List;
import com.xzzn.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.xzzn.ems.mapper.EmsStrategyCurveMapper;
import com.xzzn.ems.domain.EmsStrategyCurve;
import com.xzzn.ems.service.IEmsStrategyCurveService;
/**
* 策曲线Service业务层处理
*
* @author xzzn
* @date 2025-07-11
*/
@Service
public class EmsStrategyCurveServiceImpl implements IEmsStrategyCurveService
{
@Autowired
private EmsStrategyCurveMapper emsStrategyCurveMapper;
/**
* 查询策曲线
*
* @param id 策曲线主键
* @return 策曲线
*/
@Override
public EmsStrategyCurve selectEmsStrategyCurveById(Long id)
{
return emsStrategyCurveMapper.selectEmsStrategyCurveById(id);
}
/**
* 查询策曲线列表
*
* @param emsStrategyCurve 策曲线
* @return 策曲线
*/
@Override
public List<EmsStrategyCurve> selectEmsStrategyCurveList(EmsStrategyCurve emsStrategyCurve)
{
return emsStrategyCurveMapper.selectEmsStrategyCurveList(emsStrategyCurve);
}
/**
* 新增策曲线
*
* @param emsStrategyCurve 策曲线
* @return 结果
*/
@Override
public int insertEmsStrategyCurve(EmsStrategyCurve emsStrategyCurve)
{
emsStrategyCurve.setCreateTime(DateUtils.getNowDate());
return emsStrategyCurveMapper.insertEmsStrategyCurve(emsStrategyCurve);
}
/**
* 修改策曲线
*
* @param emsStrategyCurve 策曲线
* @return 结果
*/
@Override
public int updateEmsStrategyCurve(EmsStrategyCurve emsStrategyCurve)
{
emsStrategyCurve.setUpdateTime(DateUtils.getNowDate());
return emsStrategyCurveMapper.updateEmsStrategyCurve(emsStrategyCurve);
}
/**
* 批量删除策曲线
*
* @param ids 需要删除的策曲线主键
* @return 结果
*/
@Override
public int deleteEmsStrategyCurveByIds(Long[] ids)
{
return emsStrategyCurveMapper.deleteEmsStrategyCurveByIds(ids);
}
/**
* 删除策曲线信息
*
* @param id 策曲线主键
* @return 结果
*/
@Override
public int deleteEmsStrategyCurveById(Long id)
{
return emsStrategyCurveMapper.deleteEmsStrategyCurveById(id);
}
}

13
ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyServiceImpl.java
View File

@ -27,8 +27,7 @@ public class EmsStrategyServiceImpl implements IEmsStrategyService
@Override
public List<StrategyRunningVo> selectEmsStrategyRunningList(String siteId) {
List<StrategyRunningVo> dataList = emsStrategyRunningMapper.getRunningList(siteId);
return dataList;
return emsStrategyRunningMapper.getRunningList(siteId);
}
@Override
@ -48,15 +47,19 @@ public class EmsStrategyServiceImpl implements IEmsStrategyService
@Override
public int configStrategy(EmsStrategyRunning emsStrategyRunning) {
// 校验改策略是否已存在
// 校验是否已存在已运行的相同策略
EmsStrategyRunning existStrategy = emsStrategyRunningMapper.selectEmsStrategyRunning(emsStrategyRunning);
if (existStrategy != null) {
return -1;
}
// 不存在则插入
// 传策略组id-更新
if (emsStrategyRunning.getId() != null){
emsStrategyRunning.setUpdateTime(DateUtils.getNowDate());
return emsStrategyRunningMapper.updateEmsStrategyRunning(emsStrategyRunning);
}
// 否则新增
emsStrategyRunning.setStatus("1");
emsStrategyRunning.setCreateTime(DateUtils.getNowDate());
emsStrategyRunning.setUpdateTime(DateUtils.getNowDate());
return emsStrategyRunningMapper.insertEmsStrategyRunning(emsStrategyRunning);
}
}

116
ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyTempServiceImpl.java Normal file
View File

@ -0,0 +1,116 @@
package com.xzzn.ems.service.impl;
import java.util.List;
import java.util.Map;
import com.xzzn.common.utils.DateUtils;
import com.xzzn.common.utils.StringUtils;
import com.xzzn.common.utils.bean.BeanUtils;
import com.xzzn.ems.domain.EmsStrategyTempTimeConfig;
import com.xzzn.ems.domain.vo.StrategyTempConfigRequest;
import com.xzzn.ems.mapper.EmsStrategyTimeConfigMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.xzzn.ems.mapper.EmsStrategyTempMapper;
import com.xzzn.ems.domain.EmsStrategyTemp;
import com.xzzn.ems.service.IEmsStrategyTempService;
import org.springframework.transaction.annotation.Transactional;
/**
* 模板Service业务层处理
*
* @author xzzn
* @date 2025-07-11
*/
@Service
public class EmsStrategyTempServiceImpl implements IEmsStrategyTempService
{
private static final String PREFIX= "Temp";
@Autowired
private EmsStrategyTempMapper emsStrategyTempMapper;
@Autowired
private EmsStrategyTimeConfigMapper emsStrategyTimeConfigMapper;
/**
* 查询模板列表
*
* @param templateId 模板
* @return 模板
*/
@Override
public List<EmsStrategyTemp> selectEmsStrategyTempList(String templateId)
{
return emsStrategyTempMapper.selectStrategyTempByTempId(templateId);
}
/**
* 新增模板和时间配置
* @param requestVo
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public boolean addNewTempAndTimeConfig(StrategyTempConfigRequest requestVo) {
// 随机生产模板id格式：Temp+时间戳
String templateId = requestVo.getTemplateId();
if (StringUtils.isEmpty(templateId)) {
templateId = PREFIX + DateUtils.dateTimeNow();
}
EmsStrategyTemp publicTemp = new EmsStrategyTemp();
BeanUtils.copyProperties(requestVo, publicTemp);
publicTemp.setTemplateId(templateId);
publicTemp.setCreateTime(DateUtils.getNowDate());
List<EmsStrategyTempTimeConfig> timeList = requestVo.getTimeConfigList();
if (timeList != null && !timeList.isEmpty()) {
for (EmsStrategyTempTimeConfig timeConfig : timeList) {
EmsStrategyTemp temp = new EmsStrategyTemp();
BeanUtils.copyProperties(publicTemp, temp);
// 时间设置
temp.setStartTime(timeConfig.getStartTime());
temp.setEndTime(timeConfig.getEndTime());
temp.setChargeDischargePower(timeConfig.getChargeDischargePower());
temp.setChargeStatus(timeConfig.getChargeStatus());
emsStrategyTempMapper.insertEmsStrategyTemp(temp);
}
} else {// 无时间配置只配置模板基本信息
emsStrategyTempMapper.insertEmsStrategyTemp(publicTemp);
}
return true;
}
/**
* 修改模板
*
* @param requestVo 模板
* @return 结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public boolean updateEmsStrategyTemp(StrategyTempConfigRequest requestVo)
{
String templateId = requestVo.getTemplateId();
// 无发匹配原数据
// 全删
emsStrategyTempMapper.deleteTempByTempId(templateId);
// 重新新增
addNewTempAndTimeConfig(requestVo);
return true;
}
@Override
public List<Map<String,String>> getTempNameList(Long strategyId, String siteId) {
return emsStrategyTempMapper.getTempNameList(strategyId, siteId);
}
@Override
public int deleteStrategyTempById(String templateId) {
// 先更新配置该模板的月份数据
emsStrategyTimeConfigMapper.cleanTemplateId(templateId);
return emsStrategyTempMapper.deleteTempByTempId(templateId);
}
}

121
ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyTimeConfigServiceImpl.java Normal file
View File

@ -0,0 +1,121 @@
package com.xzzn.ems.service.impl;
import java.util.List;
import com.xzzn.common.utils.DateUtils;
import com.xzzn.ems.domain.vo.StrategyTimeConfigVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.xzzn.ems.mapper.EmsStrategyTimeConfigMapper;
import com.xzzn.ems.domain.EmsStrategyTimeConfig;
import com.xzzn.ems.service.IEmsStrategyTimeConfigService;
/**
* 时间配置Service业务层处理
*
* @author xzzn
* @date 2025-07-11
*/
@Service
public class EmsStrategyTimeConfigServiceImpl implements IEmsStrategyTimeConfigService
{
@Autowired
private EmsStrategyTimeConfigMapper emsStrategyTimeConfigMapper;
/**
* 查询时间配置
*
* @param id 时间配置主键
* @return 时间配置
*/
@Override
public EmsStrategyTimeConfig selectEmsStrategyTimeConfigById(Long id)
{
return emsStrategyTimeConfigMapper.selectEmsStrategyTimeConfigById(id);
}
/**
* 查询时间配置列表
*
* @param emsStrategyTimeConfig 时间配置
* @return 时间配置
*/
@Override
public List<EmsStrategyTimeConfig> selectEmsStrategyTimeConfigList(EmsStrategyTimeConfig emsStrategyTimeConfig)
{
return emsStrategyTimeConfigMapper.selectEmsStrategyTimeConfigList(emsStrategyTimeConfig);
}
/**
* 新增时间配置
*
* @param timeConfigList 时间配置
* @return 结果
*/
@Override
public boolean insertEmsStrategyTimeConfig(List<EmsStrategyTimeConfig> timeConfigList)
{
if (timeConfigList != null) {
for (EmsStrategyTimeConfig strategyTimeConfig : timeConfigList) {
Long id = strategyTimeConfig.getId();
// 新增
if (id == null) {
strategyTimeConfig.setCreateTime(DateUtils.getNowDate());
emsStrategyTimeConfigMapper.insertEmsStrategyTimeConfig(strategyTimeConfig);
} else {//更新
strategyTimeConfig.setUpdateTime(DateUtils.getNowDate());
emsStrategyTimeConfigMapper.updateEmsStrategyTimeConfig(strategyTimeConfig);
}
}
} else {
return false;
}
return true;
}
/**
* 修改时间配置
*
* @param emsStrategyTimeConfig 时间配置
* @return 结果
*/
@Override
public int updateEmsStrategyTimeConfig(EmsStrategyTimeConfig emsStrategyTimeConfig)
{
emsStrategyTimeConfig.setUpdateTime(DateUtils.getNowDate());
return emsStrategyTimeConfigMapper.updateEmsStrategyTimeConfig(emsStrategyTimeConfig);
}
/**
* 批量删除时间配置
*
* @param ids 需要删除的时间配置主键
* @return 结果
*/
@Override
public int deleteEmsStrategyTimeConfigByIds(Long[] ids)
{
return emsStrategyTimeConfigMapper.deleteEmsStrategyTimeConfigByIds(ids);
}
/**
* 删除时间配置信息
*
* @param id 时间配置主键
* @return 结果
*/
@Override
public int deleteEmsStrategyTimeConfigById(Long id)
{
return emsStrategyTimeConfigMapper.deleteEmsStrategyTimeConfigById(id);
}
/**
* 获取策略时间配置显示数据
* @param emsStrategyTimeConfig 时间配置
* @return
*/
public List<StrategyTimeConfigVo> getStrategyTimeList(EmsStrategyTimeConfig emsStrategyTimeConfig)
{
return emsStrategyTimeConfigMapper.getStrategyTimeList(emsStrategyTimeConfig);
}
}

13
ems-system/src/main/java/com/xzzn/ems/service/impl/EmsTicketServiceImpl.java
View File

@ -1,8 +1,11 @@
package com.xzzn.ems.service.impl;
import java.util.List;
import java.util.Random;
import com.xzzn.common.utils.DateUtils;
import com.xzzn.ems.domain.EmsTicket;
import com.xzzn.ems.domain.vo.TicketListVo;
import com.xzzn.ems.mapper.EmsTicketMapper;
import com.xzzn.ems.service.IEmsTicketService;
import org.springframework.beans.factory.annotation.Autowired;
@ -54,6 +57,11 @@ public class EmsTicketServiceImpl implements IEmsTicketService
@Override
public int insertEmsTicket(EmsTicket emsTicket)
{
// 工单号随机生产
String ticketNo = "";
String nowDate = DateUtils.dateTime();
ticketNo = "T" + nowDate + String.format("%06d", new Random().nextInt(1000000));
emsTicket.setTicketNo(ticketNo);
emsTicket.setCreateTime(DateUtils.getNowDate());
return emsTicketMapper.insertEmsTicket(emsTicket);
}
@ -106,4 +114,9 @@ public class EmsTicketServiceImpl implements IEmsTicketService
{
return emsTicketMapper.dropEmsTicketById(id);
}
@Override
public List<TicketListVo> getAllTicketList(EmsTicket emsTicket) {
return emsTicketMapper.getAllTicketList(emsTicket);
}
}

3
ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java
View File

@ -402,7 +402,8 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
} else if (AMMETER_DEVICE_METE.equals(ammeterId)) {
AmmeterMeteDataVo ammeterMeteDataVo = new AmmeterMeteDataVo();
ammeterMeteDataVo.setDeviceName(ammeterDevice.get("deviceName").toString());
ammeterMeteDataVo.setEmsCommunicationStatus(ammeterDevice.get("communicationStatus").toString());
ammeterMeteDataVo.setEmsCommunicationStatus(ammeterDevice.get("communicationStatus") == null? "" :
ammeterDevice.get("communicationStatus").toString());
// 处理储能表数据
dealAmmeterMeteData(ammeterData,ammeterMeteDataVo);
ammeterResponse.setAmmeterMeteDataVoList(ammeterMeteDataVo);