From aa15132c1992c56b679dcafafae9a1b1aa960830 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 28 十月 2024 16:17:42 +0800
Subject: [PATCH] 增加是否处理mqtt消息的配置;过程参数更改参数
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/CollectParamSearchVO.java | 87 +++++++++++++------------------------------
1 files changed, 26 insertions(+), 61 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/CollectParamSearchVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/CollectParamSearchVO.java
index 183630c..418b268 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/CollectParamSearchVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/vo/CollectParamSearchVO.java
@@ -1,17 +1,23 @@
package com.qianwen.smartman.modules.mdc.vo;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
+
import javax.validation.constraints.NotNull;
-import com.qianwen.smartman.common.constant.DateConstant;
-import com.qianwen.smartman.modules.cps.dto.WorkstationWcsDmpDTO;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.qianwen.smartman.common.constant.DateConstant;
+import com.qianwen.smartman.modules.mdc.dto.DatapointDTO;
+
+import io.swagger.annotations.ApiModelProperty;
public class CollectParamSearchVO implements Serializable {
private static final long serialVersionUID = 8868349300708294650L;
- private WorkstationWcsDmpDTO dmpDTO;
+ //private WorkstationWcsDmpDTO dmpDTO;
+ private DatapointDTO dpDTO;
@DateTimeFormat(pattern = DateConstant.PATTERN_DATE_TIME)
@ApiModelProperty("寮�濮嬫椂闂�")
@JsonFormat(pattern = DateConstant.PATTERN_DATE_TIME)
@@ -23,11 +29,11 @@
@NotNull(message = "{workstation.collectSwitch.notNull}")
@ApiModelProperty(value = "宸ヤ綅id", dataType = "java.lang.String")
private String workstationId;
-
+ /*
public void setDmpDTO(final WorkstationWcsDmpDTO dmpDTO) {
this.dmpDTO = dmpDTO;
}
-
+*/
@JsonFormat(pattern = DateConstant.PATTERN_DATE_TIME)
public void setStartTime(final Date startTime) {
this.startTime = startTime;
@@ -42,71 +48,21 @@
this.workstationId = workstationId;
}
- public boolean equals(final Object o) {
- if (o == this) {
- return true;
- }
- if (o instanceof CollectParamSearchVO) {
- CollectParamSearchVO other = (CollectParamSearchVO) o;
- if (other.canEqual(this)) {
- Object this$dmpDTO = getDmpDTO();
- Object other$dmpDTO = other.getDmpDTO();
- if (this$dmpDTO == null) {
- if (other$dmpDTO != null) {
- return false;
- }
- } else if (!this$dmpDTO.equals(other$dmpDTO)) {
- return false;
- }
- Object this$startTime = getStartTime();
- Object other$startTime = other.getStartTime();
- if (this$startTime == null) {
- if (other$startTime != null) {
- return false;
- }
- } else if (!this$startTime.equals(other$startTime)) {
- return false;
- }
- Object this$endTime = getEndTime();
- Object other$endTime = other.getEndTime();
- if (this$endTime == null) {
- if (other$endTime != null) {
- return false;
- }
- } else if (!this$endTime.equals(other$endTime)) {
- return false;
- }
- Object this$workstationId = getWorkstationId();
- Object other$workstationId = other.getWorkstationId();
- return this$workstationId == null ? other$workstationId == null : this$workstationId.equals(other$workstationId);
- }
- return false;
- }
- return false;
- }
protected boolean canEqual(final Object other) {
return other instanceof CollectParamSearchVO;
}
- public int hashCode() {
- Object $dmpDTO = getDmpDTO();
- int result = (1 * 59) + ($dmpDTO == null ? 43 : $dmpDTO.hashCode());
- Object $startTime = getStartTime();
- int result2 = (result * 59) + ($startTime == null ? 43 : $startTime.hashCode());
- Object $endTime = getEndTime();
- int result3 = (result2 * 59) + ($endTime == null ? 43 : $endTime.hashCode());
- Object $workstationId = getWorkstationId();
- return (result3 * 59) + ($workstationId == null ? 43 : $workstationId.hashCode());
- }
public String toString() {
- return "CollectParamSearchVO(dmpDTO=" + getDmpDTO() + ", startTime=" + getStartTime() + ", endTime=" + getEndTime() + ", workstationId=" + getWorkstationId() + ")";
+ return ToStringBuilder.reflectionToString(this);
+ //return "CollectParamSearchVO(dmpDTO=" + getDmpDTO() + ", startTime=" + getStartTime() + ", endTime=" + getEndTime() + ", workstationId=" + getWorkstationId() + ")";
}
-
+ /*
public WorkstationWcsDmpDTO getDmpDTO() {
return this.dmpDTO;
}
+ */
public Date getStartTime() {
return this.startTime;
@@ -119,4 +75,13 @@
public String getWorkstationId() {
return this.workstationId;
}
+
+ public DatapointDTO getDpDTO() {
+ return dpDTO;
+ }
+
+ public void setDpDTO(DatapointDTO dpDTO) {
+ this.dpDTO = dpDTO;
+ }
+
}
--
Gitblit v1.9.3