代码提交

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryPage.java

@@ -0,0 +1,45 @@
+package com.njcn.csharmonic.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 
+ * Description:
+ * Date: 2023/9/4  15:15【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@NoArgsConstructor
+public class CsEventUserQueryPage extends CsEventUserQueryParam{
+
+    @NotNull(message="当前页不能为空！")
+    @Min(value = 1, message = "当前页不能为0")
+    @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true)
+    private Integer pageNum;
+    /**显示条数*/
+    @NotNull(message="显示条数不能为空！")
+    @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "工程id")
+    private String engineeringid;
+
+
+    @ApiModelProperty(value = "项目id")
+    private String projectId;
+    /**
+     * 装置id
+     */
+    private String deviceId;
+
+
+
+}

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryParam.java

@@ -2,6 +2,7 @@ package com.njcn.csharmonic.param;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -43,5 +44,11 @@ public class CsEventUserQueryParam {
     private String status;
 
     private String level;
+    @ApiModelProperty(value="起始时间")
+//    @NotNull(message="起始时间不能为空！")
+    private String startTime;
 
+    @ApiModelProperty(value="结束时间")
+//    @NotNull(message="结束时间不能为空！")
+    private String endTime;
 }

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java

@@ -64,6 +64,7 @@ public class EventDetailVO {
      * 事件类型
      */
     private String tag;
+    private String showName;
 
     /**
      * 暂态事件波形文件路