From c29e40954ade988d8ff7800dc356311909824342 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 May 2023 08:54:24 +0800
Subject: [PATCH] 数据校验规则字段修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/entity/Rules.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/entity/Rules.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/entity/Rules.java
index 6144fb9..2eba5a0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/entity/Rules.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/entity/Rules.java
@@ -1,12 +1,16 @@
package cn.gistack.sm.resDataCheck.entity;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springblade.core.mp.base.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
/**
* @Description: 水库数据校验规则表
@@ -52,25 +56,39 @@
*是香重复执行(1、是: 2、否)
*/
@ApiModelProperty(" 是否重复执行(1、是: 2、否)")
- private String repeat;
+ private String isRepeat;
/**
*生效开始时间
*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(" 生效开始时间")
- private String activeStartTime;
+ private Date activeStartTime;
/**
*生效结束时间
*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(" 生效结束时间")
- private String activeEndTime;
+ private Date activeEndTime;
/**
- *第一次执行时间
+ *第一次执行时间 yyyy-MM-dd HH:mm:ss
*/
+ @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+ @DateTimeFormat(pattern="HH:mm:ss")
@ApiModelProperty(" 第一次执行时间")
- private String firstExecuteTime;
+ private Date firstExecuteTime;
+
+ /**
+ *执行时间
+ */
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(" 执行时间")
+ private Date executeTime;
/**
*重复执行间隔
--
Gitblit v1.9.3